Skip to content

Proxy config refactor #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
Jan 6, 2021
Merged

Proxy config refactor #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bd1cbf8
Start of proxy config refactor
Gadsee Aug 7, 2020
38226ca
Refactor all configurations and access to them
Gadsee Aug 7, 2020
9236f48
Added back configuration load messages
Gadsee Aug 7, 2020
58f6e20
Removed the creation/load confirmations
Gadsee Aug 7, 2020
7851140
Remove static config access from MultiChat.class
Gadsee Aug 8, 2020
5e6f367
Remove unused aliases access
Gadsee Aug 8, 2020
dfcfe1c
MultiChat.class optimizations
Gadsee Aug 8, 2020
9678e0b
Target UTF-8 and Java 8 in pom for platform-independency
Gadsee Aug 8, 2020
8f8ebf0
Replace MessageManager with modern config handler
Gadsee Aug 8, 2020
14d97b6
TODO Update
Gadsee Aug 8, 2020
e19b794
Auto Update Config
Gadsee Aug 8, 2020
7a16071
Making some space
Gadsee Aug 8, 2020
4840b69
Updater optimization
Gadsee Aug 8, 2020
2a72a16
Config backups
Gadsee Aug 8, 2020
aae44b6
Make regex rules / actions actually work
Gadsee Aug 8, 2020
c9491f9
Versioned proxy config backups
Gadsee Aug 8, 2020
556841a
String#valueOf(null) returns "null", not null
Gadsee Aug 8, 2020
15f09b9
Javadoc and QOL changes
Gadsee Aug 9, 2020
942d87e
Fixed reloadConfig throwing wrong exception
Gadsee Aug 9, 2020
318e9fb
Remove unnecessary new line write
Gadsee Aug 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions multichat/dependency-reduced-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,5 +299,9 @@
</exclusions>
</dependency>
</dependencies>
<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>

5 changes: 5 additions & 0 deletions multichat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
<artifactId>multichat</artifactId>
<version>1.10</version>

<properties>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>

<repository>
Expand Down
18 changes: 10 additions & 8 deletions multichat/src/main/java/xyz/olivermartin/multichat/bungee/Announcements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package xyz.olivermartin.multichat.bungee;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;

import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.scheduler.ScheduledTask;
import xyz.olivermartin.multichat.bungee.events.PostBroadcastEvent;
import xyz.olivermartin.multichat.common.MessageType;
import xyz.olivermartin.multichat.common.MultiChatUtil;
import xyz.olivermartin.multichat.proxy.common.MultiChatProxy;
import xyz.olivermartin.multichat.proxy.common.ProxyJsonUtils;
import xyz.olivermartin.multichat.proxy.common.config.ProxyConfigs;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;

/**
* Announcements Management
Expand All @@ -36,12 +38,12 @@ public static boolean startAnnouncement(final String name, Integer minutes) {
public void run() {
String message = announcements.get(name.toLowerCase());

message = ChatControl.applyChatRules(message, "announcements", "").get();
message = ChatControl.applyChatRules(null, message, MessageType.ANNOUNCEMENTS).get();

message = MultiChatUtil.translateColorCodes(message);

for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
if (MultiChat.legacyServers.contains(onlineplayer.getServer().getInfo().getName())) {
if (ProxyConfigs.CONFIG.isLegacyServer(onlineplayer.getServer().getInfo().getName())) {
onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(MultiChatUtil.approximateRGBColorCodes(message)));
} else {
onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(message));
Expand Down Expand Up @@ -136,12 +138,12 @@ public static void playAnnouncement(String name) {

String message = announcements.get(name.toLowerCase());

message = ChatControl.applyChatRules(message, "announcements", "").get();
message = ChatControl.applyChatRules(null, message, MessageType.ANNOUNCEMENTS).get();

message = MultiChatUtil.translateColorCodes(message);

for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
if (MultiChat.legacyServers.contains(onlineplayer.getServer().getInfo().getName())) {
if (ProxyConfigs.CONFIG.isLegacyServer(onlineplayer.getServer().getInfo().getName())) {
onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(MultiChatUtil.approximateRGBColorCodes(message)));
} else {
onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(message));
Expand Down
14 changes: 8 additions & 6 deletions multichat/src/main/java/xyz/olivermartin/multichat/bungee/Bulletins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package xyz.olivermartin.multichat.bungee;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;

import net.md_5.bungee.api.ProxyServer;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.scheduler.ScheduledTask;
import xyz.olivermartin.multichat.bungee.events.PostBroadcastEvent;
import xyz.olivermartin.multichat.common.MessageType;
import xyz.olivermartin.multichat.common.MultiChatUtil;
import xyz.olivermartin.multichat.proxy.common.MultiChatProxy;
import xyz.olivermartin.multichat.proxy.common.ProxyJsonUtils;
import xyz.olivermartin.multichat.proxy.common.config.ProxyConfigs;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;

/**
* Bulletins Management
Expand Down Expand Up @@ -109,12 +111,12 @@ public void run() {

message = bulletin.get(nextBulletin);

message = ChatControl.applyChatRules(message, "bulletins", "").get();
message = ChatControl.applyChatRules(null, message, MessageType.BULLETINS).get();

message = MultiChatUtil.translateColorCodes(message);

for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
if (MultiChat.legacyServers.contains(onlineplayer.getServer().getInfo().getName())) {
if (ProxyConfigs.CONFIG.isLegacyServer(onlineplayer.getServer().getInfo().getName())) {
onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(MultiChatUtil.approximateRGBColorCodes(message)));
} else {
onlineplayer.sendMessage(ProxyJsonUtils.parseMessage(message));
Expand Down
5 changes: 3 additions & 2 deletions multichat/src/main/java/xyz/olivermartin/multichat/bungee/CastControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Map;

import net.md_5.bungee.api.CommandSender;
import xyz.olivermartin.multichat.common.MessageType;
import xyz.olivermartin.multichat.proxy.common.channels.local.LocalChannel;
import xyz.olivermartin.multichat.proxy.common.channels.proxy.ProxyChannel;

Expand All @@ -19,12 +20,12 @@ public class CastControl {
public static Map<String,String> castList = new HashMap<String,String>();

public static void sendCast(String castName, String castMessage, ProxyChannel channel, CommandSender sender) {
castMessage = ChatControl.applyChatRules(castMessage, "casts", "").get();
castMessage = ChatControl.applyChatRules(sender, castMessage, MessageType.CASTS).get();
channel.broadcastRawMessage(sender, castList.get(castName.toLowerCase()) + " " + castMessage);
}

public static void sendCast(String castName, String castMessage, LocalChannel channel, String server, CommandSender sender) {
castMessage = ChatControl.applyChatRules(castMessage, "casts", "").get();
castMessage = ChatControl.applyChatRules(sender, castMessage, MessageType.CASTS).get();
channel.broadcastRawMessage(sender, server, castList.get(castName.toLowerCase()) + " " + castMessage);
}

Expand Down
Loading