Merge branch 'experimental' into Ore-Drilling-T5+T6

# Conflicts:
#	src/main/java/gregtech/api/enums/Textures.java

1 files changed, 88 insertions, 88 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
index 428369e569..fde793522a 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java
@@ -1,88 +1,88 @@
-package gregtech.common.blocks;

-

-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_Casings3

-        extends GT_Block_Casings_Abstract {

-    public GT_Block_Casings3() {

-        super(GT_Item_Casings3.class, "gt.blockcasings3", GT_Material_Casings.INSTANCE);

-        for (byte i = 0; i < 16; i = (byte) (i + 1)) {

-            Textures.BlockIcons.CASING_BLOCKS[(i + 32)] = new GT_CopiedBlockTexture(this, 6, i);

-        }

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Yellow Stripes Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Yellow Stripes Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Radioactive Hazard Sign Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Bio Hazard Sign Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Explosion Hazard Sign Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fire Hazard Sign Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Acid Hazard Sign Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Hazard Sign Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Frost Hazard Sign Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Noise Hazard Sign Block");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Grate Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Filter Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Radiation Proof Machine Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Bronze Firebox Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Steel Firebox Casing");

-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Firebox Casing");

-        ItemList.Casing_Stripes_A.set(new ItemStack(this, 1, 0));

-        ItemList.Casing_Stripes_B.set(new ItemStack(this, 1, 1));

-        ItemList.Casing_RadioactiveHazard.set(new ItemStack(this, 1, 2));

-        ItemList.Casing_BioHazard.set(new ItemStack(this, 1, 3));

-        ItemList.Casing_ExplosionHazard.set(new ItemStack(this, 1, 4));

-        ItemList.Casing_FireHazard.set(new ItemStack(this, 1, 5));

-        ItemList.Casing_AcidHazard.set(new ItemStack(this, 1, 6));

-        ItemList.Casing_MagicHazard.set(new ItemStack(this, 1, 7));

-        ItemList.Casing_FrostHazard.set(new ItemStack(this, 1, 8));

-        ItemList.Casing_NoiseHazard.set(new ItemStack(this, 1, 9));

-        ItemList.Casing_Grate.set(new ItemStack(this, 1, 10));

-        ItemList.Casing_Vent.set(new ItemStack(this, 1, 11));

-        ItemList.Casing_RadiationProof.set(new ItemStack(this, 1, 12));

-        ItemList.Casing_Firebox_Bronze.set(new ItemStack(this, 1, 13));

-        ItemList.Casing_Firebox_Steel.set(new ItemStack(this, 1, 14));

-        ItemList.Casing_Firebox_TungstenSteel.set(new ItemStack(this, 1, 15));

-    }

-

-    public IIcon getIcon(int aSide, int aMeta) {

-        switch (aMeta) {

-            case 0:

-                return Textures.BlockIcons.MACHINE_CASING_STRIPES_A.getIcon();

-            case 1:

-                return Textures.BlockIcons.MACHINE_CASING_STRIPES_B.getIcon();

-            case 2:

-                return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();

-            case 3:

-                return Textures.BlockIcons.MACHINE_CASING_BIOHAZARD.getIcon();

-            case 4:

-                return Textures.BlockIcons.MACHINE_CASING_EXPLOSIONHAZARD.getIcon();

-            case 5:

-                return Textures.BlockIcons.MACHINE_CASING_FIREHAZARD.getIcon();

-            case 6:

-                return Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD.getIcon();

-            case 7:

-                return Textures.BlockIcons.MACHINE_CASING_MAGICHAZARD.getIcon();

-            case 8:

-                return Textures.BlockIcons.MACHINE_CASING_FROSTHAZARD.getIcon();

-            case 9:

-                return Textures.BlockIcons.MACHINE_CASING_NOISEHAZARD.getIcon();

-            case 10:

-                return Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon();

-            case 11:

-                return Textures.BlockIcons.MACHINE_CASING_VENT.getIcon();

-            case 12:

-                return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();

-            case 13:

-                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon() : Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();

-            case 14:

-                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon() : Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();

-            case 15:

-                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TUNGSTENSTEEL.getIcon() : Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();

-        }

-        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();

-    }

-}

+package gregtech.common.blocks;
+
+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_Casings3
+        extends GT_Block_Casings_Abstract {
+    public GT_Block_Casings3() {
+        super(GT_Item_Casings3.class, "gt.blockcasings3", GT_Material_Casings.INSTANCE);
+        for (byte i = 0; i < 16; i = (byte) (i + 1)) {
+            Textures.BlockIcons.casingTexturePages[0][(i + 32)] = new GT_CopiedBlockTexture(this, 6, i);
+        }
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Yellow Stripes Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Yellow Stripes Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Radioactive Hazard Sign Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Bio Hazard Sign Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Explosion Hazard Sign Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Fire Hazard Sign Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Acid Hazard Sign Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Magic Hazard Sign Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Frost Hazard Sign Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Noise Hazard Sign Block");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Grate Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Filter Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Radiation Proof Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Bronze Firebox Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Steel Firebox Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Tungstensteel Firebox Casing");
+        ItemList.Casing_Stripes_A.set(new ItemStack(this, 1, 0));
+        ItemList.Casing_Stripes_B.set(new ItemStack(this, 1, 1));
+        ItemList.Casing_RadioactiveHazard.set(new ItemStack(this, 1, 2));
+        ItemList.Casing_BioHazard.set(new ItemStack(this, 1, 3));
+        ItemList.Casing_ExplosionHazard.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_FireHazard.set(new ItemStack(this, 1, 5));
+        ItemList.Casing_AcidHazard.set(new ItemStack(this, 1, 6));
+        ItemList.Casing_MagicHazard.set(new ItemStack(this, 1, 7));
+        ItemList.Casing_FrostHazard.set(new ItemStack(this, 1, 8));
+        ItemList.Casing_NoiseHazard.set(new ItemStack(this, 1, 9));
+        ItemList.Casing_Grate.set(new ItemStack(this, 1, 10));
+        ItemList.Casing_Vent.set(new ItemStack(this, 1, 11));
+        ItemList.Casing_RadiationProof.set(new ItemStack(this, 1, 12));
+        ItemList.Casing_Firebox_Bronze.set(new ItemStack(this, 1, 13));
+        ItemList.Casing_Firebox_Steel.set(new ItemStack(this, 1, 14));
+        ItemList.Casing_Firebox_TungstenSteel.set(new ItemStack(this, 1, 15));
+    }
+
+    public IIcon getIcon(int aSide, int aMeta) {
+        switch (aMeta) {
+            case 0:
+                return Textures.BlockIcons.MACHINE_CASING_STRIPES_A.getIcon();
+            case 1:
+                return Textures.BlockIcons.MACHINE_CASING_STRIPES_B.getIcon();
+            case 2:
+                return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
+            case 3:
+                return Textures.BlockIcons.MACHINE_CASING_BIOHAZARD.getIcon();
+            case 4:
+                return Textures.BlockIcons.MACHINE_CASING_EXPLOSIONHAZARD.getIcon();
+            case 5:
+                return Textures.BlockIcons.MACHINE_CASING_FIREHAZARD.getIcon();
+            case 6:
+                return Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD.getIcon();
+            case 7:
+                return Textures.BlockIcons.MACHINE_CASING_MAGICHAZARD.getIcon();
+            case 8:
+                return Textures.BlockIcons.MACHINE_CASING_FROSTHAZARD.getIcon();
+            case 9:
+                return Textures.BlockIcons.MACHINE_CASING_NOISEHAZARD.getIcon();
+            case 10:
+                return Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon();
+            case 11:
+                return Textures.BlockIcons.MACHINE_CASING_VENT.getIcon();
+            case 12:
+                return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
+            case 13:
+                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon() : Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();
+            case 14:
+                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon() : Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+            case 15:
+                return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TUNGSTENSTEEL.getIcon() : Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+        }
+        return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+    }
+}