keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Update patches for fixed inner class suffeling in srg files.

This commit is contained in:
LexManos 2016-03-13 18:32:53 -07:00
parent 5d352bda6c
commit c27b13c705
3 changed files with 15 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
build.gradle
View File

@ -171,25 +171,25 @@ task makeMdk(type: Zip) {
from 'gradlew'
from 'gradlew.bat'
into ('gradle') {
from 'gradle'
from 'gradle'
}
into ('eclipse') {
from 'mdk/eclipse'
}
from changelog.output
from ('mdk') {
filter(ReplaceTokens, tokens: [
VERSION: project.version,
MAPPINGS: minecraft.mappings.replace('nodoc_', '')
])
exclude 'eclipse'
rename 'gitignore\\.txt', '.gitignore'
from 'MinecraftForge-Credits.txt'
from 'MinecraftForge-License.txt'
from 'Paulscode IBXM Library License.txt'
from 'Paulscode SoundSystem CodecIBXM License.txt'
from 'CREDITS-fml.txt'
from 'LICENSE-fml.txt'
filter(ReplaceTokens, tokens: [
VERSION: project.version,
MAPPINGS: minecraft.mappings.replace('nodoc_', '')
])
exclude 'eclipse'
rename 'gitignore\\.txt', '.gitignore'
from 'MinecraftForge-Credits.txt'
from 'MinecraftForge-License.txt'
from 'Paulscode IBXM Library License.txt'
from 'Paulscode SoundSystem CodecIBXM License.txt'
from 'CREDITS-fml.txt'
from 'LICENSE-fml.txt'
}
}
tasks.build.dependsOn makeMdk
@ -375,13 +375,12 @@ String getVersionFromJava(File file)
task setupForge { dependsOn 'setup' }
task buildPackages { dependsOn 'build' }
//Temporary hack to fix compile errors caused by 1.8.9 mappings on 1.9
//Temporary hack to fix compile errors caused by mappings shading in Bootstrap
task fixParams << {
logger.lifecycle('Fixing param names!')
def params = new File(extractMcpMappings.destinationDir, 'params.csv')
def text = params.text
text = text.replaceAll('p_150893_2_,block,', 'p_150893_2_,state,')
text = text.replaceAll('p_148611_1_,sound,', 'p_148611_1_,p_sound,')
text = text.replaceAll('p_82499_3_,stack,', 'p_82499_3_,stackIn,')
params.write(text)
}
fixParams.dependsOn('extractMcpMappings')

431
patches/minecraft/net/minecraft/init/Bootstrap.java.patch
View File

@ -1,431 +0,0 @@
--- ../src-base/minecraft/net/minecraft/init/Bootstrap.java
+++ ../src-work/minecraft/net/minecraft/init/Bootstrap.java
@@ -74,6 +74,7 @@
return field_151355_a;
}
+ @SuppressWarnings("unused")
static void func_151353_a()
{
BlockDispenser.field_149943_a.func_82595_a(Items.field_151032_g, new BehaviorProjectileDispense()
@@ -87,42 +88,42 @@
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_185167_i, new BehaviorProjectileDispense()
{
- protected IProjectile func_82499_a(World p_82499_1_, IPosition p_82499_2_, ItemStack p_82499_3_)
+ protected IProjectile func_82499_a(World worldIn, IPosition position, ItemStack stack)
{
- EntityTippedArrow entitytippedarrow = new EntityTippedArrow(p_82499_1_, p_82499_2_.func_82615_a(), p_82499_2_.func_82617_b(), p_82499_2_.func_82616_c());
- entitytippedarrow.func_184555_a(p_82499_3_);
+ EntityTippedArrow entitytippedarrow = new EntityTippedArrow(worldIn, position.func_82615_a(), position.func_82617_b(), position.func_82616_c());
+ entitytippedarrow.func_184555_a(stack);
entitytippedarrow.field_70251_a = EntityArrow.PickupStatus.ALLOWED;
return entitytippedarrow;
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_185166_h, new BehaviorProjectileDispense()
{
- protected IProjectile func_82499_a(World p_82499_1_, IPosition p_82499_2_, ItemStack p_82499_3_)
+ protected IProjectile func_82499_a(World worldIn, IPosition position, ItemStack stack)
{
- EntityArrow entityarrow = new EntitySpectralArrow(p_82499_1_, p_82499_2_.func_82615_a(), p_82499_2_.func_82617_b(), p_82499_2_.func_82616_c());
+ EntityArrow entityarrow = new EntitySpectralArrow(worldIn, position.func_82615_a(), position.func_82617_b(), position.func_82616_c());
entityarrow.field_70251_a = EntityArrow.PickupStatus.ALLOWED;
return entityarrow;
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151110_aK, new BehaviorProjectileDispense()
{
- protected IProjectile func_82499_a(World p_82499_1_, IPosition p_82499_2_, ItemStack p_82499_3_)
+ protected IProjectile func_82499_a(World worldIn, IPosition position, ItemStack stack)
{
- return new EntityEgg(p_82499_1_, p_82499_2_.func_82615_a(), p_82499_2_.func_82617_b(), p_82499_2_.func_82616_c());
+ return new EntityEgg(worldIn, position.func_82615_a(), position.func_82617_b(), position.func_82616_c());
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151126_ay, new BehaviorProjectileDispense()
{
- protected IProjectile func_82499_a(World p_82499_1_, IPosition p_82499_2_, ItemStack p_82499_3_)
+ protected IProjectile func_82499_a(World worldIn, IPosition position, ItemStack stack)
{
- return new EntitySnowball(p_82499_1_, p_82499_2_.func_82615_a(), p_82499_2_.func_82617_b(), p_82499_2_.func_82616_c());
+ return new EntitySnowball(worldIn, position.func_82615_a(), position.func_82617_b(), position.func_82616_c());
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151062_by, new BehaviorProjectileDispense()
{
- protected IProjectile func_82499_a(World p_82499_1_, IPosition p_82499_2_, ItemStack p_82499_3_)
+ protected IProjectile func_82499_a(World worldIn, IPosition position, ItemStack stack)
{
- return new EntityExpBottle(p_82499_1_, p_82499_2_.func_82615_a(), p_82499_2_.func_82617_b(), p_82499_2_.func_82616_c());
+ return new EntityExpBottle(worldIn, position.func_82615_a(), position.func_82617_b(), position.func_82616_c());
}
protected float func_82498_a()
{
@@ -135,13 +136,13 @@
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_185155_bH, new IBehaviorDispenseItem()
{
- public ItemStack func_82482_a(IBlockSource p_82482_1_, final ItemStack p_82482_2_)
+ public ItemStack func_82482_a(IBlockSource source, final ItemStack stack)
{
return (new BehaviorProjectileDispense()
{
- protected IProjectile func_82499_a(World p_82499_1_, IPosition p_82499_2_, ItemStack p_82499_3_)
+ protected IProjectile func_82499_a(World worldIn, IPosition position, ItemStack stack)
{
- return new EntityPotion(p_82499_1_, p_82499_2_.func_82615_a(), p_82499_2_.func_82617_b(), p_82499_2_.func_82616_c(), p_82482_2_.func_77946_l());
+ return new EntityPotion(worldIn, position.func_82615_a(), position.func_82617_b(), position.func_82616_c(), stack.func_77946_l());
}
protected float func_82498_a()
{
@@ -151,18 +152,18 @@
{
return super.func_82500_b() * 1.25F;
}
- }).func_82482_a(p_82482_1_, p_82482_2_);
+ }).func_82482_a(source, stack);
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_185156_bI, new IBehaviorDispenseItem()
{
- public ItemStack func_82482_a(IBlockSource p_82482_1_, final ItemStack p_82482_2_)
+ public ItemStack func_82482_a(IBlockSource source, final ItemStack stack)
{
return (new BehaviorProjectileDispense()
{
- protected IProjectile func_82499_a(World p_82499_1_, IPosition p_82499_2_, ItemStack p_82499_3_)
+ protected IProjectile func_82499_a(World worldIn, IPosition position, ItemStack stack)
{
- return new EntityPotion(p_82499_1_, p_82499_2_.func_82615_a(), p_82499_2_.func_82617_b(), p_82499_2_.func_82616_c(), p_82482_2_.func_77946_l());
+ return new EntityPotion(worldIn, position.func_82615_a(), position.func_82617_b(), position.func_82616_c(), stack.func_77946_l());
}
protected float func_82498_a()
{
@@ -172,7 +173,7 @@
{
return super.func_82500_b() * 1.25F;
}
- }).func_82482_a(p_82482_1_, p_82482_2_);
+ }).func_82482_a(source, stack);
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151063_bx, new BehaviorDefaultDispenseItem()
@@ -215,25 +216,25 @@
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151059_bz, new BehaviorDefaultDispenseItem()
{
- public ItemStack func_82487_b(IBlockSource p_82487_1_, ItemStack p_82487_2_)
+ public ItemStack func_82487_b(IBlockSource source, ItemStack stack)
{
- EnumFacing enumfacing = BlockDispenser.func_149937_b(p_82487_1_.func_82620_h());
- IPosition iposition = BlockDispenser.func_149939_a(p_82487_1_);
+ EnumFacing enumfacing = BlockDispenser.func_149937_b(source.func_82620_h());
+ IPosition iposition = BlockDispenser.func_149939_a(source);
double d0 = iposition.func_82615_a() + (double)((float)enumfacing.func_82601_c() * 0.3F);
double d1 = iposition.func_82617_b() + (double)((float)enumfacing.func_96559_d() * 0.3F);
double d2 = iposition.func_82616_c() + (double)((float)enumfacing.func_82599_e() * 0.3F);
- World world = p_82487_1_.func_82618_k();
+ World world = source.func_82618_k();
Random random = world.field_73012_v;
double d3 = random.nextGaussian() * 0.05D + (double)enumfacing.func_82601_c();
double d4 = random.nextGaussian() * 0.05D + (double)enumfacing.func_96559_d();
double d5 = random.nextGaussian() * 0.05D + (double)enumfacing.func_82599_e();
world.func_72838_d(new EntitySmallFireball(world, d0, d1, d2, d3, d4, d5));
- p_82487_2_.func_77979_a(1);
- return p_82487_2_;
+ stack.func_77979_a(1);
+ return stack;
}
- protected void func_82485_a(IBlockSource p_82485_1_)
+ protected void func_82485_a(IBlockSource source)
{
- p_82485_1_.func_82618_k().func_175718_b(1018, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1018, source.func_180699_d(), 0);
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151124_az, new Bootstrap.BehaviorDispenseBoat(EntityBoat.Type.OAK));
@@ -244,21 +245,21 @@
BlockDispenser.field_149943_a.func_82595_a(Items.field_185153_aK, new Bootstrap.BehaviorDispenseBoat(EntityBoat.Type.ACACIA));
IBehaviorDispenseItem ibehaviordispenseitem = new BehaviorDefaultDispenseItem()
{
- private final BehaviorDefaultDispenseItem field_150841_b = new BehaviorDefaultDispenseItem();
- public ItemStack func_82487_b(IBlockSource p_82487_1_, ItemStack p_82487_2_)
+ private final BehaviorDefaultDispenseItem dispenseBehavior = new BehaviorDefaultDispenseItem();
+ public ItemStack func_82487_b(IBlockSource source, ItemStack stack)
{
- ItemBucket itembucket = (ItemBucket)p_82487_2_.func_77973_b();
- BlockPos blockpos = p_82487_1_.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(p_82487_1_.func_82620_h()));
+ ItemBucket itembucket = (ItemBucket)stack.func_77973_b();
+ BlockPos blockpos = source.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(source.func_82620_h()));
- if (itembucket.func_180616_a((EntityPlayer)null, p_82487_1_.func_82618_k(), blockpos))
+ if (itembucket.func_180616_a((EntityPlayer)null, source.func_82618_k(), blockpos))
{
- p_82487_2_.func_150996_a(Items.field_151133_ar);
- p_82487_2_.field_77994_a = 1;
- return p_82487_2_;
+ stack.func_150996_a(Items.field_151133_ar);
+ stack.field_77994_a = 1;
+ return stack;
}
else
{
- return this.field_150841_b.func_82482_a(p_82487_1_, p_82487_2_);
+ return this.dispenseBehavior.func_82482_a(source, stack);
}
}
};
@@ -266,11 +267,11 @@
BlockDispenser.field_149943_a.func_82595_a(Items.field_151131_as, ibehaviordispenseitem);
BlockDispenser.field_149943_a.func_82595_a(Items.field_151133_ar, new BehaviorDefaultDispenseItem()
{
- private final BehaviorDefaultDispenseItem field_150840_b = new BehaviorDefaultDispenseItem();
- public ItemStack func_82487_b(IBlockSource p_82487_1_, ItemStack p_82487_2_)
+ private final BehaviorDefaultDispenseItem dispenseBehavior = new BehaviorDefaultDispenseItem();
+ public ItemStack func_82487_b(IBlockSource source, ItemStack stack)
{
- World world = p_82487_1_.func_82618_k();
- BlockPos blockpos = p_82487_1_.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(p_82487_1_.func_82620_h()));
+ World world = source.func_82618_k();
+ BlockPos blockpos = source.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(source.func_82620_h()));
IBlockState iblockstate = world.func_180495_p(blockpos);
Block block = iblockstate.func_177230_c();
Material material = iblockstate.func_185904_a();
@@ -284,7 +285,7 @@
{
if (!Material.field_151587_i.equals(material) || !(block instanceof BlockLiquid) || ((Integer)iblockstate.func_177229_b(BlockLiquid.field_176367_b)).intValue() != 0)
{
- return super.func_82487_b(p_82487_1_, p_82487_2_);
+ return super.func_82487_b(source, stack);
}
item = Items.field_151129_at;
@@ -292,34 +293,34 @@
world.func_175698_g(blockpos);
- if (--p_82487_2_.field_77994_a == 0)
+ if (--stack.field_77994_a == 0)
{
- p_82487_2_.func_150996_a(item);
- p_82487_2_.field_77994_a = 1;
+ stack.func_150996_a(item);
+ stack.field_77994_a = 1;
}
- else if (((TileEntityDispenser)p_82487_1_.func_150835_j()).func_146019_a(new ItemStack(item)) < 0)
+ else if (((TileEntityDispenser)source.func_150835_j()).func_146019_a(new ItemStack(item)) < 0)
{
- this.field_150840_b.func_82482_a(p_82487_1_, new ItemStack(item));
+ this.dispenseBehavior.func_82482_a(source, new ItemStack(item));
}
- return p_82487_2_;
+ return stack;
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151033_d, new BehaviorDefaultDispenseItem()
{
private boolean field_150839_b = true;
- protected ItemStack func_82487_b(IBlockSource p_82487_1_, ItemStack p_82487_2_)
+ protected ItemStack func_82487_b(IBlockSource source, ItemStack stack)
{
- World world = p_82487_1_.func_82618_k();
- BlockPos blockpos = p_82487_1_.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(p_82487_1_.func_82620_h()));
+ World world = source.func_82618_k();
+ BlockPos blockpos = source.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(source.func_82620_h()));
if (world.func_175623_d(blockpos))
{
world.func_175656_a(blockpos, Blocks.field_150480_ab.func_176223_P());
- if (p_82487_2_.func_96631_a(1, world.field_73012_v))
+ if (stack.func_96631_a(1, world.field_73012_v))
{
- p_82487_2_.field_77994_a = 0;
+ stack.field_77994_a = 0;
}
}
else if (world.func_180495_p(blockpos).func_177230_c() == Blocks.field_150335_W)
@@ -332,31 +333,31 @@
this.field_150839_b = false;
}
- return p_82487_2_;
+ return stack;
}
- protected void func_82485_a(IBlockSource p_82485_1_)
+ protected void func_82485_a(IBlockSource source)
{
if (this.field_150839_b)
{
- p_82485_1_.func_82618_k().func_175718_b(1000, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1000, source.func_180699_d(), 0);
}
else
{
- p_82485_1_.func_82618_k().func_175718_b(1001, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1001, source.func_180699_d(), 0);
}
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151100_aR, new BehaviorDefaultDispenseItem()
{
private boolean field_150838_b = true;
- protected ItemStack func_82487_b(IBlockSource p_82487_1_, ItemStack p_82487_2_)
+ protected ItemStack func_82487_b(IBlockSource source, ItemStack stack)
{
- if (EnumDyeColor.WHITE == EnumDyeColor.func_176766_a(p_82487_2_.func_77960_j()))
+ if (EnumDyeColor.WHITE == EnumDyeColor.func_176766_a(stack.func_77960_j()))
{
- World world = p_82487_1_.func_82618_k();
- BlockPos blockpos = p_82487_1_.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(p_82487_1_.func_82620_h()));
+ World world = source.func_82618_k();
+ BlockPos blockpos = source.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(source.func_82620_h()));
- if (ItemDye.func_179234_a(p_82487_2_, world, blockpos))
+ if (ItemDye.func_179234_a(stack, world, blockpos))
{
if (!world.field_72995_K)
{
@@ -368,49 +369,49 @@
this.field_150838_b = false;
}
- return p_82487_2_;
+ return stack;
}
else
{
- return super.func_82487_b(p_82487_1_, p_82487_2_);
+ return super.func_82487_b(source, stack);
}
}
- protected void func_82485_a(IBlockSource p_82485_1_)
+ protected void func_82485_a(IBlockSource source)
{
if (this.field_150838_b)
{
- p_82485_1_.func_82618_k().func_175718_b(1000, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1000, source.func_180699_d(), 0);
}
else
{
- p_82485_1_.func_82618_k().func_175718_b(1001, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1001, source.func_180699_d(), 0);
}
}
});
BlockDispenser.field_149943_a.func_82595_a(Item.func_150898_a(Blocks.field_150335_W), new BehaviorDefaultDispenseItem()
{
- protected ItemStack func_82487_b(IBlockSource p_82487_1_, ItemStack p_82487_2_)
+ protected ItemStack func_82487_b(IBlockSource source, ItemStack stack)
{
- World world = p_82487_1_.func_82618_k();
- BlockPos blockpos = p_82487_1_.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(p_82487_1_.func_82620_h()));
+ World world = source.func_82618_k();
+ BlockPos blockpos = source.func_180699_d().func_177972_a(BlockDispenser.func_149937_b(source.func_82620_h()));
EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double)blockpos.func_177958_n() + 0.5D, (double)blockpos.func_177956_o(), (double)blockpos.func_177952_p() + 0.5D, (EntityLivingBase)null);
world.func_72838_d(entitytntprimed);
world.func_184148_a((EntityPlayer)null, entitytntprimed.field_70165_t, entitytntprimed.field_70163_u, entitytntprimed.field_70161_v, SoundEvents.field_187904_gd, SoundCategory.BLOCKS, 1.0F, 1.0F);
- --p_82487_2_.field_77994_a;
- return p_82487_2_;
+ --stack.field_77994_a;
+ return stack;
}
});
BlockDispenser.field_149943_a.func_82595_a(Items.field_151144_bL, new BehaviorDefaultDispenseItem()
{
private boolean field_179240_b = true;
- protected ItemStack func_82487_b(IBlockSource p_82487_1_, ItemStack p_82487_2_)
+ protected ItemStack func_82487_b(IBlockSource source, ItemStack stack)
{
- World world = p_82487_1_.func_82618_k();
- EnumFacing enumfacing = BlockDispenser.func_149937_b(p_82487_1_.func_82620_h());
- BlockPos blockpos = p_82487_1_.func_180699_d().func_177972_a(enumfacing);
+ World world = source.func_82618_k();
+ EnumFacing enumfacing = BlockDispenser.func_149937_b(source.func_82620_h());
+ BlockPos blockpos = source.func_180699_d().func_177972_a(enumfacing);
BlockSkull blockskull = Blocks.field_150465_bP;
- if (world.func_175623_d(blockpos) && blockskull.func_176415_b(world, blockpos, p_82487_2_))
+ if (world.func_175623_d(blockpos) && blockskull.func_176415_b(world, blockpos, stack))
{
if (!world.field_72995_K)
{
@@ -419,13 +420,13 @@
if (tileentity instanceof TileEntitySkull)
{
- if (p_82487_2_.func_77960_j() == 3)
+ if (stack.func_77960_j() == 3)
{
GameProfile gameprofile = null;
- if (p_82487_2_.func_77942_o())
+ if (stack.func_77942_o())
{
- NBTTagCompound nbttagcompound = p_82487_2_.func_77978_p();
+ NBTTagCompound nbttagcompound = stack.func_77978_p();
if (nbttagcompound.func_150297_b("SkullOwner", 10))
{
@@ -446,32 +447,32 @@
}
else
{
- ((TileEntitySkull)tileentity).func_152107_a(p_82487_2_.func_77960_j());
+ ((TileEntitySkull)tileentity).func_152107_a(stack.func_77960_j());
}
((TileEntitySkull)tileentity).func_145903_a(enumfacing.func_176734_d().func_176736_b() * 4);
Blocks.field_150465_bP.func_180679_a(world, blockpos, (TileEntitySkull)tileentity);
}
- --p_82487_2_.field_77994_a;
+ --stack.field_77994_a;
}
}
- else if (ItemArmor.func_185082_a(p_82487_1_, p_82487_2_) == null)
+ else if (ItemArmor.func_185082_a(source, stack) == null)
{
this.field_179240_b = false;
}
- return p_82487_2_;
+ return stack;
}
- protected void func_82485_a(IBlockSource p_82485_1_)
+ protected void func_82485_a(IBlockSource source)
{
if (this.field_179240_b)
{
- p_82485_1_.func_82618_k().func_175718_b(1000, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1000, source.func_180699_d(), 0);
}
else
{
- p_82485_1_.func_82618_k().func_175718_b(1001, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1001, source.func_180699_d(), 0);
}
}
});
@@ -505,15 +506,15 @@
return p_82487_2_;
}
- protected void func_82485_a(IBlockSource p_82485_1_)
+ protected void func_82485_a(IBlockSource source)
{
if (this.field_179241_b)
{
- p_82485_1_.func_82618_k().func_175718_b(1000, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1000, source.func_180699_d(), 0);
}
else
{
- p_82485_1_.func_82618_k().func_175718_b(1001, p_82485_1_.func_180699_d(), 0);
+ source.func_82618_k().func_175718_b(1001, source.func_180699_d(), 0);
}
}
});

32
patches/minecraft/net/minecraft/item/Item.java.patch
View File

@ -11,38 +11,6 @@
private static final IItemPropertyGetter field_185046_b = new IItemPropertyGetter()
{
@SideOnly(Side.CLIENT)
@@ -71,25 +71,25 @@
private static final IItemPropertyGetter field_185047_c = new IItemPropertyGetter()
{
@SideOnly(Side.CLIENT)
- public float func_185085_a(ItemStack p_185085_1_, World p_185085_2_, EntityLivingBase p_185085_3_)
+ public float func_185085_a(ItemStack stack, World worldIn, EntityLivingBase entityIn)
{
- return MathHelper.func_76131_a((float)p_185085_1_.func_77952_i() / (float)p_185085_1_.func_77958_k(), 0.0F, 1.0F);
+ return MathHelper.func_76131_a((float)stack.func_77952_i() / (float)stack.func_77958_k(), 0.0F, 1.0F);
}
};
private static final IItemPropertyGetter field_185048_d = new IItemPropertyGetter()
{
@SideOnly(Side.CLIENT)
- public float func_185085_a(ItemStack p_185085_1_, World p_185085_2_, EntityLivingBase p_185085_3_)
+ public float func_185085_a(ItemStack stack, World worldIn, EntityLivingBase entityIn)
{
- return p_185085_3_ != null && p_185085_3_.func_184591_cq() != EnumHandSide.RIGHT ? 1.0F : 0.0F;
+ return entityIn != null && entityIn.func_184591_cq() != EnumHandSide.RIGHT ? 1.0F : 0.0F;
}
};
private static final IItemPropertyGetter field_185049_e = new IItemPropertyGetter()
{
@SideOnly(Side.CLIENT)
- public float func_185085_a(ItemStack p_185085_1_, World p_185085_2_, EntityLivingBase p_185085_3_)
+ public float func_185085_a(ItemStack stack, World worldIn, EntityLivingBase entityIn)
{
- return p_185085_3_ instanceof EntityPlayer ? ((EntityPlayer)p_185085_3_).func_184811_cZ().func_185143_a(p_185085_1_.func_77973_b(), 0.0F) : 0.0F;
+ return entityIn instanceof EntityPlayer ? ((EntityPlayer)entityIn).func_184811_cZ().func_185143_a(stack.func_77973_b(), 0.0F) : 0.0F;
}
};
private final IRegistry<ResourceLocation, IItemPropertyGetter> field_185051_m = new RegistrySimple();
@@ -104,6 +104,9 @@
private Item field_77700_c;
private String field_77774_bZ;