From eb00a3ec26cadc963b24e8a9e54066ddee1b5344 Mon Sep 17 00:00:00 2001 From: hypherionmc Date: Mon, 22 Jul 2024 21:12:08 +0200 Subject: [PATCH] [BUG] Fix NeoForge crash when Vanish is installed --- 1.18.2/gradle.properties | 2 +- 1.19.2/gradle.properties | 2 +- 1.19.3/gradle.properties | 2 +- 1.20.2/gradle.properties | 2 +- .../src/main/java/com/hypherionmc/craterlib/CraterLib.java | 2 +- 1.20.4/gradle.properties | 2 +- 1.20/gradle.properties | 2 +- .../src/main/java/com/hypherionmc/craterlib/CraterLib.java | 2 +- 1.21/gradle.properties | 2 +- commit.sha | 2 +- .../main/java/com/hypherionmc/craterlib/CraterLib.java.patch | 2 +- .../main/java/com/hypherionmc/craterlib/CraterLib.java.patch | 2 +- .../main/java/com/hypherionmc/craterlib/CraterLib.java.patch | 2 +- .../main/java/com/hypherionmc/craterlib/CraterLib.java.patch | 2 +- .../main/java/com/hypherionmc/craterlib/CraterLib.java.patch | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/1.18.2/gradle.properties b/1.18.2/gradle.properties index 085f017..7ee9191 100644 --- a/1.18.2/gradle.properties +++ b/1.18.2/gradle.properties @@ -2,7 +2,7 @@ version_major=2 version_minor=0 version_patch=2 -version_build=0 +version_build=1 #Mod mod_author=HypherionSA diff --git a/1.19.2/gradle.properties b/1.19.2/gradle.properties index 8bbdd16..58baf39 100644 --- a/1.19.2/gradle.properties +++ b/1.19.2/gradle.properties @@ -2,7 +2,7 @@ version_major=2 version_minor=0 version_patch=2 -version_build=0 +version_build=1 #Mod mod_author=HypherionSA diff --git a/1.19.3/gradle.properties b/1.19.3/gradle.properties index 949af97..d95dffc 100644 --- a/1.19.3/gradle.properties +++ b/1.19.3/gradle.properties @@ -2,7 +2,7 @@ version_major=2 version_minor=0 version_patch=2 -version_build=0 +version_build=1 #Mod mod_author=HypherionSA diff --git a/1.20.2/gradle.properties b/1.20.2/gradle.properties index 72e3903..006bc65 100644 --- a/1.20.2/gradle.properties +++ b/1.20.2/gradle.properties @@ -2,7 +2,7 @@ version_major=2 version_minor=0 version_patch=2 -version_build=0 +version_build=1 #Mod mod_author=HypherionSA diff --git a/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java b/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java index 2ae793b..6f8c155 100644 --- a/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java +++ b/1.20.4/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java @@ -30,7 +30,7 @@ public class CraterLib { handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER); if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) { - eventBus.register(new Vanish()); + NeoForge.EVENT_BUS.register(new Vanish()); } } diff --git a/1.20.4/gradle.properties b/1.20.4/gradle.properties index 1883f26..2ff4166 100644 --- a/1.20.4/gradle.properties +++ b/1.20.4/gradle.properties @@ -2,7 +2,7 @@ version_major=2 version_minor=0 version_patch=2 -version_build=0 +version_build=1 #Mod mod_author=HypherionSA diff --git a/1.20/gradle.properties b/1.20/gradle.properties index 7b6d236..4bf6887 100644 --- a/1.20/gradle.properties +++ b/1.20/gradle.properties @@ -2,7 +2,7 @@ version_major=2 version_minor=0 version_patch=2 -version_build=0 +version_build=1 #Mod mod_author=HypherionSA diff --git a/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java b/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java index 7e2c82f..566e4bf 100644 --- a/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java +++ b/1.21/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java @@ -27,7 +27,7 @@ public class CraterLib { handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER); if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) { - eventBus.register(new Vanish()); + NeoForge.EVENT_BUS.register(new Vanish()); } } diff --git a/1.21/gradle.properties b/1.21/gradle.properties index 4a66e42..45d6732 100644 --- a/1.21/gradle.properties +++ b/1.21/gradle.properties @@ -2,7 +2,7 @@ version_major=2 version_minor=0 version_patch=2 -version_build=0 +version_build=1 #Mod mod_author=HypherionSA diff --git a/commit.sha b/commit.sha index a680613..25ea970 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -df50b0e82d36d510560d802628434055694d9a04 \ No newline at end of file +c8cfa985b1c8a74a42eab0d51db54add654d1f97 \ No newline at end of file diff --git a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch index 896a96b..0dd9521 100644 --- a/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch +++ b/patches/1.18.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch @@ -30,7 +30,7 @@ - handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER); - - if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) { -- eventBus.register(new Vanish()); +- NeoForge.EVENT_BUS.register(new Vanish()); - } - } - diff --git a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch index 896a96b..0dd9521 100644 --- a/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch +++ b/patches/1.19.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch @@ -30,7 +30,7 @@ - handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER); - - if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) { -- eventBus.register(new Vanish()); +- NeoForge.EVENT_BUS.register(new Vanish()); - } - } - diff --git a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch index 896a96b..0dd9521 100644 --- a/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch +++ b/patches/1.19.3/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch @@ -30,7 +30,7 @@ - handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER); - - if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) { -- eventBus.register(new Vanish()); +- NeoForge.EVENT_BUS.register(new Vanish()); - } - } - diff --git a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch index 896a96b..0dd9521 100644 --- a/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch +++ b/patches/1.20.2/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch @@ -30,7 +30,7 @@ - handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER); - - if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) { -- eventBus.register(new Vanish()); +- NeoForge.EVENT_BUS.register(new Vanish()); - } - } - diff --git a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch index 896a96b..0dd9521 100644 --- a/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch +++ b/patches/1.20/NeoForge/src/main/java/com/hypherionmc/craterlib/CraterLib.java.patch @@ -30,7 +30,7 @@ - handler = new CraterNeoForgeNetworkHandler(FMLLoader.getDist().isClient() ? PacketSide.CLIENT : PacketSide.SERVER); - - if (ModloaderEnvironment.INSTANCE.isModLoaded("vmod")) { -- eventBus.register(new Vanish()); +- NeoForge.EVENT_BUS.register(new Vanish()); - } - } -