mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 05:02:34 +00:00
Add extrabees item models
This commit is contained in:
1 parent
43efa66c20
commit
eacfa331e3
48 files changed
+276
-115
No files matched your search
@@ -3,12 +3,14 @@ package binnie.extrabees.core;
|
||||
import binnie.Binnie;
|
||||
import binnie.core.IInitializable;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.genetics.Genetics;
|
||||
import forestry.api.core.Tabs;
|
||||
|
||||
public class ModuleCore implements IInitializable {
|
||||
@Override
|
||||
public void preInit() {
|
||||
ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture);
|
||||
ExtraBees.proxy.registerItem(ExtraBees.itemMisc);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -23,6 +23,7 @@ public class ModuleGenetics implements IInitializable {
|
||||
AlleleManager.alleleRegistry.registerAllele(species);
|
||||
}
|
||||
ExtraBees.dictionary = new ItemDictionary();
|
||||
ExtraBees.proxy.registerItem(ExtraBees.dictionary);
|
||||
GameRegistry.register(ExtraBees.ectoplasm = new BlockEctoplasm());
|
||||
GameRegistry.register(new ItemBlock(ExtraBees.ectoplasm).setRegistryName(ExtraBees.ectoplasm.getRegistryName()));
|
||||
}
|
||||
|
||||
@@ -2,6 +2,8 @@ package binnie.extrabees.genetics.items;
|
||||
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.core.ExtraBeeGUID;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.Tabs;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -16,29 +18,15 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class ItemDictionary extends Item {
|
||||
public class ItemDictionary extends Item implements IItemModelRegister {
|
||||
public ItemDictionary() {
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setUnlocalizedName("dictionary");
|
||||
this.setMaxStackSize(1);
|
||||
setRegistryName("dictionary");
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
// IIcon iconMaster;
|
||||
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void registerIcons(final IIconRegister register) {
|
||||
// this.itemIcon = ExtraBees.proxy.getIcon(register, "apiaristDatabase");
|
||||
// this.iconMaster = ExtraBees.proxy.getIcon(register, "masterApiaristDatabase");
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public IIcon getIconFromDamage(final int par1) {
|
||||
// return (par1 == 0) ? this.itemIcon : this.iconMaster;
|
||||
// }
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack stack, EntityPlayer playerIn, List<String> tooltip, boolean advanced) {
|
||||
@@ -70,4 +58,10 @@ public class ItemDictionary extends Item {
|
||||
public String getItemStackDisplayName(final ItemStack i) {
|
||||
return (i.getItemDamage() == 0) ? "Apiarist Database" : "Master Apiarist Database";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, 0, getRegistryName().getResourcePath());
|
||||
manager.registerItemModel(item, 1, getRegistryName().getResourcePath() + "Master");
|
||||
}
|
||||
}
|
||||
@@ -3,15 +3,19 @@ package binnie.extrabees.products;
|
||||
import binnie.core.Mods;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.core.ExtraBeeItems;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public class ItemHoneyComb extends ItemProduct implements IColoredItem {
|
||||
|
||||
public ItemHoneyComb() {
|
||||
|
||||
@@ -1,17 +1,11 @@
|
||||
package binnie.extrabees.products;
|
||||
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
|
||||
public class ItemHoneyDrop extends ItemProduct {
|
||||
// IIcon icon1;
|
||||
// IIcon icon2;
|
||||
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public boolean requiresMultipleRenderPasses() {
|
||||
// return true;
|
||||
// }
|
||||
public class ItemHoneyDrop extends ItemProduct implements IColoredItem{
|
||||
|
||||
public ItemHoneyDrop() {
|
||||
super(EnumHoneyDrop.values());
|
||||
@@ -21,28 +15,12 @@ public class ItemHoneyDrop extends ItemProduct {
|
||||
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public int getColorFromItemStack(final ItemStack itemStack, final int j) {
|
||||
// final int i = itemStack.getItemDamage();
|
||||
// if (j == 0) {
|
||||
// return EnumHoneyDrop.get(itemStack).colour[0];
|
||||
// }
|
||||
// return EnumHoneyDrop.get(itemStack).colour[1];
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public IIcon getIconFromDamageForRenderPass(final int i, final int j) {
|
||||
// if (j > 0) {
|
||||
// return this.icon1;
|
||||
// }
|
||||
// return this.icon2;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void registerIcons(final IIconRegister register) {
|
||||
// this.icon1 = BinnieCore.proxy.getIcon(register, "forestry", "honeyDrop.0");
|
||||
// this.icon2 = BinnieCore.proxy.getIcon(register, "forestry", "honeyDrop.1");
|
||||
// }
|
||||
@Override
|
||||
public int getColorFromItemstack(ItemStack itemStack, int tintIndex) {
|
||||
if (tintIndex == 0) {
|
||||
return EnumHoneyDrop.get(itemStack).colour[0];
|
||||
}
|
||||
return EnumHoneyDrop.get(itemStack).colour[1];
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,13 +1,17 @@
|
||||
package binnie.extrabees.products;
|
||||
|
||||
import binnie.core.item.IItemEnum;
|
||||
import binnie.core.item.IItemMisc;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
|
||||
public class ItemProduct extends Item {
|
||||
public class ItemProduct extends Item implements IItemModelRegister {
|
||||
IItemEnum[] types;
|
||||
|
||||
public ItemProduct(final IItemEnum[] types) {
|
||||
@@ -38,4 +42,11 @@ public class ItemProduct extends Item {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
for (IItemEnum type : types) {
|
||||
manager.registerItemModel(item, type.ordinal(), getRegistryName().getResourcePath());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,10 @@
|
||||
package binnie.extrabees.products;
|
||||
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.core.items.IColoredItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ItemPropolis extends ItemProduct {
|
||||
public class ItemPropolis extends ItemProduct implements IColoredItem{
|
||||
public ItemPropolis() {
|
||||
super(EnumPropolis.values());
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
@@ -10,18 +12,12 @@ public class ItemPropolis extends ItemProduct {
|
||||
setRegistryName("propolis");
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public int getColorFromItemStack(final ItemStack itemStack, final int j) {
|
||||
// final int i = itemStack.getItemDamage();
|
||||
// if (j == 0) {
|
||||
// return EnumPropolis.get(itemStack).colour[0];
|
||||
// }
|
||||
// return EnumPropolis.get(itemStack).colour[1];
|
||||
// }
|
||||
@Override
|
||||
public int getColorFromItemstack(final ItemStack itemStack, final int tintIndex) {
|
||||
if (tintIndex == 0) {
|
||||
return EnumPropolis.get(itemStack).colour[0];
|
||||
}
|
||||
return EnumPropolis.get(itemStack).colour[1];
|
||||
}
|
||||
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public void registerIcons(final IIconRegister register) {
|
||||
// this.itemIcon = BinnieCore.proxy.getIcon(register, "forestry", "propolis.0");
|
||||
// }
|
||||
}
|
||||
@@ -20,8 +20,8 @@ public class ModuleProducts implements IInitializable {
|
||||
ExtraBees.proxy.registerItem(ExtraBees.honeyCrystal);
|
||||
ExtraBees.proxy.registerItem(ExtraBees.honeyCrystalEmpty);
|
||||
ExtraBees.proxy.registerItem(ExtraBees.comb);
|
||||
|
||||
|
||||
ExtraBees.proxy.registerItem(ExtraBees.honeyDrop);
|
||||
ExtraBees.proxy.registerItem(ExtraBees.propolis);
|
||||
ExtraBees.proxy.registermodel(ExtraBees.honeyCrystal, 0);
|
||||
ExtraBees.proxy.registermodel(ExtraBees.honeyCrystalEmpty, 0);
|
||||
for (EnumHoneyComb c : EnumHoneyComb.values()) {
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"inventory": {
|
||||
"model": "forge:item-layer",
|
||||
"transform": "forge:default-item",
|
||||
"textures": {
|
||||
"layer0": "forestry:items/beeCombs.0",
|
||||
"layer1": "forestry:items/beeCombs.1"
|
||||
},
|
||||
"display": {
|
||||
"thirdperson": {
|
||||
"rotation": [ 0, 90, -35 ],
|
||||
"translation": [ 0, 1.25, -3.5 ],
|
||||
"scale": [ 0.85, 0.85, 0.85 ]
|
||||
},
|
||||
"firstperson": {
|
||||
"rotation": [ 0, -135, 25 ],
|
||||
"translation": [ 0, 4, 2 ],
|
||||
"scale": [ 1.7, 1.7, 1.7 ]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"inventory": {
|
||||
"model": "forge:item-layer",
|
||||
"transform": "forge:default-item",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/honeyCrystal"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
{
|
||||
"forge_marker": 1,
|
||||
"variants": {
|
||||
"inventory": {
|
||||
"model": "forge:item-layer",
|
||||
"transform": "forge:default-item",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/honeyCrystalEmpty"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/apiaristDatabase"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/masterApiaristDatabase"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "forestry:items/beeCombs.0",
|
||||
"layer1": "forestry:items/beeCombs.1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/honeyCrystal"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/honeyCrystalEmpty"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "forestry:items/honeyDrop.0",
|
||||
"layer1": "forestry:items/honeyDrop.1"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/dyeBlack"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/dyeBlue"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/blutoniumDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/dyeBrown"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/clayDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/coalDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/copperDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/cyaniteDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/diamondShard"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/emeraldShard"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/goldDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/dyeGreen"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/ironDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/lapisShard"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/leadDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/nickelDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/platinumDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/dyeRed"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/rubyShard"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/sapphireShard"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/scentedGear"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/silverDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/tinDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/titaniumDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/tungstenDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/radioactiveDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/dyeWhite"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/yelloriumDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/dyeYellow"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabees:items/misc/zincDust"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "forestry:items/propolis.0"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user