From 01912a459a4f23836c3c533f0e7815aa621f6de3 Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 6 Mar 2016 23:18:36 -0500 Subject: [PATCH] Some more FML related fixups --- .../net/minecraft/util/IntIdentityHashBiMap.java.patch | 10 ++++++++++ .../fml/common/network/FMLOutboundHandler.java | 6 +++--- .../registry/FMLControlledNamespacedRegistry.java | 7 ++++--- .../fml/common/registry/PersistentRegistryManager.java | 2 -- 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 patches.mcp/minecraft/net/minecraft/util/IntIdentityHashBiMap.java.patch diff --git a/patches.mcp/minecraft/net/minecraft/util/IntIdentityHashBiMap.java.patch b/patches.mcp/minecraft/net/minecraft/util/IntIdentityHashBiMap.java.patch new file mode 100644 index 0000000000..2b9932be97 --- /dev/null +++ b/patches.mcp/minecraft/net/minecraft/util/IntIdentityHashBiMap.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/minecraft/net/minecraft/util/IntIdentityHashBiMap.java ++++ ../src-work/minecraft/net/minecraft/util/IntIdentityHashBiMap.java +@@ -166,7 +166,6 @@ + return Iterators.filter(Iterators.forArray(this.field_186820_d), Predicates.notNull()); + } + +- @SideOnly(Side.CLIENT) + public void func_186812_a() + { + Arrays.fill(this.field_186818_b, (Object)null); diff --git a/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java b/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java index 11d4715cfd..5db838deaa 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java +++ b/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java @@ -128,7 +128,7 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { public List selectNetworks(Object args, ChannelHandlerContext context, FMLProxyPacket packet) { ImmutableList.Builder builder = ImmutableList.builder(); - for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().playerEntityList) + for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().func_184103_al().getPlayerList()) { NetworkDispatcher dispatcher = player.playerNetServerHandler.netManager.channel().attr(NetworkDispatcher.FML_DISPATCHER).get(); if (dispatcher != null) builder.add(dispatcher); @@ -156,7 +156,7 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { { int dimension = (Integer)args; ImmutableList.Builder builder = ImmutableList.builder(); - for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().playerEntityList) + for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().func_184103_al().getPlayerList()) { if (dimension == player.dimension) { @@ -190,7 +190,7 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { { TargetPoint tp = (TargetPoint)args; ImmutableList.Builder builder = ImmutableList.builder(); - for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().playerEntityList) + for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().func_184103_al().getPlayerList()) { if (player.dimension == tp.dimension) { diff --git a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java index 22b66734c8..b18c2cf51c 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java @@ -17,6 +17,7 @@ import com.google.common.collect.HashBiMap; import com.google.common.collect.Iterators; import com.google.common.collect.Maps; import com.google.common.collect.Sets; +import net.minecraft.util.IntIdentityHashBiMap; import org.apache.commons.lang3.Validate; import org.apache.logging.log4j.Level; @@ -170,7 +171,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespacedDefaul this.dummiedLocations.clear(); this.dummiedLocations.addAll(otherRegistry.dummiedLocations); - underlyingIntegerMap = new ObjectIntIdentityMap(); + underlyingIntegerMap.func_186812_a(); registryObjects.clear(); for (I thing : otherRegistry.typeSafeIterable()) @@ -556,7 +557,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespacedDefaul throw new IllegalArgumentException("The object to be added to the registry is not of the right type. Reflection/ASM hackery? Registry bug?"); } - underlyingIntegerMap.put(thing, id); // obj <-> id + underlyingIntegerMap.func_186814_a(thing, id); // obj <-> id super.putObject(name, thing); // name <-> obj availabilityMap.set(id); if (addCallback != null) @@ -758,7 +759,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespacedDefaul for (I i : this.underlyingIntegerMap) { - addCallback.onAdd(i, this.underlyingIntegerMap.get(i)); + addCallback.onAdd(i, this.underlyingIntegerMap.func_186808_c(i)); } } diff --git a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java index 8e8c4f7051..379e298f51 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java @@ -152,8 +152,6 @@ public class PersistentRegistryManager // Empty the blockstate map before loading GameData.getBlockStateIDMap().clear(); - // Clean up potion array before reloading it from the snapshot - Arrays.fill(Potion.potionTypes, null); // Load the snapshot into the "STAGING" registry for (Map.Entry snapshotEntry : snapshot.entries.entrySet())