Added new heating coil blocks.

5 files changed, 62 insertions, 24 deletions

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 a1b9571436..8b1e4a4aa9 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -37,6 +37,8 @@ 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));
@@ -50,6 +52,8 @@ 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) {
@@ -83,9 +87,9 @@ public class GT_Block_Casings4
             case 13:
                 return Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon();
             case 14:
-                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+                return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon();
             case 15:
-                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+                return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon();
         }
         return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
     }
@@ -475,4 +479,4 @@ public class GT_Block_Casings4
         }
         return Textures.BlockIcons.CONNECTED_HULLS[(tStartIndex + 7)].getIcon();
     }
-}
\ No newline at end of file
+}
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 33447673cb..3dcfbf3c09 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings4.java
@@ -1,10 +1,25 @@
 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_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java
index 0ff5b904b7..77fb8aacb2 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
@@ -1,5 +1,7 @@
 package gregtech.common.blocks;

 

+import java.util.List;

+

 import gregtech.api.GregTech_API;

 import gregtech.api.util.GT_LanguageManager;

 import net.minecraft.block.Block;

@@ -7,8 +9,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemBlock;

 import net.minecraft.item.ItemStack;

 

-import java.util.List;

-

 public abstract class GT_Item_Casings_Abstract

         extends ItemBlock {

     protected final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block");

@@ -16,6 +16,8 @@ public abstract class GT_Item_Casings_Abstract
     protected final String mCoil01Tooltip = GT_LanguageManager.addStringLocalization("gt.coil01tooltip", "Base Heating Capacity = 1800 Kelvin");

     protected final String mCoil02Tooltip = GT_LanguageManager.addStringLocalization("gt.coil02tooltip", "Base Heating Capacity = 2700 Kelvin");

     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 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_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index bdeaa4f2df..0a90c00d0b 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
@@ -1,5 +1,8 @@
 package gregtech.common.tileentities.machines.multi;

 

+import java.util.ArrayList;

+import java.util.Arrays;

+

 import gregtech.api.GregTech_API;

 import gregtech.api.enums.Textures;

 import gregtech.api.gui.GT_GUIContainer_MultiMachine;

@@ -15,9 +18,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;

 import net.minecraftforge.fluids.FluidStack;

 

-import java.util.ArrayList;

-import java.util.Arrays;

-

 public class GT_MetaTileEntity_ElectricBlastFurnace

         extends GT_MetaTileEntity_MultiBlockBase {

     private int mHeatingCapacity = 0;

@@ -144,29 +144,38 @@ 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;

         switch (tUsedMeta) {

             case 12:

-                this.mHeatingCapacity = 1800;

+                this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 1800;

                 break;

             case 13:

-                this.mHeatingCapacity = 2700;

+                this.mHeatingCapacity = tUseAdvancedCoils ? 0 : 2700;

                 break;

             case 14:

-                this.mHeatingCapacity = 3600;

+                this.mHeatingCapacity = tUseAdvancedCoils ? 4500 : 3600;

+                break;

+            case 15:

+                this.mHeatingCapacity = tUseAdvancedCoils ? 9001 : 0;

                 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) {

+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||

+                        aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j) != GregTech_API.sBlockCasings4 && 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) {

+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||

+                        aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings4 && tUseAdvancedCoils) {

                         return false;

                     }

                     if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) {

@@ -219,4 +228,4 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
     public boolean explodesOnComponentBreak(ItemStack aStack) {

         return false;

     }

-}
\ No newline at end of file
+}

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 70a7249cae..7a7a30e446 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
@@ -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.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;

 import net.minecraftforge.common.util.ForgeDirection;

 

-import java.util.ArrayList;

-

 public class GT_MetaTileEntity_MultiFurnace

         extends GT_MetaTileEntity_MultiBlockBase {

     private int mLevel = 0;

@@ -76,8 +76,8 @@ public class GT_MetaTileEntity_MultiFurnace
             byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));

 

             int j = 0;

-            this.mOutputItems = new ItemStack[6 * this.mLevel];

-            for (int i = 0; (i < 100) && (j < this.mOutputItems.length); i++) {

+            this.mOutputItems = new ItemStack[8 * this.mLevel];

+            for (int i = 0; (i < 256) && (j < this.mOutputItems.length); i++) {

                 if (null != (this.mOutputItems[j] = GT_ModHandler.getSmeltingOutput((ItemStack) tInputList.get(i % tInputList.size()), true, null))) {

                     j++;

                 }

@@ -86,7 +86,7 @@ public class GT_MetaTileEntity_MultiFurnace
                 this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);

                 this.mEfficiencyIncrease = 10000;

 

-                this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * this.mLevel);

+                this.mEUt = (-4 * (1 << tTier - 1) * (1 << tTier - 1) * Math.min(this.mLevel, 8));

                 this.mMaxProgresstime = Math.max(1, 512 / (1 << tTier - 1));

             }

             updateSlots();

@@ -106,23 +106,31 @@ 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;

         switch (tUsedMeta) {

             case 12:

-                this.mLevel = 1;

+                this.mLevel = tUseAdvancedCoils ? 0 : 1;

                 break;

             case 13:

-                this.mLevel = 2;

+                this.mLevel = tUseAdvancedCoils ? 0 : 2;

                 break;

             case 14:

-                this.mLevel = 3;

+                this.mLevel = tUseAdvancedCoils ? 8 : 4;

+                break;

+            case 15:

+                this.mLevel = tUseAdvancedCoils ? 16 : 0;

                 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) {

+                    if (aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings1 && !tUseAdvancedCoils ||

+                        aBaseMetaTileEntity.getBlockOffset(xDir + i, 1, zDir + j) != GregTech_API.sBlockCasings4 && tUseAdvancedCoils) {

                         return false;

                     }

                     if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 1, zDir + j) != tUsedMeta) {

@@ -174,4 +182,4 @@ public class GT_MetaTileEntity_MultiFurnace
     public boolean explodesOnComponentBreak(ItemStack aStack) {

         return false;

     }

-}
\ No newline at end of file
+}