From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../darkknight/jewelrycraft/proxy/ClientProxy.java | 186 +++++++++++++-------- 1 file changed, 117 insertions(+), 69 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java (limited to 'src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java') diff --git a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java old mode 100644 new mode 100755 index 88807a7..5faa43f --- a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java +++ b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java @@ -1,6 +1,7 @@ package darkknight.jewelrycraft.proxy; import org.apache.logging.log4j.Level; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; @@ -53,77 +54,124 @@ import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; -public class ClientProxy extends CommonProxy -{ - public enum BlockRenderIDs { - CRYSTAL; - - private final int ID; - - BlockRenderIDs() - { - ID = RenderingRegistry.getNextAvailableRenderId(); - } +public class ClientProxy extends CommonProxy { + public enum BlockRenderIDs { + CRYSTAL; + + private final int ID; + + BlockRenderIDs() { + ID = RenderingRegistry.getNextAvailableRenderId(); + } + + public int id() { + return ID; + } + } + + @Override + public void preInit() { + TileEntityHandPedestalRender pedestalRender = + new TileEntityHandPedestalRender( + new ModelHandPedestal(Variables.PEDESTAL_TEXTURE), + Variables.PEDESTAL_TEXTURE); + TileEntityShadowHandRender shadowHandRender = + new TileEntityShadowHandRender( + new ModelShadowHand(Variables.SHADOW_HAND_TEXTURE), + Variables.SHADOW_HAND_TEXTURE); + + JewelrycraftMod.logger.log(Level.INFO, + "Binding Tileentities to their Special Rendered"); + ClientRegistry.bindTileEntitySpecialRenderer( + TileEntitySmelter.class, new TileEntitySmelterRender()); + ClientRegistry.bindTileEntitySpecialRenderer( + TileEntityMolder.class, new TileEntityMolderRender()); + ClientRegistry.bindTileEntitySpecialRenderer( + TileEntityJewelrsCraftingTable.class, + new TileEntityJewelrsCraftingTableRender()); + ClientRegistry.bindTileEntitySpecialRenderer( + TileEntityDisplayer.class, + new TileEntityDisplayerRender()); + ClientRegistry.bindTileEntitySpecialRenderer( + TileEntityShadowEye.class, + new TileEntityShadowEyeRender()); + ClientRegistry.bindTileEntitySpecialRenderer( + TileEntityMidasTouch.class, + new TileEntityMidasTouchRender()); + ClientRegistry.bindTileEntitySpecialRenderer( + TileEntityHandPedestal.class, pedestalRender); + ClientRegistry.bindTileEntitySpecialRenderer( + TileEntityShadowHand.class, shadowHandRender); + + JewelrycraftMod.logger.log(Level.INFO, + "Registering Item Renderes"); + MinecraftForgeClient.registerItemRenderer( + Item.getItemFromBlock(BlockList.displayer), + new ItemRender(new TileEntityDisplayerRender(), + new TileEntityDisplayer(), new ModelDisplayer())); + MinecraftForgeClient.registerItemRenderer( + Item.getItemFromBlock(BlockList.jewelCraftingTable), + new ItemRender(new TileEntityJewelrsCraftingTableRender(), + new TileEntityJewelrsCraftingTable(), + new ModelJewlersCraftingBench())); + MinecraftForgeClient.registerItemRenderer( + Item.getItemFromBlock(BlockList.smelter), + new ItemRender(new TileEntitySmelterRender(), + new TileEntitySmelter(), new ModelSmelter())); + MinecraftForgeClient.registerItemRenderer( + Item.getItemFromBlock(BlockList.molder), + new ItemRender(new TileEntityMolderRender(), + new TileEntityMolder(), new ModelMolder())); + MinecraftForgeClient.registerItemRenderer( + Item.getItemFromBlock(BlockList.shadowEye), + new ItemRender(new TileEntityShadowEyeRender(), + new TileEntityShadowEye(), new ModelShadowEye())); + MinecraftForgeClient.registerItemRenderer( + Item.getItemFromBlock(BlockList.handPedestal), + new ItemRender(pedestalRender, + new TileEntityHandPedestal(), + new ModelHandPedestal( + Variables.PEDESTAL_TEXTURE))); + MinecraftForgeClient.registerItemRenderer( + Item.getItemFromBlock(BlockList.shadowHand), + new ItemRender(shadowHandRender, + new TileEntityShadowHand(), new ModelShadowHand( + Variables.SHADOW_HAND_TEXTURE))); + MinecraftForgeClient.registerItemRenderer(ItemList.goldObj, + new ItemRender()); + + VillagerRegistry.instance().registerVillagerSkin(3000, + Variables.VILLAGER_TEXTURE); + + JewelrycraftMod.logger.log(Level.INFO, + "Registering Entity Renders"); + RenderingRegistry.registerEntityRenderingHandler(EntityHeart.class, + new HeartRender(new ModelHeart(), 0.25F)); + RenderingRegistry.registerEntityRenderingHandler( + EntityHalfHeart.class, + new HeartRender(new ModelHalfHeart(), 0.25F)); - public int id() - { - return ID; - } - } - - @Override - public void preInit() - { - TileEntityHandPedestalRender pedestalRender = new TileEntityHandPedestalRender(new ModelHandPedestal(Variables.PEDESTAL_TEXTURE), Variables.PEDESTAL_TEXTURE); - TileEntityShadowHandRender shadowHandRender = new TileEntityShadowHandRender(new ModelShadowHand(Variables.SHADOW_HAND_TEXTURE), Variables.SHADOW_HAND_TEXTURE); + RenderingRegistry.registerBlockHandler(new BlockCrystalRenderer()); - JewelrycraftMod.logger.log(Level.INFO, "Binding Tileentities to their Special Rendered"); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySmelter.class, new TileEntitySmelterRender()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMolder.class, new TileEntityMolderRender()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityJewelrsCraftingTable.class, new TileEntityJewelrsCraftingTableRender()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDisplayer.class, new TileEntityDisplayerRender()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityShadowEye.class, new TileEntityShadowEyeRender()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMidasTouch.class, new TileEntityMidasTouchRender()); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityHandPedestal.class, pedestalRender); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityShadowHand.class, shadowHandRender); - - JewelrycraftMod.logger.log(Level.INFO, "Registering Item Renderes"); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.displayer), new ItemRender(new TileEntityDisplayerRender(), new TileEntityDisplayer(), new ModelDisplayer())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.jewelCraftingTable), new ItemRender(new TileEntityJewelrsCraftingTableRender(), new TileEntityJewelrsCraftingTable(), new ModelJewlersCraftingBench())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.smelter), new ItemRender(new TileEntitySmelterRender(), new TileEntitySmelter(), new ModelSmelter())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.molder), new ItemRender(new TileEntityMolderRender(), new TileEntityMolder(), new ModelMolder())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.shadowEye), new ItemRender(new TileEntityShadowEyeRender(), new TileEntityShadowEye(), new ModelShadowEye())); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.handPedestal), new ItemRender(pedestalRender, new TileEntityHandPedestal(), new ModelHandPedestal(Variables.PEDESTAL_TEXTURE))); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(BlockList.shadowHand), new ItemRender(shadowHandRender, new TileEntityShadowHand(), new ModelShadowHand(Variables.SHADOW_HAND_TEXTURE))); - MinecraftForgeClient.registerItemRenderer(ItemList.goldObj, new ItemRender()); - - VillagerRegistry.instance().registerVillagerSkin(3000, Variables.VILLAGER_TEXTURE); + TabRegistry.registerTab(new InventoryTabVanilla()); + TabRegistry.registerTab(new TabJewelry()); + TabRegistry.registerTab(new TabCurses()); + MinecraftForge.EVENT_BUS.register(new TabRegistry()); + MinecraftForge.EVENT_BUS.register(new PlayerRenderHandler()); + MinecraftForge.EVENT_BUS + .register(new ScreenHandler(Minecraft.getMinecraft())); + } - JewelrycraftMod.logger.log(Level.INFO, "Registering Entity Renders"); - RenderingRegistry.registerEntityRenderingHandler(EntityHeart.class, new HeartRender(new ModelHeart(), 0.25F)); - RenderingRegistry.registerEntityRenderingHandler(EntityHalfHeart.class, new HeartRender(new ModelHalfHeart(), 0.25F)); - - RenderingRegistry.registerBlockHandler(new BlockCrystalRenderer()); + @Override + public void init() { + FMLCommonHandler.instance().bus().register(new KeyBindings()); + MinecraftForge.EVENT_BUS.register(new TextureEvent()); + } - TabRegistry.registerTab(new InventoryTabVanilla()); - TabRegistry.registerTab(new TabJewelry()); - TabRegistry.registerTab(new TabCurses()); - MinecraftForge.EVENT_BUS.register(new TabRegistry()); - MinecraftForge.EVENT_BUS.register(new PlayerRenderHandler()); - MinecraftForge.EVENT_BUS.register(new ScreenHandler(Minecraft.getMinecraft())); - } - - @Override - public void init() - { - FMLCommonHandler.instance().bus().register(new KeyBindings()); - MinecraftForge.EVENT_BUS.register(new TextureEvent()); - } - - @Override - public void postInit() - { - JewelrycraftMod.logger.log(Level.INFO, "Generating colors for each item"); - JewelrycraftUtil.generateColors(); - } + @Override + public void postInit() { + JewelrycraftMod.logger.log(Level.INFO, + "Generating colors for each item"); + JewelrycraftUtil.generateColors(); + } } -- cgit v1.2.3