diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 3d843ffe4..ba3fbfe13 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -201,6 +201,7 @@ public class CustomNpcs { registerNpc(EntityNpcDragon.class, "NpcDragon"); registerNpc(EntityNPCEnderman.class, "npcEnderman"); registerNpc(EntityNPCGolem.class, "npcGolem"); + registerNpc(EntityCustomNpc64.class, "CustomNpc64"); registerNpc(EntityCustomNpc.class, "CustomNpc"); diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 94212b1cc..d1cdc4543 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -181,7 +181,11 @@ public class ClientProxy extends CommonProxy { RenderingRegistry.registerEntityRenderingHandler(EntityNpcSlime.class, new RenderNpcSlime(new ModelNpcSlime(16), new ModelNpcSlime(0), 0.25F)); RenderingRegistry.registerEntityRenderingHandler(EntityProjectile.class, new RenderProjectile()); + // Changes Made Here: RenderingRegistry.registerEntityRenderingHandler(EntityCustomNpc.class, new RenderCustomNpc()); + RenderingRegistry.registerEntityRenderingHandler(EntityCustomNpc64.class, new RenderCustomNpc(false)); // False for Steve + // RenderingRegistry.registerEntityRenderingHandler(EntityNPCAlex.class, new RenderCustomNpc(true)); // False for Steve + RenderingRegistry.registerEntityRenderingHandler(EntityNPCGolem.class, new RenderNPCHumanMale( new ModelNPCGolem(0), new ModelNPCGolem(1F), new ModelNPCGolem(0.5F))); diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index 8c1747367..b3d2284ce 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -32,6 +32,7 @@ import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.controllers.PixelmonHelper; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityFakeLiving; +import noppes.npcs.entity.EntityCustomNpc64; import noppes.npcs.entity.EntityNPCInterface; public class GuiCreationScreen extends GuiModelInterface implements ICustomScrollListener{ @@ -62,6 +63,7 @@ public class GuiCreationScreen extends GuiModelInterface implements ICustomScrol } catch (NoSuchMethodException e) { } } + data.put("CustomNPC64", EntityCustomNpc64.class); list = new ArrayList(data.keySet()); Collections.sort(list,String.CASE_INSENSITIVE_ORDER); } diff --git a/src/main/java/noppes/npcs/client/model/ModelPlayer.java b/src/main/java/noppes/npcs/client/model/ModelPlayer.java new file mode 100644 index 000000000..7bf86e002 --- /dev/null +++ b/src/main/java/noppes/npcs/client/model/ModelPlayer.java @@ -0,0 +1,18 @@ +package api.player.model; + +import net.minecraft.client.model.ModelBiped; + +public class ModelPlayer extends ModelBiped { + + public ModelPlayer() { + this(0.0F); + } + + public ModelPlayer(float var1) { + this(var1, 0.0F, 64, 32); + } + + public ModelPlayer(float var1, float var2, int var3, int var4) { + super(var1, var2, var3, var4); + } +} diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java index 18a97da75..a45bde7fa 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCInterface.java @@ -24,6 +24,7 @@ import noppes.npcs.client.model.ModelMPM; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumStandingType; import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityCustomNpc64; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; @@ -176,6 +177,29 @@ public class RenderNPCInterface extends RenderLiving{ } else { super.rotateCorpse(npc, f, f1, f2); +// if(npc.deathTime > 0) +// { +// float x = (float) -Math.cos(Math.toRadians(180 - f1)); +// float y = (float) -Math.sin(Math.toRadians(f1)); +// x = (x/ 5f) * npc.getModelSize(); +// y = (y/ 5f) * npc.getModelSize(); +// GL11.glTranslatef(x, 0, y); +// +// +// float f3 = ((((float)npc.deathTime+ f2) - 1.0F) / 20F) * 1.6F; +// f3 = MathHelper.sqrt_float(f3); +// if(f3 > 1.0F) +// { +// f3 = 1.0F; +// } +// GL11.glRotatef(f1, 0.0F, 1.0F, 0.0F); +// GL11.glRotatef(f3 * getDeathMaxRotation(npc), 0.0F, 0.0F, 1.0F); +// GL11.glRotatef(180F - f1, 0.0F, 1.0F, 0.0F); +// } +// else +// { +// GL11.glRotatef(180F - f1, 0.0F, 1.0F, 0.0F); +// } } } diff --git a/src/main/java/noppes/npcs/entity/EntityCustomNpc64.java b/src/main/java/noppes/npcs/entity/EntityCustomNpc64.java new file mode 100644 index 000000000..a4253a9fd --- /dev/null +++ b/src/main/java/noppes/npcs/entity/EntityCustomNpc64.java @@ -0,0 +1,19 @@ +package noppes.npcs.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import noppes.npcs.CustomNpcs; +import noppes.npcs.ModelData; +import noppes.npcs.ModelPartData; +import noppes.npcs.client.EntityUtil; + +public class EntityCustomNpc64 extends EntityCustomNpc{ + + public EntityCustomNpc64(World world) { + super(world); + display.texture = "customnpcs:textures/entity/humanmale/Steve64.png"; + } + +}