Merge branch 'dev'

Author: KAMKEEL

README.md

@@ -38,6 +38,15 @@ This mod is an ***update*** to CustomNPC and not an add-on. Do not install Custo
 - Markov Name Generator
 - Dark Mode GUI (Link Below)
 - 1.12 Scripting Features (Details below)
+- Profile System (Multiple Character Slots)
+- Quest Party System
+- Item and Armor Attributes
+- Magic System with Elemental Cycles
+- Custom Effect Engine
+- Scripted Blocks & Particles
+- Compass Marks for Waypoints
+- Custom Model Support
+- Gecko & Dragon Block C Addons
 
 #### Scripting:
 - CustomNPC+ Api: [API](https://github.com/KAMKEEL/CustomNPC-Plus-API)

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'idea'
 }
 
-version = "1.10.1"
+version = "1.10.2"
 group= "kamkeel.customnpc-plus"
 archivesBaseName = "CustomNPC-Plus"
 
@@ -22,10 +22,13 @@ tasks.create('updateAPI', Exec) {
 }
 
 // No Mixin Build Task
+def gradleWrapper = System.getProperty('os.name').toLowerCase().contains('windows') ? 'gradlew.bat' : './gradlew'
+
 tasks.create('buildNoMixin', Exec) {
     description 'Builds mod without embed'
     group 'CustomNPC+'
-    commandLine 'build', '-Pnomixin'
+    workingDir project.rootDir
+    commandLine gradleWrapper, 'build', '-Pnomixin'
 }
 
 sourceSets {

gradle.properties

@@ -200,3 +200,7 @@ disableCheckstyle = true
 
 # Non-GTNH properties
 modVersion = 1.10
+
+# Increase Gradle's JVM memory usage to avoid daemon expiration due to
+# insufficient heap space on CI builds.
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1g

src/api

@@ -27,7 +27,12 @@
 import noppes.npcs.controllers.data.PlayerData;
 import noppes.npcs.entity.EntityNPCInterface;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 @Command(
     name = "noppes",

src/main/java/foxz/command/CmdNoppes.java

@@ -19,7 +19,11 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

src/main/java/foxz/commandhelper/AbstractCommandHelper.java

@@ -1,6 +1,10 @@
 package foxz.commandhelper.annotations;
 
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 @Documented
 @Retention(value = RetentionPolicy.RUNTIME)

src/main/java/foxz/commandhelper/annotations/SubCommand.java

@@ -17,7 +17,9 @@
 
 import java.util.List;
 
-import static kamkeel.npcs.util.ColorUtil.*;
+import static kamkeel.npcs.util.ColorUtil.sendError;
+import static kamkeel.npcs.util.ColorUtil.sendMessage;
+import static kamkeel.npcs.util.ColorUtil.sendResult;
 
 public class CloneCommand extends CommandKamkeelBase {
 

src/main/java/kamkeel/npcs/command/CloneCommand.java

@@ -13,7 +13,11 @@
 import noppes.npcs.scripted.CustomNPCsException;
 
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static kamkeel.npcs.command.EffectCommand.getSortedEffectNames;
 

src/main/java/kamkeel/npcs/command/CommandKamkeel.java

@@ -8,7 +8,12 @@
 import noppes.npcs.controllers.data.PlayerData;
 import noppes.npcs.scripted.event.player.PlayerEvent.EffectEvent.ExpirationType;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static kamkeel.npcs.util.ColorUtil.sendError;
 import static kamkeel.npcs.util.ColorUtil.sendResult;