diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaPipeEntity_Bronze.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaPipeEntity_Bronze.java index 22b78a4..59fd2d5 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaPipeEntity_Bronze.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaPipeEntity_Bronze.java @@ -33,4 +33,16 @@ public class GT_MetaPipeEntity_Bronze extends GT_MetaPipeEntity_Fluid { public int getFluidCapacityPerTick() { return 120; } + + @Override + public String getInvName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void markDirty() { + // TODO Auto-generated method stub + + } } \ No newline at end of file diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Barrel.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Barrel.java index d805ca0..93773e6 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Barrel.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Barrel.java @@ -5,6 +5,7 @@ import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; +import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,7 +15,9 @@ import net.minecraft.tileentity.TileEntity; public class GT_MetaTileEntity_Barrel extends MetaTileEntity { - public int mItemCount = 0, mItemID = 0, mItemMeta = 0; + public int mItemCount = 0, mItemMeta = 0; + + public ItemStack mItemID = null; public boolean isDigitalChest; @@ -47,9 +50,9 @@ public class GT_MetaTileEntity_Barrel extends MetaTileEntity { ItemStack tPlayerItem = aPlayer.inventory.getCurrentItem(); if (tPlayerItem == null) { - if (mItemID > 0) { + if (mItemID != null) { for (int i = 0; mItemCount < getMaxItemCount() && i < aPlayer.inventory.getSizeInventory(); i++) { - if (aPlayer.inventory.getStackInSlot(i) != null && aPlayer.inventory.getStackInSlot(i).itemID == mItemID && aPlayer.inventory.getStackInSlot(i).getItemDamage() == mItemMeta && !aPlayer.inventory.getStackInSlot(i).hasTagCompound()) { + if (aPlayer.inventory.getStackInSlot(i) != null && aPlayer.inventory.getStackInSlot(i) == mItemID && aPlayer.inventory.getStackInSlot(i).getItemDamage() == mItemMeta && !aPlayer.inventory.getStackInSlot(i).hasTagCompound()) { mItemCount += aPlayer.inventory.getStackInSlot(i).stackSize; if (aPlayer.inventory.getStackInSlot(i).stackSize == 111) { mItemCount = getMaxItemCount() + 192 - (mItemCount + (mInventory[0]==null?0:mInventory[0].stackSize)+(mInventory[1]==null?0:mInventory[1].stackSize)+(mInventory[2]==null?0:mInventory[2].stackSize)); diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_BlastFurnace.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_BlastFurnace.java index afdc610..d1f04a6 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_BlastFurnace.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_BlastFurnace.java @@ -6,10 +6,12 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; public class GT_MetaTileEntity_BlastFurnace extends MetaTileEntity { @@ -121,9 +123,9 @@ public class GT_MetaTileEntity_BlastFurnace extends MetaTileEntity { int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetX*2, yDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetY*2, zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetZ*2; mHeatCapacity = mHeatingCoilTier * 500; for (int i = -1; i < 2; i++) for (int j = 0; j < 4; j++) for (int k = -1; k < 2; k++) { - int tBlockID = getBaseMetaTileEntity().getBlockIDOffset(-xDir+i, -yDir+j, -zDir+k); + Block tBlockID = getBaseMetaTileEntity().getBlockOffset(-xDir+i, -yDir+j, -zDir+k); if (i!=0||(j!=1&&j!=2)||k!=0) { - if (tBlockID != GregTech_API.sBlockList[0].blockID) return false; + if (tBlockID != GregTech_API.sBlockList[0]) return false; int tMeta = getBaseMetaTileEntity().getMetaIDOffset(-xDir+i, -yDir+j, -zDir+k); if (tMeta == 13) mHeatCapacity += 30; @@ -133,7 +135,7 @@ public class GT_MetaTileEntity_BlastFurnace extends MetaTileEntity { mHeatCapacity += 70; else return false; } else { - if (tBlockID == 10 || tBlockID == 11) { + if (tBlockID == Blocks.lava || tBlockID == Blocks.flowing_lava) { mHeatCapacity += 250; } else if (!getBaseMetaTileEntity().getAirOffset(-xDir+i, -yDir+j, -zDir+k)) { return false; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_BronzeBlastFurnace.java index 8063564..6c7d67c 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_BronzeBlastFurnace.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_BronzeBlastFurnace.java @@ -5,12 +5,12 @@ import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; public class GT_MetaTileEntity_BronzeBlastFurnace extends MetaTileEntity { @@ -100,9 +100,9 @@ public class GT_MetaTileEntity_BronzeBlastFurnace extends MetaTileEntity { int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetX, zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing()).offsetZ; for (int i = -1; i < 2; i++) for (int j = -1; j < 3; j++) for (int k = -1; k < 2; k++) if (xDir+i != 0 || j != 0 || zDir+k != 0) { if (i!=0||j==-1||k!=0) { - if (getBaseMetaTileEntity().getBlockIDOffset(xDir+i, j, zDir+k) != GregTech_API.sBlockList[4].blockID || getBaseMetaTileEntity().getMetaIDOffset(xDir+i, j, zDir+k) != 13) return false; + if (getBaseMetaTileEntity().getBlockOffset(xDir+i, j, zDir+k) != GregTech_API.sBlockList[4] || getBaseMetaTileEntity().getMetaIDOffset(xDir+i, j, zDir+k) != 13) return false; } else { - if (getBaseMetaTileEntity().getBlockIDOffset(xDir+i, j, zDir+k) != Block.lavaStill.blockID && !getBaseMetaTileEntity().getAirOffset(xDir+i, j, zDir+k)) return false; + if (getBaseMetaTileEntity().getBlockOffset(xDir+i, j, zDir+k) != Blocks.lava && !getBaseMetaTileEntity().getAirOffset(xDir+i, j, zDir+k)) return false; } } return true; @@ -142,11 +142,11 @@ public class GT_MetaTileEntity_BronzeBlastFurnace extends MetaTileEntity { getBaseMetaTileEntity().setActive(mMaxProgresstime > 0 && mMachine); if (getBaseMetaTileEntity().isActive()) { - if (getBaseMetaTileEntity().getAir(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord() , getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1))) getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord() , getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1), Block.lavaStill.blockID, 1, 2); - if (getBaseMetaTileEntity().getAir(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord()+1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1))) getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord()+1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1), Block.lavaStill.blockID, 1, 2); + if (getBaseMetaTileEntity().getAir(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord() , getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1))) getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord() , getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1), Blocks.lava, 1, 2); + if (getBaseMetaTileEntity().getAir(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord()+1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1))) getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord()+1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1), Blocks.lava, 1, 2); } else { - if (getBaseMetaTileEntity().getBlockID(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord() , getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1)) == Block.lavaStill.blockID) getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord() , getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1), 0, 0, 2); - if (getBaseMetaTileEntity().getBlockID(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord()+1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1)) == Block.lavaStill.blockID) getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord()+1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1), 0, 0, 2); + if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord() , getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1)) == Blocks.lava) getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord() , getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1), Blocks.air, 0, 2); + if (getBaseMetaTileEntity().getBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord()+1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1)) == Blocks.lava) getBaseMetaTileEntity().getWorld().setBlock(getBaseMetaTileEntity().getOffsetX(getBaseMetaTileEntity().getBackFacing(), 1), getBaseMetaTileEntity().getYCoord()+1, getBaseMetaTileEntity().getOffsetZ(getBaseMetaTileEntity().getBackFacing(), 1), Blocks.air, 0, 2); } } } @@ -177,7 +177,7 @@ public class GT_MetaTileEntity_BronzeBlastFurnace extends MetaTileEntity { if (mInventory[0] != null && mInventory[1] != null && mInventory[0].stackSize >= 1) { if (GT_OreDictUnificator.isItemStackInstanceOf(mInventory[0], "dustIron") || GT_OreDictUnificator.isItemStackInstanceOf(mInventory[0], "ingotIron")) { - if (mInventory[1].getItem() == Item.coal && mInventory[1].stackSize >= 4 && spaceForOutput(mOutputItem1 = GT_OreDictUnificator.get("ingotSteel", 1), mOutputItem2 = GT_OreDictUnificator.get("dustDarkAsh", 4))) { + if (mInventory[1].getItem() == Items.coal && mInventory[1].stackSize >= 4 && spaceForOutput(mOutputItem1 = GT_OreDictUnificator.get("ingotSteel", 1), mOutputItem2 = GT_OreDictUnificator.get("dustDarkAsh", 4))) { getBaseMetaTileEntity().decrStackSize(0, 1); getBaseMetaTileEntity().decrStackSize(1, 4); mMaxProgresstime = 7200; @@ -196,7 +196,7 @@ public class GT_MetaTileEntity_BronzeBlastFurnace extends MetaTileEntity { return true; } } else if (GT_OreDictUnificator.isItemStackInstanceOf(mInventory[0], "dustSteel")) { - if (mInventory[1].getItem() == Item.coal && mInventory[1].stackSize >= 2 && spaceForOutput(mOutputItem1 = GT_OreDictUnificator.get("ingotSteel", 1), mOutputItem2 = GT_OreDictUnificator.get("dustDarkAsh", 2))) { + if (mInventory[1].getItem() == Items.coal && mInventory[1].stackSize >= 2 && spaceForOutput(mOutputItem1 = GT_OreDictUnificator.get("ingotSteel", 1), mOutputItem2 = GT_OreDictUnificator.get("dustDarkAsh", 2))) { getBaseMetaTileEntity().decrStackSize(0, 1); getBaseMetaTileEntity().decrStackSize(1, 2); mMaxProgresstime = 3600; @@ -215,7 +215,7 @@ public class GT_MetaTileEntity_BronzeBlastFurnace extends MetaTileEntity { return true; } } else if (GT_OreDictUnificator.isItemStackInstanceOf(mInventory[0], "blockIron")) { - if (mInventory[1].getItem() == Item.coal && mInventory[1].stackSize >= 36 && spaceForOutput(mOutputItem1 = GT_OreDictUnificator.get("ingotSteel", 9), mOutputItem2 = GT_OreDictUnificator.get("dustDarkAsh", 36))) { + if (mInventory[1].getItem() == Items.coal && mInventory[1].stackSize >= 36 && spaceForOutput(mOutputItem1 = GT_OreDictUnificator.get("ingotSteel", 9), mOutputItem2 = GT_OreDictUnificator.get("dustDarkAsh", 36))) { getBaseMetaTileEntity().decrStackSize(0, 1); getBaseMetaTileEntity().decrStackSize(1, 36); mMaxProgresstime = 64800; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Centrifuge.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Centrifuge.java index f26a014..244b34d 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Centrifuge.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Centrifuge.java @@ -8,6 +8,7 @@ import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -205,7 +206,7 @@ public class GT_MetaTileEntity_Centrifuge extends GT_MetaTileEntity_BasicTank { } } if (mFluid != null) { - ItemStack tStack = GT_Utility.fillFluidContainer(mFluid, new ItemStack(Item.bucketEmpty, 1)); + ItemStack tStack = GT_Utility.fillFluidContainer(mFluid, new ItemStack(Items.bucket, 1)); FluidStack tFluid = GT_Utility.getFluidForFilledItem(tStack); if (tStack != null && tFluid != null) { tStack.stackSize = mFluid.amount / tFluid.amount; @@ -221,7 +222,7 @@ public class GT_MetaTileEntity_Centrifuge extends GT_MetaTileEntity_BasicTank { mOutputItem1 = GT_Utility.copy(tRecipe.mOutput1); mOutputItem2 = GT_Utility.copy(tRecipe.mOutput2); mOutputItem3 = GT_Utility.copy(tRecipe.mOutput3); - if (!GT_Utility.areStacksEqual(tRecipe.mOutput4, new ItemStack(Item.bucketEmpty, 1))) mOutputItem4 = GT_Utility.copy(tRecipe.mOutput4); + if (!GT_Utility.areStacksEqual(tRecipe.mOutput4, new ItemStack(Items.bucket, 1))) mOutputItem4 = GT_Utility.copy(tRecipe.mOutput4); return true; } } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ChargerBox.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ChargerBox.java index 16a4178..af73b71 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ChargerBox.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ChargerBox.java @@ -125,7 +125,7 @@ public class GT_MetaTileEntity_ChargerBox extends MetaTileEntity { @Override public boolean allowPullStack(int aIndex, byte aSide, ItemStack aStack) { - return !GT_ModHandler.isElectricItem(mInventory[aIndex]) || (getBaseMetaTileEntity().isAllowedToWork() && (getBaseMetaTileEntity().getStoredEU() < getBaseMetaTileEntity().getEUCapacity() / 3 ? !GT_ModHandler.canUseElectricItem(mInventory[aIndex], 1) : GT_ModHandler.canUseElectricItem(mInventory[aIndex], GT_ModHandler.getMaxElectricCharge(mInventory[aIndex])))); + return !GT_ModHandler.isElectricItem(mInventory[aIndex]) || (getBaseMetaTileEntity().isAllowedToWork() && (getBaseMetaTileEntity().getStoredEU() < getBaseMetaTileEntity().getEUCapacity() / 3 ? !GT_ModHandler.canUseElectricItem(mInventory[aIndex], 1) : GT_ModHandler.canUseElectricItem(mInventory[aIndex], (int)GT_ModHandler.getMaxElectricCharge(mInventory[aIndex])))); } @Override diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DieselGenerator.java index ca94fee..5edb4fe 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DieselGenerator.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DieselGenerator.java @@ -6,8 +6,8 @@ import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicTan import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -52,7 +52,7 @@ public class GT_MetaTileEntity_DieselGenerator extends GT_MetaTileEntity_BasicTa mInventory[2] = null; else if (mInventory[2] == null) - mInventory[2] = new ItemStack(Block.fire, 1); + mInventory[2] = new ItemStack(Blocks.fire, 1); } else { if (getFuelValue(mFluid) > 0) while (getBaseMetaTileEntity().getUniversalEnergyStored() < (getBaseMetaTileEntity().getOutputVoltage() * 10 + getMinimumStoredEU()) && mFluid.amount > 0) { if (getBaseMetaTileEntity().increaseStoredEnergyUnits(getFuelValue(mFluid), true)) mFluid.amount--; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DistillationTower.java index 62ee708..95c1de6 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DistillationTower.java @@ -6,10 +6,11 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; public class GT_MetaTileEntity_DistillationTower extends MetaTileEntity { @@ -104,9 +105,9 @@ public class GT_MetaTileEntity_DistillationTower extends MetaTileEntity { private boolean checkMachine() { int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetX*2, yDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetY*2, zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetZ*2; for (int i = -1; i < 2; i++) for (int j = 0; j < 5; j++) for (int k = -1; k < 2; k++) { - int tBlockID = getBaseMetaTileEntity().getBlockIDOffset(-xDir+i, -yDir+j, -zDir+k); + Block tBlockID = getBaseMetaTileEntity().getBlockOffset(-xDir+i, -yDir+j, -zDir+k); if (i!=0||k!=0||j==0||j==4) { - if (tBlockID != GregTech_API.sBlockList[0].blockID) return false; + if (tBlockID != GregTech_API.sBlockList[0]) return false; int tMeta = getBaseMetaTileEntity().getMetaIDOffset(-xDir+i, -yDir+j, -zDir+k); if (j%2==0) { if (tMeta != 13) return false; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DragonEggEnergySiphon.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DragonEggEnergySiphon.java index 601bf8f..836c7fb 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DragonEggEnergySiphon.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_DragonEggEnergySiphon.java @@ -6,6 +6,7 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_Config; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import thaumcraft.api.EnumTag; @@ -157,7 +158,7 @@ public class GT_MetaTileEntity_DragonEggEnergySiphon extends MetaTileEntity { } public boolean hasEgg() { - return Block.dragonEgg.blockID == getBaseMetaTileEntity().getBlockIDOffset(0, 1, 0); + return Blocks.dragon_egg == getBaseMetaTileEntity().getBlockOffset(0, 1, 0); } @Override diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ElectricRegulatorAdvanced.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ElectricRegulatorAdvanced.java index 24da809..134673e 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ElectricRegulatorAdvanced.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ElectricRegulatorAdvanced.java @@ -72,6 +72,7 @@ public class GT_MetaTileEntity_ElectricRegulatorAdvanced extends GT_MetaTileEnti mTargetSlots[8] = aNBT.getInteger("mTargetSlot9"); } + @SuppressWarnings("unused") public void onPostTick() { if (getBaseMetaTileEntity().isAllowedToWork() && getBaseMetaTileEntity().isServerSide() && getBaseMetaTileEntity().getUniversalEnergyStored() >= 500 && (getBaseMetaTileEntity().hasWorkJustBeenEnabled() || getBaseMetaTileEntity().getTimer()%10 == 0)) { TileEntity tTileEntity1, tTileEntity2; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Electrolyzer.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Electrolyzer.java index f531f86..e7e860a 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Electrolyzer.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Electrolyzer.java @@ -8,7 +8,7 @@ import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; @@ -196,7 +196,7 @@ public class GT_MetaTileEntity_Electrolyzer extends GT_MetaTileEntity_BasicTank } } if (mFluid != null) { - ItemStack tStack = GT_Utility.fillFluidContainer(mFluid, new ItemStack(Item.bucketEmpty, 1)); + ItemStack tStack = GT_Utility.fillFluidContainer(mFluid, new ItemStack(Items.bucket, 1)); FluidStack tFluid = GT_Utility.getFluidForFilledItem(tStack); if (tStack != null && tFluid != null) { tStack.stackSize = mFluid.amount / tFluid.amount; @@ -212,7 +212,7 @@ public class GT_MetaTileEntity_Electrolyzer extends GT_MetaTileEntity_BasicTank mOutputItem1 = GT_Utility.copy(tRecipe.mOutput1); mOutputItem2 = GT_Utility.copy(tRecipe.mOutput2); mOutputItem3 = GT_Utility.copy(tRecipe.mOutput3); - if (!GT_Utility.areStacksEqual(tRecipe.mOutput4, new ItemStack(Item.bucketEmpty, 1))) mOutputItem4 = GT_Utility.copy(tRecipe.mOutput4); + if (!GT_Utility.areStacksEqual(tRecipe.mOutput4, new ItemStack(Items.bucket, 1))) mOutputItem4 = GT_Utility.copy(tRecipe.mOutput4); return true; } } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_FusionComputer.java index 2194abe..3ef5b63 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_FusionComputer.java @@ -12,7 +12,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity { @@ -521,11 +521,11 @@ public class GT_MetaTileEntity_FusionComputer extends MetaTileEntity { } private boolean isAdvancedMachineCasing(int aX, int aY, int aZ) { - return getBaseMetaTileEntity().getBlockID(aX, aY, aZ) == GregTech_API.sBlockList[0].blockID && getBaseMetaTileEntity().getMetaID(aX, aY, aZ) == 15; + return getBaseMetaTileEntity().getBlock(aX, aY, aZ) == GregTech_API.sBlockList[0] && getBaseMetaTileEntity().getMetaID(aX, aY, aZ) == 15; } private boolean isFusionCoil(int aX, int aY, int aZ) { - return getBaseMetaTileEntity().getBlockID(aX, aY, aZ) == GregTech_API.sBlockList[0].blockID && getBaseMetaTileEntity().getMetaID(aX, aY, aZ) == 1; + return getBaseMetaTileEntity().getBlock(aX, aY, aZ) == GregTech_API.sBlockList[0] && getBaseMetaTileEntity().getMetaID(aX, aY, aZ) == 1; } private boolean isEnergyInjector(int aX, int aY, int aZ) { diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_GasTurbine.java index ad6e4a4..b4fb296 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_GasTurbine.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_GasTurbine.java @@ -5,8 +5,8 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -51,7 +51,7 @@ public class GT_MetaTileEntity_GasTurbine extends GT_MetaTileEntity_BasicTank { mInventory[2] = null; else if (mInventory[2] == null) - mInventory[2] = new ItemStack(Block.fire, 1); + mInventory[2] = new ItemStack(Blocks.fire, 1); } else { if (getFuelValue(mFluid) > 0) while (getBaseMetaTileEntity().getUniversalEnergyStored() < (getBaseMetaTileEntity().getOutputVoltage() * 10 + getMinimumStoredEU()) && mFluid.amount > 0) { if (getBaseMetaTileEntity().increaseStoredEnergyUnits(getFuelValue(mFluid), true)) mFluid.amount--; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Grinder.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Grinder.java index b218639..1e35d68 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Grinder.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Grinder.java @@ -8,10 +8,10 @@ import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; public class GT_MetaTileEntity_Grinder extends GT_MetaTileEntity_BasicTank { @@ -111,10 +111,10 @@ public class GT_MetaTileEntity_Grinder extends GT_MetaTileEntity_BasicTank { int xDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetX*2, yDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetY*2, zDir = ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()).offsetZ*2; for (int i = -1; i < 2; i++) for (int j = -1; j < 2; j++) for (int k = -1; k < 2; k++) { if (i!=0||j!=0||k!=0) { - if (getBaseMetaTileEntity().getBlockIDOffset(-xDir+i, -yDir+j, -zDir+k) != GregTech_API.sBlockList[0].blockID) return false; + if (getBaseMetaTileEntity().getBlockOffset(-xDir+i, -yDir+j, -zDir+k) != GregTech_API.sBlockList[0]) return false; if (getBaseMetaTileEntity().getMetaIDOffset(-xDir+i, -yDir+j, -zDir+k) != (j==0?14:13)) return false; } else { - if (getBaseMetaTileEntity().getBlockIDOffset(-xDir+i, -yDir+j, -zDir+k) != 9) return false; + if (getBaseMetaTileEntity().getBlockOffset(-xDir+i, -yDir+j, -zDir+k) != Blocks.water) return false; } } return true; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ImplosionCompressor.java index 4182944..82c479f 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ImplosionCompressor.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ImplosionCompressor.java @@ -6,8 +6,8 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -86,7 +86,7 @@ public class GT_MetaTileEntity_ImplosionCompressor extends MetaTileEntity { private boolean checkMachine() { for (int i = -1; i < 2; i++) for (int j = -1; j < 2; j++) for (int k = -1; k < 2; k++) { if (i!=0||j!=0||k!=0) { - if (getBaseMetaTileEntity().getBlockIDOffset(i, j-2, k) != GregTech_API.sBlockList[0].blockID) return false; + if (getBaseMetaTileEntity().getBlockOffset(i, j-2, k) != GregTech_API.sBlockList[0]) return false; if (getBaseMetaTileEntity().getMetaIDOffset (i, j-2, k) != (i==0||j==0||k==0?14:13)) return false; } else { if (!getBaseMetaTileEntity().getAirOffset(i, j-2, k)) return false; @@ -173,7 +173,7 @@ public class GT_MetaTileEntity_ImplosionCompressor extends MetaTileEntity { @Override public boolean allowPutStack(int aIndex, byte aSide, ItemStack aStack) { - return GT_Utility.areStacksEqual(aStack, GT_ModHandler.getIC2Item("industrialTnt", 1, new ItemStack(Block.tnt, 1)))?aIndex==1:aIndex==0; + return GT_Utility.areStacksEqual(aStack, GT_ModHandler.getIC2Item("industrialTnt", 1, new ItemStack(Blocks.tnt, 1)))?aIndex==1:aIndex==0; } @Override diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Lightningrod.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Lightningrod.java index 34a2faa..45934d6 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Lightningrod.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Lightningrod.java @@ -3,8 +3,10 @@ package gregtechmod.common.tileentities; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_ModHandler; +import net.minecraft.block.Block; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -54,11 +56,11 @@ public class GT_MetaTileEntity_Lightningrod extends MetaTileEntity { boolean rodvalid = true; for (int i = getBaseMetaTileEntity().getYCoord() + 1; i < getBaseMetaTileEntity().getWorld().getHeight()-1; i++) { - if (rodvalid && getBaseMetaTileEntity().getBlockIDOffset(0, i-getBaseMetaTileEntity().getYCoord(), 0) == GT_ModHandler.getIC2Item("ironFence", 1).itemID) { + if (rodvalid && getBaseMetaTileEntity().getBlockOffset(0, i-getBaseMetaTileEntity().getYCoord(), 0) == Block.getBlockFromItem(GT_ModHandler.getIC2Item("ironFence", 1).getItem())) { rodvalue++; } else { rodvalid = false; - if ( getBaseMetaTileEntity().getBlockIDOffset(0, i-getBaseMetaTileEntity().getYCoord(), 0) != 0) { + if ( getBaseMetaTileEntity().getBlockOffset(0, i-getBaseMetaTileEntity().getYCoord(), 0) != Blocks.air) { rodvalue=0; break; } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Microwave.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Microwave.java index 6c1c857..1a3c524 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Microwave.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Microwave.java @@ -1,5 +1,9 @@ package gregtechmod.common.tileentities; +import java.util.UUID; + +import com.mojang.authlib.GameProfile; + import gregtechmod.api.GregTech_API; import gregtechmod.api.enums.Materials; import gregtechmod.api.enums.OrePrefixes; @@ -8,12 +12,13 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; -import net.minecraftforge.common.FakePlayer; +import net.minecraft.world.WorldServer; +import net.minecraftforge.common.util.FakePlayer; public class GT_MetaTileEntity_Microwave extends GT_MetaTileEntity_BasicMachine { @@ -49,7 +54,7 @@ public class GT_MetaTileEntity_Microwave extends GT_MetaTileEntity_BasicMachine getBaseMetaTileEntity().doExplosion(128); try { for (byte i = 0; i < 6; i++) { - GT_ModHandler.getIC2Item("constructionFoamSprayer", 1, new ItemStack(Block.sponge, 1)).getItem().onItemUse(GT_ModHandler.getIC2Item("constructionFoamSprayer", 1, new ItemStack(Block.sponge, 1)), new FakePlayer(getBaseMetaTileEntity().getWorld(), "Foo"), getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getYCoord(), getBaseMetaTileEntity().getZCoord(), i, 0, 0, 0); + GT_ModHandler.getIC2Item("constructionFoamSprayer", 1, new ItemStack(Blocks.sponge, 1)).getItem().onItemUse(GT_ModHandler.getIC2Item("constructionFoamSprayer", 1, new ItemStack(Blocks.sponge, 1)), new FakePlayer((WorldServer) getBaseMetaTileEntity().getWorld(), new GameProfile(UUID.fromString("Foo"),"Foo")), getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getYCoord(), getBaseMetaTileEntity().getZCoord(), i, 0, 0, 0); } } catch(Throwable e) {} return; @@ -60,8 +65,8 @@ public class GT_MetaTileEntity_Microwave extends GT_MetaTileEntity_BasicMachine || Materials.Netherrack.contains(mInventory[2]) || Materials.Gunpowder.contains(mInventory[2]) || Materials.Gunpowder.contains(tOutput) - || mInventory[2].isItemEqual(new ItemStack(Block.netherrack)) - || mInventory[2].getItem() == Item.egg) { + || mInventory[2].isItemEqual(new ItemStack(Blocks.netherrack)) + || mInventory[2].getItem() == Items.egg) { mInventory[2] = null; getBaseMetaTileEntity().doExplosion(128); return; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_GasTurbine.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_GasTurbine.java index 4364a41..254a996 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_GasTurbine.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_GasTurbine.java @@ -16,7 +16,7 @@ import gregtechmod.common.blocks.GT_BlockMetaID_Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; public class GT_MetaTileEntity_Multi_GasTurbine extends GT_MetaTileEntity_MultiBlockBase { @@ -103,7 +103,7 @@ public class GT_MetaTileEntity_Multi_GasTurbine extends GT_MetaTileEntity_MultiB int tX = getBaseMetaTileEntity().getXCoord(), tY = getBaseMetaTileEntity().getYCoord(), tZ = getBaseMetaTileEntity().getZCoord(); for (byte i = -1; i < 2; i++) for (byte j = -1; j < 2; j++) if (i != 0 || j != 0) for (byte k = 0; k < 4; k++) { if ((i == 0 || j == 0) && (k == 1 || k == 2)) { - if (getBaseMetaTileEntity().getBlockID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0].blockID || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 14) { + if (getBaseMetaTileEntity().getBlock(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0] || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 14) { tTileEntity = getBaseMetaTileEntity().getTileEntity(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)); if (tTileEntity != null && tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity)tTileEntity).getMetaTileEntity() != null) { if (((IGregTechTileEntity)tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance) { @@ -122,7 +122,7 @@ public class GT_MetaTileEntity_Multi_GasTurbine extends GT_MetaTileEntity_MultiB } } } else { - if (getBaseMetaTileEntity().getBlockID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0].blockID || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 14) { + if (getBaseMetaTileEntity().getBlock(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0] || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 14) { return false; } } @@ -150,7 +150,7 @@ public class GT_MetaTileEntity_Multi_GasTurbine extends GT_MetaTileEntity_MultiB } @Override - public Icon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { + public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { if (aActive) return GT_BlockMetaID_Block.mIconGasTurbineActive[4]; return GT_BlockMetaID_Block.mIconGasTurbine[4]; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_SteamTurbine.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_SteamTurbine.java index 38c012e..9ff79fe 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_SteamTurbine.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_SteamTurbine.java @@ -14,7 +14,7 @@ import gregtechmod.common.blocks.GT_BlockMetaID_Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; public class GT_MetaTileEntity_Multi_SteamTurbine extends GT_MetaTileEntity_MultiBlockBase { @@ -99,7 +99,7 @@ public class GT_MetaTileEntity_Multi_SteamTurbine extends GT_MetaTileEntity_Mult int tX = getBaseMetaTileEntity().getXCoord(), tY = getBaseMetaTileEntity().getYCoord(), tZ = getBaseMetaTileEntity().getZCoord(); for (byte i = -1; i < 2; i++) for (byte j = -1; j < 2; j++) if (i != 0 || j != 0) for (byte k = 0; k < 4; k++) { if ((i == 0 || j == 0) && (k == 1 || k == 2)) { - if (getBaseMetaTileEntity().getBlockID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0].blockID || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 13) { + if (getBaseMetaTileEntity().getBlock(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0] || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 13) { tTileEntity = getBaseMetaTileEntity().getTileEntity(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)); if (tTileEntity != null && tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity)tTileEntity).getMetaTileEntity() != null) { if (((IGregTechTileEntity)tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance) { @@ -116,7 +116,7 @@ public class GT_MetaTileEntity_Multi_SteamTurbine extends GT_MetaTileEntity_Mult } } } else { - if (getBaseMetaTileEntity().getBlockID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0].blockID || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 13) { + if (getBaseMetaTileEntity().getBlock(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0] || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 13) { return false; } } @@ -144,7 +144,7 @@ public class GT_MetaTileEntity_Multi_SteamTurbine extends GT_MetaTileEntity_Mult } @Override - public Icon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { + public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { if (aActive) return GT_BlockMetaID_Block.mIconSteamTurbineActive[4]; return GT_BlockMetaID_Block.mIconSteamTurbine[4]; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_ThermalBoiler.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_ThermalBoiler.java index 4e0de96..09c5477 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_ThermalBoiler.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Multi_ThermalBoiler.java @@ -77,7 +77,7 @@ public class GT_MetaTileEntity_Multi_ThermalBoiler extends GT_MetaTileEntity_Mul public boolean checkMachine(ItemStack aStack) { byte tSide = getBaseMetaTileEntity().getBackFacing(); if (getBaseMetaTileEntity().getAirAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 1)) { - if (getBaseMetaTileEntity().getBlockIDAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2) != GregTech_API.sBlockList[0].blockID || getBaseMetaTileEntity().getMetaIDAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2) != 14) { + if (getBaseMetaTileEntity().getBlockAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2) != GregTech_API.sBlockList[0] || getBaseMetaTileEntity().getMetaIDAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2) != 14) { TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2); if (tTileEntity != null && tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity)tTileEntity).getMetaTileEntity() != null) { if (((IGregTechTileEntity)tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance) { @@ -97,7 +97,7 @@ public class GT_MetaTileEntity_Multi_ThermalBoiler extends GT_MetaTileEntity_Mul int tX = getBaseMetaTileEntity().getXCoord(), tY = getBaseMetaTileEntity().getYCoord(), tZ = getBaseMetaTileEntity().getZCoord(); for (byte i = -1; i < 2; i++) for (byte j = -1; j < 2; j++) if (i != 0 || j != 0) for (byte k = 0; k < 3; k++) { if ((i == 0 || j == 0) && (k == 1)) { - if (getBaseMetaTileEntity().getBlockID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0].blockID || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 14) { + if (getBaseMetaTileEntity().getBlock(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0] || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 14) { TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)); if (tTileEntity != null && tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity)tTileEntity).getMetaTileEntity() != null) { if (((IGregTechTileEntity)tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance) { @@ -114,7 +114,7 @@ public class GT_MetaTileEntity_Multi_ThermalBoiler extends GT_MetaTileEntity_Mul } } } else { - if (getBaseMetaTileEntity().getBlockID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0].blockID || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 14) { + if (getBaseMetaTileEntity().getBlock(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != GregTech_API.sBlockList[0] || getBaseMetaTileEntity().getMetaID(tX+(tSide<4?i:tSide==5?+k:-k), tY+j, tZ+(tSide<4?tSide==3?+k:-k:i)) != 14) { return false; } } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_PlasmaGenerator.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_PlasmaGenerator.java index 49bd87a..70ce08c 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_PlasmaGenerator.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_PlasmaGenerator.java @@ -5,8 +5,8 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -51,7 +51,7 @@ public class GT_MetaTileEntity_PlasmaGenerator extends GT_MetaTileEntity_BasicTa mInventory[2] = null; else if (mInventory[2] == null) - mInventory[2] = new ItemStack(Block.fire, 1); + mInventory[2] = new ItemStack(Blocks.fire, 1); } else { if (getFuelValue(mFluid) > 0) while (getBaseMetaTileEntity().getUniversalEnergyStored() < (getBaseMetaTileEntity().getOutputVoltage() * 10 + getMinimumStoredEU()) && mFluid.amount > 0) { if (getBaseMetaTileEntity().increaseStoredEnergyUnits(getFuelValue(mFluid), true)) mFluid.amount--; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Printer.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Printer.java index e35a168..23bdb7d 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Printer.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Printer.java @@ -7,7 +7,7 @@ import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_OreDictUnificator; import gregtechmod.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { @@ -29,6 +29,7 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { return new GT_MetaTileEntity_Printer(); } + @SuppressWarnings("deprecation") @Override public void checkRecipe() { GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), 3, 4, (byte)64, (byte)1, (byte)64, (byte)1); @@ -36,31 +37,31 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { bOutputBlocked = true; } else if (mInventory[1] != null && mInventory[1].stackSize > 0) { if (mInventory[5] == null) { - if (mInventory[1].isItemEqual(new ItemStack(Item.reed, 1, 0))) { - mOutputItem1 = new ItemStack(Item.paper, 1, 0); + if (mInventory[1].isItemEqual(new ItemStack(Items.reeds, 1, 0))) { + mOutputItem1 = new ItemStack(Items.paper, 1, 0); mEUt = 1; mMaxProgresstime = 200; mInventory[1].stackSize-=1; return; } if (GT_OreDictUnificator.isItemStackInstanceOf(mInventory[1], "dustWood")) { - mOutputItem1 = new ItemStack(Item.paper, 1, 0); + mOutputItem1 = new ItemStack(Items.paper, 1, 0); mEUt = 1; mMaxProgresstime = 200; mInventory[1].stackSize-=1; return; } if (mInventory[2] != null && mInventory[2].stackSize > 0) { - if (GT_OreDictUnificator.isItemStackInstanceOf(mInventory[1], "paperEmpty") && mInventory[1].stackSize >= 3 && mInventory[2].isItemEqual(new ItemStack(Item.leather, 1, 0))) { - mOutputItem1 = new ItemStack(Item.book, 1, 0); + if (GT_OreDictUnificator.isItemStackInstanceOf(mInventory[1], "paperEmpty") && mInventory[1].stackSize >= 3 && mInventory[2].isItemEqual(new ItemStack(Items.leather, 1, 0))) { + mOutputItem1 = new ItemStack(Items.book, 1, 0); mEUt = 2; mMaxProgresstime = 400; mInventory[1].stackSize-=3; mInventory[2].stackSize-=1; return; } - if (GT_OreDictUnificator.isItemStackInstanceOf(mInventory[1], "paperEmpty") && mInventory[1].stackSize >= 8 && mInventory[2].isItemEqual(new ItemStack(Item.compass, 1, 0))) { - mOutputItem1 = new ItemStack(Item.emptyMap, 1, 0); + if (GT_OreDictUnificator.isItemStackInstanceOf(mInventory[1], "paperEmpty") && mInventory[1].stackSize >= 8 && mInventory[2].isItemEqual(new ItemStack(Items.compass, 1, 0))) { + mOutputItem1 = new ItemStack(Items.map, 1, 0); mEUt = 2; mMaxProgresstime = 400; mInventory[1].stackSize-=8; @@ -83,7 +84,7 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { mMaxProgresstime = 1600; mInventory[1].stackSize-=8; if (mInventory[2].stackSize == 1 && mInventory[2].getItem().hasContainerItem()) { - mInventory[2] = mInventory[2].getItem().getContainerItemStack(mInventory[2]); + mInventory[2] = mInventory[2].getItem().getContainerItem(mInventory[2]); } else { mInventory[2].stackSize-=1; } @@ -100,7 +101,7 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { mMaxProgresstime = 200; mInventory[1].stackSize-=1; if (mInventory[2].stackSize == 1 && mInventory[2].getItem().hasContainerItem()) { - mInventory[2] = mInventory[2].getItem().getContainerItemStack(mInventory[2]); + mInventory[2] = mInventory[2].getItem().getContainerItem(mInventory[2]); } else { mInventory[2].stackSize-=1; } @@ -115,13 +116,13 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { } } else { if (mInventory[2] != null && mInventory[2].stackSize > 0 && mInventory[1].getItem().getUnlocalizedName() != null && mInventory[2].getItem().getUnlocalizedName() != null && mInventory[5].getItem().getUnlocalizedName() != null) { - if ((mInventory[5].getItem() == Item.writableBook || mInventory[5].getItem() == Item.writtenBook) && GT_OreDictUnificator.isItemStackInstanceOf(mInventory[1], "bookEmpty") && GT_OreDictUnificator.isItemStackInstanceOf(mInventory[2], "dyeBlack")) { + if ((mInventory[5].getItem() == Items.writable_book || mInventory[5].getItem() == Items.written_book) && GT_OreDictUnificator.isItemStackInstanceOf(mInventory[1], "bookEmpty") && GT_OreDictUnificator.isItemStackInstanceOf(mInventory[2], "dyeBlack")) { mEUt = 1; mMaxProgresstime = 200; mOutputItem1 = GT_Utility.copy(1, mInventory[5]); mInventory[1].stackSize-=1; if (mInventory[2].stackSize == 1 && mInventory[2].getItem().hasContainerItem()) { - mInventory[2] = mInventory[2].getItem().getContainerItemStack(mInventory[2]); + mInventory[2] = mInventory[2].getItem().getContainerItem(mInventory[2]); } else { mInventory[2].stackSize-=1; } @@ -131,13 +132,13 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { } return; } - if ((mInventory[5].getItem() == Item.map) && mInventory[1].isItemEqual(new ItemStack(Item.emptyMap, 1, 0)) && GT_OreDictUnificator.isItemStackInstanceOf(mInventory[2], "dyeBlack")) { + if ((mInventory[5].getItem() == Items.map) && mInventory[1].isItemEqual(new ItemStack(Items.map, 1, 0)) && GT_OreDictUnificator.isItemStackInstanceOf(mInventory[2], "dyeBlack")) { mEUt = 1; mMaxProgresstime = 100; mOutputItem1 = GT_Utility.copy(1, mInventory[5]); mInventory[1].stackSize-=1; if (mInventory[2].stackSize == 1 && mInventory[2].getItem().hasContainerItem()) { - mInventory[2] = mInventory[2].getItem().getContainerItemStack(mInventory[2]); + mInventory[2] = mInventory[2].getItem().getContainerItem(mInventory[2]); } else { mInventory[2].stackSize-=1; } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Pulverizer.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Pulverizer.java index ee9bf34..fb36fc3 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Pulverizer.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Pulverizer.java @@ -1,5 +1,6 @@ package gregtechmod.common.tileentities; +import cofh.thermalexpansion.api.crafting.recipes.IPulverizerRecipe; import gregtechmod.api.GregTech_API; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; @@ -8,8 +9,8 @@ import gregtechmod.api.util.GT_Log; import gregtechmod.api.util.GT_ModHandler; import gregtechmod.api.util.GT_PulverizerRecipe; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; public class GT_MetaTileEntity_Pulverizer extends GT_MetaTileEntity_BasicMachine { @@ -35,7 +36,7 @@ public class GT_MetaTileEntity_Pulverizer extends GT_MetaTileEntity_BasicMachine GT_Utility.moveStackFromSlotAToSlotB(getBaseMetaTileEntity(), getBaseMetaTileEntity(), 3, 4, (byte)64, (byte)1, (byte)64, (byte)1); if (mInventory[2] != null) { if (mInventory[3] == null && mInventory[4] == null) { - if (mInventory[2].isItemEqual(new ItemStack(Block.gravel, 1))) { + if (mInventory[2].isItemEqual(new ItemStack(Blocks.gravel, 1))) { Object tObject = GT_ModHandler.getPulverizerRecipe(mInventory[2]); try { if (tObject instanceof GT_PulverizerRecipe) { @@ -52,7 +53,7 @@ public class GT_MetaTileEntity_Pulverizer extends GT_MetaTileEntity_BasicMachine } } } else { - thermalexpansion.api.crafting.IPulverizerRecipe tRecipe = (thermalexpansion.api.crafting.IPulverizerRecipe)tObject; + IPulverizerRecipe tRecipe = (IPulverizerRecipe)tObject; if (tRecipe != null && tRecipe.getInput().stackSize <= mInventory[2].stackSize) { if ((mOutputItem1 = tRecipe.getPrimaryOutput()) != null) { if (getBaseMetaTileEntity().getRandomNumber(100) < tRecipe.getSecondaryOutputChance()) { @@ -65,7 +66,7 @@ public class GT_MetaTileEntity_Pulverizer extends GT_MetaTileEntity_BasicMachine } } } - } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} + } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);} } try { for (ItemStack tOutput : mods.railcraft.api.crafting.RailcraftCraftingManager.rockCrusher.getRecipe(mInventory[2]).getRandomizedOuputs()) { @@ -94,7 +95,7 @@ public class GT_MetaTileEntity_Pulverizer extends GT_MetaTileEntity_BasicMachine mEUt = 4; return; } - } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);} + } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);} if (null != (mOutputItem1 = GT_ModHandler.getMaceratorOutput(mInventory[2], true, mInventory[3]))) { mOutputItem2 = null; mMaxProgresstime = 400; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneButtonPanel.java index 1289c6a..f8e578d 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneButtonPanel.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneButtonPanel.java @@ -3,11 +3,11 @@ package gregtechmod.common.tileentities; import gregtechmod.api.GregTech_API; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,7 +15,7 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends MetaTileEntity { public byte mRedstoneStrength = 0, mType = 0, mUpdate = 0; - public static Icon[] sIconList = new Icon[256]; + public static IIcon[] sIconList = new IIcon[256]; public GT_MetaTileEntity_RedstoneButtonPanel(int aID, String mName, String mNameRegional) { super(aID, mName, mNameRegional); @@ -149,13 +149,13 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends MetaTileEntity { } @Override - public Icon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { + public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { return aSide==aFacing?sIconList[mType*16+mRedstoneStrength]:null; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister aBlockIconRegister) { + public void registerIcons(IIconRegister aBlockIconRegister) { for (int i = 0; i < 48; i++) { sIconList[i] = aBlockIconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + "tile.ButtonPanel/" + i); } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneCircuitBlock.java index 17ccfac..beb1977 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneCircuitBlock.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneCircuitBlock.java @@ -86,7 +86,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends MetaTileEntity imple mGate = tList.get(tIndex); switchGate(); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -104,7 +104,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends MetaTileEntity imple mGate = tList.get(tIndex); switchGate(); } catch(Throwable e) { - e.printStackTrace(GT_Log.err); + GT_Log.log.catching(e); } } @@ -136,13 +136,13 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends MetaTileEntity imple resetRedstone(); for (int i = 0; i < mGateData.length; i++) mGateData[i] = 0; GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate); - if (tBehaviour != null) try {tBehaviour.initParameters(mGateData, this);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} + if (tBehaviour != null) try {tBehaviour.initParameters(mGateData, this);} catch(Throwable e) {GT_Log.log.catching(e);} validateGateData(); } private void validateGateData() { GT_CircuitryBehavior tBehaviour = GregTech_API.sCircuitryBehaviors.get(mGate); - if (tBehaviour != null) try {tBehaviour.validateParameters(mGateData, this);} catch(Throwable e) {e.printStackTrace(GT_Log.err);} + if (tBehaviour != null) try {tBehaviour.validateParameters(mGateData, this);} catch(Throwable e) {GT_Log.log.catching(e);} } @Override @@ -165,7 +165,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends MetaTileEntity imple if (tBehaviour.displayItemStack(mGateData, this, 1)) mInventory[2] = GT_Utility.intToStack(mGateData[1]); if (tBehaviour.displayItemStack(mGateData, this, 2)) mInventory[3] = GT_Utility.intToStack(mGateData[2]); if (tBehaviour.displayItemStack(mGateData, this, 3)) mInventory[4] = GT_Utility.intToStack(mGateData[3]); - } catch(Throwable e) {e.printStackTrace(GT_Log.err);}} + } catch(Throwable e) {GT_Log.log.catching(e);}} } getBaseMetaTileEntity().setErrorDisplayID(0); } else { diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneNoteBlock.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneNoteBlock.java index bc01d86..d365593 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneNoteBlock.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneNoteBlock.java @@ -3,8 +3,8 @@ package gregtechmod.common.tileentities; import gregtechmod.GT_Mod; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -59,12 +59,12 @@ public class GT_MetaTileEntity_RedstoneNoteBlock extends MetaTileEntity { aIndex--; ItemStack tStack; switch (getBaseMetaTileEntity().getFrontFacing()) { - case 1: tStack = new ItemStack(Block.blockGold, 1); break; - case 2: tStack = new ItemStack(Block.stone, 1); break; - case 3: tStack = new ItemStack(Block.sand, 1); break; - case 4: tStack = new ItemStack(Block.glass, 1); break; - case 5: tStack = new ItemStack(Block.wood, 1); break; - default: tStack = new ItemStack(Block.blockIron, 1); break; + case 1: tStack = new ItemStack(Blocks.gold_block, 1); break; + case 2: tStack = new ItemStack(Blocks.stone, 1); break; + case 3: tStack = new ItemStack(Blocks.sand, 1); break; + case 4: tStack = new ItemStack(Blocks.glass, 1); break; + case 5: tStack = new ItemStack(Blocks.log, 1); break; + default: tStack = new ItemStack(Blocks.iron_block, 1); break; } tStack.stackSize = 1+(int)(aIndex * 1.714); GT_Mod.gregtechproxy.doSonictronSound(tStack, getBaseMetaTileEntity().getWorld(), aX, aY, aZ); diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneStrengthDisplay.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneStrengthDisplay.java index e82941d..86eb13f 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneStrengthDisplay.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneStrengthDisplay.java @@ -3,11 +3,11 @@ package gregtechmod.common.tileentities; import gregtechmod.api.GregTech_API; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -15,7 +15,7 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends MetaTileEntity { public byte mRedstoneStrength = 0, mType = 0; - public static Icon[] sIconList = new Icon[256]; + public static IIcon[] sIconList = new IIcon[256]; public GT_MetaTileEntity_RedstoneStrengthDisplay(int aID, String mName, String mNameRegional) { super(aID, mName, mNameRegional); @@ -84,7 +84,7 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends MetaTileEntity { } @Override - public Icon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { + public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { return aSide==aFacing?sIconList[mType*16+mRedstoneStrength]:null; } @@ -95,7 +95,7 @@ public class GT_MetaTileEntity_RedstoneStrengthDisplay extends MetaTileEntity { @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister aBlockIconRegister) { + public void registerIcons(IIconRegister aBlockIconRegister) { for (int i = 0; i < 96; i++) { sIconList[i] = aBlockIconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + "tile.RedstoneDisplay/" + i); } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneStrengthScale.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneStrengthScale.java index a3f8d7a..0dfdf90 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneStrengthScale.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RedstoneStrengthScale.java @@ -3,15 +3,15 @@ package gregtechmod.common.tileentities; import gregtechmod.api.GregTech_API; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_RedstoneStrengthDisplay { - public static Icon[] sIconList = new Icon[256]; + public static IIcon[] sIconList = new IIcon[256]; public GT_MetaTileEntity_RedstoneStrengthScale(int aID, String mName, String mNameRegional) { super(aID, mName, mNameRegional); @@ -27,13 +27,13 @@ public class GT_MetaTileEntity_RedstoneStrengthScale extends GT_MetaTileEntity_R } @Override - public Icon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { + public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { return aSide==aFacing?sIconList[mType*16+mRedstoneStrength]:null; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister aBlockIconRegister) { + public void registerIcons(IIconRegister aBlockIconRegister) { for (int i = 0; i < 32; i++) { sIconList[i] = aBlockIconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + "tile.RedstoneScale/" + i); } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RockBreaker.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RockBreaker.java index 168ded2..5cfdb85 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RockBreaker.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_RockBreaker.java @@ -3,9 +3,9 @@ package gregtechmod.common.tileentities; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_ElectricBufferSmall { @@ -30,29 +30,29 @@ public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_ElectricBuf public void onPostTick() { if (getBaseMetaTileEntity().isAllowedToWork() && getBaseMetaTileEntity().isServerSide() && getBaseMetaTileEntity().getUniversalEnergyStored() >= 1000 && (getBaseMetaTileEntity().getTimer()%(40/(int)Math.pow(2, getBaseMetaTileEntity().getOverclockerUpgradeCount()))) == 0) { - ItemStack tOutput = new ItemStack(Block.cobblestone, 1); + ItemStack tOutput = new ItemStack(Blocks.cobblestone, 1); boolean tWater = true; - if (getBaseMetaTileEntity().getBlockIDOffset(0, 0, +1) != 9) - if (getBaseMetaTileEntity().getBlockIDOffset(0, 0, -1) != 9) - if (getBaseMetaTileEntity().getBlockIDOffset(-1, 0, 0) != 9) - if (getBaseMetaTileEntity().getBlockIDOffset(+1, 0, 0) != 9) + if (getBaseMetaTileEntity().getBlockOffset(0, 0, +1) != Blocks.water) + if (getBaseMetaTileEntity().getBlockOffset(0, 0, -1) != Blocks.water) + if (getBaseMetaTileEntity().getBlockOffset(-1, 0, 0) != Blocks.water) + if (getBaseMetaTileEntity().getBlockOffset(+1, 0, 0) != Blocks.water) tWater = false; - if (getBaseMetaTileEntity().getBlockIDOffset(0, +1, 0) == 11) - tOutput = new ItemStack(Block.stone, 1); + if (getBaseMetaTileEntity().getBlockOffset(0, +1, 0) == Blocks.lava) + tOutput = new ItemStack(Blocks.stone, 1); else - if (getBaseMetaTileEntity().getBlockIDOffset(0, 0, +1) != 11) - if (getBaseMetaTileEntity().getBlockIDOffset(0, 0, -1) != 11) - if (getBaseMetaTileEntity().getBlockIDOffset(-1, 0, 0) != 11) - if (getBaseMetaTileEntity().getBlockIDOffset(+1, 0, 0) != 11) + if (getBaseMetaTileEntity().getBlockOffset(0, 0, +1) != Blocks.lava) + if (getBaseMetaTileEntity().getBlockOffset(0, 0, -1) != Blocks.lava) + if (getBaseMetaTileEntity().getBlockOffset(-1, 0, 0) != Blocks.lava) + if (getBaseMetaTileEntity().getBlockOffset(+1, 0, 0) != Blocks.lava) tOutput = null; if (tOutput != null && tWater) { if (mInventory[0] == null) { - if (mInventory[1] != null && mInventory[1].getItem() == Item.redstone) { - mInventory[0] = new ItemStack(Block.obsidian, 1); + if (mInventory[1] != null && mInventory[1].getItem() == Items.redstone) { + mInventory[0] = new ItemStack(Blocks.obsidian, 1); getBaseMetaTileEntity().decrStackSize(1, 1); getBaseMetaTileEntity().decreaseStoredEnergyUnits(500*(int)Math.pow(4, getBaseMetaTileEntity().getOverclockerUpgradeCount()), true); } else { @@ -60,7 +60,7 @@ public class GT_MetaTileEntity_RockBreaker extends GT_MetaTileEntity_ElectricBuf getBaseMetaTileEntity().decreaseStoredEnergyUnits(100*(int)Math.pow(4, getBaseMetaTileEntity().getOverclockerUpgradeCount()), true); } } else { - if (mInventory[1] != null && mInventory[1].getItem() == Item.redstone && GT_Utility.areStacksEqual(mInventory[0], new ItemStack(Block.obsidian)) && mInventory[0].stackSize < 64) { + if (mInventory[1] != null && mInventory[1].getItem() == Items.redstone && GT_Utility.areStacksEqual(mInventory[0], new ItemStack(Blocks.obsidian)) && mInventory[0].stackSize < 64) { mInventory[0].stackSize++; getBaseMetaTileEntity().decrStackSize(1, 1); getBaseMetaTileEntity().decreaseStoredEnergyUnits(500*(int)Math.pow(4, getBaseMetaTileEntity().getOverclockerUpgradeCount()), true); diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Sawmill.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Sawmill.java index 36271d7..3536037 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Sawmill.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Sawmill.java @@ -97,7 +97,7 @@ public class GT_MetaTileEntity_Sawmill extends MetaTileEntity { private boolean checkMachine() { for (int i = -1; i < 2; i++) for (int j = 1; j < 2; j++) for (int k = -1; k < 2; k++) { - if (getBaseMetaTileEntity().getBlockIDOffset(i, j-2, k) != GregTech_API.sBlockList[0].blockID) return false; + if (getBaseMetaTileEntity().getBlockOffset(i, j-2, k) != GregTech_API.sBlockList[0]) return false; if (getBaseMetaTileEntity().getMetaIDOffset (i, j-2, k) != (i==0&&k==0?14:13)) return false; } return true; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_SemifluidGenerator.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_SemifluidGenerator.java index 2ef1768..5b8df1c 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_SemifluidGenerator.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_SemifluidGenerator.java @@ -5,8 +5,8 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -51,7 +51,7 @@ public class GT_MetaTileEntity_SemifluidGenerator extends GT_MetaTileEntity_Basi mInventory[2] = null; else if (mInventory[2] == null) - mInventory[2] = new ItemStack(Block.fire, 1); + mInventory[2] = new ItemStack(Blocks.fire, 1); } else { if (getFuelValue(mFluid) > 0) while (getBaseMetaTileEntity().getUniversalEnergyStored() < (getBaseMetaTileEntity().getOutputVoltage() * 10 + getMinimumStoredEU()) && mFluid.amount > 0) { if (getBaseMetaTileEntity().increaseStoredEnergyUnits(getFuelValue(mFluid), true)) mFluid.amount--; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Shelf_Compartment.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Shelf_Compartment.java index 7674b49..35918e0 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Shelf_Compartment.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Shelf_Compartment.java @@ -4,17 +4,17 @@ import gregtechmod.api.GregTech_API; import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_Utility; -import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class GT_MetaTileEntity_Shelf_Compartment extends GT_MetaTileEntity_Shelf { - public static Icon[] sIconList = new Icon[256]; + public static IIcon[] sIconList = new IIcon[256]; public GT_MetaTileEntity_Shelf_Compartment(int aID, String mName, String mNameRegional) { super(aID, mName, mNameRegional); @@ -47,13 +47,13 @@ public class GT_MetaTileEntity_Shelf_Compartment extends GT_MetaTileEntity_Shelf } @Override - public Icon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { + public IIcon getTextureIcon(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { return aSide==aFacing?sIconList[mType]:null; } @Override @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister aBlockIconRegister) { + public void registerIcons(IIconRegister aBlockIconRegister) { for (int i = 0; i < 32; i++) { sIconList[i] = aBlockIconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + "tile.Compartment/" + i); } diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Teleporter.java index b8d0903..e8fa2f3 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_Teleporter.java @@ -6,7 +6,6 @@ import gregtechmod.api.interfaces.IGregTechTileEntity; import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.util.GT_Config; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityHanging; import net.minecraft.entity.EntityLiving; @@ -15,7 +14,7 @@ import net.minecraft.entity.effect.EntityWeatherEffect; import net.minecraft.entity.item.EntityBoat; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.entity.item.EntityEnderEye; -import net.minecraft.entity.item.EntityFallingSand; +import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.item.EntityFireworkRocket; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityMinecart; @@ -26,6 +25,7 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.entity.projectile.EntityFishHook; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; @@ -107,7 +107,7 @@ public class GT_MetaTileEntity_Teleporter extends MetaTileEntity { } public boolean checkForEgg() { - for (byte i = -5; i <= 5; i++) for (byte j = -5; j <= 5; j++) for (byte k = -5; k <= 5; k++) if (getBaseMetaTileEntity().getBlockIDOffset(i, j, k) == Block.dragonEgg.blockID) return true; + for (byte i = -5; i <= 5; i++) for (byte j = -5; j <= 5; j++) for (byte k = -5; k <= 5; k++) if (getBaseMetaTileEntity().getBlockOffset(i, j, k) == Blocks.dragon_egg) return true; return false; } @@ -195,7 +195,7 @@ public class GT_MetaTileEntity_Teleporter extends MetaTileEntity { if (aEntity instanceof EntityBoat) return 0.1F; if (aEntity instanceof EntityEnderCrystal) return 2.0F; if (aEntity instanceof EntityEnderEye) return 0.001F; - if (aEntity instanceof EntityFallingSand) return 0.01F; + if (aEntity instanceof EntityFallingBlock) return 0.01F; if (aEntity instanceof EntityFireball) return 0.001F; if (aEntity instanceof EntityFireworkRocket) return 0.001F; if (aEntity instanceof EntityHanging) return 0.005F; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_TesseractGenerator.java index af1c8a3..041c03f 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_TesseractGenerator.java @@ -18,7 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; @@ -298,7 +298,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends MetaTileEntity { public String getInvName() { IInventory tTileEntity = getBaseMetaTileEntity().getIInventoryAtSide(getBaseMetaTileEntity().getBackFacing()); if (tTileEntity == null || !getBaseMetaTileEntity().isAllowedToWork()) return ""; - return tTileEntity.getInvName(); + return tTileEntity.getInventoryName(); } @Override diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_TesseractTerminal.java index 6852f4c..02cf6ad 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_TesseractTerminal.java @@ -10,7 +10,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.ForgeDirection; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ThermalGenerator.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ThermalGenerator.java index 855f577..84213a9 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ThermalGenerator.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_ThermalGenerator.java @@ -5,8 +5,8 @@ import gregtechmod.api.metatileentity.MetaTileEntity; import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; import gregtechmod.api.util.GT_Recipe; import gregtechmod.api.util.GT_Utility; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -51,7 +51,7 @@ public class GT_MetaTileEntity_ThermalGenerator extends GT_MetaTileEntity_BasicT mInventory[2] = null; else if (mInventory[2] == null) - mInventory[2] = new ItemStack(Block.fire, 1); + mInventory[2] = new ItemStack(Blocks.fire, 1); } else { if (getFuelValue(mFluid) > 0) while (getBaseMetaTileEntity().getUniversalEnergyStored() < (getBaseMetaTileEntity().getOutputVoltage() * 10 + getMinimumStoredEU()) && mFluid.amount > 0) { if (getBaseMetaTileEntity().increaseStoredEnergyUnits(getFuelValue(mFluid), true)) mFluid.amount--; diff --git a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_VacuumFreezer.java b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_VacuumFreezer.java index 3decfdc..e9a9f7e 100644 --- a/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_VacuumFreezer.java +++ b/src/main/java/gregtechmod/common/tileentities/GT_MetaTileEntity_VacuumFreezer.java @@ -75,7 +75,7 @@ public class GT_MetaTileEntity_VacuumFreezer extends MetaTileEntity { private boolean checkMachine() { for (int i = -1; i < 2; i++) for (int j = -1; j < 2; j++) for (int k = -1; k < 2; k++) { if (i!=0||j!=0||k!=0) { - if (getBaseMetaTileEntity().getBlockIDOffset(i, j-2, k) != GregTech_API.sBlockList[0].blockID) return false; + if (getBaseMetaTileEntity().getBlockOffset(i, j-2, k) != GregTech_API.sBlockList[0]) return false; if (getBaseMetaTileEntity().getMetaIDOffset (i, j-2, k) != ((i==0&&j==0&&k!=0)||(i==0&&j!=0&&k==0)||(i!=0&&j==0&&k==0)?15:14)) return false; } else { if (!getBaseMetaTileEntity().getAirOffset(i, j-2, k)) return false;