diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index b4aeb5744..bd07c4346 100755 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -48,6 +48,10 @@ public class ProxyRender { return null; } + public IBlockRenderer getRenderChest(String textureName) { + return null; + } + public short registerItemTexUID(IIconRegister register, short uid, String ident) { return uid; } diff --git a/src/main/java/forestry/core/proxy/ProxyRenderClient.java b/src/main/java/forestry/core/proxy/ProxyRenderClient.java index f8674d2ba..726189edf 100644 --- a/src/main/java/forestry/core/proxy/ProxyRenderClient.java +++ b/src/main/java/forestry/core/proxy/ProxyRenderClient.java @@ -27,6 +27,7 @@ import forestry.core.render.RenderBlock; import forestry.core.render.RenderEscritoire; import forestry.core.render.RenderMachine; import forestry.core.render.RenderMill; +import forestry.core.render.RenderNaturalistChest; import forestry.core.render.TextureManager; import forestry.core.render.TileRendererIndex; import forestry.core.tiles.MachineDefinition; @@ -74,6 +75,11 @@ public class ProxyRenderClient extends ProxyRender { return new RenderEscritoire(); } + @Override + public IBlockRenderer getRenderChest(String textureName) { + return new RenderNaturalistChest(textureName); + } + public static boolean shouldSpawnParticle(World world) { if (!Config.enableParticleFX) { return false; diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index d16c9096a..d2dcf85cd 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -148,7 +148,6 @@ import forestry.core.items.ItemScoop; import forestry.core.network.IPacketHandler; import forestry.core.proxy.Proxies; import forestry.core.recipes.ShapedRecipeCustom; -import forestry.core.render.RenderNaturalistChest; import forestry.core.tiles.MachineDefinition; import forestry.core.tiles.TileAnalyzer; import forestry.core.utils.ItemStackUtil; @@ -234,7 +233,7 @@ public class PluginApiculture extends ForestryPlugin { definitionChestLegacy = ((BlockBase) ForestryBlock.apiculture.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_APIARISTCHEST_LEGACY_META, "forestry.ApiaristChest", TileApiaristChest.class).setLegacy()); - definitionChest = ((BlockBase) ForestryBlock.apicultureChest.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_APIARISTCHEST_META, "forestry.ApiaristChestNew", TileApiaristChest.class, new RenderNaturalistChest("apiaristchest"), + definitionChest = ((BlockBase) ForestryBlock.apicultureChest.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_APIARISTCHEST_META, "forestry.ApiaristChestNew", TileApiaristChest.class, Proxies.render.getRenderChest("apiaristchest"), ShapedRecipeCustom.createShapedRecipe(ForestryBlock.apicultureChest.getItemStack(1, Constants.DEFINITION_APIARISTCHEST_META), " # ", "XYX", diff --git a/src/main/java/forestry/plugins/PluginArboriculture.java b/src/main/java/forestry/plugins/PluginArboriculture.java index 513121a46..15853d6b3 100644 --- a/src/main/java/forestry/plugins/PluginArboriculture.java +++ b/src/main/java/forestry/plugins/PluginArboriculture.java @@ -94,7 +94,6 @@ import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.recipes.ShapelessRecipeCustom; -import forestry.core.render.RenderNaturalistChest; import forestry.core.tiles.MachineDefinition; import forestry.factory.recipes.FabricatorRecipe; @@ -187,7 +186,7 @@ public class PluginArboriculture extends ForestryPlugin { ForestryBlock.arboriculture.block().setCreativeTab(Tabs.tabArboriculture); definitionChest = ((BlockBase) ForestryBlock.arboriculture.block()).addDefinition(new MachineDefinition(Constants.DEFINITION_ARBCHEST_META, - "forestry.ArbChest", TileArboristChest.class, new RenderNaturalistChest("arbchest"), + "forestry.ArbChest", TileArboristChest.class, Proxies.render.getRenderChest("arbchest"), ShapedRecipeCustom.createShapedRecipe(ForestryBlock.arboriculture.getItemStack(1, Constants.DEFINITION_ARBCHEST_META), " # ", "XYX", diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index c7420cbf0..4d758eee0 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -42,8 +42,8 @@ import forestry.core.fluids.Fluids; import forestry.core.genetics.Branch; import forestry.core.genetics.alleles.Allele; import forestry.core.items.ItemBlockForestry; +import forestry.core.proxy.Proxies; import forestry.core.recipes.ShapedRecipeCustom; -import forestry.core.render.RenderNaturalistChest; import forestry.core.tiles.MachineDefinition; import forestry.core.utils.EntityUtil; import forestry.core.utils.Log; @@ -124,7 +124,7 @@ public class PluginLepidopterology extends ForestryPlugin { registerTemplates(); BlockBase lepidopterology = ((BlockBase) ForestryBlock.lepidopterology.block()); - MachineDefinition definitionChest = lepidopterology.addDefinition(new MachineDefinition(Constants.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, new RenderNaturalistChest("lepichest"), + MachineDefinition definitionChest = lepidopterology.addDefinition(new MachineDefinition(Constants.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class, Proxies.render.getRenderChest("lepichest"), ShapedRecipeCustom.createShapedRecipe( ForestryBlock.lepidopterology.getItemStack(1, Constants.DEFINITION_LEPICHEST_META), " # ",