From ed7402666705dd67b77a64d0ead65eeeb1cc01e9 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 13 Nov 2015 18:56:15 +0100 Subject: [PATCH] Fixed Blocks having an Item Renderer in the inventory --- .../blocks/BlockCoffeeMachine.java | 2 +- .../blocks/BlockCompost.java | 2 +- .../blocks/BlockFishingNet.java | 2 +- .../blocks/BlockFurnaceSolar.java | 2 +- .../blocks/BlockLaserRelay.java | 2 +- .../blocks/BlockPhantomBooster.java | 2 +- .../blocks/BlockSmileyCloud.java | 2 +- .../blocks/render/RenderInventory.java | 54 ++++++++++++ .../blocks/render/RenderItems.java | 88 ------------------- .../blocks/render/RenderLaserRelay.java | 1 + .../blocks/render/RenderSmileyCloud.java | 1 + .../blocks/render/RenderTileEntity.java | 3 +- .../render/{ => model}/ModelBaseAA.java | 2 +- .../{ => model}/ModelCoffeeMachine.java | 2 +- .../render/{ => model}/ModelCompost.java | 2 +- .../render/{ => model}/ModelFishingNet.java | 2 +- .../render/{ => model}/ModelFurnaceSolar.java | 2 +- .../render/{ => model}/ModelLaserRelay.java | 2 +- .../{ => model}/ModelPhantomBooster.java | 2 +- .../render/{ => model}/ModelSmileyCloud.java | 2 +- .../actuallyadditions/proxy/ClientProxy.java | 56 ++++++------ .../actuallyadditions/util/AssetUtil.java | 15 ++-- 22 files changed, 106 insertions(+), 142 deletions(-) create mode 100644 src/main/java/ellpeck/actuallyadditions/blocks/render/RenderInventory.java delete mode 100644 src/main/java/ellpeck/actuallyadditions/blocks/render/RenderItems.java rename src/main/java/ellpeck/actuallyadditions/blocks/render/{ => model}/ModelBaseAA.java (92%) rename src/main/java/ellpeck/actuallyadditions/blocks/render/{ => model}/ModelCoffeeMachine.java (98%) rename src/main/java/ellpeck/actuallyadditions/blocks/render/{ => model}/ModelCompost.java (98%) rename src/main/java/ellpeck/actuallyadditions/blocks/render/{ => model}/ModelFishingNet.java (98%) rename src/main/java/ellpeck/actuallyadditions/blocks/render/{ => model}/ModelFurnaceSolar.java (94%) rename src/main/java/ellpeck/actuallyadditions/blocks/render/{ => model}/ModelLaserRelay.java (99%) rename src/main/java/ellpeck/actuallyadditions/blocks/render/{ => model}/ModelPhantomBooster.java (98%) rename src/main/java/ellpeck/actuallyadditions/blocks/render/{ => model}/ModelSmileyCloud.java (98%) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java index 8db6d7037..72d00862e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java @@ -50,7 +50,7 @@ public class BlockCoffeeMachine extends BlockContainerBase implements IActAddIte @Override public int getRenderType(){ - return AssetUtil.COFFEE_MACHINE_RENDER_ID; + return AssetUtil.coffeeMachineRenderId; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java index ea43954af..c1b01b49f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -53,7 +53,7 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo @Override public int getRenderType(){ - return AssetUtil.COMPOST_RENDER_ID; + return AssetUtil.compostRenderId; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java index 08b17163f..052fb1823 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java @@ -47,7 +47,7 @@ public class BlockFishingNet extends BlockContainerBase implements IActAddItemOr @Override public int getRenderType(){ - return AssetUtil.FISHING_NET_RENDER_ID; + return AssetUtil.fishingNetRenderId; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java index 2cab0b504..4555054de 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java @@ -49,7 +49,7 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem @Override public int getRenderType(){ - return AssetUtil.FURNACE_SOLAR_RENDER_ID; + return AssetUtil.furnaceSolarRenderId; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java index c93dfbd3b..cead25f06 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java @@ -41,7 +41,7 @@ public class BlockLaserRelay extends BlockContainerBase implements IActAddItemOr @Override public int getRenderType(){ - return AssetUtil.LASER_RELAY_RENDER_ID; + return AssetUtil.laserRelayRenderId; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java index 43bb9bdc3..d454258ec 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java @@ -44,7 +44,7 @@ public class BlockPhantomBooster extends BlockContainerBase implements IActAddIt @Override public int getRenderType(){ - return AssetUtil.PHANTOM_BOOSTER_RENDER_ID; + return AssetUtil.phantomBoosterRenderId; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java index 2f2634c0a..d95998784 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java @@ -47,7 +47,7 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO @Override public int getRenderType(){ - return AssetUtil.SMILEY_CLOUD_RENDER_ID; + return AssetUtil.smileyCloudRenderId; } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderInventory.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderInventory.java new file mode 100644 index 000000000..cbe67b88f --- /dev/null +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderInventory.java @@ -0,0 +1,54 @@ +/* + * This file ("RenderInventory.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2015 Ellpeck + */ + +package ellpeck.actuallyadditions.blocks.render; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; +import org.lwjgl.opengl.GL11; + +public class RenderInventory implements ISimpleBlockRenderingHandler{ + + private RenderTileEntity tileRender; + private int renderID; + + public RenderInventory(RenderTileEntity tileRender, int renderID){ + this.tileRender = tileRender; + this.renderID = renderID; + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer){ + GL11.glPushMatrix(); + Minecraft.getMinecraft().renderEngine.bindTexture(this.tileRender.resLoc); + GL11.glTranslatef(0F, 1F, 0F); + GL11.glRotatef(180F, 1F, 0F, 0F); + this.tileRender.theModel.render(0.0625F); + GL11.glPopMatrix(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer){ + return false; + } + + @Override + public boolean shouldRender3DInInventory(int modelId){ + return true; + } + + @Override + public int getRenderId(){ + return this.renderID; + } +} diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderItems.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderItems.java deleted file mode 100644 index 9aa261bd8..000000000 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderItems.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * This file ("RenderItems.java") is part of the Actually Additions Mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015 Ellpeck - */ - -package ellpeck.actuallyadditions.blocks.render; - -import ellpeck.actuallyadditions.util.ModUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import org.lwjgl.opengl.GL11; - -public class RenderItems implements IItemRenderer{ - - ModelBaseAA theModel; - ResourceLocation theTexture; - - public RenderItems(ModelBaseAA model){ - this.theModel = model; - this.theTexture = new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/blocks/models/"+this.theModel.getName()+".png"); - } - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type){ - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper){ - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack stack, Object... data){ - switch(type){ - case INVENTORY: - GL11.glPushMatrix(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(-0.5F, -1.27F, 0.5F); - GL11.glRotatef(180F, 0F, 1F, 0F); - Minecraft.getMinecraft().renderEngine.bindTexture(theTexture); - theModel.render(0.0625F); - GL11.glPopMatrix(); - break; - - case EQUIPPED: - GL11.glPushMatrix(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.6F, -1.2F, -0.0F); - GL11.glRotatef(180F, 0F, 1F, 0F); - Minecraft.getMinecraft().renderEngine.bindTexture(theTexture); - theModel.render(0.0625F); - GL11.glPopMatrix(); - break; - - case EQUIPPED_FIRST_PERSON: - GL11.glPushMatrix(); - GL11.glScalef(1.2F, 1.2F, 1.2F); - GL11.glRotatef(180, 2F, -0F, 0.1F); - GL11.glTranslatef(1.5F, -1.2F, -0.3F); - GL11.glRotatef(180F, 0F, 1F, 0F); - Minecraft.getMinecraft().renderEngine.bindTexture(theTexture); - theModel.render(0.0625F); - GL11.glPopMatrix(); - break; - - default: - GL11.glPushMatrix(); - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - GL11.glTranslatef(0.0F, -1.27F, 0.0F); - GL11.glRotatef(180F, 0F, 1F, 0F); - Minecraft.getMinecraft().renderEngine.bindTexture(theTexture); - theModel.render(0.0625F); - GL11.glPopMatrix(); - break; - } - } - -} diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderLaserRelay.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderLaserRelay.java index 25b4036d1..ac614e96f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderLaserRelay.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderLaserRelay.java @@ -10,6 +10,7 @@ package ellpeck.actuallyadditions.blocks.render; +import ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java index ec1c51c0d..ca1c3e6bd 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderSmileyCloud.java @@ -10,6 +10,7 @@ package ellpeck.actuallyadditions.blocks.render; +import ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA; import ellpeck.actuallyadditions.misc.cloud.ISmileyCloudEasterEgg; import ellpeck.actuallyadditions.misc.cloud.SmileyCloudEasterEggs; import ellpeck.actuallyadditions.proxy.ClientProxy; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java index 3ca24fa80..2736e7dc1 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java @@ -10,6 +10,7 @@ package ellpeck.actuallyadditions.blocks.render; +import ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA; import ellpeck.actuallyadditions.util.ModUtil; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -19,7 +20,7 @@ import org.lwjgl.opengl.GL11; public class RenderTileEntity extends TileEntitySpecialRenderer{ public ModelBaseAA theModel; - protected ResourceLocation resLoc; + public ResourceLocation resLoc; public RenderTileEntity(ModelBaseAA model){ this.theModel = model; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelBaseAA.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelBaseAA.java similarity index 92% rename from src/main/java/ellpeck/actuallyadditions/blocks/render/ModelBaseAA.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelBaseAA.java index c71be274d..d4f6c09a7 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelBaseAA.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelBaseAA.java @@ -8,7 +8,7 @@ * © 2015 Ellpeck */ -package ellpeck.actuallyadditions.blocks.render; +package ellpeck.actuallyadditions.blocks.render.model; import net.minecraft.client.model.ModelBase; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelCoffeeMachine.java similarity index 98% rename from src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCoffeeMachine.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelCoffeeMachine.java index 58eae3b66..0ff9a8219 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelCoffeeMachine.java @@ -8,7 +8,7 @@ * © 2015 Ellpeck */ -package ellpeck.actuallyadditions.blocks.render; +package ellpeck.actuallyadditions.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelCompost.java similarity index 98% rename from src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelCompost.java index ac81682d5..79c885ba9 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelCompost.java @@ -8,7 +8,7 @@ * © 2015 Ellpeck */ -package ellpeck.actuallyadditions.blocks.render; +package ellpeck.actuallyadditions.blocks.render.model; import ellpeck.actuallyadditions.config.values.ConfigIntValues; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelFishingNet.java similarity index 98% rename from src/main/java/ellpeck/actuallyadditions/blocks/render/ModelFishingNet.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelFishingNet.java index db3371583..d1c648a2c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelFishingNet.java @@ -8,7 +8,7 @@ * © 2015 Ellpeck */ -package ellpeck.actuallyadditions.blocks.render; +package ellpeck.actuallyadditions.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelFurnaceSolar.java similarity index 94% rename from src/main/java/ellpeck/actuallyadditions/blocks/render/ModelFurnaceSolar.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelFurnaceSolar.java index fdd0d09f1..c6992dfd0 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelFurnaceSolar.java @@ -8,7 +8,7 @@ * © 2015 Ellpeck */ -package ellpeck.actuallyadditions.blocks.render; +package ellpeck.actuallyadditions.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelLaserRelay.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelLaserRelay.java similarity index 99% rename from src/main/java/ellpeck/actuallyadditions/blocks/render/ModelLaserRelay.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelLaserRelay.java index 0c53a6906..75b745a64 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelLaserRelay.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelLaserRelay.java @@ -8,7 +8,7 @@ * © 2015 Ellpeck */ -package ellpeck.actuallyadditions.blocks.render; +package ellpeck.actuallyadditions.blocks.render.model; import net.minecraft.client.model.ModelRenderer; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelPhantomBooster.java similarity index 98% rename from src/main/java/ellpeck/actuallyadditions/blocks/render/ModelPhantomBooster.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelPhantomBooster.java index 402ba8648..bd90beb47 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelPhantomBooster.java @@ -8,7 +8,7 @@ * © 2015 Ellpeck */ -package ellpeck.actuallyadditions.blocks.render; +package ellpeck.actuallyadditions.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelSmileyCloud.java similarity index 98% rename from src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelSmileyCloud.java index df4b8e00d..69fd220c0 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/model/ModelSmileyCloud.java @@ -8,7 +8,7 @@ * © 2015 Ellpeck */ -package ellpeck.actuallyadditions.blocks.render; +package ellpeck.actuallyadditions.blocks.render.model; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java index 63450a415..8d792a35f 100644 --- a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java +++ b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java @@ -17,8 +17,11 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.VillagerRegistry; -import ellpeck.actuallyadditions.blocks.InitBlocks; -import ellpeck.actuallyadditions.blocks.render.*; +import ellpeck.actuallyadditions.blocks.render.RenderInventory; +import ellpeck.actuallyadditions.blocks.render.RenderLaserRelay; +import ellpeck.actuallyadditions.blocks.render.RenderSmileyCloud; +import ellpeck.actuallyadditions.blocks.render.RenderTileEntity; +import ellpeck.actuallyadditions.blocks.render.model.*; import ellpeck.actuallyadditions.config.values.ConfigBoolValues; import ellpeck.actuallyadditions.config.values.ConfigIntValues; import ellpeck.actuallyadditions.event.InitEvents; @@ -28,9 +31,8 @@ import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.playerdata.PersistentClientData; import net.minecraft.client.Minecraft; -import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.MinecraftForgeClient; import java.io.File; import java.util.Calendar; @@ -65,34 +67,21 @@ public class ClientProxy implements IProxy{ InitEvents.initClient(); - AssetUtil.COMPOST_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - AssetUtil.FISHING_NET_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - AssetUtil.FURNACE_SOLAR_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - AssetUtil.COFFEE_MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - AssetUtil.PHANTOM_BOOSTER_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - AssetUtil.SMILEY_CLOUD_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); - AssetUtil.LASER_RELAY_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); + AssetUtil.compostRenderId = RenderingRegistry.getNextAvailableRenderId(); + AssetUtil.fishingNetRenderId = RenderingRegistry.getNextAvailableRenderId(); + AssetUtil.furnaceSolarRenderId = RenderingRegistry.getNextAvailableRenderId(); + AssetUtil.coffeeMachineRenderId = RenderingRegistry.getNextAvailableRenderId(); + AssetUtil.phantomBoosterRenderId = RenderingRegistry.getNextAvailableRenderId(); + AssetUtil.smileyCloudRenderId = RenderingRegistry.getNextAvailableRenderId(); + AssetUtil.laserRelayRenderId = RenderingRegistry.getNextAvailableRenderId(); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockCompost), new RenderItems(new ModelCompost())); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFishingNet.class, new RenderTileEntity(new ModelFishingNet())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockFishingNet), new RenderItems(new ModelFishingNet())); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFurnaceSolar.class, new RenderTileEntity(new ModelFurnaceSolar())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockFurnaceSolar), new RenderItems(new ModelFurnaceSolar())); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCoffeeMachine.class, new RenderTileEntity(new ModelCoffeeMachine())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockCoffeeMachine), new RenderItems(new ModelCoffeeMachine())); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPhantomBooster.class, new RenderTileEntity(new ModelPhantomBooster())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockPhantomBooster), new RenderItems(new ModelPhantomBooster())); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud(new ModelSmileyCloud())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockSmileyCloud), new RenderItems(new ModelSmileyCloud())); - - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaserRelay.class, new RenderLaserRelay(new ModelLaserRelay())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockLaserRelay), new RenderItems(new ModelLaserRelay())); + registerRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost()), AssetUtil.compostRenderId); + registerRenderer(TileEntityFishingNet.class, new RenderTileEntity(new ModelFishingNet()), AssetUtil.fishingNetRenderId); + registerRenderer(TileEntityFurnaceSolar.class, new RenderTileEntity(new ModelFurnaceSolar()), AssetUtil.furnaceSolarRenderId); + registerRenderer(TileEntityCoffeeMachine.class, new RenderTileEntity(new ModelCoffeeMachine()), AssetUtil.coffeeMachineRenderId); + registerRenderer(TileEntityPhantomBooster.class, new RenderTileEntity(new ModelPhantomBooster()), AssetUtil.phantomBoosterRenderId); + registerRenderer(TileEntitySmileyCloud.class, new RenderSmileyCloud(new ModelSmileyCloud()), AssetUtil.smileyCloudRenderId); + registerRenderer(TileEntityLaserRelay.class, new RenderLaserRelay(new ModelLaserRelay()), AssetUtil.laserRelayRenderId); VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png")); } @@ -103,4 +92,9 @@ public class ClientProxy implements IProxy{ SpecialRenderInit.init(); } + + private static void registerRenderer(Class tileClass, RenderTileEntity tileRender, int renderID){ + ClientRegistry.bindTileEntitySpecialRenderer(tileClass, tileRender); + RenderingRegistry.registerBlockHandler(new RenderInventory(tileRender, renderID)); + } } diff --git a/src/main/java/ellpeck/actuallyadditions/util/AssetUtil.java b/src/main/java/ellpeck/actuallyadditions/util/AssetUtil.java index 61775f029..d120f8123 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/AssetUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/AssetUtil.java @@ -28,13 +28,14 @@ import org.lwjgl.opengl.GL11; public class AssetUtil{ public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory"); - public static int COMPOST_RENDER_ID; - public static int FISHING_NET_RENDER_ID; - public static int FURNACE_SOLAR_RENDER_ID; - public static int COFFEE_MACHINE_RENDER_ID; - public static int PHANTOM_BOOSTER_RENDER_ID; - public static int SMILEY_CLOUD_RENDER_ID; - public static int LASER_RELAY_RENDER_ID; + + public static int compostRenderId; + public static int fishingNetRenderId; + public static int furnaceSolarRenderId; + public static int coffeeMachineRenderId; + public static int phantomBoosterRenderId; + public static int smileyCloudRenderId; + public static int laserRelayRenderId; public static ResourceLocation getGuiLocation(String file){ return new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/gui/"+file+".png");