Update 1.2.50-alpha1 (Fix up entity registry)

Fox2Code · Fox2Code · commit 9600390063b5 · 2024-07-23T22:01:03.000+02:00
diff --git a/client/src/main/java/com/fox2code/foxloader/client/mixins/MixinNetClientHandler.java b/client/src/main/java/com/fox2code/foxloader/client/mixins/MixinNetClientHandler.java
@@ -8,6 +8,9 @@
 import com.fox2code.foxloader.registry.GameRegistryClient;
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.client.packets.*;
+import net.minecraft.src.game.entity.Entity;
+import net.minecraft.src.game.entity.EntityList;
+import net.minecraft.src.game.level.World;
 import net.minecraft.src.game.level.WorldClient;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -48,11 +51,19 @@ public void onHandlePickupSpawn(Packet21PickupSpawn packet21, CallbackInfo ci) {
 
     @Inject(method = "handleVehicleSpawn", at = @At("HEAD"))
     public void onHandleVehicleSpawn(Packet23VehicleSpawn packet23, CallbackInfo ci) {
+        packet23.type = GameRegistryClient.entityTypeIdMappingIn[packet23.type];
         if (packet23.type == 70) {
             packet23.payload0 = GameRegistryClient.itemIdMappingIn[packet23.payload0];
         }
     }
 
+    @Redirect(method = "handleMobSpawn", at = @At(value = "INVOKE", target =
+            "Lnet/minecraft/src/game/entity/EntityList;createEntity(ILnet/minecraft/src/game/level/World;)Lnet/minecraft/src/game/entity/Entity;"))
+    public Entity onHandleMobSpawn(int i, World world) {
+        if (i < 0) i += 256;
+        return EntityList.createEntity(GameRegistryClient.entityTypeIdMappingIn[i], world);
+    }
+
     @Inject(method = "handleMultiBlockChange", at = @At("HEAD"))
     public void onHandleMultiBlockChange(Packet52MultiBlockChange packet52, CallbackInfo ci) {
         short[] types = packet52.typeArray;
diff --git a/client/src/main/java/com/fox2code/foxloader/registry/GameRegistryClient.java b/client/src/main/java/com/fox2code/foxloader/registry/GameRegistryClient.java
@@ -53,6 +53,10 @@ private enum MappingState {
             blockIdMappingIn[i] = i;
             blockIdMappingOut[i] = i;
         }
+        for (short i = 0; i < MAXIMUM_ENTITY_TYPE_ID; i++) {
+            entityTypeIdMappingIn[i] = i;
+            entityTypeIdMappingOut[i] = i;
+        }
     }
 
     public static void initialize() {
@@ -406,6 +410,10 @@ public static void resetMappings(boolean singlePlayer) {
                 blockIdMappingIn[i] = i;
                 blockIdMappingOut[i] = i;
             }
+            for (short i = INITIAL_ENTITY_TYPE_ID; i < MAXIMUM_ENTITY_TYPE_ID; i++) {
+                entityTypeIdMappingIn[i] = i;
+                entityTypeIdMappingOut[i] = i;
+            }
         } else {
             if (idMappingState == MappingState.SERVER) return;
             idMappingState = MappingState.SERVER;
@@ -421,8 +429,13 @@ public static void resetMappings(boolean singlePlayer) {
                 itemIdMappingIn[i] = DEFAULT_FALLBACK_ITEM_ID;
                 itemIdMappingOut[i] = DEFAULT_FALLBACK_ITEM_ID;
             }
+            for (short i = INITIAL_ENTITY_TYPE_ID; i < MAXIMUM_ENTITY_TYPE_ID; i++) {
+                entityTypeIdMappingIn[i] = DEFAULT_FALLBACK_ENTITY_TYPE_ID;
+                entityTypeIdMappingOut[i] = DEFAULT_FALLBACK_ENTITY_TYPE_ID;
+            }
         }
         Arrays.fill(itemIdMappingInNames, null);
+        Arrays.fill(entityTypeIdMappingNames, null);
     }
 
     public static void initializeMappings(ServerHello serverHello) {
diff --git a/common/src/main/java/com/fox2code/foxloader/loader/ModLoader.java b/common/src/main/java/com/fox2code/foxloader/loader/ModLoader.java
@@ -32,7 +32,7 @@
 import java.util.logging.Logger;
 
 public class ModLoader extends Mod {
-    public static final boolean I_AM_EXPERIMENTAL = false; // Show text on client main menu
+    public static final boolean I_AM_EXPERIMENTAL = true; // Show text on client main menu
     public static final boolean TEST_MODE = Boolean.getBoolean("foxloader.test-mode");
     private static final String INJECT_MOD = System.getProperty("foxloader.inject-mod");
     public static final boolean DEV_MODE = Boolean.getBoolean("foxloader.dev-mode");
diff --git a/common/src/main/java/com/fox2code/foxloader/loader/packet/ServerHello.java b/common/src/main/java/com/fox2code/foxloader/loader/packet/ServerHello.java
@@ -47,7 +47,7 @@ public ServerHello(HashMap<String, RegistryEntry> registryEntries,
     @Override
     public void readData(DataInputStream inStream) throws IOException {
         int serverHelloVersion = inStream.readUnsignedShort();
-        int clientBackwardCompatibilityVersion = inStream.readUnsignedShort();
+        int clientBackwardCompatibilityVersion = serverHelloVersion == 0 ? 0 : inStream.readUnsignedShort();
         if (SERVER_HELLO_VERSION < clientBackwardCompatibilityVersion) {
             throw new IOException("Client is critically out of date, please update FoxLoader.");
         }
@@ -77,11 +77,11 @@ public void readData(DataInputStream inStream) throws IOException {
             this.entityTypeRegistryEntries = new HashMap<>();
             ModLoader.getModLoaderLogger().log(Level.WARNING, "Server Hello: Too few bytes to read entity data.");
         } else {
-            int entityEntries = inStream.readInt();
+            int entityEntries = inStream.readUnsignedShort();
             entityTypeRegistryEntries = new HashMap<>(entityEntries);
             while (entityEntries-- > 0) {
                 EntityTypeRegistryEntry entry = new EntityTypeRegistryEntry(
-                        inStream.readInt(), inStream.readInt(), inStream.readUTF());
+                        inStream.readUnsignedShort(), inStream.readUnsignedShort(), inStream.readUTF());
                 this.entityTypeRegistryEntries.put(entry.name, entry);
             }
         }
@@ -106,10 +106,10 @@ public void writeData(DataOutputStream outStream) throws IOException {
             outStream.writeUTF(metadata.getValue());
         }
 
-        outStream.writeInt(this.entityTypeRegistryEntries.size());
+        outStream.writeShort(this.entityTypeRegistryEntries.size());
         for (EntityTypeRegistryEntry entry : entityTypeRegistryEntries.values()) {
-            outStream.writeInt(entry.realId);
-            outStream.writeInt(entry.fallbackId);
+            outStream.writeShort(entry.realId);
+            outStream.writeShort(entry.fallbackId);
             outStream.writeUTF(entry.name);
         }
     }
diff --git a/common/src/main/java/com/fox2code/foxloader/registry/GameRegistry.java b/common/src/main/java/com/fox2code/foxloader/registry/GameRegistry.java
@@ -19,7 +19,7 @@ public abstract class GameRegistry {
     public static final int MAXIMUM_ITEM_ID = 8192; // Hard max: 31999
     public static final int INITIAL_ENTITY_TYPE_ID = 210;
     // Array size limit is fuzzy so lets avoid it.
-    public static final int MAXIMUM_ENTITY_TYPE_ID = Integer.MAX_VALUE - Short.MAX_VALUE;
+    public static final int MAXIMUM_ENTITY_TYPE_ID = 255; // Integer.MAX_VALUE - Short.MAX_VALUE;
     // Block ids but translated to item ids
     public static final int INITIAL_TRANSLATED_BLOCK_ID = convertBlockIdToItemId(INITIAL_BLOCK_ID);
     public static final int MAXIMUM_TRANSLATED_BLOCK_ID = convertBlockIdToItemId(MAXIMUM_BLOCK_ID);
diff --git a/gradle.properties b/gradle.properties
@@ -3,8 +3,8 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
 
 # FoxLoader properties
-foxloader.version=1.2.49
-foxloader.lastReIndevTransformerChanges=1.2.49
+foxloader.version=1.2.50-alpha1
+foxloader.lastReIndevTransformerChanges=1.2.50
 # https://www.jitpack.io/#com.fox2code/FoxLoader
 
 # ReIndev properties

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ private enum MappingState {`
`53`	`53`	`blockIdMappingIn[i] = i;`
`54`	`54`	`blockIdMappingOut[i] = i;`
`55`	`55`	`}`
	`56`	`+ for (short i = 0; i < MAXIMUM_ENTITY_TYPE_ID; i++) {`
	`57`	`+ entityTypeIdMappingIn[i] = i;`
	`58`	`+ entityTypeIdMappingOut[i] = i;`
	`59`	`+ }`
`56`	`60`	`}`
`57`	`61`
`58`	`62`	`public static void initialize() {`
`@@ -406,6 +410,10 @@ public static void resetMappings(boolean singlePlayer) {`
`406`	`410`	`blockIdMappingIn[i] = i;`
`407`	`411`	`blockIdMappingOut[i] = i;`
`408`	`412`	`}`
	`413`	`+ for (short i = INITIAL_ENTITY_TYPE_ID; i < MAXIMUM_ENTITY_TYPE_ID; i++) {`
	`414`	`+ entityTypeIdMappingIn[i] = i;`
	`415`	`+ entityTypeIdMappingOut[i] = i;`
	`416`	`+ }`
`409`	`417`	`} else {`
`410`	`418`	`if (idMappingState == MappingState.SERVER) return;`
`411`	`419`	`idMappingState = MappingState.SERVER;`
`@@ -421,8 +429,13 @@ public static void resetMappings(boolean singlePlayer) {`
`421`	`429`	`itemIdMappingIn[i] = DEFAULT_FALLBACK_ITEM_ID;`
`422`	`430`	`itemIdMappingOut[i] = DEFAULT_FALLBACK_ITEM_ID;`
`423`	`431`	`}`
	`432`	`+ for (short i = INITIAL_ENTITY_TYPE_ID; i < MAXIMUM_ENTITY_TYPE_ID; i++) {`
	`433`	`+ entityTypeIdMappingIn[i] = DEFAULT_FALLBACK_ENTITY_TYPE_ID;`
	`434`	`+ entityTypeIdMappingOut[i] = DEFAULT_FALLBACK_ENTITY_TYPE_ID;`
	`435`	`+ }`
`424`	`436`	`}`
`425`	`437`	`Arrays.fill(itemIdMappingInNames, null);`
	`438`	`+ Arrays.fill(entityTypeIdMappingNames, null);`
`426`	`439`	`}`
`427`	`440`
`428`	`441`	`public static void initializeMappings(ServerHello serverHello) {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public ServerHello(HashMap<String, RegistryEntry> registryEntries,`
`47`	`47`	`@Override`
`48`	`48`	`public void readData(DataInputStream inStream) throws IOException {`
`49`	`49`	`int serverHelloVersion = inStream.readUnsignedShort();`
`50`		`- int clientBackwardCompatibilityVersion = inStream.readUnsignedShort();`
	`50`	`+ int clientBackwardCompatibilityVersion = serverHelloVersion == 0 ? 0 : inStream.readUnsignedShort();`
`51`	`51`	`if (SERVER_HELLO_VERSION < clientBackwardCompatibilityVersion) {`
`52`	`52`	`throw new IOException("Client is critically out of date, please update FoxLoader.");`
`53`	`53`	`}`
`@@ -77,11 +77,11 @@ public void readData(DataInputStream inStream) throws IOException {`
`77`	`77`	`this.entityTypeRegistryEntries = new HashMap<>();`
`78`	`78`	`ModLoader.getModLoaderLogger().log(Level.WARNING, "Server Hello: Too few bytes to read entity data.");`
`79`	`79`	`} else {`
`80`		`- int entityEntries = inStream.readInt();`
	`80`	`+ int entityEntries = inStream.readUnsignedShort();`
`81`	`81`	`entityTypeRegistryEntries = new HashMap<>(entityEntries);`
`82`	`82`	`while (entityEntries-- > 0) {`
`83`	`83`	`EntityTypeRegistryEntry entry = new EntityTypeRegistryEntry(`
`84`		`- inStream.readInt(), inStream.readInt(), inStream.readUTF());`
	`84`	`+ inStream.readUnsignedShort(), inStream.readUnsignedShort(), inStream.readUTF());`
`85`	`85`	`this.entityTypeRegistryEntries.put(entry.name, entry);`
`86`	`86`	`}`
`87`	`87`	`}`
`@@ -106,10 +106,10 @@ public void writeData(DataOutputStream outStream) throws IOException {`
`106`	`106`	`outStream.writeUTF(metadata.getValue());`
`107`	`107`	`}`
`108`	`108`
`109`		`- outStream.writeInt(this.entityTypeRegistryEntries.size());`
	`109`	`+ outStream.writeShort(this.entityTypeRegistryEntries.size());`
`110`	`110`	`for (EntityTypeRegistryEntry entry : entityTypeRegistryEntries.values()) {`
`111`		`- outStream.writeInt(entry.realId);`
`112`		`- outStream.writeInt(entry.fallbackId);`
	`111`	`+ outStream.writeShort(entry.realId);`
	`112`	`+ outStream.writeShort(entry.fallbackId);`
`113`	`113`	`outStream.writeUTF(entry.name);`
`114`	`114`	`}`
`115`	`115`	`}`