diff options
| author | Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> | 2022-03-05 22:16:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-05 14:16:19 +0000 |
| commit | 7d7a33522030e582e274250cf26547edf9eae3a3 (patch) | |
| tree | b9eb9dd466ebf51b74ce7e3761edc50f70fddc67 /src/main/java/gtPlusPlus/core | |
| parent | 502c85490610c0f908aabcac9ad335ff0c169846 (diff) | |
| download | GT5-Unofficial-7d7a33522030e582e274250cf26547edf9eae3a3.tar.gz GT5-Unofficial-7d7a33522030e582e274250cf26547edf9eae3a3.tar.bz2 GT5-Unofficial-7d7a33522030e582e274250cf26547edf9eae3a3.zip | |
fix broken frame/block oredict name (#148)
* fix broken frame/block oredict name
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index 2dc780bb78..f1e415ae76 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -54,7 +54,7 @@ public class BlockBaseModular extends BasicBlock { protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString, final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour, final int miningLevel) { - super(blockType, unlocalizedName, vanillaMaterial, miningLevel); + super(blockType, unlocalizedName, vanillaMaterial, miningLevel); this.setHarvestLevel(blockType.getHarvestTool(), miningLevel); this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture()); this.blockColour = colour; @@ -66,15 +66,19 @@ public class BlockBaseModular extends BasicBlock { //ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(), GetProperName()); GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture() + unlocalizedName)); if (fx == 0) { - GT_OreDictUnificator.registerOre("block" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this)); + GT_OreDictUnificator.registerOre("block" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } else if (fx == 1) { - GT_OreDictUnificator.registerOre("frameGt" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this)); + GT_OreDictUnificator.registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } else if (fx == 2) { - GT_OreDictUnificator.registerOre("frameGt" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this)); + GT_OreDictUnificator.registerOre("frameGt" + unifyMaterialName(thisBlockMaterial), ItemUtils.getSimpleStack(this)); } } + + public static String unifyMaterialName(String rawMaterName) { + return rawMaterName.replace(" ", "").replace("-", "").replace("_", ""); + } public boolean registerComponent() { Logger.MATERIALS("Attempting to register "+this.getUnlocalizedName()+"."); |