diff --git a/build.gradle b/build.gradle index fc806e733c..814d3c3d56 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ apply plugin: "net.minecraftforge.gradle.launch4j" minecraft { version = "1.9" - mappings = 'stable_20' + mappings = 'snapshot_nodoc_20160312' //mappings = "snapshot_nodoc_20151122" workspaceDir = "projects" versionJson = "jsons/1.9-dev.json" diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index c7da6fc340..71acb3f7ca 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -166,9 +166,9 @@ } + + net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(items, p_180657_1_, p_180657_3_, p_180657_4_, 0, 1.0f, true, p_180657_2_); -+ for (ItemStack stack : items) ++ for (ItemStack item : items) + { -+ func_180635_a(p_180657_1_, p_180657_3_, stack); ++ func_180635_a(p_180657_1_, p_180657_3_, item); + } } else diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java.patch index 8a1013f885..e2758488c7 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java +++ ../src-work/minecraft/net/minecraft/client/renderer/block/model/BakedQuad.java -@@ -6,15 +6,25 @@ +@@ -6,21 +6,31 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) @@ -18,15 +18,25 @@ + @Deprecated public BakedQuad(int[] p_i46574_1_, int p_i46574_2_, EnumFacing p_i46574_3_, TextureAtlasSprite p_i46574_4_) { +- this.field_178215_a = p_i46574_1_; +- this.field_178213_b = p_i46574_2_; +- this.field_178214_c = p_i46574_3_; +- this.field_187509_d = p_i46574_4_; + this(p_i46574_1_, p_i46574_2_, p_i46574_3_, p_i46574_4_, net.minecraft.client.renderer.vertex.DefaultVertexFormats.field_176599_b); -+ } -+ -+ public BakedQuad(int[] p_i46574_1_, int p_i46574_2_, EnumFacing p_i46574_3_, TextureAtlasSprite p_i46574_4_, net.minecraft.client.renderer.vertex.VertexFormat format) + } + ++ public BakedQuad(int[] vertexDataIn, int tintIndexIn, EnumFacing faceIn, TextureAtlasSprite spriteIn, net.minecraft.client.renderer.vertex.VertexFormat format) + { + this.format = format; - this.field_178215_a = p_i46574_1_; - this.field_178213_b = p_i46574_2_; - this.field_178214_c = p_i46574_3_; ++ this.field_178215_a = vertexDataIn; ++ this.field_178213_b = tintIndexIn; ++ this.field_178214_c = faceIn; ++ this.field_187509_d = spriteIn; ++ } ++ + public TextureAtlasSprite func_187508_a() + { + return this.field_187509_d; @@ -45,4 +55,17 @@ { return this.field_178214_c; diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch index 4380612607..2d771db866 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch @@ -15,7 +15,7 @@ { - blockfaceuv = this.func_188010_a(p_178414_3_.field_178243_e, p_178414_5_, p_178414_6_); + // TODO fix uvlock for custom rotations -+ //blockfaceuv = this.func_188010_a(face.blockFaceUV, facing, modelRotationIn); ++ //blockfaceuv = this.applyUVLock(face.blockFaceUV, facing, modelRotationIn); } - int[] aint = this.func_188012_a(blockfaceuv, p_178414_4_, p_178414_5_, this.func_178403_a(p_178414_1_, p_178414_2_), p_178414_6_, p_178414_7_, p_178414_9_); @@ -38,14 +38,14 @@ + return makeQuadVertexData(p_188012_1_, p_188012_2_, p_188012_3_, p_188012_4_, (net.minecraftforge.client.model.ITransformation)p_188012_5_, p_188012_6_, p_188012_7_); + } + -+ private int[] makeQuadVertexData(BlockFaceUV p_188012_1_, TextureAtlasSprite p_188012_2_, EnumFacing p_188012_3_, float[] p_188012_4_, net.minecraftforge.client.model.ITransformation p_188012_5_, BlockPartRotation p_188012_6_, boolean p_188012_7_) ++ private int[] makeQuadVertexData(BlockFaceUV uvs, TextureAtlasSprite sprite, EnumFacing orientation, float[] p_188012_4_, net.minecraftforge.client.model.ITransformation rotationIn, BlockPartRotation partRotation, boolean shade) + { int[] aint = new int[28]; for (int i = 0; i < 4; ++i) { - this.func_188015_a(aint, i, p_188012_3_, p_188012_1_, p_188012_4_, p_188012_2_, p_188012_5_, p_188012_6_, p_188012_7_); -+ this.fillVertexData(aint, i, p_188012_3_, p_188012_1_, p_188012_4_, p_188012_2_, p_188012_5_, p_188012_6_, p_188012_7_); ++ this.fillVertexData(aint, i, orientation, uvs, p_188012_4_, sprite, rotationIn, partRotation, shade); } return aint; diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch index 4a37adc65d..59156dd0f4 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch @@ -23,19 +23,20 @@ + this(p_i46100_1_, p_i46100_2_, false); + } + -+ public TextureMap(String p_i46100_1_, boolean skipFirst) ++ public TextureMap(String basePathIn, boolean skipFirst) + { -+ this(p_i46100_1_, null, skipFirst); ++ this(basePathIn, null, skipFirst); + } + -+ public TextureMap(String p_i46100_1_, IIconCreator iconCreatorIn, boolean skipFirst) ++ public TextureMap(String basePathIn, IIconCreator iconCreatorIn, boolean skipFirst) + { this.field_94258_i = Lists.newArrayList(); this.field_110574_e = Maps.newHashMap(); this.field_94252_e = Maps.newHashMap(); this.field_94249_f = new TextureAtlasSprite("missingno"); - this.field_94254_c = p_i46100_1_; +- this.field_94254_c = p_i46100_1_; - this.field_174946_m = p_i46100_2_; ++ this.field_94254_c = basePathIn; + this.field_174946_m = iconCreatorIn; + this.skipFirst = skipFirst && ENABLE_SKIP; } diff --git a/patches/minecraft/net/minecraft/init/Bootstrap.java.patch b/patches/minecraft/net/minecraft/init/Bootstrap.java.patch index ab15f50df9..f57b0908c6 100644 --- a/patches/minecraft/net/minecraft/init/Bootstrap.java.patch +++ b/patches/minecraft/net/minecraft/init/Bootstrap.java.patch @@ -8,24 +8,25 @@ static void func_151353_a() { BlockDispenser.field_149943_a.func_82595_a(Items.field_151032_g, new BehaviorProjectileDispense() -@@ -87,9 +88,9 @@ +@@ -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 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(p_82499_3_); ++ entitytippedarrow.func_184555_a(stack); entitytippedarrow.field_70251_a = EntityArrow.PickupStatus.ALLOWED; return entitytippedarrow; -@@ -97,32 +98,32 @@ + } }); 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 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()); @@ -36,7 +37,7 @@ 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 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()); @@ -45,7 +46,7 @@ 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 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()); @@ -54,7 +55,7 @@ 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 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()); @@ -71,7 +72,7 @@ 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 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()); @@ -94,7 +95,7 @@ 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 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()); @@ -144,11 +145,13 @@ } }); BlockDispenser.field_149943_a.func_82595_a(Items.field_151124_az, new Bootstrap.BehaviorDispenseBoat(EntityBoat.Type.OAK)); -@@ -245,20 +246,20 @@ +@@ -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(); +- 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(); @@ -169,15 +172,17 @@ else { - return this.field_150841_b.func_82482_a(p_82487_1_, p_82487_2_); -+ return this.field_150841_b.func_82482_a(source, stack); ++ return this.dispenseBehavior.func_82482_a(source, stack); } } }; -@@ -267,10 +268,10 @@ +@@ -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(); +- 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(); @@ -212,7 +217,7 @@ + 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.field_150840_b.func_82482_a(source, new ItemStack(item)); ++ this.dispenseBehavior.func_82482_a(source, new ItemStack(item)); } - return p_82487_2_; diff --git a/patches/minecraft/net/minecraft/item/Item.java.patch b/patches/minecraft/net/minecraft/item/Item.java.patch index 46f446cc99..2ac6bf28a4 100644 --- a/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/patches/minecraft/net/minecraft/item/Item.java.patch @@ -11,6 +11,38 @@ 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 field_185051_m = new RegistrySimple(); @@ -104,6 +104,9 @@ private Item field_77700_c; private String field_77774_bZ; diff --git a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch index 8e24f9923a..89f16a9e86 100644 --- a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch +++ b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch @@ -246,34 +246,53 @@ return entityplayermp; } -@@ -545,15 +589,20 @@ +@@ -545,102 +589,118 @@ public void func_187242_a(EntityPlayerMP p_187242_1_, int p_187242_2_) { +- int i = p_187242_1_.field_71093_bK; +- WorldServer worldserver = this.field_72400_f.func_71218_a(p_187242_1_.field_71093_bK); +- p_187242_1_.field_71093_bK = p_187242_2_; +- WorldServer worldserver1 = this.field_72400_f.func_71218_a(p_187242_1_.field_71093_bK); +- p_187242_1_.field_71135_a.func_147359_a(new SPacketRespawn(p_187242_1_.field_71093_bK, p_187242_1_.field_70170_p.func_175659_aa(), p_187242_1_.field_70170_p.func_72912_H().func_76067_t(), p_187242_1_.field_71134_c.func_73081_b())); +- this.func_187243_f(p_187242_1_); +- worldserver.func_72973_f(p_187242_1_); +- p_187242_1_.field_70128_L = false; +- this.func_82448_a(p_187242_1_, i, worldserver, worldserver1); +- this.func_72375_a(p_187242_1_, worldserver); +- p_187242_1_.field_71135_a.func_147364_a(p_187242_1_.field_70165_t, p_187242_1_.field_70163_u, p_187242_1_.field_70161_v, p_187242_1_.field_70177_z, p_187242_1_.field_70125_A); +- p_187242_1_.field_71134_c.func_73080_a(worldserver1); +- p_187242_1_.field_71135_a.func_147359_a(new SPacketPlayerAbilities(p_187242_1_.field_71075_bZ)); +- this.func_72354_b(p_187242_1_, worldserver1); +- this.func_72385_f(p_187242_1_); + transferPlayerToDimension(p_187242_1_, p_187242_2_, field_72400_f.func_71218_a(p_187242_2_).func_85176_s()); + } -+ -+ public void transferPlayerToDimension(EntityPlayerMP p_187242_1_, int p_187242_2_, net.minecraft.world.Teleporter teleporter) + +- for (PotionEffect potioneffect : p_187242_1_.func_70651_bq()) ++ public void transferPlayerToDimension(EntityPlayerMP player, int dimensionIn, net.minecraft.world.Teleporter teleporter) + { - int i = p_187242_1_.field_71093_bK; - WorldServer worldserver = this.field_72400_f.func_71218_a(p_187242_1_.field_71093_bK); - p_187242_1_.field_71093_bK = p_187242_2_; - WorldServer worldserver1 = this.field_72400_f.func_71218_a(p_187242_1_.field_71093_bK); -- p_187242_1_.field_71135_a.func_147359_a(new SPacketRespawn(p_187242_1_.field_71093_bK, p_187242_1_.field_70170_p.func_175659_aa(), p_187242_1_.field_70170_p.func_72912_H().func_76067_t(), p_187242_1_.field_71134_c.func_73081_b())); -+ p_187242_1_.field_71135_a.func_147359_a(new SPacketRespawn(p_187242_1_.field_71093_bK, worldserver1.func_175659_aa(), worldserver1.func_72912_H().func_76067_t(), p_187242_1_.field_71134_c.func_73081_b())); - this.func_187243_f(p_187242_1_); - worldserver.func_72973_f(p_187242_1_); - p_187242_1_.field_70128_L = false; -- this.func_82448_a(p_187242_1_, i, worldserver, worldserver1); -+ this.transferEntityToWorld(p_187242_1_, i, worldserver, worldserver1, teleporter); - this.func_72375_a(p_187242_1_, worldserver); - p_187242_1_.field_71135_a.func_147364_a(p_187242_1_.field_70165_t, p_187242_1_.field_70163_u, p_187242_1_.field_70161_v, p_187242_1_.field_70177_z, p_187242_1_.field_70125_A); - p_187242_1_.field_71134_c.func_73080_a(worldserver1); -@@ -565,39 +614,50 @@ ++ int i = player.field_71093_bK; ++ WorldServer worldserver = this.field_72400_f.func_71218_a(player.field_71093_bK); ++ player.field_71093_bK = dimensionIn; ++ WorldServer worldserver1 = this.field_72400_f.func_71218_a(player.field_71093_bK); ++ player.field_71135_a.func_147359_a(new SPacketRespawn(player.field_71093_bK, worldserver1.func_175659_aa(), worldserver1.func_72912_H().func_76067_t(), player.field_71134_c.func_73081_b())); ++ this.func_187243_f(player); ++ worldserver.func_72973_f(player); ++ player.field_70128_L = false; ++ this.transferEntityToWorld(player, i, worldserver, worldserver1, teleporter); ++ this.func_72375_a(player, worldserver); ++ player.field_71135_a.func_147364_a(player.field_70165_t, player.field_70163_u, player.field_70161_v, player.field_70177_z, player.field_70125_A); ++ player.field_71134_c.func_73080_a(worldserver1); ++ player.field_71135_a.func_147359_a(new SPacketPlayerAbilities(player.field_71075_bZ)); ++ this.func_72354_b(player, worldserver1); ++ this.func_72385_f(player); ++ ++ for (PotionEffect potioneffect : player.func_70651_bq()) { - p_187242_1_.field_71135_a.func_147359_a(new SPacketEntityEffect(p_187242_1_.func_145782_y(), potioneffect)); +- p_187242_1_.field_71135_a.func_147359_a(new SPacketEntityEffect(p_187242_1_.func_145782_y(), potioneffect)); ++ player.field_71135_a.func_147359_a(new SPacketEntityEffect(player.func_145782_y(), potioneffect)); } -+ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(p_187242_1_, i, p_187242_2_); ++ net.minecraftforge.fml.common.FMLCommonHandler.instance().firePlayerChangedDimensionEvent(player, i, dimensionIn); } public void func_82448_a(Entity p_82448_1_, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_) @@ -284,46 +303,51 @@ + } + + @SuppressWarnings("unused") -+ public void transferEntityToWorld(Entity entityIn, int p_82448_2_, WorldServer p_82448_3_, WorldServer p_82448_4_, net.minecraft.world.Teleporter teleporter) ++ public void transferEntityToWorld(Entity entityIn, int lastDimension, WorldServer oldWorldIn, WorldServer toWorldIn, net.minecraft.world.Teleporter teleporter) + { -+ net.minecraft.world.WorldProvider pOld = p_82448_3_.field_73011_w; -+ net.minecraft.world.WorldProvider pNew = p_82448_4_.field_73011_w; ++ net.minecraft.world.WorldProvider pOld = oldWorldIn.field_73011_w; ++ net.minecraft.world.WorldProvider pNew = toWorldIn.field_73011_w; + double moveFactor = pOld.getMovementFactor() / pNew.getMovementFactor(); + double d0 = entityIn.field_70165_t * moveFactor; + double d1 = entityIn.field_70161_v * moveFactor; double d2 = 8.0D; - float f = p_82448_1_.field_70177_z; +- p_82448_3_.field_72984_F.func_76320_a("moving"); + float f = entityIn.field_70177_z; - p_82448_3_.field_72984_F.func_76320_a("moving"); ++ oldWorldIn.field_72984_F.func_76320_a("moving"); - if (p_82448_1_.field_71093_bK == -1) + if (false && entityIn.field_71093_bK == -1) { - d0 = MathHelper.func_151237_a(d0 / d2, p_82448_4_.func_175723_af().func_177726_b() + 16.0D, p_82448_4_.func_175723_af().func_177728_d() - 16.0D); - d1 = MathHelper.func_151237_a(d1 / d2, p_82448_4_.func_175723_af().func_177736_c() + 16.0D, p_82448_4_.func_175723_af().func_177733_e() - 16.0D); +- d0 = MathHelper.func_151237_a(d0 / d2, p_82448_4_.func_175723_af().func_177726_b() + 16.0D, p_82448_4_.func_175723_af().func_177728_d() - 16.0D); +- d1 = MathHelper.func_151237_a(d1 / d2, p_82448_4_.func_175723_af().func_177736_c() + 16.0D, p_82448_4_.func_175723_af().func_177733_e() - 16.0D); - p_82448_1_.func_70012_b(d0, p_82448_1_.field_70163_u, d1, p_82448_1_.field_70177_z, p_82448_1_.field_70125_A); ++ d0 = MathHelper.func_151237_a(d0 / d2, toWorldIn.func_175723_af().func_177726_b() + 16.0D, toWorldIn.func_175723_af().func_177728_d() - 16.0D); ++ d1 = MathHelper.func_151237_a(d1 / d2, toWorldIn.func_175723_af().func_177736_c() + 16.0D, toWorldIn.func_175723_af().func_177733_e() - 16.0D); + entityIn.func_70012_b(d0, entityIn.field_70163_u, d1, entityIn.field_70177_z, entityIn.field_70125_A); - if (p_82448_1_.func_70089_S()) + if (entityIn.func_70089_S()) { - p_82448_3_.func_72866_a(p_82448_1_, false); -+ p_82448_3_.func_72866_a(entityIn, false); ++ oldWorldIn.func_72866_a(entityIn, false); } } - else if (p_82448_1_.field_71093_bK == 0) + else if (false && entityIn.field_71093_bK == 0) { - d0 = MathHelper.func_151237_a(d0 * d2, p_82448_4_.func_175723_af().func_177726_b() + 16.0D, p_82448_4_.func_175723_af().func_177728_d() - 16.0D); - d1 = MathHelper.func_151237_a(d1 * d2, p_82448_4_.func_175723_af().func_177736_c() + 16.0D, p_82448_4_.func_175723_af().func_177733_e() - 16.0D); +- d0 = MathHelper.func_151237_a(d0 * d2, p_82448_4_.func_175723_af().func_177726_b() + 16.0D, p_82448_4_.func_175723_af().func_177728_d() - 16.0D); +- d1 = MathHelper.func_151237_a(d1 * d2, p_82448_4_.func_175723_af().func_177736_c() + 16.0D, p_82448_4_.func_175723_af().func_177733_e() - 16.0D); - p_82448_1_.func_70012_b(d0, p_82448_1_.field_70163_u, d1, p_82448_1_.field_70177_z, p_82448_1_.field_70125_A); ++ d0 = MathHelper.func_151237_a(d0 * d2, toWorldIn.func_175723_af().func_177726_b() + 16.0D, toWorldIn.func_175723_af().func_177728_d() - 16.0D); ++ d1 = MathHelper.func_151237_a(d1 * d2, toWorldIn.func_175723_af().func_177736_c() + 16.0D, toWorldIn.func_175723_af().func_177733_e() - 16.0D); + entityIn.func_70012_b(d0, entityIn.field_70163_u, d1, entityIn.field_70177_z, entityIn.field_70125_A); - if (p_82448_1_.func_70089_S()) + if (entityIn.func_70089_S()) { - p_82448_3_.func_72866_a(p_82448_1_, false); -+ p_82448_3_.func_72866_a(entityIn, false); ++ oldWorldIn.func_72866_a(entityIn, false); } } - else @@ -332,7 +356,16 @@ { BlockPos blockpos; -@@ -611,13 +671,13 @@ +- if (p_82448_2_ == 1) ++ if (lastDimension == 1) + { +- blockpos = p_82448_4_.func_175694_M(); ++ blockpos = toWorldIn.func_175694_M(); + } + else + { +- blockpos = p_82448_4_.func_180504_m(); ++ blockpos = toWorldIn.func_180504_m(); } d0 = (double)blockpos.func_177958_n(); @@ -346,11 +379,18 @@ + if (entityIn.func_70089_S()) { - p_82448_3_.func_72866_a(p_82448_1_, false); -+ p_82448_3_.func_72866_a(entityIn, false); ++ oldWorldIn.func_72866_a(entityIn, false); } } -@@ -629,18 +689,18 @@ +- p_82448_3_.field_72984_F.func_76319_b(); ++ oldWorldIn.field_72984_F.func_76319_b(); + +- if (p_82448_2_ != 1) ++ if (lastDimension != 1) + { +- p_82448_3_.field_72984_F.func_76320_a("placing"); ++ oldWorldIn.field_72984_F.func_76320_a("placing"); d0 = (double)MathHelper.func_76125_a((int)d0, -29999872, 29999872); d1 = (double)MathHelper.func_76125_a((int)d1, -29999872, 29999872); @@ -363,15 +403,16 @@ - p_82448_4_.func_72866_a(p_82448_1_, false); + entityIn.func_70012_b(d0, entityIn.field_70163_u, d1, entityIn.field_70177_z, entityIn.field_70125_A); + teleporter.func_180266_a(entityIn, f); -+ p_82448_4_.func_72838_d(entityIn); -+ p_82448_4_.func_72866_a(entityIn, false); ++ toWorldIn.func_72838_d(entityIn); ++ toWorldIn.func_72866_a(entityIn, false); } - p_82448_3_.field_72984_F.func_76319_b(); +- p_82448_3_.field_72984_F.func_76319_b(); ++ oldWorldIn.field_72984_F.func_76319_b(); } - p_82448_1_.func_70029_a(p_82448_4_); -+ entityIn.func_70029_a(p_82448_4_); ++ entityIn.func_70029_a(toWorldIn); } public void func_72374_b() diff --git a/src/main/java/net/minecraftforge/client/ClientCommandHandler.java b/src/main/java/net/minecraftforge/client/ClientCommandHandler.java index 968b944829..be724ebfe5 100644 --- a/src/main/java/net/minecraftforge/client/ClientCommandHandler.java +++ b/src/main/java/net/minecraftforge/client/ClientCommandHandler.java @@ -58,7 +58,7 @@ public class ClientCommandHandler extends CommandHandler return 0; } - if (icommand.func_184882_a(this.func_184879_a(), sender)) + if (icommand.checkPermission(this.getServer(), sender)) { CommandEvent event = new CommandEvent(icommand, sender, args); if (MinecraftForge.EVENT_BUS.post(event)) @@ -139,7 +139,7 @@ public class ClientCommandHandler extends CommandHandler } @Override - protected MinecraftServer func_184879_a() { + protected MinecraftServer getServer() { return Minecraft.getMinecraft().getIntegratedServer(); } } diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 55fa5373c1..45f830adef 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -31,7 +31,6 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemTransformVec3f; -import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelManager; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.ModelRotation; @@ -408,7 +407,7 @@ public class ForgeHooksClient else { //if(leftHandHackery) GlStateManager.scale(-1, 1, 1); - ItemCameraTransforms.func_188034_a(model.getItemCameraTransforms().getTransform(cameraTransformType), leftHandHackery); + ItemCameraTransforms.applyTransformSide(model.getItemCameraTransforms().getTransform(cameraTransformType), leftHandHackery); //if(leftHandHackery) GlStateManager.scale(-1, 1, 1); } return model; @@ -436,7 +435,7 @@ public class ForgeHooksClient VertexFormatElement attr = format.getElement(element); int count = attr.getElementCount(); int constant = attr.getType().getGlConstant(); - buffer.position(format.func_181720_d(element)); + buffer.position(format.getOffset(element)); switch(attrType) { case POSITION: diff --git a/src/main/java/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java index 9e607658fd..267356b943 100644 --- a/src/main/java/net/minecraftforge/client/GuiIngameForge.java +++ b/src/main/java/net/minecraftforge/client/GuiIngameForge.java @@ -88,8 +88,8 @@ public class GuiIngameForge extends GuiIngame eventParent = new RenderGameOverlayEvent(partialTicks, res); int width = res.getScaledWidth(); int height = res.getScaledHeight(); - renderHealthMount = mc.thePlayer.func_184187_bx() instanceof EntityLivingBase; - renderFood = mc.thePlayer.func_184187_bx() == null; + renderHealthMount = mc.thePlayer.getRidingEntity() instanceof EntityLivingBase; + renderFood = mc.thePlayer.getRidingEntity() == null; renderJumpBar = mc.thePlayer.isRidingHorse(); right_height = 39; @@ -108,7 +108,7 @@ public class GuiIngameForge extends GuiIngame else { GlStateManager.enableDepth(); - GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); } if (renderHelmet) renderHelmet(res, partialTicks); @@ -118,7 +118,7 @@ public class GuiIngameForge extends GuiIngame renderPortal(res, partialTicks); } - if (renderHotbar) renderTooltip(res, partialTicks); + if (renderHotbar) renderHotbar(res, partialTicks); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); zLevel = -90.0F; @@ -194,21 +194,21 @@ public class GuiIngameForge extends GuiIngame { if (pre(CROSSHAIRS)) return; bind(Gui.icons); - super.func_184045_a(partialTicks, res); + super.renderAttackIndicator(partialTicks, res); post(CROSSHAIRS); } protected void renderPotionIcons(ScaledResolution resolution) { if (pre(POTION_ICONS)) return; - super.func_184048_a(resolution); + super.renderPotionEffects(resolution); post(POTION_ICONS); } protected void renderSubtitles(ScaledResolution resolution) { if (pre(SUBTITLES)) return; - this.field_184049_t.func_184068_a(res); + this.overlaySubtitle.renderSubtitles(res); post(SUBTITLES); } @@ -217,10 +217,10 @@ public class GuiIngameForge extends GuiIngame { if (pre(BOSSHEALTH)) return; bind(Gui.icons); - GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); mc.mcProfiler.startSection("bossHealth"); GlStateManager.enableBlend(); - this.field_184050_w.func_184051_a(); + this.overlayBoss.renderBossHealth(); GlStateManager.disableBlend(); mc.mcProfiler.endSection(); post(BOSSHEALTH); @@ -295,7 +295,7 @@ public class GuiIngameForge extends GuiIngame } @Override - protected void renderTooltip(ScaledResolution res, float partialTicks) + protected void renderHotbar(ScaledResolution res, float partialTicks) { if (pre(HOTBAR)) return; @@ -305,7 +305,7 @@ public class GuiIngameForge extends GuiIngame } else { - super.renderTooltip(res, partialTicks); + super.renderHotbar(res, partialTicks); } post(HOTBAR); @@ -370,7 +370,7 @@ public class GuiIngameForge extends GuiIngame this.playerHealth = health; int healthLast = this.lastPlayerHealth; - IAttributeInstance attrMaxHealth = player.getEntityAttribute(SharedMonsterAttributes.maxHealth); + IAttributeInstance attrMaxHealth = player.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH); float healthMax = (float)attrMaxHealth.getAttributeValue(); float absorb = MathHelper.ceiling_float_int(player.getAbsorptionAmount()); @@ -626,7 +626,7 @@ public class GuiIngameForge extends GuiIngame GlStateManager.pushMatrix(); GlStateManager.enableBlend(); - GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); FontRenderer font = highlightingItemStack.getItem().getFontRenderer(highlightingItemStack); if (font != null) { @@ -647,7 +647,7 @@ public class GuiIngameForge extends GuiIngame } else if (this.mc.thePlayer.isSpectator()) { - this.spectatorGui.func_175263_a(res); + this.spectatorGui.renderSelectedItem(res); } } @@ -720,7 +720,7 @@ public class GuiIngameForge extends GuiIngame GlStateManager.pushMatrix(); GlStateManager.translate((float)(width / 2), (float)(height - 68), 0.0F); GlStateManager.enableBlend(); - GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); int color = (recordIsPlaying ? Color.HSBtoRGB(hue / 50.0F, 0.7F, 0.6F) & WHITE : WHITE); fontrenderer.drawString(recordPlaying, -fontrenderer.getStringWidth(recordPlaying) / 2, -4, color | (opacity << 24)); GlStateManager.disableBlend(); @@ -733,18 +733,18 @@ public class GuiIngameForge extends GuiIngame protected void renderTitle(int width, int height, float partialTicks) { - if (field_175195_w > 0) + if (titlesTimer > 0) { mc.mcProfiler.startSection("titleAndSubtitle"); - float age = (float)this.field_175195_w - partialTicks; + float age = (float)this.titlesTimer - partialTicks; int opacity = 255; - if (field_175195_w > field_175193_B + field_175192_A) + if (titlesTimer > titleFadeOut + titleDisplayTime) { - float f3 = (float)(field_175199_z + field_175192_A + field_175193_B) - age; - opacity = (int)(f3 * 255.0F / (float)field_175199_z); + float f3 = (float)(titleFadeIn + titleDisplayTime + titleFadeOut) - age; + opacity = (int)(f3 * 255.0F / (float)titleFadeIn); } - if (field_175195_w <= field_175193_B) opacity = (int)(age * 255.0F / (float)this.field_175193_B); + if (titlesTimer <= titleFadeOut) opacity = (int)(age * 255.0F / (float)this.titleFadeOut); opacity = MathHelper.clamp_int(opacity, 0, 255); @@ -753,15 +753,15 @@ public class GuiIngameForge extends GuiIngame GlStateManager.pushMatrix(); GlStateManager.translate((float)(width / 2), (float)(height / 2), 0.0F); GlStateManager.enableBlend(); - GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); GlStateManager.pushMatrix(); GlStateManager.scale(4.0F, 4.0F, 4.0F); int l = opacity << 24 & -16777216; - this.getFontRenderer().drawString(this.field_175201_x, (float)(-this.getFontRenderer().getStringWidth(this.field_175201_x) / 2), -10.0F, 16777215 | l, true); + this.getFontRenderer().drawString(this.displayedTitle, (float)(-this.getFontRenderer().getStringWidth(this.displayedTitle) / 2), -10.0F, 16777215 | l, true); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); GlStateManager.scale(2.0F, 2.0F, 2.0F); - this.getFontRenderer().drawString(this.field_175200_y, (float)(-this.getFontRenderer().getStringWidth(this.field_175200_y) / 2), 5.0F, 16777215 | l, true); + this.getFontRenderer().drawString(this.displayedSubTitle, (float)(-this.getFontRenderer().getStringWidth(this.displayedSubTitle) / 2), 5.0F, 16777215 | l, true); GlStateManager.popMatrix(); GlStateManager.disableBlend(); GlStateManager.popMatrix(); @@ -809,7 +809,7 @@ public class GuiIngameForge extends GuiIngame protected void renderHealthMount(int width, int height) { EntityPlayer player = (EntityPlayer)mc.getRenderViewEntity(); - Entity tmp = player.func_184187_bx(); + Entity tmp = player.getRidingEntity(); if (!(tmp instanceof EntityLivingBase)) return; bind(icons); diff --git a/src/main/java/net/minecraftforge/client/model/BlockStateLoader.java b/src/main/java/net/minecraftforge/client/model/BlockStateLoader.java index 4e70d85a4f..9ee47e39f8 100644 --- a/src/main/java/net/minecraftforge/client/model/BlockStateLoader.java +++ b/src/main/java/net/minecraftforge/client/model/BlockStateLoader.java @@ -167,7 +167,7 @@ public class BlockStateLoader if (hasBase) { - base = runModelHooks(base, smooth, gui3d, this.func_188049_c(), textures, customData); + base = runModelHooks(base, smooth, gui3d, this.isUvLock(), textures, customData); if (size <= 0) return base; @@ -198,7 +198,7 @@ public class BlockStateLoader models.put(entry.getKey(), Pair.of(runModelHooks(model, part.smooth, part.gui3d, part.uvLock, part.getTextures(), part.getCustomData()), partState)); } - return new MultiModel(func_188046_a(), hasBase ? base : null, baseTr, models.build()); + return new MultiModel(getModelLocation(), hasBase ? base : null, baseTr, models.build()); } @Override diff --git a/src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java b/src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java index 8db0df2509..4d3f155cea 100644 --- a/src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java +++ b/src/main/java/net/minecraftforge/client/model/IPerspectiveAwareModel.java @@ -91,12 +91,12 @@ public interface IPerspectiveAwareModel extends IBakedModel public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); } public boolean isGui3d() { return parent.isGui3d(); } - public boolean func_188618_c() { return parent.func_188618_c(); } + public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); } public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); } @SuppressWarnings("deprecation") public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); } - public List func_188616_a(IBlockState state, EnumFacing side, long rand) { return parent.func_188616_a(state, side, rand); } - public ItemOverrideList func_188617_f() { return parent.func_188617_f(); } + public List getQuads(IBlockState state, EnumFacing side, long rand) { return parent.getQuads(state, side, rand); } + public ItemOverrideList getOverrides() { return parent.getOverrides(); } @Override public Pair handlePerspective(TransformType cameraTransformType) diff --git a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java index 4bc494ba13..df577e336e 100644 --- a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java @@ -136,11 +136,11 @@ public class ItemLayerModel implements IRetexturableModel public boolean isAmbientOcclusion() { return true; } public boolean isGui3d() { return false; } - public boolean func_188618_c() { return false; } + public boolean isBuiltInRenderer() { return false; } public TextureAtlasSprite getParticleTexture() { return particle; } public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } - public ItemOverrideList func_188617_f() { return ItemOverrideList.field_188022_a; } - public List func_188616_a(IBlockState state, EnumFacing side, long rand) + public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + public List getQuads(IBlockState state, EnumFacing side, long rand) { if(side == null) return quads; return ImmutableList.of(); diff --git a/src/main/java/net/minecraftforge/client/model/ModelDynBucket.java b/src/main/java/net/minecraftforge/client/model/ModelDynBucket.java index e0faedf6bb..c0cf212ef9 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelDynBucket.java +++ b/src/main/java/net/minecraftforge/client/model/ModelDynBucket.java @@ -118,7 +118,7 @@ public class ModelDynBucket implements IModel, IModelCustomData, IRetexturableMo { // build base (insidest) IBakedModel model = (new ItemLayerModel(ImmutableList.of(baseLocation))).bake(state, format, bakedTextureGetter); - builder.addAll(model.func_188616_a(null, null, 0)); + builder.addAll(model.getQuads(null, null, 0)); } if (liquidLocation != null && fluidSprite != null) { @@ -302,7 +302,7 @@ public class ModelDynBucket implements IModel, IModelCustomData, IRetexturableMo } @Override - public ItemOverrideList func_188617_f() + public ItemOverrideList getOverrides() { return BakedDynBucketOverrideHandler.INSTANCE; } @@ -314,7 +314,7 @@ public class ModelDynBucket implements IModel, IModelCustomData, IRetexturableMo } @Override - public List func_188616_a(IBlockState state, EnumFacing side, long rand) + public List getQuads(IBlockState state, EnumFacing side, long rand) { if(side == null) return quads; return ImmutableList.of(); @@ -322,7 +322,7 @@ public class ModelDynBucket implements IModel, IModelCustomData, IRetexturableMo public boolean isAmbientOcclusion() { return true; } public boolean isGui3d() { return false; } - public boolean func_188618_c() { return false; } + public boolean isBuiltInRenderer() { return false; } public TextureAtlasSprite getParticleTexture() { return particle; } public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } } diff --git a/src/main/java/net/minecraftforge/client/model/ModelFluid.java b/src/main/java/net/minecraftforge/client/model/ModelFluid.java index 67a73e8a2b..2543037a57 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelFluid.java +++ b/src/main/java/net/minecraftforge/client/model/ModelFluid.java @@ -341,7 +341,7 @@ public class ModelFluid implements IModelCustomData return false; } - public boolean func_188618_c() + public boolean isBuiltInRenderer() { return false; } @@ -356,7 +356,7 @@ public class ModelFluid implements IModelCustomData return ItemCameraTransforms.DEFAULT; } - public List func_188616_a(IBlockState state, EnumFacing side, long rand) + public List getQuads(IBlockState state, EnumFacing side, long rand) { BakedFluid model = this; if(state instanceof IExtendedBlockState) @@ -378,9 +378,9 @@ public class ModelFluid implements IModelCustomData return model.faceQuads.get(side); } - public ItemOverrideList func_188617_f() + public ItemOverrideList getOverrides() { - return ItemOverrideList.field_188022_a; + return ItemOverrideList.NONE; } @Override diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 0c3ea9f1e3..6d2253e076 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -546,7 +546,7 @@ public class ModelLoader extends ModelBakery newTransforms.add(animation.getPartTransform(state, part, i)); } - ItemCameraTransforms transforms = model.func_181682_g(); + ItemCameraTransforms transforms = model.getAllTransforms(); Map tMap = Maps.newHashMap(); tMap.putAll(IPerspectiveAwareModel.MapWrapper.getTransforms(transforms)); tMap.putAll(IPerspectiveAwareModel.MapWrapper.getTransforms(state)); @@ -556,14 +556,14 @@ public class ModelLoader extends ModelBakery { return new ItemLayerModel(model).bake(perState, format, bakedTextureGetter); } - if(isCustomRenderer(model)) return new BuiltInModel(transforms, model.func_187967_g()); + if(isCustomRenderer(model)) return new BuiltInModel(transforms, model.createOverrides()); return bakeNormal(model, perState, state.apply(Optional.absent()).or(TRSRTransformation.identity()), newTransforms, format, bakedTextureGetter, uvlock); } private IBakedModel bakeNormal(ModelBlock model, IModelState perState, final TRSRTransformation modelState, List newTransforms, final VertexFormat format, final Function bakedTextureGetter, boolean uvLocked) { TextureAtlasSprite particle = bakedTextureGetter.apply(new ResourceLocation(model.resolveTextureName("particle"))); - SimpleBakedModel.Builder builder = (new SimpleBakedModel.Builder(model, model.func_187967_g())).setTexture(particle); + SimpleBakedModel.Builder builder = (new SimpleBakedModel.Builder(model, model.createOverrides())).setTexture(particle); for(int i = 0; i < model.getElements().size(); i++) { BlockPart part = model.getElements().get(i); @@ -593,7 +593,7 @@ public class ModelLoader extends ModelBakery return new IPerspectiveAwareModel.MapWrapper(builder.makeBakedModel(), perState) { @Override - public List func_188616_a(IBlockState state, EnumFacing side, long rand) + public List getQuads(IBlockState state, EnumFacing side, long rand) { if(state instanceof IExtendedBlockState) { @@ -604,11 +604,11 @@ public class ModelLoader extends ModelBakery IExtendedBlockState newExState = exState.withProperty(Properties.AnimationProperty, null); if(newState != null) { - return VanillaModelWrapper.this.bake(new ModelStateComposition(modelState, newState), format, bakedTextureGetter).func_188616_a(newExState, side, rand); + return VanillaModelWrapper.this.bake(new ModelStateComposition(modelState, newState), format, bakedTextureGetter).getQuads(newExState, side, rand); } } } - return super.func_188616_a(state, side, rand); + return super.getQuads(state, side, rand); }; }; } @@ -627,7 +627,7 @@ public class ModelLoader extends ModelBakery ModelBlock newModel = new ModelBlock(this.model.getParentLocation(), elements, Maps.newHashMap(this.model.textures), this.model.isAmbientOcclusion(), this.model.isGui3d(), //New Textures man VERY IMPORTANT - model.func_181682_g(), Lists.newArrayList(model.func_187966_f())); + model.getAllTransforms(), Lists.newArrayList(model.getOverrides())); newModel.name = this.model.name; newModel.parent = this.model.parent; @@ -696,7 +696,7 @@ public class ModelLoader extends ModelBakery { return this; } - ModelBlock newModel = new ModelBlock(model.getParentLocation(), model.getElements(), model.textures, value, model.isGui3d(), model.func_181682_g(), Lists.newArrayList(model.func_187966_f())); + ModelBlock newModel = new ModelBlock(model.getParentLocation(), model.getElements(), model.textures, value, model.isGui3d(), model.getAllTransforms(), Lists.newArrayList(model.getOverrides())); newModel.parent = model.parent; newModel.name = model.name; return new VanillaModelWrapper(location, newModel, uvlock, animation); @@ -709,7 +709,7 @@ public class ModelLoader extends ModelBakery { return this; } - ModelBlock newModel = new ModelBlock(model.getParentLocation(), model.getElements(), model.textures, model.ambientOcclusion, value, model.func_181682_g(), Lists.newArrayList(model.func_187966_f())); + ModelBlock newModel = new ModelBlock(model.getParentLocation(), model.getElements(), model.textures, model.ambientOcclusion, value, model.getAllTransforms(), Lists.newArrayList(model.getOverrides())); newModel.parent = model.parent; newModel.name = model.name; return new VanillaModelWrapper(location, newModel, uvlock, animation); @@ -735,11 +735,11 @@ public class ModelLoader extends ModelBakery public WeightedRandomModel(ModelResourceLocation parent, VariantList variants) { - this.variants = variants.func_188114_a(); + this.variants = variants.getVariantList(); ImmutableList.Builder> builder = ImmutableList.builder(); for (Variant v : this.variants) { - ResourceLocation loc = v.func_188046_a(); + ResourceLocation loc = v.getModelLocation(); locations.add(loc); IModel model = null; @@ -813,7 +813,7 @@ public class ModelLoader extends ModelBakery { IModel model = models.get(i); Variant v = variants.get(i); - builder.add(model.bake(MultiModelState.getPartState(state, model, i), format, bakedTextureGetter), variants.get(i).func_188047_d()); + builder.add(model.bake(MultiModelState.getPartState(state, model, i), format, bakedTextureGetter), variants.get(i).getWeight()); } return builder.build(); } diff --git a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java index c63e5c35b4..8f16b6765c 100644 --- a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java @@ -161,13 +161,13 @@ public class MultiLayerModel implements IModelCustomData ImmutableList.Builder builder = ImmutableList.builder(); for(IBakedModel model : models.values()) { - builder.addAll(model.func_188616_a(null, side.orNull(), 0)); + builder.addAll(model.getQuads(null, side.orNull(), 0)); } return builder.build(); } @Override - public List func_188616_a(IBlockState state, EnumFacing side, long rand) + public List getQuads(IBlockState state, EnumFacing side, long rand) { IBakedModel model; BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); @@ -183,7 +183,7 @@ public class MultiLayerModel implements IModelCustomData { model = models.get(Optional.of(layer)); } - return model.func_188616_a(state, side, rand); + return model.getQuads(state, side, rand); } @Override @@ -199,9 +199,9 @@ public class MultiLayerModel implements IModelCustomData } @Override - public boolean func_188618_c() + public boolean isBuiltInRenderer() { - return base.func_188618_c(); + return base.isBuiltInRenderer(); } @Override @@ -223,9 +223,9 @@ public class MultiLayerModel implements IModelCustomData } @Override - public ItemOverrideList func_188617_f() + public ItemOverrideList getOverrides() { - return ItemOverrideList.field_188022_a; + return ItemOverrideList.NONE; } } diff --git a/src/main/java/net/minecraftforge/client/model/MultiModel.java b/src/main/java/net/minecraftforge/client/model/MultiModel.java index 28b3884876..1e6ba7b1b6 100644 --- a/src/main/java/net/minecraftforge/client/model/MultiModel.java +++ b/src/main/java/net/minecraftforge/client/model/MultiModel.java @@ -96,9 +96,9 @@ public class MultiModel implements IModel } @Override - public boolean func_188618_c() + public boolean isBuiltInRenderer() { - return internalBase.func_188618_c(); + return internalBase.isBuiltInRenderer(); } @Override @@ -114,7 +114,7 @@ public class MultiModel implements IModel } @Override - public List func_188616_a(IBlockState state, EnumFacing side, long rand) + public List getQuads(IBlockState state, EnumFacing side, long rand) { if(quads == null) { @@ -125,22 +125,22 @@ public class MultiModel implements IModel ImmutableList.Builder quads = ImmutableList.builder(); if (base != null) { - quads.addAll(base.func_188616_a(null, face, 0)); + quads.addAll(base.getQuads(null, face, 0)); } for (IBakedModel bakedPart : parts.values()) { - quads.addAll(bakedPart.func_188616_a(null, face, 0)); + quads.addAll(bakedPart.getQuads(null, face, 0)); } builder.put(Optional.of(face), quads.build()); } ImmutableList.Builder quads = ImmutableList.builder(); if (base != null) { - quads.addAll(base.func_188616_a(null, null, 0)); + quads.addAll(base.getQuads(null, null, 0)); } for (IBakedModel bakedPart : parts.values()) { - quads.addAll(bakedPart.func_188616_a(null, null, 0)); + quads.addAll(bakedPart.getQuads(null, null, 0)); } builder.put(Optional.absent(), quads.build()); this.quads = builder.build(); @@ -167,7 +167,7 @@ public class MultiModel implements IModel } @Override - public ItemOverrideList func_188617_f() + public ItemOverrideList getOverrides() { // TODO Auto-generated method stub return null; diff --git a/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java b/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java index 766242af82..6174ee335c 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java +++ b/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java @@ -58,7 +58,7 @@ public class AnimationModelBase extends M GlStateManager.pushMatrix(); GlStateManager.rotate(180, 0, 0, 1); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer VertexBuffer = tessellator.getWorldRenderer(); + VertexBuffer VertexBuffer = tessellator.getBuffer(); VertexBuffer.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); VertexBuffer.setTranslation(-0.5, -1.5, -0.5); @@ -67,7 +67,7 @@ public class AnimationModelBase extends M lighter.setState(Blocks.air.getDefaultState()); lighter.setBlockPos(pos); boolean empty = true; - List quads = bakedModel.func_188616_a(null, null, 0); + List quads = bakedModel.getQuads(null, null, 0); if(!quads.isEmpty()) { lighter.updateBlockInfo(); @@ -79,7 +79,7 @@ public class AnimationModelBase extends M } for(EnumFacing side : EnumFacing.values()) { - quads = bakedModel.func_188616_a(null, side, 0); + quads = bakedModel.getQuads(null, side, 0); if(!quads.isEmpty()) { if(empty) lighter.updateBlockInfo(); diff --git a/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java b/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java index 80a238eb4b..33b59da334 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java +++ b/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java @@ -18,7 +18,7 @@ public abstract class FastTESR extends TileEntitySpecialRe public final void renderTileEntityAt(T te, double x, double y, double z, float partialTicks, int destroyStage) { Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer VertexBuffer = tessellator.getWorldRenderer(); + VertexBuffer VertexBuffer = tessellator.getBuffer(); this.bindTexture(TextureMap.locationBlocksTexture); RenderHelper.disableStandardItemLighting(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java index 5b8ee3628b..c3e52742b3 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -638,7 +638,7 @@ public class B3DLoader implements ICustomModelLoader } @Override - public List func_188616_a(IBlockState state, EnumFacing side, long rand) + public List getQuads(IBlockState state, EnumFacing side, long rand) { if(side != null) return ImmutableList.of(); IModelState modelState = this.state; @@ -807,7 +807,7 @@ public class B3DLoader implements ICustomModelLoader return gui3d; } - public boolean func_188618_c() + public boolean isBuiltInRenderer() { return false; } @@ -829,10 +829,10 @@ public class B3DLoader implements ICustomModelLoader } @Override - public ItemOverrideList func_188617_f() + public ItemOverrideList getOverrides() { // TODO handle items - return ItemOverrideList.field_188022_a; + return ItemOverrideList.NONE; } } } diff --git a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java index 7d6879ca3b..5c9df533cc 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java +++ b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java @@ -1325,7 +1325,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData // FIXME: merge with getQuads @Override - public List func_188616_a(IBlockState blockState, EnumFacing side, long rand) + public List getQuads(IBlockState blockState, EnumFacing side, long rand) { if(side != null) return ImmutableList.of(); if (quads == null) @@ -1475,7 +1475,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData } @Override - public boolean func_188618_c() + public boolean isBuiltInRenderer() { return false; } @@ -1588,9 +1588,9 @@ public class OBJModel implements IRetexturableModel, IModelCustomData } @Override - public ItemOverrideList func_188617_f() + public ItemOverrideList getOverrides() { - return ItemOverrideList.field_188022_a; + return ItemOverrideList.NONE; } } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java b/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java index 0198580e9e..fa78ce40be 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java @@ -36,7 +36,7 @@ public class BlockInfo { if(cachedTint == tint) return cachedMultiplier; cachedTint = tint; - cachedMultiplier = colors.func_186724_a(state, world, blockPos, tint); + cachedMultiplier = colors.colorMultiplier(state, world, blockPos, tint); return cachedMultiplier; } @@ -102,15 +102,15 @@ public class BlockInfo { BlockPos pos = blockPos.add(x - 1, y - 1, z - 1); IBlockState state = world.getBlockState(pos); - translucent[x][y][z] = state.func_185895_e(); + translucent[x][y][z] = state.isTranslucent(); //translucent[x][y][z] = world.getBlockState(pos).getBlock().getLightOpacity(world, pos) == 0; - int brightness = state.func_185889_a(world, pos); + int brightness = state.getPackedLightmapCoords(world, pos); s[x][y][z] = (brightness >> 0x14) & 0xF; b[x][y][z] = (brightness >> 0x04) & 0xF; - ao[x][y][z] = state.func_185892_j(); + ao[x][y][z] = state.getAmbientOcclusionLightValue(); if(x == 1 && y == 1 && z == 1) { - full = state.func_185917_h(); + full = state.isFullCube(); } } } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java b/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java index f7a79cd299..b460661899 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java @@ -48,7 +48,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer } @Override - public boolean func_187497_c(IBlockAccess world, IBakedModel model, IBlockState state, BlockPos pos, VertexBuffer buffer, boolean checkSides, long rand) + public boolean renderModelFlat(IBlockAccess world, IBakedModel model, IBlockState state, BlockPos pos, VertexBuffer buffer, boolean checkSides, long rand) { if(ForgeModContainer.forgeLightPipelineEnabled) { @@ -64,12 +64,12 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer } else { - return super.func_187497_c(world, model, state, pos, buffer, checkSides, rand); + return super.renderModelFlat(world, model, state, pos, buffer, checkSides, rand); } } @Override - public boolean func_187498_b(IBlockAccess world, IBakedModel model, IBlockState state, BlockPos pos, VertexBuffer buffer, boolean checkSides, long rand) + public boolean renderModelSmooth(IBlockAccess world, IBakedModel model, IBlockState state, BlockPos pos, VertexBuffer buffer, boolean checkSides, long rand) { if(ForgeModContainer.forgeLightPipelineEnabled) { @@ -85,7 +85,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer } else { - return super.func_187498_b(world, model, state, pos, buffer, checkSides, rand); + return super.renderModelSmooth(world, model, state, pos, buffer, checkSides, rand); } } @@ -95,7 +95,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer lighter.setState(state); lighter.setBlockPos(pos); boolean empty = true; - List quads = model.func_188616_a(state, null, rand); + List quads = model.getQuads(state, null, rand); if(!quads.isEmpty()) { lighter.updateBlockInfo(); @@ -107,10 +107,10 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer } for(EnumFacing side : EnumFacing.values()) { - quads = model.func_188616_a(state, side, rand); + quads = model.getQuads(state, side, rand); if(!quads.isEmpty()) { - if(!checkSides || state.func_185894_c(world, pos, side)) + if(!checkSides || state.shouldSideBeRendered(world, pos, side)) { if(empty) lighter.updateBlockInfo(); empty = false; diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java b/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java index b30431b493..de273c2f41 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java @@ -144,7 +144,7 @@ public class LightUtil { int length = 4 < to.length ? 4 : to.length; VertexFormatElement element = formatFrom.getElement(e); - int vertexStart = v * formatFrom.getNextOffset() + formatFrom.func_181720_d(e); + int vertexStart = v * formatFrom.getNextOffset() + formatFrom.getOffset(e); int count = element.getElementCount(); VertexFormatElement.EnumType type = element.getType(); int size = type.getSize(); @@ -198,7 +198,7 @@ public class LightUtil public static void pack(float[] from, int[] to, VertexFormat formatTo, int v, int e) { VertexFormatElement element = formatTo.getElement(e); - int vertexStart = v * formatTo.getNextOffset() + formatTo.func_181720_d(e); + int vertexStart = v * formatTo.getNextOffset() + formatTo.getOffset(e); int count = element.getElementCount(); VertexFormatElement.EnumType type = element.getType(); int size = type.getSize(); @@ -241,7 +241,7 @@ public class LightUtil if(tessellator == null) { Tessellator tes = Tessellator.getInstance(); - VertexBuffer wr = tes.getWorldRenderer(); + VertexBuffer wr = tes.getBuffer(); tessellator = new VertexBufferConsumer(wr); } return tessellator; @@ -261,7 +261,7 @@ public class LightUtil public static void renderQuadColorSlow(VertexBuffer wr, BakedQuad quad, int auxColor) { ItemConsumer cons; - if(wr == Tessellator.getInstance().getWorldRenderer()) + if(wr == Tessellator.getInstance().getBuffer()) { cons = getItemConsumer(); } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java index 32cb394e58..5ffd67f67b 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java @@ -203,7 +203,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer float e2 = 0.95f; BlockPos pos = blockInfo.getBlockPos(); - boolean full = blockInfo.getState().func_185917_h(); + boolean full = blockInfo.getState().isFullCube(); if((full || y < -e1) && normal[1] < -e2) pos = pos.down(); if((full || y > e1) && normal[1] > e2) pos = pos.up(); @@ -212,7 +212,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer if((full || x < -e1) && normal[0] < -e2) pos = pos.west(); if((full || x > e1) && normal[0] > e2) pos = pos.east(); - int brightness = blockInfo.getState().func_185889_a(blockInfo.getWorld(), pos); + int brightness = blockInfo.getState().getPackedLightmapCoords(blockInfo.getWorld(), pos); lightmap[0] = ((float)((brightness >> 0x04) & 0xF) * 0x20) / 0xFFFF; lightmap[1] = ((float)((brightness >> 0x14) & 0xF) * 0x20) / 0xFFFF; diff --git a/src/main/java/net/minecraftforge/common/BiomeDictionary.java b/src/main/java/net/minecraftforge/common/BiomeDictionary.java index 704137a531..2d430055b6 100644 --- a/src/main/java/net/minecraftforge/common/BiomeDictionary.java +++ b/src/main/java/net/minecraftforge/common/BiomeDictionary.java @@ -146,7 +146,7 @@ public class BiomeDictionary { types = listSubTags(types); - if(BiomeGenBase.field_185377_q.getNameForObject(biome) != null) + if(BiomeGenBase.biomeRegistry.getNameForObject(biome) != null) { for(Type type : types) { @@ -160,7 +160,7 @@ public class BiomeDictionary if(!isBiomeRegistered(biome)) { - ResourceLocation location = BiomeGenBase.field_185377_q.getNameForObject(biome); + ResourceLocation location = BiomeGenBase.biomeRegistry.getNameForObject(biome); biomeInfoMap.put(location, new BiomeInfo(types)); } else @@ -248,7 +248,7 @@ public class BiomeDictionary */ public static boolean isBiomeRegistered(BiomeGenBase biome) { - return biomeInfoMap.containsKey(BiomeGenBase.field_185377_q.getNameForObject(biome)); + return biomeInfoMap.containsKey(BiomeGenBase.biomeRegistry.getNameForObject(biome)); } public static void registerAllBiomes() @@ -264,9 +264,9 @@ public class BiomeDictionary */ public static void registerAllBiomesAndGenerateEvents() { - for (ResourceLocation biomeResource : BiomeGenBase.field_185377_q.getKeys()) + for (ResourceLocation biomeResource : BiomeGenBase.biomeRegistry.getKeys()) { - BiomeGenBase biome = BiomeGenBase.field_185377_q.getObject(biomeResource); + BiomeGenBase biome = BiomeGenBase.biomeRegistry.getObject(biomeResource); if (biome.theBiomeDecorator instanceof DeferredBiomeDecorator) { @@ -289,7 +289,7 @@ public class BiomeDictionary { if (biome.theBiomeDecorator.treesPerChunk >= 3) { - if (biome.isHighHumidity() && biome.func_185353_n() >= 0.9F) + if (biome.isHighHumidity() && biome.getTemperature() >= 0.9F) { BiomeDictionary.registerBiomeType(biome, JUNGLE); } @@ -297,36 +297,36 @@ public class BiomeDictionary { BiomeDictionary.registerBiomeType(biome, FOREST); - if (biome.func_185353_n() <= 0.2f) + if (biome.getTemperature() <= 0.2f) { BiomeDictionary.registerBiomeType(biome, CONIFEROUS); } } } - else if(biome.func_185360_m() <= 0.3F && biome.func_185360_m() >= 0.0F) + else if(biome.getHeightVariation() <= 0.3F && biome.getHeightVariation() >= 0.0F) { - if(!biome.isHighHumidity() || biome.func_185355_j() >= 0.0F) + if(!biome.isHighHumidity() || biome.getBaseHeight() >= 0.0F) { BiomeDictionary.registerBiomeType(biome, PLAINS); } } - if (biome.getFloatRainfall() > 0.85f) + if (biome.getRainfall() > 0.85f) { BiomeDictionary.registerBiomeType(biome, WET); } - if (biome.getFloatRainfall() < 0.15f) + if (biome.getRainfall() < 0.15f) { BiomeDictionary.registerBiomeType(biome, DRY); } - if (biome.func_185353_n() > 0.85f) + if (biome.getTemperature() > 0.85f) { BiomeDictionary.registerBiomeType(biome, HOT); } - if (biome.func_185353_n() < 0.15f) + if (biome.getTemperature() < 0.15f) { BiomeDictionary.registerBiomeType(biome, COLD); } @@ -340,14 +340,14 @@ public class BiomeDictionary BiomeDictionary.registerBiomeType(biome, DENSE); } - if (biome.isHighHumidity() && biome.func_185355_j() < 0.0F && (biome.func_185360_m() <= 0.3F && biome.func_185360_m() >= 0.0F)) + if (biome.isHighHumidity() && biome.getBaseHeight() < 0.0F && (biome.getHeightVariation() <= 0.3F && biome.getHeightVariation() >= 0.0F)) { BiomeDictionary.registerBiomeType(biome, SWAMP); } - if (biome.func_185355_j() <= -0.5F) + if (biome.getBaseHeight() <= -0.5F) { - if (biome.func_185360_m() == 0.0F) + if (biome.getHeightVariation() == 0.0F) { BiomeDictionary.registerBiomeType(biome, RIVER); } @@ -357,12 +357,12 @@ public class BiomeDictionary } } - if (biome.func_185360_m() >= 0.4F && biome.func_185360_m() < 1.5F) + if (biome.getHeightVariation() >= 0.4F && biome.getHeightVariation() < 1.5F) { BiomeDictionary.registerBiomeType(biome, HILLS); } - if (biome.func_185360_m() >= 1.5F) + if (biome.getHeightVariation() >= 1.5F) { BiomeDictionary.registerBiomeType(biome, MOUNTAIN); } @@ -372,7 +372,7 @@ public class BiomeDictionary BiomeDictionary.registerBiomeType(biome, SNOWY); } - if (biome.topBlock != Blocks.sand && biome.func_185353_n() >= 1.0f && biome.getFloatRainfall() < 0.2f) + if (biome.topBlock != Blocks.sand && biome.getTemperature() >= 1.0f && biome.getRainfall() < 0.2f) { BiomeDictionary.registerBiomeType(biome, SAVANNA); } @@ -394,7 +394,7 @@ public class BiomeDictionary //Internal implementation private static BiomeInfo getBiomeInfo(BiomeGenBase biome) { - return biomeInfoMap.get(BiomeGenBase.field_185377_q.getNameForObject(biome)); + return biomeInfoMap.get(BiomeGenBase.biomeRegistry.getNameForObject(biome)); } private static void checkRegistration(BiomeGenBase biome) diff --git a/src/main/java/net/minecraftforge/common/DimensionManager.java b/src/main/java/net/minecraftforge/common/DimensionManager.java index 246ce6c9a6..4cfb66638c 100644 --- a/src/main/java/net/minecraftforge/common/DimensionManager.java +++ b/src/main/java/net/minecraftforge/common/DimensionManager.java @@ -244,7 +244,7 @@ public class DimensionManager //WorldSettings worldSettings = new WorldSettings(overworld.getWorldInfo()); WorldServer world = (dim == 0 ? overworld : (WorldServer)(new WorldServerMulti(mcServer, savehandler, dim, overworld, mcServer.theProfiler).init())); - world.addWorldAccess(new WorldManager(mcServer, world)); + world.addEventListener(new WorldManager(mcServer, world)); MinecraftForge.EVENT_BUS.post(new WorldEvent.Load(world)); if (!mcServer.isSinglePlayer()) { diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index cecc177a68..025dd885de 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -139,7 +139,7 @@ public class ForgeHooks { IBlockState state = world.getBlockState(pos); state = state.getBlock().getActualState(state, world, pos); - if (state.func_185904_a().isToolNotRequired()) + if (state.getMaterial().isToolNotRequired()) { return true; } @@ -148,13 +148,13 @@ public class ForgeHooks String tool = block.getHarvestTool(state); if (stack == null || tool == null) { - return player.func_184823_b(state); + return player.canHarvestBlock(state); } int toolLevel = stack.getItem().getHarvestLevel(stack, tool); if (toolLevel < 0) { - return player.func_184823_b(state); + return player.canHarvestBlock(state); } return toolLevel >= block.getHarvestLevel(state); @@ -171,7 +171,7 @@ public class ForgeHooks public static float blockStrength(IBlockState state, EntityPlayer player, World world, BlockPos pos) { - float hardness = state.func_185887_b(world, pos); + float hardness = state.getBlockHardness(world, pos); if (hardness < 0.0F) { return 0.0F; @@ -276,7 +276,7 @@ public class ForgeHooks IBlockState iblockstate = this.theWorld.getBlockState(blockpos); Block block = iblockstate.getBlock(); - if (iblockstate.func_185904_a() == Material.air) + if (iblockstate.getMaterial() == Material.air) { return; } @@ -428,22 +428,22 @@ public class ForgeHooks if (te != null) { - Minecraft.getMinecraft().func_184119_a(result, te); + Minecraft.getMinecraft().storeTEInStack(result, te); } if (isCreative) { player.inventory.func_184434_a(result); - Minecraft.getMinecraft().playerController.sendSlotPacket(player.func_184586_b(EnumHand.MAIN_HAND), 36 + player.inventory.currentItem); + Minecraft.getMinecraft().playerController.sendSlotPacket(player.getHeldItem(EnumHand.MAIN_HAND), 36 + player.inventory.currentItem); return true; } - int slot = player.inventory.func_184429_b(result); + int slot = player.inventory.getSlotFor(result); if (slot != -1) { - if (InventoryPlayer.func_184435_e(slot)) + if (InventoryPlayer.isHotbar(slot)) player.inventory.currentItem = slot; else - Minecraft.getMinecraft().playerController.func_187100_a(slot); + Minecraft.getMinecraft().playerController.pickItem(slot); return true; } return false; @@ -656,7 +656,7 @@ public class ForgeHooks { // Logic from tryHarvestBlock for pre-canceling the event boolean preCancelEvent = false; - if (gameType.isCreative() && entityPlayer.func_184614_ca() != null && entityPlayer.func_184614_ca().getItem() instanceof ItemSword) + if (gameType.isCreative() && entityPlayer.getHeldItemMainhand() != null && entityPlayer.getHeldItemMainhand().getItem() instanceof ItemSword) preCancelEvent = true; if (gameType.isAdventure()) @@ -666,7 +666,7 @@ public class ForgeHooks if (!entityPlayer.isAllowEdit()) { - ItemStack itemstack = entityPlayer.func_184614_ca(); + ItemStack itemstack = entityPlayer.getHeldItemMainhand(); if (itemstack == null || !itemstack.canDestroy(world.getBlockState(pos).getBlock())) preCancelEvent = true; } @@ -789,7 +789,7 @@ public class ForgeHooks world.markAndNotifyBlock(snap.pos, null, oldBlock, newBlock, updateFlag); } - player.triggerAchievement(StatList.func_188060_a(itemstack.getItem())); + player.addStat(StatList.func_188060_a(itemstack.getItem())); } } world.capturedBlockSnapshots.clear(); @@ -904,7 +904,7 @@ public class ForgeHooks public static boolean onPlayerAttackTarget(EntityPlayer player, Entity target) { if (MinecraftForge.EVENT_BUS.post(new AttackEntityEvent(player, target))) return false; - ItemStack stack = player.func_184614_ca(); + ItemStack stack = player.getHeldItemMainhand(); if (stack != null && stack.getItem().onLeftClickEntity(stack, player, target)) return false; return true; } diff --git a/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java b/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java index 8d649ae011..579853bec6 100644 --- a/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java +++ b/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java @@ -69,9 +69,9 @@ public class WorldSpecificSaveHandler implements ISaveHandler } @Override - public TemplateManager func_186340_h() + public TemplateManager getStructureTemplateManager() { - return parent.func_186340_h(); + return parent.getStructureTemplateManager(); } } diff --git a/src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java b/src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java index 16dc3b9603..f11f4584fa 100644 --- a/src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java +++ b/src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java @@ -19,7 +19,7 @@ public class VanillaBrewingRecipe implements IBrewingRecipe { public boolean isInput(ItemStack stack) { Item item = stack.getItem(); - return item == Items.potionitem || item == Items.field_185155_bH || item == Items.field_185156_bI || item == Items.glass_bottle; + return item == Items.potionitem || item == Items.splash_potion || item == Items.lingering_potion || item == Items.glass_bottle; } /** @@ -28,7 +28,7 @@ public class VanillaBrewingRecipe implements IBrewingRecipe { @Override public boolean isIngredient(ItemStack stack) { - return PotionHelper.func_185205_a(stack); + return PotionHelper.isReagent(stack); } /** @@ -41,7 +41,7 @@ public class VanillaBrewingRecipe implements IBrewingRecipe { { if (ingredient != null && input != null && isIngredient(ingredient)) { - ItemStack result = PotionHelper.func_185212_d(ingredient, input); + ItemStack result = PotionHelper.doReaction(ingredient, input); if (result != input) { return result; diff --git a/src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java b/src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java index b7534633c9..4b38198227 100644 --- a/src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java +++ b/src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java @@ -45,11 +45,11 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider 0)) // If the block is being silk harvested, the exp dropped is 0 + (state.getBlock().canSilkHarvest(world, pos, world.getBlockState(pos), player) && EnchantmentHelper.getEnchantmentLevel(Enchantments.silkTouch, player.getHeldItemMainhand()) > 0)) // If the block is being silk harvested, the exp dropped is 0 { this.exp = 0; } else { - int bonusLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.field_185308_t, player.func_184614_ca()); + int bonusLevel = EnchantmentHelper.getEnchantmentLevel(Enchantments.fortune, player.getHeldItemMainhand()); this.exp = state.getBlock().getExpDrop(state, world, pos, bonusLevel); } } @@ -134,7 +134,7 @@ public class BlockEvent extends Event { super(blockSnapshot.world, blockSnapshot.pos, blockSnapshot.getCurrentBlock()); this.player = player; - this.itemInHand = player.func_184614_ca(); + this.itemInHand = player.getHeldItemMainhand(); this.blockSnapshot = blockSnapshot; this.placedBlock = blockSnapshot.getCurrentBlock(); this.placedAgainst = placedAgainst; diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java index 9f1cd6ff29..018b872e35 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java @@ -212,7 +212,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock return displacements.get(state.getBlock()); } - Material material = state.func_185904_a(); + Material material = state.getMaterial(); if (material.blocksMovement() || material == Material.portal) { return false; @@ -261,7 +261,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock return false; } - Material material = state.func_185904_a(); + Material material = state.getMaterial(); if (material.blocksMovement() || material == Material.portal) { return false; @@ -380,7 +380,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock */ @Override - public int func_185484_c(IBlockState state, IBlockAccess world, BlockPos pos) + public int getPackedLightmapCoords(IBlockState state, IBlockAccess world, BlockPos pos) { int lightThis = world.getCombinedLight(pos, 0); int lightUp = world.getCombinedLight(pos.up(), 0); @@ -403,7 +403,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { IBlockState neighbor = world.getBlockState(pos.offset(side)); - if (neighbor.func_185904_a() == state.func_185904_a()) + if (neighbor.getMaterial() == state.getMaterial()) { return false; } @@ -487,7 +487,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock public static double getFlowDirection(IBlockAccess world, BlockPos pos) { IBlockState state = world.getBlockState(pos); - if (!state.func_185904_a().isLiquid()) + if (!state.getMaterial().isLiquid()) { return -1000.0; } @@ -554,7 +554,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock IBlockState up = world.getBlockState(pos.down(densityDir)); if (here.getBlock() == this) { - if (up.func_185904_a().isLiquid() || up.getBlock() instanceof IFluidBlock) + if (up.getMaterial().isLiquid() || up.getBlock() instanceof IFluidBlock) { return 1; } @@ -564,7 +564,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock return 0.875F; } } - return !here.func_185904_a().isSolid() && up.getBlock() == this ? 1 : this.getQuantaPercentage(world, pos) * 0.875F; + return !here.getMaterial().isSolid() && up.getBlock() == this ? 1 : this.getQuantaPercentage(world, pos) * 0.875F; } public Vec3d getFlowVector(IBlockAccess world, BlockPos pos) @@ -589,7 +589,7 @@ public abstract class BlockFluidBase extends Block implements IFluidBlock int otherDecay = quantaPerBlock - getQuantaValue(world, pos2); if (otherDecay >= quantaPerBlock) { - if (!world.getBlockState(pos2).func_185904_a().blocksMovement()) + if (!world.getBlockState(pos2).getMaterial().blocksMovement()) { otherDecay = quantaPerBlock - getQuantaValue(world, pos2.down()); if (otherDecay >= 0) diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java b/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java index f3d60cc372..449a9c0342 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java @@ -289,7 +289,7 @@ public class BlockFluidClassic extends BlockFluidBase return displacements.get(state.getBlock()); } - Material material = state.func_185904_a(); + Material material = state.getMaterial(); if (material.blocksMovement() || material == Material.water || material == Material.lava || diff --git a/src/main/java/net/minecraftforge/fluids/FluidUtil.java b/src/main/java/net/minecraftforge/fluids/FluidUtil.java index 2ea86794ff..9b7f6bc540 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidUtil.java +++ b/src/main/java/net/minecraftforge/fluids/FluidUtil.java @@ -404,7 +404,7 @@ public class FluidUtil { if (world != null && pos != null) { - world.func_184148_a(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.field_187638_cR, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } return true; } diff --git a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java index 03ceb7797d..0c612204ca 100644 --- a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java +++ b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java @@ -129,7 +129,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem && !player.capabilities.isCreativeMode) { // success! - player.triggerAchievement(StatList.func_188057_b(this)); + player.addStat(StatList.func_188057_b(this)); itemstack.stackSize--; ItemStack emptyStack = empty != null ? empty.copy() : new ItemStack(this); @@ -162,7 +162,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem return false; } - Material material = worldIn.getBlockState(pos).func_185904_a(); + Material material = worldIn.getBlockState(pos).getMaterial(); boolean isSolid = material.isSolid(); // can only place in air or non-solid blocks @@ -177,7 +177,7 @@ public class UniversalBucket extends Item implements IFluidContainerItem int i = pos.getX(); int j = pos.getY(); int k = pos.getZ(); - worldIn.func_184133_a(null, pos, SoundEvents.field_187646_bt, SoundCategory.BLOCKS, 0.5F, + worldIn.playSound(null, pos, SoundEvents.block_fire_extinguish, SoundCategory.BLOCKS, 0.5F, 2.6F + (worldIn.rand.nextFloat() - worldIn.rand.nextFloat()) * 0.8F); for (int l = 0; l < 8; ++l) diff --git a/src/main/java/net/minecraftforge/fml/client/GuiModList.java b/src/main/java/net/minecraftforge/fml/client/GuiModList.java index ddc45a8fb7..0f67480e66 100644 --- a/src/main/java/net/minecraftforge/fml/client/GuiModList.java +++ b/src/main/java/net/minecraftforge/fml/client/GuiModList.java @@ -487,7 +487,7 @@ public class GuiModList extends GuiScreen } ITextComponent chat = ForgeHooks.newChatWithLinks(line, false); - ret.addAll(GuiUtilRenderComponents.func_178908_a(chat, this.listWidth-8, GuiModList.this.fontRendererObj, false, true)); + ret.addAll(GuiUtilRenderComponents.splitText(chat, this.listWidth-8, GuiModList.this.fontRendererObj, false, true)); } return ret; } @@ -524,13 +524,13 @@ public class GuiModList extends GuiScreen { GlStateManager.enableBlend(); GuiModList.this.mc.renderEngine.bindTexture(logoPath); - VertexBuffer wr = tess.getWorldRenderer(); + VertexBuffer wr = tess.getBuffer(); int offset = (this.left + this.listWidth/2) - (logoDims.width / 2); wr.begin(7, DefaultVertexFormats.POSITION_TEX); - wr.pos(offset, top + logoDims.height, zLevel).func_187315_a(0, 1).endVertex(); - wr.pos(offset + logoDims.width, top + logoDims.height, zLevel).func_187315_a(1, 1).endVertex(); - wr.pos(offset + logoDims.width, top, zLevel).func_187315_a(1, 0).endVertex(); - wr.pos(offset, top, zLevel).func_187315_a(0, 0).endVertex(); + wr.pos(offset, top + logoDims.height, zLevel).tex(0, 1).endVertex(); + wr.pos(offset + logoDims.width, top + logoDims.height, zLevel).tex(1, 1).endVertex(); + wr.pos(offset + logoDims.width, top, zLevel).tex(1, 0).endVertex(); + wr.pos(offset, top, zLevel).tex(0, 0).endVertex(); tess.draw(); GlStateManager.disableBlend(); top += logoDims.height + 10; diff --git a/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java b/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java index 4c82db1815..2d3a2650a5 100644 --- a/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java +++ b/src/main/java/net/minecraftforge/fml/client/GuiScrollingList.java @@ -263,7 +263,7 @@ public abstract class GuiScrollingList this.applyScrollLimits(); Tessellator tess = Tessellator.getInstance(); - VertexBuffer worldr = tess.getWorldRenderer(); + VertexBuffer worldr = tess.getBuffer(); ScaledResolution res = new ScaledResolution(client); double scaleW = client.displayWidth / res.getScaledWidth_double(); @@ -284,10 +284,10 @@ public abstract class GuiScrollingList GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); float scale = 32.0F; worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.pos(this.left, this.bottom, 0.0D).func_187315_a(this.left / scale, (this.bottom + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); - worldr.pos(this.right, this.bottom, 0.0D).func_187315_a(this.right / scale, (this.bottom + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); - worldr.pos(this.right, this.top, 0.0D).func_187315_a(this.right / scale, (this.top + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); - worldr.pos(this.left, this.top, 0.0D).func_187315_a(this.left / scale, (this.top + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); + worldr.pos(this.left, this.bottom, 0.0D).tex(this.left / scale, (this.bottom + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); + worldr.pos(this.right, this.bottom, 0.0D).tex(this.right / scale, (this.bottom + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); + worldr.pos(this.right, this.top, 0.0D).tex(this.right / scale, (this.top + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); + worldr.pos(this.left, this.top, 0.0D).tex(this.left / scale, (this.top + (int)this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); tess.draw(); } @@ -311,14 +311,14 @@ public abstract class GuiScrollingList GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableTexture2D(); worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.pos(min, slotTop + slotBuffer + 2, 0).func_187315_a(0, 1).color(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.pos(max, slotTop + slotBuffer + 2, 0).func_187315_a(1, 1).color(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.pos(max, slotTop - 2, 0).func_187315_a(1, 0).color(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.pos(min, slotTop - 2, 0).func_187315_a(0, 0).color(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.pos(min + 1, slotTop + slotBuffer + 1, 0).func_187315_a(0, 1).color(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.pos(max - 1, slotTop + slotBuffer + 1, 0).func_187315_a(1, 1).color(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.pos(max - 1, slotTop - 1, 0).func_187315_a(1, 0).color(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.pos(min + 1, slotTop - 1, 0).func_187315_a(0, 0).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(min, slotTop + slotBuffer + 2, 0).tex(0, 1).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(max, slotTop + slotBuffer + 2, 0).tex(1, 1).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(max, slotTop - 2, 0).tex(1, 0).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(min, slotTop - 2, 0).tex(0, 0).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(min + 1, slotTop + slotBuffer + 1, 0).tex(0, 1).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(max - 1, slotTop + slotBuffer + 1, 0).tex(1, 1).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(max - 1, slotTop - 1, 0).tex(1, 0).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(min + 1, slotTop - 1, 0).tex(0, 0).color(0x00, 0x00, 0x00, 0xFF).endVertex(); tess.draw(); GlStateManager.enableTexture2D(); } @@ -347,22 +347,22 @@ public abstract class GuiScrollingList GlStateManager.disableTexture2D(); worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.pos(scrollBarLeft, this.bottom, 0.0D).func_187315_a(0.0D, 1.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.pos(scrollBarRight, this.bottom, 0.0D).func_187315_a(1.0D, 1.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.pos(scrollBarRight, this.top, 0.0D).func_187315_a(1.0D, 0.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.pos(scrollBarLeft, this.top, 0.0D).func_187315_a(0.0D, 0.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(scrollBarLeft, this.bottom, 0.0D).tex(0.0D, 1.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(scrollBarRight, this.bottom, 0.0D).tex(1.0D, 1.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(scrollBarRight, this.top, 0.0D).tex(1.0D, 0.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(scrollBarLeft, this.top, 0.0D).tex(0.0D, 0.0D).color(0x00, 0x00, 0x00, 0xFF).endVertex(); tess.draw(); worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.pos(scrollBarLeft, barTop + height, 0.0D).func_187315_a(0.0D, 1.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.pos(scrollBarRight, barTop + height, 0.0D).func_187315_a(1.0D, 1.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.pos(scrollBarRight, barTop, 0.0D).func_187315_a(1.0D, 0.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.pos(scrollBarLeft, barTop, 0.0D).func_187315_a(0.0D, 0.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(scrollBarLeft, barTop + height, 0.0D).tex(0.0D, 1.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(scrollBarRight, barTop + height, 0.0D).tex(1.0D, 1.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(scrollBarRight, barTop, 0.0D).tex(1.0D, 0.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(scrollBarLeft, barTop, 0.0D).tex(0.0D, 0.0D).color(0x80, 0x80, 0x80, 0xFF).endVertex(); tess.draw(); worldr.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.pos(scrollBarLeft, barTop + height - 1, 0.0D).func_187315_a(0.0D, 1.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); - worldr.pos(scrollBarRight - 1, barTop + height - 1, 0.0D).func_187315_a(1.0D, 1.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); - worldr.pos(scrollBarRight - 1, barTop, 0.0D).func_187315_a(1.0D, 0.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); - worldr.pos(scrollBarLeft, barTop, 0.0D).func_187315_a(0.0D, 0.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); + worldr.pos(scrollBarLeft, barTop + height - 1, 0.0D).tex(0.0D, 1.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); + worldr.pos(scrollBarRight - 1, barTop + height - 1, 0.0D).tex(1.0D, 1.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); + worldr.pos(scrollBarRight - 1, barTop, 0.0D).tex(1.0D, 0.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); + worldr.pos(scrollBarLeft, barTop, 0.0D).tex(0.0D, 0.0D).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); tess.draw(); } @@ -390,7 +390,7 @@ public abstract class GuiScrollingList GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); GlStateManager.shadeModel(GL11.GL_SMOOTH); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer VertexBuffer = tessellator.getWorldRenderer(); + VertexBuffer VertexBuffer = tessellator.getBuffer(); VertexBuffer.begin(7, DefaultVertexFormats.POSITION_COLOR); VertexBuffer.pos(right, top, 0.0D).color(r1, g1, b1, a1).endVertex(); VertexBuffer.pos(left, top, 0.0D).color(r1, g1, b1, a1).endVertex(); diff --git a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java index 3ba49489fb..3f8fb469fd 100644 --- a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java +++ b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java @@ -503,8 +503,8 @@ public class SplashProgress if (max_texture_size != -1) return max_texture_size; for (int i = 0x4000; i > 0; i >>= 1) { - GlStateManager.func_187419_a(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (IntBuffer)null); - if (GlStateManager.func_187411_c(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH) != 0) + GlStateManager.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (IntBuffer)null); + if (GlStateManager.glGetTexLevelParameteri(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH) != 0) { max_texture_size = i; return i; diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java b/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java index 6502112441..b76587a143 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java +++ b/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java @@ -184,12 +184,12 @@ public class GuiUtils float uScale = 1f / 0x100; float vScale = 1f / 0x100; Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer wr = tessellator.getWorldRenderer(); + VertexBuffer wr = tessellator.getBuffer(); wr.begin(7, DefaultVertexFormats.POSITION_TEX); - wr.pos(x , y + height, zLevel).func_187315_a( u * uScale, ((v + height) * vScale)).endVertex(); - wr.pos(x + width, y + height, zLevel).func_187315_a((u + width) * uScale, ((v + height) * vScale)).endVertex(); - wr.pos(x + width, y , zLevel).func_187315_a((u + width) * uScale, ( v * vScale)).endVertex(); - wr.pos(x , y , zLevel).func_187315_a( u * uScale, ( v * vScale)).endVertex(); + wr.pos(x , y + height, zLevel).tex( u * uScale, ((v + height) * vScale)).endVertex(); + wr.pos(x + width, y + height, zLevel).tex((u + width) * uScale, ((v + height) * vScale)).endVertex(); + wr.pos(x + width, y , zLevel).tex((u + width) * uScale, ( v * vScale)).endVertex(); + wr.pos(x , y , zLevel).tex( u * uScale, ( v * vScale)).endVertex(); tessellator.draw(); } diff --git a/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java b/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java index 5db838deaa..4153af858a 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java +++ b/src/main/java/net/minecraftforge/fml/common/network/FMLOutboundHandler.java @@ -128,7 +128,7 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { public List selectNetworks(Object args, ChannelHandlerContext context, FMLProxyPacket packet) { ImmutableList.Builder builder = ImmutableList.builder(); - for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().func_184103_al().getPlayerList()) + for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerList()) { NetworkDispatcher dispatcher = player.playerNetServerHandler.netManager.channel().attr(NetworkDispatcher.FML_DISPATCHER).get(); if (dispatcher != null) builder.add(dispatcher); @@ -156,7 +156,7 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { { int dimension = (Integer)args; ImmutableList.Builder builder = ImmutableList.builder(); - for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().func_184103_al().getPlayerList()) + for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerList()) { if (dimension == player.dimension) { @@ -190,7 +190,7 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { { TargetPoint tp = (TargetPoint)args; ImmutableList.Builder builder = ImmutableList.builder(); - for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().func_184103_al().getPlayerList()) + for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerList()) { if (player.dimension == tp.dimension) { diff --git a/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java b/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java index be45fec147..4d6675d4ee 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java +++ b/src/main/java/net/minecraftforge/fml/common/network/internal/EntitySpawnHandler.java @@ -126,7 +126,7 @@ public class EntitySpawnHandler extends SimpleChannelInboundHandler 0) diff --git a/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java b/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java index 2a70bbea5f..7f6a89a949 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java +++ b/src/main/java/net/minecraftforge/fml/common/network/internal/FMLMessage.java @@ -193,7 +193,7 @@ public abstract class FMLMessage { PacketBuffer pb = new PacketBuffer(tmpBuf); try { - entity.func_184212_Q().func_187216_a(pb); + entity.getDataManager().writeEntries(pb); } catch (IOException e) { FMLLog.log(Level.FATAL,e,"Encountered fatal exception trying to send entity spawn data watchers"); @@ -247,7 +247,7 @@ public abstract class FMLMessage { scaledHeadYaw = dat.readByte() * 360F / 256F; try { - dataWatcherList = EntityDataManager.func_187215_b(new PacketBuffer(dat)); + dataWatcherList = EntityDataManager.readEntries(new PacketBuffer(dat)); } catch (IOException e) { FMLLog.log(Level.FATAL, e, "There was a critical error decoding the datawatcher stream for a mod entity."); diff --git a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java index 95145a0fd4..21b942a659 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java @@ -557,7 +557,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespacedDefaul throw new IllegalArgumentException("The object to be added to the registry is not of the right type. Reflection/ASM hackery? Registry bug?"); } - underlyingIntegerMap.func_186814_a(thing, id); // obj <-> id + underlyingIntegerMap.put(thing, id); // obj <-> id super.putObject(name, thing); // name <-> obj availabilityMap.set(id); if (addCallback != null) @@ -759,7 +759,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespacedDefaul for (I i : this.underlyingIntegerMap) { - addCallback.onAdd(i, this.underlyingIntegerMap.func_186808_c(i)); + addCallback.onAdd(i, this.underlyingIntegerMap.add(i)); } } diff --git a/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java b/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java index a373a1c163..b2caf4717f 100644 --- a/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java +++ b/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java @@ -157,8 +157,8 @@ public class ItemHandlerHelper // play sound if something got picked up if (remainder == null || remainder.stackSize != stack.stackSize) { - world.func_184148_a(player, player.posX, player.posY, player.posZ, - SoundEvents.field_187638_cR, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + world.playSound(player, player.posX, player.posY, player.posZ, + SoundEvents.entity_item_pickup, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } // drop remaining itemstack into the world diff --git a/src/main/java/net/minecraftforge/items/wrapper/PlayerArmorInvWrapper.java b/src/main/java/net/minecraftforge/items/wrapper/PlayerArmorInvWrapper.java index c0df1e3055..9da886216d 100644 --- a/src/main/java/net/minecraftforge/items/wrapper/PlayerArmorInvWrapper.java +++ b/src/main/java/net/minecraftforge/items/wrapper/PlayerArmorInvWrapper.java @@ -35,7 +35,7 @@ public class PlayerArmorInvWrapper extends InvWrapper EntityEquipmentSlot equ = null; for (EntityEquipmentSlot s : EntityEquipmentSlot.values()) { - if (s.func_188453_a() == EntityEquipmentSlot.Type.ARMOR && s.func_188454_b() == slot) + if (s.getSlotType() == EntityEquipmentSlot.Type.ARMOR && s.getIndex() == slot) { equ = s; break; diff --git a/src/main/java/net/minecraftforge/server/command/ForgeCommand.java b/src/main/java/net/minecraftforge/server/command/ForgeCommand.java index 1f133aa68f..89c9949c93 100644 --- a/src/main/java/net/minecraftforge/server/command/ForgeCommand.java +++ b/src/main/java/net/minecraftforge/server/command/ForgeCommand.java @@ -36,7 +36,7 @@ public class ForgeCommand extends CommandBase { return 2; } @Override - public void func_184881_a(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException + public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length == 0) { @@ -65,7 +65,7 @@ public class ForgeCommand extends CommandBase { } @Override - public List func_184883_a(MinecraftServer server, ICommandSender sender, String[] args, BlockPos pos) + public List getTabCompletionOptions(MinecraftServer server, ICommandSender sender, String[] args, BlockPos pos) { if (args.length == 1) { diff --git a/src/main/java/net/minecraftforge/server/console/ConsoleCommandCompleter.java b/src/main/java/net/minecraftforge/server/console/ConsoleCommandCompleter.java index 9b46bc670f..3469bbd085 100644 --- a/src/main/java/net/minecraftforge/server/console/ConsoleCommandCompleter.java +++ b/src/main/java/net/minecraftforge/server/console/ConsoleCommandCompleter.java @@ -47,7 +47,7 @@ public final class ConsoleCommandCompleter implements Completer @Override public List call() throws Exception { - return ConsoleCommandCompleter.this.server.func_184104_a(ConsoleCommandCompleter.this.server, input, + return ConsoleCommandCompleter.this.server.getTabCompletions(ConsoleCommandCompleter.this.server, input, ConsoleCommandCompleter.this.server.getPosition(), false/* we're not a command block */); } }); diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index d59cf947d3..3acac0b2d2 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -3,7 +3,7 @@ net/minecraft/client/renderer/ItemRenderer.renderItem(Lnet/minecraft/entity/Enti net/minecraft/client/renderer/RenderGlobal.drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V=|p_72717_1_,p_72717_2_,p_72717_3_ net/minecraft/client/renderer/entity/RenderItem.renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V=|p_77020_1_,p_77020_2_,p_77020_3_,p_77020_4_,p_77020_5_,p_77020_6_,p_77020_7_,pass net/minecraft/client/renderer/entity/RenderItem.renderItemIntoGUI(Lnet/minecraft/client/gui/FontRenderer;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/item/ItemStack;IIZ)V=|p_77015_1_,p_77015_2_,p_77015_3_,p_77015_4_,p_77015_5_,renderEffect -net/minecraft/server/management/ServerConfigurationManager.transferPlayerToDimension(Lnet/minecraft/entity/player/EntityPlayerMP;ILnet/minecraft/world/Teleporter;)V=|p_72356_1_,p_72356_2_,teleporter +net/minecraft/server/management/PlayerList.transferPlayerToDimension(Lnet/minecraft/entity/player/EntityPlayerMP;ILnet/minecraft/world/Teleporter;)V=|p_187242_1_,p_187242_2_,teleporter net/minecraft/server/management/ServerConfigurationManager.transferEntityToWorld(Lnet/minecraft/entity/Entity;ILnet/minecraft/world/WorldServer;Lnet/minecraft/world/WorldServer;Lnet/minecraft/world/Teleporter;)V=|p_82448_1_,p_82448_2_,p_82448_3_,p_82448_4_,teleporter net/minecraft/world/World.getBiomeGenForCoordsBody(II)Lnet/minecraft/world/biome/BiomeGenBase;=|p_72807_1_,p_72807_2_ net/minecraft/world/World.getSunBrightnessFactor(F)F=|p_72967_1_ @@ -45,4 +45,5 @@ net/minecraft/stats/StatList.mergeStatBases([Lnet/minecraft/stats/StatBase;Lnet/ net/minecraft/item/ItemStack.(Lnet/minecraft/item/Item;IILnet/minecraft/nbt/NBTTagCompound;)V=|p_i1881_1_,p_i1881_2_,p_i1881_3_,capNBT net/minecraft/block/BlockRedstoneWire.canConnectTo(Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;)Z=p_176343_0_,p_176343_1_,world,pos -net/minecraft/client/renderer/block/model/BakedQuad.([IILnet/minecraft/util/EnumFacing;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/renderer/vertex/VertexFormat)V=|p_i46574_1_,p_i46574_2_,p_i46574_3_,p_i46574_4_,format +net/minecraft/client/renderer/block/model/BakedQuad.([IILnet/minecraft/util/EnumFacing;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/renderer/vertex/VertexFormat;)V=|p_i46574_1_,p_i46574_2_,p_i46574_3_,p_i46574_4_,format +net/minecraft/client/renderer/texture/TextureMap.(Ljava/lang/String;Lnet/minecraft/client/renderer/texture/IIconCreator;Z)V=|p_i46100_1_,p_i46100_2_,skipFirst diff --git a/src/test/java/net/minecraftforge/debug/DynBucketTest.java b/src/test/java/net/minecraftforge/debug/DynBucketTest.java index 90208cdc88..a303f048ac 100644 --- a/src/test/java/net/minecraftforge/debug/DynBucketTest.java +++ b/src/test/java/net/minecraftforge/debug/DynBucketTest.java @@ -263,7 +263,7 @@ public class DynBucketTest int filled = tank.fill(resource, doFill); if(doFill && filled > 0) { IBlockState state = worldObj.getBlockState(pos); - worldObj.func_184138_a(pos, state, state, 8); // TODO check flag + worldObj.notifyBlockUpdate(pos, state, state, 8); // TODO check flag } return filled; } @@ -281,7 +281,7 @@ public class DynBucketTest FluidStack drained = tank.drain(maxDrain, doDrain); if(doDrain && drained != null) { IBlockState state = worldObj.getBlockState(pos); - worldObj.func_184138_a(pos, state, state, 8); // TODO check flag + worldObj.notifyBlockUpdate(pos, state, state, 8); // TODO check flag } return drained; } diff --git a/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java b/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java index d1b1ecaf3a..8001c0edd0 100644 --- a/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelAnimationDebug.java @@ -105,7 +105,7 @@ public class ModelAnimationDebug @Override public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) { - return this.getDefaultState().withProperty(FACING, BlockPistonBase.func_185647_a(pos, placer)); + return this.getDefaultState().withProperty(FACING, BlockPistonBase.getFacingFromEntity(pos, placer)); } @Override @@ -223,7 +223,7 @@ public class ModelAnimationDebug "base", Pair.of(base, TRSRTransformation.identity()) ) ); - return new RenderLiving(manager, new AnimationModelBase(model, new VertexLighterSmoothAo(Minecraft.getMinecraft().func_184125_al())) + return new RenderLiving(manager, new AnimationModelBase(model, new VertexLighterSmoothAo(Minecraft.getMinecraft().getBlockColors())) { @Override public void handleEvents(EntityChest chest, float time, Iterable pastEvents) @@ -379,7 +379,7 @@ public class ModelAnimationDebug protected void applyEntityAttributes() { super.applyEntityAttributes(); - this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(60); + this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(60); } } } diff --git a/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java b/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java index 654f7731a2..cb829bec5c 100644 --- a/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java +++ b/src/test/java/net/minecraftforge/debug/ModelBakeEventDebug.java @@ -249,7 +249,7 @@ public class ModelBakeEventDebug } @Override - public List func_188616_a(IBlockState state, EnumFacing side, long rand) + public List getQuads(IBlockState state, EnumFacing side, long rand) { if(side != null || !(state instanceof IExtendedBlockState)) return ImmutableList.of(); IExtendedBlockState exState = (IExtendedBlockState)state; @@ -280,7 +280,7 @@ public class ModelBakeEventDebug public boolean isAmbientOcclusion() { return true; } @Override - public boolean func_188618_c() { return false; } + public boolean isBuiltInRenderer() { return false; } @Override public TextureAtlasSprite getParticleTexture() { return this.base; } @@ -289,7 +289,7 @@ public class ModelBakeEventDebug public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } @Override - public ItemOverrideList func_188617_f() { return ItemOverrideList.field_188022_a; } + public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } private static Vec3d rotate(Vec3d vec, EnumFacing side) diff --git a/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java b/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java index bcd958d877..da9cfb182f 100644 --- a/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java +++ b/src/test/java/net/minecraftforge/debug/PotionRegistryDebug.java @@ -58,7 +58,7 @@ public class PotionRegistryDebug { @Override public void renderInventoryEffect(int x, int y, PotionEffect effect, Minecraft mc) { - Potion potion = effect.func_188419_a(); + Potion potion = effect.getPotion(); mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite("minecraft:blocks/fire_layer_0"); @@ -75,13 +75,13 @@ public class PotionRegistryDebug { float a = (float)(potion.getLiquidColor() & 255) / 255.0F; Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer buf = tessellator.getWorldRenderer(); + VertexBuffer buf = tessellator.getBuffer(); buf.begin(7, DefaultVertexFormats.POSITION_TEX); GlStateManager.color(r, g, b, a); - buf.pos((double) x, (double)(y + height), 0.0D).func_187315_a(sprite.getMinU(), sprite.getMaxV()).endVertex(); - buf.pos((double)(x + width), (double)(y + height), 0.0D).func_187315_a(sprite.getMaxU(), sprite.getMaxV()).endVertex(); - buf.pos((double)(x + width), (double) y, 0.0D).func_187315_a(sprite.getMaxU(), sprite.getMinV()).endVertex(); - buf.pos((double) x, (double) y, 0.0D).func_187315_a(sprite.getMinU(), sprite.getMinV()).endVertex(); + buf.pos((double) x, (double)(y + height), 0.0D).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); + buf.pos((double)(x + width), (double)(y + height), 0.0D).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); + buf.pos((double)(x + width), (double) y, 0.0D).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); + buf.pos((double) x, (double) y, 0.0D).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); tessellator.draw(); } } diff --git a/src/test/java/net/minecraftforge/test/ClientCommandTest.java b/src/test/java/net/minecraftforge/test/ClientCommandTest.java index 6e4a1d2e34..e302f47488 100644 --- a/src/test/java/net/minecraftforge/test/ClientCommandTest.java +++ b/src/test/java/net/minecraftforge/test/ClientCommandTest.java @@ -37,13 +37,13 @@ public class ClientCommandTest { } @Override - public boolean func_184882_a(MinecraftServer server, ICommandSender sender) + public boolean checkPermission(MinecraftServer server, ICommandSender sender) { return true; } @Override - public List func_184883_a(MinecraftServer server, ICommandSender sender, String[] args, BlockPos pos) + public List getTabCompletionOptions(MinecraftServer server, ICommandSender sender, String[] args, BlockPos pos) { if (args.length > 0) { @@ -54,7 +54,7 @@ public class ClientCommandTest { } @Override - public void func_184881_a( MinecraftServer server, ICommandSender sender, String[] args) throws CommandException + public void execute( MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { if (args.length > 0) { diff --git a/src/test/java/net/minecraftforge/test/FOVModifierTest.java b/src/test/java/net/minecraftforge/test/FOVModifierTest.java index 53f6869c75..2bd053877f 100644 --- a/src/test/java/net/minecraftforge/test/FOVModifierTest.java +++ b/src/test/java/net/minecraftforge/test/FOVModifierTest.java @@ -20,7 +20,7 @@ public class FOVModifierTest { @SubscribeEvent public void getFOVModifier(EntityViewRenderEvent.FOVModifier event) { - if(event.getState().func_185904_a() == Material.water) + if(event.getState().getMaterial() == Material.water) event.setFOV(event.getFOV() / 60.0f * 50.0f); } }