diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcTextureOverlays.java b/src/main/java/noppes/npcs/client/gui/GuiNpcTextureOverlays.java index d0152dcd6..e6e4c9fd6 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcTextureOverlays.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcTextureOverlays.java @@ -79,10 +79,7 @@ public class GuiNpcTextureOverlays extends GuiNpcSelectionInterface{ //npc.display.glowTexture = assets.getAsset(slot.selected); //npc.textureGlowLocation = null; - npc.display.skinOverlayData.overlayList.put(0,new SkinOverlay( - assets.getAsset(slot.selected), true, 1.0F, 1.0F, 0.0F, 0.0F, - 1.0F, 1.0F, 0.0F, 0.0F, 0.0F - )); + npc.display.skinOverlayData.overlayList.put(0,new SkinOverlay(assets.getAsset(slot.selected))); } } diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java index 2c1621059..e691f8342 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -132,10 +132,7 @@ public class GuiNpcDisplay extends GuiNPCInterface2 implements ITextfieldListene //npc.textureGlowLocation = null; //display.glowTexture = textfield.getText(); if (!textfield.getText().isEmpty()) { - npc.display.skinOverlayData.overlayList.put(0, new SkinOverlay( - textfield.getText(), true, 1.0F, 1.0F, 0.0F, 0.0F, - 1.0F, 1.0F, 0.0F, 0.0F, 0.0F - )); + npc.display.skinOverlayData.overlayList.put(0,new SkinOverlay(textfield.getText())); } } else if(textfield.id == 11){ diff --git a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java index fe913ebe1..0821d0415 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderCNPCPlayer.java @@ -45,7 +45,7 @@ public class RenderCNPCPlayer extends RenderPlayer { this.setRenderManager(RenderManager.instance); } - private boolean preRenderOverlay(EntityPlayer player, ResourceLocation overlayLocation, boolean glow, + private boolean preRenderOverlay(EntityPlayer player, ResourceLocation overlayLocation, boolean glow, boolean blend, float alpha, float size, float speedX, float speedY, float scaleX, float scaleY, float offsetX, float offsetY, float offsetZ) { if (overlayLocation.getResourcePath().isEmpty()) @@ -67,7 +67,11 @@ public class RenderCNPCPlayer extends RenderPlayer { // Overlay & Glow GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + if (blend) { + GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + } else { + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + } GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); if (glow) { @@ -127,7 +131,7 @@ public class RenderCNPCPlayer extends RenderPlayer { } } - if (!preRenderOverlay(player, overlayData.location, overlayData.glow, overlayData.alpha, overlayData.size, + if (!preRenderOverlay(player, overlayData.location, overlayData.glow, overlayData.blend, overlayData.alpha, overlayData.size, overlayData.speedX, overlayData.speedY, overlayData.scaleX, overlayData.scaleY, overlayData.offsetX, overlayData.offsetY, overlayData.offsetZ )) @@ -330,7 +334,7 @@ public class RenderCNPCPlayer extends RenderPlayer { } } - if (!preRenderOverlay(player, overlayData.location, overlayData.glow, overlayData.alpha, overlayData.size, + if (!preRenderOverlay(player, overlayData.location, overlayData.glow, overlayData.blend, overlayData.alpha, overlayData.size, overlayData.speedX, overlayData.speedY, overlayData.scaleX, overlayData.scaleY, overlayData.offsetX, overlayData.offsetY, overlayData.offsetZ )) diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java index 9f79fb06d..22a6a2eeb 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java @@ -243,7 +243,11 @@ public class RenderNPCInterface extends RenderLiving{ // Overlay & Glow GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + if (overlayData.getBlend()) { + GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE); + } else { + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + } GL11.glAlphaFunc(GL11.GL_GREATER, 0.003921569F); if (overlayData.getGlow()) { diff --git a/src/main/java/noppes/npcs/controllers/data/SkinOverlay.java b/src/main/java/noppes/npcs/controllers/data/SkinOverlay.java index 750a76469..217ecedd6 100644 --- a/src/main/java/noppes/npcs/controllers/data/SkinOverlay.java +++ b/src/main/java/noppes/npcs/controllers/data/SkinOverlay.java @@ -10,6 +10,7 @@ public class SkinOverlay implements ISkinOverlay { public ResourceLocation location = null; public String texture; public boolean glow = true; + public boolean blend = false; public float alpha = 1.0F; public float size = 1.0F; @@ -30,21 +31,6 @@ public class SkinOverlay implements ISkinOverlay { this.texture = texture; } - public SkinOverlay(String texture, boolean glow, float alpha, float size, float speedX, float speedY, - float scaleX, float scaleY, float offsetX, float offsetY, float offsetZ) { - this.texture = texture; - this.glow = glow; - this.alpha = alpha; - this.size = size; - this.speedX = speedX; - this.speedY = speedY; - this.scaleX = scaleX; - this.scaleY = scaleY; - this.offsetX = offsetX; - this.offsetY = offsetY; - this.offsetZ = offsetZ; - } - public void setTexture(String texture) { this.texture = texture; this.updateClient(); @@ -61,6 +47,14 @@ public class SkinOverlay implements ISkinOverlay { return glow; } + public void setBlend(boolean blend) { + this.blend = blend; + this.updateClient(); + } + public boolean getBlend() { + return blend; + } + public void setAlpha(float alpha) { this.alpha = alpha; this.updateClient(); @@ -128,6 +122,7 @@ public class SkinOverlay implements ISkinOverlay { public void readFromNBT(NBTTagCompound compound) { this.texture = compound.getString("SkinOverlayTexture"); this.glow = compound.getBoolean("SkinOverlayGlow"); + this.blend = compound.getBoolean("SkinOverlayBlend"); this.alpha = compound.getFloat("SkinOverlayAlpha"); this.size = compound.getFloat("SkinOverlaySize"); this.speedX = compound.getFloat("SkinOverlaySpeedX"); @@ -142,6 +137,7 @@ public class SkinOverlay implements ISkinOverlay { public NBTTagCompound writeToNBT(NBTTagCompound compound) { compound.setString("SkinOverlayTexture", this.getTexture()); compound.setBoolean("SkinOverlayGlow", this.getGlow()); + compound.setBoolean("SkinOverlayBlend", this.getBlend()); compound.setFloat("SkinOverlayAlpha", this.getAlpha()); compound.setFloat("SkinOverlaySize", this.getSize()); compound.setFloat("SkinOverlaySpeedX", this.getSpeedX()); diff --git a/src/main/java/noppes/npcs/entity/old/EntityNPCEnderman.java b/src/main/java/noppes/npcs/entity/old/EntityNPCEnderman.java index 62c4c224c..bfc85d14d 100644 --- a/src/main/java/noppes/npcs/entity/old/EntityNPCEnderman.java +++ b/src/main/java/noppes/npcs/entity/old/EntityNPCEnderman.java @@ -19,10 +19,7 @@ public class EntityNPCEnderman extends EntityNpcEnderchibi super(world); display.texture = "customnpcs:textures/entity/enderman/enderman.png"; //display.glowTexture = ; - display.skinOverlayData.overlayList.put(0,new SkinOverlay( - "customnpcs:textures/overlays/ender_eyes.png", true, 1.0F, 1.0F, 0.0F, 0.0F, - 1.0F, 1.0F, 0.0F, 0.0F, 0.0F - )); + display.skinOverlayData.overlayList.put(0,new SkinOverlay("customnpcs:textures/overlays/ender_eyes.png")); this.width = 0.6F; this.height = 2.9F; } diff --git a/src/main/java/noppes/npcs/scripted/interfaces/ISkinOverlay.java b/src/main/java/noppes/npcs/scripted/interfaces/ISkinOverlay.java index 637c52a7b..4bf83f0d8 100644 --- a/src/main/java/noppes/npcs/scripted/interfaces/ISkinOverlay.java +++ b/src/main/java/noppes/npcs/scripted/interfaces/ISkinOverlay.java @@ -21,6 +21,12 @@ public interface ISkinOverlay { void setGlow(boolean glow); boolean getGlow(); + /** + * Sets whether this overlay blends on top of bottom textures at any alpha value. + */ + void setBlend(boolean blend); + boolean getBlend(); + /** * Sets the transparency of the overlay, from 0 to 1. */