aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-08-19 12:15:05 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-08-19 12:15:05 +0100
commit46daf120bb00b03a4889863466a74b00e15468d8 (patch)
tree4aac9c0b818a36d932b2442cd45af6f546c8cce2 /src/main/java/gregtech/common/blocks
parenteaadf6f74bbcc37886eb7803b1b6949c6646923d (diff)
downloadGT5-Unofficial-46daf120bb00b03a4889863466a74b00e15468d8.tar.gz
GT5-Unofficial-46daf120bb00b03a4889863466a74b00e15468d8.tar.bz2
GT5-Unofficial-46daf120bb00b03a4889863466a74b00e15468d8.zip
initMaterialProperties
Diffstat (limited to 'src/main/java/gregtech/common/blocks')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_GC.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java2
6 files changed, 7 insertions, 7 deletions
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 66e2f76d05..d852aebdcb 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, false, Material.rock);
+ super("gt.blockores", 7, 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 82ef4f4fec..b1cba7aa7e 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
@@ -38,7 +38,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
public static boolean tHideOres;
public static int tOreMetaCount;
- protected GT_Block_Ores_Abstract(String aUnlocalizedName, int aOreMetaCount, boolean aHideFirstMeta, Material aMaterial) {
+ protected GT_Block_Ores_Abstract(String aUnlocalizedName, int aOreMetaCount, Material aMaterial) {
super(GT_Item_Ores.class, aUnlocalizedName, aMaterial);
this.isBlockContainer = true;
setStepSound(soundTypeStone);
@@ -58,7 +58,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
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) {
- codechicken.nei.api.API.hideItem(new ItemStack(this, 1, (j == 0 && aHideFirstMeta) ? i : i + (j * 1000)));
+ if (!aUnlocalizedName.equals("gt.blockores") && !(i + (j * 1000) < 1000)) 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)));
}
}
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 23061baada..eddbbda9d0 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, true, Material.rock);
+ super("gt.blockores.gc", 4, 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 ac17e65b93..f1089a52bb 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, true, Material.rock);
+ super("gt.blockores.ub1", 8, 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 e4caa95db7..5306b964cb 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, true, Material.rock);
+ super("gt.blockores.ub2", 8, 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 4cf76dfb1d..6867de10dd 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, true, Material.rock);
+ super("gt.blockores.ub3", 8, Material.rock);
if (aUBBlock == null) aUBBlock = Blocks.stone;
}