Entity type registry method

halotroop2288 · halotroop2288 · commit 26104a58972d · 2024-07-22T07:30:30.000-05:00
diff --git a/client/src/main/java/com/fox2code/foxloader/client/mixins/AccessorEntityList.java b/client/src/main/java/com/fox2code/foxloader/client/mixins/AccessorEntityList.java
@@ -0,0 +1,13 @@
+package com.fox2code.foxloader.client.mixins;
+
+import net.minecraft.src.game.entity.*;
+import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.gen.*;
+
+@Mixin(EntityList.class)
+public interface AccessorEntityList {
+	@Invoker
+	static void invokeAddMapping(Class<?> entityClass, String entityTypeName, int entityTypeID) {
+		throw new IllegalStateException();
+	}
+}
diff --git a/client/src/main/java/com/fox2code/foxloader/registry/GameRegistryClient.java b/client/src/main/java/com/fox2code/foxloader/registry/GameRegistryClient.java
@@ -3,6 +3,7 @@
 import static com.fox2code.foxloader.loader.ClientMod.*;
 
 import com.fox2code.foxloader.client.CreativeItems;
+import com.fox2code.foxloader.client.mixins.AccessorEntityList;
 import com.fox2code.foxloader.client.registry.RegisteredBlockImpl;
 import com.fox2code.foxloader.loader.ModLoader;
 import com.fox2code.foxloader.loader.packet.ServerHello;
@@ -75,6 +76,7 @@ public static void freeze() {
 
     private int nextBlockId = INITIAL_BLOCK_ID;
     private int nextItemId = INITIAL_ITEM_ID;
+    private int nextEntityTypeId = INITIAL_ENTITY_TYPE_ID;
 
     private GameRegistryClient() {}
 
@@ -139,6 +141,22 @@ public int generateNewItemId(String name, int fallbackId) {
         return itemId;
     }
 
+    @Override
+    public int generateNewEntityTypeId(String name, int fallbackId) {
+        if (registryEntries.containsKey(name)) {
+            throw new RuntimeException("Duplicate entity string id: " + name);
+        }
+
+        int entityTypeId = nextEntityTypeId++;
+
+        if (entityTypeId > MAXIMUM_ITEM_ID) {
+            throw new RuntimeException("Maximum block count registered! (Too many mods?)");
+        }
+
+        entityTypeEntries.put(name, new EntityTypeRegistryEntry(entityTypeId, fallbackId, name));
+        return entityTypeId;
+    }
+
     @Override
     public RegisteredBlock registerNewBlock(String name, BlockBuilder blockBuilder, int fallbackId) {
         name = validateAndFixRegistryName(name);
@@ -297,6 +315,11 @@ private RegisteredItem registerNewItem0(String name, ItemBuilder itemBuilder,
         return (RegisteredItem) item;
     }
 
+	@Override
+	public void registerNewEntityType(String name, Class<? extends RegisteredEntity> entityClass, int fallbackId) {
+		AccessorEntityList.invokeAddMapping(entityClass, name, generateNewEntityTypeId(name, fallbackId));
+	}
+
     @Override
     public void registerRecipe(RegisteredItemStack result, Object... recipe) {
         if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
diff --git a/client/src/main/resources/foxloader.client.mixins.json b/client/src/main/resources/foxloader.client.mixins.json
@@ -4,6 +4,7 @@
   "package": "com.fox2code.foxloader.client.mixins",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
+    "AccessorEntityList",
     "MixinBlock",
     "MixinBlockFire",
     "MixinChunk",
diff --git a/common/src/main/java/com/fox2code/foxloader/loader/Mod.java b/common/src/main/java/com/fox2code/foxloader/loader/Mod.java
@@ -255,6 +255,13 @@ public RegisteredBlock registerNewBlock(String name, BlockBuilder blockBuilder)
         return GameRegistry.getInstance().registerNewBlock(getModContainer().id + ":" + name, blockBuilder);
     }
 
+    /**
+     * @see GameRegistry#registerNewEntityType(String, Class, int)
+     */
+    public void registerNewEntityType(String name, Class<? extends RegisteredEntity> entityClass) {
+        GameRegistry.getInstance().registerNewEntityType(name, entityClass);
+    }
+
     /**
      * @see GameRegistry#registerRecipe(RegisteredItemStack, Object...)
      */
diff --git a/common/src/main/java/com/fox2code/foxloader/registry/EntityTypeRegistryEntry.java b/common/src/main/java/com/fox2code/foxloader/registry/EntityTypeRegistryEntry.java
@@ -0,0 +1,12 @@
+package com.fox2code.foxloader.registry;
+
+public class EntityTypeRegistryEntry {
+	public final int realId, fallbackId;
+	public final String name;
+
+	EntityTypeRegistryEntry(int realId, int fallbackId, String name) {
+		this.realId = realId;
+		this.fallbackId = fallbackId;
+		this.name = 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
@@ -8,13 +8,15 @@
 
 public abstract class GameRegistry {
     static final HashMap<String, RegistryEntry> registryEntries = new HashMap<>();
+    static final HashMap<String, EntityTypeRegistryEntry> entityTypeEntries = new HashMap<>();
     static final BlockBuilder DEFAULT_BLOCK_BUILDER = new BlockBuilder();
     static final ItemBuilder DEFAULT_ITEM_BUILDER = new ItemBuilder();
     private static GameRegistry gameRegistry;
     public static final int PARAM_ITEM_ID_DIFF = 256;
     public static final int INITIAL_BLOCK_ID = 360;
     public static final int MAXIMUM_BLOCK_ID = 1024; // Hard max: 1258
     public static final int INITIAL_ITEM_ID = 4096;
+    public static final int INITIAL_ENTITY_TYPE_ID = 210;
     public static final int MAXIMUM_ITEM_ID = 8192; // Hard max: 31999
     // Block ids but translated to item ids
     public static final int INITIAL_TRANSLATED_BLOCK_ID = convertBlockIdToItemId(INITIAL_BLOCK_ID);
@@ -23,6 +25,8 @@ public abstract class GameRegistry {
     public static final int DEFAULT_FALLBACK_BLOCK_ID = 1;
     // The default fallback id for items is planks.
     public static final int DEFAULT_FALLBACK_ITEM_ID = 5;
+    // The default fallback id for entity types is pig.
+    public static final int DEFAULT_FALLBACK_ENTITY_TYPE_ID = 90;
 
     public static GameRegistry getInstance() {
         return gameRegistry;
@@ -74,12 +78,19 @@ public RegisteredBlock getRegisteredBlock(String name) {
     }
 
     /**
-     * @return list of registered modded entries
+     * @return list of registered modded block and item entries
      */
     public static Collection<RegistryEntry> getRegistryEntries() {
         return Collections.unmodifiableCollection(registryEntries.values());
     }
 
+    /**
+     * @return list of registered modded entities
+     */
+    public static Collection<EntityTypeRegistryEntry> getEntityRegistryEntries() {
+        return Collections.unmodifiableCollection(entityTypeEntries.values());
+    }
+
     /**
      * @return maximum expected block id
      */
@@ -122,6 +133,11 @@ public static Collection<RegistryEntry> getRegistryEntries() {
      */
     public abstract int generateNewItemId(String name, int fallbackId);
 
+    /**
+     * Only use this if you know what you are doing.
+     */
+    public abstract int generateNewEntityTypeId(String name, int fallbackId);
+
     /**
      * Register a new block into the game
      */
@@ -140,6 +156,15 @@ public final RegisteredItem registerNewItem(String name, ItemBuilder itemBuilder
 
     public abstract RegisteredItem registerNewItem(String name, ItemBuilder itemBuilder, int fallbackId);
 
+	/**
+	 * Register a new entity type into the game
+	 */
+	public final void registerNewEntityType(String name, Class<? extends RegisteredEntity> entityClass) {
+		this.registerNewEntityType(name, entityClass, DEFAULT_FALLBACK_ENTITY_TYPE_ID);
+	}
+
+	public abstract void registerNewEntityType(String name, Class<? extends RegisteredEntity> entityClass, int fallbackId);
+
     protected static final String LATE_RECIPE_MESSAGE = "Too late to register recipes!";
     protected static boolean recipeFrozen = false;
 
diff --git a/server/src/main/java/com/fox2code/foxloader/registry/GameRegistryServer.java b/server/src/main/java/com/fox2code/foxloader/registry/GameRegistryServer.java
@@ -4,6 +4,7 @@
 import com.fox2code.foxloader.loader.ModLoader;
 import com.fox2code.foxloader.loader.packet.ServerHello;
 import com.fox2code.foxloader.network.SidedMetadataAPI;
+import com.fox2code.foxloader.server.mixins.AccessorEntityList;
 import com.fox2code.foxloader.server.network.NetworkPlayerImpl;
 import com.fox2code.foxloader.server.registry.RegisteredBlockImpl;
 import net.minecraft.src.game.block.*;
@@ -62,6 +63,7 @@ public static void freeze() {
 
     private int nextBlockId = INITIAL_BLOCK_ID;
     private int nextItemId = INITIAL_ITEM_ID;
+    private int nextEntityTypeId = INITIAL_ENTITY_TYPE_ID;
 
     private GameRegistryServer() {}
 
@@ -126,6 +128,18 @@ public int generateNewItemId(String name, int fallbackId) {
         return itemId;
     }
 
+    @Override
+    public int generateNewEntityTypeId(String name, int fallbackId) {
+        if (registryEntries.containsKey(name)) {
+            throw new RuntimeException("Duplicate entity string id: " + name);
+        }
+
+        int entityTypeId = nextEntityTypeId++;
+
+        entityTypeEntries.put(name, new EntityTypeRegistryEntry(entityTypeId, fallbackId, name));
+        return entityTypeId;
+    }
+
     @Override
     public RegisteredBlock registerNewBlock(String name, BlockBuilder blockBuilder, int fallbackId) {
         name = validateAndFixRegistryName(name);
@@ -276,6 +290,11 @@ private RegisteredItem registerNewItem0(String name, ItemBuilder itemBuilder,
         return (RegisteredItem) item;
     }
 
+	@Override
+	public void registerNewEntityType(String name, Class<? extends RegisteredEntity> entityClass, int fallbackId) {
+		AccessorEntityList.invokeAddMapping(entityClass, name, generateNewEntityTypeId(name, fallbackId));
+	}
+
     @Override
     public void registerRecipe(RegisteredItemStack result, Object... recipe) {
         if (recipeFrozen) throw new UnsupportedOperationException(LATE_RECIPE_MESSAGE);
diff --git a/server/src/main/java/com/fox2code/foxloader/server/mixins/AccessorEntityList.java b/server/src/main/java/com/fox2code/foxloader/server/mixins/AccessorEntityList.java
@@ -0,0 +1,13 @@
+package com.fox2code.foxloader.server.mixins;
+
+import net.minecraft.src.game.entity.*;
+import org.spongepowered.asm.mixin.*;
+import org.spongepowered.asm.mixin.gen.*;
+
+@Mixin(EntityList.class)
+public interface AccessorEntityList {
+	@Invoker
+	static void invokeAddMapping(Class<?> entityClass, String entityTypeName, int entityTypeID) {
+		throw new IllegalStateException();
+	}
+}
diff --git a/server/src/main/resources/foxloader.server.mixins.json b/server/src/main/resources/foxloader.server.mixins.json
@@ -5,6 +5,7 @@
   "plugin": "com.fox2code.foxloader.loader.mixin.MixinTestModePlugin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
+    "AccessorEntityList",
     "MixinBlock",
     "MixinBlockFire",
     "MixinChunkBlockMap",
