diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java index a1ea822..332920d 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java @@ -8,32 +8,34 @@ import com.sosnitzka.ztic_addon.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.oredict.OreDictionary; +import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.util.Arrays; public class Blocks { - public static Block basalt = new BasicBlockOre("basalt", Material.ROCK, 45.0f, 35.0f, 3, null); + public static Block basalt = new BasicBlockOre("basalt", Material.ROCK, 45.0f, 35.0f, 3); public static Block rottenGround = new BasicBlockGround("rotten_ground", Material.GROUND, 2.0f, 2.0f, 0); public static Block ligniteOre = new BlockLigniteOre(); - public static Block aardiumOre = new BasicBlockOre("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3, "oreAardium"); - public static Block adamantiteOre = new BasicBlockOre("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 4, "oreAdamantite"); - public static Block arcaniteOre = new BasicBlockOre("arcanite_ore", Material.ROCK, 23.0f, 25.0f, 2, "oreArcanite"); - public static Block axiidianOre = new BasicBlockOre("axiidian_ore", Material.ROCK, 13.0f, 13.0f, 3, "oreAxiidian"); - public static Block bismuthOre = new BasicBlockOre("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 1, "oreBismuth"); - public static Block eterniteOre = new BasicBlockOre("eternite_ore", Material.ROCK, 24.0f, 25.0f, 3, "oreEternite"); - public static Block ignititeOre = new BasicBlockOre("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 3, "oreIgnitite"); - public static Block karmesineOre = new BasicBlockOre("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1, "oreKarmesine"); - public static Block meteoriteOre = new BasicBlockOre("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 4, "oreMeteorite"); - public static Block mindoriteOre = new BasicBlockOre("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2, "oreMindorite"); - public static Block mythrilOre = new BasicBlockOre("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4, "oreMythril"); - public static Block palladiumOre = new BasicBlockOre("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3, "orePalladium"); - public static Block prometheumOre = new BasicBlockOre("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, "orePrometheum", 0.8F); - public static Block slagironOre = new BasicBlockOre("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1, "orePrometheum"); - public static Block slaggoldOre = new BasicBlockOre("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1, null); + public static Block aardiumOre = new BasicBlockOre("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3); + public static Block adamantiteOre = new BasicBlockOre("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 4); + public static Block arcaniteOre = new BasicBlockOre("arcanite_ore", Material.ROCK, 23.0f, 25.0f, 2); + public static Block axiidianOre = new BasicBlockOre("axiidian_ore", Material.ROCK, 13.0f, 13.0f, 3); + public static Block bismuthOre = new BasicBlockOre("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 1); + public static Block eterniteOre = new BasicBlockOre("eternite_ore", Material.ROCK, 24.0f, 25.0f, 3); + public static Block ignititeOre = new BasicBlockOre("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 3); + public static Block karmesineOre = new BasicBlockOre("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1); + public static Block meteoriteOre = new BasicBlockOre("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 4); + public static Block mindoriteOre = new BasicBlockOre("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2); + public static Block mythrilOre = new BasicBlockOre("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4); + public static Block palladiumOre = new BasicBlockOre("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3); + public static Block prometheumOre = new BasicBlockOre("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f); + public static Block slagironOre = new BasicBlockOre("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1); + public static Block slaggoldOre = new BasicBlockOre("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1); public static Block tiberiumOre = new BlockTiberiumOre(); - public static Block vibraniumOre = new BasicBlockOre("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 4, "oreVibranium"); - public static Block yrdeanOre = new BasicBlockOre("yrdean_ore", Material.ROCK, 13.0f, 15.0f, 3, "oreYrdean"); + public static Block vibraniumOre = new BasicBlockOre("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 4); + public static Block yrdeanOre = new BasicBlockOre("yrdean_ore", Material.ROCK, 13.0f, 15.0f, 3); public static void register() { @@ -46,9 +48,16 @@ public class Blocks { Utils.registerBlockWithItem(block); if (block instanceof BasicBlockOre) { - if (((BasicBlockOre) block).isOreDict()) { - OreDictionary.registerOre(((BasicBlockOre) block).getOreDictName(), block); + String oreDictName; + String[] nameParts = block.getUnlocalizedName().split("_"); + + if (nameParts.length > 2) { + oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1)); + } else { + oreDictName = nameParts[0]; } + + OreDictionary.registerOre("ore" + StringUtils.capitalize(oreDictName), block); } } catch (IllegalAccessException e) { e.printStackTrace(); diff --git a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java index e6c647a..b96c4ab 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Fluids.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Fluids.java @@ -6,42 +6,43 @@ import com.sosnitzka.ztic_addon.util.Utils; import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.util.Arrays; public class Fluids { - public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcaniteFluid", 0xFF272354, true, 200, 10, 4000); - public static BasicTinkerFluid aardiumFluid = new BasicTinkerFluid("aardiumFluid", 0xFFC3F93D, true, 200, 10, 4000); - public static BasicTinkerFluid adamantiteFluid = new BasicTinkerFluid("adamantiteFluid", 0xFFc45c82, true, 200, 10, 4000); - public static BasicTinkerFluid axiidianFluid = new BasicTinkerFluid("axiidianFluid", 0xFF77a19a, true, 200, 10, 4000); - public static BasicTinkerFluid bismuthFluid = new BasicTinkerFluid("bismuthFluid", 0xFF555555, true, 200, 10, 4000); - public static BasicTinkerFluid eterniteFluid = new BasicTinkerFluid("eterniteFluid", 0xFFfafa98, true, 200, 10, 4000); - public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignititeFluid", 0xFFd29453, true, 200, 10, 4000); - public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesineFluid", 0xFFc16d6d, true, 200, 10, 4000); - public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteoriteFluid", 0xFF6e6a62, true, 200, 10, 4000); - public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindoriteFluid", 0xFF6bbbbf, true, 200, 10, 4000); - public static BasicTinkerFluid mythrilFluid = new BasicTinkerFluid("mythrilFluid", 0xFFa8c0ba, true, 200, 10, 4000); - public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladiumFluid", 0xFFfe5c05, true, 200, 10, 4000); - public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheumFluid", 0xFF2b282f, true, 200, 10, 4000); - public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberiumFluid", 0xFF86bd5a, true, 200, 10, 4000); - public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibraniumFluid", 0xFFb6bba8, true, 200, 10, 4000); - public static BasicTinkerFluid yrdeanFluid = new BasicTinkerFluid("yrdeanFluid", 0xFF3e3c6f, true, 200, 10, 4000); + public static BasicTinkerFluid arcaniteFluid = new BasicTinkerFluid("arcanite_fluid", 0xFF272354, true, 200, 10, 4000); + public static BasicTinkerFluid aardiumFluid = new BasicTinkerFluid("aardium_fluid", 0xFFC3F93D, true, 200, 10, 4000); + public static BasicTinkerFluid adamantiteFluid = new BasicTinkerFluid("adamantite_fluid", 0xFFc45c82, true, 200, 10, 4000); + public static BasicTinkerFluid axiidianFluid = new BasicTinkerFluid("axiidian_fluid", 0xFF77a19a, true, 200, 10, 4000); + public static BasicTinkerFluid bismuthFluid = new BasicTinkerFluid("bismuth_fluid", 0xFF555555, true, 200, 10, 4000); + public static BasicTinkerFluid eterniteFluid = new BasicTinkerFluid("eternite_fluid", 0xFFfafa98, true, 200, 10, 4000); + public static BasicTinkerFluid ignititeFluid = new BasicTinkerFluid("ignitite_fluid", 0xFFd29453, true, 200, 10, 4000); + public static BasicTinkerFluid karmesineFluid = new BasicTinkerFluid("karmesine_fluid", 0xFFc16d6d, true, 200, 10, 4000); + public static BasicTinkerFluid meteoriteFluid = new BasicTinkerFluid("meteorite_fluid", 0xFF6e6a62, true, 200, 10, 4000); + public static BasicTinkerFluid mindoriteFluid = new BasicTinkerFluid("mindorite_fluid", 0xFF6bbbbf, true, 200, 10, 4000); + public static BasicTinkerFluid mythrilFluid = new BasicTinkerFluid("mythril_fluid", 0xFFa8c0ba, true, 200, 10, 4000); + public static BasicTinkerFluid palladiumFluid = new BasicTinkerFluid("palladium_fluid", 0xFFfe5c05, true, 200, 10, 4000); + public static BasicTinkerFluid prometheumFluid = new BasicTinkerFluid("prometheum_fluid", 0xFF2b282f, true, 200, 10, 4000); + public static BasicTinkerFluid tiberiumFluid = new BasicTinkerFluid("tiberium_fluid", 0xFF86bd5a, true, 200, 10, 4000); + public static BasicTinkerFluid vibraniumFluid = new BasicTinkerFluid("vibranium_fluid", 0xFFb6bba8, true, 200, 10, 4000); + public static BasicTinkerFluid yrdeanFluid = new BasicTinkerFluid("yrdean_fluid", 0xFF3e3c6f, true, 200, 10, 4000); - public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astriumFluid", 0xFF7a3b74, true, 200, 10, 4000); - public static BasicTinkerFluid instableNitroniteFluid = new BasicTinkerFluid("instableNitroniteFluid", 0xFF659933, true, 200, 10, 4000); - public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideumFluid", 0xFF416565, true, 200, 10, 4000); - public static BasicTinkerFluid instablePolyniumFluid = new BasicTinkerFluid("instablePolyniumFluid", 0xFF6c6aa3, true, 200, 10, 4000); - public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomiteFluid", 0xFF339966, true, 200, 10, 4000); - public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogenFluid", 0xFF9f8a4a, true, 200, 10, 4000); - public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryteFluid", 0xFFb44a14, true, 200, 10, 4000); - public static BasicTinkerFluid seismodiumFluid = new BasicTinkerFluid("seismodiumFluid", 0xFF46131D, true, 200, 10, 4000); - public static BasicTinkerFluid terramiteFluid = new BasicTinkerFluid("terramiteFluid", 0xFFa6b27a, true, 200, 10, 4000); - public static BasicTinkerFluid instablePrysociteFluid = new BasicTinkerFluid("instablePrysociteFluid", 0xFFbde398, true, 200, 10, 4000); - public static BasicTinkerFluid blazingXylititeFluid = new BasicTinkerFluid("blazingXylititeFluid", 0xFFffc81d, true, 200, 10, 4000); - public static BasicTinkerFluid instableDyoniteFluid = new BasicTinkerFluid("instableDyoniteFluid", 0xFFff6743, true, 200, 10, 4000); - public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultraniteFluid", 0xFFfff69b, true, 200, 10, 4000); - public static BasicTinkerFluid radiantPliniumFluid = new BasicTinkerFluid("radiantPliniumFluid", 0xFFc1ff68, true, 200, 10, 4000); - public static BasicTinkerFluid dysprosaniumFluid = new BasicTinkerFluid("dysprosaniumFluid", 0xFFb7a2bd, true, 200, 10, 4000); - public static BasicTinkerFluid refractiveBysmuidFluid = new BasicTinkerFluid("refractiveBysmuidFluid", 0xFF7b97b0, true, 200, 10, 4000); + public static BasicTinkerFluid astriumFluid = new BasicTinkerFluid("astrium_fluid", 0xFF7a3b74, true, 200, 10, 4000); + public static BasicTinkerFluid instableNitroniteFluid = new BasicTinkerFluid("instableNitronite_fluid", 0xFF659933, true, 200, 10, 4000); + public static BasicTinkerFluid proxideumFluid = new BasicTinkerFluid("proxideum_fluid", 0xFF416565, true, 200, 10, 4000); + public static BasicTinkerFluid instablePolyniumFluid = new BasicTinkerFluid("instablePolynium_fluid", 0xFF6c6aa3, true, 200, 10, 4000); + public static BasicTinkerFluid imperomiteFluid = new BasicTinkerFluid("imperomite_fluid", 0xFF339966, true, 200, 10, 4000); + public static BasicTinkerFluid cryptogenFluid = new BasicTinkerFluid("cryptogen_fluid", 0xFF9f8a4a, true, 200, 10, 4000); + public static BasicTinkerFluid fractoryteFluid = new BasicTinkerFluid("fractoryte_fluid", 0xFFb44a14, true, 200, 10, 4000); + public static BasicTinkerFluid seismodiumFluid = new BasicTinkerFluid("seismodium_fluid", 0xFF46131D, true, 200, 10, 4000); + public static BasicTinkerFluid terramiteFluid = new BasicTinkerFluid("terramite_fluid", 0xFFa6b27a, true, 200, 10, 4000); + public static BasicTinkerFluid instablePrysociteFluid = new BasicTinkerFluid("instablePrysocite_fluid", 0xFFbde398, true, 200, 10, 4000); + public static BasicTinkerFluid blazingXylititeFluid = new BasicTinkerFluid("blazingXylitite_fluid", 0xFFffc81d, true, 200, 10, 4000); + public static BasicTinkerFluid instableDyoniteFluid = new BasicTinkerFluid("instableDyonite_fluid", 0xFFff6743, true, 200, 10, 4000); + public static BasicTinkerFluid ultraniteFluid = new BasicTinkerFluid("ultranite_fluid", 0xFFfff69b, true, 200, 10, 4000); + public static BasicTinkerFluid radiantPliniumFluid = new BasicTinkerFluid("radiantPlinium_fluid", 0xFFc1ff68, true, 200, 10, 4000); + public static BasicTinkerFluid dysprosaniumFluid = new BasicTinkerFluid("dysprosanium_fluid", 0xFFb7a2bd, true, 200, 10, 4000); + public static BasicTinkerFluid refractiveBysmuidFluid = new BasicTinkerFluid("refractiveBysmuid_fluid", 0xFF7b97b0, true, 200, 10, 4000); static void register() { @@ -51,7 +52,17 @@ public class Fluids { Class targetType = field.getType(); try { BasicTinkerFluid fluid = (BasicTinkerFluid) field.get(targetType); - Utils.registerTinkerFluid(StringUtils.capitalize(field.getName().replace("Fluid", "")), fluid, fluid.isToolForge()); + + String oreDictName; + String[] nameParts = fluid.getUnlocalizedName().split("_"); + + if (nameParts.length > 2) { + oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1)); + } else { + oreDictName = nameParts[0]; + } + + Utils.registerTinkerFluid("fluid" + StringUtils.capitalize(nameParts[0]), fluid, fluid.isToolForge()); } catch (IllegalAccessException e) { e.printStackTrace(); } diff --git a/src/main/java/com/sosnitzka/ztic_addon/Items.java b/src/main/java/com/sosnitzka/ztic_addon/Items.java index b8a053e..d6f9966 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Items.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Items.java @@ -9,8 +9,10 @@ import com.sosnitzka.ztic_addon.items.ItemSlagironIngot; import net.minecraft.item.Item; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; +import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Field; +import java.util.Arrays; public class Items { public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot(); @@ -19,24 +21,24 @@ public class Items { public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot(); public static Item fuel_brick = new BasicItem("fuel_brick"); - public static Item aardiumIngot = new BasicItem("aardium_ingot", "ingotAardium"); - public static Item adamantiteIngot = new BasicItem("adamantite_ingot", "ingotAdamantite"); - public static Item arcaniteIngot = new BasicItem("arcanite_ingot", "ingotArcanite"); - public static Item axiidianIngot = new BasicItem("axiidian_ingot", "ingotAxiidian"); - public static Item bismuthIngot = new BasicItem("bismuth_ingot", "ingotBismuth"); - public static Item eterniteIngot = new BasicItem("eternite_ingot", "ingotEternite"); - public static Item ignititeIngot = new BasicItem("ignitite_ingot", "ingotIgnitite"); - public static Item karmesineIngot = new BasicItem("karmesine_ingot", "ingotKarmesine"); - public static Item meteoriteIngot = new BasicItem("meteorite_ingot", "ingotMeteorite"); - public static Item mindoriteIngot = new BasicItem("mindorite_ingot", "ingotMindorite"); - public static Item mythrilIngot = new BasicItem("mythril_ingot", "ingotMythril"); - public static Item palladiumIngot = new BasicItem("palladium_ingot", "ingotPalladium"); - public static Item prometheumIngot = new BasicItem("prometheum_ingot", "ingotPrometheum"); - public static Item tiberiumIngot = new BasicItem("tiberium_ingot", "ingotTiberium"); - public static Item vibraniumIngot = new BasicItem("vibranium_ingot", "ingotVibranium"); - public static Item yrdeanIngot = new BasicItem("yrdean_ingot", "ingotYrdean"); + public static Item aardiumIngot = new BasicItem("aardium_ingot", true); + public static Item adamantiteIngot = new BasicItem("adamantite_ingot", true); + public static Item arcaniteIngot = new BasicItem("arcanite_ingot", true); + public static Item axiidianIngot = new BasicItem("axiidian_ingot", true); + public static Item bismuthIngot = new BasicItem("bismuth_ingot", true); + public static Item eterniteIngot = new BasicItem("eternite_ingot", true); + public static Item ignititeIngot = new BasicItem("ignitite_ingot", true); + public static Item karmesineIngot = new BasicItem("karmesine_ingot", true); + public static Item meteoriteIngot = new BasicItem("meteorite_ingot", true); + public static Item mindoriteIngot = new BasicItem("mindorite_ingot", true); + public static Item mythrilIngot = new BasicItem("mythril_ingot", true); + public static Item palladiumIngot = new BasicItem("palladium_ingot", true); + public static Item prometheumIngot = new BasicItem("prometheum_ingot", true); + public static Item tiberiumIngot = new BasicItem("tiberium_ingot", true); + public static Item vibraniumIngot = new BasicItem("vibranium_ingot", true); + public static Item yrdeanIngot = new BasicItem("yrdean_ingot", true); - public static Item astriumIngot = new BasicItem("astrium_ingot", "ingotAstrium"); + public static Item astriumIngot = new BasicItem("astrium_ingot", true); public static Item instableNitroniteIngot = new BasicItem("instable_nitronite_ingot"); public static Item proxideumIngot = new BasicItem("proxideum_ingot"); public static Item instablePolyniumIngot = new BasicItem("instable_polyniumingot"); @@ -68,7 +70,16 @@ public class Items { if (item instanceof BasicItem) { if (((BasicItem) item).isOreDict()) { - OreDictionary.registerOre(((BasicItem) item).getOreDictName(), item); + String oreDictName; + String[] nameParts = item.getUnlocalizedName().split("_"); + + if (nameParts.length > 2) { + oreDictName = Arrays.toString(Arrays.copyOfRange(nameParts, 0, nameParts.length - 1)); + } else { + oreDictName = nameParts[0]; + } + + OreDictionary.registerOre("ingot" + StringUtils.capitalize(oreDictName), item); } } } catch (IllegalAccessException e) { diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java index 070e4ee..8b22739 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java +++ b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java @@ -4,35 +4,18 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; public class BasicBlockOre extends Block { - public String oreDictName; - public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest, String oreDictName, float lightlevel) { + public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest, float lightLevel) { super(material); setUnlocalizedName(name); setRegistryName(name); setHardness(hardness); setResistance(resistance); setHarvestLevel("pickaxe", harvest); - setLightLevel(lightlevel); - this.oreDictName = oreDictName; + setLightLevel(lightLevel); } - public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest, String oreDictName) { - super(material); - setUnlocalizedName(name); - setRegistryName(name); - setHardness(hardness); - setResistance(resistance); - setHarvestLevel("pickaxe", harvest); - this.oreDictName = oreDictName; - } - - - public boolean isOreDict() { - return this.oreDictName != null; - } - - public String getOreDictName() { - return oreDictName; + public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest) { + this(name, material, hardness, resistance, harvest, 0.0F); } } diff --git a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicItem.java b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicItem.java index 7b63de9..501fadd 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/generic/BasicItem.java +++ b/src/main/java/com/sosnitzka/ztic_addon/generic/BasicItem.java @@ -3,23 +3,19 @@ package com.sosnitzka.ztic_addon.generic; import net.minecraft.item.Item; public class BasicItem extends Item { - private String oreDictName; + private boolean oreDict; - public BasicItem(String name, String oreDictName) { + public BasicItem(String name, boolean oreDict) { setUnlocalizedName(name); setRegistryName(name); - this.oreDictName = oreDictName; + this.oreDict = oreDict; } public BasicItem(String name) { - this(name, null); + this(name, false); } public boolean isOreDict() { - return this.oreDictName != null; - } - - public String getOreDictName() { - return oreDictName; + return this.oreDict; } }