1.21.1

Author: phit

common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/BridgeIRCBot.java

@@ -12,26 +12,15 @@ public class BridgeIRCBot extends AbstractIRCBot {
 
     private SimpleIRCBridgeCommon bridge;
 
-//	/* package */ BridgeIRCBot(SimpleIRCBridge bridge) {
-//
-//		super(//
-//				/* socketAddr = */ new InetSocketAddress((String) SIBConfig.IRC_HOSTNAME.get(), SIBConfig.IRC_PORT.get()), //
-//				/* useSsl = */ SIBConfig.IRC_TLS.get(), //
-//				/* info = */ new IRCConnectionInfo(
-//						/* nickname = */ !((String) SIBConfig.IRC_NICKNAME.get()).contains("(rnd)") ? ((String) SIBConfig.IRC_NICKNAME.get()) :
-//										((String) SIBConfig.IRC_NICKNAME.get()).replace("(rnd)", String.valueOf((int) (Math.random() * 100000))),
-//						/* username = */ (String) SIBConfig.IRC_USERNAME.get(),
-//						/* realname = */ (String) SIBConfig.IRC_REALNAME.get()),
-//						/* password = */ (String) SIBConfig.IRC_PASSWORD.get());
-//		SimpleIRCBridge.log().info((String) SIBConfig.IRC_HOSTNAME.get());
-//		this.bridge = bridge;
-//	}
-
     BridgeIRCBot(SimpleIRCBridgeCommon bridge) {
         super(
                 new InetSocketAddress(Config.hostname, Config.port),
                 Config.tls,
-                new IRCConnectionInfo(Config.nick, Config.username, Config.realname),
+                new IRCConnectionInfo(
+                        !Config.nick.contains("(rnd)") ? Config.nick : Config.nick.replace("(rnd)", String.valueOf((int) (Math.random() * 100000))),
+                        Config.username,
+                        Config.realname
+                ),
                 Config.password
         );
         this.bridge = bridge;

common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/Config.java

@@ -24,11 +24,11 @@ private Config() {
     public static Boolean ircFormatting = true;
     public static Boolean mcFormatting = true;
     public static String nick = "bridgebot";
-    public static String password = "true";
+    public static String password = "";
     public static String hostname = "localhost";
     public static Integer port = 6667;
     public static String channel = "#general";
-    public static Boolean tls = true;
+    public static Boolean tls = false;
     public static String username = "bridgebot";
 
     public static String realname = "SimpleIRCBridge";
@@ -120,13 +120,13 @@ private static void correctionListener(ConfigSpec.CorrectionAction action, List<
         String key = String.join(".", path);
         switch (action) {
             case ADD:
-                SimpleIRCBridgeCommon.logger.warn("Config key {} missing -> added default value.", key);
+                SimpleIRCBridgeCommon.log().warn("Config key {} missing -> added default value.", key);
                 break;
             case REMOVE:
-                SimpleIRCBridgeCommon.logger.warn("Config key {} not defined -> removed from config.", key);
+                SimpleIRCBridgeCommon.log().warn("Config key {} not defined -> removed from config.", key);
                 break;
             case REPLACE:
-                SimpleIRCBridgeCommon.logger.warn("Config key {} not valid -> replaced with default value.", key);
+                SimpleIRCBridgeCommon.log().warn("Config key {} not valid -> replaced with default value.", key);
         }
     }
 

common/src/main/java/net/stonebound/simpleircbridge/simpleircbridge/SimpleIRCBridgeCommon.java

@@ -20,7 +20,7 @@
 
 
 public class SimpleIRCBridgeCommon {
-    public static final Logger logger = LogUtils.getLogger();
+    private static final Logger logger = LogUtils.getLogger();
     private BridgeIRCBot bot;
     private MinecraftServer mcServer;
     public static GameEventHandler eventHandler;
@@ -32,12 +32,12 @@ public SimpleIRCBridgeCommon() {
 
         ChatEvent.DECORATE.register(eventHandler::serverChat);
 
+        LifecycleEvent.SERVER_STARTING.register(Config::serverStarting);
+        LifecycleEvent.SERVER_STOPPING.register(Config::serverStopping);
+
         LifecycleEvent.SERVER_STARTING.register(this::serverStarting);
         LifecycleEvent.SERVER_STOPPING.register(this::serverStopping);
         LifecycleEvent.SERVER_STOPPED.register(this::serverStopped);
-
-        LifecycleEvent.SERVER_STARTING.register(Config::serverStarting);
-        LifecycleEvent.SERVER_STOPPING.register(Config::serverStopping);
     }
 
 
@@ -66,7 +66,7 @@ public void serverStopped(MinecraftServer instance) {
     }
 
     /* package-private */
-    static Logger log() {
+    public static Logger log() {
         return logger;
     }
 

gradle.properties

@@ -3,20 +3,17 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 1.0.2
+mod_version = 1.1.0
 maven_group = net.stonebound.simpleircbridge
 archives_name = simpleircbridge
-enabled_platforms = fabric,forge,neoforge,quilt
+enabled_platforms = fabric,neoforge
 
 # Minecraft properties
-minecraft_version = 1.20.4
+minecraft_version = 1.21.1
 
 # Dependencies
-architectury_api_version = 11.1.17
-fabric_loader_version = 0.15.11
-fabric_api_version = 0.97.1+1.20.4
-forge_version = 1.20.4-49.0.50
-neoforge_version = 20.4.234
-quilt_loader_version = 0.26.1-beta.1
-quilted_fabric_api_version = 9.0.0-alpha.8+0.97.0-1.20.4
-nightconfig_version=3.6.4
+architectury_api_version = 13.0.6
+fabric_loader_version = 0.16.2
+fabric_api_version = 0.102.1+1.21.1
+neoforge_version = 21.1.23
+nightconfig_version=3.8.0