From ba0f21dc2609903b55ad75a05b39d9bc53ddd738 Mon Sep 17 00:00:00 2001 From: luisc Date: Sat, 11 Dec 2021 08:41:54 -0600 Subject: [PATCH] Revert "Added npc.setPoweredTexture(directory) and npc.getPoweredTexture() functions, along with a new powered texture resource." This reverts commit ba4bf107b56a6f668157866d6cec5dbd7f4973f8. --- src/main/java/noppes/npcs/DataDisplay.java | 5 +-- .../npcs/client/renderer/RenderCustomNpc.java | 42 ------------------ .../npcs/entity/EntityNPCInterface.java | 4 -- .../npcs/scripted/entity/ScriptNpc.java | 9 ---- .../npcs/scripted/interfaces/ICustomNpc.java | 4 -- .../customnpcs/textures/entity/npc_armor.png | Bin 1681 -> 0 bytes 6 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 src/main/resources/assets/customnpcs/textures/entity/npc_armor.png diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java index a18bcd6a7..1bda8ee33 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -37,8 +37,7 @@ public class DataDisplay { public String texture = "customnpcs:textures/entity/humanmale/Steve.png"; public String cloakTexture = ""; public String glowTexture = ""; - public String poweredTexture = ""; - + public int visible = 0; //0:visible 1:Invisible 2:semi-invisible public int modelSize = 5; @@ -103,7 +102,6 @@ public class DataDisplay { nbttagcompound.setString("Texture", texture); nbttagcompound.setString("CloakTexture", cloakTexture); nbttagcompound.setString("GlowTexture", glowTexture); - nbttagcompound.setString("PoweredTexture", poweredTexture); nbttagcompound.setByte("UsingSkinUrl", skinType); if (this.playerProfile != null) @@ -159,7 +157,6 @@ public class DataDisplay { texture = nbttagcompound.getString("Texture"); cloakTexture = nbttagcompound.getString("CloakTexture"); glowTexture = nbttagcompound.getString("GlowTexture"); - poweredTexture = nbttagcompound.getString("PoweredTexture"); modelSize = ValueUtil.CorrectInt(nbttagcompound.getInteger("Size"), 1, Integer.MAX_VALUE); modelType = nbttagcompound.getInteger("modelType"); diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java b/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java index 9ef6ab233..57e9dd460 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderCustomNpc.java @@ -11,7 +11,6 @@ import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.BossStatus; -import net.minecraft.util.ResourceLocation; import noppes.npcs.client.model.ModelMPM; import noppes.npcs.client.model.util.ModelRenderPassHelper; import noppes.npcs.constants.EnumStandingType; @@ -89,47 +88,6 @@ public class RenderCustomNpc extends RenderNPCHumanMale{ @Override protected int shouldRenderPass(EntityLivingBase par1EntityLivingBase, int par2, float par3){ - EntityNPCInterface npc = (EntityNPCInterface) par1EntityLivingBase; - if (npc.hasPoweredTexture()) - { - if (npc.isInvisible()) - { - GL11.glDepthMask(false); - } - else - { - GL11.glDepthMask(true); - } - - if (par2 == 1) - { - ResourceLocation poweredNPCTexture = new ResourceLocation(npc.display.poweredTexture);//customnpcs:textures/entity/npc_armor.png - float f1 = (float)npc.ticksExisted + par3; - this.bindTexture(poweredNPCTexture); - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); - float f2 = f1 * 0.01F; - float f3 = f1 * 0.01F; - GL11.glTranslatef(f2, f3, 0.0F); - this.setRenderPassModel(this.originalModel); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_BLEND); - float f4 = 0.5F; - GL11.glColor4f(f4, f4, f4, 1.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); - return 1; - } - - if (par2 == 2) - { - GL11.glMatrixMode(GL11.GL_TEXTURE); - GL11.glLoadIdentity(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - } - } if(renderEntity != null){ return NPCRendererHelper.shouldRenderPass(entity, par2, par3, renderEntity); } diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 9c0947b19..991ba265f 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -1732,8 +1732,4 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti { this.display.modelType = val; } - - public boolean hasPoweredTexture() { - return !("".equals(this.display.poweredTexture)); - } } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 2c36a142c..64cd375b6 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -1006,13 +1006,4 @@ public class ScriptNpc extends ScriptLiving imp public String getOverlayTexture() { return npc.display.glowTexture; } - - public void setPoweredTexture(String poweredTexture) { - npc.display.poweredTexture = poweredTexture; - npc.updateClient = true; - } - - public String getPoweredTexture() { - return npc.display.poweredTexture; - } } diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java b/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java index ff0df53b0..c92d8c7ae 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/ICustomNpc.java @@ -703,8 +703,4 @@ public interface ICustomNpc extends IEntityLiving { public void setOverlayTexture(String overlayTexture); public String getOverlayTexture(); - - public void setPoweredTexture(String poweredTexture); - - public String getPoweredTexture(); } diff --git a/src/main/resources/assets/customnpcs/textures/entity/npc_armor.png b/src/main/resources/assets/customnpcs/textures/entity/npc_armor.png deleted file mode 100644 index 73a5d7ce29a4a895aa17d6fb196a5fd897067527..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1681 zcmd5+`!^H_8-6t`aU`L!`qXsUG(~igOQju5E+d2(*B!=fN|GU$(Yg#V$-O0-mQoUh zY_YjiQnO5j#DqSjU7t&QRzr<6dUyIS_C4o$pYxpem-ji(ISWVUD;%Fg*c0J;9nFdnyqelakXDYWTrBOv%iXxE5Wy$_PKoahqFyd;%trX>F|!sS zK)5X*Z@fe}J_5#J#ZM9ZJG#dZ9Qd#+w7du5#3(rr!I1H{1hvv}%~=HIGq6ay_ZmC@ z!t^$L@(zC+KnUuAxCOAxP)|dzDg?(e2<`>j^EPGJ_7=bAA-GgR{Gu$uQ09kkspdqv zIJ(Mg{)+}a9M>evURxev>&XUK@$ehuj*5880SLWz))Y5eTJ#YWj+XJt;r})`ueznL zH8iZ1TvAVzZ>-3$f3mtcYala&6=+755Zu&1vDVgCICAIDz zVsvopo7>V(3ucJaY*zW-Yt+ysX&Oy~2BG!!ZIYk(H}zXv5nmEmv2K~9{dvSwWuTy?3O)0FKQ#cyq`#;Yz zLvfSasF1wq*B?~XILwMZ^G5E?JH@VLRbasNXuQeymlVSFXOtj6+C46kN_vq#4+hkt@ZI_svsB`$$4N}S)}o_wt3H=!rP*5j@z?Gn572e9C++F13>B5N^` zqDLzxSQH%jvA2J{XxN7KNTYGYad46Sk>gF#lV;0J< zMWKFK>&=GAZ0<3BvO}$8QJ2jXW?B~}YKb1ca(l4V*EhQ6ve9`~7v=s;vscd4(cv%e z8ip1s%)@J^K4p41=+01In_to=yj>91DU$g+-YU1p)OXGb1a6i3weQK(e@GT6?^zda zjke`bpR~pm45j9+Ua*TK)7k7M@2u60BPZ5)OC2iq?(Q?Jr;V)i`CL6w6u9|pvq`x? z_wv+a`-6Vs?az`ug<#e=x^|{idwS<1FZFf%Q|(^OjdS`PKEUM0MiVA^FwLjBC(}T1 zf<;!?`XxR{s&>2W#SI&46|N;|jAK%_Uq?Q(=(O*MQnlw-J&A>{L)X)+4R_9q)rZQd zk>5!MV>LDOH`K@fy4^@QpVqXzmCl+;44SvPwd5}9B-9YihkC@~{wr5hD)fV|-LvWY zNxbVGtt)la^|gPw5`7(${S}p)F3i92=v!=)d}`d8^q_oGN`zD`FuUh#LuuLL{6Ch~ xE*+>-M23OB4!`f^L}fMU?WD~|rR~;s@Kr(L6iYl%lliTUz>ex@U1P~e`3G&BXX*d|