From ce1e6917e056c0a1300caefc175b10c68126832a Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 09:06:26 +0300 Subject: Preparations for moving all heating coils to another block. --- .../gregtech/common/blocks/GT_Block_Casings4.java | 8 ++--- .../gregtech/common/blocks/GT_Block_Casings5.java | 36 ++++++++++++++++++++++ .../gregtech/common/blocks/GT_Item_Casings4.java | 15 --------- .../gregtech/common/blocks/GT_Item_Casings5.java | 29 +++++++++++++++++ .../GT_MetaTileEntity_ElectricBlastFurnace.java | 17 +++++----- .../multi/GT_MetaTileEntity_MultiFurnace.java | 15 +++++---- 6 files changed, 86 insertions(+), 34 deletions(-) create mode 100644 src/main/java/gregtech/common/blocks/GT_Block_Casings5.java create mode 100644 src/main/java/gregtech/common/blocks/GT_Item_Casings5.java (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index 8b1e4a4aa9..3c3535e4da 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -37,8 +37,6 @@ public class GT_Block_Casings4 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Titanium Turbine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Tungstensteel Turbine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Engine Intake Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Tungstensteel Coil Block"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Naquadah Alloy Coil Block"); ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0)); ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1)); @@ -52,8 +50,6 @@ public class GT_Block_Casings4 ItemList.Casing_Turbine2.set(new ItemStack(this, 1, 11)); ItemList.Casing_Turbine3.set(new ItemStack(this, 1, 12)); ItemList.Casing_EngineIntake.set(new ItemStack(this, 1, 13)); - ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 14)); - ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 15)); } public IIcon getIcon(int aSide, int aMeta) { @@ -87,9 +83,9 @@ public class GT_Block_Casings4 case 13: return Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon(); case 14: - return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); case 15: - return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon(); + return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); } return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java new file mode 100644 index 0000000000..bcbc9af660 --- /dev/null +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java @@ -0,0 +1,36 @@ +package gregtech.common.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Textures; +import gregtech.api.objects.GT_CopiedBlockTexture; +import gregtech.api.util.GT_LanguageManager; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class GT_Block_Casings5 + extends GT_Block_Casings_Abstract { + public GT_Block_Casings5() { + super(GT_Item_Casings5.class, "gt.blockcasings5", GT_Material_Casings.INSTANCE); + for (byte i = 0; i < 16; i = (byte) (i + 1)) { + Textures.BlockIcons.CASING_BLOCKS[(i + 64)] = new GT_CopiedBlockTexture(this, 6, i); + } + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Tungstensteel Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Alloy Coil Block"); + + ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 4)); + ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 5)); + } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int aSide, int aMeta) { + switch (aMeta) { + case 4: + return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon(); + case 5: + return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon(); + } + return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); + } +} 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 3dcfbf3c09..33447673cb 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java @@ -1,25 +1,10 @@ package gregtech.common.blocks; -import java.util.List; - import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; public class GT_Item_Casings4 extends GT_Item_Casings_Abstract { public GT_Item_Casings4(Block par1) { super(par1); } - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - super.addInformation(aStack, aPlayer, aList, aF3_H); - switch (getDamage(aStack)) { - case 14: - aList.add(this.mCoil04Tooltip); - break; - case 15: - aList.add(this.mCoil05Tooltip); - break; - } - } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java new file mode 100644 index 0000000000..8e828d1220 --- /dev/null +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -0,0 +1,29 @@ +package gregtech.common.blocks; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +public class GT_Item_Casings5 + extends GT_Item_Casings_Abstract { + public GT_Item_Casings5(Block par1) { + super(par1); + } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + super.addInformation(aStack, aPlayer, aList, aF3_H); + switch (getDamage(aStack)) { + case 4: + aList.add(this.mCoil04Tooltip); + break; + case 5: + aList.add(this.mCoil05Tooltip); + break; + } + } +} diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index 0a90c00d0b..9fb73fb5c1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -144,8 +144,14 @@ public class GT_MetaTileEntity_ElectricBlastFurnace addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), 11); byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir); - boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 2, zDir) == GregTech_API.sBlockCasings4; + boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 2, zDir) == GregTech_API.sBlockCasings5; switch (tUsedMeta) { + case 4: + this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 0; + break; + case 5: + this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0; + break; case 12: this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800; break; @@ -153,10 +159,7 @@ public class GT_MetaTileEntity_ElectricBlastFurnace this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700; break; case 14: - this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 3600; - break; - case 15: - this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0; + this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 3600; break; default: return false; @@ -168,14 +171,14 @@ public class GT_MetaTileEntity_ElectricBlastFurnace for (int j = -1; j < 2; j++) { if ((i != 0) || (j != 0)) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings4 && tUseAdvancedCoils) { + aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 2, zDir + j) != tUsedMeta) { return false; } if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings4 && tUseAdvancedCoils) { + aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index 49212225f8..21f45ac54b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -106,8 +106,14 @@ public class GT_MetaTileEntity_MultiFurnace addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 2, zDir), 11); byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 1, zDir); - boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 1, zDir) == GregTech_API.sBlockCasings4; + boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 1, zDir) == GregTech_API.sBlockCasings5; switch (tUsedMeta) { + case 4: + this.mLevel = tUseAdvancedCoils ? 8 : 0; + break; + case 5: + this.mLevel = tUseAdvancedCoils ? 16 : 0; + break; case 12: this.mLevel = tUseAdvancedCoils ? 0 : 1; break; @@ -115,10 +121,7 @@ public class GT_MetaTileEntity_MultiFurnace this.mLevel = tUseAdvancedCoils ? 0 : 2; break; case 14: - this.mLevel = tUseAdvancedCoils ? 8 : 4; - break; - case 15: - this.mLevel = tUseAdvancedCoils ? 16 : 0; + this.mLevel = tUseAdvancedCoils ? 0 : 4; break; default: return false; @@ -130,7 +133,7 @@ public class GT_MetaTileEntity_MultiFurnace for (int j = -1; j < 2; j++) { if ((i != 0) || (j != 0)) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings4 && tUseAdvancedCoils) { + aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { -- cgit From 8bf5b61dea476ce950ed523293658780217b203f Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 10:05:44 +0300 Subject: Moved all coils to another block. --- .../gregtech/common/blocks/GT_Block_Casings1.java | 17 +----------- .../gregtech/common/blocks/GT_Block_Casings5.java | 28 +++++++++++++++----- .../gregtech/common/blocks/GT_Item_Casings1.java | 18 ------------- .../gregtech/common/blocks/GT_Item_Casings5.java | 13 ++++++++-- .../GT_MetaTileEntity_ElectricBlastFurnace.java | 30 +++++++++------------- .../multi/GT_MetaTileEntity_FusionComputer1.java | 4 +-- .../multi/GT_MetaTileEntity_MultiFurnace.java | 27 ++++++++----------- .../multi/GT_MetaTileEntity_OilCracker.java | 14 +++++----- .../multi/GT_MetaTileEntity_PyrolyseOven.java | 10 ++++---- 9 files changed, 71 insertions(+), 90 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java index 6e4231f5dc..a9c07358be 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -28,10 +28,7 @@ public class GT_Block_Casings1 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "MAX Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cupronickel Coil Block"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block"); + ItemList.Casing_ULV.set(new ItemStack(this, 1, 0)); ItemList.Casing_LV.set(new ItemStack(this, 1, 1)); ItemList.Casing_MV.set(new ItemStack(this, 1, 2)); @@ -44,10 +41,6 @@ public class GT_Block_Casings1 ItemList.Casing_MAX.set(new ItemStack(this, 1, 9)); ItemList.Casing_BronzePlatedBricks.set(new ItemStack(this, 1, 10)); ItemList.Casing_HeatProof.set(new ItemStack(this, 1, 11)); - ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 12)); - ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 13)); - ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 14)); - ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15)); } public IIcon getIcon(int aSide, int aMeta) { @@ -57,14 +50,6 @@ public class GT_Block_Casings1 return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); case 11: return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); - case 12: - return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); - case 13: - return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon(); - case 14: - return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon(); - case 15: - return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); } if (aSide == 0) { return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon(); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java index bcbc9af660..c76354d9a2 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java @@ -16,20 +16,36 @@ public class GT_Block_Casings5 for (byte i = 0; i < 16; i = (byte) (i + 1)) { Textures.BlockIcons.CASING_BLOCKS[(i + 64)] = new GT_CopiedBlockTexture(this, 6, i); } - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Tungstensteel Coil Block"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Alloy Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Cupronickel Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Kanthal Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Naquadah Alloy Coil Block"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Superconducting Coil Block"); - ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 4)); - ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 5)); + ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0)); + ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1)); + ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 2)); + ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 3)); + ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 4)); + ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 5)); } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int aSide, int aMeta) { switch (aMeta) { - case 4: + case 0: + return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); + case 1: + return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon(); + case 2: + return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon(); + case 3: return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon(); - case 5: + case 4: return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon(); + case 5: + return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); } return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); } 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 a02124706e..c253cca548 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java @@ -1,28 +1,10 @@ package gregtech.common.blocks; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import java.util.List; public class GT_Item_Casings1 extends GT_Item_Casings_Abstract { public GT_Item_Casings1(Block par1) { super(par1); } - - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { - super.addInformation(aStack, aPlayer, aList, aF3_H); - switch (getDamage(aStack)) { - case 12: - aList.add(this.mCoil01Tooltip); - break; - case 13: - aList.add(this.mCoil02Tooltip); - break; - case 14: - aList.add(this.mCoil03Tooltip); - } - } } 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 8e828d1220..7b5f281006 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -18,10 +18,19 @@ public class GT_Item_Casings5 public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); switch (getDamage(aStack)) { - case 4: + case 0: + aList.add(this.mCoil01Tooltip); + break; + case 1: + aList.add(this.mCoil02Tooltip); + break; + case 2: + aList.add(this.mCoil03Tooltip); + break; + case 3: aList.add(this.mCoil04Tooltip); break; - case 5: + case 4: aList.add(this.mCoil05Tooltip); break; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java index 9fb73fb5c1..dd91c58b42 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java @@ -144,41 +144,35 @@ public class GT_MetaTileEntity_ElectricBlastFurnace addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 3, zDir), 11); byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 2, zDir); - boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 2, zDir) == GregTech_API.sBlockCasings5; switch (tUsedMeta) { - case 4: - this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 0; + case 0: + this.mHeatingCapacity = 1800; break; - case 5: - this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0; + case 1: + this.mHeatingCapacity = 2700; break; - case 12: - this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800; + case 2: + this.mHeatingCapacity = 3600; break; - case 13: - this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700; + case 3: + this.mHeatingCapacity = 4500; break; - case 14: - this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 3600; + case 4: + this.mHeatingCapacity = 9001; break; default: return false; } - if (this.mHeatingCapacity == 0) { - return false; - } for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if ((i != 0) || (j != 0)) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings5) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 2, zDir + j) != tUsedMeta) { return false; } - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index 39d38e9bd3..35d8ce77dc 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -39,12 +39,12 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC @Override public Block getFusionCoil() { - return GregTech_API.sBlockCasings1; + return GregTech_API.sBlockCasings5; } @Override public int getFusionCoilMeta() { - return 15; + return 5; } public String[] getDescription() { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index 21f45ac54b..9e5dd35faa 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -106,34 +106,29 @@ public class GT_MetaTileEntity_MultiFurnace addMufflerToMachineList(aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 2, zDir), 11); byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 1, zDir); - boolean tUseAdvancedCoils = aBaseMetaTileEntity.getBlockOffset(xDir + 1, 1, zDir) == GregTech_API.sBlockCasings5; switch (tUsedMeta) { - case 4: - this.mLevel = tUseAdvancedCoils ? 8 : 0; + case 0: + this.mLevel = 1; break; - case 5: - this.mLevel = tUseAdvancedCoils ? 16 : 0; + case 1: + this.mLevel = 2; break; - case 12: - this.mLevel = tUseAdvancedCoils ? 0 : 1; + case 2: + this.mLevel = 4; break; - case 13: - this.mLevel = tUseAdvancedCoils ? 0 : 2; + case 3: + this.mLevel = 8; break; - case 14: - this.mLevel = tUseAdvancedCoils ? 0 : 4; + case 4: + this.mLevel = 16; break; default: return false; } - if (this.mLevel == 0) { - return false; - } for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if ((i != 0) || (j != 0)) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils || - aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5 && tUseAdvancedCoils) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings5) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index df62571864..19e7a5aa08 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -1,5 +1,7 @@ package gregtech.common.tileentities.machines.multi; +import java.util.ArrayList; + import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; @@ -17,8 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBase { public GT_MetaTileEntity_OilCracker(int aID, String aName, String aNameRegional) { @@ -120,10 +120,10 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa if (!(j == 0 && i == 0 && (h == -1 || h == 0 || h == 1))) { if (h == 1 || h == -1) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, j, h + zDir); - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings1) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, j, h + zDir) != GregTech_API.sBlockCasings5) { return false; } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 12) { + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, j, h + zDir) != 0) { return false; } } @@ -167,10 +167,10 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa if (!(j == 0 && i == 0 && (h == -1 || h == 0 || h == 1))) { if (h == 1 || h == -1) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + h, j, i + zDir); - if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings1) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + h, j, i + zDir) != GregTech_API.sBlockCasings5) { return false; } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 12) { + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + h, j, i + zDir) != 0) { return false; } } @@ -246,4 +246,4 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_MultiBlockBa return new GT_MetaTileEntity_OilCracker(this.mName); } -} \ No newline at end of file +} diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index fa35f7f30f..a69fddc981 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -1,5 +1,7 @@ package gregtech.common.tileentities.machines.multi; +import java.util.ArrayList; + import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -15,8 +17,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; - public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlockBase { public GT_MetaTileEntity_PyrolyseOven(int aID, String aName, String aNameRegional) { @@ -105,10 +105,10 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); if ((i != -2 && i != 2) && (j != -2 && j != 2)) {// innerer 3x3 ohne h�he if (h == 0) {// innen boden (kantal coils) - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings1) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings5) { return false; } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 13) { + if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) { return false; } } else if (h == 3) {// innen decke (ulv casings + input + muffler) @@ -186,4 +186,4 @@ public class GT_MetaTileEntity_PyrolyseOven extends GT_MetaTileEntity_MultiBlock return new GT_MetaTileEntity_PyrolyseOven(this.mName); } -} \ No newline at end of file +} -- cgit From ea5305f7dfbb06b7285ee50a7406e2d67b666147 Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Mon, 18 Jul 2016 14:56:21 +0300 Subject: Restored broken compatibility. --- .../java/gregtech/common/blocks/GT_Block_Casings1.java | 17 ++++++++++++++++- .../java/gregtech/common/blocks/GT_Block_Casings5.java | 4 ---- .../java/gregtech/common/blocks/GT_Item_Casings1.java | 17 +++++++++++++++++ .../common/blocks/GT_Item_Casings_Abstract.java | 2 ++ .../multi/GT_MetaTileEntity_FusionComputer1.java | 4 ++-- 5 files changed, 37 insertions(+), 7 deletions(-) (limited to 'src/main/java/gregtech/common') diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java index a9c07358be..4084a15da6 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -28,7 +28,10 @@ public class GT_Block_Casings1 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "MAX Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Bronze Plated Bricks"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing"); - + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cupronickel Coil Block (Overheated)"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block (Overheated)"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block (Overheated)"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block"); ItemList.Casing_ULV.set(new ItemStack(this, 1, 0)); ItemList.Casing_LV.set(new ItemStack(this, 1, 1)); ItemList.Casing_MV.set(new ItemStack(this, 1, 2)); @@ -41,6 +44,10 @@ public class GT_Block_Casings1 ItemList.Casing_MAX.set(new ItemStack(this, 1, 9)); ItemList.Casing_BronzePlatedBricks.set(new ItemStack(this, 1, 10)); ItemList.Casing_HeatProof.set(new ItemStack(this, 1, 11)); + ItemList.Casing_Coil_Cupronickel_Overheated.set(new ItemStack(this, 1, 12)); + ItemList.Casing_Coil_Kanthal_Overheated.set(new ItemStack(this, 1, 13)); + ItemList.Casing_Coil_Nichrome_Overheated.set(new ItemStack(this, 1, 14)); + ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15)); } public IIcon getIcon(int aSide, int aMeta) { @@ -50,6 +57,14 @@ public class GT_Block_Casings1 return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); case 11: return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); + case 12: + return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL_OVERHEATED.getIcon(); + case 13: + return Textures.BlockIcons.MACHINE_COIL_KANTHAL_OVERHEATED.getIcon(); + case 14: + return Textures.BlockIcons.MACHINE_COIL_NICHROME_OVERHEATED.getIcon(); + case 15: + return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); } if (aSide == 0) { return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon(); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java index c76354d9a2..b94346f2cf 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java @@ -21,14 +21,12 @@ public class GT_Block_Casings5 GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Nichrome Coil Block"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Tungstensteel Coil Block"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Naquadah Alloy Coil Block"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Superconducting Coil Block"); ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 0)); ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 1)); ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 2)); ItemList.Casing_Coil_TungstenSteel.set(new ItemStack(this, 1, 3)); ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 4)); - ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 5)); } @Override @SideOnly(Side.CLIENT) @@ -44,8 +42,6 @@ public class GT_Block_Casings5 return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon(); case 4: return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon(); - case 5: - return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); } return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); } 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 c253cca548..81b865d4fe 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java @@ -1,10 +1,27 @@ package gregtech.common.blocks; +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; public class GT_Item_Casings1 extends GT_Item_Casings_Abstract { public GT_Item_Casings1(Block par1) { super(par1); } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + super.addInformation(aStack, aPlayer, aList, aF3_H); + int tMeta = getDamage(aStack); + if (tMeta >= 12 && tMeta <= 14) { + aList.add(EnumChatFormatting.ITALIC + this.mCoilOverheated1Tooltip); + aList.add(EnumChatFormatting.ITALIC + this.mCoilOverheated2Tooltip); + } + } } 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 77fb8aacb2..8b34167c91 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 @@ -18,6 +18,8 @@ public abstract class GT_Item_Casings_Abstract protected final String mCoil03Tooltip = GT_LanguageManager.addStringLocalization("gt.coil03tooltip", "Base Heating Capacity = 3600 Kelvin"); protected final String mCoil04Tooltip = GT_LanguageManager.addStringLocalization("gt.coil04tooltip", "Base Heating Capacity = 4500 Kelvin"); protected final String mCoil05Tooltip = GT_LanguageManager.addStringLocalization("gt.coil05tooltip", "Base Heating Capacity = 9001 Kelvin"); + protected final String mCoilOverheated1Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated1.tooltip", "These coils are overheated"); + protected final String mCoilOverheated2Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated2.tooltip", "Place in crafting grid to repair"); protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof"); public GT_Item_Casings_Abstract(Block par1) { super(par1); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index 35d8ce77dc..39d38e9bd3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -39,12 +39,12 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC @Override public Block getFusionCoil() { - return GregTech_API.sBlockCasings5; + return GregTech_API.sBlockCasings1; } @Override public int getFusionCoilMeta() { - return 5; + return 15; } public String[] getDescription() { -- cgit