aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks
diff options
context:
space:
mode:
authorOneEyeMaker <oneeyemaker@gmail.com>2016-07-18 09:06:26 +0300
committerDream-Master <dream-master@gmx.net>2016-07-25 22:45:30 +0200
commitf3653773320ed592c336c19ba7dffe68f5146f29 (patch)
tree53fd7535265c86b4ba8e07f99780ab13f9f26ff5 /src/main/java/gregtech/common/blocks
parent718d28bd2379ea67c46a284eab7723abfa5bf410 (diff)
downloadGT5-Unofficial-f3653773320ed592c336c19ba7dffe68f5146f29.tar.gz
GT5-Unofficial-f3653773320ed592c336c19ba7dffe68f5146f29.tar.bz2
GT5-Unofficial-f3653773320ed592c336c19ba7dffe68f5146f29.zip
ce1e6917e056c0a1300caefc175b10c68126832a
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings5.java24
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings5.java13
2 files changed, 8 insertions, 29 deletions
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 b94346f2cf..bcbc9af660 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java
@@ -16,31 +16,19 @@ 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() + ".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() + ".4.name", "Tungstensteel Coil Block");
+ GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.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_NaquadahAlloy.set(new ItemStack(this, 1, 4));
+ 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 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_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_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
index 7b5f281006..8e828d1220 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java
@@ -18,19 +18,10 @@ 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 0:
- aList.add(this.mCoil01Tooltip);
- break;
- case 1:
- aList.add(this.mCoil02Tooltip);
- break;
- case 2:
- aList.add(this.mCoil03Tooltip);
- break;
- case 3:
+ case 4:
aList.add(this.mCoil04Tooltip);
break;
- case 4:
+ case 5:
aList.add(this.mCoil05Tooltip);
break;
}