From 9ba5f28ebd98cc6e6d7ab10d826ae1dadf045b07 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Sun, 28 Apr 2024 22:15:05 +0200 Subject: [PATCH] Rename mixin references as well --- .../viaforge/{ViaForge112.java => ViaForge1122.java} | 2 +- .../de/florianmichael/viaforge/mixin/MixinLoader.java | 2 +- ...viaforge-mc112.json => mixins.viaforge-mc1122.json} | 2 +- .../viaforge/{ViaForge116.java => ViaForge1165.java} | 4 ++-- ...viaforge-mc116.json => mixins.viaforge-mc1165.json} | 2 +- .../viaforge/{ViaForge117.java => ViaForge1171.java} | 4 ++-- ...viaforge-mc117.json => mixins.viaforge-mc1171.json} | 10 ++++------ .../viaforge/{ViaForge118.java => ViaForge1182.java} | 4 ++-- .../src/main/resources/mixins.viaforge-mc1182.json | 2 +- .../viaforge/{ViaForge119.java => ViaForge1194.java} | 4 ++-- .../src/main/resources/mixins.viaforge-mc1194.json | 2 +- .../viaforge/{ViaForge120.java => ViaForge1204.java} | 4 ++-- ...viaforge-mc120.json => mixins.viaforge-mc1204.json} | 2 +- 13 files changed, 21 insertions(+), 23 deletions(-) rename viaforge-mc1122/src/main/java/de/florianmichael/viaforge/{ViaForge112.java => ViaForge1122.java} (97%) rename viaforge-mc1122/src/main/resources/{mixins.viaforge-mc112.json => mixins.viaforge-mc1122.json} (91%) rename viaforge-mc1165/src/main/java/de/florianmichael/viaforge/{ViaForge116.java => ViaForge1165.java} (96%) rename viaforge-mc1165/src/main/resources/{mixins.viaforge-mc116.json => mixins.viaforge-mc1165.json} (91%) rename viaforge-mc1171/src/main/java/de/florianmichael/viaforge/{ViaForge117.java => ViaForge1171.java} (96%) rename viaforge-mc1171/src/main/resources/{mixins.viaforge-mc117.json => mixins.viaforge-mc1171.json} (85%) rename viaforge-mc1182/src/main/java/de/florianmichael/viaforge/{ViaForge118.java => ViaForge1182.java} (96%) rename viaforge-mc1194/src/main/resources/mixins.viaforge-mc119.json => viaforge-mc1182/src/main/resources/mixins.viaforge-mc1182.json (91%) rename viaforge-mc1194/src/main/java/de/florianmichael/viaforge/{ViaForge119.java => ViaForge1194.java} (96%) rename viaforge-mc1182/src/main/resources/mixins.viaforge-mc118.json => viaforge-mc1194/src/main/resources/mixins.viaforge-mc1194.json (91%) rename viaforge-mc1204/src/main/java/de/florianmichael/viaforge/{ViaForge120.java => ViaForge1204.java} (96%) rename viaforge-mc1204/src/main/resources/{mixins.viaforge-mc120.json => mixins.viaforge-mc1204.json} (91%) diff --git a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge112.java b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge1122.java similarity index 97% rename from viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge112.java rename to viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge1122.java index 2209940..a9880b3 100644 --- a/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge112.java +++ b/viaforge-mc1122/src/main/java/de/florianmichael/viaforge/ViaForge1122.java @@ -32,7 +32,7 @@ import java.io.File; import java.util.function.Supplier; @Mod(modid = "viaforge") -public class ViaForge112 implements VFPlatform { +public class ViaForge1122 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 index e491c6d..ddd2cf8 100644 --- 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-mc112.json"); + Mixins.addConfiguration("mixins.viaforge-mc1122.json"); MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT); } diff --git a/viaforge-mc1122/src/main/resources/mixins.viaforge-mc112.json b/viaforge-mc1122/src/main/resources/mixins.viaforge-mc1122.json similarity index 91% rename from viaforge-mc1122/src/main/resources/mixins.viaforge-mc112.json rename to viaforge-mc1122/src/main/resources/mixins.viaforge-mc1122.json index 00ac905..b6d2ace 100644 --- a/viaforge-mc1122/src/main/resources/mixins.viaforge-mc112.json +++ b/viaforge-mc1122/src/main/resources/mixins.viaforge-mc1122.json @@ -3,7 +3,7 @@ "minVersion": "0.7.5", "compatibilityLevel": "JAVA_8", "package": "de.florianmichael.viaforge.mixin.impl", - "refmap": "mixins.viaforge-mc112.refmap.json", + "refmap": "mixins.viaforge-mc1122.refmap.json", "client": [ "MixinGuiConnecting_1", "MixinGuiMainMenu", diff --git a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge116.java b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge1165.java similarity index 96% rename from viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge116.java rename to viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge1165.java index 162daef..499b427 100644 --- a/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge116.java +++ b/viaforge-mc1165/src/main/java/de/florianmichael/viaforge/ViaForge1165.java @@ -33,9 +33,9 @@ import java.io.File; import java.util.function.Supplier; @Mod("viaforge") -public class ViaForge116 implements VFPlatform { +public class ViaForge1165 implements VFPlatform { - public ViaForge116() { + public ViaForge1165() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit); } diff --git a/viaforge-mc1165/src/main/resources/mixins.viaforge-mc116.json b/viaforge-mc1165/src/main/resources/mixins.viaforge-mc1165.json similarity index 91% rename from viaforge-mc1165/src/main/resources/mixins.viaforge-mc116.json rename to viaforge-mc1165/src/main/resources/mixins.viaforge-mc1165.json index 5d2b000..e27effe 100644 --- a/viaforge-mc1165/src/main/resources/mixins.viaforge-mc116.json +++ b/viaforge-mc1165/src/main/resources/mixins.viaforge-mc1165.json @@ -20,5 +20,5 @@ "injectors": { "defaultRequire": 1 }, - "refmap": "mixins.viaforge-mc116.refmap.json" + "refmap": "mixins.viaforge-mc1165.refmap.json" } diff --git a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge117.java b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge1171.java similarity index 96% rename from viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge117.java rename to viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge1171.java index 4070ad4..871e038 100644 --- a/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge117.java +++ b/viaforge-mc1171/src/main/java/de/florianmichael/viaforge/ViaForge1171.java @@ -33,9 +33,9 @@ import java.io.File; import java.util.function.Supplier; @Mod("viaforge") -public class ViaForge117 implements VFPlatform { +public class ViaForge1171 implements VFPlatform { - public ViaForge117() { + public ViaForge1171() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit); } diff --git a/viaforge-mc1171/src/main/resources/mixins.viaforge-mc117.json b/viaforge-mc1171/src/main/resources/mixins.viaforge-mc1171.json similarity index 85% rename from viaforge-mc1171/src/main/resources/mixins.viaforge-mc117.json rename to viaforge-mc1171/src/main/resources/mixins.viaforge-mc1171.json index 877f780..8f8cd90 100644 --- a/viaforge-mc1171/src/main/resources/mixins.viaforge-mc117.json +++ b/viaforge-mc1171/src/main/resources/mixins.viaforge-mc1171.json @@ -14,14 +14,12 @@ "MixinServerData", "MixinServerStatusPinger", "MixinTitleScreen", - "fixes.MixinLocalPlayer" + "fixes.MixinLocalPlayer", + "MixinConnection_1", + "MixinConnectScreen_1" ], "injectors": { "defaultRequire": 1 }, - "refmap": "mixins.viaforge-mc117.refmap.json", - "mixins": [ - "MixinConnection_1", - "MixinConnectScreen_1" - ] + "refmap": "mixins.viaforge-mc1171.refmap.json" } diff --git a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge118.java b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge1182.java similarity index 96% rename from viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge118.java rename to viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge1182.java index ef17ea4..6d74066 100644 --- a/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge118.java +++ b/viaforge-mc1182/src/main/java/de/florianmichael/viaforge/ViaForge1182.java @@ -33,9 +33,9 @@ import java.io.File; import java.util.function.Supplier; @Mod("viaforge") -public class ViaForge118 implements VFPlatform { +public class ViaForge1182 implements VFPlatform { - public ViaForge118() { + public ViaForge1182() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit); } diff --git a/viaforge-mc1194/src/main/resources/mixins.viaforge-mc119.json b/viaforge-mc1182/src/main/resources/mixins.viaforge-mc1182.json similarity index 91% rename from viaforge-mc1194/src/main/resources/mixins.viaforge-mc119.json rename to viaforge-mc1182/src/main/resources/mixins.viaforge-mc1182.json index de5b42a..a1e3831 100644 --- a/viaforge-mc1194/src/main/resources/mixins.viaforge-mc119.json +++ b/viaforge-mc1182/src/main/resources/mixins.viaforge-mc1182.json @@ -20,5 +20,5 @@ "injectors": { "defaultRequire": 1 }, - "refmap": "mixins.viaforge-mc119.refmap.json" + "refmap": "mixins.viaforge-mc1182.refmap.json" } diff --git a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge119.java b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge1194.java similarity index 96% rename from viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge119.java rename to viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge1194.java index dde7850..c40e436 100644 --- a/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge119.java +++ b/viaforge-mc1194/src/main/java/de/florianmichael/viaforge/ViaForge1194.java @@ -33,9 +33,9 @@ import java.io.File; import java.util.function.Supplier; @Mod("viaforge") -public class ViaForge119 implements VFPlatform { +public class ViaForge1194 implements VFPlatform { - public ViaForge119() { + public ViaForge1194() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit); } diff --git a/viaforge-mc1182/src/main/resources/mixins.viaforge-mc118.json b/viaforge-mc1194/src/main/resources/mixins.viaforge-mc1194.json similarity index 91% rename from viaforge-mc1182/src/main/resources/mixins.viaforge-mc118.json rename to viaforge-mc1194/src/main/resources/mixins.viaforge-mc1194.json index 2115676..46b4b57 100644 --- a/viaforge-mc1182/src/main/resources/mixins.viaforge-mc118.json +++ b/viaforge-mc1194/src/main/resources/mixins.viaforge-mc1194.json @@ -20,5 +20,5 @@ "injectors": { "defaultRequire": 1 }, - "refmap": "mixins.viaforge-mc118.refmap.json" + "refmap": "mixins.viaforge-mc1194.refmap.json" } diff --git a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge120.java b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge1204.java similarity index 96% rename from viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge120.java rename to viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge1204.java index d2446d8..d1f28c7 100644 --- a/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge120.java +++ b/viaforge-mc1204/src/main/java/de/florianmichael/viaforge/ViaForge1204.java @@ -33,9 +33,9 @@ import java.io.File; import java.util.function.Supplier; @Mod("viaforge") -public class ViaForge120 implements VFPlatform { +public class ViaForge1204 implements VFPlatform { - public ViaForge120() { + public ViaForge1204() { FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onInit); } diff --git a/viaforge-mc1204/src/main/resources/mixins.viaforge-mc120.json b/viaforge-mc1204/src/main/resources/mixins.viaforge-mc1204.json similarity index 91% rename from viaforge-mc1204/src/main/resources/mixins.viaforge-mc120.json rename to viaforge-mc1204/src/main/resources/mixins.viaforge-mc1204.json index 71be943..40289cd 100644 --- a/viaforge-mc1204/src/main/resources/mixins.viaforge-mc120.json +++ b/viaforge-mc1204/src/main/resources/mixins.viaforge-mc1204.json @@ -19,5 +19,5 @@ "injectors": { "defaultRequire": 1 }, - "refmap": "mixins.viaforge-mc120.refmap.json" + "refmap": "mixins.viaforge-mc1204.refmap.json" }