Moved model scale parts into a single ModelScale class, similar to ModelRotate.

Added NPC model data interfaces to the API.
This commit is contained in:
Luis C.M committed 2023-03-17 02:36:28 -05:00
1 parent 2ef93dd35f
commit f0b33cf913
63 files changed
+412 -283

No files matched your search

@@ -61,6 +61,8 @@ import noppes.npcs.constants.EnumGuiType;
import noppes.npcs.containers.*;
import noppes.npcs.controllers.data.PlayerData;
import noppes.npcs.entity.*;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.items.ItemScripted;
import org.lwjgl.input.Keyboard;
import tconstruct.client.tabs.InventoryTabFactions;
@@ -1,8 +1,8 @@
package noppes.npcs.client.controllers;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import java.util.HashMap;
@@ -28,10 +28,10 @@ public class Preset {
Preset preset = new Preset();
preset.name = "Elf Male";
preset.data = data;
data.legs.setScale(0.85f,1.15f);
data.arms.setScale(0.85f,1.15f);
data.body.setScale(0.85f,1.15f);
data.head.setScale(0.85f,0.95f);
data.modelScale.legs.setScale(0.85f,1.15f);
data.modelScale.arms.setScale(0.85f,1.15f);
data.modelScale.body.setScale(0.85f,1.15f);
data.modelScale.head.setScale(0.85f,0.95f);
presets.put("elf male", preset);
data = new ModelData();
@@ -39,20 +39,20 @@ public class Preset {
preset.name = "Elf Female";
preset.data = data;
data.breasts = 2;
data.legs.setScale(0.8f,1.05f);
data.arms.setScale(0.8f,1.05f);
data.body.setScale(0.8f,1.05f);
data.head.setScale(0.8f,0.85f);
data.modelScale.legs.setScale(0.8f,1.05f);
data.modelScale.arms.setScale(0.8f,1.05f);
data.modelScale.body.setScale(0.8f,1.05f);
data.modelScale.head.setScale(0.8f,0.85f);
presets.put("elf female", preset);
data = new ModelData();
preset = new Preset();
preset.name = "Dwarf Male";
preset.data = data;
data.legs.setScale(1.1f,0.7f, 0.9f);
data.arms.setScale(0.9f,0.7f);
data.body.setScale(1.2f, 0.7f, 1.5f);
data.head.setScale(0.85f,0.85f);
data.modelScale.legs.setScale(1.1f,0.7f, 0.9f);
data.modelScale.arms.setScale(0.9f,0.7f);
data.modelScale.body.setScale(1.2f, 0.7f, 1.5f);
data.modelScale.head.setScale(0.85f,0.85f);
presets.put("dwarf male", preset);
data = new ModelData();
@@ -60,20 +60,20 @@ public class Preset {
preset.name = "Dwarf Female";
preset.data = data;
data.breasts = 2;
data.legs.setScale(0.9f,0.65f);
data.arms.setScale(0.9f,0.65f);
data.body.setScale(1f, 0.65f, 1.1f);
data.head.setScale(0.85f,0.85f);
data.modelScale.legs.setScale(0.9f,0.65f);
data.modelScale.arms.setScale(0.9f,0.65f);
data.modelScale.body.setScale(1f, 0.65f, 1.1f);
data.modelScale.head.setScale(0.85f,0.85f);
presets.put("dwarf female", preset);
data = new ModelData();
preset = new Preset();
preset.name = "Orc Male";
preset.data = data;
data.legs.setScale(1.2f,1.05f);
data.arms.setScale(1.2f,1.05f);
data.body.setScale(1.4f, 1.1f, 1.5f);
data.head.setScale(1.2f,1.1f);
data.modelScale.legs.setScale(1.2f,1.05f);
data.modelScale.arms.setScale(1.2f,1.05f);
data.modelScale.body.setScale(1.4f, 1.1f, 1.5f);
data.modelScale.head.setScale(1.2f,1.1f);
presets.put("orc male", preset);
data = new ModelData();
@@ -81,9 +81,9 @@ public class Preset {
preset.name = "Orc Female";
preset.data = data;
data.breasts = 2;
data.legs.setScale(1.1f,1);
data.arms.setScale(1.1f,1);
data.body.setScale(1.1f, 1f, 1.25f);
data.modelScale.legs.setScale(1.1f,1);
data.modelScale.arms.setScale(1.1f,1);
data.modelScale.body.setScale(1.1f, 1f, 1.25f);
presets.put("orc female", preset);
data = new ModelData();
@@ -97,10 +97,10 @@ public class Preset {
preset.name = "Human Female";
preset.data = data;
data.breasts = 2;
data.head.setScale(0.95f,0.95f);
data.legs.setScale(0.92f,0.92f);
data.arms.setScale(0.80f,0.92f);
data.body.setScale(0.92f, 0.92f);
data.modelScale.head.setScale(0.95f,0.95f);
data.modelScale.legs.setScale(0.92f,0.92f);
data.modelScale.arms.setScale(0.80f,0.92f);
data.modelScale.body.setScale(0.92f, 0.92f);
presets.put("human female", preset);
data = new ModelData();
@@ -132,10 +132,10 @@ public class Preset {
tail.setTexture("tail/tail1", 0);
tail.color = 0xD9A64E;
data.breasts = 2;
data.head.setScale(0.95f,0.95f);
data.legs.setScale(0.92f,0.92f);
data.arms.setScale(0.80f,0.92f);
data.body.setScale(0.92f, 0.92f);
data.modelScale.head.setScale(0.95f,0.95f);
data.modelScale.legs.setScale(0.92f,0.92f);
data.modelScale.arms.setScale(0.80f,0.92f);
data.modelScale.body.setScale(0.92f, 0.92f);
presets.put("cat female", preset);
data = new ModelData();
@@ -167,18 +167,18 @@ public class Preset {
tail.setTexture("tail/tail2", 0);
tail.color = 0x5E5855;
data.breasts = 2;
data.head.setScale(0.95f,0.95f);
data.legs.setScale(0.92f,0.92f);
data.arms.setScale(0.80f,0.92f);
data.body.setScale(0.92f, 0.92f);
data.modelScale.head.setScale(0.95f,0.95f);
data.modelScale.legs.setScale(0.92f,0.92f);
data.modelScale.arms.setScale(0.80f,0.92f);
data.modelScale.body.setScale(0.92f, 0.92f);
presets.put("wolf female", preset);
data = new ModelData();
preset = new Preset();
preset.name = "Enderchibi";
preset.data = data;
data.legs.setScale(0.65f,0.75f);
data.arms.setScale(0.50f,1.45f);
data.modelScale.legs.setScale(0.65f,0.75f);
data.modelScale.arms.setScale(0.50f,1.45f);
ModelPartData part = data.getOrCreatePart("particles");
part.setTexture("particle/type1", 1);
part.color = 0xFF0000;
@@ -3,7 +3,7 @@ package noppes.npcs.client.fx;
import net.minecraft.client.particle.EntityPortalFX;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.ClientProxy;
import noppes.npcs.entity.EntityCustomNpc;
import org.lwjgl.opengl.GL11;
@@ -8,7 +8,7 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RendererLivingEntity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import noppes.npcs.ModelData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.client.EntityUtil;
import noppes.npcs.client.gui.util.GuiNPCInterface;
import noppes.npcs.client.gui.util.GuiNPCStringSlot;
@@ -2,7 +2,7 @@ package noppes.npcs.client.gui.model;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.gui.util.GuiModelInterface;
import noppes.npcs.client.gui.util.GuiNpcButton;
import noppes.npcs.client.gui.util.GuiNpcLabel;
@@ -2,7 +2,7 @@ package noppes.npcs.client.gui.model;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.gui.util.GuiModelInterface;
import noppes.npcs.client.gui.util.GuiNpcButton;
import noppes.npcs.client.gui.util.GuiNpcLabel;
@@ -4,7 +4,7 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.resources.IResource;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.gui.util.GuiModelInterface;
import noppes.npcs.client.gui.util.GuiNpcTextField;
import noppes.npcs.client.gui.util.ITextfieldListener;
@@ -2,7 +2,7 @@ package noppes.npcs.client.gui.model;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.gui.util.GuiModelInterface;
import noppes.npcs.client.gui.util.GuiNpcButton;
import noppes.npcs.client.gui.util.GuiNpcLabel;
@@ -2,7 +2,7 @@ package noppes.npcs.client.gui.model;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.gui.util.GuiModelInterface;
import noppes.npcs.client.gui.util.GuiNpcButton;
import noppes.npcs.client.gui.util.GuiNpcLabel;
@@ -2,9 +2,8 @@ package noppes.npcs.client.gui.model;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import noppes.npcs.ModelData;
import noppes.npcs.ModelLimbConfig;
import noppes.npcs.ModelRotatePart;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelRotatePart;
import noppes.npcs.client.gui.util.GuiModelInterface;
import noppes.npcs.client.gui.util.GuiNpcButton;
import noppes.npcs.client.gui.util.GuiNpcLabel;
@@ -2,8 +2,8 @@ package noppes.npcs.client.gui.model;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import noppes.npcs.ModelData;
import noppes.npcs.ModelLimbConfig;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelScalePart;
import noppes.npcs.client.gui.util.*;
import noppes.npcs.entity.EntityCustomNpc;
@@ -32,7 +32,7 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{
addLabel(new GuiNpcLabel(20, "Head", guiLeft + 55, y + 5, 0xFFFFFF));
if(type == 0){
drawSlider(y, playerdata.head);
drawSlider(y, playerdata.modelScale.head);
y += 88;
}
else{
@@ -42,7 +42,7 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{
addLabel(new GuiNpcLabel(21, "Body", guiLeft + 55, y + 5, 0xFFFFFF));
if(type == 1){
drawSlider(y, playerdata.body);
drawSlider(y, playerdata.modelScale.body);
y += 88;
}
else{
@@ -52,7 +52,7 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{
addLabel(new GuiNpcLabel(22, "Arms", guiLeft + 55, y + 5, 0xFFFFFF));
if(type == 2){
drawSlider(y, playerdata.arms);
drawSlider(y, playerdata.modelScale.arms);
y += 88;
}
else {
@@ -62,7 +62,7 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{
addLabel(new GuiNpcLabel(23, "Legs", guiLeft + 55, y + 5, 0xFFFFFF));
if(type == 3){
drawSlider(y, playerdata.legs);
drawSlider(y, playerdata.modelScale.legs);
y += 88;
}
else{
@@ -71,7 +71,7 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{
}
}
private void drawSlider(int y, ModelLimbConfig config){
private void drawSlider(int y, ModelScalePart config){
y += 20;
addLabel(new GuiNpcLabel(10, "Width", guiLeft - 25 + offset, y + 5, 0xFFFFFF));
scaleWidth = new GuiNpcSlider(this, 10, guiLeft + 50 + offset, y, config.scaleX - 0.5f);
@@ -100,13 +100,13 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{
}
else{
// Resetting Type
ModelLimbConfig config = playerdata.head;
ModelScalePart config = playerdata.modelScale.head;
if(type == 1)
config = playerdata.body;
config = playerdata.modelScale.body;
else if(type == 2)
config = playerdata.arms;
config = playerdata.modelScale.arms;
else if(type == 3)
config = playerdata.legs;
config = playerdata.modelScale.legs;
if(btn.id == 170){
config.scaleX = 1.0f;
@@ -143,13 +143,13 @@ public class GuiModelScale extends GuiModelInterface implements ISliderListener{
public void mouseDragged(GuiNpcSlider slider) {
int percent = (int) (50 + slider.sliderValue * 100);
slider.setString(percent + "%");
ModelLimbConfig config = playerdata.head;
ModelScalePart config = playerdata.modelScale.head;
if(type == 1)
config = playerdata.body;
config = playerdata.modelScale.body;
else if(type == 2)
config = playerdata.arms;
config = playerdata.modelScale.arms;
else if(type == 3)
config = playerdata.legs;
config = playerdata.modelScale.legs;
if(slider.id == 10)
config.scaleX = slider.sliderValue + 0.5f;
@@ -2,7 +2,7 @@ package noppes.npcs.client.gui.model;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import noppes.npcs.ModelData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.client.controllers.Preset;
import noppes.npcs.client.controllers.PresetController;
import noppes.npcs.client.gui.util.GuiNPCInterface;
@@ -8,7 +8,7 @@ import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.ModelData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.client.EntityUtil;
import noppes.npcs.client.controllers.Preset;
import noppes.npcs.client.controllers.PresetController;
@@ -6,7 +6,7 @@ import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.EntityLivingBase;
import noppes.npcs.ModelData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.client.EntityUtil;
import noppes.npcs.entity.EntityCustomNpc;
import org.lwjgl.input.Mouse;
@@ -24,6 +24,8 @@ import noppes.npcs.controllers.data.Frame;
import noppes.npcs.controllers.data.FramePart;
import noppes.npcs.controllers.data.SkinOverlay;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.entity.data.ModelScalePart;
import org.lwjgl.opengl.GL11;
import java.util.HashMap;
@@ -632,7 +634,7 @@ public class ModelMPM extends ModelNPCMale{
bipedRightArm.rotateAngleZ = (float) (Math.PI - 1f - Math.sin(entity.ticksExisted * 0.27f) * 0.5f );
}
else if(isSneak){
this.bipedBody.rotateAngleX = 0.5F / npc.modelData.body.scaleY;
this.bipedBody.rotateAngleX = 0.5F / npc.modelData.modelScale.body.scaleY;
}
AnimationData animationData = npc.display.animationData;
@@ -736,7 +738,7 @@ public class ModelMPM extends ModelNPCMale{
float dancing = entity.ticksExisted / 4f;
GL11.glTranslatef((float)Math.sin(dancing) * 0.075F, (float)Math.abs(Math.cos(dancing)) * 0.125F - 0.02F, (float)(-Math.abs(Math.cos(dancing))) * 0.075F);
}
ModelLimbConfig head = entity.modelData.head;
ModelScalePart head = entity.modelData.modelScale.head;
this.copyAnglesPivots(headwear,bipedHead);
this.copyAnglesPivots(bipedHeadwear,bipedHead);
@@ -772,7 +774,7 @@ public class ModelMPM extends ModelNPCMale{
GL11.glTranslatef((float)Math.sin(dancing) * 0.015F, 0.0F, 0.0F);
}
ModelLimbConfig body = entity.modelData.body;
ModelScalePart body = entity.modelData.modelScale.body;
// Hide Body
((ModelScaleRenderer)this.bipedBody).isHidden = entity.modelData.hideBody == 1;
@@ -782,7 +784,7 @@ public class ModelMPM extends ModelNPCMale{
if(bipedBodywear.showModel && !bipedBodywear.isHidden){
if(entity.modelData.bodywear == 1 || isArmor){
((ModelScaleRenderer)this.bipedBodywear).setConfig(entity.modelData.body,x,y,z);
((ModelScaleRenderer)this.bipedBodywear).setConfig(entity.modelData.modelScale.body,x,y,z);
((ModelScaleRenderer)this.bipedBodywear).render(f);
}
else if(entity.modelData.bodywear == 2){
@@ -792,7 +794,7 @@ public class ModelMPM extends ModelNPCMale{
this.bodywear.rotationPointX = bipedBodywear.rotationPointX;
this.bodywear.rotationPointY = bipedBodywear.rotationPointY;
this.bodywear.rotationPointZ = bipedBodywear.rotationPointZ;
this.bodywear.setConfig(entity.modelData.body,x,y,z);
this.bodywear.setConfig(entity.modelData.modelScale.body,x,y,z);
this.bodywear.render(f);
}
}
@@ -804,9 +806,9 @@ public class ModelMPM extends ModelNPCMale{
}
public void renderArms(EntityCustomNpc entity, float f, boolean bo){
loadPlayerTexture(entity);
ModelLimbConfig arms = entity.modelData.arms;
ModelScalePart arms = entity.modelData.modelScale.arms;
float x = (1 - entity.modelData.body.scaleX) * 0.25f + (1 - arms.scaleX) * 0.075f;
float x = (1 - entity.modelData.modelScale.body.scaleX) * 0.25f + (1 - arms.scaleX) * 0.075f;
float y = entity.modelData.getBodyY() + (1 - arms.scaleY) * -0.1f;
float z = 0;
@@ -883,7 +885,7 @@ public class ModelMPM extends ModelNPCMale{
}
private void renderLegs(EntityCustomNpc entity, float f) {
loadPlayerTexture(entity);
ModelLimbConfig legs = entity.modelData.legs;
ModelScalePart legs = entity.modelData.modelScale.legs;
float x = (1 - legs.scaleX) * 0.125f;
float y = entity.modelData.getLegsY();
@@ -1,8 +1,8 @@
package noppes.npcs.client.model.part;
import net.minecraft.entity.Entity;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -2,7 +2,7 @@ package noppes.npcs.client.model.part;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import noppes.npcs.ModelData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -1,7 +1,7 @@
package noppes.npcs.client.model.part;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -1,8 +1,8 @@
package noppes.npcs.client.model.part;
import net.minecraft.client.model.ModelRenderer;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -1,7 +1,7 @@
package noppes.npcs.client.model.part;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -2,8 +2,8 @@ package noppes.npcs.client.model.part;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -2,8 +2,8 @@ package noppes.npcs.client.model.part;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.part.horns.ModelAntennasBack;
import noppes.npcs.client.model.part.horns.ModelAntennasFront;
@@ -3,7 +3,7 @@ package noppes.npcs.client.model.part;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.ClientProxy;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.part.legs.ModelDigitigradeLegs;
@@ -294,8 +294,8 @@ public class ModelLegs extends ModelScaleRenderer{
spiderNeck.rotateAngleX = (float) (Math.PI / -8);
}
if(base.isSleeping(entity) || this.entity.currentAnimation == EnumAnimation.CRAWLING){
rotationPointY = 12 * this.entity.modelData.legs.scaleY;
rotationPointZ = 15 * this.entity.modelData.legs.scaleY;
rotationPointY = 12 * this.entity.modelData.modelScale.legs.scaleY;
rotationPointZ = 15 * this.entity.modelData.modelScale.legs.scaleY;
this.rotateAngleX = (float) (Math.PI / -2);
}
@@ -1,8 +1,8 @@
package noppes.npcs.client.model.part;
import net.minecraft.entity.Entity;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -3,8 +3,8 @@ package noppes.npcs.client.model.part;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.ModelPartInterface;
import noppes.npcs.client.model.util.ModelPlaneRenderer;
@@ -2,8 +2,8 @@ package noppes.npcs.client.model.part;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -5,7 +5,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.ClientProxy;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.part.tails.*;
@@ -87,18 +87,18 @@ public class ModelTail extends ModelScaleRenderer {
if(this.entity.modelData.legParts.type == 2){
rotationPointY = 13f;
rotationPointZ = 14 * this.entity.modelData.legs.scaleZ;
rotationPointZ = 14 * this.entity.modelData.modelScale.legs.scaleZ;
if(base.isSleeping(entity) || this.entity.currentAnimation == EnumAnimation.CRAWLING){
rotationPointY = 12 + 16 * this.entity.modelData.legs.scaleZ;
rotationPointZ = 1f * this.entity.modelData.legs.scaleY;
rotationPointY = 12 + 16 * this.entity.modelData.modelScale.legs.scaleZ;
rotationPointZ = 1f * this.entity.modelData.modelScale.legs.scaleY;
rotateAngleX = (float) (Math.PI / -4);
}
}
else if(this.entity.modelData.legParts.type == 3){
rotationPointY = 8.6f;
rotationPointZ = 19 * this.entity.modelData.legs.scaleZ;
rotationPointZ = 19 * this.entity.modelData.modelScale.legs.scaleZ;
}
else{
rotationPointY = 11;
@@ -2,8 +2,8 @@ package noppes.npcs.client.model.part;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelPartInterface;
@@ -4,8 +4,8 @@ import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.ModelData;
import noppes.npcs.ModelPartData;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
import noppes.npcs.client.ClientProxy;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.entity.EntityCustomNpc;
@@ -5,7 +5,7 @@ import net.minecraft.client.model.ModelBox;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.Tessellator;
import noppes.npcs.ModelLimbConfig;
import noppes.npcs.entity.data.ModelScalePart;
import org.lwjgl.opengl.GL11;
public class ModelScaleRenderer extends ModelRenderer {
@@ -15,7 +15,7 @@ public class ModelScaleRenderer extends ModelRenderer {
/** The GL display list rendered by the Tessellator for this model */
public int displayList;
protected ModelLimbConfig config;
protected ModelScalePart config;
public float x, y, z;
@@ -28,7 +28,7 @@ public class ModelScaleRenderer extends ModelRenderer {
this.setTextureOffset(par2, par3);
}
public void setConfig(ModelLimbConfig config, float x, float y, float z){
public void setConfig(ModelScalePart config, float x, float y, float z){
this.config = config;
this.x = x;
this.y = y;
@@ -145,17 +145,17 @@ public class RenderNPCHumanMale extends RenderNPCInterface
modelArmorChestplate.heldItemRight = modelArmor.heldItemRight = modelBipedMain.heldItemRight =
itemstack == null ? 0 : npc.hurtResistantTime > 0 ? 3 : 1;
modelArmorChestplate.heldItemLeft = modelArmor.heldItemLeft = modelBipedMain.heldItemLeft =
modelArmorChestplate.heldItemLeft = modelArmor.heldItemLeft = modelBipedMain.heldItemLeft =
npc.getOffHand() == null ? 0 : npc.hurtResistantTime > 0 ? 3 : 1;
modelArmorChestplate.isSneak = modelArmor.isSneak = modelBipedMain.isSneak = npc.isSneaking();
modelArmorChestplate.isSleeping = modelArmor.isSleeping = modelBipedMain.isSleeping = npc.isPlayerSleeping();
modelArmorChestplate.isDancing = modelArmor.isDancing = modelBipedMain.isDancing = npc.currentAnimation == EnumAnimation.DANCING;
modelArmorChestplate.aimedBow = modelArmor.aimedBow = modelBipedMain.aimedBow = npc.currentAnimation == EnumAnimation.AIMING;
modelArmorChestplate.isRiding = modelArmor.isRiding = modelBipedMain.isRiding = npc.isRiding();
double d3 = d1 - (double)npc.yOffset;
if(npc.isSneaking())
{
@@ -185,7 +185,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface
EntityCustomNpc cnpc = (EntityCustomNpc) npc;
GL11.glTranslatef(0, cnpc.modelData.getBodyY(), 0);
this.modelBipedMain.bipedHead.postRender(0.0625F);
GL11.glScalef(cnpc.modelData.head.scaleX, cnpc.modelData.head.scaleY, cnpc.modelData.head.scaleZ);
GL11.glScalef(cnpc.modelData.modelScale.head.scaleX, cnpc.modelData.modelScale.head.scaleY, cnpc.modelData.modelScale.head.scaleZ);
}
else
this.modelBipedMain.bipedHead.postRender(0.0625F);
@@ -218,8 +218,8 @@ public class RenderNPCHumanMale extends RenderNPCInterface
float x = 0;
if(npc instanceof EntityCustomNpc){
EntityCustomNpc cnpc = (EntityCustomNpc) npc;
y = (cnpc.modelData.arms.scaleY - 1) * 0.7f;
x = (1 - cnpc.modelData.body.scaleX) * 0.28f + (1 - cnpc.modelData.arms.scaleX) * 0.175f;
y = (cnpc.modelData.modelScale.arms.scaleY - 1) * 0.7f;
x = (1 - cnpc.modelData.modelScale.body.scaleX) * 0.28f + (1 - cnpc.modelData.modelScale.arms.scaleX) * 0.175f;
GL11.glTranslatef(x, cnpc.modelData.getBodyY(), 0);
}
this.modelBipedMain.bipedRightArm.postRender(0.0625F);
@@ -263,7 +263,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface
GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F);
GL11.glTranslatef(0.0F, -0.125F, 0.0F);
}
if (npc.hurtResistantTime > 0 && npc.stats.resistances.playermelee > 1f)
{
GL11.glTranslatef(0.05F, 0.0F, -0.1F);
@@ -309,7 +309,7 @@ public class RenderNPCHumanMale extends RenderNPCInterface
}
else
renderManager.itemRenderer.renderItem(npc, itemstack2, 0);
GL11.glPopMatrix();
}
GL11.glColor4f(1, 1, 1, 1.0F);
@@ -321,8 +321,8 @@ public class RenderNPCHumanMale extends RenderNPCInterface
float x = 0;
if(npc instanceof EntityCustomNpc){
EntityCustomNpc cnpc = (EntityCustomNpc) npc;
y = (cnpc.modelData.arms.scaleY - 1) * 0.7f;
x = (1 - cnpc.modelData.body.scaleX) * -0.28f + (1 - cnpc.modelData.arms.scaleX) * -0.175f;
y = (cnpc.modelData.modelScale.arms.scaleY - 1) * 0.7f;
x = (1 - cnpc.modelData.modelScale.body.scaleX) * -0.28f + (1 - cnpc.modelData.modelScale.arms.scaleX) * -0.175f;
GL11.glTranslatef(x, cnpc.modelData.getBodyY(), 0);
}
this.modelBipedMain.bipedLeftArm.postRender(0.0625F);