Update to NeoForge 20.4.70-beta

embeddedt · embeddedt · commit dcee8b416953 · 2023-12-31T21:07:32.000-05:00
diff --git a/common/src/main/java/org/embeddedt/modernfix/packet/EntityIDSyncPacket.java b/common/src/main/java/org/embeddedt/modernfix/packet/EntityIDSyncPacket.java
@@ -2,15 +2,18 @@
 
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.network.syncher.EntityDataAccessor;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Entity;
 import org.embeddedt.modernfix.ModernFix;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.*;
 
-public class EntityIDSyncPacket {
+public class EntityIDSyncPacket implements CustomPacketPayload {
+    public static final ResourceLocation ID = new ResourceLocation(ModernFix.MODID, "entity_id_sync");
     private Map<Class<? extends Entity>, List<Pair<String, Integer>>> map;
 
     public EntityIDSyncPacket(Map<Class<? extends Entity>, List<Pair<String, Integer>>> map) {
@@ -21,11 +24,8 @@ public Map<Class<? extends Entity>, List<Pair<String, Integer>>> getFieldInfo()
         return this.map;
     }
 
-    public EntityIDSyncPacket() {
-        this.map = new HashMap<>();
-    }
-
-    public void serialize(FriendlyByteBuf buf) {
+    @Override
+    public void write(FriendlyByteBuf buf) {
         buf.writeVarInt(map.keySet().size());
         for(Map.Entry<Class<? extends Entity>, List<Pair<String, Integer>>> entry : map.entrySet()) {
             buf.writeUtf(entry.getKey().getName());
@@ -38,8 +38,8 @@ public void serialize(FriendlyByteBuf buf) {
     }
 
     @SuppressWarnings("unchecked")
-    public static EntityIDSyncPacket deserialize(FriendlyByteBuf buf) {
-        EntityIDSyncPacket self = new EntityIDSyncPacket();
+    public EntityIDSyncPacket(FriendlyByteBuf buf) {
+        EntityIDSyncPacket self = this;
         int numEntityClasses = buf.readVarInt();
         for(int i = 0; i < numEntityClasses; i++) {
             String clzName = buf.readUtf();
@@ -73,6 +73,10 @@ public static EntityIDSyncPacket deserialize(FriendlyByteBuf buf) {
                 ModernFix.LOGGER.error("Error deserializing packet", e);
             }
         }
-        return self;
+    }
+
+    @Override
+    public ResourceLocation id() {
+        return ID;
     }
 }
diff --git a/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java b/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java
@@ -4,6 +4,7 @@
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.client.searchtree.SearchRegistry;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.ItemStack;
@@ -39,7 +40,7 @@ public interface ModernFixPlatformHooks {
 
     Path getGameDirectory();
 
-    void sendPacket(ServerPlayer player, Object packet);
+    void sendPacket(ServerPlayer player, CustomPacketPayload packet);
 
     Multimap<String, String> getCustomModOptions();
 
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java b/fabric/src/main/java/org/embeddedt/modernfix/platform/fabric/ModernFixPlatformHooksImpl.java
@@ -11,6 +11,7 @@
 import net.fabricmc.loader.api.metadata.ModMetadata;
 import net.minecraft.client.searchtree.SearchRegistry;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.CreativeModeTabs;
@@ -72,7 +73,7 @@ public Path getGameDirectory() {
         return FabricLoader.getInstance().getGameDir();
     }
 
-    public void sendPacket(ServerPlayer player, Object packet) {
+    public void sendPacket(ServerPlayer player, CustomPacketPayload packet) {
         //PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), packet);
     }
 
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ mixinextras_version=0.3.2
 mod_id=modernfix
 minecraft_version=1.20.4
 enabled_platforms=fabric,neoforge
-forge_version=20.4.22-beta
+forge_version=20.4.70-beta
 # parchment_version=2023.07.09
 refined_storage_version=4392788
 jei_version=16.0.0.28
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java
@@ -1,15 +1,9 @@
 package org.embeddedt.modernfix.neoforge.mixin.bugfix.recipe_book_type_desync;
 
-import com.llamalad7.mixinextras.sugar.Local;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.stats.RecipeBookSettings;
 import net.minecraft.world.inventory.RecipeBookType;
-import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.embeddedt.modernfix.neoforge.packet.NetworkUtils;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -36,12 +30,14 @@ public class RecipeBookSettingsMixin {
         }
         mfix$maxVanillaOrdinal = ord;
     }
+    /*
     @Redirect(method = "read(Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/stats/RecipeBookSettings;", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/FriendlyByteBuf;readBoolean()Z"))
     private static boolean useDefaultBooleanIfVanilla(FriendlyByteBuf buf, @Local(ordinal = 0) RecipeBookType type) {
-        if(type.ordinal() >= (mfix$maxVanillaOrdinal + 1) && NetworkUtils.isCurrentlyVanilla) {
+        if(type.ordinal() >= (mfix$maxVanillaOrdinal + 1)) {
             ModernFix.LOGGER.warn("Not reading recipe book data for type '{}' as we are using vanilla connection", type.name());
             return false; // skip actually reading buffer
         }
         return buf.readBoolean();
     }
+    */
 }
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapMixin.java
@@ -1,7 +1,6 @@
 package org.embeddedt.modernfix.neoforge.mixin.core;
 
 import net.minecraft.server.Bootstrap;
-import net.neoforged.neoforge.network.NetworkConstants;
 import org.embeddedt.modernfix.util.TimeFormatter;
 import org.slf4j.Logger;
 import org.spongepowered.asm.mixin.Final;
@@ -25,10 +24,4 @@ private static void doModernFixBootstrap(CallbackInfo ci) {
             LOGGER.info("ModernFix reached bootstrap stage ({} after launch)", TimeFormatter.formatNanos(ManagementFactory.getRuntimeMXBean().getUptime() * 1000L * 1000L));
         }
     }
-
-    /* for https://github.com/MinecraftForge/MinecraftForge/issues/9505 */
-    @Inject(method = "bootStrap", at = @At("RETURN"))
-    private static void doClassloadHack(CallbackInfo ci) {
-        NetworkConstants.init();
-    }
 }
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/NetworkHooksMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/NetworkHooksMixin.java
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/NetworkUtils.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/NetworkUtils.java
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/PacketHandler.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/PacketHandler.java
@@ -1,33 +1,24 @@
 package org.embeddedt.modernfix.neoforge.packet;
 
-import net.minecraft.resources.ResourceLocation;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.fml.DistExecutor;
-import net.neoforged.neoforge.network.NetworkEvent;
-import net.neoforged.neoforge.network.NetworkRegistry;
-import net.neoforged.neoforge.network.simple.SimpleChannel;
+import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlerEvent;
+import net.neoforged.neoforge.network.handling.PlayPayloadContext;
+import net.neoforged.neoforge.network.registration.IPayloadRegistrar;
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.packet.EntityIDSyncPacket;
 
 public class PacketHandler {
-    private static final String PROTOCOL_VERSION = "1";
-    public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel(
-            new ResourceLocation(ModernFix.MODID, "main"),
-            () -> PROTOCOL_VERSION,
-            NetworkRegistry.acceptMissingOr(PROTOCOL_VERSION),
-            NetworkRegistry.acceptMissingOr(PROTOCOL_VERSION)
-    );
+    private static void registerPackets(final RegisterPayloadHandlerEvent event) {
+        final IPayloadRegistrar registrar = event.registrar(ModernFix.MODID).optional();
+        registrar.play(EntityIDSyncPacket.ID, EntityIDSyncPacket::new, PacketHandler::handleSyncPacket);
+    }
 
     public static void register() {
-        int id = 1;
-        INSTANCE.registerMessage(id++, EntityIDSyncPacket.class, EntityIDSyncPacket::serialize, EntityIDSyncPacket::deserialize, PacketHandler::handleSyncPacket);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(PacketHandler::registerPackets);
     }
 
-    private static void handleSyncPacket(EntityIDSyncPacket packet, NetworkEvent.Context contextSupplier) {
-        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> {
-            contextSupplier.enqueueWork(() -> ModernFixClient.handleEntityIDSync(packet));
-            contextSupplier.setPacketHandled(true);
-        });
+    private static void handleSyncPacket(EntityIDSyncPacket packet, PlayPayloadContext context) {
+        context.workHandler().execute(() -> ModernFixClient.handleEntityIDSync(packet));
     }
 }
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java b/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java
@@ -5,6 +5,7 @@
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.client.searchtree.SearchRegistry;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.CreativeModeTab;
@@ -87,8 +88,8 @@ public Path getGameDirectory() {
         return FMLPaths.GAMEDIR.get();
     }
 
-    public void sendPacket(ServerPlayer player, Object packet) {
-        PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), packet);
+    public void sendPacket(ServerPlayer player, CustomPacketPayload packet) {
+        PacketDistributor.PLAYER.with(player).send(packet);
     }
 
     public void injectPlatformSpecificHacks() {
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -45,24 +45,24 @@ Egregious, yet effective performance improvements for modern Minecraft
 # the modid of the dependency
 modId = "neoforge" #mandatory
 # Does this dependency have to exist - if not, ordering below must be specified
-mandatory = true #mandatory
+type = "required" #mandatory
 # The version range of the dependency
-versionRange = "[20.4.22-beta,)" #mandatory
+versionRange = "[20.4.70-beta,)" #mandatory
 # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
 ordering = "NONE"
 # Side this dependency is applied on - BOTH, CLIENT or SERVER
 side = "BOTH"
 # Here's another dependency
 [[dependencies.modernfix]]
 modId = "minecraft"
-mandatory = true
+type = "required"
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
 versionRange = "[1.20, 1.21)"
 ordering = "NONE"
 side = "BOTH"
 [[dependencies.modernfix]]
 modId = "jei"
-mandatory = false
+type = "optional"
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
 versionRange = "[13,)"
 ordering = "BEFORE"

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import net.fabricmc.loader.api.metadata.ModMetadata;`
`12`	`12`	`import net.minecraft.client.searchtree.SearchRegistry;`
`13`	`13`	`import net.minecraft.commands.CommandSourceStack;`
	`14`	`+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;`
`14`	`15`	`import net.minecraft.server.MinecraftServer;`
`15`	`16`	`import net.minecraft.server.level.ServerPlayer;`
`16`	`17`	`import net.minecraft.world.item.CreativeModeTabs;`
`@@ -72,7 +73,7 @@ public Path getGameDirectory() {`
`72`	`73`	`return FabricLoader.getInstance().getGameDir();`
`73`	`74`	`}`
`74`	`75`
`75`		`- public void sendPacket(ServerPlayer player, Object packet) {`
	`76`	`+ public void sendPacket(ServerPlayer player, CustomPacketPayload packet) {`
`76`	`77`	`//PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), packet);`
`77`	`78`	`}`
`78`	`79`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,9 @@`
`1`	`1`	`package org.embeddedt.modernfix.neoforge.mixin.bugfix.recipe_book_type_desync;`
`2`	`2`
`3`		`-import com.llamalad7.mixinextras.sugar.Local;`
`4`		`-import net.minecraft.network.FriendlyByteBuf;`
`5`	`3`	`import net.minecraft.stats.RecipeBookSettings;`
`6`	`4`	`import net.minecraft.world.inventory.RecipeBookType;`
`7`		`-import org.embeddedt.modernfix.ModernFix;`
`8`	`5`	`import org.embeddedt.modernfix.annotation.ClientOnlyMixin;`
`9`		`-import org.embeddedt.modernfix.neoforge.packet.NetworkUtils;`
`10`	`6`	`import org.spongepowered.asm.mixin.Mixin;`
`11`		`-import org.spongepowered.asm.mixin.injection.At;`
`12`		`-import org.spongepowered.asm.mixin.injection.Redirect;`
`13`	`7`
`14`	`8`	`import java.lang.reflect.Field;`
`15`	`9`	`import java.lang.reflect.Modifier;`
`@@ -36,12 +30,14 @@ public class RecipeBookSettingsMixin {`
`36`	`30`	`}`
`37`	`31`	`mfix$maxVanillaOrdinal = ord;`
`38`	`32`	`}`
	`33`	`+ /*`
`39`	`34`	`@Redirect(method = "read(Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/stats/RecipeBookSettings;", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/FriendlyByteBuf;readBoolean()Z"))`
`40`	`35`	`private static boolean useDefaultBooleanIfVanilla(FriendlyByteBuf buf, @Local(ordinal = 0) RecipeBookType type) {`
`41`		`- if(type.ordinal() >= (mfix$maxVanillaOrdinal + 1) && NetworkUtils.isCurrentlyVanilla) {`
	`36`	`+ if(type.ordinal() >= (mfix$maxVanillaOrdinal + 1)) {`
`42`	`37`	`ModernFix.LOGGER.warn("Not reading recipe book data for type '{}' as we are using vanilla connection", type.name());`
`43`	`38`	`return false; // skip actually reading buffer`
`44`	`39`	`}`
`45`	`40`	`return buf.readBoolean();`
`46`	`41`	`}`
	`42`	`+ */`
`47`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package org.embeddedt.modernfix.neoforge.mixin.core;`
`2`	`2`
`3`	`3`	`import net.minecraft.server.Bootstrap;`
`4`		`-import net.neoforged.neoforge.network.NetworkConstants;`
`5`	`4`	`import org.embeddedt.modernfix.util.TimeFormatter;`
`6`	`5`	`import org.slf4j.Logger;`
`7`	`6`	`import org.spongepowered.asm.mixin.Final;`
`@@ -25,10 +24,4 @@ private static void doModernFixBootstrap(CallbackInfo ci) {`
`25`	`24`	`LOGGER.info("ModernFix reached bootstrap stage ({} after launch)", TimeFormatter.formatNanos(ManagementFactory.getRuntimeMXBean().getUptime() * 1000L * 1000L));`
`26`	`25`	`}`
`27`	`26`	`}`
`28`		`-`
`29`		`- /* for https://github.com/MinecraftForge/MinecraftForge/issues/9505 */`
`30`		`- @Inject(method = "bootStrap", at = @At("RETURN"))`
`31`		`- private static void doClassloadHack(CallbackInfo ci) {`
`32`		`- NetworkConstants.init();`
`33`		`- }`
`34`	`27`	`}`