Merge branch 'OreDrills' into experimental

2 files changed, 26 insertions, 36 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 bbf489c6aa..81daf2c04a 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,7 @@ 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", "Mining Osmiridium Casing");
 
         ItemList.Casing_RobustTungstenSteel.set(new ItemStack(this, 1, 0));
         ItemList.Casing_CleanStainlessSteel.set(new ItemStack(this, 1, 1));
@@ -52,6 +53,7 @@ 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_MiningOsmiridium.set(new ItemStack(this, 1, 14));
     }
 
     public IIcon getIcon(int aSide, int aMeta) {
@@ -85,7 +87,7 @@ 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_CASING_MINING_OSMIRIDIUM.getIcon();
             case 15:
                 return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
         }
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
index 97cd810ec1..65008aaabe 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -33,46 +33,34 @@ public class GT_Item_Machines
             if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {

                 return;

             }

-            if (tDamage == 0) {

-                aList.add("WARNING, THE EXISTENCE OF THIS ITEM IS A BUG");

-                aList.add("IF YOU GOT IT IN SURVIVAL THEN PLEASE REPORT IT");

-            } else {

-                TileEntity temp = GregTech_API.sBlockMachines.createTileEntity(aPlayer == null ? GT_Values.DW : aPlayer.worldObj, GregTech_API.METATILEENTITIES[tDamage] == null ? 0 : GregTech_API.METATILEENTITIES[tDamage].getTileEntityBaseType());

-                if (temp != null) {

-                    temp.setWorldObj(aPlayer == null ? GT_Values.DW : aPlayer.worldObj);

-                    temp.xCoord = 0;

-                    temp.yCoord = 0;

-                    temp.zCoord = 0;

-                    if ((temp instanceof IGregTechTileEntity)) {

-                        IGregTechTileEntity tTileEntity = (IGregTechTileEntity) temp;

-                        tTileEntity.setInitialValuesAsNBT(new NBTTagCompound(), (short) tDamage);

-                        if (tTileEntity.getDescription() != null) {

-                            int i = 0;

+

+            if (GregTech_API.METATILEENTITIES[tDamage] != null) {

+                IGregTechTileEntity tTileEntity = GregTech_API.METATILEENTITIES[tDamage].getBaseMetaTileEntity();

+                if (tTileEntity.getDescription() != null) {

+                    int i = 0;

                     for (String tDescription : tTileEntity.getDescription()) {

                         if (GT_Utility.isStringValid(tDescription)) {

-                        	if(tDescription.contains("%%%")){

-                        		String[] tString = tDescription.split("%%%");

-                        		if(tString.length>=2){

+                            if(tDescription.contains("%%%")){

+                                String[] tString = tDescription.split("%%%");

+                                if(tString.length>=2){

                                     aList.add(GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tString[0], !GregTech_API.sPostloadFinished )+" "+tString[1]);

-                        		}

-                        	}else{String tTranslated = GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tDescription, !GregTech_API.sPostloadFinished );

-                            aList.add(tTranslated.equals("") ? tDescription : tTranslated);}

+                                }

+                            }else{String tTranslated = GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tDescription, !GregTech_API.sPostloadFinished );

+                                aList.add(tTranslated.equals("") ? tDescription : tTranslated);}

                         }else i++;

                     }

-                        }

-                        if (tTileEntity.getEUCapacity() > 0L) {

-                            if (tTileEntity.getInputVoltage() > 0L) {

-                                aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" + EnumChatFormatting.GRAY);

-                            }

-                            if (tTileEntity.getOutputVoltage() > 0L) {

-                                aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" + EnumChatFormatting.GRAY);

-                            }

-                            if (tTileEntity.getOutputAmperage() > 1L) {

-                                aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY);

-                            }

-                            aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "EU Capacity: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY);

-                        }

+                }

+                if (tTileEntity.getEUCapacity() > 0L) {

+                    if (tTileEntity.getInputVoltage() > 0L) {

+                        aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getInputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getInputVoltage())] + ")" + EnumChatFormatting.GRAY);

+                    }

+                    if (tTileEntity.getOutputVoltage() > 0L) {

+                        aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.GREEN + tTileEntity.getOutputVoltage() + " (" + GT_Values.VN[GT_Utility.getTier(tTileEntity.getOutputVoltage())] + ")" + EnumChatFormatting.GRAY);

+                    }

+                    if (tTileEntity.getOutputAmperage() > 1L) {

+                        aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.YELLOW + tTileEntity.getOutputAmperage() + EnumChatFormatting.GRAY);

                     }

+                    aList.add(GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ", !GregTech_API.sPostloadFinished ) + EnumChatFormatting.BLUE + tTileEntity.getEUCapacity() + EnumChatFormatting.GRAY);

                 }

             }

             NBTTagCompound aNBT = aStack.getTagCompound();

@@ -149,4 +137,4 @@ public class GT_Item_Machines
         }

         return true;

     }

-}

+}
\ No newline at end of file