From 7e12d90ce0072bb8e72ab3bba38f5c7525f49e67 Mon Sep 17 00:00:00 2001 From: Purplicious_Cow Date: Mon, 14 Aug 2017 22:49:16 +0200 Subject: [PATCH 1/2] Render Arm fixes... texture, rotation, and show in first person --- .../carryon/client/event/RenderEvents.java | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/main/java/tschipp/carryon/client/event/RenderEvents.java b/src/main/java/tschipp/carryon/client/event/RenderEvents.java index 297cf59..749a2fb 100644 --- a/src/main/java/tschipp/carryon/client/event/RenderEvents.java +++ b/src/main/java/tschipp/carryon/client/event/RenderEvents.java @@ -9,6 +9,7 @@ import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.IBakedModel; @@ -123,7 +124,9 @@ public class RenderEvents { World world = Minecraft.getMinecraft().world; EntityPlayer player = Minecraft.getMinecraft().player; + AbstractClientPlayer aplayer = (AbstractClientPlayer) player; ItemStack stack = player.getHeldItemMainhand(); + int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView; if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack)) { @@ -131,11 +134,8 @@ public class RenderEvents BlockPos pos = player.getPosition(); NBTTagCompound tag = ItemTile.getTileData(stack); IBlockState state = ItemTile.getBlockState(stack); - ItemStack tileStack = ItemTile.getItemStack(stack); - int perspective = Minecraft.getMinecraft().gameSettings.thirdPersonView; - GlStateManager.pushMatrix(); GlStateManager.scale(2.5, 2.5, 2.5); GlStateManager.translate(0, -0.6, -1); @@ -158,7 +158,15 @@ public class RenderEvents event.setCanceled(true); } else + { event.setCanceled(false); + Minecraft mc = Minecraft.getMinecraft(); + RenderManager manager = mc.getRenderManager(); + RenderPlayer renderPlayer = manager.getSkinMap().get(aplayer.getSkinType()); + ModelPlayer modelPlayer = renderPlayer.getMainModel(); + modelPlayer.bipedLeftArm.isHidden = false; + modelPlayer.bipedRightArm.isHidden = false; + } } /* @@ -170,7 +178,7 @@ public class RenderEvents { World world = Minecraft.getMinecraft().world; EntityPlayer player = event.getEntityPlayer(); - ModelBiped modelBiped = event.getRenderer().getMainModel(); + ModelPlayer modelPlayer = event.getRenderer().getMainModel(); EntityPlayerSP clientPlayer = Minecraft.getMinecraft().player; ItemStack stack = player.getHeldItemMainhand(); if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack)) @@ -217,9 +225,10 @@ public class RenderEvents GlStateManager.popMatrix(); } else { - modelBiped.bipedLeftArm.isHidden = false; - modelBiped.bipedRightArm.isHidden = false; + modelPlayer.bipedLeftArm.isHidden = false; + modelPlayer.bipedRightArm.isHidden = false; } + } /* @@ -232,20 +241,19 @@ public class RenderEvents EntityPlayer player = event.getEntityPlayer(); AbstractClientPlayer aplayer = (AbstractClientPlayer) player; ItemStack stack = player.getHeldItemMainhand(); - ModelBiped model = event.getRenderer().getMainModel(); + ModelPlayer model = event.getRenderer().getMainModel(); EntityPlayerSP clientPlayer = Minecraft.getMinecraft().player; - + ResourceLocation skinLoc = DefaultPlayerSkin.getDefaultSkin(player.getPersistentID()); if (!stack.isEmpty() && stack.getItem() == RegistrationHandler.itemTile && ItemTile.hasTileData(stack)) { model.bipedLeftArm.isHidden = true; model.bipedRightArm.isHidden = true; - + Minecraft.getMinecraft().getTextureManager().bindTexture(skinLoc); float rotation = -player.renderYawOffset; - ModelRenderer fakeLeftArm = new ModelRenderer(model, 40, 16); - fakeLeftArm.mirror = true; + ModelRenderer fakeLeftArm = new ModelRenderer(model, 32, 48); if (aplayer.getSkinType().equals("default")) { fakeLeftArm.addBox(model.bipedLeftArm.offsetX + 4.2F, model.bipedLeftArm.offsetY, model.bipedLeftArm.offsetZ, 4, 12, 4, .08F); @@ -256,7 +264,6 @@ public class RenderEvents } ModelRenderer fakeRightArm = new ModelRenderer(model, 40, 16); - fakeRightArm.mirror = true; if (aplayer.getSkinType().equals("default")) { fakeRightArm.addBox(model.bipedRightArm.offsetX - 7.9F, model.bipedRightArm.offsetY, model.bipedRightArm.offsetZ, 4, 12, 4, .08F); @@ -282,6 +289,12 @@ public class RenderEvents } } + if (stack.isEmpty() || stack.getItem() != RegistrationHandler.itemTile || !ItemTile.hasTileData(stack)) + { + model.bipedLeftArm.isHidden = false; + model.bipedRightArm.isHidden = false; + } + } public static boolean isChest(Block block) @@ -298,7 +311,7 @@ public class RenderEvents } @SideOnly(Side.CLIENT) - private static ModelBiped getPlayerModel(AbstractClientPlayer player) + private static ModelPlayer getPlayerModel(AbstractClientPlayer player) { return getRenderPlayer(player).getMainModel(); } From 0aa337d3763a46790f149de01b21cbd5e003cfaa Mon Sep 17 00:00:00 2001 From: Tschipp Date: Mon, 14 Aug 2017 22:50:25 +0200 Subject: [PATCH 2/2] Added Update JSON and changed Version Number --- src/main/java/tschipp/carryon/CarryOn.java | 5 +++-- src/main/resources/mcmod.info | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/tschipp/carryon/CarryOn.java b/src/main/java/tschipp/carryon/CarryOn.java index d39d3aa..05ce88c 100644 --- a/src/main/java/tschipp/carryon/CarryOn.java +++ b/src/main/java/tschipp/carryon/CarryOn.java @@ -19,7 +19,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import tschipp.carryon.common.CommonProxy; @EventBusSubscriber -@Mod(modid = CarryOn.MODID, name = CarryOn.NAME, version = CarryOn.VERSION, guiFactory = "tschipp.carryon.client.gui.GuiFactoryCarryOn", dependencies = "required-after:forge@[13.20.1.2386,)") +@Mod(modid = CarryOn.MODID, name = CarryOn.NAME, version = CarryOn.VERSION, guiFactory = "tschipp.carryon.client.gui.GuiFactoryCarryOn", dependencies = "required-after:forge@[13.20.1.2386,)", updateJSON = CarryOn.UPDATE_JSON) public class CarryOn { @SidedProxy(clientSide = "tschipp.carryon.client.ClientProxy", serverSide = "tschipp.carryon.common.CommonProxy") @@ -30,8 +30,9 @@ public class CarryOn { public static CarryOn instance; public static final String MODID = "carryon"; - public static final String VERSION = "1.0"; + public static final String VERSION = "1.1"; public static final String NAME = "Carry On"; + public static final String UPDATE_JSON = "https://gist.githubusercontent.com/Tschipp/dccadee7c90d7a34e6e76a35d9d6fa2e/raw/bf7fb60d5e59f73eee65b271d5c01585e26a0352/update.json"; //public static SimpleNetworkWrapper network; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 4177a47..e224d4f 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid" : "carryon", "name" : "Carry On", - "version" : "1.0", "mcversion" : "1.11.2", + "version" : "1.1", "mcversion" : "1.11.2", "url" : "", "credits" : "Tschipp, Purplicious_Cow, cy4n", "authorList" : ["Tschipp, Purplicious_Cow, cy4n"],