Update with exp changes

10 files changed, 76 insertions, 83 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
index 2793130d91..d9c05fd17a 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -12,6 +12,7 @@ import gregtech.api.items.GT_Generic_Block;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;

 import gregtech.api.metatileentity.BaseMetaTileEntity;

 import gregtech.api.metatileentity.BaseTileEntity;

+import gregtech.api.objects.XSTR;

 import gregtech.api.util.GT_BaseCrop;

 import gregtech.api.util.GT_Log;

 import gregtech.api.util.GT_Utility;

@@ -211,15 +212,13 @@ public class GT_Block_Machines
             GregTech_API.sBlockIcons = aIconRegister;

 

             GT_Log.out.println("GT_Mod: Registering MetaTileEntity specific Textures");

-            for (IMetaTileEntity tMetaTileEntity : GregTech_API.METATILEENTITIES) {

-                try {

+            try {

+                for (IMetaTileEntity tMetaTileEntity : GregTech_API.METATILEENTITIES) {

                     if (tMetaTileEntity != null) {

                         tMetaTileEntity.registerIcons(aIconRegister);

                     }

-                } catch (Throwable e) {

-                    e.printStackTrace(GT_Log.err);

                 }

-            }

+            } catch (Throwable e) {e.printStackTrace(GT_Log.err);}

             GT_Log.out.println("GT_Mod: Registering Crop specific Textures");

             try {

                 for (GT_BaseCrop tCrop : GT_BaseCrop.sCropList) {

@@ -230,13 +229,11 @@ public class GT_Block_Machines
             }

             GT_Log.out.println("GT_Mod: Starting Block Icon Load Phase");

             System.out.println("GT_Mod: Starting Block Icon Load Phase");

-            for (Runnable tRunnable : GregTech_API.sGTBlockIconload) {

-                try {

+            try {

+                for (Runnable tRunnable : GregTech_API.sGTBlockIconload) {

                     tRunnable.run();

-                } catch (Throwable e) {

-                    e.printStackTrace(GT_Log.err);

                 }

-            }

+            } catch (Throwable e) {e.printStackTrace(GT_Log.err);}

             GT_Log.out.println("GT_Mod: Finished Block Icon Load Phase");

             System.out.println("GT_Mod: Finished Block Icon Load Phase");

         }

@@ -281,8 +278,7 @@ public class GT_Block_Machines
 

     public void onBlockClicked(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer) {

         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

-        if ((tTileEntity != null) &&

-                ((tTileEntity instanceof IGregTechTileEntity))) {

+        if (((tTileEntity instanceof IGregTechTileEntity))) {

             ((IGregTechTileEntity) tTileEntity).onLeftclick(aPlayer);

         }

     }

@@ -308,7 +304,7 @@ public class GT_Block_Machines
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

         if ((tTileEntity instanceof IGregTechTileEntity)) {

             IGregTechTileEntity tGregTechTileEntity = (IGregTechTileEntity) tTileEntity;

-            Random tRandom = new Random();

+            Random tRandom = new XSTR();

             mTemporaryTileEntity.set(tGregTechTileEntity);

             for (int i = 0; i < tGregTechTileEntity.getSizeInventory(); i++) {

                 ItemStack tItem = tGregTechTileEntity.getStackInSlot(i);

@@ -340,7 +336,7 @@ public class GT_Block_Machines
 

     public int getComparatorInputOverride(World aWorld, int aX, int aY, int aZ, int aSide) {

         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

-        if ((tTileEntity != null) && ((tTileEntity instanceof IGregTechTileEntity))) {

+        if (((tTileEntity instanceof IGregTechTileEntity))) {

             return ((IGregTechTileEntity) tTileEntity).getComparatorValue((byte) aSide);

         }

         return 0;

@@ -351,7 +347,7 @@ public class GT_Block_Machines
             return 0;

         }

         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

-        if ((tTileEntity != null) && ((tTileEntity instanceof IGregTechTileEntity))) {

+        if (((tTileEntity instanceof IGregTechTileEntity))) {

             return ((IGregTechTileEntity) tTileEntity).getOutputRedstoneSignal(GT_Utility.getOppositeSide(aSide));

         }

         return 0;

@@ -362,7 +358,7 @@ public class GT_Block_Machines
             return 0;

         }

         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

-        if ((tTileEntity != null) && ((tTileEntity instanceof IGregTechTileEntity))) {

+        if (((tTileEntity instanceof IGregTechTileEntity))) {

             return ((IGregTechTileEntity) tTileEntity).getStrongOutputRedstoneSignal(GT_Utility.getOppositeSide(aSide));

         }

         return 0;

@@ -428,7 +424,7 @@ public class GT_Block_Machines
 

     public float getExplosionResistance(Entity par1Entity, World aWorld, int aX, int aY, int aZ, double explosionX, double explosionY, double explosionZ) {

         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

-        if ((tTileEntity != null) && ((tTileEntity instanceof IGregTechTileEntity))) {

+        if (((tTileEntity instanceof IGregTechTileEntity))) {

             return ((IGregTechTileEntity) tTileEntity).getBlastResistance((byte) 6);

         }

         return 10.0F;

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
index d852aebdcb..66e2f76d05 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java
@@ -13,7 +13,7 @@ import net.minecraft.init.Blocks;
 
 public class GT_Block_Ores extends GT_Block_Ores_Abstract {
     public GT_Block_Ores() {
-        super("gt.blockores", 7, Material.rock);
+        super("gt.blockores", 7, false, Material.rock);
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
index b1cba7aa7e..e554777be2 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
@@ -37,8 +37,10 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     public static boolean FUCKING_LOCK = false;
     public static boolean tHideOres;
     public static int tOreMetaCount;
+    private final String aTextName = ".name";
+    private final String aTextSmall = "Small ";
 
-    protected GT_Block_Ores_Abstract(String aUnlocalizedName, int aOreMetaCount, Material aMaterial) {
+    protected GT_Block_Ores_Abstract(String aUnlocalizedName, int aOreMetaCount, boolean aHideFirstMeta, Material aMaterial) {
         super(GT_Item_Ores.class, aUnlocalizedName, aMaterial);
         this.isBlockContainer = true;
         setStepSound(soundTypeStone);
@@ -53,12 +55,13 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
             if (GregTech_API.sGeneratedMaterials[i] != null) {
                 for (int j = 0; j < aOreMetaCount; j++) {
-                    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + (j * 1000)) + ".name", getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
-                    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + ".name", "Small " + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + (i + (j * 1000)) + aTextName, getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
+                    GT_LanguageManager.addStringLocalization(getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + aTextName, aTextSmall + getLocalizedName(GregTech_API.sGeneratedMaterials[i]));
                     if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0) {
                         GT_OreDictUnificator.registerOre(this.getProcessingPrefix()[j] != null ? this.getProcessingPrefix()[j].get(GregTech_API.sGeneratedMaterials[i]) : "", new ItemStack(this, 1, i + (j * 1000)));
                         if (tHideOres) {
-                            if (!aUnlocalizedName.equals("gt.blockores") && !(i + (j * 1000) < 1000)) codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000)));
+                            if(!(j == 0 && !aHideFirstMeta)){
+                                codechicken.nei.api.API.hideItem(new ItemStack(this, 1, i + (j * 1000)));}
                             codechicken.nei.api.API.hideItem(new ItemStack(this, 1, (i + 16000) + (j * 1000)));
                         }
                     }
@@ -151,7 +154,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     public abstract String getUnlocalizedName();
 
     public String getLocalizedName() {
-        return StatCollector.translateToLocal(getUnlocalizedName() + ".name");
+        return StatCollector.translateToLocal(getUnlocalizedName() + aTextName);
     }
 
     public int getRenderType() {
@@ -199,7 +202,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
 
     public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
         TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if ((tTileEntity != null) && ((tTileEntity instanceof GT_TileEntity_Ores))) {
+        if (((tTileEntity instanceof GT_TileEntity_Ores))) {
             return ((GT_TileEntity_Ores) tTileEntity).getMetaData();
         }
         return 0;
@@ -239,23 +242,23 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
         for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {
             Materials tMaterial = GregTech_API.sGeneratedMaterials[i];
             if ((tMaterial != null) && ((tMaterial.mTypes & 0x8) != 0)) {
-                if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i));
-                if (!(new ItemStack(aItem, 1, i + 1000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 1000));
-                if (!(new ItemStack(aItem, 1, i + 2000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 2000));
-                if (!(new ItemStack(aItem, 1, i + 3000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 3000));
-                if (!(new ItemStack(aItem, 1, i + 4000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 4000));
-                if (!(new ItemStack(aItem, 1, i + 5000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 5000));
-                if (!(new ItemStack(aItem, 1, i + 6000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 6000));
-                if (!(new ItemStack(aItem, 1, i + 7000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 7000));
-                if (!(new ItemStack(aItem, 1, i + 16000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 16000));
-                if (!(new ItemStack(aItem, 1, i + 17000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 17000));
-                if (!(new ItemStack(aItem, 1, i + 18000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 18000));
-                if (!(new ItemStack(aItem, 1, i + 19000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 19000));
-                if (!(new ItemStack(aItem, 1, i + 20000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 20000));
-                if (!(new ItemStack(aItem, 1, i + 21000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 21000));
-                if (!(new ItemStack(aItem, 1, i + 22000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 22000));
-                if (!(new ItemStack(aItem, 1, i + 23000).getDisplayName().contains(".name"))) aList.add(new ItemStack(aItem, 1, i + 23000));
+                if (!(new ItemStack(aItem, 1, i).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i));
+                if (!(new ItemStack(aItem, 1, i + 1000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 1000));
+                if (!(new ItemStack(aItem, 1, i + 2000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 2000));
+                if (!(new ItemStack(aItem, 1, i + 3000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 3000));
+                if (!(new ItemStack(aItem, 1, i + 4000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 4000));
+                if (!(new ItemStack(aItem, 1, i + 5000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 5000));
+                if (!(new ItemStack(aItem, 1, i + 6000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 6000));
+                if (!(new ItemStack(aItem, 1, i + 7000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 7000));
+                if (!(new ItemStack(aItem, 1, i + 16000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 16000));
+                if (!(new ItemStack(aItem, 1, i + 17000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 17000));
+                if (!(new ItemStack(aItem, 1, i + 18000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 18000));
+                if (!(new ItemStack(aItem, 1, i + 19000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 19000));
+                if (!(new ItemStack(aItem, 1, i + 20000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 20000));
+                if (!(new ItemStack(aItem, 1, i + 21000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 21000));
+                if (!(new ItemStack(aItem, 1, i + 22000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 22000));
+                if (!(new ItemStack(aItem, 1, i + 23000).getDisplayName().contains(aTextName))) aList.add(new ItemStack(aItem, 1, i + 23000));
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_GC.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_GC.java
index eddbbda9d0..23061baada 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_GC.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_GC.java
@@ -15,7 +15,7 @@ public class GT_Block_Ores_GC extends GT_Block_Ores_Abstract {
     Block aMarsBlock = GameRegistry.findBlock("GalacticraftMars", "tile.mars");
 
     public GT_Block_Ores_GC() {
-        super("gt.blockores.gc", 4, Material.rock);
+        super("gt.blockores.gc", 4, true, Material.rock);
         if (aMoonBlock == null) aMoonBlock = Blocks.stone;
         if (aMarsBlock == null) aMarsBlock = Blocks.stone;
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java
index f1089a52bb..ac17e65b93 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java
@@ -14,7 +14,7 @@ public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract {
     Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "igneousStone");
 
     public GT_Block_Ores_UB1() {
-        super("gt.blockores.ub1", 8, Material.rock);
+        super("gt.blockores.ub1", 8, true, Material.rock);
         if (aUBBlock == null) aUBBlock = Blocks.stone;
     }
 
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java
index 5306b964cb..e4caa95db7 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java
@@ -14,7 +14,7 @@ public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract {
     Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "metamorphicStone");
 
     public GT_Block_Ores_UB2() {
-        super("gt.blockores.ub2", 8, Material.rock);
+        super("gt.blockores.ub2", 8, true, Material.rock);
         if (aUBBlock == null) aUBBlock = Blocks.stone;
     }
 
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java
index 6867de10dd..4cf76dfb1d 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java
@@ -14,7 +14,7 @@ public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract {
     Block aUBBlock = GameRegistry.findBlock("UndergroundBiomes", "sedimentaryStone");
 
     public GT_Block_Ores_UB3() {
-        super("gt.blockores.ub3", 8, Material.rock);
+        super("gt.blockores.ub3", 8, true, Material.rock);
         if (aUBBlock == null) aUBBlock = Blocks.stone;
     }
 
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
index 8da05da7b2..05c294f0ee 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java
@@ -48,7 +48,7 @@ public class GT_Block_Stones extends GT_Block_Stones_Abstract {
     }
 
     public int getHarvestLevel(int aMeta) {
-        return 2;
+        return 1;
     }
 
     public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {
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 e03cabe783..281176542f 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -33,53 +33,46 @@ 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;

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

-                                if (GT_Utility.isStringValid(tDescription)) {

-                                    aList.add(GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tDescription, !GregTech_API.sPostloadFinished));

-                                }

-                            }

-                        }

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

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

+            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;

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

+                        if (GT_Utility.isStringValid(tDescription)) {

+                            aList.add(GT_LanguageManager.addStringLocalization("TileEntity_DESCRIPTION_" + tDamage + "_Index_" + i++, tDescription, !GregTech_API.sPostloadFinished ));

                         }

                     }

                 }

+                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();

             if (aNBT != null) {

                 if (aNBT.getBoolean("mMuffler")) {

-                    aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade", !GregTech_API.sPostloadFinished));

+                    aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade", !GregTech_API.sPostloadFinished ));

                 }

                 if (aNBT.getBoolean("mSteamConverter")) {

-                    aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade", !GregTech_API.sPostloadFinished));

+                    aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade", !GregTech_API.sPostloadFinished ));

                 }

                 int tAmount = 0;

                 if ((tAmount = aNBT.getByte("mSteamTanks")) > 0) {

-                    aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMTANKS", "Steam Tank Upgrades", !GregTech_API.sPostloadFinished));

+                    aList.add(tAmount + " " + GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMTANKS", "Steam Tank Upgrades", !GregTech_API.sPostloadFinished ));

                 }

             }

         } catch (Throwable e) {

@@ -143,4 +136,4 @@ public class GT_Item_Machines
         }

         return true;

     }

-}

+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
index b3a28fb0ae..c7dd416e5e 100644
--- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
+++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java
@@ -9,6 +9,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ITexturedTileEntity;
 import gregtech.api.objects.GT_CopiedBlockTexture;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.XSTR;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -208,7 +209,7 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit
             aFortune = 0;
         }
         if (aMaterial != null) {
-            Random tRandom = new Random(this.xCoord ^ this.yCoord ^ this.zCoord);
+            Random tRandom = new XSTR(this.xCoord ^ this.yCoord ^ this.zCoord);
             ArrayList<ItemStack> tSelector = new ArrayList();