From ef6cbb1090a48d7f193ccc3e32fb41dff2282966 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Fri, 21 Oct 2016 12:20:02 +0200 Subject: [PATCH] Adding basic Item and improve genetic Items --- src/main/java/binnie/core/item/IItemEnum.java | 2 ++ src/main/java/binnie/core/item/ItemCore.java | 18 +++++++++++++++ src/main/java/binnie/core/item/ItemMisc.java | 22 ++++++++++++++++--- .../java/binnie/core/models/ModelManager.java | 2 +- .../binnie/genetics/item/ItemAnalyst.java | 5 +++-- .../binnie/genetics/item/ItemDatabase.java | 5 +++-- .../java/binnie/genetics/item/ItemGene.java | 5 +++-- .../binnie/genetics/item/ItemRegistry.java | 5 +++-- .../binnie/genetics/item/ItemSequence.java | 5 +++-- .../java/binnie/genetics/item/ModuleItem.java | 14 +++--------- 10 files changed, 58 insertions(+), 25 deletions(-) create mode 100644 src/main/java/binnie/core/item/ItemCore.java diff --git a/src/main/java/binnie/core/item/IItemEnum.java b/src/main/java/binnie/core/item/IItemEnum.java index 48d0a2d5..3688db5b 100644 --- a/src/main/java/binnie/core/item/IItemEnum.java +++ b/src/main/java/binnie/core/item/IItemEnum.java @@ -10,4 +10,6 @@ public interface IItemEnum { int ordinal(); ItemStack get(final int p0); + + String name(); } diff --git a/src/main/java/binnie/core/item/ItemCore.java b/src/main/java/binnie/core/item/ItemCore.java new file mode 100644 index 00000000..450c5949 --- /dev/null +++ b/src/main/java/binnie/core/item/ItemCore.java @@ -0,0 +1,18 @@ +package binnie.core.item; + +import forestry.api.core.IItemModelRegister; +import forestry.api.core.IModelManager; +import net.minecraft.item.Item; + +public class ItemCore extends Item implements IItemModelRegister{ + + public ItemCore(String registryName) { + setRegistryName(getRegistryName()); + } + + @Override + public void registerModel(Item item, IModelManager manager) { + manager.registerItemModel(item, 0); + } + +} diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index b3e8c555..0289eb7d 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,5 +1,6 @@ package binnie.core.item; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -8,19 +9,25 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; +import java.util.Locale; -public class ItemMisc extends Item { +import binnie.core.BinnieCore; +import binnie.genetics.Genetics; +import binnie.genetics.item.GeneticsItems; +import forestry.api.core.IModelManager; + +public class ItemMisc extends ItemCore { private IItemMisc[] items; public ItemMisc() { - setRegistryName("misc"); + super("misc"); } protected ItemMisc(final CreativeTabs tab, final IItemMisc[] items2) { + super("misc"); this.setCreativeTab(tab); this.setHasSubtypes(true); this.setUnlocalizedName("misc"); - setRegistryName("misc"); this.items = items2; } @@ -51,6 +58,15 @@ public class ItemMisc extends Item { item.addInformation(tooltip); } } + + @SideOnly(Side.CLIENT) + @Override + public void registerModel(Item item, IModelManager manager) { + for (IItemMisc type : items) { + manager.registerItemModel(item, type.ordinal(), type.name().toLowerCase(Locale.ENGLISH));; + } + + } @Override public String getItemStackDisplayName(final ItemStack stack) { diff --git a/src/main/java/binnie/core/models/ModelManager.java b/src/main/java/binnie/core/models/ModelManager.java index cda70676..15b5d038 100644 --- a/src/main/java/binnie/core/models/ModelManager.java +++ b/src/main/java/binnie/core/models/ModelManager.java @@ -137,7 +137,7 @@ public class ModelManager implements IModelManager { @Override public ModelResourceLocation getModelLocation(Item item) { - String itemName = ItemStackUtil.getItemNameFromRegistry(item).getResourcePath(); + String itemName = item.getRegistryName().getResourcePath(); return getModelLocation(itemName); } diff --git a/src/main/java/binnie/genetics/item/ItemAnalyst.java b/src/main/java/binnie/genetics/item/ItemAnalyst.java index 6c1707e8..76791f69 100644 --- a/src/main/java/binnie/genetics/item/ItemAnalyst.java +++ b/src/main/java/binnie/genetics/item/ItemAnalyst.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; @@ -11,7 +12,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class ItemAnalyst extends Item { +public class ItemAnalyst extends ItemCore { // @Override // @SideOnly(Side.CLIENT) // public void registerIcons(final IIconRegister register) { @@ -19,10 +20,10 @@ public class ItemAnalyst extends Item { // } public ItemAnalyst() { + super("analyst"); this.setCreativeTab(CreativeTabGenetics.instance); this.setUnlocalizedName("analyst"); this.setMaxStackSize(1); - setRegistryName("analyst"); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemDatabase.java b/src/main/java/binnie/genetics/item/ItemDatabase.java index 389c6208..9e199b17 100644 --- a/src/main/java/binnie/genetics/item/ItemDatabase.java +++ b/src/main/java/binnie/genetics/item/ItemDatabase.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; @@ -18,7 +19,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemDatabase extends Item implements IItemModelRegister{ +public class ItemDatabase extends ItemCore{ // IIcon iconMaster; // // @Override @@ -42,10 +43,10 @@ public class ItemDatabase extends Item implements IItemModelRegister{ } public ItemDatabase() { + super("geneticdatabase"); this.setCreativeTab(CreativeTabGenetics.instance); this.setUnlocalizedName("database"); this.setMaxStackSize(1); - setRegistryName("geneticdatabase"); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index ab3b73c2..4c3715b8 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.genetics.IGeneItem; import net.minecraft.creativetab.CreativeTabs; @@ -11,7 +12,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public abstract class ItemGene extends Item { +public abstract class ItemGene extends ItemCore { // IIcon[] icons; // @@ -47,11 +48,11 @@ public abstract class ItemGene extends Item { // } public ItemGene(final String unlocName) { + super(unlocName); // this.icons = new IIcon[4]; this.setMaxStackSize(1); this.setMaxDamage(16); this.setUnlocalizedName(unlocName); - setRegistryName(unlocName); this.setCreativeTab(CreativeTabGenetics.instance); } // diff --git a/src/main/java/binnie/genetics/item/ItemRegistry.java b/src/main/java/binnie/genetics/item/ItemRegistry.java index 876af828..d5b31daa 100644 --- a/src/main/java/binnie/genetics/item/ItemRegistry.java +++ b/src/main/java/binnie/genetics/item/ItemRegistry.java @@ -1,5 +1,6 @@ package binnie.genetics.item; +import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsGUI; @@ -11,7 +12,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class ItemRegistry extends Item { +public class ItemRegistry extends ItemCore { // @Override // @SideOnly(Side.CLIENT) // public void registerIcons(final IIconRegister register) { @@ -19,10 +20,10 @@ public class ItemRegistry extends Item { // } public ItemRegistry() { + super("registry"); this.setCreativeTab(CreativeTabGenetics.instance); this.setUnlocalizedName("registry"); this.setMaxStackSize(1); - setRegistryName("registry"); } @Override diff --git a/src/main/java/binnie/genetics/item/ItemSequence.java b/src/main/java/binnie/genetics/item/ItemSequence.java index 4b65aa2a..cf8f4c8e 100644 --- a/src/main/java/binnie/genetics/item/ItemSequence.java +++ b/src/main/java/binnie/genetics/item/ItemSequence.java @@ -2,6 +2,7 @@ package binnie.genetics.item; import binnie.Binnie; import binnie.core.genetics.Gene; +import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.api.IGene; @@ -21,13 +22,13 @@ import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class ItemSequence extends Item implements IItemAnalysable, IItemChargable { +public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChargable { public ItemSequence() { + super("sequence"); this.setMaxStackSize(1); this.setMaxDamage(5); this.setUnlocalizedName("sequence"); this.setCreativeTab(CreativeTabGenetics.instance); - setRegistryName("sequence"); } @Override diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index 6fbb6179..d0f15daa 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -44,13 +44,10 @@ public class ModuleItem implements IInitializable { Genetics.itemSerumArray = new ItemSerumArray(); Genetics.itemSequencer = new ItemSequence(); Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), CreativeTabGenetics.instance); - BinnieCore.proxy.registermodel(BinnieCore.proxy.registerItem(Genetics.itemSerum), 0); - BinnieCore.proxy.registermodel(BinnieCore.proxy.registerItem(Genetics.itemSerumArray), 0); - BinnieCore.proxy.registermodel(BinnieCore.proxy.registerItem(Genetics.itemSequencer), 0); + BinnieCore.proxy.registerItem(Genetics.itemSerum); + BinnieCore.proxy.registerItem(Genetics.itemSerumArray); + BinnieCore.proxy.registerItem(Genetics.itemSequencer); BinnieCore.proxy.registerItem(Genetics.itemGenetics); - for (GeneticsItems type : GeneticsItems.values()) { - BinnieCore.proxy.registermodel(Genetics.itemGenetics, type.ordinal(), new ModelResourceLocation(Genetics.itemGenetics.getRegistryName(), "type=" + type.name().toLowerCase())); - } Genetics.database = new ItemDatabase(); Genetics.analyst = new ItemAnalyst(); @@ -60,11 +57,6 @@ public class ModuleItem implements IInitializable { BinnieCore.proxy.registerItem(Genetics.analyst); BinnieCore.proxy.registerItem(Genetics.registry); BinnieCore.proxy.registerItem(Genetics.masterRegistry); - BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.database), 0, new ModelResourceLocation(Genetics.database.getRegistryName(), "type=database")); - BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.database), 1, new ModelResourceLocation(Genetics.database.getRegistryName(), "type=master_database")); - BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.analyst), 0); - BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.registry), 0); - BinnieCore.proxy.registermodel(GameRegistry.register(Genetics.masterRegistry), 0); Binnie.Liquid.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics); }