upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 11:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Luis C.M committed 2023-07-30 01:26:42 -05:00
2 parents 5f3ed66234 5fbc063dd4
commit d2de021dae
5 files changed
+34 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/NoppesUtilPlayer.java
+6 -1
View File
@@ -347,7 +347,12 @@ public class NoppesUtilPlayer {
NBTTagCompound compound = new NBTTagCompound();
compound.setTag("Quest",trackedQuest.writeToNBT(new NBTTagCompound()));
compound.setString("CategoryName", trackedQuest.getCategory().getName());
compound.setString("TurnInNPC", trackedQuest.getNpcName());
if(trackedQuest.completion == EnumQuestCompletion.Instant){
compound.setBoolean("Instant", true);
}
else {
compound.setString("TurnInNPC", trackedQuest.getNpcName());
}
NBTTagList nbtTagList = new NBTTagList();
for (IQuestObjective objective : trackedQuest.questInterface.getObjectives(player)) {
nbtTagList.appendTag(new NBTTagString(objective.getText()));
src/main/java/noppes/npcs/NoppesUtilServer.java
+2
View File
@@ -783,6 +783,8 @@ public class NoppesUtilServer {
if(entity == null){
return null;
}
entity.dimension = worldObj.provider.dimensionId;
int i = MathHelper.floor_double(entity.posX / 16.0D);
int j = MathHelper.floor_double(entity.posZ / 16.0D);
if (!entity.forceSpawn && !worldObj.checkChunksExist(
src/main/java/noppes/npcs/client/gui/OverlayQuestTracking.java
+9 -3
View File
@@ -143,9 +143,15 @@ public class OverlayQuestTracking extends Gui {
objectiveLines.add(objective);
}
String npcName = compound.getString("TurnInNPC");
if (!npcName.isEmpty()) {
turnInText.add("Complete with " + npcName);
boolean instantComplete = compound.getBoolean("Instant");
if(instantComplete){
turnInText.add("Completed automatically");
}
else {
String npcName = compound.getString("TurnInNPC");
if (!npcName.isEmpty()) {
turnInText.add("Complete with " + npcName);
}
}
this.initOverlay();
src/main/java/noppes/npcs/client/model/ModelMPM.java
+9 -21
View File
@@ -100,7 +100,9 @@ public class ModelMPM extends ModelNPCMale{
this.bipedBodywear = (new ModelScaleRenderer(this, 16, 32));
this.bipedBodywear.addBox(-4.0F, 0.0F, -2.0F, 8, 12, 4, par1 + 0.5F);
this.bipedBody.addChild(this.bipedBodywear);
// this.bipedBodywear.setRotationPoint(0.0F, 0.0F + par2, 0.0F);
bodywear = new ModelBodywear(this, 64, 64);
this.bipedBody.addChild(bodywear);
// Steve 64x64 Model or Alex 64x64 Model
if (alex){
@@ -171,7 +173,6 @@ public class ModelMPM extends ModelNPCMale{
headwear = new ModelHeadwear(this);
legs = new ModelLegs(this, (ModelScaleRenderer)bipedRightLeg, (ModelScaleRenderer)bipedLeftLeg, 64, 64);
bodywear = new ModelBodywear(this);
this.bipedBody.addChild(breasts = new ModelBreasts(this, 64, 64));
if(!isArmor){
@@ -265,6 +266,9 @@ public class ModelMPM extends ModelNPCMale{
this.bipedBodywear = (new ModelScaleRenderer(this, 0, 0));
this.bipedBody.addChild(this.bipedBodywear);
bodywear = new ModelBodywear(this, 0, 0);
this.bipedBody.addChild(bodywear);
// Arms
this.bipedRightArmWear = (new ModelScaleRenderer(this, 0, 0));
this.bipedRightArm.addChild(this.bipedRightArmWear);
@@ -777,29 +781,13 @@ public class ModelMPM extends ModelNPCMale{
((ModelScaleRenderer)this.bipedBody).isHidden = entity.modelData.hideBody == 1;
// Hide Bodywear
((ModelScaleRenderer)this.bipedBodywear).isHidden = entity.modelData.bodywear == 0;
if(bipedBodywear.showModel && !bipedBodywear.isHidden){
if(entity.modelData.bodywear == 1 || isArmor){
((ModelScaleRenderer)this.bipedBodywear).setConfig(entity.modelData.modelScale.body,x,y,z);
((ModelScaleRenderer)this.bipedBodywear).render(f);
}
else if(entity.modelData.bodywear == 2){
this.bodywear.rotateAngleX = bipedBodywear.rotateAngleX;
this.bodywear.rotateAngleY = bipedBodywear.rotateAngleY;
this.bodywear.rotateAngleZ = bipedBodywear.rotateAngleZ;
this.bodywear.rotationPointX = bipedBodywear.rotationPointX;
this.bodywear.rotationPointY = bipedBodywear.rotationPointY;
this.bodywear.rotationPointZ = bipedBodywear.rotationPointZ;
this.bodywear.setConfig(entity.modelData.modelScale.body,x,y,z);
this.bodywear.render(f);
}
}
this.bipedBodywear.isHidden = entity.modelData.bodywear != 1;
this.bodywear.isHidden = entity.modelData.bodywear != 2;
((ModelScaleRenderer)this.bipedBody).setConfig(body,x,y,z);
((ModelScaleRenderer)this.bipedBody).render(f);
GL11.glPopMatrix();
GL11.glPopMatrix();
}
public void renderArms(EntityCustomNpc entity, float f, boolean bo){
loadPlayerTexture(entity);
src/main/java/noppes/npcs/client/model/part/ModelBodywear.java
+8 -8
View File
@@ -5,35 +5,35 @@ import net.minecraft.client.model.ModelRenderer;
import noppes.npcs.client.model.util.Model2DRenderer;
import noppes.npcs.client.model.util.ModelScaleRenderer;
public class ModelBodywear extends ModelScaleRenderer{
public class ModelBodywear extends ModelScaleRenderer {
public ModelBodywear(ModelBase base) {
public ModelBodywear(ModelBase base, int height, int width) {
super(base);
float thick = 0.50f;
Model2DRenderer front = new Model2DRenderer(base, 20, 36, 8, 12, 64, 64);
Model2DRenderer front = new Model2DRenderer(base, 20, 36, 8, 12, width, height);
front.setRotationPoint(-4.53f, 12.535f, -2.52f);
front.setScale(0.85f,0.8175f);
front.setThickness(thick);
setRotation(front, 0, 0, 0);
this.addChild(front);
Model2DRenderer back = new Model2DRenderer(base, 32, 36, 8, 12, 64, 64);
Model2DRenderer back = new Model2DRenderer(base, 32, 36, 8, 12, width, height);
back.setRotationPoint(4.53f, 12.535f, 2.52f);
back.setScale(0.85f,0.8175f);
back.setThickness(thick);
setRotation(back, 0, (float)(Math.PI), 0);
this.addChild(back);
Model2DRenderer right = new Model2DRenderer(base, 28, 36, 4, 12, 64, 64);
Model2DRenderer right = new Model2DRenderer(base, 28, 36, 4, 12, width, height);
right.setRotationPoint(4.03f, 12.55f, 2.55f);
right.setScale(0.96f,0.82f);
right.setThickness(thick);
setRotation(right, 0, (float)(Math.PI/2f), 0);
this.addChild(right);
Model2DRenderer left = new Model2DRenderer(base, 16, 36, 4, 12, 64, 64);
Model2DRenderer left = new Model2DRenderer(base, 16, 36, 4, 12, width, height);
left.setRotationPoint(-4.03f, 12.55f, -2.55f);
left.setScale(0.96f,0.82f);
left.setThickness(thick);
@@ -41,14 +41,14 @@ public class ModelBodywear extends ModelScaleRenderer{
this.addChild(left);
Model2DRenderer top = new Model2DRenderer(base, 20, 32, 8, 4, 64, 64);
Model2DRenderer top = new Model2DRenderer(base, 20, 32, 8, 4, width, height);
top.setRotationPoint(-4.5f, -0.6f, -2.525f);
top.setScale(0.2815f,0.315f);
top.setThickness(thick);
setRotation(top, (float)(Math.PI / -2), 0, 0);
this.addChild(top);
Model2DRenderer bottom = new Model2DRenderer(base, 28, 32, 8, 4, 64, 64);
Model2DRenderer bottom = new Model2DRenderer(base, 28, 32, 8, 4, width, height);
bottom.setRotationPoint(-4.5f, 12.11f, -2.525f);
bottom.setScale(0.2815f,0.315f);
bottom.setThickness(thick);