diff --git a/BetterCNPCsPack.zip b/BetterCNPCsPack.zip new file mode 100644 index 000000000..3613397a6 Binary files /dev/null and b/BetterCNPCsPack.zip differ diff --git a/README.md b/README.md index 3a2abf20d..8b036a85a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ This mod is an ***update*** to CustomNPC and not an add-on. Do not install Custo - Custom Part Disabling - Markov Name Generator - Flying NPCS -- Better Script Speeds +- Script Enchanments and Fixes - Scripting Additions: [Documentation](https://github.com/PewDizinho/CustomNPCPlus-Script-Documentation) --- Please Suggest New Features! @@ -56,5 +56,6 @@ This mod is an ***update*** to CustomNPC and not an add-on. Do not install Custo [![Discord Badge](https://img.shields.io/badge/CustomNPC-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rgeWsmQaKa) [![Discord Badge](https://img.shields.io/badge/CustomNPC+-7289DA?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/pQqRTvFeJ5) [![Download CustomNPC+](https://img.shields.io/badge/Download⠀CustomNPC⠀Plus!-0081CB?style=for-the-badge&logo=material-ui&logoColor=white)](https://www.curseforge.com/minecraft/mc-mods/customnpc-plus) -[![Download CustomNPC+](https://img.shields.io/badge/Download⠀Plugin⠀Mod!-0081CB?style=for-the-badge&logo=material-ui&logoColor=white)](https://github.com/KAMKEEL/Plugin-Mod) +[![Download PluginMod](https://img.shields.io/badge/Download⠀Plugin⠀Mod!-0081CB?style=for-the-badge&logo=material-ui&logoColor=white)](https://github.com/KAMKEEL/Plugin-Mod) + Support Me on Kofi diff --git a/Scripting_Documentation.pdf b/Scripting_Documentation.pdf deleted file mode 100644 index 629f97237..000000000 Binary files a/Scripting_Documentation.pdf and /dev/null differ diff --git a/build.gradle b/build.gradle index 4e2f429c2..0fa989b42 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.5.1-beta" +version = "1.5.1" group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 087c9b525..a1c50e79b 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -29,7 +29,6 @@ import noppes.npcs.enchants.EnchantInterface; import noppes.npcs.entity.*; import noppes.npcs.entity.old.*; import noppes.npcs.scripted.wrapper.WrapperNpcAPI; - import java.io.File; import java.util.Set; import java.util.concurrent.Executors; diff --git a/src/main/java/noppes/npcs/client/TranslateUtil.java b/src/main/java/noppes/npcs/client/TranslateUtil.java index 199e1953b..7e3e758b9 100644 --- a/src/main/java/noppes/npcs/client/TranslateUtil.java +++ b/src/main/java/noppes/npcs/client/TranslateUtil.java @@ -99,7 +99,7 @@ public class TranslateUtil { return null; element = array.get(0); } - System.out.println(element.getAsString()); + // System.out.println(element.getAsString()); return element.getAsString(); } } diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcPuppet.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcPuppet.java index 7b04d2970..242b4bd0a 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcPuppet.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcPuppet.java @@ -163,8 +163,8 @@ public class GuiNpcPuppet extends GuiModelInterface implements ISliderListener{ } if(btn.id == 170 || btn.id == 171 || btn.id == 172){ if(btn.id == 170){ - System.out.println(part.rotationX); - System.out.println(rotateX.sliderValue); + // System.out.println(part.rotationX); + /// System.out.println(rotateX.sliderValue); part.rotationX = 0.0f; rotateX.sliderValue = 0.5f; int percent = (int) ((rotateX.sliderValue) * 360); diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java index 5d369d159..99cc2e437 100644 --- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java +++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java @@ -42,8 +42,8 @@ public class ServerCloneController implements ICloneHandler { try { File dir = new File(getDir(), ".."); File file = new File(dir, "clonednpcs.dat"); - System.out.println(file.getAbsolutePath()); - System.out.println(file.exists()); + // System.out.println(file.getAbsolutePath()); + // System.out.println(file.exists()); if(file.exists()){ Map> clones = loadOldClones(file); file.delete(); diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java index e6ef07d7d..eb1cbed0e 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java @@ -106,7 +106,11 @@ public class ScriptLivingBase extends ScriptEntity