mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-09-30 15:37:28 +02:00
Simplify Configuration Load/Save System
This commit is contained in:
LinsaFTW
parent
9af7e49bbe
commit
3da7f18f2b
@ -1,4 +1,4 @@
|
||||
From 2346ffd53c8afc4ae29f33687baa539157fadd2f Mon Sep 17 00:00:00 2001
|
||||
From f4ab4a93d462da9ff8375c432ea7824a189ca59a Mon Sep 17 00:00:00 2001
|
||||
From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com>
|
||||
Date: Mon, 12 Oct 2020 15:40:53 -0300
|
||||
Subject: [PATCH] FlameCord General Patch
|
||||
@ -44,19 +44,47 @@ index 000000000..f3d5c0290
|
||||
\ No newline at end of file
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameConfig.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameConfig.java
|
||||
new file mode 100644
|
||||
index 000000000..5589ce1b7
|
||||
index 000000000..e6c660d15
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameConfig.java
|
||||
@@ -0,0 +1,42 @@
|
||||
@@ -0,0 +1,74 @@
|
||||
+package dev._2lstudios.flamecord.configuration;
|
||||
+
|
||||
+import java.io.File;
|
||||
+import java.io.IOException;
|
||||
+import java.util.ArrayList;
|
||||
+import java.util.Collection;
|
||||
+import java.util.HashSet;
|
||||
+
|
||||
+import net.md_5.bungee.config.Configuration;
|
||||
+import net.md_5.bungee.config.ConfigurationProvider;
|
||||
+import net.md_5.bungee.config.YamlConfiguration;
|
||||
+
|
||||
+public class FlameConfig {
|
||||
+ Configuration load(File file) {
|
||||
+ ConfigurationProvider configurationProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
|
||||
+
|
||||
+ if (file.exists() && file.isFile()) {
|
||||
+ try {
|
||||
+ return configurationProvider.load(file);
|
||||
+ } catch (IOException ex) {
|
||||
+ // Failed to load, do nothing
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return new Configuration();
|
||||
+ }
|
||||
+
|
||||
+ void save(Configuration config, File file) {
|
||||
+ ConfigurationProvider configurationProvider = ConfigurationProvider.getProvider(YamlConfiguration.class);
|
||||
+
|
||||
+ try {
|
||||
+ configurationProvider.save(config, file);
|
||||
+ } catch (IOException ex) {
|
||||
+ // Failed to save, do nothing
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ double setIfUnexistant(final String arg1, final double arg2, final Configuration configuration) {
|
||||
+ return (double) setIfUnexistant(arg1, (Object) arg2, configuration);
|
||||
+ }
|
||||
@ -65,6 +93,10 @@ index 000000000..5589ce1b7
|
||||
+ return (int) setIfUnexistant(arg1, (Object) arg2, configuration);
|
||||
+ }
|
||||
+
|
||||
+ String setIfUnexistant(final String arg1, final String arg2, final Configuration configuration) {
|
||||
+ return (String) setIfUnexistant(arg1, (Object) arg2, configuration);
|
||||
+ }
|
||||
+
|
||||
+ boolean setIfUnexistant(final String arg1, final boolean arg2, final Configuration configuration) {
|
||||
+ return (boolean) setIfUnexistant(arg1, (Object) arg2, configuration);
|
||||
+ }
|
||||
@ -92,14 +124,13 @@ index 000000000..5589ce1b7
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
new file mode 100644
|
||||
index 000000000..114bbf877
|
||||
index 000000000..241e8ed9c
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
@@ -0,0 +1,33 @@
|
||||
@@ -0,0 +1,20 @@
|
||||
+package dev._2lstudios.flamecord.configuration;
|
||||
+
|
||||
+import java.io.File;
|
||||
+import java.io.IOException;
|
||||
+import java.util.ArrayList;
|
||||
+import java.util.Arrays;
|
||||
+import java.util.Collection;
|
||||
@ -111,22 +142,10 @@ index 000000000..114bbf877
|
||||
+
|
||||
+public class FlameCordConfiguration extends FlameConfig {
|
||||
+ public FlameCordConfiguration(final ConfigurationProvider configurationProvider, final Collection<String> whitelistedAddresses) {
|
||||
+ try {
|
||||
+ final String fileName = "./flamecord.yml";
|
||||
+ final File configurationFile = new File(fileName);
|
||||
+ final Configuration configuration;
|
||||
+ final boolean configurationExists = configurationFile.exists();
|
||||
+ final File configurationFile = new File("./flamecord.yml");
|
||||
+ final Configuration configuration = load(configurationFile);
|
||||
+
|
||||
+ if (!configurationExists) {
|
||||
+ configuration = new Configuration();
|
||||
+ } else {
|
||||
+ configuration = configurationProvider.load(configurationFile);
|
||||
+ }
|
||||
+
|
||||
+ configurationProvider.save(configuration, configurationFile);
|
||||
+ } catch (final IOException e) {
|
||||
+ e.printStackTrace();
|
||||
+ }
|
||||
+ save(configuration, configurationFile);
|
||||
+ }
|
||||
+}
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
@ -205,7 +224,7 @@ index 000000000..021b38d43
|
||||
+ }
|
||||
+}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
index 031b21084..39986d522 100644
|
||||
index 27d41dd00..0d8f02d25 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
@@ -9,6 +9,8 @@ import com.google.common.collect.Sets;
|
||||
@ -292,7 +311,7 @@ index 94702434d..e48f77131 100644
|
||||
b.connect().addListener( listener );
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index 1c10b5a93..3e5a337e0 100644
|
||||
index 3b1bffe6c..22688a045 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -21,6 +21,8 @@ import java.util.logging.Level;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From 368bddfcbf0018aeca7eaa72769d9b31c1dfc229 Mon Sep 17 00:00:00 2001
|
||||
From 1d9ee842e043c343a64b8fe7ef6962ee0fb53041 Mon Sep 17 00:00:00 2001
|
||||
From: linsaftw <25271111+linsaftw@users.noreply.github.com>
|
||||
Date: Fri, 30 Apr 2021 23:51:51 -0300
|
||||
Subject: [PATCH] FlameCord logger options
|
||||
|
||||
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
index 114bbf877..edecc1e55 100644
|
||||
index 241e8ed9c..b563cbced 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
@@ -12,6 +12,17 @@ import net.md_5.bungee.config.Configuration;
|
||||
@@ -11,10 +11,27 @@ import net.md_5.bungee.config.Configuration;
|
||||
import net.md_5.bungee.config.ConfigurationProvider;
|
||||
|
||||
public class FlameCordConfiguration extends FlameConfig {
|
||||
@ -24,21 +24,18 @@ index 114bbf877..edecc1e55 100644
|
||||
+ private boolean loggerDetailedConnection = true;
|
||||
+
|
||||
public FlameCordConfiguration(final ConfigurationProvider configurationProvider, final Collection<String> whitelistedAddresses) {
|
||||
try {
|
||||
final String fileName = "./flamecord.yml";
|
||||
@@ -25,6 +36,12 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
configuration = configurationProvider.load(configurationFile);
|
||||
}
|
||||
final File configurationFile = new File("./flamecord.yml");
|
||||
final Configuration configuration = load(configurationFile);
|
||||
|
||||
+ this.loggerInitialhandler = setIfUnexistant("logger.initialhandler", this.loggerInitialhandler, configuration);
|
||||
+ this.loggerExceptions = setIfUnexistant("logger.exceptions", this.loggerExceptions, configuration);
|
||||
+ this.loggerDump = setIfUnexistant("logger.dump", this.loggerDump, configuration);
|
||||
+ this.loggerHaProxy = setIfUnexistant("logger.haproxy", this.loggerHaProxy, configuration);
|
||||
+ this.loggerDetailedConnection = setIfUnexistant("logger.detailed-connect-errors", this.loggerDetailedConnection, configuration);
|
||||
+ this.loggerInitialhandler = setIfUnexistant("logger.initialhandler", this.loggerInitialhandler, configuration);
|
||||
+ this.loggerExceptions = setIfUnexistant("logger.exceptions", this.loggerExceptions, configuration);
|
||||
+ this.loggerDump = setIfUnexistant("logger.dump", this.loggerDump, configuration);
|
||||
+ this.loggerHaProxy = setIfUnexistant("logger.haproxy", this.loggerHaProxy, configuration);
|
||||
+ this.loggerDetailedConnection = setIfUnexistant("logger.detailed-connect-errors", this.loggerDetailedConnection, configuration);
|
||||
+
|
||||
configurationProvider.save(configuration, configurationFile);
|
||||
} catch (final IOException e) {
|
||||
e.printStackTrace();
|
||||
save(configuration, configurationFile);
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
index e48f77131..909227970 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
|
||||
@ -64,7 +61,7 @@ index e48f77131..909227970 100644
|
||||
}
|
||||
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index 3e5a337e0..abed08d4f 100644
|
||||
index 22688a045..66a347542 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -396,7 +396,8 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
|
||||
@ -1,31 +1,16 @@
|
||||
From 40db55725460874e6f2129bdbfa60478bba3fb69 Mon Sep 17 00:00:00 2001
|
||||
From 2072d8d33f059abfdb95c16158792887f3f701d3 Mon Sep 17 00:00:00 2001
|
||||
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
||||
Date: Thu, 7 Oct 2021 21:37:24 -0300
|
||||
Subject: [PATCH] Custom motd system
|
||||
|
||||
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameConfig.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameConfig.java
|
||||
index 5589ce1b..1e928197 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameConfig.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameConfig.java
|
||||
@@ -15,6 +15,10 @@ public class FlameConfig {
|
||||
return (int) setIfUnexistant(arg1, (Object) arg2, configuration);
|
||||
}
|
||||
|
||||
+ String setIfUnexistant(final String arg1, final String arg2, final Configuration configuration) {
|
||||
+ return (String) setIfUnexistant(arg1, (Object) arg2, configuration);
|
||||
+ }
|
||||
+
|
||||
boolean setIfUnexistant(final String arg1, final boolean arg2, final Configuration configuration) {
|
||||
return (boolean) setIfUnexistant(arg1, (Object) arg2, configuration);
|
||||
}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
index edecc1e5..ab33e071 100644
|
||||
index b563cbced..b41ee92cc 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
@@ -3,15 +3,94 @@ package dev._2lstudios.flamecord.configuration;
|
||||
@@ -2,15 +2,94 @@ package dev._2lstudios.flamecord.configuration;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
+import java.util.Collections;
|
||||
import java.util.Arrays;
|
||||
@ -118,32 +103,32 @@ index edecc1e5..ab33e071 100644
|
||||
@Getter
|
||||
private boolean loggerInitialhandler = false;
|
||||
@Getter
|
||||
@@ -36,6 +115,22 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
configuration = configurationProvider.load(configurationFile);
|
||||
}
|
||||
@@ -32,6 +111,22 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
this.loggerHaProxy = setIfUnexistant("logger.haproxy", this.loggerHaProxy, configuration);
|
||||
this.loggerDetailedConnection = setIfUnexistant("logger.detailed-connect-errors", this.loggerDetailedConnection, configuration);
|
||||
|
||||
+ this.motdEnabled = setIfUnexistant("custom-motd.motd.enabled", this.motdEnabled, configuration);
|
||||
+ this.hexMotds = ColorUtil.hexColor(new ArrayList<>(setIfUnexistant("custom-motd.motd.motds", this.motds, configuration)), 735);
|
||||
+ this.motds = ColorUtil.hexColor(new ArrayList<>(setIfUnexistant("custom-motd.motd.motds", this.motds, configuration)), 734);
|
||||
+ this.sampleEnabled = setIfUnexistant("custom-motd.sample.enabled", this.sampleEnabled, configuration);
|
||||
+ this.hexSamples = ColorUtil.hexColor(new ArrayList<>(setIfUnexistant("custom-motd.sample.samples", this.samples, configuration)), 735);
|
||||
+ this.samples = ColorUtil.hexColor(new ArrayList<>(setIfUnexistant("custom-motd.sample.samples", this.samples, configuration)), 734);
|
||||
+ this.protocolEnabled = setIfUnexistant("custom-motd.protocol.enabled", this.protocolEnabled, configuration);
|
||||
+ this.protocolName = ColorUtil.hexColor(setIfUnexistant("custom-motd.protocol.name", this.protocolName, configuration), 735);
|
||||
+ this.protocolAlwaysShow = setIfUnexistant("custom-motd.protocol.always-show", this.protocolAlwaysShow, configuration);
|
||||
+ this.maxPlayersEnabled = setIfUnexistant("custom-motd.maxplayers.enabled", this.maxPlayersEnabled, configuration);
|
||||
+ this.maxPlayersAmount = setIfUnexistant("custom-motd.maxplayers.amount", this.maxPlayersAmount, configuration);
|
||||
+ this.maxPlayersOneMore = setIfUnexistant("custom-motd.maxplayers.justonemore", this.maxPlayersOneMore, configuration);
|
||||
+ this.fakePlayersEnabled = setIfUnexistant("custom-motd.fakeplayers.enabled", this.fakePlayersEnabled, configuration);
|
||||
+ this.fakePlayersAmount = setIfUnexistant("custom-motd.fakeplayers.amount", this.fakePlayersAmount, configuration);
|
||||
+ this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
||||
+ this.motdEnabled = setIfUnexistant("custom-motd.motd.enabled", this.motdEnabled, configuration);
|
||||
+ this.hexMotds = ColorUtil.hexColor(new ArrayList<>(setIfUnexistant("custom-motd.motd.motds", this.motds, configuration)), 735);
|
||||
+ this.motds = ColorUtil.hexColor(new ArrayList<>(setIfUnexistant("custom-motd.motd.motds", this.motds, configuration)), 734);
|
||||
+ this.sampleEnabled = setIfUnexistant("custom-motd.sample.enabled", this.sampleEnabled, configuration);
|
||||
+ this.hexSamples = ColorUtil.hexColor(new ArrayList<>(setIfUnexistant("custom-motd.sample.samples", this.samples, configuration)), 735);
|
||||
+ this.samples = ColorUtil.hexColor(new ArrayList<>(setIfUnexistant("custom-motd.sample.samples", this.samples, configuration)), 734);
|
||||
+ this.protocolEnabled = setIfUnexistant("custom-motd.protocol.enabled", this.protocolEnabled, configuration);
|
||||
+ this.protocolName = ColorUtil.hexColor(setIfUnexistant("custom-motd.protocol.name", this.protocolName, configuration), 735);
|
||||
+ this.protocolAlwaysShow = setIfUnexistant("custom-motd.protocol.always-show", this.protocolAlwaysShow, configuration);
|
||||
+ this.maxPlayersEnabled = setIfUnexistant("custom-motd.maxplayers.enabled", this.maxPlayersEnabled, configuration);
|
||||
+ this.maxPlayersAmount = setIfUnexistant("custom-motd.maxplayers.amount", this.maxPlayersAmount, configuration);
|
||||
+ this.maxPlayersOneMore = setIfUnexistant("custom-motd.maxplayers.justonemore", this.maxPlayersOneMore, configuration);
|
||||
+ this.fakePlayersEnabled = setIfUnexistant("custom-motd.fakeplayers.enabled", this.fakePlayersEnabled, configuration);
|
||||
+ this.fakePlayersAmount = setIfUnexistant("custom-motd.fakeplayers.amount", this.fakePlayersAmount, configuration);
|
||||
+ this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
||||
+
|
||||
this.loggerInitialhandler = setIfUnexistant("logger.initialhandler", this.loggerInitialhandler, configuration);
|
||||
this.loggerExceptions = setIfUnexistant("logger.exceptions", this.loggerExceptions, configuration);
|
||||
this.loggerDump = setIfUnexistant("logger.dump", this.loggerDump, configuration);
|
||||
save(configuration, configurationFile);
|
||||
}
|
||||
}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/ColorUtil.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/ColorUtil.java
|
||||
new file mode 100644
|
||||
index 00000000..9587bccd
|
||||
index 000000000..9587bccda
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/ColorUtil.java
|
||||
@@ -0,0 +1,48 @@
|
||||
@ -197,7 +182,7 @@ index 00000000..9587bccd
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/IridiumColorAPI.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/IridiumColorAPI.java
|
||||
new file mode 100644
|
||||
index 00000000..6c386e16
|
||||
index 000000000..6c386e16f
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/IridiumColorAPI.java
|
||||
@@ -0,0 +1,275 @@
|
||||
@ -478,7 +463,7 @@ index 00000000..6c386e16
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/GradientPattern.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/GradientPattern.java
|
||||
new file mode 100644
|
||||
index 00000000..c1f05cd0
|
||||
index 000000000..c1f05cd0a
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/GradientPattern.java
|
||||
@@ -0,0 +1,33 @@
|
||||
@ -517,7 +502,7 @@ index 00000000..c1f05cd0
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/Pattern.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/Pattern.java
|
||||
new file mode 100644
|
||||
index 00000000..5457ead6
|
||||
index 000000000..5457ead64
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/Pattern.java
|
||||
@@ -0,0 +1,17 @@
|
||||
@ -540,7 +525,7 @@ index 00000000..5457ead6
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/RainbowPattern.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/RainbowPattern.java
|
||||
new file mode 100644
|
||||
index 00000000..792e9f98
|
||||
index 000000000..792e9f987
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/RainbowPattern.java
|
||||
@@ -0,0 +1,28 @@
|
||||
@ -574,7 +559,7 @@ index 00000000..792e9f98
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/SolidPattern.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/SolidPattern.java
|
||||
new file mode 100644
|
||||
index 00000000..0b039c79
|
||||
index 000000000..0b039c797
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/iridiumcolorapi/patterns/SolidPattern.java
|
||||
@@ -0,0 +1,29 @@
|
||||
@ -608,7 +593,7 @@ index 00000000..0b039c79
|
||||
+
|
||||
+}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index 66a34754..58be68b0 100644
|
||||
index 66a347542..58be68b02 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -23,6 +23,8 @@ import javax.crypto.spec.SecretKeySpec;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From 6fbdfc541f535fb0b4d18d09f7fb7bd15f0c91d8 Mon Sep 17 00:00:00 2001
|
||||
From 62bf8051431b5035171c900d729a1c175fcda639 Mon Sep 17 00:00:00 2001
|
||||
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
||||
Date: Thu, 24 Feb 2022 23:41:57 -0300
|
||||
Subject: [PATCH] TCP Fast Open
|
||||
|
||||
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
index ab33e071..9a3c78e2 100644
|
||||
index b41ee92cc..14665b1f6 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
@@ -16,6 +16,10 @@ import net.md_5.bungee.config.Configuration;
|
||||
@@ -15,6 +15,10 @@ import net.md_5.bungee.config.Configuration;
|
||||
import net.md_5.bungee.config.ConfigurationProvider;
|
||||
|
||||
public class FlameCordConfiguration extends FlameConfig {
|
||||
@ -19,16 +19,17 @@ index ab33e071..9a3c78e2 100644
|
||||
public String getMOTD(int maxPlayers, int onlinePlayers, int protocol) {
|
||||
String motd;
|
||||
|
||||
@@ -130,6 +134,7 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
this.fakePlayersEnabled = setIfUnexistant("custom-motd.fakeplayers.enabled", this.fakePlayersEnabled, configuration);
|
||||
this.fakePlayersAmount = setIfUnexistant("custom-motd.fakeplayers.amount", this.fakePlayersAmount, configuration);
|
||||
this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
||||
+ this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
|
||||
@@ -127,6 +131,8 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
this.fakePlayersAmount = setIfUnexistant("custom-motd.fakeplayers.amount", this.fakePlayersAmount, configuration);
|
||||
this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
||||
|
||||
this.loggerInitialhandler = setIfUnexistant("logger.initialhandler", this.loggerInitialhandler, configuration);
|
||||
this.loggerExceptions = setIfUnexistant("logger.exceptions", this.loggerExceptions, configuration);
|
||||
+ this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
|
||||
+
|
||||
save(configuration, configurationFile);
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
index a4c3bd71..ffea1599 100644
|
||||
index a4c3bd710..ffea15992 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
@@ -194,6 +194,8 @@ public class PipelineUtils
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
From 808f0c6dff3f8b0944f699680daa9b22b01ac087 Mon Sep 17 00:00:00 2001
|
||||
From 802403a3d743e4b95d3b9b4845b9ff2302303b20 Mon Sep 17 00:00:00 2001
|
||||
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
||||
Date: Fri, 4 Mar 2022 13:35:53 -0300
|
||||
Subject: [PATCH] Antibot System
|
||||
|
||||
|
||||
diff --git a/flamecord/pom.xml b/flamecord/pom.xml
|
||||
index 20edd900..f48f1e60 100644
|
||||
index 20edd9001..f48f1e60b 100644
|
||||
--- a/flamecord/pom.xml
|
||||
+++ b/flamecord/pom.xml
|
||||
@@ -30,6 +30,17 @@
|
||||
@ -27,7 +27,7 @@ index 20edd900..f48f1e60 100644
|
||||
|
||||
<build>
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java
|
||||
index 676ba95b..3824cc53 100644
|
||||
index 676ba95b9..3824cc533 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/FlameCord.java
|
||||
@@ -1,8 +1,16 @@
|
||||
@ -188,7 +188,7 @@ index 676ba95b..3824cc53 100644
|
||||
\ No newline at end of file
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AccountsCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AccountsCheck.java
|
||||
new file mode 100644
|
||||
index 00000000..0295ea89
|
||||
index 000000000..0295ea89d
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AccountsCheck.java
|
||||
@@ -0,0 +1,48 @@
|
||||
@ -242,7 +242,7 @@ index 00000000..0295ea89
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AddressData.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AddressData.java
|
||||
new file mode 100644
|
||||
index 00000000..7c789983
|
||||
index 000000000..7c7899830
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AddressData.java
|
||||
@@ -0,0 +1,165 @@
|
||||
@ -413,7 +413,7 @@ index 00000000..7c789983
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AddressDataManager.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AddressDataManager.java
|
||||
new file mode 100644
|
||||
index 00000000..bd14f56a
|
||||
index 000000000..bd14f56a1
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/AddressDataManager.java
|
||||
@@ -0,0 +1,48 @@
|
||||
@ -467,7 +467,7 @@ index 00000000..bd14f56a
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/CheckManager.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/CheckManager.java
|
||||
new file mode 100644
|
||||
index 00000000..1503ac95
|
||||
index 000000000..1503ac954
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/CheckManager.java
|
||||
@@ -0,0 +1,40 @@
|
||||
@ -513,7 +513,7 @@ index 00000000..1503ac95
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/CountryCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/CountryCheck.java
|
||||
new file mode 100644
|
||||
index 00000000..fdfd9c8d
|
||||
index 000000000..fdfd9c8d7
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/CountryCheck.java
|
||||
@@ -0,0 +1,148 @@
|
||||
@ -667,7 +667,7 @@ index 00000000..fdfd9c8d
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/FastChatCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/FastChatCheck.java
|
||||
new file mode 100644
|
||||
index 00000000..e2140887
|
||||
index 000000000..e21408873
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/FastChatCheck.java
|
||||
@@ -0,0 +1,39 @@
|
||||
@ -712,7 +712,7 @@ index 00000000..e2140887
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/LoggerWrapper.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/LoggerWrapper.java
|
||||
new file mode 100644
|
||||
index 00000000..df26a363
|
||||
index 000000000..df26a3634
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/LoggerWrapper.java
|
||||
@@ -0,0 +1,28 @@
|
||||
@ -746,7 +746,7 @@ index 00000000..df26a363
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/NicknameCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/NicknameCheck.java
|
||||
new file mode 100644
|
||||
index 00000000..1b35fba5
|
||||
index 000000000..1b35fba5d
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/NicknameCheck.java
|
||||
@@ -0,0 +1,52 @@
|
||||
@ -804,7 +804,7 @@ index 00000000..1b35fba5
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PacketsCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PacketsCheck.java
|
||||
new file mode 100644
|
||||
index 00000000..a7bd9f15
|
||||
index 000000000..a7bd9f153
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PacketsCheck.java
|
||||
@@ -0,0 +1,69 @@
|
||||
@ -879,7 +879,7 @@ index 00000000..a7bd9f15
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PacketsData.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PacketsData.java
|
||||
new file mode 100644
|
||||
index 00000000..7189a7f3
|
||||
index 000000000..7189a7f37
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PacketsData.java
|
||||
@@ -0,0 +1,115 @@
|
||||
@ -1000,7 +1000,7 @@ index 00000000..7189a7f3
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PasswordCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PasswordCheck.java
|
||||
new file mode 100644
|
||||
index 00000000..68555de3
|
||||
index 000000000..68555de34
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/PasswordCheck.java
|
||||
@@ -0,0 +1,69 @@
|
||||
@ -1075,7 +1075,7 @@ index 00000000..68555de3
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/RatelimitCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/RatelimitCheck.java
|
||||
new file mode 100644
|
||||
index 00000000..7ca2662c
|
||||
index 000000000..7ca2662cc
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/RatelimitCheck.java
|
||||
@@ -0,0 +1,48 @@
|
||||
@ -1129,7 +1129,7 @@ index 00000000..7ca2662c
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ReconnectCheck.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ReconnectCheck.java
|
||||
new file mode 100644
|
||||
index 00000000..d38ffc9e
|
||||
index 000000000..d38ffc9e3
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/ReconnectCheck.java
|
||||
@@ -0,0 +1,53 @@
|
||||
@ -1188,7 +1188,7 @@ index 00000000..d38ffc9e
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/StatsData.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/StatsData.java
|
||||
new file mode 100644
|
||||
index 00000000..44d773ab
|
||||
index 000000000..44d773abe
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/antibot/StatsData.java
|
||||
@@ -0,0 +1,75 @@
|
||||
@ -1268,10 +1268,10 @@ index 00000000..44d773ab
|
||||
+ }
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
index 9a3c78e2..8acfb6eb 100644
|
||||
index 14665b1f6..179bb1c3e 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
@@ -16,6 +16,184 @@ import net.md_5.bungee.config.Configuration;
|
||||
@@ -15,6 +15,184 @@ import net.md_5.bungee.config.Configuration;
|
||||
import net.md_5.bungee.config.ConfigurationProvider;
|
||||
|
||||
public class FlameCordConfiguration extends FlameConfig {
|
||||
@ -1456,26 +1456,18 @@ index 9a3c78e2..8acfb6eb 100644
|
||||
// FlameCord - TCP Fast Open
|
||||
@Getter
|
||||
private int tcpFastOpen = 3;
|
||||
@@ -134,6 +312,7 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
this.fakePlayersEnabled = setIfUnexistant("custom-motd.fakeplayers.enabled", this.fakePlayersEnabled, configuration);
|
||||
this.fakePlayersAmount = setIfUnexistant("custom-motd.fakeplayers.amount", this.fakePlayersAmount, configuration);
|
||||
this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
||||
+
|
||||
this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
|
||||
@@ -132,6 +310,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
||||
|
||||
this.loggerInitialhandler = setIfUnexistant("logger.initialhandler", this.loggerInitialhandler, configuration);
|
||||
@@ -142,6 +321,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
this.loggerHaProxy = setIfUnexistant("logger.haproxy", this.loggerHaProxy, configuration);
|
||||
this.loggerDetailedConnection = setIfUnexistant("logger.detailed-connect-errors", this.loggerDetailedConnection, configuration);
|
||||
this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
|
||||
+
|
||||
+ // FlameCord - Antibot System
|
||||
+ loadAntibot(configuration, whitelistedAddresses);
|
||||
|
||||
+ // FlameCord - Antibot System
|
||||
+ loadAntibot(configuration, whitelistedAddresses);
|
||||
+
|
||||
configurationProvider.save(configuration, configurationFile);
|
||||
} catch (final IOException e) {
|
||||
e.printStackTrace();
|
||||
save(configuration, configurationFile);
|
||||
}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java
|
||||
index 21381bb4..37bccaeb 100644
|
||||
index 21381bb45..37bccaebd 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/MessagesConfiguration.java
|
||||
@@ -90,6 +90,22 @@ public class MessagesConfiguration extends FlameConfig {
|
||||
@ -1503,7 +1495,7 @@ index 21381bb4..37bccaeb 100644
|
||||
for (final String key : configuration.getKeys()) {
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/enums/PacketsCheckResult.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/enums/PacketsCheckResult.java
|
||||
new file mode 100644
|
||||
index 00000000..285810ea
|
||||
index 000000000..285810ea1
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/enums/PacketsCheckResult.java
|
||||
@@ -0,0 +1,5 @@
|
||||
@ -1514,7 +1506,7 @@ index 00000000..285810ea
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/enums/PacketsViolationReason.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/enums/PacketsViolationReason.java
|
||||
new file mode 100644
|
||||
index 00000000..c19c4965
|
||||
index 000000000..c19c4965d
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/enums/PacketsViolationReason.java
|
||||
@@ -0,0 +1,5 @@
|
||||
@ -1525,7 +1517,7 @@ index 00000000..c19c4965
|
||||
+}
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/ProtocolUtil.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/ProtocolUtil.java
|
||||
new file mode 100644
|
||||
index 00000000..7f26e7a0
|
||||
index 000000000..7f26e7a0d
|
||||
--- /dev/null
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/utils/ProtocolUtil.java
|
||||
@@ -0,0 +1,27 @@
|
||||
@ -1558,7 +1550,7 @@ index 00000000..7f26e7a0
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
index 6316143f..aa538f74 100644
|
||||
index 6316143f7..aa538f748 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
|
||||
@@ -51,12 +51,38 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
|
||||
@ -1601,7 +1593,7 @@ index 6316143f..aa538f74 100644
|
||||
if (in.readableBytes() == 0 && !server) {
|
||||
return;
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
index c9e45b91..022f94b2 100644
|
||||
index c9e45b915..022f94b2d 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
|
||||
@@ -723,4 +723,8 @@ public enum Protocol
|
||||
@ -1614,7 +1606,7 @@ index c9e45b91..022f94b2 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
|
||||
index c0d37142..403ccba9 100644
|
||||
index c0d371426..403ccba98 100644
|
||||
--- a/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
|
||||
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/Varint21FrameDecoder.java
|
||||
@@ -5,11 +5,11 @@ import io.netty.buffer.Unpooled;
|
||||
@ -1631,7 +1623,7 @@ index c0d37142..403ccba9 100644
|
||||
|
||||
@Override
|
||||
diff --git a/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java b/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java
|
||||
index fb81adee..173b47f3 100644
|
||||
index fb81adee0..173b47f33 100644
|
||||
--- a/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java
|
||||
+++ b/proxy/src/main/java/dev/_2lstudios/flamecord/commands/FlameCordCommand.java
|
||||
@@ -4,6 +4,7 @@ import java.util.Collection;
|
||||
@ -1701,7 +1693,7 @@ index fb81adee..173b47f3 100644
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
index 0c559fb0..5889d419 100644
|
||||
index 8994454c7..62712330e 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
@@ -533,6 +533,11 @@ public class BungeeCord extends ProxyServer
|
||||
@ -1717,7 +1709,7 @@ index 0c559fb0..5889d419 100644
|
||||
// Need to close loggers after last message!
|
||||
org.apache.logging.log4j.LogManager.shutdown(); // Waterfall
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index 58be68b0..b88e6452 100644
|
||||
index 58be68b02..b88e64526 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -22,8 +22,8 @@ import javax.crypto.SecretKey;
|
||||
@ -1841,7 +1833,7 @@ index 58be68b0..b88e6452 100644
|
||||
// We can just check by UUID here as names are based on UUID
|
||||
if ( !isOnlineMode() && bungee.getPlayer( getUniqueId() ) != null )
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
index 66332af4..c16e28c8 100644
|
||||
index 66332af4e..c16e28c80 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
|
||||
@@ -4,11 +4,15 @@ import com.google.common.base.Preconditions;
|
||||
@ -1884,7 +1876,7 @@ index 66332af4..c16e28c8 100644
|
||||
if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
|
||||
{
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
|
||||
index e2911d5e..1e3608fa 100644
|
||||
index e2911d5e4..1e3608fa4 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/http/HttpHandler.java
|
||||
@@ -8,7 +8,11 @@ import io.netty.handler.codec.http.HttpResponse;
|
||||
@ -1916,7 +1908,7 @@ index e2911d5e..1e3608fa 100644
|
||||
{
|
||||
callback.done( null, cause );
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
|
||||
index b3fa4835..6f1d8336 100644
|
||||
index b3fa48355..6f1d8336d 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
|
||||
@@ -154,4 +154,11 @@ public class ChannelWrapper
|
||||
@ -1932,7 +1924,7 @@ index b3fa4835..6f1d8336 100644
|
||||
+ // FlameCord end - Antibot System
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
|
||||
index 14e3004f..3fce5ff1 100644
|
||||
index 14e3004fc..3fce5ff11 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
|
||||
@@ -12,6 +12,8 @@ import io.netty.handler.timeout.ReadTimeoutException;
|
||||
@ -1961,7 +1953,7 @@ index 14e3004f..3fce5ff1 100644
|
||||
{
|
||||
boolean logExceptions = !( handler instanceof PingHandler );
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
index ffea1599..f04fdd9c 100644
|
||||
index ffea15992..f04fdd9ce 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
|
||||
@@ -59,6 +59,20 @@ public class PipelineUtils
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From 80933081e2983627c9f8488cf034316c1571f512 Mon Sep 17 00:00:00 2001
|
||||
From a753d95f4e54be610ccaca37e5bd02a863cee933 Mon Sep 17 00:00:00 2001
|
||||
From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
|
||||
Date: Fri, 4 Mar 2022 14:09:35 -0300
|
||||
Subject: [PATCH] Allow Invalid Names
|
||||
|
||||
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
index 8acfb6eb..05f7da1d 100644
|
||||
index 179bb1c3e..c84cf3cca 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
@@ -16,6 +16,10 @@ import net.md_5.bungee.config.Configuration;
|
||||
@@ -15,6 +15,10 @@ import net.md_5.bungee.config.Configuration;
|
||||
import net.md_5.bungee.config.ConfigurationProvider;
|
||||
|
||||
public class FlameCordConfiguration extends FlameConfig {
|
||||
@ -19,18 +19,18 @@ index 8acfb6eb..05f7da1d 100644
|
||||
// Antibot accounts
|
||||
@Getter
|
||||
private boolean antibotAccountsEnabled = true;
|
||||
@@ -321,6 +325,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
this.loggerHaProxy = setIfUnexistant("logger.haproxy", this.loggerHaProxy, configuration);
|
||||
this.loggerDetailedConnection = setIfUnexistant("logger.detailed-connect-errors", this.loggerDetailedConnection, configuration);
|
||||
@@ -314,6 +318,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
// FlameCord - Antibot System
|
||||
loadAntibot(configuration, whitelistedAddresses);
|
||||
|
||||
+ // FlameCord - Allow Invalid Names
|
||||
+ this.allowInvalidNames = setIfUnexistant("allow-invalid-names", this.allowInvalidNames, configuration);
|
||||
+ // FlameCord - Allow Invalid Names
|
||||
+ this.allowInvalidNames = setIfUnexistant("allow-invalid-names", this.allowInvalidNames, configuration);
|
||||
+
|
||||
// FlameCord - Antibot System
|
||||
loadAntibot(configuration, whitelistedAddresses);
|
||||
|
||||
save(configuration, configurationFile);
|
||||
}
|
||||
}
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
index b88e6452..e8c14c55 100644
|
||||
index b88e64526..e8c14c552 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
||||
@@ -528,7 +528,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From 80d41a1e52de99ccfac9d98bd64c0176caac13e1 Mon Sep 17 00:00:00 2001
|
||||
From e1191a593b1aa81cc8519f6c7fa7192713cc98e3 Mon Sep 17 00:00:00 2001
|
||||
From: xIsm4 <soportexism4@gmail.com>
|
||||
Date: Fri, 27 Jan 2023 14:12:44 +0100
|
||||
Subject: [PATCH] Implement libdeflate
|
||||
|
||||
|
||||
diff --git a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
index 05f7da1d4..1ef7f6a72 100644
|
||||
index c84cf3cca..034fb37e4 100644
|
||||
--- a/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
+++ b/flamecord/src/main/java/dev/_2lstudios/flamecord/configuration/FlameCordConfiguration.java
|
||||
@@ -60,6 +60,8 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
@@ -59,6 +59,8 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
@Getter
|
||||
private int antibotFirewallExpire = 60;
|
||||
@Getter
|
||||
@ -17,14 +17,16 @@ index 05f7da1d4..1ef7f6a72 100644
|
||||
private boolean antibotFirewallLog = true;
|
||||
@Getter
|
||||
private boolean antibotFirewallIpset = true;
|
||||
@@ -318,6 +320,7 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
this.fakePlayersMode = setIfUnexistant("custom-motd.fakeplayers.mode", this.fakePlayersMode, configuration);
|
||||
@@ -321,6 +323,9 @@ public class FlameCordConfiguration extends FlameConfig {
|
||||
// FlameCord - Allow Invalid Names
|
||||
this.allowInvalidNames = setIfUnexistant("allow-invalid-names", this.allowInvalidNames, configuration);
|
||||
|
||||
this.tcpFastOpen = setIfUnexistant("tcp-fast-open", this.tcpFastOpen, configuration);
|
||||
+ this.compressionLevel = setIfUnexistant("compression-level", this.compressionLevel, configuration);
|
||||
|
||||
this.loggerInitialhandler = setIfUnexistant("logger.initialhandler", this.loggerInitialhandler, configuration);
|
||||
this.loggerExceptions = setIfUnexistant("logger.exceptions", this.loggerExceptions, configuration);
|
||||
+ // FlameCord - Implement libdeflate
|
||||
+ this.compressionLevel = setIfUnexistant("compression-level", this.compressionLevel, configuration);
|
||||
+
|
||||
save(configuration, configurationFile);
|
||||
}
|
||||
}
|
||||
diff --git a/native/compile-linux.sh b/native/compile-linux.sh
|
||||
new file mode 100644
|
||||
index 000000000..5442dce9d
|
||||
@ -2270,7 +2272,7 @@ index 10fe411d8..f6daaea4d 100644
|
||||
<groupId>io.github.waterfallmc</groupId>
|
||||
<artifactId>waterfall-module-cmd-alert</artifactId>
|
||||
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
index d67519484..f7a3952a2 100644
|
||||
index f5059666e..dba21bcc7 100644
|
||||
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
||||
@@ -17,6 +17,7 @@ import dev._2lstudios.flamecord.commands.FlameCordCommand;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user