From 6af565ab07a802518345df7f06772df56f6e205f Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Tue, 22 Aug 2017 01:35:44 -0500 Subject: 1.4.1.1a update --- .../java/lance5057/tDefense/proxy/ClientProxy.java | 137 ++++++++++++++------- 1 file changed, 91 insertions(+), 46 deletions(-) (limited to 'src/main/java/lance5057/tDefense/proxy/ClientProxy.java') diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java index 9443435..af0a175 100644 --- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java +++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java @@ -1,14 +1,15 @@ package lance5057.tDefense.proxy; +import java.util.Map; + import javax.annotation.Nonnull; import lance5057.tDefense.Reference; import lance5057.tDefense.TD_Commands; -import lance5057.tDefense.baubles.BaublesClientProxy; -import lance5057.tDefense.core.CoreBlocks; import lance5057.tDefense.core.CoreClientProxy; -import lance5057.tDefense.core.CoreItems; -import lance5057.tDefense.core.blocks.TDMetalBlock; +import lance5057.tDefense.core.parts.TDParts; +import lance5057.tDefense.core.renderers.BaubleRenderer; +import lance5057.tDefense.core.renderers.SheatheModel; import lance5057.tDefense.core.tools.TDTools; import lance5057.tDefense.holiday.HolidayClientProxy; import net.minecraft.block.Block; @@ -17,6 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -24,6 +26,7 @@ import net.minecraftforge.client.ClientCommandHandler; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fluids.Fluid; import slimeknights.tconstruct.common.ModelRegisterUtil; +import slimeknights.tconstruct.library.TinkerRegistry; import slimeknights.tconstruct.library.TinkerRegistryClient; import slimeknights.tconstruct.library.client.ToolBuildGuiInfo; @@ -36,8 +39,6 @@ public class ClientProxy extends CommonProxy { // public static ModelTinkersTabard sheath; - public static BaublesClientProxy baubles = new BaublesClientProxy(); - ToolBuildGuiInfo roundshieldGUI; ToolBuildGuiInfo heatershieldGUI; @@ -60,6 +61,12 @@ public class ClientProxy extends CommonProxy { ToolBuildGuiInfo grievesGUI; ToolBuildGuiInfo sabatonsGUI; + ToolBuildGuiInfo sheatheGUI; + ToolBuildGuiInfo ringGUI; + ToolBuildGuiInfo amuletGUI; + + public static SheatheModel sheathe; + public static CoreClientProxy coreProxy = new CoreClientProxy(); public static HolidayClientProxy holiProxy = new HolidayClientProxy(); // public static ArmorClientProxy armorProxy = new ArmorClientProxy(); @@ -68,35 +75,29 @@ public class ClientProxy extends CommonProxy { public void preInit() { ClientCommandHandler.instance.registerCommand(new TD_Commands()); registerToolRenderers(); + registerPartModels(); coreProxy.preInit(); - // armorProxy.preInit(); - baubles.preInit(); } @Override public void init() { - // Minecraft.getMinecraft().getRenderItem().getItemModelMesher() - // .register(TDTools.heatershield, 0, new - // ModelResourceLocation("modid:itemname", "inventory")); - // + Map skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap(); + RenderPlayer render; + render = skinMap.get("default"); + render.addLayer(new BaubleRenderer()); + + render = skinMap.get("slim"); + render.addLayer(new BaubleRenderer()); createToolGuis(); setToolGuis(); registerToolGuis(); - - registerItemRenderer(CoreBlocks.metalItemBlock, TDMetalBlock.EnumMetal.AEONSTEEL.getID(), "aeonsteelblock"); - registerItemRenderer(CoreBlocks.metalItemBlock, TDMetalBlock.EnumMetal.QUEENSGOLD.getID(), "queensgoldblock"); - registerItemRenderer(CoreBlocks.metalItemBlock, TDMetalBlock.EnumMetal.DOGBEARIUM.getID(), "dogbeariumblock"); - - registerItemRenderer(CoreItems.item_aeonsteelIngot, 0, CoreItems.item_aeonsteelIngot.getUnlocalizedName()); - registerItemRenderer(CoreItems.item_dogbeariumIngot, 0, CoreItems.item_dogbeariumIngot.getUnlocalizedName()); - registerItemRenderer(CoreItems.item_queensgoldIngot, 0, CoreItems.item_queensgoldIngot.getUnlocalizedName()); + createToolModels(); coreProxy.init(); // armorProxy.init(); holiProxy.Init(); - baubles.init(); } public void registerToolRenderers() { @@ -111,6 +112,9 @@ public class ClientProxy extends CommonProxy { ModelRegisterUtil.registerToolModel(TDTools.robe); ModelRegisterUtil.registerToolModel(TDTools.shoes); + ModelRegisterUtil.registerToolModel(TDTools.sheathe); + ModelRegisterUtil.registerToolModel(TDTools.ring); + ModelRegisterUtil.registerToolModel(TDTools.amulet); } public void createToolGuis() { @@ -124,6 +128,11 @@ public class ClientProxy extends CommonProxy { shawlGUI = new ToolBuildGuiInfo(TDTools.shawl); robeGUI = new ToolBuildGuiInfo(TDTools.robe); shoesGUI = new ToolBuildGuiInfo(TDTools.shoes); + + sheatheGUI = new ToolBuildGuiInfo(TDTools.sheathe); + ringGUI = new ToolBuildGuiInfo(TDTools.ring); + amuletGUI = new ToolBuildGuiInfo(TDTools.amulet); + } public void setupToolGuis() { @@ -160,6 +169,10 @@ public class ClientProxy extends CommonProxy { shearsGUI.addSlotPosition(34, 15 + 8); shearsGUI.addSlotPosition(43, 33 + 8); shearsGUI.addSlotPosition(34, 51 + 8); + + ringGUI.addSlotPosition(34, 15 + 8); + ringGUI.addSlotPosition(43, 33 + 8); + ringGUI.addSlotPosition(34, 51 + 8); } public void registerToolGuis() { @@ -174,13 +187,26 @@ public class ClientProxy extends CommonProxy { TinkerRegistryClient.addToolBuilding(robeGUI); TinkerRegistryClient.addToolBuilding(shoesGUI); + TinkerRegistryClient.addToolBuilding(sheatheGUI); + TinkerRegistryClient.addToolBuilding(ringGUI); + TinkerRegistryClient.addToolBuilding(amuletGUI); + } + + public void registerPartModels() { + ModelRegisterUtil.registerPartModel(TDParts.armorPlate); + ModelRegisterUtil.registerPartModel(TDParts.chainmail); + ModelRegisterUtil.registerPartModel(TDParts.clasp); + ModelRegisterUtil.registerPartModel(TDParts.cloth); + ModelRegisterUtil.registerPartModel(TDParts.filigree); + ModelRegisterUtil.registerPartModel(TDParts.ringShank); + ModelRegisterUtil.registerPartModel(TDParts.rivets); + ModelRegisterUtil.registerPartModel(TDParts.setting); + ModelRegisterUtil.registerPartModel(TDParts.wire); } @Override public void reloadRenderers() { setToolGuis(); - - baubles.reloadRenderers(); } public void setToolGuis() { @@ -230,6 +256,25 @@ public class ClientProxy extends CommonProxy { fishingRodGUI.addSlotPosition(34, 15 + 8); fishingRodGUI.addSlotPosition(43, 33 + 8); fishingRodGUI.addSlotPosition(34, 51 + 8); + + sheatheGUI.positions.clear(); + sheatheGUI.addSlotPosition(34, 15); + sheatheGUI.addSlotPosition(34, 33); + sheatheGUI.addSlotPosition(34, 51); + + ringGUI.positions.clear(); + ringGUI.addSlotPosition(34, 15); + ringGUI.addSlotPosition(34, 33); + ringGUI.addSlotPosition(34, 51); + + amuletGUI.positions.clear(); + amuletGUI.addSlotPosition(34, 15); + amuletGUI.addSlotPosition(34, 33); + amuletGUI.addSlotPosition(34, 51); + } + + void createToolModels() { + sheathe = new SheatheModel(); } @Override @@ -258,36 +303,36 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomStateMapper(block, mapper); } } - + @Override public void registerItemBlockRenderer(Block block, int meta, String file) { - Minecraft.getMinecraft().getRenderItem().getItemModelMesher() - .register(Item.getItemFromBlock(block), meta, new ModelResourceLocation(Reference.MOD_ID + ":" + file, "inventory")); + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(Item.getItemFromBlock(block), meta, + new ModelResourceLocation(Reference.MOD_ID + ":" + file, "inventory")); } - - public static class FluidStateMapper extends StateMapperBase implements ItemMeshDefinition { + public static class FluidStateMapper extends StateMapperBase implements ItemMeshDefinition { - public final Fluid fluid; - public final ModelResourceLocation location; + public final Fluid fluid; + public final ModelResourceLocation location; - public FluidStateMapper(Fluid fluid) { - this.fluid = fluid; + public FluidStateMapper(Fluid fluid) { + this.fluid = fluid; - // have each block hold its fluid per nbt? hm - this.location = new ModelResourceLocation(new ResourceLocation(Reference.MOD_ID, "fluid_block"), fluid.getName()); - } + // have each block hold its fluid per nbt? hm + this.location = new ModelResourceLocation(new ResourceLocation(Reference.MOD_ID, "fluid_block"), + fluid.getName()); + } - @Nonnull - @Override - protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { - return location; - } + @Nonnull + @Override + protected ModelResourceLocation getModelResourceLocation(@Nonnull IBlockState state) { + return location; + } - @Nonnull - @Override - public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack) { - return location; - } -} + @Nonnull + @Override + public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack) { + return location; + } + } } -- cgit v1.2.3