rebuild modular minecraft

conf/astyle.cfg

@@ -0,0 +1,19 @@
+# Artistic Style format configuration
+# see http://astyle.sourceforge.net/astyle.html
+
+style=allman
+
+add-brackets
+break-closing-brackets
+
+indent-switches
+
+max-instatement-indent=40
+
+pad-oper
+pad-header
+unpad-paren
+
+break-blocks
+
+delete-empty-lines

conf/mcp.cfg

@@ -0,0 +1,186 @@
+[DEFAULT]
+DirTemp    = temp
+DirSrc     = src
+DirLogs    = logs
+DirBin     = bin
+DirJars    = jars
+DirReobf   = reobf
+DirConf    = conf
+DirRuntime = runtime
+DirLib     = lib
+DirTempSrc = temp/src
+DirTempCls = temp/cls
+DirTempBin = temp/bin
+DirModSrc  = modsrc
+DirEclipse = eclipse
+
+[CSV]
+Classes = %(DirConf)s/classes.csv
+Methods = %(DirConf)s/methods.csv
+Fields  = %(DirConf)s/fields.csv
+Params  = %(DirConf)s/params.csv
+NewIds  = %(DirConf)s/newids.csv
+
+[SRGS]
+ConfClient     = %(DirConf)s/joined.srg
+ConfServer     = %(DirConf)s/joined.srg
+Client         = %(DirTemp)s/client_rg.srg
+Server         = %(DirTemp)s/server_rg.srg
+DeobfClient    = %(DirTemp)s/client_deobf.srg
+DeobfServer    = %(DirTemp)s/server_deobf.srg
+ReobfClient    = %(DirTemp)s/client_ro.srg
+ReobfServer    = %(DirTemp)s/server_ro.srg
+ReobfClientSrg = %(DirTemp)s/client_ro_srg.srg
+ReobfServerSrg = %(DirTemp)s/server_ro_srg.srg
+ReobfClientCls = %(DirTemp)s/client_ro_cls.srg
+ReobfServerCls = %(DirTemp)s/server_ro_cls.srg
+
+[JAR]
+DirNatives = %(DirJars)s/bin/natives
+Client     = %(DirJars)s/bin/minecraft.jar
+Server     = %(DirJars)s/minecraft_server.jar
+LWJGL      = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
+MD5Client  = 253d74d38e334133e3e9dca0017a9b5b
+MD5Server  = 218513c2d5b0ec4b6db26801a3883ad1
+
+[RETROGUARD]
+Location       = %(DirRuntime)s/bin/retroguard.jar
+RetroConf      = %(DirTemp)s/retroguard.cfg
+RetroReobConf  = %(DirTemp)s/retroguard_ro.cfg
+ClientConf     = %(DirTemp)s/client_rg.cfg
+ServerConf     = %(DirTemp)s/server_rg.cfg
+ClientReobConf = %(DirTemp)s/client_ro.cfg
+ServerReobConf = %(DirTemp)s/server_ro.cfg
+ClientOut      = %(DirTemp)s/minecraft_rg.jar
+ServerOut      = %(DirTemp)s/minecraft_server_rg.jar
+ClientLog      = %(DirLogs)s/client_rg.log
+ServerLog      = %(DirLogs)s/server_rg.log
+ClientDeobLog  = %(DirLogs)s/client_deob.log
+ServerDeobLog  = %(DirLogs)s/server_deob.log
+NullPkg        = net/minecraft/src
+
+[EXCEPTOR]
+XClientJson     = %(DirConf)s/exceptor.json
+XServerJson     = %(DirConf)s/exceptor.json
+XClientCfg      = %(DirConf)s/joined.exc
+XServerCfg      = %(DirConf)s/joined.exc
+XClientOut      = %(DirTemp)s/minecraft_exc.jar
+XServerOut      = %(DirTemp)s/minecraft_server_exc.jar
+XClientLog      = %(DirLogs)s/client_exc.log
+XServerLog      = %(DirLogs)s/server_exc.log
+XClientLogReobf = %(DirLogs)s/client_reobf_exc.log
+XServerLogReobf = %(DirLogs)s/server_reobf_exc.log
+XClientMeta     = %(DirTemp)s/client_meta.log
+XServerMeta     = %(DirTemp)s/server_meta.log
+
+
+[DECOMPILE]
+ClsClientTemp = %(DirTempCls)s/minecraft
+ClsServerTemp = %(DirTempCls)s/minecraft_server
+SrcClientTemp = %(DirTempSrc)s/minecraft
+SrcServerTemp = %(DirTempSrc)s/minecraft_server
+FFSource      = net
+FFClientIn    = %(DirTemp)s/minecraft_ff_in.jar
+FFClientOut   = %(DirTemp)s/minecraft_ff_out.jar
+FFClientExtra = %(DirTemp)s/minecraft_ff_extra.jar
+FFServerIn    = %(DirTemp)s/minecraft_server_ff_in.jar
+FFServerOut   = %(DirTemp)s/minecraft_server_ff_out.jar
+FFServerExtra = %(DirTemp)s/minecraft_server_ff_extra.jar
+
+[OUTPUT]
+BinClientTemp = %(DirTempBin)s/minecraft
+BinServerTemp = %(DirTempBin)s/minecraft_server
+SrcClient  = %(DirSrc)s/minecraft
+SrcServer  = %(DirSrc)s/minecraft_server
+TestClient = net/minecraft/client/main/Main
+TestServer = net/minecraft/server/MinecraftServer
+
+[PATCHES]
+PatchClient   = %(DirConf)s/patches/minecraft.patch
+PatchServer   = %(DirConf)s/patches/minecraft_server.patch
+PatchTemp     = %(DirTemp)s/temp.patch
+FFPatchClient = %(DirConf)s/patches/minecraft_ff
+FFPatchServer = %(DirConf)s/patches/minecraft_server_ff
+FFPatchJoined = %(DirConf)s/patches/minecraft_merged_ff
+PatchClient_osx = %(DirConf)s/patches/minecraft_osx.patch
+PatchServer_osx = %(DirConf)s/patches/minecraft_server_osx.patch
+
+[RECOMPILE]
+BinClient       = %(DirBin)s/minecraft
+BinServer       = %(DirBin)s/minecraft_server
+LogClient       = %(DirLogs)s/client_compile.log
+LogServer       = %(DirLogs)s/server_compile.log
+ClassPathClient = %(DirJars)s/libraries/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar
+ClassPathServer = %(DirJars)s/libraries/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.jar
+ClientFixes     = %(DirConf)s/patches
+JavaSrcClient   = %(DirTemp)s/java_src_client.txt
+JavaSrcServer   = %(DirTemp)s/java_src_server.txt
+ScalaSrcClient  = %(DirTemp)s/scala_src_client.txt
+ScalaSrcServer  = %(DirTemp)s/scala_src_server.txt
+FixStart        = Start
+IgnorePkg       = paulscode,com,isom,ibxm,de/matthiasmann/twl,org,javax,argo,gnu,io/netty,oshi,it/unimi
+InjectSrcClient = %(DirConf)s/patches/inject/client
+InjectSrcServer = %(DirConf)s/patches/inject/server
+InjectSrcCommon = %(DirConf)s/patches/inject/common
+PkgInfoClient   = %(DirConf)s/patches/inject/package-info-template.java
+PkgInfoServer   = %(DirConf)s/patches/inject/package-info-template.java
+
+[REOBF]
+MD5Client         = %(DirTemp)s/client.md5
+MD5Server         = %(DirTemp)s/server.md5
+MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
+MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
+RecompJarClient   = %(DirTemp)s/client_recomp.jar
+RecompJarServer   = %(DirTemp)s/server_recomp.jar
+ObfJarClient      = %(DirTemp)s/client_reobf.jar
+ObfJarServer      = %(DirTemp)s/server_reobf.jar
+ReobfDirClient    = %(DirReobf)s/minecraft
+ReobfDirServer    = %(DirReobf)s/minecraft_server
+ClientRoLog       = %(DirLogs)s/client_ro.log
+ServerRoLog       = %(DirLogs)s/server_ro.log
+ReobfClientLog    = %(DirLogs)s/client_reob.log
+ReobfServerLog    = %(DirLogs)s/server_reob.log
+
+[GETMODSOURCE]
+OutSRCClient      = %(DirModSrc)s/minecraft
+OutSRCServer      = %(DirModSrc)s/minecraft_server
+
+[MCP]
+LogFile           = %(DirLogs)s/mcp.log
+LogFileErr        = %(DirLogs)s/mcperr.log
+UpdateUrl         = http://mcp.ocean-labs.de/files/mcprolling_{version}/
+IgnoreUpdate      = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
+RGIndex           = 193900
+
+[ASTYLE]
+AstyleConfig  = %(DirConf)s/astyle.cfg
+
+[COMMANDS]
+Wine          = wine
+Patcher_win   = %(DirRuntime)s/bin/applydiff.exe
+Patcher_linux = patch
+Patcher_osx   = patch
+Jad_win       = %(DirRuntime)s/bin/jad.exe
+Jad_osx       = %(DirRuntime)s/bin/jad-osx
+AStyle_win    = %(DirRuntime)s/bin/astyle.exe
+AStyle_linux  = astyle
+AStyle_osx    = %(DirRuntime)s/bin/astyle-osx
+JadRetro      = %(DirRuntime)s/bin/jadretro.jar
+Fernflower    = %(DirRuntime)s/bin/fernflower.jar
+Exceptor      = %(DirRuntime)s/bin/mcinjector.jar
+SpecialSource = %(DirRuntime)s/bin/specialsource.jar
+CmdPatch      = %s -p1 -u -i {patchfile} -d {srcdir}
+CmdJad        = %s -b -d {outdir} -dead -o -r -s .java -stat -ff {classes}
+CmdAStyle     = %s --suffix=none --quiet --options={conffile} {classes}
+CmdRG         = %s -cp "{classpath}" RetroGuard -searge {conffile}
+CmdRGReobf    = %s -cp "{classpath}" RetroGuard -notch {conffile}
+CmdSS         = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -m {mapfile} --kill-source
+CmdSSReobf    = %s -cp "{classpath}" -jar %s -i {injar} -o {outjar} -r -m {mapfile} -d {identifier} -e %s
+CmdJadretro   = %s -jar %s {targetdir}
+CmdFernflower = %s -jar %s -din=1 -rbr=1 -dgs=1 -asc=1 -rsy=1 -iec=1 -jvn=1 -log=TRACE {extra} {indir} {outdir}
+CmdExceptor   = %s -jar %s --jarIn {input} --jarOut {output} --mapIn {conf} --log {log} --generateParams --lvt=LVT
+CmdExceptorDry = %s -jar %s --jarIn {input} --mapIn {conf} --log {log} --lvt=LVT
+CmdRecomp     = %s -Xlint:-options -deprecation -g -source 1.8 -target 1.8 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} @{javasrc}
+CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.8 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} @{javasrc} @{scalasrc}
+CmdStartSrv   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
+CmdStartClt   = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start

conf/patches/Start.java

@@ -0,0 +1,25 @@
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+
+import net.minecraft.client.main.Main;
+
+public class Start
+{
+    public static void main(String[] args)
+    {
+        /* 
+         * start minecraft game application
+         * --version is just used as 'launched version' in snoop data and is required
+         * Working directory is used as gameDir if not provided
+         */
+        Main.main(concat(new String[]{"--version", "mcp", "--accessToken", "0", "--assetsDir", "assets", "--assetIndex", "1.8", "--userProperties", "{}"}, args));
+    }
+    
+    public static <T> T[] concat(T[] first, T[] second)
+    {
+        T[] result = Arrays.copyOf(first, first.length + second.length);
+        System.arraycopy(second, 0, result, first.length, second.length);
+        return result;
+    }
+}

conf/patches/inject/common/mcp/MethodsReturnNonnullByDefault.java

@@ -0,0 +1,26 @@
+package mcp;
+import javax.annotation.Nonnull;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.meta.TypeQualifierDefault;
+
+/**
+ * This annotation can be applied to a package, class or method to indicate that
+ * the method in that element are nonnull by default unless there is:
+ * <ul>
+ * <li>An explicit nullness annotation
+ * <li>The method overrides a method in a superclass (in which case the
+ * annotation of the corresponding method in the superclass applies)
+ * <li> there is a default parameter annotation applied to a more tightly nested
+ * element.
+ * </ul>
+ *
+ */
+@Documented
+@Nonnull
+@TypeQualifierDefault(ElementType.METHOD) // Note: This is a copy of javax.annotation.ParametersAreNonnullByDefault with target changed to METHOD
+@Retention(RetentionPolicy.RUNTIME)
+public @interface MethodsReturnNonnullByDefault {}

conf/patches/inject/package-info-template.java

@@ -0,0 +1,7 @@
+// Auto generated package-info by MCP
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package {PACKAGE};
+
+import mcp.MethodsReturnNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;

conf/patches/minecraft_ff/net.minecraft.advancements.AdvancementList.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\advancements\AdvancementList.java minecraft_patched\net\minecraft\advancements\AdvancementList.java
+--- minecraft\net\minecraft\advancements\AdvancementList.java
++++ minecraft_patched\net\minecraft\advancements\AdvancementList.java
+@@ -54,7 +54,7 @@
+    }
+ 
+    public void func_192083_a(Map<ResourceLocation, Advancement.Builder> p_192083_1_) {
+-      Function<ResourceLocation, Advancement> function = Functions.<ResourceLocation, Advancement>forMap(this.field_192092_b, (Object)null);
++      Function<ResourceLocation, Advancement> function = Functions.<ResourceLocation, Advancement>forMap(this.field_192092_b, null);
+ 
+       label42:
+       while(!p_192083_1_.isEmpty()) {

conf/patches/minecraft_ff/net.minecraft.advancements.PlayerAdvancements.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\advancements\PlayerAdvancements.java minecraft_patched\net\minecraft\advancements\PlayerAdvancements.java
+--- minecraft\net\minecraft\advancements\PlayerAdvancements.java
++++ minecraft_patched\net\minecraft\advancements\PlayerAdvancements.java
+@@ -119,7 +119,7 @@
+ 
+             Stream<Entry<ResourceLocation, AdvancementProgress>> stream = map.entrySet().stream().sorted(Comparator.comparing(Entry::getValue));
+ 
+-            for(Entry<ResourceLocation, AdvancementProgress> entry : (List)stream.collect(Collectors.toList())) {
++            for(Entry<ResourceLocation, AdvancementProgress> entry : stream.collect(Collectors.toList())) {
+                Advancement advancement = this.field_192756_d.func_191949_aK().func_192778_a(entry.getKey());
+                if (advancement == null) {
+                   field_192753_a.warn("Ignored advancement '" + entry.getKey() + "' in progress file " + this.field_192757_e + " - it doesn't exist anymore?");

conf/patches/minecraft_ff/net.minecraft.block.BlockFurnace.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\block\BlockFurnace.java minecraft_patched\net\minecraft\block\BlockFurnace.java
+--- minecraft\net\minecraft\block\BlockFurnace.java
++++ minecraft_patched\net\minecraft\block\BlockFurnace.java
+@@ -67,6 +67,7 @@
+       }
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public void func_180655_c(IBlockState p_180655_1_, World p_180655_2_, BlockPos p_180655_3_, Random p_180655_4_) {
+       if (this.field_149932_b) {
+          EnumFacing enumfacing = (EnumFacing)p_180655_1_.func_177229_b(field_176447_a);

conf/patches/minecraft_ff/net.minecraft.block.BlockHugeMushroom.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\block\BlockHugeMushroom.java minecraft_patched\net\minecraft\block\BlockHugeMushroom.java
+--- minecraft\net\minecraft\block\BlockHugeMushroom.java
++++ minecraft_patched\net\minecraft\block\BlockHugeMushroom.java
+@@ -141,6 +141,7 @@
+       }
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_) {
+       BlockHugeMushroom.EnumType blockhugemushroom$enumtype = (BlockHugeMushroom.EnumType)p_185471_1_.func_177229_b(field_176380_a);
+       switch(p_185471_2_) {

conf/patches/minecraft_ff/net.minecraft.block.BlockNewLog.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\block\BlockNewLog.java minecraft_patched\net\minecraft\block\BlockNewLog.java
+--- minecraft\net\minecraft\block\BlockNewLog.java
++++ minecraft_patched\net\minecraft\block\BlockNewLog.java
+@@ -68,6 +68,7 @@
+       return iblockstate;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public int func_176201_c(IBlockState p_176201_1_) {
+       int i = 0;
+       i = i | ((BlockPlanks.EnumType)p_176201_1_.func_177229_b(field_176300_b)).func_176839_a() - 4;

conf/patches/minecraft_ff/net.minecraft.block.BlockOldLog.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\block\BlockOldLog.java minecraft_patched\net\minecraft\block\BlockOldLog.java
+--- minecraft\net\minecraft\block\BlockOldLog.java
++++ minecraft_patched\net\minecraft\block\BlockOldLog.java
+@@ -74,6 +74,7 @@
+       return iblockstate;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public int func_176201_c(IBlockState p_176201_1_) {
+       int i = 0;
+       i = i | ((BlockPlanks.EnumType)p_176201_1_.func_177229_b(field_176301_b)).func_176839_a();

conf/patches/minecraft_ff/net.minecraft.block.BlockRail.java.patch

@@ -0,0 +1,19 @@
+diff -r -U 3 minecraft\net\minecraft\block\BlockRail.java minecraft_patched\net\minecraft\block\BlockRail.java
+--- minecraft\net\minecraft\block\BlockRail.java
++++ minecraft_patched\net\minecraft\block\BlockRail.java
+@@ -36,6 +36,7 @@
+       return ((BlockRailBase.EnumRailDirection)p_176201_1_.func_177229_b(field_176565_b)).func_177015_a();
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_) {
+       switch(p_185499_2_) {
+       case CLOCKWISE_180:
+@@ -108,6 +109,7 @@
+       }
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_) {
+       BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_185471_1_.func_177229_b(field_176565_b);
+       switch(p_185471_2_) {

conf/patches/minecraft_ff/net.minecraft.block.BlockRailDetector.java.patch

@@ -0,0 +1,19 @@
+diff -r -U 3 minecraft\net\minecraft\block\BlockRailDetector.java minecraft_patched\net\minecraft\block\BlockRailDetector.java
+--- minecraft\net\minecraft\block\BlockRailDetector.java
++++ minecraft_patched\net\minecraft\block\BlockRailDetector.java
+@@ -170,6 +170,7 @@
+       return i;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_) {
+       switch(p_185499_2_) {
+       case CLOCKWISE_180:
+@@ -242,6 +243,7 @@
+       }
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_) {
+       BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_185471_1_.func_177229_b(field_176573_b);
+       switch(p_185471_2_) {

conf/patches/minecraft_ff/net.minecraft.block.BlockRailPowered.java.patch

@@ -0,0 +1,27 @@
+diff -r -U 3 minecraft\net\minecraft\block\BlockRailPowered.java minecraft_patched\net\minecraft\block\BlockRailPowered.java
+--- minecraft\net\minecraft\block\BlockRailPowered.java
++++ minecraft_patched\net\minecraft\block\BlockRailPowered.java
+@@ -25,6 +25,7 @@
+       this.func_180632_j(this.field_176227_L.func_177621_b().func_177226_a(field_176568_b, BlockRailBase.EnumRailDirection.NORTH_SOUTH).func_177226_a(field_176569_M, Boolean.valueOf(false)));
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    protected boolean func_176566_a(World p_176566_1_, BlockPos p_176566_2_, IBlockState p_176566_3_, boolean p_176566_4_, int p_176566_5_) {
+       if (p_176566_5_ >= 8) {
+          return false;
+@@ -155,6 +156,7 @@
+       return i;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public IBlockState func_185499_a(IBlockState p_185499_1_, Rotation p_185499_2_) {
+       switch(p_185499_2_) {
+       case CLOCKWISE_180:
+@@ -227,6 +229,7 @@
+       }
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_) {
+       BlockRailBase.EnumRailDirection blockrailbase$enumraildirection = (BlockRailBase.EnumRailDirection)p_185471_1_.func_177229_b(field_176568_b);
+       switch(p_185471_2_) {

conf/patches/minecraft_ff/net.minecraft.block.BlockStairs.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\block\BlockStairs.java minecraft_patched\net\minecraft\block\BlockStairs.java
+--- minecraft\net\minecraft\block\BlockStairs.java
++++ minecraft_patched\net\minecraft\block\BlockStairs.java
+@@ -346,6 +346,7 @@
+       return p_185499_1_.func_177226_a(field_176309_a, p_185499_2_.func_185831_a((EnumFacing)p_185499_1_.func_177229_b(field_176309_a)));
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public IBlockState func_185471_a(IBlockState p_185471_1_, Mirror p_185471_2_) {
+       EnumFacing enumfacing = (EnumFacing)p_185471_1_.func_177229_b(field_176309_a);
+       BlockStairs.EnumShape blockstairs$enumshape = (BlockStairs.EnumShape)p_185471_1_.func_177229_b(field_176310_M);

conf/patches/minecraft_ff/net.minecraft.block.state.BlockStateBase.java.patch

@@ -0,0 +1,18 @@
+diff -r -U 3 minecraft\net\minecraft\block\state\BlockStateBase.java minecraft_patched\net\minecraft\block\state\BlockStateBase.java
+--- minecraft\net\minecraft\block\state\BlockStateBase.java
++++ minecraft_patched\net\minecraft\block\state\BlockStateBase.java
+@@ -24,12 +24,12 @@
+       }
+ 
+       private <T extends Comparable<T>> String func_185886_a(IProperty<T> p_185886_1_, Comparable<?> p_185886_2_) {
+-         return p_185886_1_.func_177702_a(p_185886_2_);
++         return p_185886_1_.func_177702_a((T)p_185886_2_);
+       }
+    };
+ 
+    public <T extends Comparable<T>> IBlockState func_177231_a(IProperty<T> p_177231_1_) {
+-      return this.func_177226_a(p_177231_1_, (Comparable)func_177232_a(p_177231_1_.func_177700_c(), this.func_177229_b(p_177231_1_)));
++      return this.func_177226_a(p_177231_1_, func_177232_a(p_177231_1_.func_177700_c(), this.func_177229_b(p_177231_1_)));
+    }
+ 
+    protected static <T> T func_177232_a(Collection<T> p_177232_0_, T p_177232_1_) {

conf/patches/minecraft_ff/net.minecraft.block.state.BlockStateContainer.java.patch

@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\block\state\BlockStateContainer.java minecraft_patched\net\minecraft\block\state\BlockStateContainer.java
+--- minecraft\net\minecraft\block\state\BlockStateContainer.java
++++ minecraft_patched\net\minecraft\block\state\BlockStateContainer.java
+@@ -76,7 +76,7 @@
+          blockstatecontainer$stateimplementation1.func_177235_a(map2);
+       }
+ 
+-      this.field_177625_e = ImmutableList.copyOf(list1);
++      this.field_177625_e = ImmutableList.<IBlockState>copyOf(list1);
+    }
+ 
+    public static <T extends Comparable<T>> String func_185919_a(Block p_185919_0_, IProperty<T> p_185919_1_) {
+@@ -106,7 +106,7 @@
+ 
+       while(unmodifiableiterator.hasNext()) {
+          IProperty<?> iproperty = (IProperty)unmodifiableiterator.next();
+-         list.add(iproperty.func_177700_c());
++         list.add(((IProperty)iproperty).func_177700_c());
+       }
+ 
+       return list;

conf/patches/minecraft_ff/net.minecraft.block.state.pattern.BlockStateMatcher.java.patch

@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\block\state\pattern\BlockStateMatcher.java minecraft_patched\net\minecraft\block\state\pattern\BlockStateMatcher.java
+--- minecraft\net\minecraft\block\state\pattern\BlockStateMatcher.java
++++ minecraft_patched\net\minecraft\block\state\pattern\BlockStateMatcher.java
+@@ -33,7 +33,7 @@
+             return true;
+          } else {
+             for(Entry<IProperty<?>, Predicate<?>> entry : this.field_177640_b.entrySet()) {
+-               if (!this.func_185927_a(p_apply_1_, entry.getKey(), entry.getValue())) {
++               if (!this.func_185927_a(p_apply_1_, (IProperty)entry.getKey(), (Predicate)entry.getValue())) {
+                   return false;
+                }
+             }
+@@ -45,7 +45,7 @@
+       }
+    }
+ 
+-   protected <T extends Comparable<T>> boolean func_185927_a(IBlockState p_185927_1_, IProperty<T> p_185927_2_, Predicate<?> p_185927_3_) {
++   protected <T extends Comparable<T>> boolean func_185927_a(IBlockState p_185927_1_, IProperty<T> p_185927_2_, Predicate<T> p_185927_3_) {
+       return p_185927_3_.apply(p_185927_1_.func_177229_b(p_185927_2_));
+    }
+ 

conf/patches/minecraft_ff/net.minecraft.block.state.pattern.FactoryBlockPattern.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\block\state\pattern\FactoryBlockPattern.java minecraft_patched\net\minecraft\block\state\pattern\FactoryBlockPattern.java
+--- minecraft\net\minecraft\block\state\pattern\FactoryBlockPattern.java
++++ minecraft_patched\net\minecraft\block\state\pattern\FactoryBlockPattern.java
+@@ -41,7 +41,7 @@
+ 
+                for(char c0 : s.toCharArray()) {
+                   if (!this.field_177666_c.containsKey(Character.valueOf(c0))) {
+-                     this.field_177666_c.put(Character.valueOf(c0), (Object)null);
++                     this.field_177666_c.put(Character.valueOf(c0), null);
+                   }
+                }
+             }

conf/patches/minecraft_ff/net.minecraft.client.Minecraft.java.patch

@@ -0,0 +1,38 @@
+diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
+--- minecraft\net\minecraft\client\Minecraft.java
++++ minecraft_patched\net\minecraft\client\Minecraft.java
+@@ -376,9 +376,7 @@
+ 
+       while(true) {
+          try {
+-            if (!this.field_71425_J) {
+-               break;
+-            }
++            while(this.field_71425_J) {
+ 
+             if (!this.field_71434_R || this.field_71433_S == null) {
+                try {
+@@ -388,10 +386,12 @@
+                   this.func_147108_a(new GuiMemoryErrorScreen());
+                   System.gc();
+                }
+-               continue;
+-            }
+-
++            }
++            else
++            {
+             this.func_71377_b(this.field_71433_S);
++            }
++            }
+          } catch (MinecraftError var12) {
+             break;
+          } catch (ReportedException reportedexception) {
+@@ -1282,6 +1282,7 @@
+       }
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    private void func_147121_ag() {
+       if (!this.field_71442_b.func_181040_m()) {
+          this.field_71467_ac = 4;

conf/patches/minecraft_ff/net.minecraft.client.gui.GuiOverlayDebug.java.patch

@@ -0,0 +1,20 @@
+diff -r -U 3 minecraft\net\minecraft\client\gui\GuiOverlayDebug.java minecraft_patched\net\minecraft\client\gui\GuiOverlayDebug.java
+--- minecraft\net\minecraft\client\gui\GuiOverlayDebug.java
++++ minecraft_patched\net\minecraft\client\gui\GuiOverlayDebug.java
+@@ -85,6 +85,7 @@
+ 
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    protected List<String> call() {
+       BlockPos blockpos = new BlockPos(this.field_175242_a.func_175606_aa().field_70165_t, this.field_175242_a.func_175606_aa().func_174813_aQ().field_72338_b, this.field_175242_a.func_175606_aa().field_70161_v);
+       if (this.field_175242_a.func_189648_am()) {
+@@ -168,7 +169,7 @@
+             for(UnmodifiableIterator unmodifiableiterator = iblockstate.func_177228_b().entrySet().iterator(); unmodifiableiterator.hasNext(); list.add(iproperty.func_177701_a() + ": " + s)) {
+                Entry<IProperty<?>, Comparable<?>> entry = (Entry)unmodifiableiterator.next();
+                iproperty = (IProperty)entry.getKey();
+-               T t = entry.getValue();
++               T t = (T)entry.getValue();
+                s = iproperty.func_177702_a(t);
+                if (Boolean.TRUE.equals(t)) {
+                   s = TextFormatting.GREEN + s;

conf/patches/minecraft_ff/net.minecraft.client.gui.GuiSnooper.java.patch

@@ -0,0 +1,19 @@
+diff -r -U 3 minecraft\net\minecraft\client\gui\GuiSnooper.java minecraft_patched\net\minecraft\client\gui\GuiSnooper.java
+--- minecraft\net\minecraft\client\gui\GuiSnooper.java
++++ minecraft_patched\net\minecraft\client\gui\GuiSnooper.java
+@@ -38,13 +38,13 @@
+       this.field_146292_n.add(new GuiButton(2, this.field_146294_l / 2 + 2, this.field_146295_m - 30, 150, 20, I18n.func_135052_a("gui.done")));
+       boolean flag = this.field_146297_k.func_71401_C() != null && this.field_146297_k.func_71401_C().func_80003_ah() != null;
+ 
+-      for(Entry<String, String> entry : (new TreeMap(this.field_146297_k.func_71378_E().func_76465_c())).entrySet()) {
++      for(Entry<String, String> entry : (new TreeMap<String, String>(this.field_146297_k.func_71378_E().func_76465_c())).entrySet()) {
+          this.field_146604_g.add((flag ? "C " : "") + (String)entry.getKey());
+          this.field_146609_h.add(this.field_146289_q.func_78269_a(entry.getValue(), this.field_146294_l - 220));
+       }
+ 
+       if (flag) {
+-         for(Entry<String, String> entry1 : (new TreeMap(this.field_146297_k.func_71401_C().func_80003_ah().func_76465_c())).entrySet()) {
++         for(Entry<String, String> entry1 : (new TreeMap<String, String>(this.field_146297_k.func_71401_C().func_80003_ah().func_76465_c())).entrySet()) {
+             this.field_146604_g.add("S " + (String)entry1.getKey());
+             this.field_146609_h.add(this.field_146289_q.func_78269_a(entry1.getValue(), this.field_146294_l - 220));
+          }

conf/patches/minecraft_ff/net.minecraft.client.gui.recipebook.GuiRecipeBook.java.patch

@@ -0,0 +1,25 @@
+diff -r -U 3 minecraft\net\minecraft\client\gui\recipebook\GuiRecipeBook.java minecraft_patched\net\minecraft\client\gui\recipebook\GuiRecipeBook.java
+--- minecraft\net\minecraft\client\gui\recipebook\GuiRecipeBook.java
++++ minecraft_patched\net\minecraft\client\gui\recipebook\GuiRecipeBook.java
+@@ -161,7 +161,7 @@
+       if (!s.isEmpty()) {
+          ObjectSet<RecipeList> objectset = new ObjectLinkedOpenHashSet<RecipeList>(this.field_191888_F.func_193987_a(SearchTreeManager.field_194012_b).func_194038_a(s.toLowerCase(Locale.ROOT)));
+          list1.removeIf((p_193947_1_) -> {
+-            return !p_193947_0_.contains(p_193947_1_);
++            return !objectset.contains(p_193947_1_);
+          });
+       }
+ 
+@@ -462,9 +462,9 @@
+ 
+          if (this.field_193965_u.func_194118_a(p_193950_1_, intlist, j1)) {
+             List<CPacketRecipePlacement.ItemMove> list2 = this.func_193954_a(p_193950_4_);
+-            lvt_10_1_ = Lists.<CPacketRecipePlacement.ItemMove>newArrayList();
+-            this.func_193013_a(p_193950_1_, p_193950_2_, j1, intlist, lvt_10_1_);
+-            this.field_191888_F.field_71442_b.func_192831_a(p_193950_3_, list2, lvt_10_1_, this.field_191888_F.field_71439_g);
++            List<CPacketRecipePlacement.ItemMove> list3 = Lists.<CPacketRecipePlacement.ItemMove>newArrayList();
++            this.func_193013_a(p_193950_1_, p_193950_2_, j1, intlist, list3);
++            this.field_191888_F.field_71442_b.func_192831_a(p_193950_3_, list2, list3, this.field_191888_F.field_71439_g);
+             this.field_191888_F.field_71439_g.field_71071_by.func_70296_d();
+          }
+       }

conf/patches/minecraft_ff/net.minecraft.client.model.ModelBiped.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\client\model\ModelBiped.java minecraft_patched\net\minecraft\client\model\ModelBiped.java
+--- minecraft\net\minecraft\client\model\ModelBiped.java
++++ minecraft_patched\net\minecraft\client\model\ModelBiped.java
+@@ -92,6 +92,7 @@
+       GlStateManager.func_179121_F();
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public void func_78087_a(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_) {
+       boolean flag = p_78087_7_ instanceof EntityLivingBase && ((EntityLivingBase)p_78087_7_).func_184599_cB() > 4;
+       this.field_78116_c.field_78796_g = p_78087_4_ * 0.017453292F;

conf/patches/minecraft_ff/net.minecraft.client.network.NetHandlerPlayClient.java.patch

@@ -0,0 +1,37 @@
+diff -r -U 3 minecraft\net\minecraft\client\network\NetHandlerPlayClient.java minecraft_patched\net\minecraft\client\network\NetHandlerPlayClient.java
+--- minecraft\net\minecraft\client\network\NetHandlerPlayClient.java
++++ minecraft_patched\net\minecraft\client\network\NetHandlerPlayClient.java
+@@ -1159,14 +1159,14 @@
+          break;
+       case ADD:
+          p_191980_1_.func_192595_a().forEach((p_194025_2_) -> {
+-            p_194025_1_.func_194073_a(p_194025_2_);
+-            p_194025_1_.func_193825_e(p_194025_2_);
++            recipebook.func_194073_a(p_194025_2_);
++            recipebook.func_193825_e(p_194025_2_);
+             RecipeToast.func_193665_a(this.field_147299_f.func_193033_an(), p_194025_2_);
+          });
+       }
+ 
+       RecipeBookClient.field_194087_f.forEach((p_194023_1_) -> {
+-         p_194023_1_.func_194214_a(p_194023_0_);
++         p_194023_1_.func_194214_a(recipebook);
+       });
+       if (this.field_147299_f.field_71462_r instanceof IRecipeShownListener) {
+          ((IRecipeShownListener)this.field_147299_f.field_71462_r).func_192043_J_();
+@@ -1218,6 +1218,7 @@
+       p_175093_1_.func_179788_a(this.field_147300_g.func_175723_af());
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public void func_175099_a(SPacketTitle p_175099_1_) {
+       PacketThreadUtil.func_180031_a(p_175099_1_, this, this.field_147299_f);
+       SPacketTitle.Type spackettitle$type = p_175099_1_.func_179807_a();
+@@ -1257,6 +1258,7 @@
+ 
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public void func_147256_a(SPacketPlayerListItem p_147256_1_) {
+       PacketThreadUtil.func_180031_a(p_147256_1_, this, this.field_147299_f);
+ 

conf/patches/minecraft_ff/net.minecraft.client.particle.ParticleManager.java.patch

@@ -0,0 +1,13 @@
+diff -r -U 3 minecraft\net\minecraft\client\particle\ParticleManager.java minecraft_patched\net\minecraft\client\particle\ParticleManager.java
+--- minecraft\net\minecraft\client\particle\ParticleManager.java
++++ minecraft_patched\net\minecraft\client\particle\ParticleManager.java
+@@ -239,7 +239,8 @@
+       GlStateManager.func_187401_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
+       GlStateManager.func_179092_a(516, 0.003921569F);
+ 
+-      for(final int i = 0; i < 3; ++i) {
++      for(int i_nf = 0; i_nf < 3; ++i_nf) {
++         final int i = i_nf;
+          for(int j = 0; j < 2; ++j) {
+             if (!this.field_78876_b[i][j].isEmpty()) {
+                switch(j) {

conf/patches/minecraft_ff/net.minecraft.client.renderer.BlockRendererDispatcher.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\BlockRendererDispatcher.java minecraft_patched\net\minecraft\client\renderer\BlockRendererDispatcher.java
+--- minecraft\net\minecraft\client\renderer\BlockRendererDispatcher.java
++++ minecraft_patched\net\minecraft\client\renderer\BlockRendererDispatcher.java
+@@ -81,6 +81,7 @@
+       return this.field_175028_a.func_178125_b(p_184389_1_);
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public void func_175016_a(IBlockState p_175016_1_, float p_175016_2_) {
+       EnumBlockRenderType enumblockrendertype = p_175016_1_.func_185901_i();
+       if (enumblockrendertype != EnumBlockRenderType.INVISIBLE) {

conf/patches/minecraft_ff/net.minecraft.client.renderer.EntityRenderer.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\EntityRenderer.java minecraft_patched\net\minecraft\client\renderer\EntityRenderer.java
+--- minecraft\net\minecraft\client\renderer\EntityRenderer.java
++++ minecraft_patched\net\minecraft\client\renderer\EntityRenderer.java
+@@ -315,7 +315,7 @@
+                   flag = true;
+                }
+ 
+-               d0 = d0;
++//               d0 = d0;
+             }
+ 
+             if (this.field_78531_r.field_71476_x != null) {

conf/patches/minecraft_ff/net.minecraft.client.renderer.ItemRenderer.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\ItemRenderer.java minecraft_patched\net\minecraft\client\renderer\ItemRenderer.java
+--- minecraft\net\minecraft\client\renderer\ItemRenderer.java
++++ minecraft_patched\net\minecraft\client\renderer\ItemRenderer.java
+@@ -216,7 +216,7 @@
+       GlStateManager.func_179114_b(200.0F, 1.0F, 0.0F, 0.0F);
+       GlStateManager.func_179114_b(f * -135.0F, 0.0F, 1.0F, 0.0F);
+       GlStateManager.func_179109_b(f * 5.6F, 0.0F, 0.0F);
+-      RenderPlayer renderplayer = (RenderPlayer)this.field_178111_g.func_78713_a(abstractclientplayer);
++      RenderPlayer renderplayer = (RenderPlayer)this.field_178111_g.<AbstractClientPlayer>func_78713_a(abstractclientplayer);
+       GlStateManager.func_179129_p();
+       if (flag) {
+          renderplayer.func_177138_b(abstractclientplayer);

conf/patches/minecraft_ff/net.minecraft.client.renderer.RenderGlobal.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\RenderGlobal.java minecraft_patched\net\minecraft\client\renderer\RenderGlobal.java
+--- minecraft\net\minecraft\client\renderer\RenderGlobal.java
++++ minecraft_patched\net\minecraft\client\renderer\RenderGlobal.java
+@@ -917,6 +917,7 @@
+       return l;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    private void func_174982_a(BlockRenderLayer p_174982_1_) {
+       this.field_72777_q.field_71460_t.func_180436_i();
+       if (OpenGlHelper.func_176075_f()) {

conf/patches/minecraft_ff/net.minecraft.client.renderer.block.model.Variant.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\block\model\Variant.java minecraft_patched\net\minecraft\client\renderer\block\model\Variant.java
+--- minecraft\net\minecraft\client\renderer\block\model\Variant.java
++++ minecraft_patched\net\minecraft\client\renderer\block\model\Variant.java
+@@ -56,7 +56,7 @@
+    public int hashCode() {
+       int i = this.field_188050_a.hashCode();
+       i = 31 * i + this.field_188051_b.hashCode();
+-      i = 31 * i + this.field_188052_c.hashCode();
++      i = 31 * i + Boolean.valueOf(this.field_188052_c).hashCode();
+       i = 31 * i + this.field_188053_d;
+       return i;
+    }

conf/patches/minecraft_ff/net.minecraft.client.renderer.block.statemap.StateMap.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\block\statemap\StateMap.java minecraft_patched\net\minecraft\client\renderer\block\statemap\StateMap.java
+--- minecraft\net\minecraft\client\renderer\block\statemap\StateMap.java
++++ minecraft_patched\net\minecraft\client\renderer\block\statemap\StateMap.java
+@@ -44,7 +44,7 @@
+    }
+ 
+    private <T extends Comparable<T>> String func_187490_a(IProperty<T> p_187490_1_, Map<IProperty<?>, Comparable<?>> p_187490_2_) {
+-      return p_187490_1_.func_177702_a(p_187490_2_.remove(this.field_178142_a));
++      return p_187490_1_.func_177702_a((T)p_187490_2_.remove(this.field_178142_a));
+    }
+ 
+    public static class Builder {

conf/patches/minecraft_ff/net.minecraft.client.renderer.block.statemap.StateMapperBase.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\block\statemap\StateMapperBase.java minecraft_patched\net\minecraft\client\renderer\block\statemap\StateMapperBase.java
+--- minecraft\net\minecraft\client\renderer\block\statemap\StateMapperBase.java
++++ minecraft_patched\net\minecraft\client\renderer\block\statemap\StateMapperBase.java
+@@ -34,7 +34,7 @@
+    }
+ 
+    private <T extends Comparable<T>> String func_187489_a(IProperty<T> p_187489_1_, Comparable<?> p_187489_2_) {
+-      return p_187489_1_.func_177702_a(p_187489_2_);
++      return p_187489_1_.func_177702_a((T)p_187489_2_);
+    }
+ 
+    public Map<IBlockState, ModelResourceLocation> func_178130_a(Block p_178130_1_) {

conf/patches/minecraft_ff/net.minecraft.client.renderer.chunk.ChunkRenderWorker.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\chunk\ChunkRenderWorker.java minecraft_patched\net\minecraft\client\renderer\chunk\ChunkRenderWorker.java
+--- minecraft\net\minecraft\client\renderer\chunk\ChunkRenderWorker.java
++++ minecraft_patched\net\minecraft\client\renderer\chunk\ChunkRenderWorker.java
+@@ -82,7 +82,7 @@
+       }
+ 
+       Entity entity = Minecraft.func_71410_x().func_175606_aa();
+-      if (lvt_2_2_ == null) {
++      if (entity == null) {
+          p_178474_1_.func_178542_e();
+       } else {
+          p_178474_1_.func_178541_a(this.func_178475_b());

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.RenderArmorStand.java.patch

@@ -0,0 +1,14 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\RenderArmorStand.java minecraft_patched\net\minecraft\client\renderer\entity\RenderArmorStand.java
+--- minecraft\net\minecraft\client\renderer\entity\RenderArmorStand.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\RenderArmorStand.java
+@@ -18,8 +18,8 @@
+       super(p_i46195_1_, new ModelArmorStand(), 0.0F);
+       LayerBipedArmor layerbipedarmor = new LayerBipedArmor(this) {
+          protected void func_177177_a() {
+-            this.field_177189_c = (T)(new ModelArmorStandArmor(0.5F));
+-            this.field_177186_d = (T)(new ModelArmorStandArmor(1.0F));
++            this.field_177189_c = new ModelArmorStandArmor(0.5F);
++            this.field_177186_d = new ModelArmorStandArmor(1.0F);
+          }
+       };
+       this.func_177094_a(layerbipedarmor);

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.RenderGiantZombie.java.patch

@@ -0,0 +1,14 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\RenderGiantZombie.java minecraft_patched\net\minecraft\client\renderer\entity\RenderGiantZombie.java
+--- minecraft\net\minecraft\client\renderer\entity\RenderGiantZombie.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\RenderGiantZombie.java
+@@ -17,8 +17,8 @@
+       this.func_177094_a(new LayerHeldItem(this));
+       this.func_177094_a(new LayerBipedArmor(this) {
+          protected void func_177177_a() {
+-            this.field_177189_c = (T)(new ModelZombie(0.5F, true));
+-            this.field_177186_d = (T)(new ModelZombie(1.0F, true));
++            this.field_177189_c = new ModelZombie(0.5F, true);
++            this.field_177186_d = new ModelZombie(1.0F, true);
+          }
+       });
+    }

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.RenderLivingBase.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\RenderLivingBase.java minecraft_patched\net\minecraft\client\renderer\entity\RenderLivingBase.java
+--- minecraft\net\minecraft\client\renderer\entity\RenderLivingBase.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\RenderLivingBase.java
+@@ -35,7 +35,7 @@
+    }
+ 
+    protected <V extends EntityLivingBase, U extends LayerRenderer<V>> boolean func_177094_a(U p_177094_1_) {
+-      return this.field_177097_h.add(p_177094_1_);
++      return this.field_177097_h.add((LayerRenderer<T>)p_177094_1_);
+    }
+ 
+    public ModelBase func_177087_b() {

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.RenderManager.java.patch

@@ -0,0 +1,24 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\RenderManager.java minecraft_patched\net\minecraft\client\renderer\entity\RenderManager.java
+--- minecraft\net\minecraft\client\renderer\entity\RenderManager.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\RenderManager.java
+@@ -231,9 +231,9 @@
+    }
+ 
+    public <T extends Entity> Render<T> func_78715_a(Class<? extends Entity> p_78715_1_) {
+-      Render<? extends Entity> render = (Render)this.field_78729_o.get(p_78715_1_);
++      Render<T> render = (Render)this.field_78729_o.get(p_78715_1_);
+       if (render == null && p_78715_1_ != Entity.class) {
+-         render = this.<Entity>func_78715_a(p_78715_1_.getSuperclass());
++         render = this.func_78715_a((Class<? extends Entity>)p_78715_1_.getSuperclass());
+          this.field_78729_o.put(p_78715_1_, render);
+       }
+ 
+@@ -245,7 +245,7 @@
+       if (p_78713_1_ instanceof AbstractClientPlayer) {
+          String s = ((AbstractClientPlayer)p_78713_1_).func_175154_l();
+          RenderPlayer renderplayer = this.field_178636_l.get(s);
+-         return renderplayer != null ? renderplayer : this.field_178637_m;
++         return (Render<T>)(renderplayer != null ? renderplayer : this.field_178637_m);
+       } else {
+          return this.<T>func_78715_a(p_78713_1_.getClass());
+       }

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.RenderPigZombie.java.patch

@@ -0,0 +1,14 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\RenderPigZombie.java minecraft_patched\net\minecraft\client\renderer\entity\RenderPigZombie.java
+--- minecraft\net\minecraft\client\renderer\entity\RenderPigZombie.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\RenderPigZombie.java
+@@ -12,8 +12,8 @@
+       super(p_i46148_1_, new ModelZombie(), 0.5F);
+       this.func_177094_a(new LayerBipedArmor(this) {
+          protected void func_177177_a() {
+-            this.field_177189_c = (T)(new ModelZombie(0.5F, true));
+-            this.field_177186_d = (T)(new ModelZombie(1.0F, true));
++            this.field_177189_c = new ModelZombie(0.5F, true);
++            this.field_177186_d = new ModelZombie(1.0F, true);
+          }
+       });
+    }

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.RenderSkeleton.java.patch

@@ -0,0 +1,14 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\RenderSkeleton.java minecraft_patched\net\minecraft\client\renderer\entity\RenderSkeleton.java
+--- minecraft\net\minecraft\client\renderer\entity\RenderSkeleton.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\RenderSkeleton.java
+@@ -15,8 +15,8 @@
+       this.func_177094_a(new LayerHeldItem(this));
+       this.func_177094_a(new LayerBipedArmor(this) {
+          protected void func_177177_a() {
+-            this.field_177189_c = (T)(new ModelSkeleton(0.5F, true));
+-            this.field_177186_d = (T)(new ModelSkeleton(1.0F, true));
++            this.field_177189_c = new ModelSkeleton(0.5F, true);
++            this.field_177186_d = new ModelSkeleton(1.0F, true);
+          }
+       });
+    }

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.RenderZombie.java.patch

@@ -0,0 +1,14 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\RenderZombie.java minecraft_patched\net\minecraft\client\renderer\entity\RenderZombie.java
+--- minecraft\net\minecraft\client\renderer\entity\RenderZombie.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\RenderZombie.java
+@@ -12,8 +12,8 @@
+       super(p_i46127_1_, new ModelZombie(), 0.5F);
+       LayerBipedArmor layerbipedarmor = new LayerBipedArmor(this) {
+          protected void func_177177_a() {
+-            this.field_177189_c = (T)(new ModelZombie(0.5F, true));
+-            this.field_177186_d = (T)(new ModelZombie(1.0F, true));
++            this.field_177189_c = new ModelZombie(0.5F, true);
++            this.field_177186_d = new ModelZombie(1.0F, true);
+          }
+       };
+       this.func_177094_a(layerbipedarmor);

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.layers.LayerBipedArmor.java.patch

@@ -0,0 +1,17 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\layers\LayerBipedArmor.java minecraft_patched\net\minecraft\client\renderer\entity\layers\LayerBipedArmor.java
+--- minecraft\net\minecraft\client\renderer\entity\layers\LayerBipedArmor.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\layers\LayerBipedArmor.java
+@@ -10,10 +10,11 @@
+    }
+ 
+    protected void func_177177_a() {
+-      this.field_177189_c = (T)(new ModelBiped(0.5F));
+-      this.field_177186_d = (T)(new ModelBiped(1.0F));
++      this.field_177189_c = new ModelBiped(0.5F);
++      this.field_177186_d = new ModelBiped(1.0F);
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    protected void func_188359_a(ModelBiped p_188359_1_, EntityEquipmentSlot p_188359_2_) {
+       this.func_177194_a(p_188359_1_);
+       switch(p_188359_2_) {

conf/patches/minecraft_ff/net.minecraft.client.renderer.entity.layers.LayerVillagerArmor.java.patch

@@ -0,0 +1,13 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\entity\layers\LayerVillagerArmor.java minecraft_patched\net\minecraft\client\renderer\entity\layers\LayerVillagerArmor.java
+--- minecraft\net\minecraft\client\renderer\entity\layers\LayerVillagerArmor.java
++++ minecraft_patched\net\minecraft\client\renderer\entity\layers\LayerVillagerArmor.java
+@@ -9,7 +9,7 @@
+    }
+ 
+    protected void func_177177_a() {
+-      this.field_177189_c = (T)(new ModelZombieVillager(0.5F, 0.0F, true));
+-      this.field_177186_d = (T)(new ModelZombieVillager(1.0F, 0.0F, true));
++      this.field_177189_c = new ModelZombieVillager(0.5F, 0.0F, true);
++      this.field_177186_d = new ModelZombieVillager(1.0F, 0.0F, true);
+    }
+ }

conf/patches/minecraft_ff/net.minecraft.client.renderer.texture.TextureAtlasSprite.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\texture\TextureAtlasSprite.java minecraft_patched\net\minecraft\client\renderer\texture\TextureAtlasSprite.java
+--- minecraft\net\minecraft\client\renderer\texture\TextureAtlasSprite.java
++++ minecraft_patched\net\minecraft\client\renderer\texture\TextureAtlasSprite.java
+@@ -278,7 +278,7 @@
+    private void func_130099_d(int p_130099_1_) {
+       if (this.field_110976_a.size() <= p_130099_1_) {
+          for(int i = this.field_110976_a.size(); i <= p_130099_1_; ++i) {
+-            this.field_110976_a.add((Object)null);
++            this.field_110976_a.add(null);
+          }
+ 
+       }

conf/patches/minecraft_ff/net.minecraft.client.renderer.texture.TextureManager.java.patch

@@ -0,0 +1,27 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\texture\TextureManager.java minecraft_patched\net\minecraft\client\renderer\texture\TextureManager.java
+--- minecraft\net\minecraft\client\renderer\texture\TextureManager.java
++++ minecraft_patched\net\minecraft\client\renderer\texture\TextureManager.java
+@@ -48,7 +48,7 @@
+       }
+    }
+ 
+-   public boolean func_110579_a(ResourceLocation p_110579_1_, final ITextureObject p_110579_2_) {
++   public boolean func_110579_a(ResourceLocation p_110579_1_, ITextureObject p_110579_2_) {
+       boolean flag = true;
+ 
+       try {
+@@ -62,12 +62,13 @@
+          this.field_110585_a.put(p_110579_1_, p_110579_2_);
+          flag = false;
+       } catch (Throwable throwable) {
++        final ITextureObject p_110579_2_f = p_110579_2_;
+          CrashReport crashreport = CrashReport.func_85055_a(throwable, "Registering texture");
+          CrashReportCategory crashreportcategory = crashreport.func_85058_a("Resource location being registered");
+          crashreportcategory.func_71507_a("Resource location", p_110579_1_);
+          crashreportcategory.func_189529_a("Texture object class", new ICrashReportDetail<String>() {
+             public String call() throws Exception {
+-               return p_110579_2_.getClass().getName();
++               return p_110579_2_f.getClass().getName();
+             }
+          });
+          throw new ReportedException(crashreport);

conf/patches/minecraft_ff/net.minecraft.client.renderer.texture.TextureMap.java.patch

@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\texture\TextureMap.java minecraft_patched\net\minecraft\client\renderer\texture\TextureMap.java
+--- minecraft\net\minecraft\client\renderer\texture\TextureMap.java
++++ minecraft_patched\net\minecraft\client\renderer\texture\TextureMap.java
+@@ -53,7 +53,7 @@
+       this.field_94249_f.func_110969_c(16);
+       int[][] aint1 = new int[this.field_147636_j + 1][];
+       aint1[0] = aint;
+-      this.field_94249_f.func_110968_a(Lists.newArrayList(aint1));
++      this.field_94249_f.func_110968_a(Lists.<int[][]>newArrayList(aint1));
+    }
+ 
+    public void func_110551_a(IResourceManager p_110551_1_) throws IOException {
+@@ -101,7 +101,7 @@
+ 
+          j = Math.min(j, Math.min(textureatlassprite.func_94211_a(), textureatlassprite.func_94216_b()));
+          int j1 = Math.min(Integer.lowestOneBit(textureatlassprite.func_94211_a()), Integer.lowestOneBit(textureatlassprite.func_94216_b()));
+-         if (lvt_11_4_ < k) {
++         if (j1 < k) {
+             field_147635_d.warn("Texture {} with size {}x{} limits mip level from {} to {}", resourcelocation, Integer.valueOf(textureatlassprite.func_94211_a()), Integer.valueOf(textureatlassprite.func_94216_b()), Integer.valueOf(MathHelper.func_151239_c(k)), Integer.valueOf(MathHelper.func_151239_c(j1)));
+             k = j1;
+          }

conf/patches/minecraft_ff/net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.java.patch

@@ -0,0 +1,15 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\tileentity\TileEntityRendererDispatcher.java minecraft_patched\net\minecraft\client\renderer\tileentity\TileEntityRendererDispatcher.java
+--- minecraft\net\minecraft\client\renderer\tileentity\TileEntityRendererDispatcher.java
++++ minecraft_patched\net\minecraft\client\renderer\tileentity\TileEntityRendererDispatcher.java
+@@ -72,9 +72,9 @@
+    }
+ 
+    public <T extends TileEntity> TileEntitySpecialRenderer<T> func_147546_a(Class<? extends TileEntity> p_147546_1_) {
+-      TileEntitySpecialRenderer<? extends TileEntity> tileentityspecialrenderer = (TileEntitySpecialRenderer)this.field_147559_m.get(p_147546_1_);
++      TileEntitySpecialRenderer<T> tileentityspecialrenderer = (TileEntitySpecialRenderer)this.field_147559_m.get(p_147546_1_);
+       if (tileentityspecialrenderer == null && p_147546_1_ != TileEntity.class) {
+-         tileentityspecialrenderer = this.<TileEntity>func_147546_a(p_147546_1_.getSuperclass());
++         tileentityspecialrenderer = this.func_147546_a((Class<? extends TileEntity>)p_147546_1_.getSuperclass());
+          this.field_147559_m.put(p_147546_1_, tileentityspecialrenderer);
+       }
+ 

conf/patches/minecraft_ff/net.minecraft.client.renderer.vertex.VertexFormat.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\client\renderer\vertex\VertexFormat.java minecraft_patched\net\minecraft\client\renderer\vertex\VertexFormat.java
+--- minecraft\net\minecraft\client\renderer\vertex\VertexFormat.java
++++ minecraft_patched\net\minecraft\client\renderer\vertex\VertexFormat.java
+@@ -41,6 +41,7 @@
+       this.field_177353_d = 0;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public VertexFormat func_181721_a(VertexFormatElement p_181721_1_) {
+       if (p_181721_1_.func_177374_g() && this.func_177341_i()) {
+          field_177357_a.warn("VertexFormat error: Trying to add a position VertexFormatElement when one already exists, ignoring.");

conf/patches/minecraft_ff/net.minecraft.client.resources.SimpleResource.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\client\resources\SimpleResource.java minecraft_patched\net\minecraft\client\resources\SimpleResource.java
+--- minecraft\net\minecraft\client\resources\SimpleResource.java
++++ minecraft_patched\net\minecraft\client\resources\SimpleResource.java
+@@ -63,7 +63,7 @@
+             }
+          }
+ 
+-         T t = this.field_110535_a.get(p_110526_1_);
++         T t = (T)this.field_110535_a.get(p_110526_1_);
+          if (t == null) {
+             t = this.field_110532_e.func_110503_a(p_110526_1_, this.field_110530_g);
+          }

conf/patches/minecraft_ff/net.minecraft.client.settings.KeyBinding.java.patch

@@ -0,0 +1,15 @@
+diff -r -U 3 minecraft\net\minecraft\client\settings\KeyBinding.java minecraft_patched\net\minecraft\client\settings\KeyBinding.java
+--- minecraft\net\minecraft\client\settings\KeyBinding.java
++++ minecraft_patched\net\minecraft\client\settings\KeyBinding.java
+@@ -127,9 +127,9 @@
+    public static Supplier<String> func_193626_b(String p_193626_0_) {
+       KeyBinding keybinding = field_74516_a.get(p_193626_0_);
+       return keybinding == null ? () -> {
+-         return p_193624_0_;
++         return p_193626_0_;
+       } : () -> {
+-         return GameSettings.func_74298_c(p_193625_0_.func_151463_i());
++         return GameSettings.func_74298_c(keybinding.func_151463_i());
+       };
+    }
+ 

conf/patches/minecraft_ff/net.minecraft.client.util.SearchTree.java.patch

@@ -0,0 +1,16 @@
+diff -r -U 3 minecraft\net\minecraft\client\util\SearchTree.java minecraft_patched\net\minecraft\client\util\SearchTree.java
+--- minecraft\net\minecraft\client\util\SearchTree.java
++++ minecraft_patched\net\minecraft\client\util\SearchTree.java
+@@ -44,10 +44,10 @@
+ 
+    private void func_194042_b(T p_194042_1_) {
+       (this.field_194047_d.apply(p_194042_1_)).forEach((p_194039_2_) -> {
+-         this.field_194045_b.func_194057_a(p_194039_1_, p_194039_2_.toString().toLowerCase(Locale.ROOT));
++         this.field_194045_b.func_194057_a(p_194042_1_, p_194039_2_.toString().toLowerCase(Locale.ROOT));
+       });
+       (this.field_194046_c.apply(p_194042_1_)).forEach((p_194041_2_) -> {
+-         this.field_194044_a.func_194057_a(p_194041_1_, p_194041_2_.toLowerCase(Locale.ROOT));
++         this.field_194044_a.func_194057_a(p_194042_1_, p_194041_2_.toLowerCase(Locale.ROOT));
+       });
+    }
+ 

conf/patches/minecraft_ff/net.minecraft.client.util.SuffixArray.java.patch

@@ -0,0 +1,28 @@
+diff -r -U 3 minecraft\net\minecraft\client\util\SuffixArray.java minecraft_patched\net\minecraft\client\util\SuffixArray.java
+--- minecraft\net\minecraft\client\util\SuffixArray.java
++++ minecraft_patched\net\minecraft\client\util\SuffixArray.java
+@@ -60,15 +60,15 @@
+       };
+       Swapper swapper = (p_194054_3_, p_194054_4_) -> {
+          if (p_194054_3_ != p_194054_4_) {
+-            int i2 = p_194054_0_[p_194054_3_];
+-            p_194054_0_[p_194054_3_] = p_194054_0_[p_194054_4_];
+-            p_194054_0_[p_194054_4_] = i2;
+-            i2 = p_194054_1_[p_194054_3_];
+-            p_194054_1_[p_194054_3_] = p_194054_1_[p_194054_4_];
+-            p_194054_1_[p_194054_4_] = i2;
+-            i2 = p_194054_2_[p_194054_3_];
+-            p_194054_2_[p_194054_3_] = p_194054_2_[p_194054_4_];
+-            p_194054_2_[p_194054_4_] = i2;
++            int i2 = aint1[p_194054_3_];
++            aint1[p_194054_3_] = aint1[p_194054_4_];
++            aint1[p_194054_4_] = i2;
++            i2 = aint2[p_194054_3_];
++            aint2[p_194054_3_] = aint2[p_194054_4_];
++            aint2[p_194054_4_] = i2;
++            i2 = aint3[p_194054_3_];
++            aint3[p_194054_3_] = aint3[p_194054_4_];
++            aint3[p_194054_4_] = i2;
+          }
+ 
+       };

conf/patches/minecraft_ff/net.minecraft.command.CommandBase.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\command\CommandBase.java minecraft_patched\net\minecraft\command\CommandBase.java
+--- minecraft\net\minecraft\command\CommandBase.java
++++ minecraft_patched\net\minecraft\command\CommandBase.java
+@@ -432,7 +432,7 @@
+    }
+ 
+    private static <T extends Comparable<T>> IBlockState func_190793_a(IBlockState p_190793_0_, IProperty<T> p_190793_1_, Comparable<?> p_190793_2_) {
+-      return p_190793_0_.func_177226_a(p_190793_1_, p_190793_2_);
++      return p_190793_0_.func_177226_a(p_190793_1_, (T)p_190793_2_);
+    }
+ 
+    public static Predicate<IBlockState> func_190791_b(final Block p_190791_0_, String p_190791_1_) throws InvalidBlockStateException {

conf/patches/minecraft_ff/net.minecraft.command.CommandSpreadPlayers.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\command\CommandSpreadPlayers.java minecraft_patched\net\minecraft\command\CommandSpreadPlayers.java
+--- minecraft\net\minecraft\command\CommandSpreadPlayers.java
++++ minecraft_patched\net\minecraft\command\CommandSpreadPlayers.java
+@@ -97,7 +97,7 @@
+          if (entity instanceof EntityPlayer) {
+             set.add(entity.func_96124_cp());
+          } else {
+-            set.add((Object)null);
++            set.add(null);
+          }
+       }
+ 

conf/patches/minecraft_ff/net.minecraft.command.EntitySelector.java.patch

@@ -0,0 +1,127 @@
+diff -r -U 3 minecraft\net\minecraft\command\EntitySelector.java minecraft_patched\net\minecraft\command\EntitySelector.java
+--- minecraft\net\minecraft\command\EntitySelector.java
++++ minecraft_patched\net\minecraft\command\EntitySelector.java
+@@ -150,7 +150,7 @@
+                            }
+                         }
+ 
+-                        return Lists.newArrayList(entity);
++                        return Lists.newArrayList((T)entity);
+                      }
+ 
+                      return Collections.<T>emptyList();
+@@ -245,7 +245,7 @@
+             s = s.substring(1);
+          }
+ 
+-         final GameType gametype;
++         GameType gametype;
+          try {
+             int i = Integer.parseInt(s);
+             gametype = GameType.func_185329_a(i, GameType.NOT_SET);
+@@ -253,6 +253,7 @@
+             gametype = GameType.func_185328_a(s, GameType.NOT_SET);
+          }
+ 
++         final GameType type = gametype;
+          list.add(new Predicate<Entity>() {
+             public boolean apply(@Nullable Entity p_apply_1_) {
+                if (!(p_apply_1_ instanceof EntityPlayerMP)) {
+@@ -260,7 +261,7 @@
+                } else {
+                   EntityPlayerMP entityplayermp = (EntityPlayerMP)p_apply_1_;
+                   GameType gametype1 = entityplayermp.field_71134_c.func_73081_b();
+-                  return flag ? gametype1 != gametype : gametype1 == gametype;
++                  return flag ? gametype1 != type : gametype1 == type;
+                }
+             }
+          });
+@@ -270,13 +271,14 @@
+ 
+    private static List<Predicate<Entity>> func_179659_d(Map<String, String> p_179659_0_) {
+       List<Predicate<Entity>> list = Lists.<Predicate<Entity>>newArrayList();
+-      final String s = func_179651_b(p_179659_0_, field_190847_u);
++      String s = func_179651_b(p_179659_0_, field_190847_u);
+       final boolean flag = s != null && s.startsWith("!");
+       if (flag) {
+          s = s.substring(1);
+       }
+ 
+       if (s != null) {
++         final String s_f_ = s;
+          list.add(new Predicate<Entity>() {
+             public boolean apply(@Nullable Entity p_apply_1_) {
+                if (!(p_apply_1_ instanceof EntityLivingBase)) {
+@@ -285,7 +287,7 @@
+                   EntityLivingBase entitylivingbase = (EntityLivingBase)p_apply_1_;
+                   Team team = entitylivingbase.func_96124_cp();
+                   String s1 = team == null ? "" : team.func_96661_b();
+-                  return s1.equals(s) != flag;
++                  return s1.equals(s_f_) != flag;
+                }
+             }
+          });
+@@ -296,7 +298,7 @@
+ 
+    private static List<Predicate<Entity>> func_184952_c(final ICommandSender p_184952_0_, Map<String, String> p_184952_1_) {
+       final Map<String, Integer> map = func_96560_a(p_184952_1_);
+-      return (List<Predicate<Entity>>)(map.isEmpty() ? Collections.emptyList() : Lists.newArrayList(new Predicate<Entity>() {
++      return (map.isEmpty() ? Collections.emptyList() : Lists.newArrayList(new Predicate<Entity>() {
+          public boolean apply(@Nullable Entity p_apply_1_) {
+             if (p_apply_1_ == null) {
+                return false;
+@@ -340,16 +342,17 @@
+ 
+    private static List<Predicate<Entity>> func_179647_f(Map<String, String> p_179647_0_) {
+       List<Predicate<Entity>> list = Lists.<Predicate<Entity>>newArrayList();
+-      final String s = func_179651_b(p_179647_0_, field_190848_v);
++      String s = func_179651_b(p_179647_0_, field_190848_v);
+       final boolean flag = s != null && s.startsWith("!");
+       if (flag) {
+          s = s.substring(1);
+       }
+ 
+       if (s != null) {
++         final String s_f_ = s;
+          list.add(new Predicate<Entity>() {
+             public boolean apply(@Nullable Entity p_apply_1_) {
+-               return p_apply_1_ != null && p_apply_1_.func_70005_c_().equals(s) != flag;
++               return p_apply_1_ != null && p_apply_1_.func_70005_c_().equals(s_f_) != flag;
+             }
+          });
+       }
+@@ -359,21 +362,22 @@
+ 
+    private static List<Predicate<Entity>> func_184951_f(Map<String, String> p_184951_0_) {
+       List<Predicate<Entity>> list = Lists.<Predicate<Entity>>newArrayList();
+-      final String s = func_179651_b(p_184951_0_, field_190850_x);
++      String s = func_179651_b(p_184951_0_, field_190850_x);
+       final boolean flag = s != null && s.startsWith("!");
+       if (flag) {
+          s = s.substring(1);
+       }
+ 
+       if (s != null) {
++         final String s_f_ = s;
+          list.add(new Predicate<Entity>() {
+             public boolean apply(@Nullable Entity p_apply_1_) {
+                if (p_apply_1_ == null) {
+                   return false;
+-               } else if ("".equals(s)) {
++               } else if ("".equals(s_f_)) {
+                   return p_apply_1_.func_184216_O().isEmpty() != flag;
+                } else {
+-                  return p_apply_1_.func_184216_O().contains(s) != flag;
++                  return p_apply_1_.func_184216_O().contains(s_f_) != flag;
+                }
+             }
+          });
+@@ -510,7 +514,7 @@
+ 
+       Entity entity = p_179658_2_.func_174793_f();
+       if (entity != null && p_179658_3_.isAssignableFrom(entity.getClass()) && i == 1 && p_179658_0_.contains(entity) && !"r".equals(p_179658_4_)) {
+-         p_179658_0_ = Lists.newArrayList(entity);
++         p_179658_0_ = Lists.newArrayList((T)entity);
+       }
+ 
+       if (i != 0) {

conf/patches/minecraft_ff/net.minecraft.entity.Entity.java.patch

@@ -0,0 +1,30 @@
+diff -r -U 3 minecraft\net\minecraft\entity\Entity.java minecraft_patched\net\minecraft\entity\Entity.java
+--- minecraft\net\minecraft\entity\Entity.java
++++ minecraft_patched\net\minecraft\entity\Entity.java
+@@ -605,7 +605,7 @@
+             }
+          }
+ 
+-         boolean flag = this.field_70122_E || p_70091_4_ != p_70091_4_ && p_70091_4_ < 0.0D;
++         boolean flag = this.field_70122_E || d3 != p_70091_4_ && d3 < 0.0D;
+          if (this.field_70138_W > 0.0F && flag && (d2 != p_70091_2_ || d4 != p_70091_6_)) {
+             double d14 = p_70091_2_;
+             double d6 = p_70091_4_;
+@@ -698,7 +698,7 @@
+          this.field_70170_p.field_72984_F.func_76320_a("rest");
+          this.func_174829_m();
+          this.field_70123_F = d2 != p_70091_2_ || d4 != p_70091_6_;
+-         this.field_70124_G = p_70091_4_ != p_70091_4_;
++         this.field_70124_G = d3 != p_70091_4_;
+          this.field_70122_E = this.field_70124_G && d3 < 0.0D;
+          this.field_70132_H = this.field_70123_F || this.field_70124_G;
+          int j6 = MathHelper.func_76128_c(this.field_70165_t);
+@@ -2363,7 +2363,7 @@
+    private <T extends Entity> void func_184175_a(Class<T> p_184175_1_, Set<T> p_184175_2_) {
+       for(Entity entity : this.func_184188_bt()) {
+          if (p_184175_1_.isAssignableFrom(entity.getClass())) {
+-            p_184175_2_.add(entity);
++            p_184175_2_.add((T)entity);
+          }
+ 
+          entity.func_184175_a(p_184175_1_, p_184175_2_);

conf/patches/minecraft_ff/net.minecraft.entity.EntityAreaEffectCloud.java.patch

@@ -0,0 +1,33 @@
+diff -r -U 3 minecraft\net\minecraft\entity\EntityAreaEffectCloud.java minecraft_patched\net\minecraft\entity\EntityAreaEffectCloud.java
+--- minecraft\net\minecraft\entity\EntityAreaEffectCloud.java
++++ minecraft_patched\net\minecraft\entity\EntityAreaEffectCloud.java
+@@ -248,14 +248,14 @@
+                }
+             }
+ 
+-            iterator = Lists.<Entry<Entity, Integer>>newArrayList();
++            List<PotionEffect> lstPotions = Lists.newArrayList();
+ 
+             for(PotionEffect potioneffect1 : this.field_184502_e.func_185170_a()) {
+-               iterator.add(new PotionEffect(potioneffect1.func_188419_a(), potioneffect1.func_76459_b() / 4, potioneffect1.func_76458_c(), potioneffect1.func_82720_e(), potioneffect1.func_188418_e()));
+-            }
+-
+-            iterator.addAll(this.field_184503_f);
+-            if (iterator.isEmpty()) {
++                lstPotions.add(new PotionEffect(potioneffect1.func_188419_a(), potioneffect1.func_76459_b() / 4, potioneffect1.func_76458_c(), potioneffect1.func_82720_e(), potioneffect1.func_188418_e()));
++            }
++
++            lstPotions.addAll(this.field_184503_f);
++            if (lstPotions.isEmpty()) {
+                this.field_184504_g.clear();
+             } else {
+                List<EntityLivingBase> list = this.field_70170_p.<EntityLivingBase>func_72872_a(EntityLivingBase.class, this.func_174813_aQ());
+@@ -268,7 +268,7 @@
+                         if (d2 <= (double)(f * f)) {
+                            this.field_184504_g.put(entitylivingbase, Integer.valueOf(this.field_70173_aa + this.field_184507_at));
+ 
+-                           for(PotionEffect potioneffect : iterator) {
++                           for(PotionEffect potioneffect : lstPotions) {
+                               if (potioneffect.func_188419_a().func_76403_b()) {
+                                  potioneffect.func_188419_a().func_180793_a(this, this.func_184494_w(), entitylivingbase, potioneffect.func_76458_c(), 0.5D);
+                               } else {

conf/patches/minecraft_ff/net.minecraft.entity.EntityHanging.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\entity\EntityHanging.java minecraft_patched\net\minecraft\entity\EntityHanging.java
+--- minecraft\net\minecraft\entity\EntityHanging.java
++++ minecraft_patched\net\minecraft\entity\EntityHanging.java
+@@ -213,6 +213,7 @@
+       return this.field_174861_a;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public float func_184229_a(Rotation p_184229_1_) {
+       if (this.field_174860_b != null && this.field_174860_b.func_176740_k() != EnumFacing.Axis.Y) {
+          switch(p_184229_1_) {

conf/patches/minecraft_ff/net.minecraft.entity.EntityList.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\entity\EntityList.java minecraft_patched\net\minecraft\entity\EntityList.java
+--- minecraft\net\minecraft\entity\EntityList.java
++++ minecraft_patched\net\minecraft\entity\EntityList.java
+@@ -353,7 +353,7 @@
+          field_191309_d.add(resourcelocation);
+ 
+          while(field_191311_g.size() <= p_191303_0_) {
+-            field_191311_g.add((Object)null);
++            field_191311_g.add(null);
+          }
+ 
+          field_191311_g.set(p_191303_0_, p_191303_3_);

conf/patches/minecraft_ff/net.minecraft.entity.ai.EntityAINearestAttackableTarget.java.patch

@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\entity\ai\EntityAINearestAttackableTarget.java minecraft_patched\net\minecraft\entity\ai\EntityAINearestAttackableTarget.java
+--- minecraft\net\minecraft\entity\ai\EntityAINearestAttackableTarget.java
++++ minecraft_patched\net\minecraft\entity\ai\EntityAINearestAttackableTarget.java
+@@ -67,7 +67,7 @@
+             return true;
+          }
+       } else {
+-         this.field_75309_a = this.field_75299_d.field_70170_p.func_184150_a(this.field_75299_d.field_70165_t, this.field_75299_d.field_70163_u + (double)this.field_75299_d.func_70047_e(), this.field_75299_d.field_70161_v, this.func_111175_f(), this.func_111175_f(), new Function<EntityPlayer, Double>() {
++         this.field_75309_a = (T)this.field_75299_d.field_70170_p.func_184150_a(this.field_75299_d.field_70165_t, this.field_75299_d.field_70163_u + (double)this.field_75299_d.func_70047_e(), this.field_75299_d.field_70161_v, this.func_111175_f(), this.func_111175_f(), new Function<EntityPlayer, Double>() {
+             @Nullable
+             public Double apply(@Nullable EntityPlayer p_apply_1_) {
+                ItemStack itemstack = p_apply_1_.func_184582_a(EntityEquipmentSlot.HEAD);
+@@ -83,7 +83,7 @@
+ 
+                return 1.0D;
+             }
+-         }, this.field_82643_g);
++         }, (Predicate<EntityPlayer>)this.field_82643_g);
+          return this.field_75309_a != null;
+       }
+    }

conf/patches/minecraft_ff/net.minecraft.entity.item.EntityMinecart.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\entity\item\EntityMinecart.java minecraft_patched\net\minecraft\entity\item\EntityMinecart.java
+--- minecraft\net\minecraft\entity\item\EntityMinecart.java
++++ minecraft_patched\net\minecraft\entity\item\EntityMinecart.java
+@@ -334,6 +334,7 @@
+ 
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    protected void func_180460_a(BlockPos p_180460_1_, IBlockState p_180460_2_) {
+       this.field_70143_R = 0.0F;
+       Vec3d vec3d = this.func_70489_a(this.field_70165_t, this.field_70163_u, this.field_70161_v);

conf/patches/minecraft_ff/net.minecraft.entity.monster.EntityEnderman.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\entity\monster\EntityEnderman.java minecraft_patched\net\minecraft\entity\monster\EntityEnderman.java
+--- minecraft\net\minecraft\entity\monster\EntityEnderman.java
++++ minecraft_patched\net\minecraft\entity\monster\EntityEnderman.java
+@@ -359,7 +359,7 @@
+       public void func_75246_d() {
+          if (this.field_179448_g != null) {
+             if (--this.field_179450_h <= 0) {
+-               this.field_75309_a = (T)this.field_179448_g;
++               this.field_75309_a = this.field_179448_g;
+                this.field_179448_g = null;
+                super.func_75249_e();
+             }

conf/patches/minecraft_ff/net.minecraft.entity.player.EntityPlayer.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\entity\player\EntityPlayer.java minecraft_patched\net\minecraft\entity\player\EntityPlayer.java
+--- minecraft\net\minecraft\entity\player\EntityPlayer.java
++++ minecraft_patched\net\minecraft\entity\player\EntityPlayer.java
+@@ -91,6 +91,7 @@
+ import net.minecraft.world.World;
+ import net.minecraft.world.WorldServer;
+ 
++@SuppressWarnings("incomplete-switch")
+ public abstract class EntityPlayer extends EntityLivingBase {
+    private static final DataParameter<Float> field_184829_a = EntityDataManager.<Float>func_187226_a(EntityPlayer.class, DataSerializers.field_187193_c);
+    private static final DataParameter<Integer> field_184830_b = EntityDataManager.<Integer>func_187226_a(EntityPlayer.class, DataSerializers.field_187192_b);

conf/patches/minecraft_ff/net.minecraft.item.ItemHoe.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\item\ItemHoe.java minecraft_patched\net\minecraft\item\ItemHoe.java
+--- minecraft\net\minecraft\item\ItemHoe.java
++++ minecraft_patched\net\minecraft\item\ItemHoe.java
+@@ -32,6 +32,7 @@
+       this.field_185072_b = p_i45343_1_.func_78000_c() + 1.0F;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public EnumActionResult func_180614_a(EntityPlayer p_180614_1_, World p_180614_2_, BlockPos p_180614_3_, EnumHand p_180614_4_, EnumFacing p_180614_5_, float p_180614_6_, float p_180614_7_, float p_180614_8_) {
+       ItemStack itemstack = p_180614_1_.func_184586_b(p_180614_4_);
+       if (!p_180614_1_.func_175151_a(p_180614_3_.func_177972_a(p_180614_5_), p_180614_5_, itemstack)) {

conf/patches/minecraft_ff/net.minecraft.item.ItemSlab.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\item\ItemSlab.java minecraft_patched\net\minecraft\item\ItemSlab.java
+--- minecraft\net\minecraft\item\ItemSlab.java
++++ minecraft_patched\net\minecraft\item\ItemSlab.java
+@@ -105,6 +105,6 @@
+    }
+ 
+    protected <T extends Comparable<T>> IBlockState func_185055_a(IProperty<T> p_185055_1_, Comparable<?> p_185055_2_) {
+-      return this.field_179226_c.func_176223_P().func_177226_a(p_185055_1_, p_185055_2_);
++      return this.field_179226_c.func_176223_P().func_177226_a(p_185055_1_, (T)p_185055_2_);
+    }
+ }

conf/patches/minecraft_ff/net.minecraft.nbt.JsonToNBT.java.patch

@@ -0,0 +1,18 @@
+diff -r -U 3 minecraft\net\minecraft\nbt\JsonToNBT.java minecraft_patched\net\minecraft\nbt\JsonToNBT.java
+--- minecraft\net\minecraft\nbt\JsonToNBT.java
++++ minecraft_patched\net\minecraft\nbt\JsonToNBT.java
+@@ -259,11 +259,11 @@
+             }
+ 
+             if (p_193603_2_ == 1) {
+-               list.add(Byte.valueOf(((NBTPrimitive)nbtbase).func_150290_f()));
++               list.add((T)Byte.valueOf(((NBTPrimitive)nbtbase).func_150290_f()));
+             } else if (p_193603_2_ == 4) {
+-               list.add(Long.valueOf(((NBTPrimitive)nbtbase).func_150291_c()));
++               list.add((T)Long.valueOf(((NBTPrimitive)nbtbase).func_150291_c()));
+             } else {
+-               list.add(Integer.valueOf(((NBTPrimitive)nbtbase).func_150287_d()));
++               list.add((T)Integer.valueOf(((NBTPrimitive)nbtbase).func_150287_d()));
+             }
+ 
+             if (this.func_193613_m()) {

conf/patches/minecraft_ff/net.minecraft.nbt.NBTUtil.java.patch

@@ -0,0 +1,22 @@
+diff -r -U 3 minecraft\net\minecraft\nbt\NBTUtil.java minecraft_patched\net\minecraft\nbt\NBTUtil.java
+--- minecraft\net\minecraft\nbt\NBTUtil.java
++++ minecraft_patched\net\minecraft\nbt\NBTUtil.java
+@@ -200,7 +200,7 @@
+    private static <T extends Comparable<T>> IBlockState func_193590_a(IBlockState p_193590_0_, IProperty<T> p_193590_1_, String p_193590_2_, NBTTagCompound p_193590_3_, NBTTagCompound p_193590_4_) {
+       Optional<T> optional = p_193590_1_.func_185929_b(p_193590_3_.func_74779_i(p_193590_2_));
+       if (optional.isPresent()) {
+-         return p_193590_0_.func_177226_a(p_193590_1_, (Comparable)optional.get());
++         return p_193590_0_.func_177226_a(p_193590_1_, optional.get());
+       } else {
+          field_193591_a.warn("Unable to read property: {} with value: {} for blockstate: {}", p_193590_2_, p_193590_3_.func_74779_i(p_193590_2_), p_193590_4_.toString());
+          return p_193590_0_;
+@@ -225,7 +225,8 @@
+       return p_190009_0_;
+    }
+ 
++   @SuppressWarnings("unchecked")
+    private static <T extends Comparable<T>> String func_190010_a(IProperty<T> p_190010_0_, Comparable<?> p_190010_1_) {
+-      return p_190010_0_.func_177702_a(p_190010_1_);
++      return p_190010_0_.func_177702_a((T)p_190010_1_);
+    }
+ }

conf/patches/minecraft_ff/net.minecraft.network.EnumConnectionState.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\network\EnumConnectionState.java minecraft_patched\net\minecraft\network\EnumConnectionState.java
+--- minecraft\net\minecraft\network\EnumConnectionState.java
++++ minecraft_patched\net\minecraft\network\EnumConnectionState.java
+@@ -323,7 +323,7 @@
+          field_150764_e[i - -1] = enumconnectionstate;
+ 
+          for(EnumPacketDirection enumpacketdirection : enumconnectionstate.field_179247_h.keySet()) {
+-            for(Class<? extends Packet<?>> oclass : ((BiMap)enumconnectionstate.field_179247_h.get(enumpacketdirection)).values()) {
++            for(Class<? extends Packet<?>> oclass : (enumconnectionstate.field_179247_h.get(enumpacketdirection)).values()) {
+                if (field_150761_f.containsKey(oclass) && field_150761_f.get(oclass) != enumconnectionstate) {
+                   throw new Error("Packet " + oclass + " is already assigned to protocol " + field_150761_f.get(oclass) + " - can't reassign to " + enumconnectionstate);
+                }

conf/patches/minecraft_ff/net.minecraft.network.NetworkManager.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\network\NetworkManager.java minecraft_patched\net\minecraft\network\NetworkManager.java
+--- minecraft\net\minecraft\network\NetworkManager.java
++++ minecraft_patched\net\minecraft\network\NetworkManager.java
+@@ -116,7 +116,7 @@
+    protected void channelRead0(ChannelHandlerContext p_channelRead0_1_, Packet<?> p_channelRead0_2_) throws Exception {
+       if (this.field_150746_k.isOpen()) {
+          try {
+-            p_channelRead0_2_.func_148833_a(this.field_150744_m);
++            ((Packet<INetHandler>)p_channelRead0_2_).func_148833_a(this.field_150744_m);
+          } catch (ThreadQuickExitException var4) {
+             ;
+          }

conf/patches/minecraft_ff/net.minecraft.network.datasync.EntityDataManager.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\network\datasync\EntityDataManager.java minecraft_patched\net\minecraft\network\datasync\EntityDataManager.java
+--- minecraft\net\minecraft\network\datasync\EntityDataManager.java
++++ minecraft_patched\net\minecraft\network\datasync\EntityDataManager.java
+@@ -247,7 +247,7 @@
+    }
+ 
+    protected <T> void func_187224_a(EntityDataManager.DataEntry<T> p_187224_1_, EntityDataManager.DataEntry<?> p_187224_2_) {
+-      p_187224_1_.func_187210_a(p_187224_2_.func_187206_b());
++      p_187224_1_.func_187210_a((T)p_187224_2_.func_187206_b());
+    }
+ 
+    public boolean func_187228_d() {

conf/patches/minecraft_ff/net.minecraft.network.play.server.SPacketCombatEvent.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\network\play\server\SPacketCombatEvent.java minecraft_patched\net\minecraft\network\play\server\SPacketCombatEvent.java
+--- minecraft\net\minecraft\network\play\server\SPacketCombatEvent.java
++++ minecraft_patched\net\minecraft\network\play\server\SPacketCombatEvent.java
+@@ -23,6 +23,7 @@
+       this(p_i46931_1_, p_i46931_2_, true);
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    public SPacketCombatEvent(CombatTracker p_i46932_1_, SPacketCombatEvent.Event p_i46932_2_, boolean p_i46932_3_) {
+       this.field_179776_a = p_i46932_2_;
+       EntityLivingBase entitylivingbase = p_i46932_1_.func_94550_c();

conf/patches/minecraft_ff/net.minecraft.server.management.UserList.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\server\management\UserList.java minecraft_patched\net\minecraft\server\management\UserList.java
+--- minecraft\net\minecraft\server\management\UserList.java
++++ minecraft_patched\net\minecraft\server\management\UserList.java
+@@ -116,7 +116,7 @@
+    }
+ 
+    protected UserListEntry<K> func_152682_a(JsonObject p_152682_1_) {
+-      return new UserListEntry<K>((Object)null, p_152682_1_);
++      return new UserListEntry<K>(null, p_152682_1_);
+    }
+ 
+    protected Map<String, V> func_152688_e() {

conf/patches/minecraft_ff/net.minecraft.tileentity.TileEntityChest.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\tileentity\TileEntityChest.java minecraft_patched\net\minecraft\tileentity\TileEntityChest.java
+--- minecraft\net\minecraft\tileentity\TileEntityChest.java
++++ minecraft_patched\net\minecraft\tileentity\TileEntityChest.java
+@@ -100,6 +100,7 @@
+       this.field_145984_a = false;
+    }
+ 
++   @SuppressWarnings("incomplete-switch")
+    private void func_174910_a(TileEntityChest p_174910_1_, EnumFacing p_174910_2_) {
+       if (p_174910_1_.func_145837_r()) {
+          this.field_145984_a = false;

conf/patches/minecraft_ff/net.minecraft.tileentity.TileEntityPiston.java.patch

@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\tileentity\TileEntityPiston.java minecraft_patched\net\minecraft\tileentity\TileEntityPiston.java
+--- minecraft\net\minecraft\tileentity\TileEntityPiston.java
++++ minecraft_patched\net\minecraft\tileentity\TileEntityPiston.java
+@@ -149,7 +149,7 @@
+                      d1 = Math.min(d1, d0) + 0.01D;
+                      field_190613_i.set(enumfacing);
+                      entity.func_70091_d(MoverType.PISTON, d1 * (double)enumfacing.func_82601_c(), d1 * (double)enumfacing.func_96559_d(), d1 * (double)enumfacing.func_82599_e());
+-                     field_190613_i.set((Object)null);
++                     field_190613_i.set(null);
+                      if (!this.field_145875_k && this.field_145872_l) {
+                         this.func_190605_a(entity, enumfacing, d0);
+                      }
+@@ -230,7 +230,7 @@
+             d0 = Math.min(d0, p_190605_3_) + 0.01D;
+             field_190613_i.set(p_190605_2_);
+             p_190605_1_.func_70091_d(MoverType.PISTON, d0 * (double)enumfacing.func_82601_c(), d0 * (double)enumfacing.func_96559_d(), d0 * (double)enumfacing.func_82599_e());
+-            field_190613_i.set((Object)null);
++            field_190613_i.set(null);
+          }
+       }
+ 

conf/patches/minecraft_ff/net.minecraft.util.EntitySelectors.java.patch

@@ -0,0 +1,20 @@
+diff -r -U 3 minecraft\net\minecraft\util\EntitySelectors.java minecraft_patched\net\minecraft\util\EntitySelectors.java
+--- minecraft\net\minecraft\util\EntitySelectors.java
++++ minecraft_patched\net\minecraft\util\EntitySelectors.java
+@@ -51,7 +51,7 @@
+    public static <T extends Entity> Predicate<T> func_188442_a(final Entity p_188442_0_) {
+       final Team team = p_188442_0_.func_96124_cp();
+       final Team.CollisionRule team$collisionrule = team == null ? Team.CollisionRule.ALWAYS : team.func_186681_k();
+-      return team$collisionrule == Team.CollisionRule.NEVER ? Predicates.alwaysFalse() : Predicates.and(field_180132_d, new Predicate<Entity>() {
++      Predicate<?> ret = team$collisionrule == Team.CollisionRule.NEVER ? Predicates.alwaysFalse() : Predicates.and(field_180132_d, new Predicate<Entity>() {
+          public boolean apply(@Nullable Entity p_apply_1_) {
+             if (!p_apply_1_.func_70104_M()) {
+                return false;
+@@ -73,6 +73,7 @@
+             }
+          }
+       });
++      return (Predicate<T>)ret;
+    }
+ 
+    public static Predicate<Entity> func_191324_b(final Entity p_191324_0_) {

conf/patches/minecraft_ff/net.minecraft.util.EnumTypeAdapterFactory.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\util\EnumTypeAdapterFactory.java minecraft_patched\net\minecraft\util\EnumTypeAdapterFactory.java
+--- minecraft\net\minecraft\util\EnumTypeAdapterFactory.java
++++ minecraft_patched\net\minecraft\util\EnumTypeAdapterFactory.java
+@@ -16,7 +16,7 @@
+ public class EnumTypeAdapterFactory implements TypeAdapterFactory {
+    @Nullable
+    public <T> TypeAdapter<T> create(Gson p_create_1_, TypeToken<T> p_create_2_) {
+-      Class<T> oclass = p_create_2_.getRawType();
++      Class<T> oclass = (Class<T>)p_create_2_.getRawType();
+       if (!oclass.isEnum()) {
+          return null;
+       } else {

conf/patches/minecraft_ff/net.minecraft.util.HttpUtil.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\util\HttpUtil.java minecraft_patched\net\minecraft\util\HttpUtil.java
+--- minecraft\net\minecraft\util\HttpUtil.java
++++ minecraft_patched\net\minecraft\util\HttpUtil.java
+@@ -218,7 +218,7 @@
+             }
+          }
+       });
+-      return listenablefuture;
++      return (ListenableFuture<Object>) listenablefuture;
+    }
+ 
+    public static int func_76181_a() throws IOException {

conf/patches/minecraft_ff/net.minecraft.util.IObjectIntIterable.java.patch

@@ -0,0 +1,9 @@
+diff -r -U 3 minecraft\net\minecraft\util\IObjectIntIterable.java minecraft_patched\net\minecraft\util\IObjectIntIterable.java
+--- minecraft\net\minecraft\util\IObjectIntIterable.java
++++ minecraft_patched\net\minecraft\util\IObjectIntIterable.java
+@@ -1,4 +1,4 @@
+ package net.minecraft.util;
+ 
+-public interface IObjectIntIterable extends Iterable {
++public interface IObjectIntIterable<V> extends Iterable<V> {
+ }

conf/patches/minecraft_ff/net.minecraft.util.NonNullList.java.patch

@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\util\NonNullList.java minecraft_patched\net\minecraft\util\NonNullList.java
+--- minecraft\net\minecraft\util\NonNullList.java
++++ minecraft_patched\net\minecraft\util\NonNullList.java
+@@ -20,7 +20,7 @@
+       Validate.notNull(p_191197_1_);
+       Object[] aobject = new Object[p_191197_0_];
+       Arrays.fill(aobject, p_191197_1_);
+-      return new NonNullList<E>(Arrays.asList(aobject), p_191197_1_);
++      return new NonNullList<E>(Arrays.asList((E[])aobject), p_191197_1_);
+    }
+ 
+    public static <E> NonNullList<E> func_193580_a(E p_193580_0_, E... p_193580_1_) {
+@@ -28,7 +28,7 @@
+    }
+ 
+    protected NonNullList() {
+-      this(new ArrayList(), (Object)null);
++      this(new ArrayList(), null);
+    }
+ 
+    protected NonNullList(List<E> p_i47327_1_, @Nullable E p_i47327_2_) {

conf/patches/minecraft_ff/net.minecraft.util.ObjectIntIdentityMap.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\util\ObjectIntIdentityMap.java minecraft_patched\net\minecraft\util\ObjectIntIdentityMap.java
+--- minecraft\net\minecraft\util\ObjectIntIdentityMap.java
++++ minecraft_patched\net\minecraft\util\ObjectIntIdentityMap.java
+@@ -25,7 +25,7 @@
+       this.field_148749_a.put(p_148746_1_, Integer.valueOf(p_148746_2_));
+ 
+       while(this.field_148748_b.size() <= p_148746_2_) {
+-         this.field_148748_b.add((Object)null);
++         this.field_148748_b.add(null);
+       }
+ 
+       this.field_148748_b.set(p_148746_2_, p_148746_1_);

conf/patches/minecraft_ff/net.minecraft.util.datafix.walkers.Filtered.java.patch

@@ -0,0 +1,15 @@
+diff -r -U 3 minecraft\net\minecraft\util\datafix\walkers\Filtered.java minecraft_patched\net\minecraft\util\datafix\walkers\Filtered.java
+--- minecraft\net\minecraft\util\datafix\walkers\Filtered.java
++++ minecraft_patched\net\minecraft\util\datafix\walkers\Filtered.java
+@@ -13,9 +13,9 @@
+ 
+    public Filtered(Class<?> p_i47309_1_) {
+       if (Entity.class.isAssignableFrom(p_i47309_1_)) {
+-         this.field_188272_a = EntityList.func_191306_a(p_i47309_1_);
++         this.field_188272_a = EntityList.func_191306_a((Class<Entity>)p_i47309_1_);
+       } else if (TileEntity.class.isAssignableFrom(p_i47309_1_)) {
+-         this.field_188272_a = TileEntity.func_190559_a(p_i47309_1_);
++         this.field_188272_a = TileEntity.func_190559_a((Class<TileEntity>)p_i47309_1_);
+       } else {
+          this.field_188272_a = null;
+       }

conf/patches/minecraft_ff/net.minecraft.util.math.Cartesian.java.patch

@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\util\math\Cartesian.java minecraft_patched\net\minecraft\util\math\Cartesian.java
+--- minecraft\net\minecraft\util\math\Cartesian.java
++++ minecraft_patched\net\minecraft\util\math\Cartesian.java
+@@ -14,7 +14,7 @@
+ 
+ public class Cartesian {
+    public static <T> Iterable<T[]> func_179318_a(Class<T> p_179318_0_, Iterable<? extends Iterable<? extends T>> p_179318_1_) {
+-      return new Cartesian.Product<T[]>(p_179318_0_, (Iterable[])func_179322_b(Iterable.class, p_179318_1_));
++      return new Cartesian.Product(p_179318_0_, (Iterable[])func_179322_b(Iterable.class, p_179318_1_));
+    }
+ 
+    public static <T> Iterable<List<T>> func_179321_a(Iterable<? extends Iterable<? extends T>> p_179321_0_) {
+@@ -44,7 +44,7 @@
+       }
+ 
+       public List<T> apply(@Nullable Object[] p_apply_1_) {
+-         return Arrays.<T>asList(p_apply_1_);
++         return Arrays.<T>asList((T[])p_apply_1_);
+       }
+    }
+ 

conf/patches/minecraft_ff/net.minecraft.util.text.TextComponentKeybind.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\util\text\TextComponentKeybind.java minecraft_patched\net\minecraft\util\text\TextComponentKeybind.java
+--- minecraft\net\minecraft\util\text\TextComponentKeybind.java
++++ minecraft_patched\net\minecraft\util\text\TextComponentKeybind.java
+@@ -6,7 +6,7 @@
+ public class TextComponentKeybind extends TextComponentBase {
+    public static Function<String, Supplier<String>> field_193637_b = (p_193635_0_) -> {
+       return () -> {
+-         return p_193634_0_;
++         return p_193635_0_;
+       };
+    };
+    private final String field_193638_c;

conf/patches/minecraft_ff/net.minecraft.world.World.java.patch

@@ -0,0 +1,25 @@
+diff -r -U 3 minecraft\net\minecraft\world\World.java minecraft_patched\net\minecraft\world\World.java
+--- minecraft\net\minecraft\world\World.java
++++ minecraft_patched\net\minecraft\world\World.java
+@@ -2145,8 +2145,8 @@
+       List<T> list = Lists.<T>newArrayList();
+ 
+       for(Entity entity : this.field_72996_f) {
+-         if (p_175644_1_.isAssignableFrom(entity.getClass()) && p_175644_2_.apply(entity)) {
+-            list.add(entity);
++         if (p_175644_1_.isAssignableFrom(entity.getClass()) && p_175644_2_.apply((T)entity)) {
++            list.add((T)entity);
+          }
+       }
+ 
+@@ -2157,8 +2157,8 @@
+       List<T> list = Lists.<T>newArrayList();
+ 
+       for(Entity entity : this.field_73010_i) {
+-         if (p_175661_1_.isAssignableFrom(entity.getClass()) && p_175661_2_.apply(entity)) {
+-            list.add(entity);
++         if (p_175661_1_.isAssignableFrom(entity.getClass()) && p_175661_2_.apply((T)entity)) {
++            list.add((T)entity);
+          }
+       }
+ 

conf/patches/minecraft_ff/net.minecraft.world.chunk.storage.AnvilChunkLoader.java.patch

@@ -0,0 +1,16 @@
+diff -r -U 3 minecraft\net\minecraft\world\chunk\storage\AnvilChunkLoader.java minecraft_patched\net\minecraft\world\chunk\storage\AnvilChunkLoader.java
+--- minecraft\net\minecraft\world\chunk\storage\AnvilChunkLoader.java
++++ minecraft_patched\net\minecraft\world\chunk\storage\AnvilChunkLoader.java
+@@ -164,11 +164,7 @@
+       try {
+          this.field_183014_e = true;
+ 
+-         while(true) {
+-            if (this.func_75814_c()) {
+-               continue;
+-            }
+-         }
++         while(this.func_75814_c());
+       } finally {
+          this.field_183014_e = false;
+       }

conf/patches/minecraft_ff/net.minecraft.world.gen.structure.StructureMineshaftPieces.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\world\gen\structure\StructureMineshaftPieces.java minecraft_patched\net\minecraft\world\gen\structure\StructureMineshaftPieces.java
+--- minecraft\net\minecraft\world\gen\structure\StructureMineshaftPieces.java
++++ minecraft_patched\net\minecraft\world\gen\structure\StructureMineshaftPieces.java
+@@ -547,7 +547,7 @@
+          }
+ 
+          int k;
+-         for(lvt_5_1_ = 0; k < this.field_74887_e.func_78883_b(); k = k + 4) {
++         for(k = 0; k < this.field_74887_e.func_78883_b(); k = k + 4) {
+             k = k + p_74861_3_.nextInt(this.field_74887_e.func_78883_b());
+             if (k + 3 > this.field_74887_e.func_78883_b()) {
+                break;

conf/patches/minecraft_ff/net.minecraft.world.gen.structure.StructureNetherBridgePieces.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\world\gen\structure\StructureNetherBridgePieces.java minecraft_patched\net\minecraft\world\gen\structure\StructureNetherBridgePieces.java
+--- minecraft\net\minecraft\world\gen\structure\StructureNetherBridgePieces.java
++++ minecraft_patched\net\minecraft\world\gen\structure\StructureNetherBridgePieces.java
+@@ -18,6 +18,7 @@
+ import net.minecraft.world.gen.structure.template.TemplateManager;
+ import net.minecraft.world.storage.loot.LootTableList;
+ 
++@SuppressWarnings("incomplete-switch")
+ public class StructureNetherBridgePieces {
+    private static final StructureNetherBridgePieces.PieceWeight[] field_78742_a = new StructureNetherBridgePieces.PieceWeight[]{new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Straight.class, 30, 0, true), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Crossing3.class, 10, 4), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Crossing.class, 10, 4), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Stairs.class, 10, 3), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Throne.class, 5, 2), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Entrance.class, 5, 1)};
+    private static final StructureNetherBridgePieces.PieceWeight[] field_78741_b = new StructureNetherBridgePieces.PieceWeight[]{new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Corridor5.class, 25, 0, true), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Crossing2.class, 15, 5), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Corridor2.class, 5, 10), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Corridor.class, 5, 10), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Corridor3.class, 10, 3, true), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.Corridor4.class, 7, 2), new StructureNetherBridgePieces.PieceWeight(StructureNetherBridgePieces.NetherStalkRoom.class, 5, 2)};

conf/patches/minecraft_ff/net.minecraft.world.gen.structure.StructureStrongholdPieces.java.patch

@@ -0,0 +1,11 @@
+diff -r -U 3 minecraft\net\minecraft\world\gen\structure\StructureStrongholdPieces.java minecraft_patched\net\minecraft\world\gen\structure\StructureStrongholdPieces.java
+--- minecraft\net\minecraft\world\gen\structure\StructureStrongholdPieces.java
++++ minecraft_patched\net\minecraft\world\gen\structure\StructureStrongholdPieces.java
+@@ -26,6 +26,7 @@
+ import net.minecraft.world.gen.structure.template.TemplateManager;
+ import net.minecraft.world.storage.loot.LootTableList;
+ 
++@SuppressWarnings("incomplete-switch")
+ public class StructureStrongholdPieces {
+    private static final StructureStrongholdPieces.PieceWeight[] field_75205_b = new StructureStrongholdPieces.PieceWeight[]{new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Straight.class, 40, 0), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Prison.class, 5, 5), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.LeftTurn.class, 20, 0), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.RightTurn.class, 20, 0), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.RoomCrossing.class, 10, 6), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.StairsStraight.class, 5, 5), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Stairs.class, 5, 5), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Crossing.class, 5, 4), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.ChestCorridor.class, 5, 4), new StructureStrongholdPieces.PieceWeight(StructureStrongholdPieces.Library.class, 10, 2) {
+       public boolean func_75189_a(int p_75189_1_) {

conf/patches/minecraft_ff/net.minecraft.world.storage.loot.conditions.LootConditionManager.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\world\storage\loot\conditions\LootConditionManager.java minecraft_patched\net\minecraft\world\storage\loot\conditions\LootConditionManager.java
+--- minecraft\net\minecraft\world\storage\loot\conditions\LootConditionManager.java
++++ minecraft_patched\net\minecraft\world\storage\loot\conditions\LootConditionManager.java
+@@ -23,7 +23,7 @@
+ 
+    public static <T extends LootCondition> void func_186639_a(LootCondition.Serializer<? extends T> p_186639_0_) {
+       ResourceLocation resourcelocation = p_186639_0_.func_186602_a();
+-      Class<T> oclass = p_186639_0_.func_186604_b();
++      Class<T> oclass = (Class<T>)p_186639_0_.func_186604_b();
+       if (field_186642_a.containsKey(resourcelocation)) {
+          throw new IllegalArgumentException("Can't re-register item condition name " + resourcelocation);
+       } else if (field_186643_b.containsKey(oclass)) {

conf/patches/minecraft_ff/net.minecraft.world.storage.loot.functions.LootFunctionManager.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\world\storage\loot\functions\LootFunctionManager.java minecraft_patched\net\minecraft\world\storage\loot\functions\LootFunctionManager.java
+--- minecraft\net\minecraft\world\storage\loot\functions\LootFunctionManager.java
++++ minecraft_patched\net\minecraft\world\storage\loot\functions\LootFunctionManager.java
+@@ -21,7 +21,7 @@
+ 
+    public static <T extends LootFunction> void func_186582_a(LootFunction.Serializer<? extends T> p_186582_0_) {
+       ResourceLocation resourcelocation = p_186582_0_.func_186529_a();
+-      Class<T> oclass = p_186582_0_.func_186531_b();
++      Class<T> oclass = (Class<T>)p_186582_0_.func_186531_b();
+       if (field_186584_a.containsKey(resourcelocation)) {
+          throw new IllegalArgumentException("Can't re-register item function name " + resourcelocation);
+       } else if (field_186585_b.containsKey(oclass)) {

conf/patches/minecraft_ff/net.minecraft.world.storage.loot.properties.EntityPropertyManager.java.patch

@@ -0,0 +1,21 @@
+diff -r -U 3 minecraft\net\minecraft\world\storage\loot\properties\EntityPropertyManager.java minecraft_patched\net\minecraft\world\storage\loot\properties\EntityPropertyManager.java
+--- minecraft\net\minecraft\world\storage\loot\properties\EntityPropertyManager.java
++++ minecraft_patched\net\minecraft\world\storage\loot\properties\EntityPropertyManager.java
+@@ -10,7 +10,7 @@
+ 
+    public static <T extends EntityProperty> void func_186644_a(EntityProperty.Serializer<? extends T> p_186644_0_) {
+       ResourceLocation resourcelocation = p_186644_0_.func_186649_a();
+-      Class<T> oclass = p_186644_0_.func_186651_b();
++      Class<T> oclass = (Class<T>)p_186644_0_.func_186651_b();
+       if (field_186647_a.containsKey(resourcelocation)) {
+          throw new IllegalArgumentException("Can't re-register entity property name " + resourcelocation);
+       } else if (field_186648_b.containsKey(oclass)) {
+@@ -35,7 +35,7 @@
+       if (serializer == null) {
+          throw new IllegalArgumentException("Unknown loot entity property " + p_186645_0_);
+       } else {
+-         return serializer;
++         return (EntityProperty.Serializer<T>)serializer;
+       }
+    }
+ 

conf/patches/minecraft_merged_ff/net.minecraft.advancements.AdvancementList.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\advancements\AdvancementList.java minecraft_patched\net\minecraft\advancements\AdvancementList.java
+--- minecraft\net\minecraft\advancements\AdvancementList.java
++++ minecraft_patched\net\minecraft\advancements\AdvancementList.java
+@@ -58,7 +58,7 @@
+    }
+ 
+    public void func_192083_a(Map<ResourceLocation, Advancement.Builder> p_192083_1_) {
+-      Function<ResourceLocation, Advancement> function = Functions.<ResourceLocation, Advancement>forMap(this.field_192092_b, (Object)null);
++      Function<ResourceLocation, Advancement> function = Functions.<ResourceLocation, Advancement>forMap(this.field_192092_b, null);
+ 
+       label42:
+       while(!p_192083_1_.isEmpty()) {

conf/patches/minecraft_merged_ff/net.minecraft.advancements.PlayerAdvancements.java.patch

@@ -0,0 +1,12 @@
+diff -r -U 3 minecraft\net\minecraft\advancements\PlayerAdvancements.java minecraft_patched\net\minecraft\advancements\PlayerAdvancements.java
+--- minecraft\net\minecraft\advancements\PlayerAdvancements.java
++++ minecraft_patched\net\minecraft\advancements\PlayerAdvancements.java
+@@ -119,7 +119,7 @@
+ 
+             Stream<Entry<ResourceLocation, AdvancementProgress>> stream = map.entrySet().stream().sorted(Comparator.comparing(Entry::getValue));
+ 
+-            for(Entry<ResourceLocation, AdvancementProgress> entry : (List)stream.collect(Collectors.toList())) {
++            for(Entry<ResourceLocation, AdvancementProgress> entry : stream.collect(Collectors.toList())) {
+                Advancement advancement = this.field_192756_d.func_191949_aK().func_192778_a(entry.getKey());
+                if (advancement == null) {
+                   field_192753_a.warn("Ignored advancement '" + entry.getKey() + "' in progress file " + this.field_192757_e + " - it doesn't exist anymore?");