Simplify mixin file & bootstrap class names

FlorianMichael · FlorianMichael · commit cf64477d6307 · 2026-01-06T01:13:33.000+01:00
The version suffix isn't really needed as they are standalone mods on its own anyway
diff --git a/build.gradle b/build.gradle
@@ -138,7 +138,7 @@ subprojects {
                     property "mixin.hotSwap", "true"
                     property "fml.coreMods.load", "de.florianmichael.viaforge.mixin.MixinLoader"
                     // Only required for MC 1.12, but modern Forges skips this anyway
-                    args "-mixin.config=" + "mixins." + project.getProperty('name') + ".json"
+                    args "-mixin.config=" + "mixins.viaforge.json"
 
                     // source set
                     mods {
@@ -173,7 +173,7 @@ subprojects {
         }
 
         mixin {
-            add sourceSets.main, "mixins.${project.name}.refmap.json"
+            add sourceSets.main, "mixins.viaforge.refmap.json"
         }
 
         if (versionId < 1_20_6) { // Use official mappings at runtime, otherwise re-obfuscate output
@@ -217,7 +217,7 @@ subprojects {
             "TweakOrder": "0",
             "FMLCorePluginContainsFMLMod": "true", // Only required for MC 1.12, but modern Forges skips this anyway
             "FMLCorePlugin": "de.florianmichael.viaforge.mixin.MixinLoader", // Counterpart to the above
-            "MixinConfigs": "mixins.${project.name}.json",
+            "MixinConfigs": "mixins.viaforge.json",
             "ForceLoadAsMod": "true"
         )
         enabled = false
diff --git a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_12to1_12_1.packet.ServerboundPackets1_12_1;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -34,7 +32,7 @@
 import java.util.function.Supplier;
 
 @Mod(modid = "viaforge", name = "ViaForge", acceptableRemoteVersions = "*", clientSideOnly=true, useMetadata=true)
-public class ViaForge1122 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
     @Mod.EventHandler
     public void onInit(FMLInitializationEvent event) {
diff --git a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/mixin/MixinLoader.java b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/mixin/MixinLoader.java
@@ -29,7 +29,7 @@ public class MixinLoader implements IFMLLoadingPlugin {
 
     public MixinLoader() {
         MixinBootstrap.init();
-        Mixins.addConfiguration("mixins.viaforge-mc1122.json");
+        Mixins.addConfiguration("mixins.viaforge.json");
         MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT);
     }
 
diff --git a/viaforge-mc1122/src/main/resources/mixins.viaforge.json b/viaforge-mc1122/src/main/resources/mixins.viaforge.json
@@ -3,7 +3,7 @@
   "minVersion": "0.7.5",
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin.impl",
-  "refmap": "mixins.viaforge-mc1122.refmap.json",
+  "refmap": "mixins.viaforge.refmap.json",
   "client": [
     "MixinNetHandlerPlayClient",
     "MixinGuiMainMenu",
diff --git a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -35,9 +33,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge1165 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge1165() {
+    public ViaForge() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1165/src/main/resources/mixins.viaforge.json b/viaforge-mc1165/src/main/resources/mixins.viaforge.json
@@ -20,5 +20,5 @@
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc1165.refmap.json"
+  "refmap": "mixins.viaforge.refmap.json"
 }
diff --git a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -35,9 +33,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge1171 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge1171() {
+    public ViaForge() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1171/src/main/resources/mixins.viaforge.json b/viaforge-mc1171/src/main/resources/mixins.viaforge.json
@@ -20,5 +20,5 @@
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc1171.refmap.json"
+  "refmap": "mixins.viaforge.refmap.json"
 }
diff --git a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -35,9 +33,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge1182 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge1182() {
+    public ViaForge() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1182/src/main/resources/mixins.viaforge.json b/viaforge-mc1182/src/main/resources/mixins.viaforge.json
@@ -4,11 +4,11 @@
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
   "client": [
-    "MixinClientPacketListener",
     "MixinDebugScreenOverlay",
     "MixinDirectJoinServerScreen",
     "MixinEditServerScreen",
     "MixinJoinMultiplayerScreen",
+    "MixinClientPacketListener",
     "MixinServerData",
     "MixinTitleScreen",
     "connect.MixinClientHandshakePacketListenerImpl",
@@ -20,5 +20,5 @@
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc1201.refmap.json"
+  "refmap": "mixins.viaforge.refmap.json"
 }
diff --git a/viaforge-mc1192/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1192/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_19to1_19_1.packet.ServerboundPackets1_19_1;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -35,9 +33,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge1192 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge1192() {
+    public ViaForge() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1192/src/main/resources/mixins.viaforge.json b/viaforge-mc1192/src/main/resources/mixins.viaforge.json
@@ -20,5 +20,5 @@
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc1192.refmap.json"
+  "refmap": "mixins.viaforge.refmap.json"
 }
diff --git a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -35,9 +33,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge1201 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge1201() {
+    public ViaForge() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1194/src/main/resources/mixins.viaforge.json b/viaforge-mc1194/src/main/resources/mixins.viaforge.json
@@ -4,11 +4,11 @@
   "compatibilityLevel": "JAVA_8",
   "package": "de.florianmichael.viaforge.mixin",
   "client": [
+    "MixinClientPacketListener",
     "MixinDebugScreenOverlay",
     "MixinDirectJoinServerScreen",
     "MixinEditServerScreen",
     "MixinJoinMultiplayerScreen",
-    "MixinClientPacketListener",
     "MixinServerData",
     "MixinTitleScreen",
     "connect.MixinClientHandshakePacketListenerImpl",
@@ -20,5 +20,5 @@
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc1182.refmap.json"
+  "refmap": "mixins.viaforge.refmap.json"
 }
diff --git a/viaforge-mc1201/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1201/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ServerboundPackets1_19_4;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -35,9 +33,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge1194 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge1194() {
+    public ViaForge() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1201/src/main/resources/mixins.viaforge.json b/viaforge-mc1201/src/main/resources/mixins.viaforge.json
@@ -20,5 +20,5 @@
   "injectors": {
     "defaultRequire": 1
   },
-  "refmap": "mixins.viaforge-mc1194.refmap.json"
+  "refmap": "mixins.viaforge.refmap.json"
 }
diff --git a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPackets1_20_3;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -35,9 +33,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge1204 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge1204() {
+    public ViaForge() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1204/src/main/resources/mixins.viaforge-mc1204.json b/viaforge-mc1204/src/main/resources/mixins.viaforge-mc1204.json
diff --git a/viaforge-mc1204/src/main/resources/mixins.viaforge.json b/viaforge-mc1204/src/main/resources/mixins.viaforge.json
@@ -0,0 +1,24 @@
+{
+  "required": true,
+  "minVersion": "0.7.5",
+  "compatibilityLevel": "JAVA_8",
+  "package": "de.florianmichael.viaforge.mixin",
+  "client": [
+    "MixinClientPacketListener",
+    "MixinDebugScreenOverlay",
+    "MixinDirectJoinServerScreen",
+    "MixinEditServerScreen",
+    "MixinJoinMultiplayerScreen",
+    "MixinServerData",
+    "MixinTitleScreen",
+    "connect.MixinClientHandshakePacketListenerImpl",
+    "connect.MixinConnection",
+    "connect.MixinConnection_1",
+    "connect.MixinConnectScreen_1",
+    "connect.MixinServerStatusPinger"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "refmap": "mixins.viaforge.refmap.json"
+}
diff --git a/viaforge-mc1206/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc1206/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -36,9 +34,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge1206 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge1206() {
+    public ViaForge() {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1206/src/main/java/de/florianmichael/viaforge/ViaNeoForge.java b/viaforge-mc1206/src/main/java/de/florianmichael/viaforge/ViaNeoForge.java
@@ -18,8 +18,6 @@
 
 package de.florianmichael.viaforge;
 
-import com.viaversion.viaversion.api.protocol.packet.ServerboundPacketType;
-import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ServerboundPackets1_20_5;
 import de.florianmichael.viaforge.common.ViaForgeCommon;
 import de.florianmichael.viaforge.common.platform.VFPlatform;
 import de.florianmichael.viaforge.provider.ViaForgeGameProfileFetcher;
@@ -36,9 +34,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaNeoForge1206 implements VFPlatform {
+public class ViaNeoForge implements VFPlatform {
 
-    public ViaNeoForge1206(IEventBus modEventBus) {
+    public ViaNeoForge(IEventBus modEventBus) {
         modEventBus.addListener(this::onInit);
     }
 
diff --git a/viaforge-mc1206/src/main/resources/mixins.viaforge.json b/viaforge-mc1206/src/main/resources/mixins.viaforge.json
diff --git a/viaforge-mc12111/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc12111/src/main/java/de/florianmichael/viaforge/ViaForge.java
@@ -34,9 +34,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaForge12111 implements VFPlatform {
+public class ViaForge implements VFPlatform {
 
-    public ViaForge12111(final FMLJavaModLoadingContext context) {
+    public ViaForge(final FMLJavaModLoadingContext context) {
         FMLCommonSetupEvent.getBus(context.getModBusGroup()).addListener(this::onInit);
     }
 
diff --git a/viaforge-mc12111/src/main/java/de/florianmichael/viaforge/ViaNeoForge.java b/viaforge-mc12111/src/main/java/de/florianmichael/viaforge/ViaNeoForge.java
@@ -34,9 +34,9 @@
 import java.util.function.Supplier;
 
 @Mod("viaforge")
-public class ViaNeoForge12111 implements VFPlatform {
+public class ViaNeoForge implements VFPlatform {
 
-    public ViaNeoForge12111(IEventBus modEventBus) {
+    public ViaNeoForge(IEventBus modEventBus) {
         modEventBus.addListener(this::onInit);
     }
 
diff --git a/viaforge-mc12111/src/main/resources/META-INF/neoforge.mods.toml b/viaforge-mc12111/src/main/resources/META-INF/neoforge.mods.toml
@@ -17,4 +17,4 @@ authors="FlorianMichael/EnZaXD"
 description="{description}"
 
 [[mixins]]
-config = "mixins.viaforge-mc12111.json"
+config = "mixins.viaforge.json"
diff --git a/viaforge-mc12111/src/main/resources/mixins.viaforge.json b/viaforge-mc12111/src/main/resources/mixins.viaforge.json
diff --git a/viaforge-mc189/build.gradle b/viaforge-mc189/build.gradle
diff --git a/viaforge-mc189/src/main/java/de/florianmichael/viaforge/ViaForge.java b/viaforge-mc189/src/main/java/de/florianmichael/viaforge/ViaForge.java
diff --git a/viaforge-mc189/src/main/java/de/florianmichael/viaforge/mixin/MixinLoader.java b/viaforge-mc189/src/main/java/de/florianmichael/viaforge/mixin/MixinLoader.java
diff --git a/viaforge-mc189/src/main/resources/mixins.viaforge.json b/viaforge-mc189/src/main/resources/mixins.viaforge.json

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class MixinLoader implements IFMLLoadingPlugin {`
`29`	`29`
`30`	`30`	`public MixinLoader() {`
`31`	`31`	`MixinBootstrap.init();`
`32`		`- Mixins.addConfiguration("mixins.viaforge-mc1122.json");`
	`32`	`+ Mixins.addConfiguration("mixins.viaforge.json");`
`33`	`33`	`MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT);`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`"injectors": {`
`21`	`21`	`"defaultRequire": 1`
`22`	`22`	`},`
`23`		`- "refmap": "mixins.viaforge-mc1165.refmap.json"`
	`23`	`+ "refmap": "mixins.viaforge.refmap.json"`
`24`	`24`	`}`