aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings1.java18
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings4.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings5.java56
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings1.java23
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings5.java44
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java10
6 files changed, 129 insertions, 24 deletions
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..7eb7cb4189 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java
@@ -28,9 +28,9 @@ 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() + ".12.name", "Cupronickel Coil Block (Deprecated)");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block (Deprecated)");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block (Deprecated)");
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));
@@ -44,9 +44,9 @@ 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_Cupronickel_Deprecated.set(new ItemStack(this, 1, 12));
+ ItemList.Casing_Coil_Kanthal_Deprecated.set(new ItemStack(this, 1, 13));
+ ItemList.Casing_Coil_Nichrome_Deprecated.set(new ItemStack(this, 1, 14));
ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));
}
@@ -58,11 +58,11 @@ public class GT_Block_Casings1
case 11:
return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
case 12:
- return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
+ return Textures.BlockIcons.RENDERING_ERROR.getIcon();
case 13:
- return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon();
+ return Textures.BlockIcons.RENDERING_ERROR.getIcon();
case 14:
- return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();
+ return Textures.BlockIcons.RENDERING_ERROR.getIcon();
case 15:
return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
}
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..3c3535e4da 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
@@ -475,4 +475,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_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
new file mode 100644
index 0000000000..d6c5bfebc9
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
@@ -0,0 +1,56 @@
+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() + ".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", "HSS-G Coil Block");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Naquadah Coil Block");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Naquadah Alloy 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_HSSG.set(new ItemStack(this, 1, 4));
+ ItemList.Casing_Coil_Naquadah.set(new ItemStack(this, 1, 5));
+ ItemList.Casing_Coil_NaquadahAlloy.set(new ItemStack(this, 1, 6));
+ }
+ @Override
+ @SideOnly(Side.CLIENT)
+ public IIcon getIcon(int aSide, int aMeta) {
+ switch (aMeta) {
+ 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 4:
+ return Textures.BlockIcons.MACHINE_COIL_HSSG.getIcon();
+ case 5:
+ return Textures.BlockIcons.MACHINE_COIL_NAQUADAH.getIcon();
+ case 6:
+ 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_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings1.java
index a02124706e..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,28 +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 java.util.List;
+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);
- switch (getDamage(aStack)) {
- case 12:
- aList.add(this.mCoil01Tooltip);
- break;
- case 13:
- aList.add(this.mCoil02Tooltip);
- break;
- case 14:
- aList.add(this.mCoil03Tooltip);
+ 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_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
new file mode 100644
index 0000000000..36e7fea047
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
@@ -0,0 +1,44 @@
+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 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 4:
+ aList.add(this.mCoil05Tooltip);
+ break;
+ case 5:
+ aList.add(this.mCoil06Tooltip);
+ break;
+ case 6:
+ aList.add(this.mCoil07Tooltip);
+ 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..e7298154dc 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,12 @@ 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 = 5400 Kelvin");
+ protected final String mCoil06Tooltip = GT_LanguageManager.addStringLocalization("gt.coil06tooltip", "Base Heating Capacity = 7200 Kelvin");
+ protected final String mCoil07Tooltip = GT_LanguageManager.addStringLocalization("gt.coil07tooltip", "Base Heating Capacity = 9001 Kelvin");
+ protected final String mCoilOverheated1Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated1.tooltip", "These coils are deprecated");
+ protected final String mCoilOverheated2Tooltip = GT_LanguageManager.addStringLocalization("gt.coil.overheated2.tooltip", "Place in crafting grid to get regular coils");
protected final String mBlastProofTooltip = GT_LanguageManager.addStringLocalization("gt.blastprooftooltip", "This Block is Blast Proof");
public GT_Item_Casings_Abstract(Block par1) {
super(par1);
generated by cgit (git 2.46.0) at 2025-03-26 16:29:40 +0000