From 0b1f9552409d5e4065e25541440379055e84df4e Mon Sep 17 00:00:00 2001 From: HbmMods Date: Wed, 20 Mar 2019 09:46:50 +0100 Subject: [PATCH] permanently fixed VIP capes to the player model --- assets/hbm/textures/gui/gui_bobmazon.png | Bin 3765 -> 4226 bytes .../hbm/textures/items/chem_icon_CONCRETE.png | Bin 0 -> 311 bytes assets/hbm/textures/models/CapeSam.png | Bin 0 -> 871 bytes assets/hbm/textures/models/CapeTest.png | Bin 0 -> 1509 bytes com/hbm/items/ModItems.java | 32 ++++----- com/hbm/items/gear/ArmorModel.java | 16 ++--- com/hbm/lib/Library.java | 1 + com/hbm/main/CraftingManager.java | 16 ++--- com/hbm/main/ModEventHandlerClient.java | 14 +++- .../render/misc/RenderAccessoryUtility.java | 64 ++++++++++++++++++ 10 files changed, 109 insertions(+), 34 deletions(-) create mode 100644 assets/hbm/textures/items/chem_icon_CONCRETE.png create mode 100644 assets/hbm/textures/models/CapeSam.png create mode 100644 assets/hbm/textures/models/CapeTest.png create mode 100644 com/hbm/render/misc/RenderAccessoryUtility.java diff --git a/assets/hbm/textures/gui/gui_bobmazon.png b/assets/hbm/textures/gui/gui_bobmazon.png index c84b96bb68fd86e92783712ca319d8fc7e17dc8b..33890326aec6b0a8b4906f3858d516f899831ca9 100644 GIT binary patch literal 4226 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 Ur`>?n_}d?S+4xfNMW?_12l{rgsQ>@~ literal 3765 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 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/models/CapeTest.png b/assets/hbm/textures/models/CapeTest.png new file mode 100644 index 0000000000000000000000000000000000000000..a2d0f284b65ea55008d45305b0faf5063d7c68ee GIT binary patch literal 1509 zcmeAS@N?(olHy`uVBq!ia0y~yU_1b1Kj2^kl2iU|`v|01ik&<|IDnvrBc+3Zfpw0j zi(^Q|oVRy<^FvZ4*d7>f)eT^m61sa}+L6{4->0WrdL@c#Tm^Aq*~%3Gut zX)Kji;uhYv!T6Se*b5U`@l!Jwmz~Ofws`6H(zWya=I<#^n02Re{+x2Z)wi6NUw--a z>+kD*a@o_jgc=9mcCFoeuO#w*$@UfNcN<4vF^}G>^(uRAl-4Wlt)EL$m%N^v8!P{^ zs($db$ zzoJs-JC-khV_flbQSg=PdD~?tGVqC5J1{75(h>Xi|K^=$_j}2@^~tx;h@6E;jm<5zk|7%*{iC=#D)L6vv>D9uaApfwQ7~US?$|*<>kkVY8g^CF|#O4 zVqj6Ybi;kY_xhOCuTM|^wVq$9{obz9?CYh|>|@tuKMr7MONAL31`KT8-6t+4zg@I% z=E}Fb{=GQ#bl1M3r(Uu4RbN)DoBjBLw0Yi@uYdm3#NLnm`>glq&(g3?Wlx6&Mz>C@@S^vtp86V#ya9 zAHV+fv%3p@SFc`OdUsFo6$_DupfYI8S_!Z}oIUIDg`GQh##W!3W4ZbD>$AI^r%(TV zU-sA6yHgjvE*98#-m&7rhRrZ%xVSHvu0MDE>vsNk*S{`c{^UDZqFt)-n`9$X`&^*S z6TvoD3DjM69t)ddR?hJR=I1R6Y;fcW>f*ag+S&eePO z>%UIg|NnoV^XzkTt;4U!o5bncD)1k8m<$VO=8qOjfYSf14EBG!9JN2QqcCH0dUA5I z$aJ0q(dS_1u_v+Iy0VA+%b%nF%G>#*+Rb=>$z6PA@#Xi{_QUZi4EeUO6#4eH@Wbyx z@-6kj_e;LZ+s8-zsJOoG(#GY-6~9)>2o>D8$;c$&$-pG=^1xkIs~+~(_HTYwZJ#yw z!&HWX3otp5JRzL^gFMsN%{y!$He)`|}y6U)Zl4s6OtzA}M()Ry1;|+dTgkfaKt$w=S)V`)! z`-i*jx_9&1*NN-C@7QH~>Fc*oiC>?3T>riE`&EzYv#n}Nm%RQuZ|$_X`x#~kz`}t> ixf59G4MFhW?ML superuser = new ArrayList(); diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 1a5bc48a0..ccfbafa07 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -546,7 +546,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.wrench, 1), new Object[] { " S ", " IS", "I ", 'S', "ingotSteel", 'I', "ingotIron" })); GameRegistry.addRecipe(new ItemStack(ModItems.wrench_flipped, 1), new Object[] { "S", "D", "W", 'S', Items.iron_sword, 'D', ModItems.ducttape, 'W', ModItems.wrench }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.memespoon, 1), new Object[] { "CGC", "PSP", "IAI", 'C', ModItems.powder_cloud, 'G', ModItems.cape_codered_, 'P', ModItems.photo_panel, 'S', ModItems.steel_shovel, 'I', ModItems.plate_polymer, 'A', "ingotAustralium" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.memespoon, 1), new Object[] { "CGC", "PSP", "IAI", 'C', ModItems.powder_cloud, 'G', ModBlocks.block_thorium, 'P', ModItems.photo_panel, 'S', ModItems.steel_shovel, 'I', ModItems.plate_polymer, 'A', "ingotAustralium" })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.toothpicks, 3), new Object[] { Items.stick, Items.stick, Items.stick }); GameRegistry.addShapedRecipe(new ItemStack(ModItems.ducttape, 6), new Object[] { "FSF", "SPS", "FSF", 'F', Items.string, 'S', Items.slime_ball, 'P', Items.paper }); @@ -1305,13 +1305,13 @@ public class CraftingManager { GameRegistry.addRecipe(new ItemStack(ModItems.cape_radiation, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 11), 'D', new ItemStack(Items.dye, 1, 11), 'I', ModItems.nuclear_waste }); GameRegistry.addRecipe(new ItemStack(ModItems.cape_gasmask, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 4), 'D', new ItemStack(Items.dye, 1, 0), 'I', ModItems.gas_mask }); GameRegistry.addRecipe(new ItemStack(ModItems.cape_schrabidium, 1), new Object[] { "W W", "WIW", "WDW", 'W', ModItems.ingot_schrabidium, 'D', new ItemStack(Items.dye, 1, 0), 'I', ModItems.circuit_red_copper }); - GameRegistry.addRecipe(new ItemStack(ModItems.cape_hbm, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', ModItems.ingot_neptunium, 'I', ModItems.ingot_euphemium }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_dafnik, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 1), 'D', new ItemStack(Items.dye, 1, 0), 'I', "ingotSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_lpkukin, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), 'D', new ItemStack(Items.dye, 1, 8), 'I', "plateSteel" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_codered_, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 6), 'D', new ItemStack(Items.dye, 1, 5), 'I', "ingotAustralium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_vertice, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), 'D', new ItemStack(Items.dye, 1, 8), 'I', "ingotVerticium" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_ayy, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', new ItemStack(Items.dye, 1, 8), 'I', "ingotReiium" })); - GameRegistry.addRecipe(new ItemStack(ModItems.cape_nostalgia, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', new ItemStack(Items.dye, 1, 6), 'I', ModItems.flame_pony }); + //GameRegistry.addRecipe(new ItemStack(ModItems.cape_hbm, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', ModItems.ingot_neptunium, 'I', ModItems.ingot_euphemium }); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_dafnik, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 1), 'D', new ItemStack(Items.dye, 1, 0), 'I', "ingotSteel" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_lpkukin, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), 'D', new ItemStack(Items.dye, 1, 8), 'I', "plateSteel" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_codered_, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 6), 'D', new ItemStack(Items.dye, 1, 5), 'I', "ingotAustralium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_vertice, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 13), 'D', new ItemStack(Items.dye, 1, 8), 'I', "ingotVerticium" })); + //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cape_ayy, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', new ItemStack(Items.dye, 1, 8), 'I', "ingotReiium" })); + //GameRegistry.addRecipe(new ItemStack(ModItems.cape_nostalgia, 1), new Object[] { "W W", "WIW", "WDW", 'W', new ItemStack(Item.getItemFromBlock(Blocks.wool), 1, 15), 'D', new ItemStack(Items.dye, 1, 6), 'I', ModItems.flame_pony }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.igniter, 1), new Object[] { " W", "SC", "CE", 'S', "plateSteel", 'W', ModItems.wire_schrabidium, 'C', ModItems.circuit_schrabidium, 'E', ModItems.ingot_euphemium })); GameRegistry.addRecipe(new ItemStack(ModItems.euphemium_helmet, 1), new Object[] { "EEE", "E E", 'E', ModItems.plate_euphemium }); diff --git a/com/hbm/main/ModEventHandlerClient.java b/com/hbm/main/ModEventHandlerClient.java index f31a64862..89ae3e804 100644 --- a/com/hbm/main/ModEventHandlerClient.java +++ b/com/hbm/main/ModEventHandlerClient.java @@ -10,10 +10,13 @@ import com.hbm.items.ModItems; import com.hbm.items.tool.ItemGeigerCounter; import com.hbm.items.weapon.ItemGunBase; import com.hbm.lib.Library; +import com.hbm.lib.RefStrings; import com.hbm.packet.GunButtonPacket; import com.hbm.packet.PacketDispatcher; +import com.hbm.render.misc.RenderAccessoryUtility; import com.hbm.render.misc.RenderScreenOverlay; import com.hbm.render.misc.RenderScreenOverlay.Crosshair; +import com.hbm.render.model.ModelCloak; import com.hbm.saveddata.RadEntitySavedData; import com.hbm.saveddata.RadiationSavedData; import com.hbm.sound.MovingSoundChopper; @@ -21,10 +24,12 @@ import com.hbm.sound.MovingSoundChopperMine; import com.hbm.sound.MovingSoundCrashing; import com.hbm.sound.MovingSoundPlayerLoop; import com.hbm.sound.MovingSoundXVL1456; +import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.player.EntityPlayer; @@ -91,10 +96,15 @@ public class ModEventHandlerClient { } @SubscribeEvent - public void renderGunPull(RenderPlayerEvent.Pre event) { + public void preRenderEvent(RenderPlayerEvent.Pre event) { RenderPlayer renderer = event.renderer; - EntityPlayer player = event.entityPlayer; + AbstractClientPlayer player = (AbstractClientPlayer)event.entityPlayer; + + ResourceLocation cloak = RenderAccessoryUtility.getCloakFromPlayer(player); + + if(cloak != null) + player.func_152121_a(Type.CAPE, cloak); if(player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IHoldableWeapon) { renderer.modelBipedMain.aimedBow = true; diff --git a/com/hbm/render/misc/RenderAccessoryUtility.java b/com/hbm/render/misc/RenderAccessoryUtility.java new file mode 100644 index 000000000..6e5cebc1f --- /dev/null +++ b/com/hbm/render/misc/RenderAccessoryUtility.java @@ -0,0 +1,64 @@ +package com.hbm.render.misc; + +import com.hbm.items.ModItems; +import com.hbm.lib.Library; +import com.hbm.lib.RefStrings; +import com.hbm.main.MainRegistry; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; + +public class RenderAccessoryUtility { + + private static ResourceLocation hbm = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeHbm.png"); + private static ResourceLocation hbm2 = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeHbm2.png"); + private static ResourceLocation dafnik = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeDafnik.png"); + private static ResourceLocation lpkukin = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeShield.png"); + private static ResourceLocation vertice = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeVertice_2.png"); + private static ResourceLocation red = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeRed.png"); + private static ResourceLocation ayy = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeAyy.png"); + private static ResourceLocation nostalgia = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeNostalgia.png"); + private static ResourceLocation sam = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeSam.png"); + private static ResourceLocation test = new ResourceLocation(RefStrings.MODID + ":textures/models/CapeTest.png"); + + public static ResourceLocation getCloakFromPlayer(EntityPlayer player) { + + String uuid = player.getUniqueID().toString(); + String name = player.getDisplayName(); + + if(uuid.equals(Library.HbMinecraft)) { + + if(MainRegistry.polaroidID == 11) + return hbm; + else + return hbm2; + } + if(uuid.equals(Library.Dafnik)) { + return dafnik; + } + if(uuid.equals(Library.LPkukin)) { + return lpkukin; + } + if(uuid.equals(Library.LordVertice)) { + return vertice; + } + if(uuid.equals(Library.CodeRed_)) { + return red; + } + if(uuid.equals(Library.dxmaster769)) { + return ayy; + } + if(uuid.equals(Library.nostalgia)) { + return nostalgia; + } + if(uuid.equals(Library.samino2)) { + return sam; + } + if(name.startsWith("Player")) { + return test; + } + + return null; + } + +}