Skip to content

Instantly share code, notes, and snippets.

@cpw

cpw/foo.patch

Created October 11, 2015 17:09
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save cpw/dbe952e6e909531f9dc5 to your computer and use it in GitHub Desktop.
Save cpw/dbe952e6e909531f9dc5 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
foo.patch
diff -Naur src/minecraft/net/minecraft/block/BlockRedstoneTorch.java src.working/minecraft/net/minecraft/block/BlockRedstoneTorch.java
--- src/minecraft/net/minecraft/block/BlockRedstoneTorch.java 2015-10-10 17:07:52.378017898 -0400
+++ src.working/minecraft/net/minecraft/block/BlockRedstoneTorch.java 2015-10-10 15:55:55.067984632 -0400
@@ -24,7 +24,7 @@
private boolean func_176598_a(World p_176598_1_, BlockPos p_176598_2_, boolean p_176598_3_) {
if(!field_150112_b.containsKey(p_176598_1_)) {
- field_150112_b.put(p_176598_1_, Lists.newArrayList());
+ field_150112_b.put(p_176598_1_, Lists.<BlockRedstoneTorch.Toggle>newArrayList());
}
List<BlockRedstoneTorch.Toggle> lvt_4_1_ = (List)field_150112_b.get(p_176598_1_);
diff -Naur src/minecraft/net/minecraft/block/properties/PropertyDirection.java src.working/minecraft/net/minecraft/block/properties/PropertyDirection.java
--- src/minecraft/net/minecraft/block/properties/PropertyDirection.java 2015-10-10 17:07:52.330019339 -0400
+++ src.working/minecraft/net/minecraft/block/properties/PropertyDirection.java 2015-10-10 15:43:17.958847630 -0400
@@ -16,7 +16,7 @@
}
public static PropertyDirection func_177714_a(String p_177714_0_) {
- return func_177712_a(p_177714_0_, Predicates.alwaysTrue());
+ return func_177712_a(p_177714_0_, Predicates.<EnumFacing>alwaysTrue());
}
public static PropertyDirection func_177712_a(String p_177712_0_, Predicate<EnumFacing> p_177712_1_) {
diff -Naur src/minecraft/net/minecraft/block/properties/PropertyEnum.java src.working/minecraft/net/minecraft/block/properties/PropertyEnum.java
--- src/minecraft/net/minecraft/block/properties/PropertyEnum.java 2015-10-10 17:07:52.330019339 -0400
+++ src.working/minecraft/net/minecraft/block/properties/PropertyEnum.java 2015-10-10 15:42:57.147476240 -0400
@@ -40,7 +40,7 @@
}
public static <T extends Enum<T> & IStringSerializable> PropertyEnum<T> func_177709_a(String p_177709_0_, Class<T> p_177709_1_) {
- return func_177708_a(p_177709_0_, p_177709_1_, Predicates.alwaysTrue());
+ return func_177708_a(p_177709_0_, p_177709_1_, Predicates.<T>alwaysTrue());
}
public static <T extends Enum<T> & IStringSerializable> PropertyEnum<T> func_177708_a(String p_177708_0_, Class<T> p_177708_1_, Predicate<T> p_177708_2_) {
diff -Naur src/minecraft/net/minecraft/block/state/BlockStateBase.java src.working/minecraft/net/minecraft/block/state/BlockStateBase.java
--- src/minecraft/net/minecraft/block/state/BlockStateBase.java 2015-10-10 17:07:52.342018979 -0400
+++ src.working/minecraft/net/minecraft/block/state/BlockStateBase.java 2015-10-10 15:07:44.683366945 -0400
@@ -28,7 +28,7 @@
private static final String __OBFID = "CL_00002032";
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_) {
diff -Naur src/minecraft/net/minecraft/block/state/BlockState.java src.working/minecraft/net/minecraft/block/state/BlockState.java
--- src/minecraft/net/minecraft/block/state/BlockState.java 2015-10-10 17:07:52.342018979 -0400
+++ src.working/minecraft/net/minecraft/block/state/BlockState.java 2015-10-10 16:02:34.087939769 -0400
@@ -65,7 +65,7 @@
lvt_7_2_.func_177235_a(lvt_3_1_);
}
- this.field_177625_e = ImmutableList.copyOf(lvt_4_1_);
+ this.field_177625_e = ImmutableList.<IBlockState>copyOf(lvt_4_1_);
}
public ImmutableList<IBlockState> func_177619_a() {
diff -Naur src/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.java src.working/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.java
--- src/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.java 2015-10-10 17:07:52.334019219 -0400
+++ src.working/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.java 2015-10-10 15:51:12.924503308 -0400
@@ -23,7 +23,7 @@
private static final String __OBFID = "CL_00002021";
private FactoryBlockPattern() {
- this.field_177666_c.put(Character.valueOf(' '), Predicates.alwaysTrue());
+ this.field_177666_c.put(Character.valueOf(' '), Predicates.<BlockWorldState>alwaysTrue());
}
public FactoryBlockPattern func_177659_a(String... p_177659_1_) {
@@ -43,7 +43,7 @@
for(char lvt_9_1_ : lvt_5_1_.toCharArray()) {
if(!this.field_177666_c.containsKey(Character.valueOf(lvt_9_1_))) {
- this.field_177666_c.put(Character.valueOf(lvt_9_1_), (Object)null);
+ this.field_177666_c.put(Character.valueOf(lvt_9_1_), null);
}
}
}
diff -Naur src/minecraft/net/minecraft/client/gui/GuiFlatPresets.java src.working/minecraft/net/minecraft/client/gui/GuiFlatPresets.java
--- src/minecraft/net/minecraft/client/gui/GuiFlatPresets.java 2015-10-10 17:07:51.554042638 -0400
+++ src.working/minecraft/net/minecraft/client/gui/GuiFlatPresets.java 2015-10-10 15:53:36.152178674 -0400
@@ -131,7 +131,7 @@
lvt_6_1_.func_82645_d();
if(p_175354_4_ != null) {
for(String lvt_8_1_ : p_175354_4_) {
- lvt_6_1_.func_82644_b().put(lvt_8_1_, Maps.newHashMap());
+ lvt_6_1_.func_82644_b().put(lvt_8_1_, Maps.<String,String>newHashMap());
}
}
diff -Naur src/minecraft/net/minecraft/client/gui/GuiScreenRealmsProxy.java src.working/minecraft/net/minecraft/client/gui/GuiScreenRealmsProxy.java
--- src/minecraft/net/minecraft/client/gui/GuiScreenRealmsProxy.java 2015-10-10 17:07:51.566042278 -0400
+++ src.working/minecraft/net/minecraft/client/gui/GuiScreenRealmsProxy.java 2015-10-10 16:03:49.077676444 -0400
@@ -17,7 +17,7 @@
public GuiScreenRealmsProxy(RealmsScreen p_i1087_1_) {
this.field_154330_a = p_i1087_1_;
- super.field_146292_n = Collections.synchronizedList(Lists.newArrayList());
+ super.field_146292_n = Collections.synchronizedList(Lists.<GuiButton>newArrayList());
}
public RealmsScreen func_154321_a() {
diff -Naur src/minecraft/net/minecraft/client/gui/GuiSnooper.java src.working/minecraft/net/minecraft/client/gui/GuiSnooper.java
--- src/minecraft/net/minecraft/client/gui/GuiSnooper.java 2015-10-10 17:07:51.550042758 -0400
+++ src.working/minecraft/net/minecraft/client/gui/GuiSnooper.java 2015-10-10 15:58:34.707165388 -0400
@@ -42,13 +42,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", new Object[0])));
boolean lvt_3_2_ = this.field_146297_k.func_71401_C() != null && this.field_146297_k.func_71401_C().func_80003_ah() != null;
- for(Entry<String, String> lvt_5_1_ : (new TreeMap(this.field_146297_k.func_71378_E().func_76465_c())).entrySet()) {
+ for(Entry<String, String> lvt_5_1_ : (new TreeMap<String,String>(this.field_146297_k.func_71378_E().func_76465_c())).entrySet()) {
this.field_146604_g.add((lvt_3_2_?"C ":"") + (String)lvt_5_1_.getKey());
this.field_146609_h.add(this.field_146289_q.func_78269_a((String)lvt_5_1_.getValue(), this.field_146294_l - 220));
}
if(lvt_3_2_) {
- for(Entry<String, String> lvt_5_2_ : (new TreeMap(this.field_146297_k.func_71401_C().func_80003_ah().func_76465_c())).entrySet()) {
+ for(Entry<String, String> lvt_5_2_ : (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)lvt_5_2_.getKey());
this.field_146609_h.add(this.field_146289_q.func_78269_a((String)lvt_5_2_.getValue(), this.field_146294_l - 220));
}
diff -Naur src/minecraft/net/minecraft/client/Minecraft.java src.working/minecraft/net/minecraft/client/Minecraft.java
--- src/minecraft/net/minecraft/client/Minecraft.java 2015-10-10 17:07:51.642039996 -0400
+++ src.working/minecraft/net/minecraft/client/Minecraft.java 2015-10-10 16:57:49.628113611 -0400
@@ -328,9 +328,8 @@
return;
}
- while(true) {
try {
- if(this.field_71425_J) {
+ while(this.field_71425_J) {
if(!this.field_71434_R || this.field_71433_S == null) {
try {
this.func_71411_J();
@@ -346,7 +345,7 @@
return;
}
} catch (MinecraftError var12) {
- ;
+ var12.printStackTrace();
} catch (ReportedException var13) {
this.func_71396_d(var13.func_71575_a());
this.func_71398_f();
@@ -362,7 +361,7 @@
}
return;
- }
+
}
private void func_71384_a() throws LWJGLException, IOException {
@@ -636,7 +635,7 @@
field_147123_G.info("Caught error stitching, removing all assigned resourcepacks", var4);
lvt_1_1_.clear();
lvt_1_1_.addAll(this.field_110449_ao);
- this.field_110448_aq.func_148527_a(Collections.emptyList());
+ this.field_110448_aq.func_148527_a(Collections.<ResourcePackRepository.Entry>emptyList());
this.field_110451_am.func_110541_a(lvt_1_1_);
this.field_71474_y.field_151453_l.clear();
this.field_71474_y.func_74303_b();
diff -Naur src/minecraft/net/minecraft/client/network/OldServerPinger.java src.working/minecraft/net/minecraft/client/network/OldServerPinger.java
--- src/minecraft/net/minecraft/client/network/OldServerPinger.java 2015-10-10 17:07:51.402047202 -0400
+++ src.working/minecraft/net/minecraft/client/network/OldServerPinger.java 2015-10-10 16:04:17.560816797 -0400
@@ -46,7 +46,7 @@
public class OldServerPinger {
private static final Splitter field_147230_a = Splitter.on('\u0000').limit(6);
private static final Logger field_147228_b = LogManager.getLogger();
- private final List<NetworkManager> field_147229_c = Collections.synchronizedList(Lists.newArrayList());
+ private final List<NetworkManager> field_147229_c = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
private static final String __OBFID = "CL_00000892";
public void func_147224_a(final ServerData p_147224_1_) throws UnknownHostException {
diff -Naur src/minecraft/net/minecraft/client/particle/EffectRenderer.java src.working/minecraft/net/minecraft/client/particle/EffectRenderer.java
--- src/minecraft/net/minecraft/client/particle/EffectRenderer.java 2015-10-10 17:07:51.394047442 -0400
+++ src.working/minecraft/net/minecraft/client/particle/EffectRenderer.java 2015-10-10 15:24:02.917756368 -0400
@@ -238,7 +238,7 @@
GlStateManager.func_179112_b(770, 771);
GlStateManager.func_179092_a(516, 0.003921569F);
- for(final int lvt_8_1_ = 0; lvt_8_1_ < 3; ++lvt_8_1_) {
+ for(int lvt_8_1_ = 0; lvt_8_1_ < 3; ++lvt_8_1_) {
for(int lvt_9_1_ = 0; lvt_9_1_ < 2; ++lvt_9_1_) {
if(!this.field_78876_b[lvt_8_1_][lvt_9_1_].isEmpty()) {
switch(lvt_9_1_) {
@@ -279,11 +279,12 @@
}
});
+ final int lvt_8_1_f = lvt_8_1_;
lvt_16_1_.func_71500_a("Particle Type", new Callable<String>() {
private static final String __OBFID = "CL_00000919";
public String call() throws Exception {
- return lvt_8_1_ == 0?"MISC_TEXTURE":(lvt_8_1_ == 1?"TERRAIN_TEXTURE":(lvt_8_1_ == 3?"ENTITY_PARTICLE_TEXTURE":"Unknown - " + lvt_8_1_));
+ return lvt_8_1_f == 0?"MISC_TEXTURE":(lvt_8_1_f == 1?"TERRAIN_TEXTURE":(lvt_8_1_f == 3?"ENTITY_PARTICLE_TEXTURE":"Unknown - " + lvt_8_1_f));
}
});
diff -Naur src/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java src.working/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java
--- src/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java 2015-10-10 17:07:51.362048403 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java 2015-10-10 15:18:55.531056101 -0400
@@ -53,7 +53,7 @@
}
protected ModelBlock(ResourceLocation p_i46226_1_, Map<String, String> p_i46226_2_, boolean p_i46226_3_, boolean p_i46226_4_, ItemCameraTransforms p_i46226_5_) {
- this(p_i46226_1_, Collections.emptyList(), p_i46226_2_, p_i46226_3_, p_i46226_4_, p_i46226_5_);
+ this(p_i46226_1_, Collections.<BlockPart>emptyList(), p_i46226_2_, p_i46226_3_, p_i46226_4_, p_i46226_5_);
}
private ModelBlock(ResourceLocation p_i46227_1_, List<BlockPart> p_i46227_2_, Map<String, String> p_i46227_3_, boolean p_i46227_4_, boolean p_i46227_5_, ItemCameraTransforms p_i46227_6_) {
diff -Naur src/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java src.working/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java
--- src/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java 2015-10-10 17:07:51.354048642 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/block/statemap/StateMap.java 2015-10-10 15:46:23.145254262 -0400
@@ -30,7 +30,7 @@
if(this.field_178142_a == null) {
lvt_3_1_ = ((ResourceLocation)Block.field_149771_c.func_177774_c(p_178132_1_.func_177230_c())).toString();
} else {
- lvt_3_1_ = this.field_178142_a.func_177702_a((Comparable)lvt_2_1_.remove(this.field_178142_a));
+ lvt_3_1_ = ((IProperty)this.field_178142_a).func_177702_a((Comparable)lvt_2_1_.remove(this.field_178142_a));
}
if(this.field_178141_c != null) {
diff -Naur src/minecraft/net/minecraft/client/renderer/BlockModelShapes.java src.working/minecraft/net/minecraft/client/renderer/BlockModelShapes.java
--- src/minecraft/net/minecraft/client/renderer/BlockModelShapes.java 2015-10-10 17:07:51.366048282 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/BlockModelShapes.java 2015-10-10 15:36:28.699210720 -0400
@@ -9,6 +9,7 @@
import net.minecraft.block.BlockColored;
import net.minecraft.block.BlockCommandBlock;
import net.minecraft.block.BlockDirt;
+import net.minecraft.block.BlockDirt.DirtType;
import net.minecraft.block.BlockDispenser;
import net.minecraft.block.BlockDoor;
import net.minecraft.block.BlockDoublePlant;
@@ -37,6 +38,7 @@
import net.minecraft.block.BlockStone;
import net.minecraft.block.BlockStoneBrick;
import net.minecraft.block.BlockStoneSlab;
+import net.minecraft.block.BlockStoneSlab.EnumType;
import net.minecraft.block.BlockStoneSlabNew;
import net.minecraft.block.BlockTNT;
import net.minecraft.block.BlockTallGrass;
@@ -248,7 +250,7 @@
protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
Map<IProperty, Comparable> lvt_2_1_2524_ = Maps.newLinkedHashMap(p_178132_1_.func_177228_b());
- String lvt_3_1_2524_ = BlockDirt.field_176386_a.func_177702_a((Comparable)lvt_2_1_2524_.remove(BlockDirt.field_176386_a));
+ String lvt_3_1_2524_ = BlockDirt.field_176386_a.func_177702_a((DirtType) lvt_2_1_2524_.remove(BlockDirt.field_176386_a));
if(BlockDirt.DirtType.PODZOL != p_178132_1_.func_177229_b(BlockDirt.field_176386_a)) {
lvt_2_1_2524_.remove(BlockDirt.field_176385_b);
}
@@ -261,7 +263,7 @@
protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
Map<IProperty, Comparable> lvt_2_1_2523_ = Maps.newLinkedHashMap(p_178132_1_.func_177228_b());
- String lvt_3_1_2523_ = BlockStoneSlab.field_176556_M.func_177702_a((Comparable)lvt_2_1_2523_.remove(BlockStoneSlab.field_176556_M));
+ String lvt_3_1_2523_ = BlockStoneSlab.field_176556_M.func_177702_a((EnumType)lvt_2_1_2523_.remove(BlockStoneSlab.field_176556_M));
lvt_2_1_2523_.remove(BlockStoneSlab.field_176555_b);
String lvt_4_1_2523_ = ((Boolean)p_178132_1_.func_177229_b(BlockStoneSlab.field_176555_b)).booleanValue()?"all":"normal";
return new ModelResourceLocation(lvt_3_1_2523_ + "_double_slab", lvt_4_1_2523_);
@@ -272,7 +274,7 @@
protected ModelResourceLocation func_178132_a(IBlockState p_178132_1_) {
Map<IProperty, Comparable> lvt_2_1_2522_ = Maps.newLinkedHashMap(p_178132_1_.func_177228_b());
- String lvt_3_1_2522_ = BlockStoneSlabNew.field_176559_M.func_177702_a((Comparable)lvt_2_1_2522_.remove(BlockStoneSlabNew.field_176559_M));
+ String lvt_3_1_2522_ = BlockStoneSlabNew.field_176559_M.func_177702_a((net.minecraft.block.BlockStoneSlabNew.EnumType)lvt_2_1_2522_.remove(BlockStoneSlabNew.field_176559_M));
lvt_2_1_2522_.remove(BlockStoneSlab.field_176555_b);
String lvt_4_1_2522_ = ((Boolean)p_178132_1_.func_177229_b(BlockStoneSlabNew.field_176558_b)).booleanValue()?"all":"normal";
return new ModelResourceLocation(lvt_3_1_2522_ + "_double_slab", lvt_4_1_2522_);
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderDragon.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderDragon.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderDragon.java 2015-10-10 17:07:37.506464423 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderDragon.java 2015-10-10 15:44:40.044368223 -0400
@@ -80,7 +80,7 @@
public void func_76986_a(EntityDragon p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
BossStatus.func_82824_a(p_76986_1_, false);
- super.func_76986_a((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
if(p_76986_1_.field_70992_bH != null) {
this.func_180574_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_9_);
}
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.java 2015-10-10 17:07:37.498464663 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderEnderman.java 2015-10-10 15:44:51.780013758 -0400
@@ -35,7 +35,7 @@
p_76986_6_ += this.field_77077_b.nextGaussian() * lvt_10_1_;
}
- super.func_76986_a((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
protected ResourceLocation func_110775_a(EntityEnderman p_110775_1_) {
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java src.working/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java
--- src/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java 2015-10-10 17:07:37.034478594 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RendererLivingEntity.java 2015-10-10 15:25:56.234329177 -0400
@@ -45,7 +45,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)p_177094_1_);
}
protected <V extends EntityLivingBase, U extends LayerRenderer<V>> boolean func_177089_b(U p_177089_1_) {
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.java 2015-10-10 17:07:37.306470427 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderGuardian.java 2015-10-10 15:34:47.978254278 -0400
@@ -31,7 +31,7 @@
}
public boolean func_177071_a(EntityGuardian p_177071_1_, ICamera p_177071_2_, double p_177071_3_, double p_177071_5_, double p_177071_7_) {
- if(super.func_177071_a((EntityLiving)p_177071_1_, p_177071_2_, p_177071_3_, p_177071_5_, p_177071_7_)) {
+ if(super.func_177071_a(p_177071_1_, p_177071_2_, p_177071_3_, p_177071_5_, p_177071_7_)) {
return true;
} else {
if(p_177071_1_.func_175474_cn()) {
@@ -62,7 +62,7 @@
this.field_177115_a = ((ModelGuardian)this.field_77045_g).func_178706_a();
}
- super.func_76986_a((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
EntityLivingBase lvt_10_1_ = p_76986_1_.func_175466_co();
if(lvt_10_1_ != null) {
float lvt_11_1_ = p_76986_1_.func_175477_p(p_76986_9_);
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java 2015-10-10 17:07:33.694578876 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderLiving.java 2015-10-10 15:47:24.007416153 -0400
@@ -22,7 +22,7 @@
}
protected boolean func_177070_b(T p_177070_1_) {
- return super.func_177070_b((EntityLivingBase)p_177070_1_) && (p_177070_1_.func_94059_bO() || p_177070_1_.func_145818_k_() && p_177070_1_ == this.field_76990_c.field_147941_i);
+ return super.func_177070_b(p_177070_1_) && (p_177070_1_.func_94059_bO() || p_177070_1_.func_145818_k_() && p_177070_1_ == this.field_76990_c.field_147941_i);
}
public boolean func_177071_a(T p_177071_1_, ICamera p_177071_2_, double p_177071_3_, double p_177071_5_, double p_177071_7_) {
@@ -37,7 +37,7 @@
}
public void func_76986_a(T p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
- super.func_76986_a((EntityLivingBase)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
this.func_110827_b(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderManager.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderManager.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderManager.java 2015-10-10 17:07:37.474465384 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderManager.java 2015-10-10 15:48:38.961152573 -0400
@@ -251,20 +251,20 @@
}
public <T extends Entity> Render<T> func_78715_a(Class<? extends Entity> p_78715_1_) {
- Render<? extends Entity> lvt_2_1_ = (Render)this.field_78729_o.get(p_78715_1_);
+ Render<? extends Entity> lvt_2_1_ = this.field_78729_o.get(p_78715_1_);
if(lvt_2_1_ == null && p_78715_1_ != Entity.class) {
- lvt_2_1_ = this.func_78715_a(p_78715_1_.getSuperclass());
+ lvt_2_1_ = this.func_78715_a((Class<? extends Entity>) p_78715_1_.getSuperclass());
this.field_78729_o.put(p_78715_1_, lvt_2_1_);
}
- return lvt_2_1_;
+ return (Render<T>) lvt_2_1_;
}
public <T extends Entity> Render<T> func_78713_a(Entity p_78713_1_) {
if(p_78713_1_ instanceof AbstractClientPlayer) {
String lvt_2_1_ = ((AbstractClientPlayer)p_78713_1_).func_175154_l();
RenderPlayer lvt_3_1_ = (RenderPlayer)this.field_178636_l.get(lvt_2_1_);
- return lvt_3_1_ != null?lvt_3_1_:this.field_178637_m;
+ return (Render<T>) (lvt_3_1_ != null?lvt_3_1_:this.field_178637_m);
} else {
return this.func_78715_a(p_78713_1_.getClass());
}
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java 2015-10-10 17:07:33.062597852 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderPlayer.java 2015-10-10 15:44:17.217057710 -0400
@@ -54,7 +54,7 @@
}
this.func_177137_d(p_76986_1_);
- super.func_76986_a((EntityLivingBase)p_76986_1_, p_76986_2_, lvt_10_1_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, lvt_10_1_, p_76986_6_, p_76986_8_, p_76986_9_);
}
}
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderSlime.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderSlime.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderSlime.java 2015-10-10 17:07:33.626580918 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderSlime.java 2015-10-10 15:45:51.218218530 -0400
@@ -22,7 +22,7 @@
public void func_76986_a(EntitySlime p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
this.field_76989_e = 0.25F * (float)p_76986_1_.func_70809_q();
- super.func_76986_a((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
protected void func_77041_b(EntitySlime p_77041_1_, float p_77041_2_) {
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderWitch.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderWitch.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderWitch.java 2015-10-10 17:07:33.558582959 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderWitch.java 2015-10-10 15:46:53.040351385 -0400
@@ -22,7 +22,7 @@
public void func_76986_a(EntityWitch p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
((ModelWitch)this.field_77045_g).field_82900_g = p_76986_1_.func_70694_bm() != null;
- super.func_76986_a((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
protected ResourceLocation func_110775_a(EntityWitch p_110775_1_) {
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderWither.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderWither.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderWither.java 2015-10-10 17:07:33.558582959 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderWither.java 2015-10-10 15:47:01.756088160 -0400
@@ -24,7 +24,7 @@
public void func_76986_a(EntityWither p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
BossStatus.func_82824_a(p_76986_1_, true);
- super.func_76986_a((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
protected ResourceLocation func_110775_a(EntityWither p_110775_1_) {
diff -Naur src/minecraft/net/minecraft/client/renderer/entity/RenderWolf.java src.working/minecraft/net/minecraft/client/renderer/entity/RenderWolf.java
--- src/minecraft/net/minecraft/client/renderer/entity/RenderWolf.java 2015-10-10 17:07:33.498584761 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/entity/RenderWolf.java 2015-10-10 15:47:11.347798482 -0400
@@ -32,7 +32,7 @@
GlStateManager.func_179124_c(lvt_10_1_, lvt_10_1_, lvt_10_1_);
}
- super.func_76986_a((EntityLiving)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
+ super.func_76986_a(p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
}
protected ResourceLocation func_110775_a(EntityWolf p_110775_1_) {
diff -Naur src/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java src.working/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java
--- src/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java 2015-10-10 17:07:31.638640606 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/texture/TextureAtlasSprite.java 2015-10-10 15:16:39.843162689 -0400
@@ -267,7 +267,7 @@
public String call() throws Exception {
StringBuilder lvt_1_1_1063_ = new StringBuilder();
- for(int[] lvt_5_1_1063_ : this.field_147983_a) {
+ for(int[] lvt_5_1_1063_ : lvt_4_1_) {
if(lvt_1_1_1063_.length() > 0) {
lvt_1_1_1063_.append(", ");
}
@@ -290,7 +290,7 @@
private void func_130099_d(int p_130099_1_) {
if(this.field_110976_a.size() <= p_130099_1_) {
for(int lvt_2_1_ = this.field_110976_a.size(); lvt_2_1_ <= p_130099_1_; ++lvt_2_1_) {
- this.field_110976_a.add((Object)null);
+ this.field_110976_a.add(null);
}
}
@@ -324,7 +324,7 @@
private void func_130102_n() {
this.field_110982_k = null;
- this.func_110968_a(Lists.newArrayList());
+ this.func_110968_a(Lists.<int[][]>newArrayList());
this.field_110973_g = 0;
this.field_110983_h = 0;
}
diff -Naur src/minecraft/net/minecraft/client/renderer/texture/TextureManager.java src.working/minecraft/net/minecraft/client/renderer/texture/TextureManager.java
--- src/minecraft/net/minecraft/client/renderer/texture/TextureManager.java 2015-10-10 17:07:31.638640606 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/texture/TextureManager.java 2015-10-10 15:24:50.400320215 -0400
@@ -53,7 +53,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 lvt_3_1_ = true;
try {
@@ -66,12 +66,13 @@
} catch (Throwable var9) {
CrashReport lvt_5_1_ = CrashReport.func_85055_a(var9, "Registering texture");
CrashReportCategory lvt_6_1_ = lvt_5_1_.func_85058_a("Resource location being registered");
+ final ITextureObject p_110579_2_f = p_110579_2_;
lvt_6_1_.func_71507_a("Resource location", p_110579_1_);
lvt_6_1_.func_71500_a("Texture object class", new Callable<String>() {
private static final String __OBFID = "CL_00001065";
public String call() throws Exception {
- return p_110579_2_.getClass().getName();
+ return p_110579_2_f.getClass().getName();
}
});
diff -Naur src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java src.working/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java
--- src/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java 2015-10-10 17:07:51.326049484 -0400
+++ src.working/minecraft/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java 2015-10-10 15:33:07.453292308 -0400
@@ -73,15 +73,15 @@
public <T extends TileEntity> TileEntitySpecialRenderer<T> func_147546_a(Class<? extends TileEntity> p_147546_1_) {
TileEntitySpecialRenderer<? extends TileEntity> lvt_2_1_ = (TileEntitySpecialRenderer)this.field_147559_m.get(p_147546_1_);
if(lvt_2_1_ == null && p_147546_1_ != TileEntity.class) {
- lvt_2_1_ = this.func_147546_a(p_147546_1_.getSuperclass());
+ lvt_2_1_ = this.func_147546_a((Class<? extends TileEntity>)p_147546_1_.getSuperclass());
this.field_147559_m.put(p_147546_1_, lvt_2_1_);
}
- return lvt_2_1_;
+ return (TileEntitySpecialRenderer<T>)lvt_2_1_;
}
public <T extends TileEntity> TileEntitySpecialRenderer<T> func_147547_b(TileEntity p_147547_1_) {
- return p_147547_1_ == null?null:this.func_147546_a(p_147547_1_.getClass());
+ return (TileEntitySpecialRenderer<T>) (p_147547_1_ == null?null:this.func_147546_a(p_147547_1_.getClass()));
}
public void func_178470_a(World p_178470_1_, TextureManager p_178470_2_, FontRenderer p_178470_3_, Entity p_178470_4_, float p_178470_5_) {
diff -Naur src/minecraft/net/minecraft/client/resources/FolderResourcePack.java src.working/minecraft/net/minecraft/client/resources/FolderResourcePack.java
--- src/minecraft/net/minecraft/client/resources/FolderResourcePack.java 2015-10-10 17:07:31.634640727 -0400
+++ src.working/minecraft/net/minecraft/client/resources/FolderResourcePack.java 2015-10-10 15:50:38.317548297 -0400
@@ -3,6 +3,7 @@
import com.google.common.collect.Sets;
import java.io.BufferedInputStream;
import java.io.File;
+import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -29,7 +30,7 @@
Set<String> lvt_1_1_ = Sets.newHashSet();
File lvt_2_1_ = new File(this.field_110597_b, "assets/");
if(lvt_2_1_.isDirectory()) {
- for(File lvt_6_1_ : lvt_2_1_.listFiles(DirectoryFileFilter.DIRECTORY)) {
+ for(File lvt_6_1_ : lvt_2_1_.listFiles((FileFilter)DirectoryFileFilter.DIRECTORY)) {
String lvt_7_1_ = func_110595_a(lvt_2_1_, lvt_6_1_);
if(!lvt_7_1_.equals(lvt_7_1_.toLowerCase())) {
this.func_110594_c(lvt_7_1_);
diff -Naur src/minecraft/net/minecraft/client/resources/model/ModelBakery.java src.working/minecraft/net/minecraft/client/resources/model/ModelBakery.java
--- src/minecraft/net/minecraft/client/resources/model/ModelBakery.java 2015-10-10 17:07:28.186744251 -0400
+++ src.working/minecraft/net/minecraft/client/resources/model/ModelBakery.java 2015-10-10 15:17:13.686138347 -0400
@@ -478,7 +478,7 @@
private static final String __OBFID = "CL_00002389";
public void func_177059_a(TextureMap p_177059_1_) {
- for(ResourceLocation lvt_3_1_2389_ : this.field_177061_a) {
+ for(ResourceLocation lvt_3_1_2389_ : lvt_1_1_) {
TextureAtlasSprite lvt_4_1_2389_ = p_177059_1_.func_174942_a(lvt_3_1_2389_);
ModelBakery.this.field_177599_g.put(lvt_3_1_2389_, lvt_4_1_2389_);
}
diff -Naur src/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java src.working/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java
--- src/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java 2015-10-10 17:07:27.374768630 -0400
+++ src.working/minecraft/net/minecraft/client/resources/model/SimpleBakedModel.java 2015-10-10 15:26:43.748892298 -0400
@@ -99,7 +99,7 @@
this.field_177654_b = Lists.newArrayListWithCapacity(6);
for(EnumFacing var10000 : EnumFacing.values()) {
- this.field_177654_b.add(Lists.newArrayList());
+ this.field_177654_b.add(Lists.<BakedQuad>newArrayList());
}
this.field_177655_c = p_i46076_1_;
diff -Naur src/minecraft/net/minecraft/client/resources/ResourcePackRepository.java src.working/minecraft/net/minecraft/client/resources/ResourcePackRepository.java
--- src/minecraft/net/minecraft/client/resources/ResourcePackRepository.java 2015-10-10 17:07:31.630640846 -0400
+++ src.working/minecraft/net/minecraft/client/resources/ResourcePackRepository.java 2015-10-10 16:03:17.998614454 -0400
@@ -100,7 +100,7 @@
}
private List<File> func_110614_g() {
- return this.field_110618_d.isDirectory()?Arrays.asList(this.field_110618_d.listFiles(field_110622_a)):Collections.emptyList();
+ return this.field_110618_d.isDirectory()?Arrays.asList(this.field_110618_d.listFiles(field_110622_a)):Collections.<File>emptyList();
}
public void func_110611_a() {
diff -Naur src/minecraft/net/minecraft/client/resources/SimpleResource.java src.working/minecraft/net/minecraft/client/resources/SimpleResource.java
--- src/minecraft/net/minecraft/client/resources/SimpleResource.java 2015-10-10 17:07:31.630640846 -0400
+++ src.working/minecraft/net/minecraft/client/resources/SimpleResource.java 2015-10-10 16:00:39.803389277 -0400
@@ -60,7 +60,7 @@
}
}
- T lvt_2_2_ = (IMetadataSection)this.field_110535_a.get(p_110526_1_);
+ T lvt_2_2_ = (T) this.field_110535_a.get(p_110526_1_);
if(lvt_2_2_ == null) {
lvt_2_2_ = this.field_110532_e.func_110503_a(p_110526_1_, this.field_110530_g);
}
diff -Naur src/minecraft/net/minecraft/command/CommandSpreadPlayers.java src.working/minecraft/net/minecraft/command/CommandSpreadPlayers.java
--- src/minecraft/net/minecraft/command/CommandSpreadPlayers.java 2015-10-10 17:08:57.420064950 -0400
+++ src.working/minecraft/net/minecraft/command/CommandSpreadPlayers.java 2015-10-10 15:27:58.194641197 -0400
@@ -105,7 +105,7 @@
if(lvt_4_1_ instanceof EntityPlayer) {
lvt_2_1_.add(((EntityPlayer)lvt_4_1_).func_96124_cp());
} else {
- lvt_2_1_.add((Object)null);
+ lvt_2_1_.add(null);
}
}
diff -Naur src/minecraft/net/minecraft/command/PlayerSelector.java src.working/minecraft/net/minecraft/command/PlayerSelector.java
--- src/minecraft/net/minecraft/command/PlayerSelector.java 2015-10-10 17:08:57.444064228 -0400
+++ src.working/minecraft/net/minecraft/command/PlayerSelector.java 2015-10-10 15:22:39.588276992 -0400
@@ -127,7 +127,7 @@
private static List<Predicate<Entity>> func_179663_a(Map<String, String> p_179663_0_, String p_179663_1_) {
List<Predicate<Entity>> lvt_2_1_ = Lists.newArrayList();
- final String lvt_3_1_ = func_179651_b(p_179663_0_, "type");
+ String lvt_3_1_ = func_179651_b(p_179663_0_, "type");
final boolean lvt_4_1_ = lvt_3_1_ != null && lvt_3_1_.startsWith("!");
if(lvt_4_1_) {
lvt_3_1_ = lvt_3_1_.substring(1);
@@ -147,11 +147,12 @@
});
}
} else {
+ final String lvt_3_1_f = lvt_3_1_;
lvt_2_1_.add(new Predicate<Entity>() {
private static final String __OBFID = "CL_00002362";
public boolean apply(Entity p_apply_1_) {
- return EntityList.func_180123_a(p_apply_1_, lvt_3_1_) != lvt_4_1_;
+ return EntityList.func_180123_a(p_apply_1_, lvt_3_1_f) != lvt_4_1_;
}
});
@@ -207,13 +208,14 @@
private static List<Predicate<Entity>> func_179659_d(Map<String, String> p_179659_0_) {
List<Predicate<Entity>> lvt_1_1_ = Lists.newArrayList();
- final String lvt_2_1_ = func_179651_b(p_179659_0_, "team");
+ String lvt_2_1_ = func_179651_b(p_179659_0_, "team");
final boolean lvt_3_1_ = lvt_2_1_ != null && lvt_2_1_.startsWith("!");
if(lvt_3_1_) {
lvt_2_1_ = lvt_2_1_.substring(1);
}
if(lvt_2_1_ != null) {
+ final String lvt_2_1_f = lvt_2_1_;
lvt_1_1_.add(new Predicate<Entity>() {
private static final String __OBFID = "CL_00002355";
@@ -224,7 +226,7 @@
EntityLivingBase lvt_2_1_2355_ = (EntityLivingBase)p_apply_1_;
Team lvt_3_1_2355_ = lvt_2_1_2355_.func_96124_cp();
String lvt_4_1_2355_ = lvt_3_1_2355_ == null?"":lvt_3_1_2355_.func_96661_b();
- return lvt_4_1_2355_.equals(lvt_2_1_) != lvt_3_1_;
+ return lvt_4_1_2355_.equals(lvt_2_1_f) != lvt_3_1_;
}
}
@@ -284,18 +286,19 @@
private static List<Predicate<Entity>> func_179647_f(Map<String, String> p_179647_0_) {
List<Predicate<Entity>> lvt_1_1_ = Lists.newArrayList();
- final String lvt_2_1_ = func_179651_b(p_179647_0_, "name");
+ String lvt_2_1_ = func_179651_b(p_179647_0_, "name");
final boolean lvt_3_1_ = lvt_2_1_ != null && lvt_2_1_.startsWith("!");
if(lvt_3_1_) {
lvt_2_1_ = lvt_2_1_.substring(1);
}
if(lvt_2_1_ != null) {
+ final String lvt_2_1_f = lvt_2_1_;
lvt_1_1_.add(new Predicate<Entity>() {
private static final String __OBFID = "CL_00002353";
public boolean apply(Entity p_apply_1_) {
- return p_apply_1_.func_70005_c_().equals(lvt_2_1_) != lvt_3_1_;
+ return p_apply_1_.func_70005_c_().equals(lvt_2_1_f) != lvt_3_1_;
}
});
@@ -435,7 +438,7 @@
Entity lvt_7_1_ = p_179658_2_.func_174793_f();
if(lvt_7_1_ != null && p_179658_3_.isAssignableFrom(lvt_7_1_.getClass()) && lvt_6_1_ == 1 && p_179658_0_.contains(lvt_7_1_) && !"r".equals(p_179658_4_)) {
- p_179658_0_ = Lists.newArrayList(new Entity[]{lvt_7_1_});
+ p_179658_0_ = Lists.<T>newArrayList((T[])new Entity[]{lvt_7_1_});
}
if(lvt_6_1_ != 0) {
diff -Naur src/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java src.working/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java
--- src/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java 2015-10-10 17:07:52.670009131 -0400
+++ src.working/minecraft/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.java 2015-10-10 15:52:52.577494330 -0400
@@ -30,7 +30,7 @@
this.field_111132_f = p_i1608_2_.func_111110_b();
for(int lvt_3_1_ = 0; lvt_3_1_ < 3; ++lvt_3_1_) {
- this.field_111137_c.put(Integer.valueOf(lvt_3_1_), Sets.newHashSet());
+ this.field_111137_c.put(Integer.valueOf(lvt_3_1_), Sets.<AttributeModifier>newHashSet());
}
}
@@ -115,7 +115,7 @@
public void func_142049_d() {
Collection<AttributeModifier> lvt_1_1_ = this.func_111122_c();
if(lvt_1_1_ != null) {
- ArrayList var4 = Lists.newArrayList(lvt_1_1_);
+ ArrayList<AttributeModifier> var4 = Lists.newArrayList(lvt_1_1_);
for(AttributeModifier lvt_3_1_ : var4) {
this.func_111124_b(lvt_3_1_);
diff -Naur src/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.java src.working/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.java
--- src/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.java 2015-10-10 17:07:52.666009250 -0400
+++ src.working/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.java 2015-10-10 15:58:51.038672395 -0400
@@ -53,7 +53,7 @@
if(lvt_1_1_.isEmpty()) {
return false;
} else {
- this.field_75376_d = (Entity)lvt_1_1_.get(0);
+ this.field_75376_d = lvt_1_1_.get(0);
Vec3 lvt_2_1_ = RandomPositionGenerator.func_75461_b(this.field_75380_a, 16, 7, new Vec3(this.field_75376_d.field_70165_t, this.field_75376_d.field_70163_u, this.field_75376_d.field_70161_v));
if(lvt_2_1_ == null) {
return false;
diff -Naur src/minecraft/net/minecraft/inventory/Container.java src.working/minecraft/net/minecraft/inventory/Container.java
--- src/minecraft/net/minecraft/inventory/Container.java 2015-10-10 17:07:52.530013334 -0400
+++ src.working/minecraft/net/minecraft/inventory/Container.java 2015-10-10 15:25:02.327959470 -0400
@@ -29,7 +29,7 @@
protected Slot func_75146_a(Slot p_75146_1_) {
p_75146_1_.field_75222_d = this.field_75151_b.size();
this.field_75151_b.add(p_75146_1_);
- this.field_75153_a.add((Object)null);
+ this.field_75153_a.add(null);
return p_75146_1_;
}
diff -Naur src/minecraft/net/minecraft/inventory/ContainerPlayer.java src.working/minecraft/net/minecraft/inventory/ContainerPlayer.java
--- src/minecraft/net/minecraft/inventory/ContainerPlayer.java 2015-10-10 17:07:52.526013454 -0400
+++ src.working/minecraft/net/minecraft/inventory/ContainerPlayer.java 2015-10-10 15:23:22.386982340 -0400
@@ -33,7 +33,8 @@
}
}
- for(final int lvt_4_2_ = 0; lvt_4_2_ < 4; ++lvt_4_2_) {
+ for(int lvt_4_2_ = 0; lvt_4_2_ < 4; ++lvt_4_2_) {
+ final int lvt_4_2_f = lvt_4_2_;
this.func_75146_a(new Slot(p_i1819_1_, p_i1819_1_.func_70302_i_() - 1 - lvt_4_2_, 8, 8 + lvt_4_2_ * 18) {
private static final String __OBFID = "CL_00001755";
@@ -42,11 +43,11 @@
}
public boolean func_75214_a(ItemStack p_75214_1_) {
- return p_75214_1_ == null?false:(p_75214_1_.func_77973_b() instanceof ItemArmor?((ItemArmor)p_75214_1_.func_77973_b()).field_77881_a == lvt_4_2_:(p_75214_1_.func_77973_b() != Item.func_150898_a(Blocks.field_150423_aK) && p_75214_1_.func_77973_b() != Items.field_151144_bL?false:lvt_4_2_ == 0));
+ return p_75214_1_ == null?false:(p_75214_1_.func_77973_b() instanceof ItemArmor?((ItemArmor)p_75214_1_.func_77973_b()).field_77881_a == lvt_4_2_f:(p_75214_1_.func_77973_b() != Item.func_150898_a(Blocks.field_150423_aK) && p_75214_1_.func_77973_b() != Items.field_151144_bL?false:lvt_4_2_f == 0));
}
public String func_178171_c() {
- return ItemArmor.field_94603_a[lvt_4_2_];
+ return ItemArmor.field_94603_a[lvt_4_2_f];
}
});
}
diff -Naur src/minecraft/net/minecraft/item/ItemSlab.java src.working/minecraft/net/minecraft/item/ItemSlab.java
--- src/minecraft/net/minecraft/item/ItemSlab.java 2015-10-10 17:07:52.498014295 -0400
+++ src.working/minecraft/net/minecraft/item/ItemSlab.java 2015-10-10 15:07:01.780664368 -0400
@@ -81,7 +81,7 @@
if(lvt_5_1_.func_177230_c() == this.field_150949_c) {
Comparable lvt_6_1_ = lvt_5_1_.func_177229_b(this.field_150949_c.func_176551_l());
if(lvt_6_1_ == p_180615_4_) {
- IBlockState lvt_7_1_ = this.field_179226_c.func_176223_P().func_177226_a(this.field_150949_c.func_176551_l(), lvt_6_1_);
+ IBlockState lvt_7_1_ = this.field_179226_c.func_176223_P().func_177226_a((IProperty)this.field_150949_c.func_176551_l(), lvt_6_1_);
if(p_180615_2_.func_72855_b(this.field_179226_c.func_180640_a(p_180615_2_, p_180615_3_, lvt_7_1_)) && p_180615_2_.func_180501_a(p_180615_3_, lvt_7_1_, 3)) {
p_180615_2_.func_72908_a((double)((float)p_180615_3_.func_177958_n() + 0.5F), (double)((float)p_180615_3_.func_177956_o() + 0.5F), (double)((float)p_180615_3_.func_177952_p() + 0.5F), this.field_179226_c.field_149762_H.func_150496_b(), (this.field_179226_c.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.field_179226_c.field_149762_H.func_150494_d() * 0.8F);
--p_180615_1_.field_77994_a;
diff -Naur src/minecraft/net/minecraft/network/EnumConnectionState.java src.working/minecraft/net/minecraft/network/EnumConnectionState.java
--- src/minecraft/net/minecraft/network/EnumConnectionState.java 2015-10-10 17:08:57.400065549 -0400
+++ src.working/minecraft/net/minecraft/network/EnumConnectionState.java 2015-10-10 15:58:01.852157187 -0400
@@ -311,7 +311,7 @@
field_150764_e[lvt_4_1_ - field_181136_e] = lvt_3_1_;
for(EnumPacketDirection lvt_6_1_ : lvt_3_1_.field_179247_h.keySet()) {
- for(Class<? extends Packet> lvt_8_1_ : ((BiMap)lvt_3_1_.field_179247_h.get(lvt_6_1_)).values()) {
+ for(Class<? extends Packet> lvt_8_1_ : (lvt_3_1_.field_179247_h.get(lvt_6_1_)).values()) {
if(field_150761_f.containsKey(lvt_8_1_) && field_150761_f.get(lvt_8_1_) != lvt_3_1_) {
throw new Error("Packet " + lvt_8_1_ + " is already assigned to protocol " + field_150761_f.get(lvt_8_1_) + " - can\'t reassign to " + lvt_3_1_);
}
diff -Naur src/minecraft/net/minecraft/network/NetHandlerPlayServer.java src.working/minecraft/net/minecraft/network/NetHandlerPlayServer.java
--- src/minecraft/net/minecraft/network/NetHandlerPlayServer.java 2015-10-10 17:07:52.770006128 -0400
+++ src.working/minecraft/net/minecraft/network/NetHandlerPlayServer.java 2015-10-10 15:34:09.511416763 -0400
@@ -351,7 +351,7 @@
}
public void func_147364_a(double p_147364_1_, double p_147364_3_, double p_147364_5_, float p_147364_7_, float p_147364_8_) {
- this.func_175089_a(p_147364_1_, p_147364_3_, p_147364_5_, p_147364_7_, p_147364_8_, Collections.emptySet());
+ this.func_175089_a(p_147364_1_, p_147364_3_, p_147364_5_, p_147364_7_, p_147364_8_, Collections.<S08PacketPlayerPosLook.EnumFlags>emptySet());
}
public void func_175089_a(double p_175089_1_, double p_175089_3_, double p_175089_5_, float p_175089_7_, float p_175089_8_, Set<S08PacketPlayerPosLook.EnumFlags> p_175089_9_) {
diff -Naur src/minecraft/net/minecraft/network/NetworkSystem.java src.working/minecraft/net/minecraft/network/NetworkSystem.java
--- src/minecraft/net/minecraft/network/NetworkSystem.java 2015-10-10 17:07:52.770006128 -0400
+++ src.working/minecraft/net/minecraft/network/NetworkSystem.java 2015-10-10 16:03:35.790077481 -0400
@@ -75,8 +75,8 @@
};
private final MinecraftServer field_151273_d;
public volatile boolean field_151277_a;
- private final List<ChannelFuture> field_151274_e = Collections.synchronizedList(Lists.newArrayList());
- private final List<NetworkManager> field_151272_f = Collections.synchronizedList(Lists.newArrayList());
+ private final List<ChannelFuture> field_151274_e = Collections.synchronizedList(Lists.<ChannelFuture>newArrayList());
+ private final List<NetworkManager> field_151272_f = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
private static final String __OBFID = "CL_00001447";
public NetworkSystem(MinecraftServer p_i45292_1_) {
diff -Naur src/minecraft/net/minecraft/pathfinding/Path.java src.working/minecraft/net/minecraft/pathfinding/Path.java
--- src/minecraft/net/minecraft/pathfinding/Path.java 2015-10-10 17:07:51.862033390 -0400
+++ src.working/minecraft/net/minecraft/pathfinding/Path.java 2015-10-10 15:56:55.482160771 -0400
@@ -87,7 +87,7 @@
float lvt_9_1_;
if(lvt_5_1_ >= this.field_75851_b) {
lvt_8_1_ = null;
- lvt_9_1_ = 1.0F / 0.0;
+ lvt_9_1_ = 1.0F / 0.0F;
} else {
lvt_8_1_ = this.field_75852_a[lvt_5_1_];
lvt_9_1_ = lvt_8_1_.field_75834_g;
diff -Naur src/minecraft/net/minecraft/realms/RealmsServerStatusPinger.java src.working/minecraft/net/minecraft/realms/RealmsServerStatusPinger.java
--- src/minecraft/net/minecraft/realms/RealmsServerStatusPinger.java 2015-10-10 17:07:52.502014174 -0400
+++ src.working/minecraft/net/minecraft/realms/RealmsServerStatusPinger.java 2015-10-10 16:04:26.592544214 -0400
@@ -28,7 +28,7 @@
public class RealmsServerStatusPinger {
private static final Logger LOGGER = LogManager.getLogger();
- private final List<NetworkManager> connections = Collections.synchronizedList(Lists.newArrayList());
+ private final List<NetworkManager> connections = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
private static final String __OBFID = "CL_00001854";
public void pingServer(final String p_pingServer_1_, final RealmsServerPing p_pingServer_2_) throws UnknownHostException {
diff -Naur src/minecraft/net/minecraft/scoreboard/Scoreboard.java src.working/minecraft/net/minecraft/scoreboard/Scoreboard.java
--- src/minecraft/net/minecraft/scoreboard/Scoreboard.java 2015-10-10 17:07:51.646039876 -0400
+++ src.working/minecraft/net/minecraft/scoreboard/Scoreboard.java 2015-10-10 15:56:17.879295966 -0400
@@ -49,7 +49,7 @@
public Collection<ScoreObjective> func_96520_a(IScoreObjectiveCriteria p_96520_1_) {
Collection<ScoreObjective> lvt_2_1_ = (Collection)this.field_96543_b.get(p_96520_1_);
- return lvt_2_1_ == null?Lists.newArrayList():Lists.newArrayList(lvt_2_1_);
+ return lvt_2_1_ == null?Lists.<ScoreObjective>newArrayList():Lists.newArrayList(lvt_2_1_);
}
public boolean func_178819_b(String p_178819_1_, ScoreObjective p_178819_2_) {
diff -Naur src/minecraft/net/minecraft/server/dedicated/DedicatedServer.java src.working/minecraft/net/minecraft/server/dedicated/DedicatedServer.java
--- src/minecraft/net/minecraft/server/dedicated/DedicatedServer.java 2015-10-10 17:08:57.456063868 -0400
+++ src.working/minecraft/net/minecraft/server/dedicated/DedicatedServer.java 2015-10-10 16:04:37.276221776 -0400
@@ -41,7 +41,7 @@
public class DedicatedServer extends MinecraftServer implements IServer {
private static final Logger field_155771_h = LogManager.getLogger();
- private final List<ServerCommand> field_71341_l = Collections.synchronizedList(Lists.newArrayList());
+ private final List<ServerCommand> field_71341_l = Collections.synchronizedList(Lists.<ServerCommand>newArrayList());
private RConThreadQuery field_71342_m;
private RConThreadMain field_71339_n;
private PropertyManager field_71340_o;
diff -Naur src/minecraft/net/minecraft/server/management/UserList.java src.working/minecraft/net/minecraft/server/management/UserList.java
--- src/minecraft/net/minecraft/server/management/UserList.java 2015-10-10 17:07:52.706008049 -0400
+++ src.working/minecraft/net/minecraft/server/management/UserList.java 2015-10-10 15:55:37.132526104 -0400
@@ -166,7 +166,7 @@
for(UserListEntry<K> lvt_4_1_ : lvt_1_1_) {
if(lvt_4_1_.func_152640_f() != null) {
- this.field_152696_d.put(this.func_152681_a(lvt_4_1_.func_152640_f()), lvt_4_1_);
+ this.field_152696_d.put(this.func_152681_a(lvt_4_1_.func_152640_f()), (V) lvt_4_1_);
}
}
}
diff -Naur src/minecraft/net/minecraft/util/Cartesian.java src.working/minecraft/net/minecraft/util/Cartesian.java
--- src/minecraft/net/minecraft/util/Cartesian.java 2015-10-10 17:08:57.416065070 -0400
+++ src.working/minecraft/net/minecraft/util/Cartesian.java 2015-10-10 15:18:24.040009094 -0400
@@ -40,20 +40,16 @@
return (T[])((Object[])((Object[])Array.newInstance(p_179319_0_, p_179319_1_)));
}
- static class GetList<T> implements Function<Object[], List<T>> {
+ static class GetList<T> implements Function<T[], List<T>> {
private static final String __OBFID = "CL_00002325";
private GetList() {
}
- public List<T> apply(Object[] p_apply_1_) {
- return Arrays.asList((Object[])p_apply_1_);
+ public List<T> apply(T[] p_apply_1_) {
+ return Arrays.asList(p_apply_1_);
}
- // $FF: synthetic method
- public Object apply(Object p_apply_1_) {
- return this.apply((Object[])p_apply_1_);
- }
}
static class Product<T> implements Iterable<T[]> {
diff -Naur src/minecraft/net/minecraft/util/ClassInheritanceMultiMap.java src.working/minecraft/net/minecraft/util/ClassInheritanceMultiMap.java
--- src/minecraft/net/minecraft/util/ClassInheritanceMultiMap.java 2015-10-10 17:07:52.698008289 -0400
+++ src.working/minecraft/net/minecraft/util/ClassInheritanceMultiMap.java 2015-10-10 16:05:37.262411405 -0400
@@ -66,7 +66,7 @@
private void func_181743_a(T p_181743_1_, Class<?> p_181743_2_) {
List<T> lvt_3_1_ = (List)this.field_180218_a.get(p_181743_2_);
if(lvt_3_1_ == null) {
- this.field_180218_a.put(p_181743_2_, Lists.newArrayList(new Object[]{p_181743_1_}));
+ this.field_180218_a.put(p_181743_2_, Lists.newArrayList((T[])new Object[]{p_181743_1_}));
} else {
lvt_3_1_.add(p_181743_1_);
}
@@ -74,7 +74,7 @@
}
public boolean remove(Object p_remove_1_) {
- T lvt_2_1_ = p_remove_1_;
+ T lvt_2_1_ = (T) p_remove_1_;
boolean lvt_3_1_ = false;
for(Class<?> lvt_5_1_ : this.field_180216_b) {
@@ -110,7 +110,7 @@
}
public Iterator<T> iterator() {
- return this.field_181745_e.isEmpty()?Iterators.emptyIterator():Iterators.unmodifiableIterator(this.field_181745_e.iterator());
+ return this.field_181745_e.isEmpty()?Iterators.<T>emptyIterator():Iterators.unmodifiableIterator(this.field_181745_e.iterator());
}
public int size() {
diff -Naur src/minecraft/net/minecraft/util/EnumTypeAdapterFactory.java src.working/minecraft/net/minecraft/util/EnumTypeAdapterFactory.java
--- src/minecraft/net/minecraft/util/EnumTypeAdapterFactory.java 2015-10-10 17:07:52.694008410 -0400
+++ src.working/minecraft/net/minecraft/util/EnumTypeAdapterFactory.java 2015-10-10 15:56:36.706727580 -0400
@@ -16,7 +16,7 @@
private static final String __OBFID = "CL_00001494";
public <T> TypeAdapter<T> create(Gson p_create_1_, TypeToken<T> p_create_2_) {
- Class<T> lvt_3_1_ = p_create_2_.getRawType();
+ Class<T> lvt_3_1_ = (Class<T>) p_create_2_.getRawType();
if(!lvt_3_1_.isEnum()) {
return null;
} else {
diff -Naur src/minecraft/net/minecraft/util/HttpUtil.java src.working/minecraft/net/minecraft/util/HttpUtil.java
--- src/minecraft/net/minecraft/util/HttpUtil.java 2015-10-10 17:07:52.698008289 -0400
+++ src.working/minecraft/net/minecraft/util/HttpUtil.java 2015-10-10 16:05:11.207197740 -0400
@@ -199,7 +199,7 @@
}
}
});
- return lvt_6_1_;
+ return (ListenableFuture<Object>) lvt_6_1_;
}
public static int func_76181_a() throws IOException {
diff -Naur src/minecraft/net/minecraft/util/MapPopulator.java src.working/minecraft/net/minecraft/util/MapPopulator.java
--- src/minecraft/net/minecraft/util/MapPopulator.java 2015-10-10 17:08:57.412065189 -0400
+++ src.working/minecraft/net/minecraft/util/MapPopulator.java 2015-10-10 15:43:31.158448923 -0400
@@ -9,7 +9,7 @@
private static final String __OBFID = "CL_00002318";
public static <K, V> Map<K, V> func_179400_b(Iterable<K> p_179400_0_, Iterable<V> p_179400_1_) {
- return func_179399_a(p_179400_0_, p_179400_1_, Maps.newLinkedHashMap());
+ return func_179399_a(p_179400_0_, p_179400_1_, Maps.<K,V>newLinkedHashMap());
}
public static <K, V> Map<K, V> func_179399_a(Iterable<K> p_179399_0_, Iterable<V> p_179399_1_, Map<K, V> p_179399_2_) {
diff -Naur src/minecraft/net/minecraft/util/ObjectIntIdentityMap.java src.working/minecraft/net/minecraft/util/ObjectIntIdentityMap.java
--- src/minecraft/net/minecraft/util/ObjectIntIdentityMap.java 2015-10-10 17:08:57.412065189 -0400
+++ src.working/minecraft/net/minecraft/util/ObjectIntIdentityMap.java 2015-10-10 15:27:16.631897946 -0400
@@ -17,7 +17,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_);
diff -Naur src/minecraft/net/minecraft/util/ThreadSafeBoundList.java src.working/minecraft/net/minecraft/util/ThreadSafeBoundList.java
--- src/minecraft/net/minecraft/util/ThreadSafeBoundList.java 2015-10-10 17:07:52.694008410 -0400
+++ src.working/minecraft/net/minecraft/util/ThreadSafeBoundList.java 2015-10-10 16:05:26.794727314 -0400
@@ -14,7 +14,7 @@
public ThreadSafeBoundList(Class<? extends T> p_i1126_1_, int p_i1126_2_) {
this.field_152760_b = p_i1126_1_;
- this.field_152759_a = (Object[])((Object[])Array.newInstance(p_i1126_1_, p_i1126_2_));
+ this.field_152759_a = (T[])((Object[])Array.newInstance(p_i1126_1_, p_i1126_2_));
}
public T func_152757_a(T p_152757_1_) {
@@ -37,7 +37,7 @@
}
public T[] func_152756_c() {
- T[] lvt_1_1_ = (Object[])((Object[])Array.newInstance(this.field_152760_b, this.field_152762_d));
+ T[] lvt_1_1_ = (T[])((Object[])Array.newInstance(this.field_152760_b, this.field_152762_d));
this.field_152761_c.readLock().lock();
for(int lvt_2_1_ = 0; lvt_2_1_ < this.field_152762_d; ++lvt_2_1_) {
diff -Naur src/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.java src.working/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.java
--- src/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.java 2015-10-10 17:07:51.898032309 -0400
+++ src.working/minecraft/net/minecraft/world/gen/FlatGeneratorInfo.java 2015-10-10 15:53:12.436894707 -0400
@@ -218,7 +218,7 @@
}
}
} else {
- lvt_3_1_.func_82644_b().put("village", Maps.newHashMap());
+ lvt_3_1_.func_82644_b().put("village", Maps.<String,String>newHashMap());
}
return lvt_3_1_;
@@ -238,7 +238,7 @@
lvt_0_1_.func_82650_c().add(new FlatLayerInfo(2, Blocks.field_150346_d));
lvt_0_1_.func_82650_c().add(new FlatLayerInfo(1, Blocks.field_150349_c));
lvt_0_1_.func_82645_d();
- lvt_0_1_.func_82644_b().put("village", Maps.newHashMap());
+ lvt_0_1_.func_82644_b().put("village", Maps.<String,String>newHashMap());
return lvt_0_1_;
}
}
diff -Naur src/minecraft/net/minecraft/world/gen/layer/GenLayer.java src.working/minecraft/net/minecraft/world/gen/layer/GenLayer.java
--- src/minecraft/net/minecraft/world/gen/layer/GenLayer.java 2015-10-10 17:07:51.862033390 -0400
+++ src.working/minecraft/net/minecraft/world/gen/layer/GenLayer.java 2015-10-10 16:00:08.476334876 -0400
@@ -73,7 +73,7 @@
GenLayer var37 = GenLayerZoom.func_75915_a(1000L, lvt_9_1_, 2);
GenLayerBiomeEdge var38 = new GenLayerBiomeEdge(1000L, var37);
GenLayer lvt_10_1_ = GenLayerZoom.func_75915_a(1000L, var32, 2);
- GenLayerHills var39 = new GenLayerHills(1000L, var38, lvt_10_1_);
+ GenLayer var39 = new GenLayerHills(1000L, var38, lvt_10_1_);
GenLayer var33 = GenLayerZoom.func_75915_a(1000L, var32, 2);
var33 = GenLayerZoom.func_75915_a(1000L, var33, lvt_7_1_);
GenLayerRiver var35 = new GenLayerRiver(1L, var33);
diff -Naur src/minecraft/net/minecraft/world/storage/ThreadedFileIOBase.java src.working/minecraft/net/minecraft/world/storage/ThreadedFileIOBase.java
--- src/minecraft/net/minecraft/world/storage/ThreadedFileIOBase.java 2015-10-10 17:07:51.650039755 -0400
+++ src.working/minecraft/net/minecraft/world/storage/ThreadedFileIOBase.java 2015-10-10 16:04:05.617177266 -0400
@@ -7,7 +7,7 @@
public class ThreadedFileIOBase implements Runnable {
private static final ThreadedFileIOBase field_75741_a = new ThreadedFileIOBase();
- private List<IThreadedFileIO> field_75739_b = Collections.synchronizedList(Lists.newArrayList());
+ private List<IThreadedFileIO> field_75739_b = Collections.synchronizedList(Lists.<IThreadedFileIO>newArrayList());
private volatile long field_75740_c;
private volatile long field_75737_d;
private volatile boolean field_75738_e;
diff -Naur src/minecraft/net/minecraft/world/World.java src.working/minecraft/net/minecraft/world/World.java
--- src/minecraft/net/minecraft/world/World.java 2015-10-10 17:07:52.478014895 -0400
+++ src.working/minecraft/net/minecraft/world/World.java 2015-10-10 15:59:01.034370660 -0400
@@ -2155,8 +2155,8 @@
List<T> lvt_3_1_ = Lists.newArrayList();
for(Entity lvt_5_1_ : this.field_72996_f) {
- if(p_175644_1_.isAssignableFrom(lvt_5_1_.getClass()) && p_175644_2_.apply(lvt_5_1_)) {
- lvt_3_1_.add(lvt_5_1_);
+ if(p_175644_1_.isAssignableFrom(lvt_5_1_.getClass()) && p_175644_2_.apply((T)lvt_5_1_)) {
+ lvt_3_1_.add((T)lvt_5_1_);
}
}
@@ -2167,8 +2167,8 @@
List<T> lvt_3_1_ = Lists.newArrayList();
for(Entity lvt_5_1_ : this.field_73010_i) {
- if(p_175661_1_.isAssignableFrom(lvt_5_1_.getClass()) && p_175661_2_.apply(lvt_5_1_)) {
- lvt_3_1_.add(lvt_5_1_);
+ if(p_175661_1_.isAssignableFrom(lvt_5_1_.getClass()) && p_175661_2_.apply((T)lvt_5_1_)) {
+ lvt_3_1_.add((T)lvt_5_1_);
}
}
@@ -2203,7 +2203,7 @@
double lvt_6_1_ = 1.7976931348623157E308D;
for(int lvt_8_1_ = 0; lvt_8_1_ < lvt_4_1_.size(); ++lvt_8_1_) {
- T lvt_9_1_ = (Entity)lvt_4_1_.get(lvt_8_1_);
+ T lvt_9_1_ = lvt_4_1_.get(lvt_8_1_);
if(lvt_9_1_ != p_72857_3_ && EntitySelectors.field_180132_d.apply(lvt_9_1_)) {
double lvt_10_1_ = p_72857_3_.func_70068_e(lvt_9_1_);
if(lvt_10_1_ <= lvt_6_1_) {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment