diff --git a/client/cpw/mods/fml/client/FMLClientHandler.java b/client/cpw/mods/fml/client/FMLClientHandler.java index db0bb3c80e..2e7a8795a9 100644 --- a/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/client/cpw/mods/fml/client/FMLClientHandler.java @@ -37,6 +37,7 @@ import net.minecraft.src.World; import net.minecraft.src.WorldClient; import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import cpw.mods.fml.client.modloader.ModLoaderClientHelper; @@ -289,7 +290,7 @@ public class FMLClientHandler implements IFMLSidedHandler { return Arrays.asList(String.format("Optifine %s",optifineContainer.getVersion())); } else { - return Collections.emptyList(); + return ImmutableList.of(); } } diff --git a/common/cpw/mods/fml/server/FMLServerHandler.java b/common/cpw/mods/fml/server/FMLServerHandler.java index a6bbdf7a54..f075b1b316 100644 --- a/common/cpw/mods/fml/server/FMLServerHandler.java +++ b/common/cpw/mods/fml/server/FMLServerHandler.java @@ -14,6 +14,8 @@ package cpw.mods.fml.server; import java.util.List; +import com.google.common.collect.ImmutableList; + import net.minecraft.server.MinecraftServer; import net.minecraft.src.Entity; import net.minecraft.src.NetClientHandler; @@ -117,7 +119,7 @@ public class FMLServerHandler implements IFMLSidedHandler @Override public List getAdditionalBrandingInformation() { - return null; + return ImmutableList.of(); } /* (non-Javadoc) diff --git a/patches/common/net/minecraft/src/BlockDispenser.java.patch b/patches/common/net/minecraft/src/BlockDispenser.java.patch deleted file mode 100644 index aea8b3070f..0000000000 --- a/patches/common/net/minecraft/src/BlockDispenser.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src-base/common/net/minecraft/src/BlockDispenser.java -+++ ../src-work/common/net/minecraft/src/BlockDispenser.java -@@ -2,6 +2,8 @@ - - import cpw.mods.fml.common.Side; - import cpw.mods.fml.common.asm.SideOnly; -+import cpw.mods.fml.common.registry.GameRegistry; -+ - import java.util.Random; - - public class BlockDispenser extends BlockContainer diff --git a/patches/common/net/minecraft/src/CallableSuspiciousClasses.java.patch b/patches/common/net/minecraft/src/CallableSuspiciousClasses.java.patch new file mode 100644 index 0000000000..e894508881 --- /dev/null +++ b/patches/common/net/minecraft/src/CallableSuspiciousClasses.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/common/net/minecraft/src/CallableSuspiciousClasses.java ++++ ../src-work/common/net/minecraft/src/CallableSuspiciousClasses.java +@@ -130,6 +130,6 @@ + + public Object call() + { +- return this.func_85085_a(); ++ return "FML is installed"; + } + } diff --git a/patches/common/net/minecraft/src/EntityAIVillagerMate.java.patch b/patches/common/net/minecraft/src/EntityAIVillagerMate.java.patch deleted file mode 100644 index 879024117e..0000000000 --- a/patches/common/net/minecraft/src/EntityAIVillagerMate.java.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- ../src-base/common/net/minecraft/src/EntityAIVillagerMate.java -+++ ../src-work/common/net/minecraft/src/EntityAIVillagerMate.java -@@ -1,4 +1,6 @@ - package net.minecraft.src; -+ -+import cpw.mods.fml.common.registry.VillagerRegistry; - - public class EntityAIVillagerMate extends EntityAIBase - { diff --git a/patches/common/net/minecraft/src/TileEntity.java.patch b/patches/common/net/minecraft/src/TileEntity.java.patch index 9c79a98848..cec9d87eeb 100644 --- a/patches/common/net/minecraft/src/TileEntity.java.patch +++ b/patches/common/net/minecraft/src/TileEntity.java.patch @@ -44,3 +44,12 @@ } else { +@@ -177,7 +189,7 @@ + public void func_85027_a(CrashReportCategory p_85027_1_) + { + p_85027_1_.func_71500_a("Name", new CallableTileEntityName(this)); +- CrashReportCategory.func_85068_a(p_85027_1_, this.field_70329_l, this.field_70330_m, this.field_70327_n, this.field_70324_q.field_71990_ca, this.field_70325_p); ++ CrashReportCategory.func_85068_a(p_85027_1_, this.field_70329_l, this.field_70330_m, this.field_70327_n, this.field_70324_q != null ? this.field_70324_q.field_71990_ca : 0, this.field_70325_p); + } + + static Map func_85028_t()