From 61365dc80f865bcbde491f677f1afdf806386c70 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 29 Oct 2015 22:06:18 -0700 Subject: [PATCH] Use abstracted ModelLoader method in Orb Registry + Stop Orb JSON spam --- .../alchemicalWizardry/api/registry/OrbRegistry.java | 7 ++----- .../alchemicalwizardry/models/item/ItemBloodOrb.json | 6 ++++++ 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/ItemBloodOrb.json diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/registry/OrbRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/api/registry/OrbRegistry.java index f78f97aa..06445b4e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/registry/OrbRegistry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/registry/OrbRegistry.java @@ -3,11 +3,10 @@ package WayofTime.alchemicalWizardry.api.registry; import WayofTime.alchemicalWizardry.api.AlchemicalWizardryAPI; import WayofTime.alchemicalWizardry.api.orb.BloodOrb; import lombok.Getter; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -34,10 +33,8 @@ public class OrbRegistry { public static void registerOrbTexture(BloodOrb orb, String resourceLocation) { int meta = getIndexOf(orb); - RenderItem renderItem = Minecraft.getMinecraft().getRenderItem(); - ModelBakery.addVariantName(AlchemicalWizardryAPI.getOrbItem(), resourceLocation); - renderItem.getItemModelMesher().register(AlchemicalWizardryAPI.getOrbItem(), meta, new ModelResourceLocation(resourceLocation, "inventory")); + ModelLoader.setCustomModelResourceLocation(AlchemicalWizardryAPI.getOrbItem(), meta, new ModelResourceLocation(resourceLocation, "inventory")); } public static BloodOrb getOrb(int index) { diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/ItemBloodOrb.json b/src/main/resources/assets/alchemicalwizardry/models/item/ItemBloodOrb.json new file mode 100644 index 00000000..e5edb788 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/ItemBloodOrb.json @@ -0,0 +1,6 @@ +{ + "parent":"alchemicalwizardry:item/ItemModelBase", + "textures": { + "layer0":"alchemicalwizardry:items/WeakBloodOrb" + } +}