From 682f2be11581a553e06d50ee8010fd5fb6db6619 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Fri, 30 Apr 2021 04:48:06 -0400 Subject: [PATCH] Final Fix to UrlSkins + Working Model Switch Username Skins will take a long time to implement because of how 1.7.10 pulls skins from Minecraft's Servers. --- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- .../java/noppes/npcs/client/ClientProxy.java | 2 +- .../npcs/client/renderer/RenderNPCInterface.java | 2 +- .../textures/entity/humanmale/Steve64.png | Bin 2696 -> 0 bytes 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/humanmale/Steve64.png diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 3d843ffe4..64b95be3e 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -63,7 +63,7 @@ import noppes.npcs.entity.old.EntityNpcNagaFemale; import noppes.npcs.entity.old.EntityNpcNagaMale; import noppes.npcs.entity.old.EntityNpcSkeleton; -@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.7.10d") +@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.7.10f") public class CustomNpcs { @ConfigProp(info = "Disable Chat Bubbles") diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 150e6e342..13f9c1c74 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -191,7 +191,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileBlockAnvil.class, new BlockCarpentryBenchRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileMailbox.class, new BlockMailboxRenderer()); RenderingRegistry.registerBlockHandler(new BlockBorderRenderer()); - + if(!CustomNpcs.DisableExtraBlock){ ClientRegistry.bindTileEntitySpecialRenderer(TileBanner.class, new BlockBannerRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileWallBanner.class, new BlockWallBannerRenderer()); diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java index 459a78951..a3b27f81d 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java @@ -274,7 +274,7 @@ public class RenderNPCInterface extends RenderLiving{ } else if(npc.display.skinType == 1 && npc.display.playerProfile != null){ Minecraft minecraft = Minecraft.getMinecraft(); - Map map = minecraft.func_152342_ad().func_152788_a(npc.display.playerProfile); + Map map = minecraft.func_152342_ad().func_152788_a(npc.display.playerProfile); if (map.containsKey(Type.SKIN)){ npc.textureLocation = minecraft.func_152342_ad().func_152792_a((MinecraftProfileTexture)map.get(Type.SKIN), Type.SKIN); } diff --git a/src/main/resources/assets/customnpcs/textures/entity/humanmale/Steve64.png b/src/main/resources/assets/customnpcs/textures/entity/humanmale/Steve64.png deleted file mode 100644 index c5b91d054d4def145cf9666442a6e6b75983301c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2696 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