From d032a34aaa0c9ad972a44fc67e79ddba2e0c8560 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 23 Jun 2017 11:21:55 -0700 Subject: [PATCH] Fix conflicts --- patches/minecraft/net/minecraft/entity/EntityList.java.patch | 2 +- .../fml/common/network/handshake/FMLHandshakeClientState.java | 2 +- src/test/java/net/minecraftforge/debug/DynBucketTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/entity/EntityList.java.patch b/patches/minecraft/net/minecraft/entity/EntityList.java.patch index 26b7f0020d..c535780198 100644 --- a/patches/minecraft/net/minecraft/entity/EntityList.java.patch +++ b/patches/minecraft/net/minecraft/entity/EntityList.java.patch @@ -134,7 +134,7 @@ } private static void func_191303_a(int p_191303_0_, String p_191303_1_, Class p_191303_2_, String p_191303_3_) -@@ -394,22 +421,17 @@ +@@ -394,22 +420,17 @@ else { ResourceLocation resourcelocation = new ResourceLocation(p_191303_1_); diff --git a/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeClientState.java b/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeClientState.java index 6512443876..312943dedc 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeClientState.java +++ b/src/main/java/net/minecraftforge/fml/common/network/handshake/FMLHandshakeClientState.java @@ -134,7 +134,7 @@ enum FMLHandshakeClientState implements IHandshakeState if (pkt.hasMore()) { - FMLLog.log.debug("Received Mod Registry mapping for {}: {} IDs {} subs {} dummied", pkt.getName(), entry.ids.size(), entry.substitutions.size(), entry.dummied.size()); + FMLLog.log.debug("Received Mod Registry mapping for {}: {} IDs {} overrides {} dummied", pkt.getName(), entry.ids.size(), entry.overrides.size(), entry.dummied.size()); return WAITINGSERVERCOMPLETE; } diff --git a/src/test/java/net/minecraftforge/debug/DynBucketTest.java b/src/test/java/net/minecraftforge/debug/DynBucketTest.java index 8d5c5142ff..149842547d 100644 --- a/src/test/java/net/minecraftforge/debug/DynBucketTest.java +++ b/src/test/java/net/minecraftforge/debug/DynBucketTest.java @@ -136,7 +136,7 @@ public class DynBucketTest @SubscribeEvent public void registrRecipes(RegistryEvent.Register event) { - ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(TestFluid.instance, Fluid.BUCKET_VOLUME)); + ItemStack filledBucket = FluidUtil.getFilledBucket(new FluidStack(ModelFluidDebug.FLUID, Fluid.BUCKET_VOLUME)); GameRegistry.addShapelessRecipe(new ResourceLocation(MODID, "diamond_to_fluid"), null, filledBucket, Ingredient.fromItem(Items.DIAMOND)); }