Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator

2 files changed, 23 insertions, 2 deletions

diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
index cd4ab71ea8..d8ef031e11 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java
@@ -40,7 +40,7 @@ import java.util.Random;
 public class GT_Block_Reinforced extends GT_Generic_Block {
 
     public GT_Block_Reinforced(String aName) {
-        super(GT_Item_Storage.class, aName, Material.rock);
+        super(GT_Item_Storage.class, aName, new GT_Material_Reinforced());
         setStepSound(soundTypeStone);
         setCreativeTab(GregTech_API.TAB_GREGTECH);
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Bronzeplate Reinforced Block");
@@ -65,7 +65,8 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
     }
 
     public String getHarvestTool(int aMeta) {
-        if (aMeta == 4||aMeta == 5) return "axe";
+        if (aMeta == 4) return "shovel";
+        if (aMeta == 5) return "axe";
         return "pickaxe";
     }
 
@@ -98,6 +99,9 @@ public class GT_Block_Reinforced extends GT_Generic_Block {
         if (aWorld == null) {
             return 0.0F;
         }
+        if (aWorld.isAirBlock(aX, aY, aZ)) {
+            return 0.0F;
+        }
         int tMeta = aWorld.getBlockMetadata(aX, aY, aZ);
         if (tMeta == 0) {
             return 60.0F;
diff --git a/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java
new file mode 100644
index 0000000000..a6cf425caa
--- /dev/null
+++ b/src/main/java/gregtech/common/blocks/GT_Material_Reinforced.java
@@ -0,0 +1,17 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+
+public class GT_Material_Reinforced
+        extends Material {
+    public GT_Material_Reinforced() {
+        super(MapColor.stoneColor);
+        setRequiresTool();
+        setAdventureModeExempt();
+    }
+
+    public boolean isOpaque() {
+        return false;
+    }
+}