From 214275babadb9288ecea779245442687dd3ae8cd Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Thu, 4 Oct 2018 08:24:01 +0100 Subject: [PATCH] Change biome spawn list entries to use factory method where possible (#5075) --- .../minecraft/world/biome/Biome.java.patch | 29 +++-------------- .../fml/common/registry/EntityRegistry.java | 22 +++++-------- .../minecraftforge/registries/GameData.java | 31 +++++++++++++++++-- 3 files changed, 40 insertions(+), 42 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/biome/Biome.java.patch b/patches/minecraft/net/minecraft/world/biome/Biome.java.patch index 1f9850b39b..addaa5a850 100644 --- a/patches/minecraft/net/minecraft/world/biome/Biome.java.patch +++ b/patches/minecraft/net/minecraft/world/biome/Biome.java.patch @@ -164,37 +164,16 @@ public static void func_185358_q() { func_185354_a(0, "ocean", new BiomeOcean((new Biome.BiomeProperties("Ocean")).func_185398_c(-1.0F).func_185400_d(0.1F))); -@@ -552,6 +635,7 @@ - public Class field_76300_b; - public int field_76301_c; - public int field_76299_d; -+ private final java.lang.reflect.Constructor ctr; - - public SpawnListEntry(Class p_i1970_1_, int p_i1970_2_, int p_i1970_3_, int p_i1970_4_) - { -@@ -559,12 +643,26 @@ - this.field_76300_b = p_i1970_1_; - this.field_76301_c = p_i1970_3_; - this.field_76299_d = p_i1970_4_; -+ -+ try -+ { -+ ctr = p_i1970_1_.getConstructor(World.class); -+ } -+ catch (NoSuchMethodException e) -+ { -+ throw new RuntimeException(e); -+ } - } - - public String toString() +@@ -565,6 +648,13 @@ { return this.field_76300_b.getSimpleName() + "*(" + this.field_76301_c + "-" + this.field_76299_d + "):" + this.field_76292_a; } + + public EntityLiving newInstance(World world) throws Exception + { -+ return ctr.newInstance(world); ++ net.minecraftforge.fml.common.registry.EntityEntry entry = net.minecraftforge.fml.common.registry.EntityRegistry.getEntry(this.field_76300_b); ++ if (entry != null) return (EntityLiving) entry.newInstance(world); ++ return this.field_76300_b.getConstructor(World.class).newInstance(world); + } } diff --git a/src/main/java/net/minecraftforge/fml/common/registry/EntityRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/EntityRegistry.java index f3f3a248b9..b0b77043c3 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/EntityRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/EntityRegistry.java @@ -19,10 +19,6 @@ package net.minecraftforge.fml.common.registry; -import java.util.Iterator; -import java.util.List; -import org.apache.logging.log4j.Level; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList.EntityEggInfo; import net.minecraft.entity.EntityLiving; @@ -36,7 +32,10 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.ModContainer; import net.minecraftforge.fml.common.network.internal.FMLMessage.EntitySpawnMessage; +import net.minecraftforge.registries.GameData; +import java.util.List; +import java.util.Map; import java.util.function.Function; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.BiMap; @@ -145,8 +144,9 @@ public class EntityRegistry private static final EntityRegistry INSTANCE = new EntityRegistry(); - private ListMultimap entityRegistrations = ArrayListMultimap.create(); - private BiMap, EntityRegistration> entityClassRegistrations = HashBiMap.create(); + private final ListMultimap entityRegistrations = ArrayListMultimap.create(); + private final BiMap, EntityRegistration> entityClassRegistrations = HashBiMap.create(); + private final Map, EntityEntry> entityClassEntries = GameData.getEntityClassMap(); public static EntityRegistry instance() { @@ -374,15 +374,9 @@ public class EntityRegistry //Helper function @Nullable - public static EntityEntry getEntry(Class entry) + public static EntityEntry getEntry(Class entityClass) { - //TODO: Slave map for faster lookup? - for (EntityEntry e : ForgeRegistries.ENTITIES) - { - if (e.getEntityClass() == entry) - return e; - } - return null; + return instance().entityClassEntries.get(entityClass); } // This is an internal method - do not touch. diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java index 1f0e3476e3..e4be1c171b 100644 --- a/src/main/java/net/minecraftforge/registries/GameData.java +++ b/src/main/java/net/minecraftforge/registries/GameData.java @@ -70,6 +70,7 @@ import java.io.IOException; import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; +import java.util.IdentityHashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; @@ -111,8 +112,9 @@ public class GameData private static final int MAX_RECIPE_ID = Integer.MAX_VALUE >> 5; // Varint CPacketRecipeInfo/SPacketRecipeBook private static final int MAX_PROFESSION_ID = 1024; //TODO: Is this serialized anywhere anymore? - private static final ResourceLocation BLOCK_TO_ITEM = new ResourceLocation("minecraft:blocktoitemmap"); - private static final ResourceLocation BLOCKSTATE_TO_ID = new ResourceLocation("minecraft:blockstatetoid"); + private static final ResourceLocation BLOCK_TO_ITEM = new ResourceLocation("minecraft:blocktoitemmap"); + private static final ResourceLocation BLOCKSTATE_TO_ID = new ResourceLocation("minecraft:blockstatetoid"); + private static final ResourceLocation ENTITY_CLASS_TO_ENTRY = new ResourceLocation("forge:entity_class_to_entry"); private static boolean hasInit = false; private static final boolean DISABLE_VANILLA_REGISTRIES = Boolean.parseBoolean(System.getProperty("forge.disableVanillaGameData", "false")); // Use for unit tests/debugging private static final BiConsumer> LOCK_VANILLA = (name, reg) -> reg.slaves.values().stream().filter(o -> o instanceof ILockableRegistry).forEach(o -> ((ILockableRegistry)o).lock()); @@ -188,6 +190,12 @@ public class GameData return GameRegistry.findRegistry(Block.class).getSlaveMap(BLOCKSTATE_TO_ID, ObjectIntIdentityMap.class); } + @SuppressWarnings("unchecked") + public static Map, EntityEntry> getEntityClassMap() + { + return GameRegistry.findRegistry(EntityEntry.class).getSlaveMap(ENTITY_CLASS_TO_ENTRY, Map.class); + } + public static > K register_impl(K value) { Validate.notNull(value, "Attempted to register a null object"); @@ -452,7 +460,7 @@ public class GameData reg.register(id, key, new EntityEntry(clazz, oldName)); } - private static class EntityCallbacks implements IForgeRegistry.AddCallback + private static class EntityCallbacks implements IForgeRegistry.AddCallback, IForgeRegistry.ClearCallback, IForgeRegistry.CreateCallback { static final EntityCallbacks INSTANCE = new EntityCallbacks(); @@ -464,7 +472,24 @@ public class GameData ((EntityEntryBuilder.BuiltEntityEntry) entry).addedToRegistry(); } if (entry.getEgg() != null) + { EntityList.ENTITY_EGGS.put(entry.getRegistryName(), entry.getEgg()); + } + @SuppressWarnings("unchecked") + Map, EntityEntry> map = owner.getSlaveMap(ENTITY_CLASS_TO_ENTRY, Map.class); + map.put(entry.getEntityClass(), entry); + } + + @Override + public void onClear(IForgeRegistryInternal owner, RegistryManager stage) + { + owner.getSlaveMap(ENTITY_CLASS_TO_ENTRY, Map.class).clear(); + } + + @Override + public void onCreate(IForgeRegistryInternal owner, RegistryManager stage) + { + owner.setSlaveMap(ENTITY_CLASS_TO_ENTRY, new IdentityHashMap<>()); } }