diff options
Diffstat (limited to 'src/main/java/gregtech/common')
52 files changed, 266 insertions, 438 deletions
diff --git a/src/main/java/gregtech/common/GT_DummyWorld.java b/src/main/java/gregtech/common/GT_DummyWorld.java index baab96510a..756e35863f 100644 --- a/src/main/java/gregtech/common/GT_DummyWorld.java +++ b/src/main/java/gregtech/common/GT_DummyWorld.java @@ -22,19 +22,19 @@ public class GT_DummyWorld extends World { public GT_IteratorRandom mRandom = new GT_IteratorRandom(); public ItemStack mLastSetBlock = null; - public GT_DummyWorld(ISaveHandler par1iSaveHandler, String par2Str, WorldProvider par3WorldProvider, WorldSettings par4WorldSettings, Profiler par5Profiler) { - super(par1iSaveHandler, par2Str, par4WorldSettings, par3WorldProvider, par5Profiler); + public GT_DummyWorld(ISaveHandler saveHandler, String name, WorldProvider worldProvider, WorldSettings worldSettings, Profiler profiler) { + super(saveHandler, name, worldSettings, worldProvider, profiler); this.rand = this.mRandom; } public GT_DummyWorld() { this(new ISaveHandler() { @Override - public void saveWorldInfoWithPlayer(WorldInfo var1, NBTTagCompound var2) { + public void saveWorldInfoWithPlayer(WorldInfo worldInfo, NBTTagCompound nbtTagCompound) { } @Override - public void saveWorldInfo(WorldInfo var1) { + public void saveWorldInfo(WorldInfo worldInfo) { } @Override @@ -48,12 +48,12 @@ public class GT_DummyWorld extends World { } @Override - public File getMapFileFromName(String var1) { + public File getMapFileFromName(String mapName) { return null; } @Override - public IChunkLoader getChunkLoader(WorldProvider var1) { + public IChunkLoader getChunkLoader(WorldProvider worldProvider) { return null; } diff --git a/src/main/java/gregtech/common/GT_MinableOreGenerator.java b/src/main/java/gregtech/common/GT_MinableOreGenerator.java deleted file mode 100644 index 2a1191b07e..0000000000 --- a/src/main/java/gregtech/common/GT_MinableOreGenerator.java +++ /dev/null @@ -1,81 +0,0 @@ -package gregtech.common; - -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; - -import java.util.Random; - -public class GT_MinableOreGenerator extends WorldGenerator { - private Block minableBlockId; - private Block mBlock; - private int minableBlockMeta = 0; - private int numberOfBlocks; - private boolean allowVoid = false; - - public GT_MinableOreGenerator(Block par1, int par2) { - this.minableBlockId = par1; - this.numberOfBlocks = par2; - } - - public GT_MinableOreGenerator(Block id, int meta, int number, boolean aAllowVoid, Block aBlock) { - this(id, number); - this.minableBlockMeta = meta; - this.allowVoid = aAllowVoid; - this.mBlock = aBlock; - } - - @Override - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) { - float math_pi = 3.141593F;//FB: CNT - CNT_ROUGH_CONSTANT_VALUE - float var6 = par2Random.nextFloat() * math_pi; - float var1s = this.numberOfBlocks / 8.0F; - int var4s = par4 - 2;int var5s = par3 + 8;int var6s = par5 + 8; - float var7s = this.numberOfBlocks / 16.0F; - float var8s = math_pi / this.numberOfBlocks; - float mh_s_0 = MathHelper.sin(var6) * var1s;float mh_c_0 = MathHelper.cos(var6) * var1s; - float var7 = var5s + mh_s_0; - float var11 = var6s + mh_c_0; - int var15r = par2Random.nextInt(3);int var17r = par2Random.nextInt(3); - int mh_n_4=var17r - var15r; - int var15 = var4s + var15r; - float mh_n_0 = -2*mh_s_0;float mh_n_1 = -2*mh_c_0; - for (int var19 = 0; var19 <= this.numberOfBlocks; var19++) { - float mh_n_2 = var19 / this.numberOfBlocks; - float var20 = var7 + mh_n_0 * mh_n_2; - float var22 = var15 + mh_n_4 * mh_n_2; - float var24 = var11 + mh_n_1 * mh_n_2; - float var26 = par2Random.nextFloat() * var7s; - float var1c = var19 * var8s; - float var28 = ((MathHelper.sin(var1c) + 1.0F) * var26 + 1.0F) / 2.0F; - int var32 = MathHelper.floor_float(var20 - var28); - int var33 = MathHelper.floor_float(var22 - var28); - int var34 = MathHelper.floor_float(var24 - var28); - int var35 = MathHelper.floor_float(var20 + var28); - int var36 = MathHelper.floor_float(var22 + var28); - int var37 = MathHelper.floor_float(var24 + var28); - for (int var38 = var32; var38 <= var35; var38++) { - float var39 = (var38 + 0.5F - var20) / (var28); - float var5c = var39 * var39; - if (var5c < 1.0F) { - for (int var41 = var33; var41 <= var36; var41++) { - float var42 = (var41 + 0.5F - var22) / (var28); - float var7c = var5c + var42 * var42; - if (var7c < 1.0F) { - for (int var44 = var34; var44 <= var37; var44++) { - float var45 = (var44 + 0.5F - var24) / (var28); - Block block = par1World.getBlock(var38, var41, var44); - if ((var7c + var45 * var45 < 1.0F) && (((this.allowVoid) && (par1World.getBlock(var38, var41, var44) == Blocks.air)) || ((block != null) && (block.isReplaceableOreGen(par1World, var38, var41, var44, this.mBlock))))) { - par1World.setBlock(var38, var41, var44, this.minableBlockId, this.minableBlockMeta, 0); - } - } - } - } - } - } - } - return true; - } -} diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java index 0911f257b4..aa6dfa2a41 100644 --- a/src/main/java/gregtech/common/GT_Worldgenerator.java +++ b/src/main/java/gregtech/common/GT_Worldgenerator.java @@ -61,9 +61,9 @@ public class GT_Worldgenerator implements IWorldGenerator { mList.add(new WorldGenContainer(new XSTR(Math.abs(aRandom.nextInt()) +1), aX, aZ, aWorld.provider.dimensionId, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName)); if (debugWorldGen) GT_Log.out.println( "ADD WorldSeed:"+aWorld.getSeed() + - " DimId" + aWorld.provider.dimensionId + - " chunk x:" + aX + - " z:" + aZ + + " DimId" + aWorld.provider.dimensionId + + " chunk x:" + aX + + " z:" + aZ + " SIZE: " + mList.size() ); } @@ -76,11 +76,11 @@ public class GT_Worldgenerator implements IWorldGenerator { WorldGenContainer toRun = (WorldGenContainer) mList.get(0); if (debugWorldGen) GT_Log.out.println( "RUN WorldSeed:"+aWorld.getSeed()+ - " DimId" + aWorld.provider.dimensionId + - " chunk x:" + toRun.mX + - " z:" + toRun.mZ + - " SIZE: " + mList.size() + - " i: " + i + " DimId" + aWorld.provider.dimensionId + + " chunk x:" + toRun.mX + + " z:" + toRun.mZ + + " SIZE: " + mList.size() + + " i: " + i ); synchronized (listLock) { @@ -379,7 +379,7 @@ public class GT_Worldgenerator implements IWorldGenerator { for( ; seedList.size() != 0; seedList.remove(0) ) { if (debugWorldGen) GT_Log.out.println( "Processing seed x="+seedList.get(0).mX+ - " z="+seedList.get(0).mZ + " z="+seedList.get(0).mZ ); worldGenFindVein( seedList.get(0).mX, seedList.get(0).mZ ); } @@ -431,35 +431,35 @@ public class GT_Worldgenerator implements IWorldGenerator { // mSize = aRandom.nextInt((int) (gcMaxSize - gcMinSize)); } if ((mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) { - float var6 = aRandom.nextFloat() * 3.141593F; - double var7 = tX + 8 + MathHelper.sin(var6) * mSize / 8.0F; - double var9 = tX + 8 - MathHelper.sin(var6) * mSize / 8.0F; - double var11 = tZ + 8 + MathHelper.cos(var6) * mSize / 8.0F; - double var13 = tZ + 8 - MathHelper.cos(var6) * mSize / 8.0F; - double var15 = tY + aRandom.nextInt(3) - 2; - double var17 = tY + aRandom.nextInt(3) - 2; - for (int var19 = 0; var19 <= mSize; var19++) { - double var20 = var7 + (var9 - var7) * var19 / mSize; - double var22 = var15 + (var17 - var15) * var19 / mSize; - double var24 = var11 + (var13 - var11) * var19 / mSize; - double var26 = aRandom.nextDouble() * mSize / 16.0D; - double var28 = (MathHelper.sin(var19 * 3.141593F / mSize) + 1.0F) * var26 + 1.0D; - double var30 = (MathHelper.sin(var19 * 3.141593F / mSize) + 1.0F) * var26 + 1.0D; - int tMinX = MathHelper.floor_double(var20 - var28 / 2.0D); - int tMinY = MathHelper.floor_double(var22 - var30 / 2.0D); - int tMinZ = MathHelper.floor_double(var24 - var28 / 2.0D); - int tMaxX = MathHelper.floor_double(var20 + var28 / 2.0D); - int tMaxY = MathHelper.floor_double(var22 + var30 / 2.0D); - int tMaxZ = MathHelper.floor_double(var24 + var28 / 2.0D); + float randomRadian = aRandom.nextFloat() * 3.141593F; + double xBase = tX + 8 + MathHelper.sin(randomRadian) * mSize / 8.0F; + double xFactor = tX + 8 - MathHelper.sin(randomRadian) * mSize / 8.0F; + double zBase = tZ + 8 + MathHelper.cos(randomRadian) * mSize / 8.0F; + double zFactor = tZ + 8 - MathHelper.cos(randomRadian) * mSize / 8.0F; + double yBase = tY + aRandom.nextInt(3) - 2; + double yFactor = tY + aRandom.nextInt(3) - 2; + for (int i = 0; i <= mSize; i++) { + double xCenter = xBase + (xFactor - xBase) * i / mSize; + double yCenter = yBase + (yFactor - yBase) * i / mSize; + double zCenter = zBase + (zFactor - zBase) * i / mSize; + double randomDistance = aRandom.nextDouble() * mSize / 16.0D; + double halfLength = (MathHelper.sin(i * 3.141593F / mSize) + 1.0F) * randomDistance + 1.0D; + double halfHeight = (MathHelper.sin(i * 3.141593F / mSize) + 1.0F) * randomDistance + 1.0D; + int tMinX = MathHelper.floor_double(xCenter - halfLength / 2.0D); + int tMinY = MathHelper.floor_double(yCenter - halfHeight / 2.0D); + int tMinZ = MathHelper.floor_double(zCenter - halfLength / 2.0D); + int tMaxX = MathHelper.floor_double(xCenter + halfLength / 2.0D); + int tMaxY = MathHelper.floor_double(yCenter + halfHeight / 2.0D); + int tMaxZ = MathHelper.floor_double(zCenter + halfLength / 2.0D); for (int eX = tMinX; eX <= tMaxX; eX++) { - double var39 = (eX + 0.5D - var20) / (var28 / 2.0D); - if (var39 * var39 < 1.0D) { + double xChance = (eX + 0.5D - xCenter) / (halfLength / 2.0D); + if (xChance * xChance < 1.0D) { for (int eY = tMinY; eY <= tMaxY; eY++) { - double var42 = (eY + 0.5D - var22) / (var30 / 2.0D); - if (var39 * var39 + var42 * var42 < 1.0D) { + double yChance = (eY + 0.5D - yCenter) / (halfHeight / 2.0D); + if (xChance * xChance + yChance * yChance < 1.0D) { for (int eZ = tMinZ; eZ <= tMaxZ; eZ++) { - double var45 = (eZ + 0.5D - var24) / (var28 / 2.0D); - if ((var39 * var39 + var42 * var42 + var45 * var45 < 1.0D) && (mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) { + double zChance = (eZ + 0.5D - zCenter) / (halfLength / 2.0D); + if ((xChance * xChance + yChance * yChance + zChance * zChance < 1.0D) && (mWorld.getBlock(tX, tY, tZ).isAir(mWorld, tX, tY, tZ))) { int ranOre = aRandom.nextInt(50); if (ranOre < 3) { GT_TileEntity_Ores.setOreBlock(mWorld, eX, eY, eZ, primaryMeta, false); @@ -494,7 +494,7 @@ public class GT_Worldgenerator implements IWorldGenerator { GT_Log.out.println( " Oregen took " + (oregenTime-leftOverTime)+ " Leftover gen took " + (leftOverTime - startTime) + - " Worldgen took " + duration + + " Worldgen took " + duration + " nanoseconds" ); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java index 49f15e328c..072259f2ee 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java @@ -20,7 +20,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block { public GT_Block_Casings_Abstract(Class<? extends ItemBlock> aItemClass, String aName, Material aMaterial) { @@ -84,16 +83,6 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block { } @Override - public boolean renderAsNormalBlock() { - return true; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); @@ -106,23 +95,13 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block { } @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); - } - - @Override - public int quantityDropped(Random par1Random) { - return 1; + public int damageDropped(int metadata) { + return metadata; } @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -132,7 +111,7 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); if (!aStack.getDisplayName().contains(".name")) aList.add(aStack); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index 851b84b5c3..24b8635c86 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -156,7 +156,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } @Override - public boolean canConnectRedstone(IBlockAccess var1, int var2, int var3, int var4, int var5) { + public boolean canConnectRedstone(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) { return true; } @@ -339,7 +339,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } @Override - public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) { + public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float aOffsetX, float aOffsetY, float aOffsetZ) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity == null) { return false; @@ -361,7 +361,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo if ((!aWorld.isRemote) && !((IGregTechTileEntity) tTileEntity).isUseableByPlayer(aPlayer)) { return true; } - return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, (byte) aSide, par1, par2, par3); + return ((IGregTechTileEntity) tTileEntity).onRightclick(aPlayer, (byte) aSide, aOffsetX, aOffsetY, aOffsetZ); } return false; } @@ -394,7 +394,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } @Override - public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) { + public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity) { @@ -423,7 +423,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } } } - super.breakBlock(aWorld, aX, aY, aZ, par5, par6); + super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata); aWorld.removeTileEntity(aX, aY, aZ); } @@ -490,7 +490,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo } @Override - public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int par5, float chance, int par7) { + public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int aMetadata, float chance, int aFortune) { if (!aWorld.isRemote) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity != null && (chance < 1.0F)) { @@ -500,7 +500,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo ((BaseMetaTileEntity) tTileEntity).doEnergyExplosion(); } } else { - super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, par5, chance, par7); + super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, aMetadata, chance, aFortune); } } } @@ -568,7 +568,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @Override public float getExplosionResistance( - Entity par1Entity, World aWorld, int aX, int aY, int aZ, + Entity entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity) { @@ -580,10 +580,10 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @SideOnly(Side.CLIENT) @Override @SuppressWarnings("unchecked") // Old API uses raw List type - public void getSubBlocks(Item par1Item, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List outputSubBlocks) { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { if (GregTech_API.METATILEENTITIES[i] != null) { - par3List.add(new ItemStack(par1Item, 1, i)); + outputSubBlocks.add(new ItemStack(item, 1, i)); } } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index 6c2ebed490..3a7f231761 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -138,7 +138,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } @Override - public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) { + public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float aOffsetX, float aOffsetY, float aOffsetZ) { if (!aPlayer.isSneaking() || !aPlayer.capabilities.isCreativeMode) { return false; } @@ -181,7 +181,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } @Override - public float getExplosionResistance(Entity par1Entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) { + public float getExplosionResistance(Entity entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) { return 1.0F + getHarvestLevel(aWorld.getBlockMetadata(aX, aY, aZ)) * 1.0F; } @@ -222,16 +222,6 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } @Override - public boolean renderAsNormalBlock() { - return true; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override public TileEntity createNewTileEntity(World aWorld, int aMeta) { return createTileEntity(aWorld, aMeta); } @@ -277,12 +267,12 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } @Override - public void breakBlock(World aWorld, int aX, int aY, int aZ, Block par5, int par6) { + public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if ((tTileEntity instanceof GT_TileEntity_Ores)) { mTemporaryTileEntity.set((GT_TileEntity_Ores) tTileEntity); } - super.breakBlock(aWorld, aX, aY, aZ, par5, par6); + super.breakBlock(aWorld, aX, aY, aZ, aBlock, aMetadata); aWorld.removeTileEntity(aX, aY, aZ); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java index fc49ecc597..79087b8ae4 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java @@ -31,7 +31,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; @@ -72,7 +71,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { ItemList.Block_BedrockiumCompressed.set(new ItemStack(this.setHardness(1500.0f).setResistance(5000.0f), 1, 12)); GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(Items.coal, 1, 1), new Object[]{ItemList.Block_BrittleCharcoal.get(1)}); GT_ModHandler.addCraftingRecipe(ItemList.Block_Powderbarrel.get(1L),GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"WSW","GGG","WGW", 'W', OrePrefixes.plate.get(Materials.Wood), 'G', new ItemStack(Items.gunpowder,1),'S',new ItemStack(Items.string,1)}); - + } @Override @@ -166,7 +165,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { if (world == null) { return 0.0F; } @@ -202,7 +201,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { return 2500.0F; } - return super.getExplosionResistance(par1Entity, world, x, y, z, explosionX, explosionY, explosionZ); + return super.getExplosionResistance(entity, world, x, y, z, explosionX, explosionY, explosionZ); } @Override @@ -226,49 +225,29 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } @Override - public boolean renderAsNormalBlock() { - return true; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return false; } @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); - } - - @Override - public int quantityDropped(Random par1Random) { - return 1; + public int damageDropped(int metadata) { + return metadata; } @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override - public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int par5, float chance, int par7) { - if (par5 == 4) { + public void dropBlockAsItemWithChance(World aWorld, int aX, int aY, int aZ, int aMetadata, float chance, int aFortune) { + if (aMetadata == 4) { this.dropBlockAsItem(aWorld, aX, aY, aZ, new ItemStack(Items.coal, XSTR_INSTANCE.nextInt(2) + 1, 1)); } else { - super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, par5, chance, par7); + super.dropBlockAsItemWithChance(aWorld, aX, aY, aZ, aMetadata, chance, aFortune); } } - + @Override public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { @@ -287,7 +266,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } return super.removedByPlayer(world, player, x, y, z); } - + @Override public void onBlockAdded(World world, int x, int y, int z) { @@ -296,7 +275,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { removedByPlayer(world, null, x, y, z); } } - + @Override public void onNeighborBlockChange(World world, int x, int y, int z, Block neighbor) { @@ -304,7 +283,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { removedByPlayer(world, null, x, y, z); } } - + @Override public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { if (!world.isRemote && world.getBlockMetadata(x, y, z)==5){ @@ -314,17 +293,17 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } super.onBlockExploded(world, x, y, z, explosion); } - + @Override - public boolean onBlockActivated(World par1World, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float xOffset, float yOffset, float zOffset) { - if ((player.getCurrentEquippedItem() != null) && (player.getCurrentEquippedItem().getItem() == Items.flint_and_steel)&&par1World.getBlockMetadata(x, y, z)==5) + if ((player.getCurrentEquippedItem() != null) && (player.getCurrentEquippedItem().getItem() == Items.flint_and_steel)&&world.getBlockMetadata(x, y, z)==5) { - removedByPlayer(par1World, player, x, y, z); - + removedByPlayer(world, player, x, y, z); + return true; } - return super.onBlockActivated(par1World, x, y, z, player, side, xOffset, yOffset, zOffset); + return super.onBlockActivated(world, x, y, z, player, side, xOffset, yOffset, zOffset); } @Override @@ -334,13 +313,13 @@ public class GT_Block_Reinforced extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); if (!aStack.getDisplayName().contains(".name")) aList.add(aStack); } } - + @Override public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { return !(entity instanceof EntityWither); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java index 2f816b93c0..b3c0a1811c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java @@ -22,7 +22,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRecipeRegistrator { public GT_Block_Stones_Abstract(Class<? extends ItemBlock> aItemClass, String aName) { @@ -100,14 +99,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe return true; } @Override - public boolean renderAsNormalBlock() { - return true; - } - @Override - public boolean isOpaqueCube() { - return true; - } - @Override public IIcon getIcon(int aSide, int aMeta) { if ((aMeta >= 0) && (aMeta < 16)) { return gregtech.api.enums.Textures.BlockIcons.GRANITES[aMeta].getIcon(); @@ -120,21 +111,12 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe return world.getBlockMetadata(x, y, z) % 8 < 3; } @Override - public int damageDropped(int par1) { - return par1 % 8 == 0 ? par1 + 1 : par1; + public int damageDropped(int metadata) { + return metadata % 8 == 0 ? metadata + 1 : metadata; } @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); - } - @Override - public int quantityDropped(Random par1Random) { - return 1; - } - - @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -144,7 +126,7 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java index 0a05ab300c..7c1fd49db1 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java @@ -18,7 +18,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; -import java.util.Random; public class GT_Block_Storage extends GT_Generic_Block { @@ -69,38 +68,18 @@ public class GT_Block_Storage extends GT_Generic_Block { } @Override - public boolean renderAsNormalBlock() { - return true; - } - - @Override - public boolean isOpaqueCube() { - return true; - } - - @Override public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { return true; } @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - public int getDamageValue(World par1World, int par2, int par3, int par4) { - return par1World.getBlockMetadata(par2, par3, par4); - } - - @Override - public int quantityDropped(Random par1Random) { - return 1; + public int damageDropped(int metadata) { + return metadata; } @Override - public Item getItemDropped(int par1, Random par2Random, int par3) { - return Item.getItemFromBlock(this); + public int getDamageValue(World aWorld, int aX, int aY, int aZ) { + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -110,7 +89,7 @@ public class GT_Block_Storage extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { for (int i = 0; i < 16; i++) { if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java index 98b0c24c61..f61f8360fa 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java @@ -10,7 +10,7 @@ import net.minecraft.util.EnumChatFormatting; import java.util.List; public class GT_Item_Casings1 extends GT_Item_Casings_Abstract { - public GT_Item_Casings1(Block par1) { - super(par1); + public GT_Item_Casings1(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java index ed705d0c57..11a3aed3af 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java @@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack; import java.util.List; public class GT_Item_Casings2 extends GT_Item_Casings_Abstract { - public GT_Item_Casings2(Block par1) { - super(par1); + public GT_Item_Casings2(Block block) { + super(block); } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java index b9eac8252a..d80d88d2d1 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings3.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Casings3 extends GT_Item_Casings_Abstract { - public GT_Item_Casings3(Block par1) { - super(par1); + public GT_Item_Casings3(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java index 10b39e3ea8..7848398a0b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Casings4 extends GT_Item_Casings_Abstract { - public GT_Item_Casings4(Block par1) { - super(par1); + public GT_Item_Casings4(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java index c93f8bb38c..a0890ce154 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack; import java.util.List; public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { - public GT_Item_Casings5(Block par1) { - super(par1); + public GT_Item_Casings5(Block block) { + super(block); } protected static final String mCoilHeatTooltip = GT_LanguageManager.addStringLocalization("gt.coilheattooltip", "Base Heating Capacity = "); @@ -26,4 +26,4 @@ public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { HeatingCoilLevel coilLevel = GT_Block_Casings5.getCoilHeatFromDamage(aStack.getItemDamage()); aList.add(mCoilHeatTooltip + coilLevel.getHeat() + mCoilUnitTooltip); } -}
\ No newline at end of file +} diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java index ebeab2f0aa..f4a8d38ba6 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings6.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Casings6 extends GT_Item_Casings_Abstract { - public GT_Item_Casings6(Block par1) { - super(par1); + public GT_Item_Casings6(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java index 19ca06d5ac..0d87b5d906 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings8.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Casings8 extends GT_Item_Casings_Abstract { - public GT_Item_Casings8(Block par1) { - super(par1); + public GT_Item_Casings8(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java index 6a4b6e0695..33b428772d 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java @@ -23,8 +23,8 @@ public abstract class GT_Item_Casings_Abstract extends ItemBlock { protected final String mCoil09Tooltip = GT_LanguageManager.addStringLocalization("gt.coil09tooltip", "Base Heating Capacity = 10800 Kelvin"); protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof"); - public GT_Item_Casings_Abstract(Block par1) { - super(par1); + public GT_Item_Casings_Abstract(Block block) { + super(block ); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java index bf8957afb4..1417aa4c39 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java @@ -10,8 +10,8 @@ import java.util.List; public class GT_Item_Concretes extends GT_Item_Stones_Abstract { private final String mRunFasterToolTip = GT_LanguageManager.addStringLocalization("gt.runfastertooltip", "You can walk faster on this Block"); - public GT_Item_Concretes(Block par1) { - super(par1); + public GT_Item_Concretes(Block block) { + super(block); } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java b/src/main/java/gregtech/common/blocks/GT_Item_Granites.java index d14474c17f..e0df50d07b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Granites.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Granites.java @@ -3,7 +3,7 @@ package gregtech.common.blocks; import net.minecraft.block.Block; public class GT_Item_Granites extends GT_Item_Stones_Abstract { - public GT_Item_Granites(Block par1) { - super(par1); + public GT_Item_Granites(Block block) { + super(block); } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java index e376933623..c63f10b8f4 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java @@ -13,13 +13,13 @@ public class GT_Item_LongDistancePipe extends ItemBlock { protected final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); protected final String mNoTileEntityToolTip = GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); - public GT_Item_LongDistancePipe(Block par1) { - super(par1); + public GT_Item_LongDistancePipe(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); } - + @Override public int getMetadata(int aMeta) { return aMeta; diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index 18b1d073e5..2a108aca71 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -40,8 +40,8 @@ import java.util.List; import static gregtech.GT_Mod.GT_FML_LOGGER; public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { - public GT_Item_Machines(Block par1) { - super(par1); + public GT_Item_Machines(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH); @@ -59,7 +59,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { @Override @SuppressWarnings("unchecked") - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean par4) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { try { final int tDamage = getDamage(aStack); if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) { diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java index ab31233abc..63c3babfbb 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class GT_Item_Ores extends ItemBlock { - public GT_Item_Ores(Block par1) { - super(par1); + public GT_Item_Ores(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java index 5170b1cbeb..b75743e110 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java @@ -12,8 +12,8 @@ import java.util.List; public class GT_Item_Stones_Abstract extends ItemBlock { private final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - public GT_Item_Stones_Abstract(Block par1) { - super(par1); + public GT_Item_Stones_Abstract(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java index 3696cd4fc2..10cc3ea1ac 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java @@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack; import java.util.List; public class GT_Item_Storage extends ItemBlock { - public GT_Item_Storage(Block par1) { - super(par1); + public GT_Item_Storage(Block block) { + super(block); setMaxDamage(0); setHasSubtypes(true); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java index 0bed5423dd..bd3003f39f 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java @@ -20,7 +20,7 @@ public class GT_Cover_Crafting extends GT_CoverBehavior { ((EntityPlayerMP) aPlayer).playerNetServerHandler.sendPacket(new S2DPacketOpenWindow(((EntityPlayerMP) aPlayer).currentWindowId, 1, "Crafting", 9, true)); ((EntityPlayerMP) aPlayer).openContainer = new ContainerWorkbench(((EntityPlayerMP) aPlayer).inventory, ((EntityPlayerMP) aPlayer).worldObj, aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord()) { @Override - public boolean canInteractWith(EntityPlayer par1EntityPlayer) { + public boolean canInteractWith(EntityPlayer player) { return true; } }; diff --git a/src/main/java/gregtech/common/gui/GT_Container_Boiler.java b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java index afceed249b..d534c2e8ba 100644 --- a/src/main/java/gregtech/common/gui/GT_Container_Boiler.java +++ b/src/main/java/gregtech/common/gui/GT_Container_Boiler.java @@ -57,30 +57,30 @@ public class GT_Container_Boiler extends GT_ContainerMetaTile_Machine { this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000)); for (Object crafter : this.crafters) { - ICrafting var1 = (ICrafting) crafter; - var1.sendProgressBarUpdate(this, 100, this.mTemperature); - var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy); - var1.sendProgressBarUpdate(this, 102, this.mSteamAmount); - var1.sendProgressBarUpdate(this, 103, this.mWaterAmount); + ICrafting player = (ICrafting) crafter; + player.sendProgressBarUpdate(this, 100, this.mTemperature); + player.sendProgressBarUpdate(this, 101, this.mProcessingEnergy); + player.sendProgressBarUpdate(this, 102, this.mSteamAmount); + player.sendProgressBarUpdate(this, 103, this.mWaterAmount); } } @Override @SideOnly(Side.CLIENT) - public void updateProgressBar(int par1, int par2) { - super.updateProgressBar(par1, par2); - switch (par1) { + public void updateProgressBar(int id, int value) { + super.updateProgressBar(id, value); + switch (id) { case 100: - this.mTemperature = par2; + this.mTemperature = value; break; case 101: - this.mProcessingEnergy = par2; + this.mProcessingEnergy = value; break; case 102: - this.mSteamAmount = par2; + this.mSteamAmount = value; break; case 103: - this.mWaterAmount = par2; + this.mWaterAmount = value; } } } diff --git a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java index 96e918e27b..4e88c8088e 100644 --- a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java @@ -119,50 +119,50 @@ public class GT_Container_MicrowaveEnergyTransmitter extends GT_ContainerMetaTil this.mEgg = (((GT_MetaTileEntity_MicrowaveEnergyTransmitter) this.mTileEntity.getMetaTileEntity()).hasDimensionalTeleportCapability() ? 1 : 0); for (Object crafter : this.crafters) { - ICrafting var1 = (ICrafting) crafter; - var1.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF); - var1.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16); - var1.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF); - var1.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16); - var1.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF); - var1.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16); - var1.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF); - var1.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16); - var1.sendProgressBarUpdate(this, 108, this.mEgg); + ICrafting aPlayer = (ICrafting) crafter; + aPlayer.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF); + aPlayer.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16); + aPlayer.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF); + aPlayer.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16); + aPlayer.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF); + aPlayer.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16); + aPlayer.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF); + aPlayer.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16); + aPlayer.sendProgressBarUpdate(this, 108, this.mEgg); } } @Override @SideOnly(Side.CLIENT) - public void updateProgressBar(int par1, int par2) { - super.updateProgressBar(par1, par2); - switch (par1) { + public void updateProgressBar(int id, int value) { + super.updateProgressBar(id, value); + switch (id) { case 100: - this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF); + this.mTargetX = (this.mTargetX & 0xFFFF0000 | value & 0xFFFF); break; case 101: - this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16); + this.mTargetX = (this.mTargetX & 0xFFFF | value << 16); break; case 102: - this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF); + this.mTargetY = (this.mTargetY & 0xFFFF0000 | value & 0xFFFF); break; case 103: - this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16); + this.mTargetY = (this.mTargetY & 0xFFFF | value << 16); break; case 104: - this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF); + this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | value & 0xFFFF); break; case 105: - this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16); + this.mTargetZ = (this.mTargetZ & 0xFFFF | value << 16); break; case 106: - this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF); + this.mTargetD = (this.mTargetD & 0xFFFF0000 | value & 0xFFFF); break; case 107: - this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16); + this.mTargetD = (this.mTargetD & 0xFFFF | value << 16); break; case 108: - this.mEgg = par2; + this.mEgg = value; } } } diff --git a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java index 22098a0350..731db03613 100644 --- a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java +++ b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java @@ -41,22 +41,22 @@ public class GT_Container_QuantumChest extends GT_ContainerMetaTile_Machine { } for (Object crafter : this.crafters) { - ICrafting var1 = (ICrafting) crafter; - var1.sendProgressBarUpdate(this, 100, mContent & 65535); - var1.sendProgressBarUpdate(this, 101, mContent >>> 16); + ICrafting aPlayer = (ICrafting) crafter; + aPlayer.sendProgressBarUpdate(this, 100, mContent & 65535); + aPlayer.sendProgressBarUpdate(this, 101, mContent >>> 16); } } @Override @SideOnly(Side.CLIENT) - public void updateProgressBar(int par1, int par2) { - super.updateProgressBar(par1, par2); - switch (par1) { + public void updateProgressBar(int id, int value) { + super.updateProgressBar(id, value); + switch (id) { case 100: - mContent = mContent & 0xffff0000 | par2 & 0x0000ffff; + mContent = mContent & 0xffff0000 | value & 0x0000ffff; break; case 101: - mContent = mContent & 0x0000ffff | par2 << 16; + mContent = mContent & 0x0000ffff | value << 16; break; } } diff --git a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java index 909e1a04a5..c6a7bdbdec 100644 --- a/src/main/java/gregtech/common/gui/GT_Container_Regulator.java +++ b/src/main/java/gregtech/common/gui/GT_Container_Regulator.java @@ -116,44 +116,44 @@ public class GT_Container_Regulator extends GT_ContainerMetaTile_Machine { this.mTargetSlots[i] = ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[i]; } for (Object crafter : this.crafters) { - ICrafting var1 = (ICrafting) crafter; + ICrafting player = (ICrafting) crafter; for (int i = 0; i < 9; i++) { - var1.sendProgressBarUpdate(this, 100 + i, this.mTargetSlots[i]); + player.sendProgressBarUpdate(this, 100 + i, this.mTargetSlots[i]); } } } @Override @SideOnly(Side.CLIENT) - public void updateProgressBar(int par1, int par2) { - super.updateProgressBar(par1, par2); - switch (par1) { + public void updateProgressBar(int id, int value) { + super.updateProgressBar(id, value); + switch (id) { case 100: - this.mTargetSlots[0] = par2; + this.mTargetSlots[0] = value; break; case 101: - this.mTargetSlots[1] = par2; + this.mTargetSlots[1] = value; break; case 102: - this.mTargetSlots[2] = par2; + this.mTargetSlots[2] = value; break; case 103: - this.mTargetSlots[3] = par2; + this.mTargetSlots[3] = value; break; case 104: - this.mTargetSlots[4] = par2; + this.mTargetSlots[4] = value; break; case 105: - this.mTargetSlots[5] = par2; + this.mTargetSlots[5] = value; break; case 106: - this.mTargetSlots[6] = par2; + this.mTargetSlots[6] = value; break; case 107: - this.mTargetSlots[7] = par2; + this.mTargetSlots[7] = value; break; case 108: - this.mTargetSlots[8] = par2; + this.mTargetSlots[8] = value; } } diff --git a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java index 2b1bc3b584..d5013d9504 100644 --- a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java +++ b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java @@ -120,52 +120,52 @@ public class GT_Container_Teleporter extends GT_ContainerMetaTile_Machine { this.mTargetD = ((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).mTargetD; this.mEgg = (((GT_MetaTileEntity_Teleporter) this.mTileEntity.getMetaTileEntity()).hasDimensionalTeleportCapability() ? 1 : 0); - Iterator var2 = this.crafters.iterator(); - while (var2.hasNext()) { - ICrafting var1 = (ICrafting) var2.next(); - var1.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF); - var1.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16); - var1.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF); - var1.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16); - var1.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF); - var1.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16); - var1.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF); - var1.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16); - var1.sendProgressBarUpdate(this, 108, this.mEgg); + Iterator playerIterator = this.crafters.iterator(); + while (playerIterator.hasNext()) { + ICrafting player = (ICrafting) playerIterator.next(); + player.sendProgressBarUpdate(this, 100, this.mTargetX & 0xFFFF); + player.sendProgressBarUpdate(this, 101, this.mTargetX >>> 16); + player.sendProgressBarUpdate(this, 102, this.mTargetY & 0xFFFF); + player.sendProgressBarUpdate(this, 103, this.mTargetY >>> 16); + player.sendProgressBarUpdate(this, 104, this.mTargetZ & 0xFFFF); + player.sendProgressBarUpdate(this, 105, this.mTargetZ >>> 16); + player.sendProgressBarUpdate(this, 106, this.mTargetD & 0xFFFF); + player.sendProgressBarUpdate(this, 107, this.mTargetD >>> 16); + player.sendProgressBarUpdate(this, 108, this.mEgg); } } @Override @SideOnly(Side.CLIENT) - public void updateProgressBar(int par1, int par2) { - super.updateProgressBar(par1, par2); - switch (par1) { + public void updateProgressBar(int id, int value) { + super.updateProgressBar(id, value); + switch (id) { case 100: - this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF); + this.mTargetX = (this.mTargetX & 0xFFFF0000 | value & 0xFFFF); break; case 101: - this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16); + this.mTargetX = (this.mTargetX & 0xFFFF | value << 16); break; case 102: - this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF); + this.mTargetY = (this.mTargetY & 0xFFFF0000 | value & 0xFFFF); break; case 103: - this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16); + this.mTargetY = (this.mTargetY & 0xFFFF | value << 16); break; case 104: - this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF); + this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | value & 0xFFFF); break; case 105: - this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16); + this.mTargetZ = (this.mTargetZ & 0xFFFF | value << 16); break; case 106: - this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF); + this.mTargetD = (this.mTargetD & 0xFFFF0000 | value & 0xFFFF); break; case 107: - this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16); + this.mTargetD = (this.mTargetD & 0xFFFF | value << 16); break; case 108: - this.mEgg = par2; + this.mEgg = value; } } } diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java index 4af4826f93..879c803702 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java @@ -10,13 +10,13 @@ public class GT_GUIContainer_Boiler extends GT_GUIContainerMetaTile_Machine { } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString("Boiler", 8, 4, 4210752); } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java index a43de53e2f..d60977104e 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java @@ -10,13 +10,13 @@ public class GT_GUIContainer_BronzeBlastFurnace extends GT_GUIContainerMetaTile_ } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString("Bronze Blast Furnace", 8, 4, 4210752); } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java index 149f120771..2f993140ac 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_ChestBuffer.java @@ -10,8 +10,8 @@ public class GT_GUIContainer_ChestBuffer extends GT_GUIContainerMetaTile_Machine } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java index 20a8f59894..2ad3ea3018 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Filter.java @@ -10,8 +10,8 @@ public class GT_GUIContainer_Filter extends GT_GUIContainerMetaTile_Machine { } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java index 9d597c7f30..d6fd5da3ce 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java @@ -23,15 +23,15 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(mName, 8, -10, 16448255); if (mContainer != null) { - if ((((GT_Container_MultiMachine) mContainer).mDisplayErrorCode & 64) != 0) + if ((mContainer.mDisplayErrorCode & 64) != 0) fontRendererObj.drawString("Incomplete Structure.", 10, 8, 16448255); - if (((GT_Container_MultiMachine) mContainer).mDisplayErrorCode == 0) { - if (((GT_Container_MultiMachine) mContainer).mActive == 0) { + if (mContainer.mDisplayErrorCode == 0) { + if (mContainer.mActive == 0) { fontRendererObj.drawString("Hit with Soft Mallet to (re-)start the Machine if it doesn't start.", -70, 170, 16448255); } else { fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255); @@ -49,8 +49,8 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (width - xSize) / 2; int y = (height - ySize) / 2; drawTexturedModalRect(x, y, 0, 0, xSize, ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java index ca94379c5a..d4a2484a88 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_ItemDistributor.java @@ -10,8 +10,8 @@ public class GT_GUIContainer_ItemDistributor extends GT_GUIContainerMetaTile_Mac } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java index db27fb8016..6d580bad11 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java @@ -13,7 +13,7 @@ public class GT_GUIContainer_MicrowaveEnergyTransmitter extends GT_GUIContainerM } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString("Teleporter", 46, 8, 16448255); if (this.mContainer != null) { this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetX), 46, 16, 16448255); @@ -27,8 +27,8 @@ public class GT_GUIContainer_MicrowaveEnergyTransmitter extends GT_GUIContainerM } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java index 0ee4b0fd9f..5e009ef428 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java @@ -31,7 +31,7 @@ public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); fontRendererObj.drawString(mName, 8, 6, 4210752); if (mContainer != null) { @@ -45,8 +45,8 @@ public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (width - xSize) / 2; int y = (height - ySize) / 2; drawTexturedModalRect(x, y, 0, 0, xSize, ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java index 08ee0d125c..1a709c8129 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java @@ -17,23 +17,23 @@ public class GT_GUIContainer_PrimitiveBlastFurnace extends GT_GUIContainerMetaTi GT_GuiIcon.TAB_NORMAL_BRICK, GT_GuiIcon.TAB_HIGHLIGHT_BRICK, GT_GuiIcon.TAB_DISABLED_BRICK); - + public GT_GUIContainer_PrimitiveBlastFurnace(InventoryPlayer inventoryPlayer, IGregTechTileEntity tileEntity, String name, String aNEI) { - super(new GT_Container_PrimitiveBlastFurnace(inventoryPlayer, tileEntity), + super(new GT_Container_PrimitiveBlastFurnace(inventoryPlayer, tileEntity), String.format("gregtech:textures/gui/%s.png", name.replace(" ", ""))); this.name = name; this.mNEI = aNEI; } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString(name, 8, 4, 4210752); } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java index 9f557d43af..e4a98ac14b 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java @@ -18,7 +18,7 @@ public class GT_GUIContainer_QuantumChest extends GT_GUIContainerMetaTile_Machin } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752); fontRendererObj.drawString(mName, 8, 6, 4210752); if (mContainer != null) { @@ -28,8 +28,8 @@ public class GT_GUIContainer_QuantumChest extends GT_GUIContainerMetaTile_Machin } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (width - xSize) / 2; int y = (height - ySize) / 2; drawTexturedModalRect(x, y, 0, 0, xSize, ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java index 9a237a517f..06b1ddb00e 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java @@ -10,7 +10,7 @@ public class GT_GUIContainer_Regulator extends GT_GUIContainerMetaTile_Machine { } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[0]), 120, 9, 16448255); this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[1]), 137, 9, 16448255); this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[2]), 155, 9, 16448255); @@ -23,8 +23,8 @@ public class GT_GUIContainer_Regulator extends GT_GUIContainerMetaTile_Machine { } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java index f4cb165cf9..e7b7730d75 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_SuperBuffer.java @@ -10,8 +10,8 @@ public class GT_GUIContainer_SuperBuffer extends GT_GUIContainerMetaTile_Machine } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java index 8c02897738..786cb6b5b3 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java @@ -13,7 +13,7 @@ public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine } @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) { + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { this.fontRendererObj.drawString("Teleporter", 46, 8, 16448255); if (this.mContainer != null) { this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetX), 46, 16, 16448255); @@ -27,8 +27,8 @@ public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine } @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - super.drawGuiContainerBackgroundLayer(par1, par2, par3); + protected void drawGuiContainerBackgroundLayer(float parTicks, int mouseX, int mouseY) { + super.drawGuiContainerBackgroundLayer(parTicks, mouseX, mouseY); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java index 55e10bd62e..a2879844aa 100644 --- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java @@ -65,8 +65,8 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { } @Override - public IIcon getIconFromDamage(int aMeta) { - return Stream.of(FluidRegistry.getFluid(aMeta), FluidRegistry.WATER) + public IIcon getIconFromDamage(int aMetaData) { + return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER) .filter(Objects::nonNull) .map(Fluid::getStillIcon) .filter(Objects::nonNull) diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index b68a6974e4..052e5ed1b6 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -125,7 +125,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo @Override @SideOnly(Side.CLIENT) - public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { + public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { aList.add(new ItemStack(this, 1, 0)); } @@ -151,8 +151,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo } @Override - public IIcon getIconFromDamage(int damage) { - byte circuitMode = ((byte) (damage & 0xFF)); // Mask out the MSB Comparison Mode Bits. See: getModeString + public IIcon getIconFromDamage(int aMetaData) { + byte circuitMode = ((byte) (aMetaData & 0xFF)); // Mask out the MSB Comparison Mode Bits. See: getModeString return mIconDamage[circuitMode < mIconDamage.length ? circuitMode : 0]; } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java index b78d4e567b..34f01c7165 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java @@ -300,7 +300,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { Arrays.stream(FluidCell.values()) .map(FluidCell::get) .filter(Objects::nonNull) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java index 1c27310d99..820c28fea3 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java @@ -161,7 +161,7 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { enabled.stream() .mapToObj(i -> new ItemStack(this, 1, i)) .forEach(aList::add); diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java index ddc523239a..b2f73d304f 100644 --- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java +++ b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java @@ -94,6 +94,6 @@ public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item var1, CreativeTabs aTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aOutputSubItems) { } } diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 4599382063..a6030b0cd8 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -73,9 +73,9 @@ public class ItemComb extends Item { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("forestry:beeCombs.0"); - this.secondIcon = par1IconRegister.registerIcon("forestry:beeCombs.1"); + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("forestry:beeCombs.0"); + this.secondIcon = iconRegister.registerIcon("forestry:beeCombs.1"); } @Override diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index d9b5db5bc7..b48072dbd1 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -65,9 +65,9 @@ public class ItemDrop extends Item { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("forestry:honeyDrop.0"); - this.secondIcon = par1IconRegister.registerIcon("forestry:honeyDrop.1"); + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("forestry:honeyDrop.0"); + this.secondIcon = iconRegister.registerIcon("forestry:honeyDrop.1"); } @Override diff --git a/src/main/java/gregtech/common/items/ItemPollen.java b/src/main/java/gregtech/common/items/ItemPollen.java index eaef49e02a..bc41b1c83d 100644 --- a/src/main/java/gregtech/common/items/ItemPollen.java +++ b/src/main/java/gregtech/common/items/ItemPollen.java @@ -57,9 +57,9 @@ public class ItemPollen extends Item { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("forestry:pollen.0"); - this.secondIcon = par1IconRegister.registerIcon("forestry:pollen.1"); + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("forestry:pollen.0"); + this.secondIcon = iconRegister.registerIcon("forestry:pollen.1"); } @Override diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index b6fe8b242e..729958a72e 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -54,8 +54,8 @@ public class ItemPropolis extends Item { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon("forestry:propolis.0"); + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon("forestry:propolis.0"); } @Override |