diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-06-14 18:24:53 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-06-14 18:24:53 +0200 |
| commit | fd714b65496fcdd6f610c1b7176c568781e32eb8 (patch) | |
| tree | b3e456c1a8d28e7e7a295567bc103ab8515707da | |
| parent | 2d8634e29bd5cf512c1cef04ad83bed3aeab8424 (diff) | |
| download | GT5-Unofficial-fd714b65496fcdd6f610c1b7176c568781e32eb8.tar.gz GT5-Unofficial-fd714b65496fcdd6f610c1b7176c568781e32eb8.tar.bz2 GT5-Unofficial-fd714b65496fcdd6f610c1b7176c568781e32eb8.zip | |
Revert "Quick fixes"
This reverts commit 4a08587c07dd9c0f2a6bc783d7e8108a85438fd6.
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java | 10 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Stones.java | 21 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java index 929b612d50..5254b0481b 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java @@ -697,14 +697,4 @@ public abstract class MetaPipeEntity implements IMetaTileEntity { public boolean allowGeneralRedstoneOutput(){ return false; } - - @Override - public boolean hasAlternativeModeText() { - return false; - } - - @Override - public String getAlternativeModeText() { - return ""; - } }
\ No newline at end of file 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 efac529b18..8da05da7b2 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Stones.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones.java @@ -29,11 +29,22 @@ public class GT_Block_Stones extends GT_Block_Stones_Abstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Mossy Basalt Bricks"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Chiseled Basalt"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Smooth Basalt"); - for(int i = 0;i<16;i++){ - GT_OreDictUnificator.registerOre(OrePrefixes.stone, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i)); - GT_OreDictUnificator.registerOre(OrePrefixes.block, i < 8 ? Materials.Marble : Materials.Basalt, new ItemStack(this, 1, i)); - GT_OreDictUnificator.registerOre((i < 8 ? Materials.Marble.mName.toLowerCase() : Materials.Basalt.mName.toLowerCase()), new ItemStack(this, 1, i)); - } + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 0)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 1)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 2)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 3)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 4)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 5)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 6)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Marble, new ItemStack(this, 1, 7)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 8)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 9)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 10)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 11)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 12)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 13)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 14)); + GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Basalt, new ItemStack(this, 1, 15)); } public int getHarvestLevel(int aMeta) { |