From 2ec3c000d520503d8e24eecc5cb43cbd7bc087f1 Mon Sep 17 00:00:00 2001 From: TonimatasDEV Date: Tue, 7 Nov 2023 00:42:05 +0100 Subject: [PATCH] Fix Pluto/Krypton compat and 1.2.0 --- .../packetfixerforge/mixin/MixinConfigPlugin.java | 6 +++--- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/MixinConfigPlugin.java b/forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/MixinConfigPlugin.java index 42b0695..5c2974f 100644 --- a/forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/MixinConfigPlugin.java +++ b/forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/MixinConfigPlugin.java @@ -24,12 +24,12 @@ public String getRefMapperConfig() { @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { boolean connectivity = FMLLoader.getLoadingModList().getModFileById("connectivity") != null; - boolean krypton = FMLLoader.getLoadingModList().getModFileById("krypton") != null; + boolean krypton = FMLLoader.getLoadingModList().getModFileById("krypton") != null || FMLLoader.getLoadingModList().getModFileById("pluto") != null; if (mixinClassName.equalsIgnoreCase("net.tonimatasdev.packetfixerforge.mixin.CompressionDecoderMixin")) return !connectivity; if (mixinClassName.equalsIgnoreCase("net.tonimatasdev.packetfixerforge.mixin.compat.connectivity.CompressionDecoderMixin")) return connectivity; - if (mixinClassName.equalsIgnoreCase("net.tonimatasdev.packetfixerfabric.mixin.SplitterHandlerMixin") || mixinClassName.equalsIgnoreCase("net.tonimatasdev.packetfixerfabric.mixin.SizePrependerMixin")) { - LogUtils.getLogger().warn("For can't fit X into 3 error fix. Delete Krypton."); + if (mixinClassName.equalsIgnoreCase("net.tonimatasdev.packetfixerforge.mixin.Varint21FrameDecoderMixin") || mixinClassName.equalsIgnoreCase("net.tonimatasdev.packetfixerforge.mixin.Varint21LengthFieldPrependerMixin")) { + LogUtils.getLogger().warn("For can't fit X into 3 error fix. Delete Krypton or Pluto."); return !krypton; } diff --git a/gradle.properties b/gradle.properties index 3561ff8..4bd1ec6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Mod Properties -modVersion=1.1.9 +modVersion=1.2.0 minecraftVersion=1.20.2 forgeVersion=48.0.34