diff --git a/src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java b/src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java index 1786bd52d..b2b32ee1b 100644 --- a/src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java +++ b/src/main/java/forestry/api/arboriculture/IGermlingModelProvider.java @@ -10,6 +10,9 @@ import javax.annotation.Nonnull; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IModelManager; /** @@ -18,6 +21,7 @@ import forestry.api.core.IModelManager; * There is no default implementation because every sapling has a unique icon. */ public interface IGermlingModelProvider { + @SideOnly(Side.CLIENT) void registerModels(Item item, IModelManager manager, EnumGermlingType type); @Nonnull diff --git a/src/main/java/forestry/api/core/IModelManager.java b/src/main/java/forestry/api/core/IModelManager.java index 4d0db9598..2cc452df5 100644 --- a/src/main/java/forestry/api/core/IModelManager.java +++ b/src/main/java/forestry/api/core/IModelManager.java @@ -30,6 +30,4 @@ public interface IModelManager { void registerItemModel(Item item, ItemMeshDefinition definition); - void registerVariant(Item item, ResourceLocation... resources); - } diff --git a/src/main/java/forestry/apiculture/genetics/DefaultBeeModelProvider.java b/src/main/java/forestry/apiculture/genetics/DefaultBeeModelProvider.java index 45a12af03..8a5025083 100644 --- a/src/main/java/forestry/apiculture/genetics/DefaultBeeModelProvider.java +++ b/src/main/java/forestry/apiculture/genetics/DefaultBeeModelProvider.java @@ -12,6 +12,7 @@ package forestry.apiculture.genetics; import java.util.Locale; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; @@ -47,7 +48,7 @@ public class DefaultBeeModelProvider implements IBeeModelProvider { } models[beeType.ordinal()] = manager.getModelLocation(beeTypeNameBase); - manager.registerVariant(item, new ResourceLocation("forestry:" + beeTypeNameBase)); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:" + beeTypeNameBase)); } @Override diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java b/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java index cce107f6f..9c956579b 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbDoor.java @@ -18,6 +18,7 @@ import java.util.Random; import net.minecraft.block.BlockDoor; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; @@ -51,7 +52,7 @@ public class BlockArbDoor extends BlockDoor implements IWoodTyped, IItemModelReg @Override @SideOnly(Side.CLIENT) public void registerModel(Item item, IModelManager manager) { - manager.registerVariant(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java index 67734a796..2bd9fd2ed 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryFenceGate.java @@ -20,6 +20,7 @@ import net.minecraft.block.BlockPlanks.EnumType; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -119,7 +120,7 @@ public class BlockForestryFenceGate & IWoodType> extends Block @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - manager.registerVariant(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); manager.registerItemModel(item, new WoodMeshDefinition(this)); } } \ No newline at end of file diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java index 703f023c5..b962a22a0 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryStairs.java @@ -7,6 +7,7 @@ import java.util.Collections; import net.minecraft.block.BlockStairs; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.item.Item; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -42,7 +43,7 @@ public class BlockForestryStairs & IWoodType> extends BlockSta @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - manager.registerVariant(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java b/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java index a28884595..f45c61744 100644 --- a/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java +++ b/src/main/java/forestry/arboriculture/blocks/fence/BlockForestryFence.java @@ -12,6 +12,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; @@ -103,7 +104,7 @@ public abstract class BlockForestryFence & IWoodType> extends @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - manager.registerVariant(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java b/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java index e32064a32..f258f3b1e 100644 --- a/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java +++ b/src/main/java/forestry/arboriculture/blocks/log/BlockForestryLog.java @@ -8,6 +8,7 @@ import net.minecraft.block.BlockLog; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; @@ -181,7 +182,7 @@ public abstract class BlockForestryLog & IWoodType> extends Bl @SideOnly(Side.CLIENT) @Override public final void registerModel(Item item, IModelManager manager) { - manager.registerVariant(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java b/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java index 1216504fc..f702b1d3b 100644 --- a/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/planks/BlockForestryPlanks.java @@ -9,6 +9,7 @@ import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; @@ -120,7 +121,7 @@ public abstract class BlockForestryPlanks & IWoodType> extends @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - manager.registerVariant(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java b/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java index 7c79839b3..0e05b81bc 100644 --- a/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java +++ b/src/main/java/forestry/arboriculture/blocks/slab/BlockForestrySlab.java @@ -11,6 +11,7 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -132,7 +133,7 @@ public abstract class BlockForestrySlab & IWoodType> extends B @SideOnly(Side.CLIENT) @Override public void registerModel(Item item, IModelManager manager) { - manager.registerVariant(item, WoodHelper.getResourceLocations(this)); + ModelBakery.registerItemVariants(item, WoodHelper.getResourceLocations(this)); manager.registerItemModel(item, new WoodHelper.WoodMeshDefinition(this)); } diff --git a/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java b/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java index 5e88f0430..37ca96214 100644 --- a/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java +++ b/src/main/java/forestry/arboriculture/models/ModelProviderGermling.java @@ -12,10 +12,14 @@ package forestry.arboriculture.models; import javax.annotation.Nonnull; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.IGermlingModelProvider; import forestry.api.core.IModelManager; @@ -31,14 +35,15 @@ public class ModelProviderGermling implements IGermlingModelProvider { this.name = modelUid.substring("forestry.".length()); } + @SideOnly(Side.CLIENT) @Override public void registerModels(Item item, IModelManager manager, EnumGermlingType type) { if(type == EnumGermlingType.SAPLING){ germlingModel = manager.getModelLocation("germlings/sapling." + name); - manager.registerVariant(item, new ResourceLocation("forestry:germlings/sapling." + name)); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:germlings/sapling." + name)); }else if(type == EnumGermlingType.POLLEN){ pollenModel = manager.getModelLocation("pollen"); - manager.registerVariant(item, new ResourceLocation("forestry:pollen")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:pollen")); } } diff --git a/src/main/java/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java index 6af158fb3..bc98c881e 100755 --- a/src/main/java/forestry/core/items/ItemPipette.java +++ b/src/main/java/forestry/core/items/ItemPipette.java @@ -13,6 +13,7 @@ package forestry.core.items; import java.util.List; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -106,8 +107,8 @@ public class ItemPipette extends ItemForestry implements IToolPipette, IFluidCon models = new ModelResourceLocation[2]; models[0] = manager.getModelLocation("pipette.0"); models[1] = manager.getModelLocation("pipette.1"); - manager.registerVariant(item, new ResourceLocation("forestry:pipette.0")); - manager.registerVariant(item, new ResourceLocation("forestry:pipette.1")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:pipette.0")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:pipette.1")); manager.registerItemModel(item, new PipetteMeshDefinition()); } diff --git a/src/main/java/forestry/core/models/ModelManager.java b/src/main/java/forestry/core/models/ModelManager.java index c512e93e4..fc0704733 100644 --- a/src/main/java/forestry/core/models/ModelManager.java +++ b/src/main/java/forestry/core/models/ModelManager.java @@ -143,12 +143,7 @@ public class ModelManager implements IModelManager { public void registerItemModel(Item item, ItemMeshDefinition definition) { ModelLoader.setCustomMeshDefinition(item, definition); } - - @Override - public void registerVariant(Item item, ResourceLocation... resources) { - ModelBakery.registerItemVariants(item, resources); - } - + @Override public ModelResourceLocation getModelLocation(Item item) { String itemName = ItemStackUtil.getItemNameFromRegistry(item).getResourcePath(); diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index 28f721a25..a22903085 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -15,6 +15,7 @@ import java.util.Random; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; @@ -181,7 +182,7 @@ public class ItemButterflyGE extends ItemGE implements ISpriteRegister, IColored for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) { if (allele instanceof IAlleleButterflyCocoon) { for(int age = 0;age < 3;age++){ - manager.registerVariant(this, ((IAlleleButterflyCocoon) allele).getCocoonItemModel(age)); + ModelBakery.registerItemVariants(this, ((IAlleleButterflyCocoon) allele).getCocoonItemModel(age)); } } } diff --git a/src/main/java/forestry/mail/LetterProperties.java b/src/main/java/forestry/mail/LetterProperties.java index d4f678a87..259f605bf 100644 --- a/src/main/java/forestry/mail/LetterProperties.java +++ b/src/main/java/forestry/mail/LetterProperties.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -100,13 +101,13 @@ public class LetterProperties { models = new ModelResourceLocation[3][4]; for (int i = 0; i < 3; i++) { models[i][0] = new ModelResourceLocation("forestry:mail/letter." + i + ".fresh", "inventory"); - manager.registerVariant(item, new ResourceLocation("forestry:mail/letter." + i + ".fresh")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:mail/letter." + i + ".fresh")); models[i][1] = new ModelResourceLocation("forestry:mail/letter." + i + ".stamped", "inventory"); - manager.registerVariant(item, new ResourceLocation("forestry:mail/letter." + i + ".stamped")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:mail/letter." + i + ".stamped")); models[i][2] = new ModelResourceLocation("forestry:mail/letter." + i + ".opened", "inventory"); - manager.registerVariant(item, new ResourceLocation("forestry:mail/letter." + i + ".opened")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:mail/letter." + i + ".opened")); models[i][3] = new ModelResourceLocation("forestry:mail/letter." + i + ".emptied", "inventory"); - manager.registerVariant(item, new ResourceLocation("forestry:mail/letter." + i + ".emptied")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:mail/letter." + i + ".emptied")); } manager.registerItemModel(item, new LetterMeshDefinition()); } diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index 868a8fe5a..c584e4d91 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.Locale; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -216,10 +217,10 @@ public class ItemBackpack extends ItemWithGui implements IColoredItem { models[1] = new ModelResourceLocation("forestry:" + typeTag + "_locked", "inventory"); models[2] = new ModelResourceLocation("forestry:" + typeTag + "_receive", "inventory"); models[3] = new ModelResourceLocation("forestry:" + typeTag + "_resupply", "inventory"); - manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_neutral")); - manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_locked")); - manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_receive")); - manager.registerVariant(item, new ResourceLocation("forestry:" + typeTag + "_resupply")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:" + typeTag + "_neutral")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:" + typeTag + "_locked")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:" + typeTag + "_receive")); + ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:" + typeTag + "_resupply")); manager.registerItemModel(item, new BackpackMeshDefinition()); }