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

Enabled fly button in movement, and set max value for fields as Integer.MAX_VALUE for various fields.

Browse Source
This commit is contained in:
luisc committed 2021-12-01 18:46:48 -06:00
1 parent 17eb612fb8
commit 44d4e74279
10 files changed
+30 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java
+5 -5
View File
@@ -29,28 +29,28 @@ public class SubGuiNpcMeleeProperties extends SubGuiInterface implements ITextfi
addLabel(new GuiNpcLabel(1,"stats.meleestrength", guiLeft + 5, guiTop + 15));
addTextField(new GuiNpcTextField(1,this, fontRendererObj, guiLeft + 85, guiTop + 10, 50, 18, stats.getAttackStrength()+""));
getTextField(1).numbersOnly = true;
getTextField(1).setMinMaxDefault(0, 99999, 5);
getTextField(1).setMinMaxDefault(0, Integer.MAX_VALUE, 5);
addLabel(new GuiNpcLabel(2,"stats.meleerange", guiLeft + 5, guiTop + 45));
addTextField(new GuiNpcTextField(2,this, fontRendererObj, guiLeft + 85, guiTop + 40, 50, 18, stats.attackRange+""));
getTextField(2).numbersOnly = true;
getTextField(2).setMinMaxDefault(1, 30, 2);
getTextField(2).setMinMaxDefault(1, Integer.MAX_VALUE, 2);
addLabel(new GuiNpcLabel(3,"stats.meleespeed", guiLeft + 5, guiTop + 75));
addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 85, guiTop + 70, 50, 18, stats.attackSpeed+""));
getTextField(3).numbersOnly = true;
getTextField(3).setMinMaxDefault(1, 1000, 20);
getTextField(3).setMinMaxDefault(1, Integer.MAX_VALUE, 20);
addLabel(new GuiNpcLabel(4,"enchantment.knockback", guiLeft + 5, guiTop + 105));
addTextField(new GuiNpcTextField(4,this, fontRendererObj, guiLeft + 85, guiTop + 100, 50, 18, stats.knockback + ""));
getTextField(4).numbersOnly = true;
getTextField(4).setMinMaxDefault(0, 4, 0);
getTextField(4).setMinMaxDefault(0, Integer.MAX_VALUE, 0);
addLabel(new GuiNpcLabel(5,"stats.meleeeffect", guiLeft + 5, guiTop + 135));
addButton(new GuiNpcButton(5,guiLeft + 85, guiTop + 130, 52, 20, potionNames, stats.potionType.ordinal()));
if(stats.potionType != EnumPotionType.None) {
addLabel(new GuiNpcLabel(6,"gui.time", guiLeft + 5, guiTop + 165));
addTextField(new GuiNpcTextField(6,this, fontRendererObj, guiLeft + 85, guiTop + 160, 50, 18, stats.potionDuration + ""));
getTextField(6).numbersOnly = true;
getTextField(6).setMinMaxDefault(1, 99999, 5);
getTextField(6).setMinMaxDefault(1, Integer.MAX_VALUE, 5);
if(stats.potionType != EnumPotionType.Fire) {
addLabel(new GuiNpcLabel(7,"stats.amplify", guiLeft + 5, guiTop + 195));
addButton(new GuiNpcButton(7,guiLeft + 85, guiTop + 190, 52, 20, new String[]{"gui.no", "gui.yes"} ,stats.potionAmp));
src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java
+3 -3
View File
@@ -30,12 +30,12 @@ public class SubGuiNpcMovement extends SubGuiInterface implements ITextfieldList
this.addButton(new GuiNpcButton(0, guiLeft + 80, y, 100, 20, EnumMovingType.names(), ai.movingType.ordinal()));
// Fly Change
// this.addButton(new GuiNpcButton(15, guiLeft + 80, y += 22, 100, 20, new String[]{"movement.ground","movement.flying"}, ai.movementType));
this.addButton(new GuiNpcButton(15, guiLeft + 80, y += 22, 100, 20, new String[]{"movement.ground","movement.flying"}, ai.movementType));
if(ai.movingType == EnumMovingType.Wandering){
addTextField(new GuiNpcTextField(4,this, guiLeft + 100, y += 22, 40, 20, ai.walkingRange + ""));
getTextField(4).numbersOnly = true;
getTextField(4).setMinMaxDefault(0, 1000, 5);
getTextField(4).setMinMaxDefault(0, Integer.MAX_VALUE, 5);
addLabel(new GuiNpcLabel(4,"gui.range", guiLeft + 4, y + 5));
addButton(new GuiNpcButton(5, guiLeft + 100, y += 22, 50, 20, new String[]{"gui.no","gui.yes"}, ai.npcInteracting?1:0));
@@ -93,7 +93,7 @@ public class SubGuiNpcMovement extends SubGuiInterface implements ITextfieldList
addTextField(new GuiNpcTextField(14,this, guiLeft + 80, y += 22, 50, 18, ai.getWalkingSpeed()+""));
getTextField(14).numbersOnly = true;
getTextField(14).setMinMaxDefault(0, 10, 4);
getTextField(14).setMinMaxDefault(0, Integer.MAX_VALUE, 4);
addLabel(new GuiNpcLabel(14,"stats.walkspeed", guiLeft + 5, y + 5));
addButton(new GuiNpcButton(66, guiLeft + 190, guiTop + 190, 60, 20, "gui.done"));
src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java
+5 -5
View File
@@ -31,19 +31,19 @@ public class SubGuiNpcProjectiles extends SubGuiInterface implements ITextfieldL
addLabel(new GuiNpcLabel(1,"enchantment.arrowDamage", guiLeft + 5, guiTop + 15));
addTextField(new GuiNpcTextField(1,this, fontRendererObj, guiLeft + 45, guiTop + 10, 50, 18, stats.pDamage+""));
getTextField(1).numbersOnly = true;
getTextField(1).setMinMaxDefault(0, 9999, 5);
getTextField(1).setMinMaxDefault(0, Integer.MAX_VALUE, 5);
addLabel(new GuiNpcLabel(2,"enchantment.arrowKnockback", guiLeft + 110, guiTop + 15));
addTextField(new GuiNpcTextField(2,this, fontRendererObj, guiLeft + 150, guiTop + 10, 50, 18, stats.pImpact+""));
getTextField(2).numbersOnly = true;
getTextField(2).setMinMaxDefault(0, 3, 0);
getTextField(2).setMinMaxDefault(0, Integer.MAX_VALUE, 0);
addLabel(new GuiNpcLabel(3,"stats.size", guiLeft + 5, guiTop + 45));
addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 45, guiTop + 40, 50, 18, stats.pSize+""));
getTextField(3).numbersOnly = true;
getTextField(3).setMinMaxDefault(1, 10, 10);
getTextField(3).setMinMaxDefault(1, Integer.MAX_VALUE, 10);
addLabel(new GuiNpcLabel(4,"stats.speed", guiLeft + 5, guiTop + 75));
addTextField(new GuiNpcTextField(4,this, fontRendererObj, guiLeft + 45, guiTop + 70, 50, 18, stats.pSpeed+""));
getTextField(4).numbersOnly = true;
getTextField(4).setMinMaxDefault(1, 50, 10);
getTextField(4).setMinMaxDefault(1, Integer.MAX_VALUE, 10);
addLabel(new GuiNpcLabel(5,"stats.hasgravity", guiLeft + 5, guiTop + 105));
addButton(new GuiNpcButton(0, guiLeft + 60, guiTop + 100, 60, 20, new String[]{"gui.no", "gui.yes"} ,stats.pPhysics ? 1:0));
@@ -60,7 +60,7 @@ public class SubGuiNpcProjectiles extends SubGuiInterface implements ITextfieldL
if(stats.pEffect != EnumPotionType.None) {
addTextField(new GuiNpcTextField(5,this, fontRendererObj, guiLeft + 140, guiTop + 160, 60, 18, stats.pDur + ""));
getTextField(5).numbersOnly = true;
getTextField(5).setMinMaxDefault(1, 99999, 5);
getTextField(5).setMinMaxDefault(1, Integer.MAX_VALUE, 5);
if(stats.pEffect != EnumPotionType.Fire) {
addButton(new GuiNpcButton(10, guiLeft + 210, guiTop + 160, 40, 20, new String[]{"stats.regular", "stats.amplified"} ,stats.pEffAmp));
}
src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java
+6 -6
View File
@@ -34,31 +34,31 @@ public class SubGuiNpcRangeProperties extends SubGuiInterface implements ITextfi
addTextField(new GuiNpcTextField(2,this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.rangedRange+""));
addLabel(new GuiNpcLabel(2,"stats.rangedrange", guiLeft + 5, y + 5));
getTextField(2).numbersOnly = true;
getTextField(2).setMinMaxDefault(1, 64, 2);
getTextField(2).setMinMaxDefault(1, Integer.MAX_VALUE, 2);
addTextField(new GuiNpcTextField(3,this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.minDelay+""));
addLabel(new GuiNpcLabel(3,"stats.mindelay", guiLeft + 5, y + 5));
getTextField(3).numbersOnly = true;
getTextField(3).setMinMaxDefault(1, 9999, 20);
getTextField(3).setMinMaxDefault(1, Integer.MAX_VALUE, 20);
addTextField(new GuiNpcTextField(4,this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.maxDelay+""));
addLabel(new GuiNpcLabel(4,"stats.maxdelay", guiLeft + 5, y + 5));
getTextField(4).numbersOnly = true;
getTextField(4).setMinMaxDefault(1, 9999, 20);
getTextField(4).setMinMaxDefault(1, Integer.MAX_VALUE, 20);
addTextField(new GuiNpcTextField(5, this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.fireRate + ""));
addLabel(new GuiNpcLabel(5, "stats.burstspeed", guiLeft + 5, y + 5));
getTextField(5).numbersOnly = true;
getTextField(5).setMinMaxDefault(0, 30, 0);
getTextField(5).setMinMaxDefault(0, Integer.MAX_VALUE, 0);
addTextField(new GuiNpcTextField(6, this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.burstCount + ""));
addLabel(new GuiNpcLabel(6, "stats.burstcount", guiLeft + 5, y + 5));
getTextField(6).numbersOnly = true;
getTextField(6).setMinMaxDefault(1, 100, 20);
getTextField(6).setMinMaxDefault(1, Integer.MAX_VALUE, 20);
addTextField(new GuiNpcTextField(7,this, fontRendererObj, guiLeft + 85, y += 22, 100, 20, stats.fireSound));
addLabel(new GuiNpcLabel(7, "stats.firesound:", guiLeft + 5, y + 5));
addButton(new GuiNpcButton(7, guiLeft + 187, y, 60, 20, "mco.template.button.select"));
addTextField(new GuiNpcTextField(8, this, fontRendererObj, guiLeft + 85, y += 22, 50, 18, stats.shotCount + ""));
addLabel(new GuiNpcLabel(8, "stats.shotcount", guiLeft + 5, y + 5));
getTextField(8).numbersOnly = true;
getTextField(8).setMinMaxDefault(1, 10, 1);
getTextField(8).setMinMaxDefault(1, Integer.MAX_VALUE, 1);
addButton(new GuiNpcButtonYesNo(9, guiLeft + 100, y += 22, stats.aimWhileShooting));
addLabel(new GuiNpcLabel(9, "stats.aimWhileShooting", guiLeft + 5, y + 5));
src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java
+1 -1
View File
@@ -33,7 +33,7 @@ public class GuiNpcQuestReward extends GuiContainerNPCInterface implements IText
addLabel(new GuiNpcLabel(1, "quest.exp", guiLeft + 4, guiTop + 45));
addTextField(new GuiNpcTextField(0, this, this.fontRendererObj, guiLeft + 4, guiTop + 55, 60, 20, quest.rewardExp + ""));
getTextField(0).numbersOnly = true;
getTextField(0).setMinMaxDefault(0, 99999, 0);
getTextField(0).setMinMaxDefault(0, Integer.MAX_VALUE, 0);
}
public void actionPerformed(GuiButton guibutton){
src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener,
addLabel(new GuiNpcLabel(1,"stats.aggro", guiLeft + 140, y + 5));
addTextField(new GuiNpcTextField(1, this, fontRendererObj, guiLeft + 220, y, 50, 18, stats.aggroRange+""));
getTextField(1).numbersOnly = true;
getTextField(1).setMinMaxDefault(1, 64, 2);
getTextField(1).setMinMaxDefault(1, Integer.MAX_VALUE, 2);
addLabel(new GuiNpcLabel(34,"stats.creaturetype", guiLeft + 275, y + 5));
addButton(new GuiNpcButton(8,guiLeft + 355, y, 56, 20, new String[]{"stats.normal","stats.undead","stats.arthropod"} ,stats.creatureType.ordinal()));
src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java
+2 -2
View File
@@ -40,7 +40,7 @@ public class GuiNpcBard extends GuiNPCInterface2
addLabel(new GuiNpcLabel(2,"bard.ondistance", guiLeft + 60, guiTop + 143));
addTextField(new GuiNpcTextField(2,this, this.fontRendererObj, guiLeft+160, guiTop + 138, 40, 20, job.minRange + ""));
getTextField(2).numbersOnly = true;
getTextField(2).setMinMaxDefault(2, 64, 5);
getTextField(2).setMinMaxDefault(2, Integer.MAX_VALUE, 5);
addLabel(new GuiNpcLabel(4,"bard.hasoff", guiLeft + 60, guiTop + 166));
addButton(new GuiNpcButton(4, guiLeft + 160, guiTop + 161, 60, 20, new String[]{"gui.no","gui.yes"}, job.hasOffRange?1:0));
@@ -48,7 +48,7 @@ public class GuiNpcBard extends GuiNPCInterface2
addLabel(new GuiNpcLabel(3,"bard.offdistance", guiLeft + 60, guiTop + 189));
addTextField(new GuiNpcTextField(3,this, this.fontRendererObj, guiLeft+160, guiTop + 184, 40, 20, job.maxRange + ""));
getTextField(3).numbersOnly = true;
getTextField(3).setMinMaxDefault(2, 64, 10);
getTextField(3).setMinMaxDefault(2, Integer.MAX_VALUE, 10);
getLabel(3).enabled = job.hasOffRange;
getTextField(3).enabled = job.hasOffRange;
src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java
+2 -2
View File
@@ -55,12 +55,12 @@ public class GuiNpcConversation extends GuiNPCInterface2 implements ITextfieldLi
addLabel(new GuiNpcLabel(50, "conversation.delay", guiLeft + 202, guiTop + 175));
addTextField(new GuiNpcTextField(50, this, fontRendererObj, guiLeft + 260, guiTop + 170, 40, 20, job.generalDelay + ""));
getTextField(50).numbersOnly = true;
getTextField(50).setMinMaxDefault(10, 1000000, 12000);
getTextField(50).setMinMaxDefault(10, Integer.MAX_VALUE, 12000);
addLabel(new GuiNpcLabel(54, "gui.range", guiLeft + 202, guiTop + 196));
addTextField(new GuiNpcTextField(54, this, fontRendererObj, guiLeft + 260, guiTop + 191, 40, 20, job.range + ""));
getTextField(54).numbersOnly = true;
getTextField(54).setMinMaxDefault(4, 60, 20);
getTextField(54).setMinMaxDefault(4, Integer.MAX_VALUE, 20);
addLabel(new GuiNpcLabel(51, "quest.quest", guiLeft + 13, guiTop + 175));
String title = job.questTitle;
src/main/java/noppes/npcs/client/gui/roles/GuiNpcHealer.java
+2 -2
View File
@@ -25,12 +25,12 @@ public class GuiNpcHealer extends GuiNPCInterface2
addLabel(new GuiNpcLabel(1,"Healing Speed:", guiLeft + 60, guiTop + 110));
addTextField(new GuiNpcTextField(1,this, this.fontRendererObj, guiLeft+130, guiTop + 105, 40, 20, job.speed + ""));
getTextField(1).numbersOnly = true;
getTextField(1).setMinMaxDefault(1, 10, 8);
getTextField(1).setMinMaxDefault(1, Integer.MAX_VALUE, 8);
addLabel(new GuiNpcLabel(2,"Range:", guiLeft + 60, guiTop + 133));
addTextField(new GuiNpcTextField(2,this, this.fontRendererObj, guiLeft+130, guiTop + 128, 40, 20, job.range + ""));
getTextField(2).numbersOnly = true;
getTextField(2).setMinMaxDefault(2, 20, 5);
getTextField(2).setMinMaxDefault(2, Integer.MAX_VALUE, 5);
}
@Override
src/main/java/noppes/npcs/entity/EntityNPCFlying.java
+3
View File
@@ -73,6 +73,9 @@ public abstract class EntityNPCFlying extends EntityNPCInterface {
d5 = (double)MathHelper.sqrt_double(d3);
this.motionX += (d0 / d5 * 0.5D - this.motionX) * 0.6000000238418579D;
this.motionZ += (d1 / d5 * 0.5D - this.motionZ) * 0.6000000238418579D;
this.motionX *= this.ai.getWalkingSpeed()/10.0D;
this.motionZ *= this.ai.getWalkingSpeed()/10.0D;
}
}
}