From 0bb1375823b75ccce97e79dc8fbda98ad2fb297a Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Tue, 24 Nov 2015 21:39:22 +0000 Subject: [PATCH] Added cell rendering --- .../java/ic2/api/tile/IWrenchable.java | 0 src/main/java/techreborn/items/ItemCells.java | 78 +++---------------- .../java/techreborn/items/ItemMetaBase.java | 12 +++ src/main/java/techreborn/items/ItemTR.java | 6 +- 4 files changed, 28 insertions(+), 68 deletions(-) rename src/{main => api}/java/ic2/api/tile/IWrenchable.java (100%) create mode 100644 src/main/java/techreborn/items/ItemMetaBase.java diff --git a/src/main/java/ic2/api/tile/IWrenchable.java b/src/api/java/ic2/api/tile/IWrenchable.java similarity index 100% rename from src/main/java/ic2/api/tile/IWrenchable.java rename to src/api/java/ic2/api/tile/IWrenchable.java diff --git a/src/main/java/techreborn/items/ItemCells.java b/src/main/java/techreborn/items/ItemCells.java index 35175865d..44c13f92a 100644 --- a/src/main/java/techreborn/items/ItemCells.java +++ b/src/main/java/techreborn/items/ItemCells.java @@ -7,14 +7,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IStringSerializable; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import reborncore.api.TextureRegistry; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; +import techreborn.lib.ModInfo; import java.util.List; -public class ItemCells extends ItemTR { +public class ItemCells extends ItemMetaBase { - public static final PropertyEnum VARIANT_PROP = PropertyEnum.create("variant", EnumCells.class); public static ItemStack getCellByName(String name, int count) { return getCellByName(name, count, true); @@ -60,70 +61,6 @@ public class ItemCells extends ItemTR { "sodiumSulfide", "sulfur", "sulfuricAcid", "tritium", "wolframium", "empty"}; - public enum EnumCells implements IStringSerializable{ - Berylium(0, "Berylium"), - biomass(1, "biomass"), - calciumCarbonate(2, "calciumCarbonate"), - calcium(3, "calcium"), - carbon(4, "carbon"), - chlorine(0, "chlorine"), - deuterium(0, "deuterium"), - diesel(0, "diesel"), - ethanol(0, "ethanol"), - glyceryl(0, "glyceryl"), - helium3(0, "helium3"), - helium(0, "helium"), - heliumPlasma(0, "heliumPlasma"), - hydrogen(0, "hydrogen"), - ice(0, "ice"), - lithium(0, "lithium"), - mercury(0, "mercury"), - methane(0, "methane"), - nitrocarbon(0, "nitrocarbon"), - nitroCoalfuel(0, "nitroCoalfuel"), - nitroDiesel(0, "nitroDiesel"), - nitrogen(0, "nitrogen"), - nitrogenDioxide(0, "nitrogenDioxide"), - oil(0, "oil"), - potassium(0, "potassium"), - seedOil(0, "seedOil"), - silicon(0, "silicon"), - sodium(0, "sodium"), - sodiumPersulfate(0, "sodiumPersulfate"), - sodiumSulfide(0, "sodiumSulfide"), - sulfur(0, "sulfur"), - tritium(0, "tritium"), - wolframium(0, "wolframium"), - empty(0, "empty"); - - private static final EnumCells[] META_LOOKUP = new EnumCells[values().length]; - private final int meta; - private final String name; - - private EnumCells(int meta, String name) - { - this.meta = meta; - this.name = name; - } - - @Override - public String getName() { - return this.name; - } - - public int getMeta() { - return meta; - } - - static - { - for (EnumCells cells : values()) - { - META_LOOKUP[cells.getMeta()] = cells; - } - } - } - public ItemCells() { setUnlocalizedName("techreborn.cell"); setHasSubtypes(true); @@ -149,4 +86,13 @@ public class ItemCells extends ItemTR { } } + @Override + public String getTextureName(int damage) { + return ModInfo.MOD_ID + ":items/cells/" + types[damage] + "Cell"; + } + + @Override + public int getMaxMeta() { + return types.length; + } } diff --git a/src/main/java/techreborn/items/ItemMetaBase.java b/src/main/java/techreborn/items/ItemMetaBase.java new file mode 100644 index 000000000..bfc68f776 --- /dev/null +++ b/src/main/java/techreborn/items/ItemMetaBase.java @@ -0,0 +1,12 @@ +package techreborn.items; + + +import reborncore.api.IItemTexture; +import techreborn.lib.ModInfo; + +public abstract class ItemMetaBase extends ItemTR implements IItemTexture { + @Override + public String getModID() { + return ModInfo.MOD_ID; + } +} diff --git a/src/main/java/techreborn/items/ItemTR.java b/src/main/java/techreborn/items/ItemTR.java index 1ea4bc792..484d98195 100644 --- a/src/main/java/techreborn/items/ItemTR.java +++ b/src/main/java/techreborn/items/ItemTR.java @@ -1,13 +1,15 @@ package techreborn.items; -import net.minecraft.item.Item; +import reborncore.api.TextureRegistry; +import reborncore.jsonDestroyers.item.BaseItem; import techreborn.client.TechRebornCreativeTab; -public class ItemTR extends Item { +public class ItemTR extends BaseItem { public ItemTR() { setNoRepair(); setCreativeTab(TechRebornCreativeTab.instance); + TextureRegistry.registerItem(this); } }