diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index 3fab69c26..4ee7a25fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -56,7 +56,6 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ protected void registerRendering(){ ResourceLocation resLoc = new ResourceLocation(ModUtil.MOD_ID, "itemPaxel"); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ModelResourceLocation(resLoc, "inventory")); - ActuallyAdditions.proxy.addRenderVariant(this, resLoc); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index a18fe5d08..9dd9eb46a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -58,12 +58,9 @@ public class ItemCrystal extends ItemBase{ @Override protected void registerRendering(){ - ResourceLocation[] resLocs = new ResourceLocation[BlockCrystal.allCrystals.length]; for(int i = 0; i < BlockCrystal.allCrystals.length; i++){ String name = this.getRegistryName()+BlockCrystal.allCrystals[i].name; - resLocs[i] = new ResourceLocation(name); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); } - ActuallyAdditions.proxy.addRenderVariant(this, resLocs); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 16b40e507..0d20dd8ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -335,13 +335,10 @@ public class ItemDrill extends ItemEnergy{ @Override protected void registerRendering(){ - ResourceLocation[] resLocs = new ResourceLocation[16]; for(int i = 0; i < 16; i++){ String name = this.getRegistryName()+TheColoredLampColors.values()[i].name; - resLocs[i] = new ResourceLocation(name); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); } - ActuallyAdditions.proxy.addRenderVariant(this, resLocs); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index bc5d797b0..8b0f32c60 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -102,12 +102,9 @@ public class ItemFoods extends ItemFoodBase{ @Override protected void registerRendering(){ - ResourceLocation[] resLocs = new ResourceLocation[allFoods.length]; for(int i = 0; i < allFoods.length; i++){ String name = this.getRegistryName()+allFoods[i].name; - resLocs[i] = new ResourceLocation(name); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); } - ActuallyAdditions.proxy.addRenderVariant(this, resLocs); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index e32d56e64..f4b689562 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -59,12 +59,9 @@ public class ItemMisc extends ItemBase{ @Override protected void registerRendering(){ - ResourceLocation[] resLocs = new ResourceLocation[allMiscItems.length]; for(int i = 0; i < allMiscItems.length; i++){ String name = this.getRegistryName()+allMiscItems[i].name; - resLocs[i] = new ResourceLocation(name); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); } - ActuallyAdditions.proxy.addRenderVariant(this, resLocs); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index 2806e5fdb..9bcf39d80 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java @@ -164,11 +164,6 @@ public class ClientProxy implements IProxy{ modelLocationsForRegistering.put(stack, location); } - @Override - public void addRenderVariant(Item item, ResourceLocation... location){ - modelVariantsForRegistering.put(item, location); - } - @Override public void addColoredItem(Item item){ colorProdividingItemsForRegistering.add(item); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java index 3b084f9e9..d319fff77 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java @@ -28,7 +28,5 @@ public interface IProxy{ void addRenderRegister(ItemStack stack, ModelResourceLocation location); - void addRenderVariant(Item item, ResourceLocation... location); - void addColoredItem(Item item); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java index e00ad7c7e..15bbd6199 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java @@ -42,11 +42,6 @@ public class ServerProxy implements IProxy{ } - @Override - public void addRenderVariant(Item item, ResourceLocation... location){ - - } - @Override public void addColoredItem(Item item){