diff --git a/gradle.properties b/gradle.properties index 989614d..d30634c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 +minecraft_version=1.19.4 +yarn_mappings=1.19.4+build.2 loader_version=0.15.3 # Mod Properties -mod_version=4.0.3-beta.2 +mod_version=4.0.3+1.19.4 maven_group=dev.louis archives_base_name=Nebula # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.91.2+1.20.4 +fabric_version=0.87.2+1.19.4 diff --git a/src/main/java/dev/louis/nebula/NebulaClient.java b/src/main/java/dev/louis/nebula/NebulaClient.java index c962fc5..a0e0605 100644 --- a/src/main/java/dev/louis/nebula/NebulaClient.java +++ b/src/main/java/dev/louis/nebula/NebulaClient.java @@ -8,13 +8,7 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.util.Identifier; -import java.lang.reflect.InvocationTargetException; -import java.util.function.Consumer; -import java.util.function.Supplier; - public class NebulaClient implements ClientModInitializer { - public static final Consumer retainer = getConsumer("retain", () -> PacketByteBuf::retain); - public static final Consumer releaser = getConsumer("release", () -> PacketByteBuf::release); @Override public void onInitializeClient() { @@ -30,32 +24,14 @@ private void registerPacketReceivers() { } public static void runSyncWithBuf(MinecraftClient client, PacketByteBuf buf, Runnable runnable) { - retainer.accept(buf); + buf.retain(); client.executeSync(() -> { runnable.run(); - releaser.accept(buf); + buf.release(); }); } private void registerReceiver(Identifier id, ClientPlayNetworking.PlayChannelHandler playChannelHandler) { ClientPlayNetworking.registerGlobalReceiver(id, playChannelHandler); } - - private static Consumer getConsumer(String methodName, Supplier> defaultConsumer) { - try { - //Needed to throw NoSuchMethodException if the method doesn't exist. - PacketByteBuf.class.getMethod(methodName); - return buf -> invoke(buf, methodName); - } catch (NoSuchMethodException e) { - return defaultConsumer.get(); - } - } - - private static void invoke(PacketByteBuf buf, String methodName) { - try { - PacketByteBuf.class.getMethod(methodName).invoke(buf); - } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { - throw new RuntimeException(e); - } - } }