diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 296c358b9..c07dfb6be 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,9 +1,6 @@ --- -name: Bug report -about: Create a report to help us improve -title: '' -labels: Bug -assignees: '' +name: Bug report about: Create a report to help us improve title: '' +labels: Bug assignees: '' --- @@ -12,6 +9,7 @@ A clear and concise description of what the bug is. **To Reproduce** Steps to reproduce the behavior: + 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' @@ -24,11 +22,13 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots or video recordings to help explain your problem. **Server and Plugin Information** - - Installed plugins: - - Iris Version: - - Server Platform and Version [eg: PaperSpigot 1.16.3 #240]: - - Operating System (if applicable): - - Server Logs: + +- Installed plugins: +- Iris Version: +- Server Platform and Version [eg: PaperSpigot 1.16.3 #240]: +- Operating System (if applicable): +- Server Logs: **Additional context** -Add any other context about the problem here, server timings reports, Iris dump information, complete console log etc. Please do not make Pastebin dumps or screenshot expire. +Add any other context about the problem here, server timings reports, Iris dump information, complete console log etc. +Please do not make Pastebin dumps or screenshot expire. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 3830dc8f1..aab81ed77 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,9 +1,6 @@ --- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: Enhancement, Addition -assignees: '' +name: Feature request about: Suggest an idea for this project title: '' +labels: Enhancement, Addition assignees: '' --- diff --git a/README.md b/README.md index 8f91e02fd..f757df5a2 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,7 @@ For 1.16 and below, see the 1.14-1.16 branch. The master branch is for the latest version of minecraft. -# [Support](https://discord.gg/3xxPTpT) **|** [Documentation](https://docs.volmit.com/iris/) **|** [Git](https://github.com/IrisDimensions) +# [Support](https://discord.gg/3xxPTpT) **|** [Documentation](https://docs.volmit.com/iris/) ** +|** [Git](https://github.com/IrisDimensions) + ![Iris Image](https://raw.githubusercontent.com/VolmitSoftware/Iris/master/IRIS.png) diff --git a/build.gradle b/build.gradle index fe7301f28..8d2f080dd 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ registerCustomOutputTask('Coco', 'C:/Users/sjoer/Documents/MCServer/plugins'); def registerCustomOutputTask(name, path) { tasks.register('build' + name, Copy) { group('development') - outputs.upToDateWhen{false} + outputs.upToDateWhen { false } dependsOn ':shadowJar' from(file('build/libs/Iris-' + version + '-all.jar')) into(file(path)) diff --git a/gradle.properties b/gradle.properties index e30439176..5fb2b7e0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - org.gradle.daemon=true org.gradle.parallel=true org.gradle.jvmargs=-Xmx3072m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9a6266293..b1b787bd8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -15,7 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # - distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip diff --git a/gradlew b/gradlew index 782ac18d3..29bd81e90 100644 --- a/gradlew +++ b/gradlew @@ -28,22 +28,22 @@ # Resolve links: $0 may be a link PRG="$0" # Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +while [ -h "$PRG" ]; do + ls=$(ls -ld "$PRG") + link=$(expr "$ls" : '.*-> \(.*\)$') + if expr "$link" : '/.*' >/dev/null; then + PRG="$link" + else + PRG=$(dirname "$PRG")"/$link" + fi done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" +SAVED="$(pwd)" +cd "$(dirname \"$PRG\")/" >/dev/null +APP_HOME="$(pwd -P)" cd "$SAVED" >/dev/null APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=$(basename "$0") # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -51,15 +51,15 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn () { - echo "$*" +warn() { + echo "$*" } -die () { - echo - echo "$*" - echo - exit 1 +die() { + echo + echo "$*" + echo + exit 1 } # OS specific support (must be 'true' or 'false'). @@ -67,119 +67,118 @@ cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$(uname)" in +CYGWIN*) + cygwin=true + ;; +Darwin*) + darwin=true + ;; +MINGW*) + msys=true + ;; +NONSTOP*) + nonstop=true + ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - # Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME +if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ]; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME Please set the JAVA_HOME variable in your environment to match the location of your Java installation." - fi + fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ]; then + MAX_FD_LIMIT=$(ulimit -H -n) + if [ $? -eq 0 ]; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then + MAX_FD="$MAX_FD_LIMIT" fi + ulimit -n $MAX_FD + if [ $? -ne 0 ]; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi # For Darwin, add options to specify how the application appears in the dock if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` +if [ "$cygwin" = "true" -o "$msys" = "true" ]; then + APP_HOME=$(cygpath --path --mixed "$APP_HOME") + CLASSPATH=$(cygpath --path --mixed "$CLASSPATH") - JAVACMD=`cygpath --unix "$JAVACMD"` + JAVACMD=$(cygpath --unix "$JAVACMD") - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=$(find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null) + SEP="" + for dir in $ROOTDIRSRAW; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ]; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@"; do + CHECK=$(echo "$arg" | egrep -c "$OURCYGPATTERN" -) + CHECK2=$(echo "$arg" | egrep -c "^-") ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ]; then ### Added a condition + eval $(echo args$i)=$(cygpath --path --ignore --mixed "$arg") + else + eval $(echo args$i)="\"$arg\"" fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac + i=$(expr $i + 1) + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi # Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " +save() { + for i; do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"; done + echo " " } -APP_ARGS=`save "$@"` +APP_ARGS=$(save "$@") # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" diff --git a/plains.json b/plains.json index 960520677..14e83f928 100644 --- a/plains.json +++ b/plains.json @@ -1,69 +1,69 @@ { - "children": [], - "decorators": [], - "objects": [], - "name": "Plains", - "layers": [ - { - "minHeight": 1, - "terrainZoom": 5, - "maxHeight": 3, - "palette": [ - "GRASS_BLOCK" - ], - "dispersion": "SCATTER" - }, - { - "minHeight": 1, - "terrainZoom": 5, - "maxHeight": 1, - "palette": [ - "DIRT" - ], - "dispersion": "SCATTER" - }, - { - "minHeight": 1, - "terrainZoom": 5, - "maxHeight": 3, - "palette": [ - "DIRT", - "COARSE_DIRT" - ], - "dispersion": "SCATTER" - }, - { - "minHeight": 6, - "terrainZoom": 5, - "maxHeight": 2341, - "palette": [ - "STONE", - "ANDESITE", - "STONE" - ], - "dispersion": "SCATTER" - } - ], - "childShrinkFactor": 1.55, - "derivative": "THE_VOID", - "auxiliaryGenerators": [ - { - "offsetX": 0, - "offsetZ": 0.01, - "min": 1, - "seed": 1336, - "max": 5, - "zoom": 3.065 - }, - { - "offsetX": 0, - "offsetZ": 0, - "min": 1.01, - "seed": 1339, - "max": 2, - "zoom": 1.6 - } - ], - "highHeight": 3.66669, - "lowHeight": 31.5 + "children": [], + "decorators": [], + "objects": [], + "name": "Plains", + "layers": [ + { + "minHeight": 1, + "terrainZoom": 5, + "maxHeight": 3, + "palette": [ + "GRASS_BLOCK" + ], + "dispersion": "SCATTER" + }, + { + "minHeight": 1, + "terrainZoom": 5, + "maxHeight": 1, + "palette": [ + "DIRT" + ], + "dispersion": "SCATTER" + }, + { + "minHeight": 1, + "terrainZoom": 5, + "maxHeight": 3, + "palette": [ + "DIRT", + "COARSE_DIRT" + ], + "dispersion": "SCATTER" + }, + { + "minHeight": 6, + "terrainZoom": 5, + "maxHeight": 2341, + "palette": [ + "STONE", + "ANDESITE", + "STONE" + ], + "dispersion": "SCATTER" + } + ], + "childShrinkFactor": 1.55, + "derivative": "THE_VOID", + "auxiliaryGenerators": [ + { + "offsetX": 0, + "offsetZ": 0.01, + "min": 1, + "seed": 1336, + "max": 5, + "zoom": 3.065 + }, + { + "offsetX": 0, + "offsetZ": 0, + "min": 1.01, + "seed": 1339, + "max": 2, + "zoom": 1.6 + } + ], + "highHeight": 3.66669, + "lowHeight": 31.5 } \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 4bc42c9ee..95d9584e6 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -23,14 +23,13 @@ import com.volmit.iris.core.command.CommandIris; import com.volmit.iris.core.command.PermissionIris; import com.volmit.iris.core.command.world.CommandLocate; import com.volmit.iris.core.link.BKLink; -import com.volmit.iris.core.link.CitizensLink; import com.volmit.iris.core.link.MultiverseCoreLink; import com.volmit.iris.core.link.MythicMobsLink; import com.volmit.iris.core.nms.INMS; -import com.volmit.iris.engine.object.IrisCompat; -import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.framework.EngineCompositeGenerator; +import com.volmit.iris.engine.object.IrisCompat; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; @@ -73,7 +72,6 @@ public class Iris extends VolmitPlugin implements Listener { public static BKLink linkBK; public static MultiverseCoreLink linkMultiverseCore; public static MythicMobsLink linkMythicMobs; - public static CitizensLink linkCitizens; private static final Queue syncJobs = new ShurikenQueue<>(); public static boolean customModels = doesSupportCustomModels(); public static boolean awareEntities = doesSupportAwareness(); @@ -96,8 +94,7 @@ public class Iris extends VolmitPlugin implements Listener { installDataPacks(); } - public File getDatapacksFolder() - { + public File getDatapacksFolder() { File props = new File("server.properties"); if (props.exists()) { @@ -424,12 +421,11 @@ public class Iris extends VolmitPlugin implements Listener { } public static void debug(String string) { - if(!IrisSettings.get().getGeneral().isDebug()) - { + if (!IrisSettings.get().getGeneral().isDebug()) { return; } - msg( C.LIGHT_PURPLE+ "" + C.BOLD+ string); + msg(C.LIGHT_PURPLE + "" + C.BOLD + string); } public static void verbose(String string) { @@ -535,21 +531,17 @@ public class Iris extends VolmitPlugin implements Listener { return IrisSettings.get().getGenerator().isMcaPregenerator(); } - public static synchronized void reportError(Throwable e) - { - if(IrisSettings.get().getGeneral().isDebug()) - { + public static synchronized void reportError(Throwable e) { + if (IrisSettings.get().getGeneral().isDebug()) { String n = e.getClass().getCanonicalName() + "-" + e.getStackTrace()[0].getClassName() + "-" + e.getStackTrace()[0].getLineNumber(); - if(e.getCause() != null) - { + if (e.getCause() != null) { n += "-" + e.getCause().getStackTrace()[0].getClassName() + "-" + e.getCause().getStackTrace()[0].getLineNumber(); } File f = instance.getDataFile("debug", "caught-exceptions", n + ".txt"); - if(!f.exists()) - { + if (!f.exists()) { J.attempt(() -> { PrintWriter pw = new PrintWriter(f); pw.println("Thread: " + Thread.currentThread().getName()); diff --git a/src/main/java/com/volmit/iris/core/ConversionManager.java b/src/main/java/com/volmit/iris/core/ConversionManager.java index 3f8b92dc1..4fee078f8 100644 --- a/src/main/java/com/volmit/iris/core/ConversionManager.java +++ b/src/main/java/com/volmit/iris/core/ConversionManager.java @@ -20,13 +20,13 @@ package com.volmit.iris.core; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.data.DirectWorldWriter; import com.volmit.iris.engine.data.nbt.io.NBTUtil; import com.volmit.iris.engine.data.nbt.io.NamedTag; import com.volmit.iris.engine.data.nbt.tag.CompoundTag; import com.volmit.iris.engine.data.nbt.tag.IntTag; import com.volmit.iris.engine.data.nbt.tag.ListTag; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/core/IrisDataManager.java b/src/main/java/com/volmit/iris/core/IrisDataManager.java index 9b3a8db85..849ee9459 100644 --- a/src/main/java/com/volmit/iris/core/IrisDataManager.java +++ b/src/main/java/com/volmit/iris/core/IrisDataManager.java @@ -19,10 +19,10 @@ package com.volmit.iris.core; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.data.loader.ObjectResourceLoader; -import com.volmit.iris.util.math.RNG; import com.volmit.iris.engine.data.loader.ResourceLoader; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.util.math.RNG; import lombok.Data; import java.io.File; diff --git a/src/main/java/com/volmit/iris/core/IrisProject.java b/src/main/java/com/volmit/iris/core/IrisProject.java index c2c116aee..525bbdf51 100644 --- a/src/main/java/com/volmit/iris/core/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/IrisProject.java @@ -20,13 +20,13 @@ package com.volmit.iris.core; import com.google.gson.Gson; import com.volmit.iris.Iris; +import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.report.Report; import com.volmit.iris.core.report.ReportType; -import com.volmit.iris.core.nms.INMS; -import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.IrisWorldCreator; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -259,14 +259,10 @@ public class IrisProject { assert gx != null; double v = (double) gx.getGenerated() / (double) req; - if(sender.isPlayer()) - { + if (sender.isPlayer()) { sender.player().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(C.WHITE + "Generating " + Form.pc(v) + ((C.GRAY + " (" + (req - gx.getGenerated()) + " Left)")))); J.sleep(50); - } - - else - { + } else { sender.sendMessage(C.WHITE + "Generating " + Form.pc(v) + ((C.GRAY + " (" + (req - gx.getGenerated()) + " Left)"))); J.sleep(1000); } @@ -295,10 +291,7 @@ public class IrisProject { if (sender.isPlayer()) { assert world != null; sender.player().teleport(world.getSpawnLocation()); - } - - else - { + } else { sender.sendMessage(C.WHITE + "Generating Complete!"); } diff --git a/src/main/java/com/volmit/iris/core/ProjectManager.java b/src/main/java/com/volmit/iris/core/ProjectManager.java index a4464ab01..f121986d3 100644 --- a/src/main/java/com/volmit/iris/core/ProjectManager.java +++ b/src/main/java/com/volmit/iris/core/ProjectManager.java @@ -21,8 +21,8 @@ package com.volmit.iris.core; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.io.IO; diff --git a/src/main/java/com/volmit/iris/core/command/CommandIris.java b/src/main/java/com/volmit/iris/core/command/CommandIris.java index debb22a59..4110a63d2 100644 --- a/src/main/java/com/volmit/iris/core/command/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIris.java @@ -24,8 +24,8 @@ import com.volmit.iris.core.command.object.CommandIrisObject; import com.volmit.iris.core.command.studio.CommandIrisStudio; import com.volmit.iris.core.command.what.CommandIrisWhat; import com.volmit.iris.core.command.world.*; -import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java index d4f9350ee..9a7942a62 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java @@ -20,8 +20,8 @@ package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java index 939fc5165..dff8b7d22 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.engine.object.IrisJigsawPiece; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java index 4327791ee..797cdcdd6 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java index e6fce4281..e63bb4591 100644 --- a/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java @@ -19,11 +19,11 @@ package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.engine.jigsaw.PlannedStructure; import com.volmit.iris.engine.object.IrisJigsawStructure; import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.jigsaw.PlannedStructure; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java index f9f266e2a..9e7e53048 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java @@ -20,8 +20,8 @@ package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java index cfc245f12..fabc9bc60 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.ProjectManager; import com.volmit.iris.core.WandManager; import com.volmit.iris.engine.object.IrisObject; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java index c38b87ca6..286767a13 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java @@ -21,9 +21,9 @@ package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.WandManager; +import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.data.Cuboid.CuboidDirection; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java index 12d5cf4f0..c130237f1 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java @@ -21,9 +21,9 @@ package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.WandManager; +import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.data.Cuboid.CuboidDirection; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java index 828b8c215..5bb736beb 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java @@ -20,8 +20,8 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java index f3c581757..898362403 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java @@ -20,8 +20,8 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.format.C; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java index 08ec48e6a..01f04cdea 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java @@ -21,8 +21,8 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.gui.NoiseExplorer; -import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java index e972cd60a..9fc2b73dc 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java @@ -19,14 +19,14 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.gui.NoiseExplorer; import com.volmit.iris.engine.object.IrisGenerator; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; -import com.volmit.iris.util.math.RNG; public class CommandIrisStudioExplorerGenerator extends MortarCommand { public CommandIrisStudioExplorerGenerator() { diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java index e2fe41b1b..c00d36a19 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java @@ -20,10 +20,10 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; @@ -103,9 +103,7 @@ public class CommandIrisStudioGoto extends MortarCommand { J.s(() -> sender.player().teleport(l)); } }); - } - - else { + } else { sender.sendMessage(args[0] + " is not a biome or region in this dimension. (Biome teleportation works best!"); } diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java index 5e0e870c3..c33de13de 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java @@ -20,10 +20,10 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.engine.object.InventorySlotType; -import com.volmit.iris.engine.object.IrisLootTable; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.InventorySlotType; +import com.volmit.iris.engine.object.IrisLootTable; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.plugin.MortarCommand; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java index 1cbc80996..b6c7c9e6d 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java @@ -28,10 +28,8 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; -public class CommandIrisStudioMap extends MortarCommand -{ - public CommandIrisStudioMap() - { +public class CommandIrisStudioMap extends MortarCommand { + public CommandIrisStudioMap() { super("map", "render"); setDescription("Render a map (gui outside of mc)"); requiresPermission(Iris.perm.studio); @@ -44,16 +42,13 @@ public class CommandIrisStudioMap extends MortarCommand } @Override - public boolean handle(MortarSender sender, String[] args) - { - if(!IrisSettings.get().isStudio()) - { + public boolean handle(MortarSender sender, String[] args) { + if (!IrisSettings.get().isStudio()) { sender.sendMessage("To use Iris Studio, please enable studio in Iris/settings.json"); return true; } - if(!IrisSettings.get().isUseServerLaunchedGuis()) - { + if (!IrisSettings.get().isUseServerLaunchedGuis()) { sender.sendMessage("To use Iris Guis, please enable serverLaunchedGuis in Iris/settings.json"); return true; } @@ -74,8 +69,7 @@ public class CommandIrisStudioMap extends MortarCommand } @Override - protected String getArgsUsage() - { + protected String getArgsUsage() { return "[pack] [seed=1337]"; } } diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java index 1b2b3801f..a658b6ced 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java @@ -20,10 +20,10 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; +import com.volmit.iris.util.scheduling.J; public class CommandIrisStudioPackage extends MortarCommand { public CommandIrisStudioPackage() { diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java index ef2bdc5f1..3471cbd9d 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java @@ -19,10 +19,10 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.core.IrisProject; +import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java index fb104de9b..9793dd218 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java @@ -20,10 +20,10 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.engine.object.IrisEntity; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.IrisEntity; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java index acd6dab7e..c24f8d1ad 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisProject; +import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java index ac86dd12a..8ae9181f1 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; -import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.plugin.Command; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java index a8ba56ed1..d5d063037 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java @@ -20,9 +20,9 @@ package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; import com.volmit.iris.core.nms.INMS; -import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java index c06e6327e..8e7d1e16b 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; -import com.volmit.iris.util.format.C; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.MortarSender; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java index 39bd7cb54..70da26d02 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java @@ -19,11 +19,11 @@ package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.IrisWorlds; -import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java index e6711a8a8..5cde775ce 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java @@ -19,14 +19,14 @@ package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.core.gui.Pregenerator; import com.volmit.iris.core.link.MultiverseCoreLink; import com.volmit.iris.core.nms.INMS; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.core.gui.Pregenerator; import com.volmit.iris.engine.IrisWorldCreator; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.plugin.MortarCommand; diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java index 43d7d8232..4db2e1475 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java @@ -106,10 +106,12 @@ public class CommandIrisPregen extends MortarCommand { } try { new Pregenerator(world, getVal(args[0]) * 2); - } catch (NumberFormatException e) {Iris.reportError(e); + } catch (NumberFormatException e) { + Iris.reportError(e); sender.sendMessage("Invalid argument in command"); return true; - } catch (NullPointerException e) {Iris.reportError(e); + } catch (NullPointerException e) { + Iris.reportError(e); e.printStackTrace(); sender.sendMessage("No radius specified (check error in console)"); } catch (HeadlessException e) { @@ -130,12 +132,15 @@ public class CommandIrisPregen extends MortarCommand { World world = Bukkit.getWorld(args[1]); try { new Pregenerator(world, getVal(args[0]) * 2); - } catch (NumberFormatException e) {Iris.reportError(e); + } catch (NumberFormatException e) { + Iris.reportError(e); sender.sendMessage("Invalid argument in command"); return true; - } catch (NullPointerException e) {Iris.reportError(e); + } catch (NullPointerException e) { + Iris.reportError(e); sender.sendMessage("Not all required parameters specified"); - } catch (HeadlessException e) {Iris.reportError(e); + } catch (HeadlessException e) { + Iris.reportError(e); sender.sendMessage("If you are seeing this and are using a hosted server, please turn off 'useServerLaunchedGUIs' in the settings"); } diff --git a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java index 1a81cac14..f2d487890 100644 --- a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java +++ b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java @@ -80,7 +80,8 @@ public class JigsawEditor implements Listener { if (e.getPlayer().equals(player)) { try { target = player.getTargetBlockExact(7).getLocation(); - } catch (Throwable ex) {Iris.reportError(ex); + } catch (Throwable ex) { + Iris.reportError(ex); target = player.getLocation(); return; } @@ -147,7 +148,8 @@ public class JigsawEditor implements Listener { exit(); try { IO.writeAll(targetSaveLocation, new JSONObject(new Gson().toJson(piece)).toString(4)); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java b/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java index 40ca25978..436d57951 100644 --- a/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java +++ b/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java @@ -62,6 +62,6 @@ public class IrisRenderer { } public void set(double worldX, double worldZ) { - ((Engine) renderer).getWorld().getBlockAt((int) worldX, 20, (int) worldZ).setType(Material.DIAMOND_BLOCK); + renderer.getWorld().getBlockAt((int) worldX, 20, (int) worldZ).setType(Material.DIAMOND_BLOCK); } } diff --git a/src/main/java/com/volmit/iris/core/gui/IrisVision.java b/src/main/java/com/volmit/iris/core/gui/IrisVision.java index fa111ea18..df684bafd 100644 --- a/src/main/java/com/volmit/iris/core/gui/IrisVision.java +++ b/src/main/java/com/volmit/iris/core/gui/IrisVision.java @@ -20,10 +20,10 @@ package com.volmit.iris.core.gui; import com.volmit.iris.Iris; import com.volmit.iris.engine.IrisComplex; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -80,7 +80,7 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene private int h = 0; private double lx = 0; private double lz = 0; - private KList lastEntities = new KList<>(); + private final KList lastEntities = new KList<>(); private double ox = 0; private double oz = 0; private double hx = 0; @@ -88,10 +88,10 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene private double oxp = 0; private double ozp = 0; private Engine engine; - private KMap notifications = new KMap<>(); + private final KMap notifications = new KMap<>(); double tfps = 240D; int ltc = 3; - private ChronoLatch centities = new ChronoLatch(1000); + private final ChronoLatch centities = new ChronoLatch(1000); private final RollingSequence rs = new RollingSequence(512); private final O m = new O<>(); private int tid = 0; @@ -175,11 +175,10 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene return colorFunction.apply(wx, wz); } - public void notify(String s) - { + public void notify(String s) { notifications.put(s, M.ms() + 2500); } - + @Override public void keyTyped(KeyEvent e) { @@ -192,12 +191,15 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene } if (e.getKeyCode() == KeyEvent.VK_CONTROL) { control = true; - }if (e.getKeyCode() == KeyEvent.VK_SEMICOLON) { + } + if (e.getKeyCode() == KeyEvent.VK_SEMICOLON) { debug = true; - } if (e.getKeyCode() == KeyEvent.VK_SLASH) { + } + if (e.getKeyCode() == KeyEvent.VK_SLASH) { help = true; helpIgnored = true; - } if (e.getKeyCode() == KeyEvent.VK_ALT) { + } + if (e.getKeyCode() == KeyEvent.VK_ALT) { alt = true; } } @@ -217,7 +219,8 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene if (e.getKeyCode() == KeyEvent.VK_SLASH) { help = false; helpIgnored = true; - } if (e.getKeyCode() == KeyEvent.VK_ALT) { + } + if (e.getKeyCode() == KeyEvent.VK_ALT) { alt = false; } @@ -225,19 +228,12 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene if (e.getKeyCode() == KeyEvent.VK_F) { follow = !follow; - if(player != null && follow) - { + if (player != null && follow) { notify("Following " + player.getName() + ". Press F to disable"); - } - - else if(follow) - { + } else if (follow) { notify("Can't follow, no one is in the world"); follow = false; - } - - else - { + } else { notify("Follow Off"); } @@ -253,7 +249,7 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene if (e.getKeyCode() == KeyEvent.VK_P) { lowtile = !lowtile; dump(); - notify("Rendering "+(lowtile ? "Low" : "High")+" Quality Tiles"); + notify("Rendering " + (lowtile ? "Low" : "High") + " Quality Tiles"); return; } if (e.getKeyCode() == KeyEvent.VK_E) { @@ -284,11 +280,9 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene int currentMode = currentType.ordinal(); - for(RenderType i : RenderType.values()) - { - if (e.getKeyChar() == String.valueOf(i.ordinal()+1).charAt(0)) { - if(i.ordinal() != currentMode) - { + for (RenderType i : RenderType.values()) { + if (e.getKeyChar() == String.valueOf(i.ordinal() + 1).charAt(0)) { + if (i.ordinal() != currentMode) { currentType = i; dump(); notify("Rendering " + Form.capitalizeWords(currentType.name().toLowerCase().replaceAll("\\Q_\\E", " "))); @@ -298,14 +292,13 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene } if (e.getKeyCode() == KeyEvent.VK_M) { - currentType = RenderType.values()[(currentMode+1) % RenderType.values().length]; + currentType = RenderType.values()[(currentMode + 1) % RenderType.values().length]; notify("Rendering " + Form.capitalizeWords(currentType.name().toLowerCase().replaceAll("\\Q_\\E", " "))); dump(); } } - private void dump() - { + private void dump() { positions.clear(); fastpositions.clear(); } @@ -418,17 +411,15 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene hz += Math.abs(hz - lz) * 0.36; } - if(centities.flip()) - { + if (centities.flip()) { J.s(() -> { - synchronized (lastEntities) - { + synchronized (lastEntities) { lastEntities.clear(); lastEntities.addAll(world.getEntitiesByClass(LivingEntity.class)); } }); } - lowq = Math.max(Math.min((int)M.lerp(8, 28, velocity / 1000D), 28), 8); + lowq = Math.max(Math.min((int) M.lerp(8, 28, velocity / 1000D), 28), 8); PrecisionStopwatch p = PrecisionStopwatch.start(); Graphics2D g = (Graphics2D) gx; w = getWidth(); @@ -495,8 +486,7 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene } private void hanleFollow() { - if(follow && player != null) - { + if (follow && player != null) { animateTo(player.getLocation().getX(), player.getLocation().getZ()); } } @@ -504,21 +494,16 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene private void renderOverlays(Graphics2D g) { renderPlayer(g); - if(help) - { + if (help) { renderOverlayHelp(g); - } - - else if(debug) - { + } else if (debug) { renderOverlayDebug(g); } renderOverlayLegend(g); renderHoverOverlay(g, shift); - if(!notifications.isEmpty()) - { + if (!notifications.isEmpty()) { renderNotification(g); } } @@ -526,7 +511,7 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene private void renderOverlayLegend(Graphics2D g) { KList l = new KList<>(); l.add("Zoom: " + Form.pc(mscale, 0)); - l.add("Blocks: " + Form.f((int)mscale * w) + " by " + Form.f((int)mscale * h)); + l.add("Blocks: " + Form.f((int) mscale * w) + " by " + Form.f((int) mscale * h)); l.add("BPP: " + Form.f(mscale, 1)); l.add("Render Mode: " + Form.capitalizeWords(currentType.name().toLowerCase().replaceAll("\\Q_\\E", " "))); @@ -536,10 +521,8 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene private void renderNotification(Graphics2D g) { drawCardCB(g, notifications.k()); - for(String i : notifications.k()) - { - if(M.ms() > notifications.get(i)) - { + for (String i : notifications.k()) { + if (M.ms() > notifications.get(i)) { notifications.remove(i); } } @@ -548,47 +531,40 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene private void renderPlayer(Graphics2D g) { Player b = null; - for(Player i : world.getPlayers()) - { + for (Player i : world.getPlayers()) { b = i; renderPosition(g, i.getLocation().getX(), i.getLocation().getZ()); } - synchronized (lastEntities) - { + synchronized (lastEntities) { double dist = Double.MAX_VALUE; LivingEntity h = null; - for(LivingEntity i : lastEntities) - { - if(i instanceof Player) - { + for (LivingEntity i : lastEntities) { + if (i instanceof Player) { continue; } renderMobPosition(g, i, i.getLocation().getX(), i.getLocation().getZ()); - if(shift) - { + if (shift) { double d = i.getLocation().distanceSquared(new Location(i.getWorld(), getWorldX(hx), i.getLocation().getY(), getWorldZ(hz))); - if(d < dist) - { + if (d < dist) { dist = d; h = i; } } } - if(h != null && shift) - { + if (h != null && shift) { g.setColor(Color.red); - g.fillRoundRect((int)getScreenX(h.getLocation().getX()) - 10, (int)getScreenZ(h.getLocation().getZ()) - 10, 20, 20, 20, 20); + g.fillRoundRect((int) getScreenX(h.getLocation().getX()) - 10, (int) getScreenZ(h.getLocation().getZ()) - 10, 20, 20, 20, 20); KList k = new KList<>(); k.add(Form.capitalizeWords(h.getType().name().toLowerCase(Locale.ROOT).replaceAll("\\Q_\\E", " ")) + h.getEntityId()); - k.add("Pos: " + h.getLocation().getBlockX() + ", " + h.getLocation().getBlockY() + ", " + h.getLocation().getBlockZ()); - k.add("UUID: " + h.getUniqueId().toString()); - k.add("HP: " + h.getHealth() + " / " + h.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); + k.add("Pos: " + h.getLocation().getBlockX() + ", " + h.getLocation().getBlockY() + ", " + h.getLocation().getBlockZ()); + k.add("UUID: " + h.getUniqueId()); + k.add("HP: " + h.getHealth() + " / " + h.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); drawCardTR(g, k); } @@ -598,32 +574,26 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene } private void animateTo(double wx, double wz) { - double cx = getWorldX(getWidth()/2); - double cz = getWorldZ(getHeight()/2); + double cx = getWorldX(getWidth() / 2); + double cz = getWorldZ(getHeight() / 2); ox += (wx - cx); oz += (wz - cz); } - private void renderPosition(Graphics2D g, double x, double z) - { - if(texture != null) - { - g.drawImage(texture, (int)getScreenX(x), (int)getScreenZ(z), 66, 66, (img, infoflags, xx, xy, width, height) -> true); - } - - else - { + private void renderPosition(Graphics2D g, double x, double z) { + if (texture != null) { + g.drawImage(texture, (int) getScreenX(x), (int) getScreenZ(z), 66, 66, (img, infoflags, xx, xy, width, height) -> true); + } else { g.setColor(Color.darkGray); - g.fillRoundRect((int)getScreenX(x) - 15, (int)getScreenZ(z) - 15, 30, 30, 15, 15); + g.fillRoundRect((int) getScreenX(x) - 15, (int) getScreenZ(z) - 15, 30, 30, 15, 15); g.setColor(Color.cyan.darker().darker()); - g.fillRoundRect((int)getScreenX(x) - 10, (int)getScreenZ(z) - 10, 20, 20, 10, 10); + g.fillRoundRect((int) getScreenX(x) - 10, (int) getScreenZ(z) - 10, 20, 20, 10, 10); } } - private void renderMobPosition(Graphics2D g, LivingEntity e, double x, double z) - { + private void renderMobPosition(Graphics2D g, LivingEntity e, double x, double z) { g.setColor(Color.red.darker().darker()); - g.fillRoundRect((int)getScreenX(x) - 2, (int)getScreenZ(z) - 2, 4, 4, 4, 4); + g.fillRoundRect((int) getScreenX(x) - 2, (int) getScreenZ(z) - 2, 4, 4, 4, 4); } private void renderHoverOverlay(Graphics2D g, boolean detailed) { @@ -632,22 +602,21 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene KList l = new KList<>(); l.add("Biome: " + biome.getName()); l.add("Region: " + region.getName() + "(" + region.getLoadKey() + ")"); - if(detailed) - { - l.add("Block " + (int)getWorldX(hx) + ", " + (int)getWorldZ(hz)); - l.add("Chunk " + ((int)getWorldX(hx)>>4) + ", " + ((int)getWorldZ(hz)>>4)); - l.add("Region " + (((int)getWorldX(hx)>>4)>>5) + ", " + (((int)getWorldZ(hz)>>4)>>5)); + if (detailed) { + l.add("Block " + (int) getWorldX(hx) + ", " + (int) getWorldZ(hz)); + l.add("Chunk " + ((int) getWorldX(hx) >> 4) + ", " + ((int) getWorldZ(hz) >> 4)); + l.add("Region " + (((int) getWorldX(hx) >> 4) >> 5) + ", " + (((int) getWorldZ(hz) >> 4) >> 5)); l.add("Key: " + biome.getLoadKey()); l.add("File: " + biome.getLoadFile()); } - drawCardAt((float)hx, (float)hz, 0, 0, g, l); + drawCardAt((float) hx, (float) hz, 0, 0, g, l); } private void renderOverlayDebug(Graphics2D g) { KList l = new KList<>(); - l.add("Velocity: " + (int)velocity); - l.add("Center Pos: " + Form.f((int)getWorldX(getWidth()/2)) + ", " + Form.f((int)getWorldZ(getHeight()/2))); + l.add("Velocity: " + (int) velocity); + l.add("Center Pos: " + Form.f((int) getWorldX(getWidth() / 2)) + ", " + Form.f((int) getWorldZ(getHeight() / 2))); drawCardBL(g, l); } @@ -674,32 +643,26 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene drawCardTL(g, l); } - private void drawCardTL(Graphics2D g, KList text) - { + private void drawCardTL(Graphics2D g, KList text) { drawCardAt(0, 0, 0, 0, g, text); } - private void drawCardBR(Graphics2D g, KList text) - { + private void drawCardBR(Graphics2D g, KList text) { drawCardAt(getWidth(), getHeight(), 1, 1, g, text); } - private void drawCardBL(Graphics2D g, KList text) - { + private void drawCardBL(Graphics2D g, KList text) { drawCardAt(0, getHeight(), 0, 1, g, text); } - private void drawCardTR(Graphics2D g, KList text) - { + private void drawCardTR(Graphics2D g, KList text) { drawCardAt(getWidth(), 0, 1, 0, g, text); } - private void open() - { + private void open() { IrisComplex complex = engine.getFramework().getComplex(); File r = null; - switch(currentType) - { + switch (currentType) { case BIOME, LAYER_LOAD, DECORATOR_LOAD, OBJECT_LOAD, HEIGHT -> r = complex.getTrueBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode(); case BIOME_LAND -> r = complex.getLandBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode(); case BIOME_SEA -> r = complex.getSeaBiomeStream().get(getWorldX(hx), getWorldZ(hz)).openInVSCode(); @@ -710,41 +673,32 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene notify("Opening " + r.getPath() + " in VSCode"); } - private void teleport() - { + private void teleport() { J.s(() -> { - if(player != null) - { + if (player != null) { double h = engine.getFramework().getComplex().getTrueHeightStream().get(getWorldX(hx), getWorldZ(hz)); player.teleport(new Location(player.getWorld(), getWorldX(hx), h, getWorldZ(hz))); - notify("Teleporting to " + Form.f((int)getWorldX(hx)) +", " + Form.f((int)h) + ", " + Form.f((int)getWorldZ(hz))); - } - - else - { + notify("Teleporting to " + Form.f((int) getWorldX(hx)) + ", " + Form.f((int) h) + ", " + Form.f((int) getWorldZ(hz))); + } else { notify("No player in world, can't teleport."); } }); } - private void drawCardCB(Graphics2D g, KList text) - { - drawCardAt(getWidth()/2, getHeight(), 0.5, 1, g, text); + private void drawCardCB(Graphics2D g, KList text) { + drawCardAt(getWidth() / 2, getHeight(), 0.5, 1, g, text); } - private void drawCardCT(Graphics2D g, KList text) - { - drawCardAt(getWidth()/2, 0, 0.5, 0, g, text); + private void drawCardCT(Graphics2D g, KList text) { + drawCardAt(getWidth() / 2, 0, 0.5, 0, g, text); } - private void drawCardAt(float x, float y, double pushX, double pushZ, Graphics2D g, KList text) - { + private void drawCardAt(float x, float y, double pushX, double pushZ, Graphics2D g, KList text) { g.setFont(new Font("Hevetica", Font.BOLD, 16)); int h = 0; int w = 0; - for(String i : text) - { + for (String i : text) { h += g.getFontMetrics().getHeight(); w = Math.max(w, g.getFontMetrics().stringWidth(i)); } @@ -752,21 +706,20 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene w += 28; h += 28; - int cw = (int) ((w+26) * pushX); - int ch = (int) ((h+26) * pushZ); + int cw = (int) ((w + 26) * pushX); + int ch = (int) ((h + 26) * pushZ); g.setColor(Color.darkGray); - g.fillRect((int)x + 7 + 2-cw , (int)y + 7 + 2-ch, w + 7, h + 7); // Shadow + g.fillRect((int) x + 7 + 2 - cw, (int) y + 7 + 2 - ch, w + 7, h + 7); // Shadow g.setColor(Color.gray); - g.fillRect((int)x + 7 + 1-cw, (int)y + 7 + 1-ch, w + 7, h + 7); // Shadow + g.fillRect((int) x + 7 + 1 - cw, (int) y + 7 + 1 - ch, w + 7, h + 7); // Shadow g.setColor(Color.white); - g.fillRect((int)x + 7-cw, (int)y + 7-ch, w + 7, h + 7); + g.fillRect((int) x + 7 - cw, (int) y + 7 - ch, w + 7, h + 7); g.setColor(Color.black); int m = 0; - for(String i : text) - { - g.drawString(i, x + 14-cw, y + 14 -ch + (++m * g.getFontMetrics().getHeight())); + for (String i : text) { + g.drawString(i, x + 14 - cw, y + 14 - ch + (++m * g.getFontMetrics().getHeight())); } } @@ -785,7 +738,8 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene try { nv.texture = ImageIO.read(file); frame.setIconImage(ImageIO.read(file)); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); } } @@ -811,13 +765,9 @@ public class IrisVision extends JPanel implements MouseWheelListener, KeyListene @Override public void mouseClicked(MouseEvent e) { - if(control) - { + if (control) { teleport(); - } - - else if(alt) - { + } else if (alt) { open(); } } diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java index 9c100ef0c..3a7843b25 100644 --- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java +++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java @@ -32,7 +32,6 @@ import com.volmit.iris.util.scheduling.PrecisionStopwatch; import javax.imageio.ImageIO; import javax.swing.*; -import java.awt.Dimension; import java.awt.*; import java.awt.event.*; import java.io.File; @@ -250,7 +249,8 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { if (file != null) { try { frame.setIconImage(ImageIO.read(file)); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); } } frame.setSize(1440, 820); @@ -283,7 +283,8 @@ public class NoiseExplorer extends JPanel implements MouseWheelListener { if (file != null) { try { frame.setIconImage(ImageIO.read(file)); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); } } frame.setSize(1440, 820); diff --git a/src/main/java/com/volmit/iris/core/gui/Pregenerator.java b/src/main/java/com/volmit/iris/core/gui/Pregenerator.java index a53a24596..1c8265d92 100644 --- a/src/main/java/com/volmit/iris/core/gui/Pregenerator.java +++ b/src/main/java/com/volmit/iris/core/gui/Pregenerator.java @@ -192,8 +192,7 @@ public class Pregenerator implements Listener { flushWorld(); } - while(wait.isNotEmpty()) - { + while (wait.isNotEmpty()) { J.sleep(50); } @@ -263,7 +262,7 @@ public class Pregenerator implements Listener { totalChunks.getAndAdd(1024); mcaDefer.add(new ChunkPosition(x, z)); install(mcg, mca); - } else { + } else { totalChunks.getAndAdd(1024); mcaDefer.add(new ChunkPosition(x, z)); e.complete(); @@ -277,7 +276,8 @@ public class Pregenerator implements Listener { try { Files.move(from.toPath(), to.toPath()); return true; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -285,7 +285,8 @@ public class Pregenerator implements Listener { IO.copyFile(from, to); from.delete(); return true; - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); } @@ -307,13 +308,12 @@ public class Pregenerator implements Listener { if (PaperLib.isPaper()) { method.set("PaperAsync (Slow)"); - while(wait.size() > 8192) - { + while (wait.size() > 8192) { J.sleep(25); } mcaIteration.accept(mcaox, mcaoz, (ii, jj) -> { - ChunkPosition cx = new ChunkPosition(ii,jj); + ChunkPosition cx = new ChunkPosition(ii, jj); PaperLib.getChunkAtAsync(world, ii, jj).thenAccept((c) -> { draw(ii, jj, COLOR_MCA_GENERATE_SLOW_ASYNC); draw(ii, jj, COLOR_MCA_GENERATED); @@ -321,8 +321,7 @@ public class Pregenerator implements Listener { vcax.set(ii); vcaz.set(jj); - synchronized (wait) - { + synchronized (wait) { wait.remove(cx); } }); @@ -358,7 +357,8 @@ public class Pregenerator implements Listener { try { q.pop().run(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } @@ -521,7 +521,8 @@ public class Pregenerator implements Listener { while (order.isNotEmpty()) { try { order.pop().run(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } @@ -590,7 +591,8 @@ public class Pregenerator implements Listener { if (file != null) { try { frame.setIconImage(ImageIO.read(file)); - } catch (IOException ignored) {Iris.reportError(ignored); + } catch (IOException ignored) { + Iris.reportError(ignored); } } diff --git a/src/main/java/com/volmit/iris/core/link/CitizensLink.java b/src/main/java/com/volmit/iris/core/link/CitizensLink.java deleted file mode 100644 index e912c2deb..000000000 --- a/src/main/java/com/volmit/iris/core/link/CitizensLink.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2021 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.volmit.iris.core.link; - -import org.bukkit.Bukkit; -import org.bukkit.plugin.Plugin; - -public class CitizensLink { - public CitizensLink() { - - } - - public boolean supported() { - return getCitizens() != null; - } - - public Plugin getCitizens() { - - return Bukkit.getPluginManager().getPlugin("Citizens"); - } -} diff --git a/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java b/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java index e3ac9601c..4546a4368 100644 --- a/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java +++ b/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java @@ -67,7 +67,8 @@ public class MultiverseCoreLink { Field f = mvWorldManager.getClass().getDeclaredField("worldsFromTheConfig"); f.setAccessible(true); return (Map) f.get(mvWorldManager); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } @@ -97,7 +98,8 @@ public class MultiverseCoreLink { Plugin p = getMultiverse(); Object mvWorldManager = p.getClass().getDeclaredMethod("getMVWorldManager").invoke(p); mvWorldManager.getClass().getDeclaredMethod("saveWorldsConfig").invoke(mvWorldManager); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } } @@ -110,7 +112,8 @@ public class MultiverseCoreLink { try { String t = worldNameTypes.get(worldName); return t == null ? defaultType : t; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); return defaultType; } } diff --git a/src/main/java/com/volmit/iris/core/nms/INMS.java b/src/main/java/com/volmit/iris/core/nms/INMS.java index 1a4971963..f624fa418 100644 --- a/src/main/java/com/volmit/iris/core/nms/INMS.java +++ b/src/main/java/com/volmit/iris/core/nms/INMS.java @@ -43,7 +43,8 @@ public class INMS { try { return Bukkit.getServer().getClass().getCanonicalName().split("\\Q.\\E")[3]; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.error("Failed to determine server nms version!"); e.printStackTrace(); } @@ -61,7 +62,8 @@ public class INMS { Iris.info("Craftbukkit " + code + " <-> " + b.getClass().getSimpleName() + " Successfully Bound"); return b; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java b/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java index f62459afa..3b65664cb 100644 --- a/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java +++ b/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java @@ -46,7 +46,8 @@ public class NMSBinding17_1 implements INMSBinding { private Object getBiomeStorage(ChunkGenerator.BiomeGrid g) { try { return getFieldForBiomeStorage(g).get(g); - } catch (IllegalAccessException e) {Iris.reportError(e); + } catch (IllegalAccessException e) { + Iris.reportError(e); e.printStackTrace(); } @@ -64,7 +65,8 @@ public class NMSBinding17_1 implements INMSBinding { f = storage.getClass().getDeclaredField("biome"); f.setAccessible(true); return f; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); Iris.error(storage.getClass().getCanonicalName()); } @@ -128,7 +130,8 @@ public class NMSBinding17_1 implements INMSBinding { f.setAccessible(true); //noinspection unchecked return (T) f.invoke(from, par); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } @@ -141,7 +144,8 @@ public class NMSBinding17_1 implements INMSBinding { f.setAccessible(true); //noinspection unchecked return (T) f.invoke(null, par); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } @@ -154,7 +158,8 @@ public class NMSBinding17_1 implements INMSBinding { f.setAccessible(true); //noinspection unchecked return (T) f.get(from); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } @@ -167,7 +172,8 @@ public class NMSBinding17_1 implements INMSBinding { f.setAccessible(true); //noinspection unchecked return (T) f.get(null); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } @@ -230,7 +236,8 @@ public class NMSBinding17_1 implements INMSBinding { try { BiomeStorage s = (BiomeStorage) getFieldForBiomeStorage(chunk).get(chunk); s.setBiome(x, y, z, (BiomeBase) somethingVeryDirty); - } catch (IllegalAccessException e) {Iris.reportError(e); + } catch (IllegalAccessException e) { + Iris.reportError(e); e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index dd530c6f7..434fb6a82 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -20,17 +20,17 @@ package com.volmit.iris.engine; import com.google.common.util.concurrent.AtomicDouble; import com.volmit.iris.Iris; +import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.engine.actuator.IrisTerrainActuator; -import com.volmit.iris.engine.modifier.IrisCaveModifier; -import com.volmit.iris.engine.noise.CNG; -import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.modifier.IrisCaveModifier; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.object.common.CaveResult; import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.engine.stream.interpolation.Interpolated; -import com.volmit.iris.engine.object.common.CaveResult; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 13d8085e3..9cc5766ac 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -19,12 +19,15 @@ package com.volmit.iris.engine; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.framework.*; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBiomePaletteLayer; +import com.volmit.iris.engine.object.IrisDecorator; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; -import com.volmit.iris.util.math.RNG; import lombok.Getter; import lombok.Setter; import org.bukkit.Chunk; @@ -97,28 +100,24 @@ public class IrisEngine extends BlockPopulator implements Engine { } private void computeBiomeMaxes() { - for(IrisBiome i : getDimension().getAllBiomes(this)) - { + for (IrisBiome i : getDimension().getAllBiomes(this)) { double density = 0; - for(IrisObjectPlacement j : i.getObjects()) - { + for (IrisObjectPlacement j : i.getObjects()) { density += j.getDensity() * j.getChance(); } maxBiomeObjectDensity = Math.max(maxBiomeObjectDensity, density); density = 0; - for(IrisDecorator j : i.getDecorators()) - { + for (IrisDecorator j : i.getDecorators()) { density += Math.max(j.getStackMax(), 1) * j.getChance(); } maxBiomeDecoratorDensity = Math.max(maxBiomeDecoratorDensity, density); density = 0; - for(IrisBiomePaletteLayer j : i.getLayers()) - { + for (IrisBiomePaletteLayer j : i.getLayers()) { density++; } diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java index b3aa1196d..2ba9b78ca 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java @@ -20,14 +20,14 @@ package com.volmit.iris.engine; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisDimensionIndex; -import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineCompound; import com.volmit.iris.engine.framework.EngineData; import com.volmit.iris.engine.framework.EngineTarget; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisDimensionIndex; +import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineFramework.java b/src/main/java/com/volmit/iris/engine/IrisEngineFramework.java index b0892f2ae..48e516641 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineFramework.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineFramework.java @@ -23,11 +23,11 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.engine.actuator.IrisBiomeActuator; import com.volmit.iris.engine.actuator.IrisDecorantActuator; import com.volmit.iris.engine.actuator.IrisTerrainActuator; +import com.volmit.iris.engine.framework.*; import com.volmit.iris.engine.modifier.IrisCaveModifier; import com.volmit.iris.engine.modifier.IrisDepositModifier; import com.volmit.iris.engine.modifier.IrisPostModifier; import com.volmit.iris.engine.modifier.IrisRavineModifier; -import com.volmit.iris.engine.framework.*; import com.volmit.iris.util.scheduling.ChronoLatch; import lombok.Getter; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldCreator.java b/src/main/java/com/volmit/iris/engine/IrisWorldCreator.java index 3f4ddd739..ce830b071 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldCreator.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldCreator.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.framework.EngineCompositeGenerator; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.fakenews.FakeWorld; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 55ec3f60d..861c5935c 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -20,13 +20,13 @@ package com.volmit.iris.engine; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedWorldManager; -import com.volmit.iris.util.scheduling.J; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.scheduling.J; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.event.block.BlockBreakEvent; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java index 469a025f4..cf57eecb9 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java @@ -20,15 +20,15 @@ package com.volmit.iris.engine.actuator; import com.volmit.iris.Iris; import com.volmit.iris.core.nms.INMS; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBiomeCustom; +import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.hunk.view.BiomeGridHunkView; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBiomeCustom; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.engine.data.chunk.TerrainChunk; +import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java index aa7c455c1..7ddde6c93 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -19,13 +19,13 @@ package com.volmit.iris.engine.actuator; import com.volmit.iris.engine.decorator.*; -import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.framework.EngineDecorator; import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java index b044d0810..c33edd429 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java @@ -18,13 +18,13 @@ package com.volmit.iris.engine.actuator; -import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/cache/AtomicCache.java b/src/main/java/com/volmit/iris/engine/cache/AtomicCache.java index f1b820ec4..70410eb65 100644 --- a/src/main/java/com/volmit/iris/engine/cache/AtomicCache.java +++ b/src/main/java/com/volmit/iris/engine/cache/AtomicCache.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.cache; -import com.volmit.iris.util.scheduling.IrisLock; import com.volmit.iris.util.math.M; +import com.volmit.iris.util.scheduling.IrisLock; import java.util.function.Supplier; diff --git a/src/main/java/com/volmit/iris/engine/data/B.java b/src/main/java/com/volmit/iris/engine/data/B.java index acf0a838f..14bddd451 100644 --- a/src/main/java/com/volmit/iris/engine/data/B.java +++ b/src/main/java/com/volmit/iris/engine/data/B.java @@ -76,7 +76,8 @@ public class B { Material mm = Material.valueOf(bx); materialCache.put(bx, mm); return mm; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); nullMaterialCache.add(bx); return null; } @@ -111,7 +112,8 @@ public class B { } return bdx; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.warn("Unknown Block Data '" + bdxf + "'"); } @@ -143,7 +145,8 @@ public class B { BlockData bx = Bukkit.createBlockData(ix); blockDataCache.put(ix, bx); return bx; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -154,7 +157,8 @@ public class B { try { BlockData bd = Material.valueOf(i).createBlockData(); blockDataCache.put(ix, bd); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } diff --git a/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java b/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java index 8c1f22829..9458ecf16 100644 --- a/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java +++ b/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java @@ -69,7 +69,8 @@ public class DirectWorldWriter { MCAUtil.write(writeBuffer.get(i), f, true); writeBuffer.remove(i); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } }); @@ -157,7 +158,8 @@ public class DirectWorldWriter { } return getBlockData(tag); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } return B.get("AIR"); @@ -238,14 +240,11 @@ public class DirectWorldWriter { public void verify(int mcaox, int mcaoz) { MCAFile file = getMCA(mcaox, mcaoz); - for(int i = 0; i < 32; i++) - { - for(int j = 0; j < 32; j++) - { + for (int i = 0; i < 32; i++) { + for (int j = 0; j < 32; j++) { Chunk c = file.getChunk(i, j); - if(c == null) - { + if (c == null) { Iris.warn("Chunk " + ((mcaox << 5) + i) + ", " + ((mcaoz << 5) + j) + " is null in MCA File " + mcaox + ", " + mcaoz); } } diff --git a/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java b/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java index 792c3fb4b..479ba635a 100644 --- a/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java +++ b/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java @@ -60,7 +60,8 @@ public class LinkedTerrainChunk implements TerrainChunk { private ChunkData createChunkData(int maxHeight) { try { return Bukkit.createChunkData(new HeightedFakeWorld(maxHeight)); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java b/src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java index 760224812..4b184f621 100644 --- a/src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/engine/data/loader/ResourceLoader.java @@ -126,23 +126,21 @@ public class ResourceLoader { t.setLoader(manager); lock.unlock(); return t; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); lock.unlock(); failLoad(j, e); return null; } } - public KList loadAll(KList s) - { + public KList loadAll(KList s) { KList m = new KList<>(); - for(String i : s) - { + for (String i : s) { T t = load(i); - if(t != null) - { + if (t != null) { m.add(t); } } diff --git a/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTParser.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTParser.java index f2681721b..9ecb18060 100644 --- a/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTParser.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTParser.java @@ -93,19 +93,22 @@ public final class SNBTParser implements MaxDepthIO { } else if (SHORT_LITERAL_PATTERN.matcher(s).matches()) { try { return new ShortTag(Short.parseShort(s.substring(0, s.length() - 1))); - } catch (NumberFormatException ex) {Iris.reportError(ex); + } catch (NumberFormatException ex) { + Iris.reportError(ex); throw ptr.parseException("short not in range: \"" + s.substring(0, s.length() - 1) + "\""); } } else if (LONG_LITERAL_PATTERN.matcher(s).matches()) { try { return new LongTag(Long.parseLong(s.substring(0, s.length() - 1))); - } catch (NumberFormatException ex) {Iris.reportError(ex); + } catch (NumberFormatException ex) { + Iris.reportError(ex); throw ptr.parseException("long not in range: \"" + s.substring(0, s.length() - 1) + "\""); } } else if (INT_LITERAL_PATTERN.matcher(s).matches()) { try { return new IntTag(Integer.parseInt(s)); - } catch (NumberFormatException ex) {Iris.reportError(ex); + } catch (NumberFormatException ex) { + Iris.reportError(ex); throw ptr.parseException("int not in range: \"" + s.substring(0, s.length() - 1) + "\""); } } else if (DOUBLE_LITERAL_PATTERN.matcher(s).matches()) { @@ -152,7 +155,8 @@ public final class SNBTParser implements MaxDepthIO { Tag element = parseAnything(decrementMaxDepth(maxDepth)); try { list.addUnchecked(element); - } catch (IllegalArgumentException ex) {Iris.reportError(ex); + } catch (IllegalArgumentException ex) { + Iris.reportError(ex); throw ptr.parseException(ex.getMessage()); } if (!ptr.nextArrayElement()) { @@ -187,7 +191,8 @@ public final class SNBTParser implements MaxDepthIO { if (NUMBER_PATTERN.matcher(s).matches()) { try { byteList.add(Byte.parseByte(s)); - } catch (NumberFormatException ex) {Iris.reportError(ex); + } catch (NumberFormatException ex) { + Iris.reportError(ex); throw ptr.parseException("byte not in range: \"" + s + "\""); } } else { @@ -213,7 +218,8 @@ public final class SNBTParser implements MaxDepthIO { if (NUMBER_PATTERN.matcher(s).matches()) { try { intList.add(Integer.parseInt(s)); - } catch (NumberFormatException ex) {Iris.reportError(ex); + } catch (NumberFormatException ex) { + Iris.reportError(ex); throw ptr.parseException("int not in range: \"" + s + "\""); } } else { @@ -235,7 +241,8 @@ public final class SNBTParser implements MaxDepthIO { if (NUMBER_PATTERN.matcher(s).matches()) { try { longList.add(Long.parseLong(s)); - } catch (NumberFormatException ex) {Iris.reportError(ex); + } catch (NumberFormatException ex) { + Iris.reportError(ex); throw ptr.parseException("long not in range: \"" + s + "\""); } } else { diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java index 193b5e618..1d7b762a9 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.decorator; -import com.volmit.iris.engine.object.DecorationPart; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.DecorationPart; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorator; import org.bukkit.block.data.BlockData; public class IrisCeilingDecorator extends IrisEngineDecorator { diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java index 7d65026cd..2f62bbba7 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java @@ -19,13 +19,13 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.DecorationPart; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedComponent; import com.volmit.iris.engine.framework.EngineDecorator; +import com.volmit.iris.engine.object.DecorationPart; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java index bb1dbb9c6..cd0d09c24 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.decorator; -import com.volmit.iris.engine.object.DecorationPart; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.DecorationPart; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorator; import org.bukkit.block.data.BlockData; public class IrisSeaFloorDecorator extends IrisEngineDecorator { diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java index b6c192424..950f69d66 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.decorator; -import com.volmit.iris.engine.object.DecorationPart; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.DecorationPart; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorator; import org.bukkit.block.data.BlockData; public class IrisSeaSurfaceDecorator extends IrisEngineDecorator { diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java index f82906393..0b7f4cccf 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.decorator; -import com.volmit.iris.engine.object.DecorationPart; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.DecorationPart; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorator; import org.bukkit.block.data.BlockData; public class IrisShoreLineDecorator extends IrisEngineDecorator { diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java index 88a94bf01..84675c40a 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java @@ -19,13 +19,13 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.Iris; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.object.DecorationPart; import com.volmit.iris.engine.object.InferredType; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDecorator; -import com.volmit.iris.engine.cache.Cache; -import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.block.data.Bisected; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index 0bebe3d0e..d2ad0638a 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -20,13 +20,13 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.core.gui.Renderer; import com.volmit.iris.core.gui.RenderType; -import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.object.*; +import com.volmit.iris.core.gui.Renderer; import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.parallax.ParallaxAccess; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; @@ -231,7 +231,8 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro try { InventoryHolder m = (InventoryHolder) block.getState(); addItems(false, m.getInventory(), rx, tables, slot, x, y, z, 15); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } @@ -269,7 +270,8 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro try { Arrays.parallelSort(nitems, (a, b) -> rng.nextInt()); break; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java index d615fe4b9..f62641efc 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; -import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.parallax.ParallaxAccess; import com.volmit.iris.util.math.RollingSequence; @@ -38,7 +38,8 @@ public interface EngineComponent { if (this instanceof Listener) { Iris.instance.unregisterListener((Listener) this); } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java index 350447235..dfbb3d378 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java @@ -19,20 +19,20 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.engine.IrisEngineCompound; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.nms.BiomeBaseInjector; import com.volmit.iris.core.nms.INMS; +import com.volmit.iris.engine.IrisEngineCompound; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.cache.Cache; import com.volmit.iris.engine.data.B; +import com.volmit.iris.engine.data.DirectWorldWriter; import com.volmit.iris.engine.data.chunk.TerrainChunk; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.data.DirectWorldWriter; -import com.volmit.iris.engine.IrisWorlds; -import com.volmit.iris.engine.cache.Cache; -import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.parallel.BurstExecutor; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; @@ -120,7 +120,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce new MortarSender(i, Iris.instance.getTag()).sendMessage("Dimension Hotloaded"); i.playSound(i.getLocation(), Sound.BLOCK_COPPER_PLACE, 1f, 1.25f); } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } }); @@ -142,7 +143,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce J.a(() -> hotloader.check()); getComposite().clean(); } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -163,7 +165,6 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce File iris = new File(world.getWorldFolder(), "iris"); if (iris.exists() && iris.isDirectory()) { - searching: for (File i : iris.listFiles()) { // Look for v1 location if (i.isDirectory() && i.getName().equals("dimensions")) { @@ -318,7 +319,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce populators.addAll(compound.get().getPopulators()); hotloader = new ReactiveFolder(data.getDataFolder(), (a, c, d) -> hotload()); dim.installDataPack(() -> data, Iris.instance.getDatapacksFolder()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); Iris.error("FAILED TO INITIALIZE DIMENSION FROM " + world.toString()); } @@ -326,7 +328,6 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce /** * Place strongholds in the world - * */ public void placeStrongholds(World world) { EngineData metadata = getComposite().getEngineMetadata(); @@ -362,7 +363,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce try { Object o = getBP(clazz, clazzSG, clazzBP, nmsWorld, blockPosToTest, chunkGenerator); future.complete(o); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); e.printStackTrace(); future.complete(e); } @@ -383,7 +385,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce strongholds.add(ipos); } - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); e.printStackTrace(); } } @@ -398,7 +401,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce getComposite().saveEngineMetadata(); }); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); strongholds.add(new IrisPosition(1337, 32, -1337)); metadata.setStrongholdPositions(strongholds); Iris.warn("Couldn't properly find the stronghold position for this world. Is this headless mode? Are you not using 1.16 or higher?"); @@ -917,7 +921,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce public boolean isClosed() { try { return getComposite().getEngine(0).isClosed(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); return false; } } @@ -926,7 +931,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce public EngineTarget getTarget() { try { return getComposite().getEngine(0).getTarget(); - } catch (NullPointerException e) {Iris.reportError(e); + } catch (NullPointerException e) { + Iris.reportError(e); Iris.info("Failed to get composite engine. Please re-create the world in case you notice issues"); return null; } @@ -965,7 +971,8 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce try { dim.getDimensionalComposite().forEach((m) -> IrisDataManager.loadAnyDimension(m.getDimension()).getAllAnyBiomes().forEach((i) -> v.put(i.getLoadKey(), i))); - } catch (Throwable ignored) {Iris.reportError(ignored); + } catch (Throwable ignored) { + Iris.reportError(ignored); } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java index c96f78cbe..1f251c4f3 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java @@ -19,13 +19,13 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; -import com.volmit.iris.engine.actuator.IrisTerrainActuator; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.actuator.IrisTerrainActuator; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.data.DataProvider; -import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineData.java b/src/main/java/com/volmit/iris/engine/framework/EngineData.java index 6869d7194..0228616d7 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineData.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineData.java @@ -48,7 +48,8 @@ public class EngineData { try { f.getParentFile().mkdirs(); return new Gson().fromJson(IO.readAll(f), EngineData.class); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java index 556069871..3affbaea5 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.data.B; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.IrisBiome; import org.bukkit.block.data.BlockData; public interface EngineDecorator extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java b/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java index ae30b5d4a..266520f6d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.DataProvider; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java index 2bcef219a..f8d669511 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java @@ -19,16 +19,16 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; -import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.object.*; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.jigsaw.PlannedStructure; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.object.common.IObjectPlacer; +import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.parallax.ParallaxAccess; import com.volmit.iris.engine.parallax.ParallaxChunkMeta; import com.volmit.iris.engine.parallel.BurstExecutor; @@ -184,7 +184,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { }); getEngine().getMetrics().getParallaxInsert().put(p.getMilliseconds()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.error("Failed to insert parallax at chunk " + (x >> 4) + " " + (z >> 4)); e.printStackTrace(); } @@ -214,7 +215,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { } } } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); Iris.warn("Failed to read positional features in chunk " + (i + cx) + " " + (j + cz) + "(" + e.getClass().getSimpleName() + ")"); } @@ -252,8 +254,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { burst.complete(); - if(getEngine().getDimension().isPlaceObjects()) - { + if (getEngine().getDimension().isPlaceObjects()) { burst = MultiBurst.burst.burst(bs); for (i = -s; i <= s; i++) { @@ -287,7 +288,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { getParallaxAccess().setChunkGenerated(x, z); p.end(); getEngine().getMetrics().getParallax().put(p.getMilliseconds()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.error("Failed to generate parallax in " + x + " " + z); e.printStackTrace(); } @@ -299,8 +301,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { return after; } - if(getEngine().getDimension().isPlaceObjects()) - { + if (getEngine().getDimension().isPlaceObjects()) { int xx = x << 4; int zz = z << 4; RNG rng = new RNG(Cache.key(x, z)).nextParallelRNG(getEngine().getTarget().getWorld().getSeed()); @@ -376,8 +377,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { default KList generateParallaxJigsaw(RNG rng, int x, int z, IrisBiome biome, IrisRegion region) { KList placeAfter = new KList<>(); - if(getEngine().getDimension().isPlaceObjects()) - { + if (getEngine().getDimension().isPlaceObjects()) { boolean placed = false; if (getEngine().getDimension().getStronghold() != null) { @@ -441,7 +441,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { if (rng.chance(i.getChance() + rng.d(-0.005, 0.005)) && rng.chance(getComplex().getObjectChanceStream().get(x << 4, z << 4))) { try { place(rng, x << 4, z << 4, i); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.error("Failed to place objects in the following biome: " + biome.getName()); Iris.error("Object(s) " + i.getPlace().toString(", ") + " (" + e.getClass().getSimpleName() + ")."); Iris.error("Are these objects missing?"); @@ -458,7 +459,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { if (rng.chance(i.getChance() + rng.d(-0.005, 0.005)) && rng.chance(getComplex().getObjectChanceStream().get(x << 4, z << 4))) { try { place(rng, x << 4, z << 4, i); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.error("Failed to place objects in the following biome: " + biome.getName()); Iris.error("Object(s) " + i.getPlace().toString(", ") + " (" + e.getClass().getSimpleName() + ")."); Iris.error("Are these objects missing?"); @@ -589,8 +591,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { int x = xg.get(); int z = zg.get(); - if(getEngine().getDimension().isPlaceObjects()) - { + if (getEngine().getDimension().isPlaceObjects()) { KList r = getAllRegions(); KList b = getAllBiomes(); @@ -629,7 +630,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { if (getEngine().getDimension().getStronghold() != null) { try { jig = Math.max(jig, getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()).getMaxDimension()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.error("THIS IS THE ONE"); e.printStackTrace(); } @@ -648,7 +650,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { try { return IrisObject.sampleSize(getData().getObjectLoader().findFile(i)); - } catch (IOException ex) {Iris.reportError(ex); + } catch (IOException ex) { + Iris.reportError(ex); ex.printStackTrace(); } @@ -668,7 +671,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { synchronized (zg) { zg.getAndSet(Math.max(bv.getBlockZ(), zg.get())); } - } catch (Throwable ed) {Iris.reportError(ed); + } catch (Throwable ed) { + Iris.reportError(ed); } }); @@ -686,7 +690,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { try { return IrisObject.sampleSize(getData().getObjectLoader().findFile(j)); - } catch (IOException ioException) {Iris.reportError(ioException); + } catch (IOException ioException) { + Iris.reportError(ioException); ioException.printStackTrace(); } @@ -706,7 +711,8 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { synchronized (zg) { zg.getAndSet((int) Math.max(Math.ceil(bv.getBlockZ() * ms), zg.get())); } - } catch (Throwable ee) {Iris.reportError(ee); + } catch (Throwable ee) { + Iris.reportError(ee); } }); diff --git a/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java b/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java index 51fcaf6a4..5afa34b33 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java +++ b/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java @@ -22,8 +22,8 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisEffect; import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.math.M; +import com.volmit.iris.util.scheduling.J; import lombok.Data; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -64,7 +64,8 @@ public class EnginePlayer { for (IrisEffect j : biome.getEffects()) { try { j.apply(player, getEngine()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } @@ -83,7 +84,8 @@ public class EnginePlayer { lastSample = M.ms(); sampleBiomeRegion(); } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } diff --git a/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java b/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java index 1585d7e4c..2b455093d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java +++ b/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java @@ -20,10 +20,10 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.core.gui.Renderer; +import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisObjectPlacement; import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.parallax.ParallaxAccess; public interface GeneratorAccess extends DataProvider, Renderer { diff --git a/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java index b6f0e8b7a..fe5e408c6 100644 --- a/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java +++ b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java @@ -20,10 +20,10 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.data.DirectWorldWriter; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.data.DirectWorldWriter; -import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.M; @@ -139,7 +139,8 @@ public interface IrisAccess extends Hotloadable, DataProvider { return; } } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } }); @@ -199,7 +200,8 @@ public interface IrisAccess extends Hotloadable, DataProvider { } tries.getAndIncrement(); - } catch (Throwable xe) {Iris.reportError(xe); + } catch (Throwable xe) { + Iris.reportError(xe); xe.printStackTrace(); return; } diff --git a/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java b/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java index 5cbc95f53..c9e1133f6 100644 --- a/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java +++ b/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.chunk.TerrainChunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Data; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java index f870928f5..6943ea18c 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.hunk.io; import com.volmit.iris.engine.data.IOAdapter; import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.util.oldnbt.ByteArrayTag; -import com.volmit.iris.util.io.CustomOutputStream; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.io.CustomOutputStream; +import com.volmit.iris.util.oldnbt.ByteArrayTag; import java.io.*; import java.util.zip.GZIPInputStream; diff --git a/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java index bda25045e..25e8ed350 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.hunk.io; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.parallel.BurstExecutor; import com.volmit.iris.engine.parallel.GridLock; import com.volmit.iris.engine.parallel.MultiBurst; @@ -109,7 +109,8 @@ public class HunkRegionSlice { try { lock.withNasty(i.getX(), i.getZ(), () -> save.remove(i)); - } catch (Throwable eer) {Iris.reportError(eer); + } catch (Throwable eer) { + Iris.reportError(eer); } } @@ -137,7 +138,8 @@ public class HunkRegionSlice { try { return adapter.read(factory, (ByteArrayTag) t); - } catch (IOException xe) {Iris.reportError(xe); + } catch (IOException xe) { + Iris.reportError(xe); e.set(xe); } @@ -175,7 +177,8 @@ public class HunkRegionSlice { public void save(Hunk region, int x, int z) { try { lock.withIO(x, z, () -> write(region, x, z)); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); e.printStackTrace(); } } @@ -218,7 +221,8 @@ public class HunkRegionSlice { if (contains(x, z)) { try { v = read(x, z); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java index 69521a006..5f6f4a16c 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.hunk.storage; import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.util.function.Consumer4; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.function.Consumer4; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java index d66cc5a8e..c676cba83 100644 --- a/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.hunk.view; import com.volmit.iris.core.nms.INMS; -import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.data.chunk.LinkedTerrainChunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Getter; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java index 0b652d5e7..266829c7b 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java @@ -19,12 +19,12 @@ package com.volmit.iris.engine.jigsaw; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.engine.object.*; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.object.common.IObjectPlacer; +import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.AxisAlignedBB; import com.volmit.iris.util.math.BlockPosition; diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java index 564fcbde8..b94a02374 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -20,12 +20,12 @@ package com.volmit.iris.engine.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.engine.framework.EngineParallaxManager; import com.volmit.iris.engine.framework.IrisAccess; -import com.volmit.iris.engine.parallax.ParallaxChunkMeta; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.common.IObjectPlacer; +import com.volmit.iris.engine.parallax.ParallaxChunkMeta; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/lighting/LightingCategory.java b/src/main/java/com/volmit/iris/engine/lighting/LightingCategory.java index 52db28d5e..08b3d52a7 100644 --- a/src/main/java/com/volmit/iris/engine/lighting/LightingCategory.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingCategory.java @@ -166,7 +166,6 @@ public enum LightingCategory { /** * Initializes the lighting in the chunk for this category - * */ public abstract void initialize(LightingChunk chunk); @@ -180,7 +179,6 @@ public enum LightingCategory { /** * Sets whether this category of light is dirty, indicating this category of light is all good, * or that more work is needed spreading light around. - * */ public abstract void setDirty(LightingChunk chunk, boolean dirty); @@ -195,7 +193,6 @@ public enum LightingCategory { /** * Sets the light level in a section at the coordinates specified. * No bounds checking is performed. - * */ public abstract void set(LightingCube section, int x, int y, int z, int level); } \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/engine/lighting/LightingChunk.java b/src/main/java/com/volmit/iris/engine/lighting/LightingChunk.java index dfe5e002a..55ad08d09 100644 --- a/src/main/java/com/volmit/iris/engine/lighting/LightingChunk.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingChunk.java @@ -462,7 +462,8 @@ public class LightingChunk { return Boolean.TRUE; } } - } catch (Throwable t) {Iris.reportError(t); + } catch (Throwable t) { + Iris.reportError(t); t.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/engine/lighting/LightingChunkNeighboring.java b/src/main/java/com/volmit/iris/engine/lighting/LightingChunkNeighboring.java index 8029cbdfb..37c976235 100644 --- a/src/main/java/com/volmit/iris/engine/lighting/LightingChunkNeighboring.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingChunkNeighboring.java @@ -66,7 +66,7 @@ public class LightingChunkNeighboring { /** * Gets a relative neighboring chunk, and then a vertical cube in that chunk, if possible. * - * @param cy Cube absolute y-coordinate + * @param cy Cube absolute y-coordinate * @return cube, null if the chunk or cube is not available */ public LightingCube getCube(int deltaChunkX, int deltaChunkZ, int cy) { @@ -77,7 +77,7 @@ public class LightingChunkNeighboring { /** * Sets the neighbor representing the given relative chunk * - * @param neighbor to set to + * @param neighbor to set to */ public void set(int deltaChunkX, int deltaChunkZ, LightingChunk neighbor) { values[getIndexByChunk(deltaChunkX, deltaChunkZ)] = neighbor; diff --git a/src/main/java/com/volmit/iris/engine/lighting/LightingCube.java b/src/main/java/com/volmit/iris/engine/lighting/LightingCube.java index 26502bce6..5dc25d054 100644 --- a/src/main/java/com/volmit/iris/engine/lighting/LightingCube.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingCube.java @@ -136,9 +136,9 @@ public class LightingCube { * higher light value if all these tests pass. * The x/y/z coordinates are allowed to check neighboring cubes. * - * @param x The X-coordinate of the block (-1 to 16) - * @param y The Y-coordinate of the block (-1 to 16) - * @param z The Z-coordinate of the block (-1 to 16) + * @param x The X-coordinate of the block (-1 to 16) + * @param y The Y-coordinate of the block (-1 to 16) + * @param z The Z-coordinate of the block (-1 to 16) * @return higher light level if propagated, otherwise the old light value */ public int getLightIfHigherNeighbor(LightingCategory category, int old_light, int faceMask, int x, int y, int z) { diff --git a/src/main/java/com/volmit/iris/engine/lighting/LightingCubeNeighboring.java b/src/main/java/com/volmit/iris/engine/lighting/LightingCubeNeighboring.java index e40603228..02ee0c434 100644 --- a/src/main/java/com/volmit/iris/engine/lighting/LightingCubeNeighboring.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingCubeNeighboring.java @@ -68,7 +68,7 @@ public class LightingCubeNeighboring { /** * Sets the neighbor representing the given relative cube * - * @param neighbor to set to, is allowed to be null to set to 'none' + * @param neighbor to set to, is allowed to be null to set to 'none' */ public void set(int deltaCubeX, int deltaCubeY, int deltaCubeZ, LightingCube neighbor) { values[getIndexByCube(deltaCubeX, deltaCubeY, deltaCubeZ)] = neighbor; diff --git a/src/main/java/com/volmit/iris/engine/lighting/LightingService.java b/src/main/java/com/volmit/iris/engine/lighting/LightingService.java index 0198808a3..59efbb11b 100644 --- a/src/main/java/com/volmit/iris/engine/lighting/LightingService.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingService.java @@ -412,7 +412,8 @@ public class LightingService extends AsyncTask { while (paused) { try { Thread.sleep(1000); - } catch (InterruptedException e) {Iris.reportError(e); + } catch (InterruptedException e) { + Iris.reportError(e); e.printStackTrace(); } synchronized (tasks) { @@ -468,7 +469,8 @@ public class LightingService extends AsyncTask { // Process the task try { currentTask.process(); - } catch (Throwable t) {Iris.reportError(t); + } catch (Throwable t) { + Iris.reportError(t); t.printStackTrace(); Iris.error("Failed to process task: " + currentTask.getStatus()); } diff --git a/src/main/java/com/volmit/iris/engine/lighting/LightingTaskBatch.java b/src/main/java/com/volmit/iris/engine/lighting/LightingTaskBatch.java index 5fe22b083..c95450ad9 100644 --- a/src/main/java/com/volmit/iris/engine/lighting/LightingTaskBatch.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingTaskBatch.java @@ -105,10 +105,10 @@ public class LightingTaskBatch implements LightingTask { return coords; } else //noinspection ReplaceNullCheck if (this.chunks_coords != null) { - return this.chunks_coords; - } else { - return new long[0]; - } + return this.chunks_coords; + } else { + return new long[0]; + } } } @@ -240,7 +240,8 @@ public class LightingTaskBatch implements LightingTask { return true; } catch (InterruptedException | TimeoutException e1) { Iris.reportError(e1); - } catch (ExecutionException ex) {Iris.reportError(ex); + } catch (ExecutionException ex) { + Iris.reportError(ex); ex.printStackTrace(); Iris.error("Error while processing"); return false; @@ -441,15 +442,18 @@ public class LightingTaskBatch implements LightingTask { try { future.get(200, TimeUnit.MILLISECONDS); break; - } catch (TimeoutException e) {Iris.reportError(e); + } catch (TimeoutException e) { + Iris.reportError(e); if (this.aborted) { return; } } } - } catch (InterruptedException e) {Iris.reportError(e); + } catch (InterruptedException e) { + Iris.reportError(e); // Ignore - } catch (ExecutionException e) {Iris.reportError(e); + } catch (ExecutionException e) { + Iris.reportError(e); e.printStackTrace(); Iris.error("Failed to apply lighting data for " + getShortStatus()); diff --git a/src/main/java/com/volmit/iris/engine/lighting/LightingTaskWorld.java b/src/main/java/com/volmit/iris/engine/lighting/LightingTaskWorld.java index e3ba807e1..7cfefa20b 100644 --- a/src/main/java/com/volmit/iris/engine/lighting/LightingTaskWorld.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingTaskWorld.java @@ -99,9 +99,11 @@ public class LightingTaskWorld implements LightingTask { // Wait until region list is loaded synchronously try { regionsLoadedFuture.get(); - } catch (InterruptedException ex) {Iris.reportError(ex); + } catch (InterruptedException ex) { + Iris.reportError(ex); // Ignore - } catch (ExecutionException ex) {Iris.reportError(ex); + } catch (ExecutionException ex) { + Iris.reportError(ex); throw new RuntimeException("Failed to load regions", ex.getCause()); } diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java index f799dccab..8e2cd9644 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java @@ -19,12 +19,12 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.noise.FastNoiseDouble; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisCaveLayer; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.noise.FastNoiseDouble; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisCaveLayer; import com.volmit.iris.engine.object.common.CaveResult; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java index 6fa281cb9..623678fee 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java @@ -18,16 +18,16 @@ package com.volmit.iris.engine.modifier; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedModifier; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisDepositGenerator; import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.data.HeightMap; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.block.data.BlockData; import org.bukkit.util.BlockVector; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java index bcf037ad5..2c5babee0 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -19,16 +19,16 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.common.CaveResult; import com.volmit.iris.engine.parallel.BurstExecutor; import com.volmit.iris.engine.parallel.MultiBurst; -import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Levelled; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java index a323f9d2d..25fcaa5ac 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java @@ -19,11 +19,11 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.noise.CNG; -import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.ChunkPosition; import com.volmit.iris.util.math.MathHelper; diff --git a/src/main/java/com/volmit/iris/engine/noise/CNG.java b/src/main/java/com/volmit/iris/engine/noise/CNG.java index d0178cca1..1d7c5ab41 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CNG.java +++ b/src/main/java/com/volmit/iris/engine/noise/CNG.java @@ -19,6 +19,7 @@ package com.volmit.iris.engine.noise; import com.volmit.iris.Iris; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.engine.stream.arithmetic.FittedStream; @@ -26,7 +27,6 @@ import com.volmit.iris.engine.stream.sources.CNGStream; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.NoiseInjector; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java b/src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java index cc6812ffc..c14c20db0 100644 --- a/src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java +++ b/src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java @@ -598,7 +598,7 @@ public class FastNoiseDouble { long y1 = y0 + 1; long z1 = z0 + 1; - double xs=0, ys=0, zs=0; + double xs = 0, ys = 0, zs = 0; switch (m_longerp) { case Linear -> { xs = x - x0; @@ -696,7 +696,7 @@ public class FastNoiseDouble { long x1 = x0 + 1; long y1 = y0 + 1; - double xs=0, ys=0; + double xs = 0, ys = 0; switch (m_longerp) { case Linear -> { xs = x - x0; @@ -794,7 +794,7 @@ public class FastNoiseDouble { long y1 = y0 + 1; long z1 = z0 + 1; - double xs=0, ys=0, zs=0; + double xs = 0, ys = 0, zs = 0; switch (m_longerp) { case Linear -> { xs = x - x0; @@ -1886,7 +1886,7 @@ public class FastNoiseDouble { long y1 = y0 + 1; long z1 = z0 + 1; - double xs=0, ys=0, zs=0; + double xs = 0, ys = 0, zs = 0; switch (m_longerp) { case Linear -> { xs = xf - x0; @@ -1969,7 +1969,7 @@ public class FastNoiseDouble { long x1 = x0 + 1; long y1 = y0 + 1; - double xs=0, ys=0; + double xs = 0, ys = 0; switch (m_longerp) { case Linear -> { xs = xf - x0; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java index 40c329e1d..57eb56674 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java @@ -19,15 +19,15 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.engine.IrisComplex; -import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.core.gui.RenderType; +import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; @@ -405,7 +405,8 @@ public class IrisBiome extends IrisRegistrant implements IRare { for (int j = 0; j < d; j++) { try { data.add(getLayers().get(i).get(random.nextParallelRNG(i + j), (wx + j) / layers.get(i).getZoom(), j, (wz - j) / layers.get(i).getZoom(), rdata)); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } } @@ -460,7 +461,8 @@ public class IrisBiome extends IrisRegistrant implements IRare { try { data.add(getSeaLayers().get(i).get(random.nextParallelRNG(i + j), (wx + j) / seaLayers.get(i).getZoom(), j, (wz - j) / seaLayers.get(i).getZoom(), rdata)); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } } @@ -643,8 +645,7 @@ public class IrisBiome extends IrisRegistrant implements IRare { return cacheColorObjectDensity.aquire(() -> { double density = 0; - for(IrisObjectPlacement i : getObjects()) - { + for (IrisObjectPlacement i : getObjects()) { density += i.getDensity() * i.getChance(); } @@ -655,8 +656,7 @@ public class IrisBiome extends IrisRegistrant implements IRare { return cacheColorDecoratorLoad.aquire(() -> { double density = 0; - for(IrisDecorator i : getDecorators()) - { + for (IrisDecorator i : getDecorators()) { density += i.getChance() * Math.min(1, i.getStackMax()) * 256; } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java index f233049cf..16a2776d3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java @@ -94,8 +94,7 @@ public class IrisBiomeCustom { effects.put("water_color", parseColor(getWaterColor())); effects.put("water_fog_color", parseColor(getWaterFogColor())); - if(ambientParticle != null) - { + if (ambientParticle != null) { JSONObject particle = new JSONObject(); JSONObject po = new JSONObject(); po.put("type", ambientParticle.getParticle().name().toLowerCase()); @@ -128,18 +127,15 @@ public class IrisBiomeCustom { j.put("carvers", new JSONObject()); j.put("features", new JSONArray()); - if(spawnRarity > 0) - { + if (spawnRarity > 0) { j.put("creature_spawn_probability", spawnRarity); } - if(getSpawns() != null && getSpawns().isNotEmpty()) - { + if (getSpawns() != null && getSpawns().isNotEmpty()) { JSONObject spawners = new JSONObject(); KMap groups = new KMap<>(); - for(IrisBiomeCustomSpawn i : getSpawns()) - { + for (IrisBiomeCustomSpawn i : getSpawns()) { JSONArray g = groups.compute(i.getGroup(), (k, v) -> v != null ? v : new JSONArray()); JSONObject o = new JSONObject(); o.put("type", "minecraft:" + i.getType().name().toLowerCase()); @@ -149,8 +145,7 @@ public class IrisBiomeCustom { g.put(o); } - for(IrisBiomeCustomSpawnType i : groups.k()) - { + for (IrisBiomeCustomSpawnType i : groups.k()) { spawners.put(i.name().toLowerCase(Locale.ROOT), groups.get(i)); } @@ -164,7 +159,8 @@ public class IrisBiomeCustom { String v = (c.startsWith("#") ? c : "#" + c).trim(); try { return Color.decode(v).getRGB(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.error("Error Parsing '''color''', (" + c + ")"); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java index b80b4992f..f0518d978 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java @@ -20,8 +20,8 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.DataProvider; -import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.interpolation.IrisInterpolation; +import com.volmit.iris.engine.object.annotations.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java index 0b5599b37..25dfd1dac 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java @@ -90,8 +90,7 @@ public class IrisBiomeMutation { } else if (i.startsWith("!*")) { String name = i.substring(2); - for(String g : xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)) - { + for (String g : xg.getData().getBiomeLoader().load(name).getAllChildren(xg, 7)) { r.remove(g); } } else { diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java index e49fc2760..a34813fd7 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java b/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java index e2af27814..b50e58a35 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java @@ -200,13 +200,15 @@ public class IrisBlockData extends IrisRegistrant { try { return Integer.valueOf(string); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } try { return Double.valueOf(string).intValue(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java index c4740973e..9d039bf4f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java @@ -18,15 +18,15 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.interpolation.IrisInterpolation; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.Required; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java index d2c10e6c6..52d012605 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java @@ -19,9 +19,9 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index 9e455a7c9..a829382b0 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -19,10 +19,10 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.io.IO; @@ -478,7 +478,8 @@ public class IrisDimension extends IrisRegistrant { output.getParentFile().mkdirs(); try { IO.writeAll(output, j.generateJson()); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); e.printStackTrace(); } } @@ -496,7 +497,8 @@ public class IrisDimension extends IrisRegistrant { } } """); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); e.printStackTrace(); } Iris.verbose(" Installing Data Pack MCMeta: " + mcm.getPath()); diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java index 7d55ac6e6..9bbfdca00 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java @@ -193,7 +193,8 @@ public class IrisEffect { return t; } } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java b/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java index fb16319fb..de73bbcd1 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java @@ -80,7 +80,8 @@ public class IrisEnchantment { try { return (Enchantment) i.get(null); } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace();Iris.reportError(e); + e.printStackTrace(); + Iris.reportError(e); } } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisFeature.java b/src/main/java/com/volmit/iris/engine/object/IrisFeature.java index 3dc2a209e..89f283522 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisFeature.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFeature.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.object; import com.google.gson.Gson; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java index 0a7d92c49..ac3bedbcf 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.object; import com.google.gson.Gson; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.math.M; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java index 71b255a83..ce7a2d34f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java @@ -20,8 +20,8 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.util.math.RNG; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.util.math.RNG; import lombok.Data; @Data diff --git a/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java index 51322f573..9c7f5fc63 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java @@ -19,13 +19,13 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.engine.noise.CellGenerator; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.interpolation.IrisInterpolation; +import com.volmit.iris.engine.noise.CellGenerator; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java index b1fa5ef25..36ee3473e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java index b3f1e9db3..4c1f40785 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.object; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.Required; import com.volmit.iris.util.function.NoiseProvider; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java index 0b990e057..bac937ef7 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java @@ -81,7 +81,8 @@ public class IrisJigsawPiece extends IrisRegistrant { try { BlockVector v = IrisObject.sampleSize(getLoader().getObjectLoader().findFile(getObject())); return Math.max(Math.max(v.getBlockX(), v.getBlockZ()), v.getBlockY()); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java index ac880b188..e4d69c109 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java @@ -19,9 +19,9 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.noise.CNG; -import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; @@ -190,7 +190,8 @@ public class IrisLoot { is.setItemMeta(m); return is; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -264,7 +265,8 @@ public class IrisLoot { m.setLore(lore); is.setItemMeta(m); return is; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java index 3b36d93fb..3b2b9849f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java index 754c33ac8..f73d66fea 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java @@ -18,15 +18,15 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.interpolation.IrisInterpolation; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.Required; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObject.java b/src/main/java/com/volmit/iris/engine/object/IrisObject.java index a40726e07..9832af511 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObject.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObject.java @@ -20,18 +20,18 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.B; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.common.CarveResult; import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.object.tile.TileData; -import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.math.AxisAlignedBB; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.ChunkPosition; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.util.scheduling.IrisLock; import lombok.Data; import lombok.EqualsAndHashCode; @@ -249,7 +249,8 @@ public class IrisObject extends IrisRegistrant { for (int i = 0; i < size; i++) { getStates().put(new BlockVector(din.readShort(), din.readShort(), din.readShort()), TileData.read(din)); } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } @@ -329,7 +330,8 @@ public class IrisObject extends IrisRegistrant { try { read(fin); fin.close(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); fin.close(); fin = new FileInputStream(file); readLegacy(fin); @@ -582,7 +584,8 @@ public class IrisObject extends IrisRegistrant { try { d = getBlocks().get(g); tile = getStates().get(g); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + getLoadKey() + " (cme)"); d = AIR; } @@ -675,7 +678,8 @@ public class IrisObject extends IrisRegistrant { try { d = getBlocks().get(g); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); Iris.warn("Failed to read block node " + g.getBlockX() + "," + g.getBlockY() + "," + g.getBlockZ() + " in object " + getLoadKey() + " (stilt cme)"); d = AIR; } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java index e89f5b8a4..67284be4e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java @@ -19,11 +19,11 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.engine.data.B; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java index a72e2053e..6e645fea3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java index 79891f826..966a56f1e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java @@ -83,7 +83,8 @@ public class IrisPotionEffect { return t; } } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java index ffc3df4db..47a587219 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java @@ -19,11 +19,11 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.core.gui.RenderType; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; @@ -37,7 +37,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import java.awt.Color; + +import java.awt.*; import java.util.Random; @@ -532,7 +533,7 @@ public class IrisRegion extends IrisRegistrant implements IRare { while (biomes.size() > 0) { int index = rand.nextInt(biomes.size()); - IrisBiome biome = biomes.get(index); + IrisBiome biome = biomes.get(index); if (biome.getVanillaDerivative() != null) { RandomColor.Color col = VanillaBiomeMap.getColorType(biome.getVanillaDerivative()); diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java b/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java index e0af1a8ab..d749c5b60 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CellGenerator; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.noise.CellGenerator; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java b/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java index 97f26f132..e0fe0d5c6 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.noise.CellGenerator; import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.noise.CellGenerator; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListBiome; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java b/src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java index 2c20fe966..ba1f313e1 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java @@ -33,8 +33,7 @@ public class IrisRegistrant { private transient File loadFile; - public File openInVSCode() - { + public File openInVSCode() { try { Desktop.getDesktop().open(getLoadFile()); } catch (Throwable e) { diff --git a/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java b/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java index dfe0e4e62..e74ee04fb 100644 --- a/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java @@ -21,8 +21,8 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.engine.noise.CNGFactory; import com.volmit.iris.engine.noise.NoiseType; -import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.math.RNG; @Desc("Styles of noise") diff --git a/src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java b/src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java index 846d7e074..a54a72168 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java +++ b/src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.object.common; -import com.volmit.iris.engine.object.common.CaveResult; import com.volmit.iris.util.collection.KList; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; diff --git a/src/main/java/com/volmit/iris/engine/object/common/IRare.java b/src/main/java/com/volmit/iris/engine/object/common/IRare.java index 52e6546fb..6d84daf49 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IRare.java +++ b/src/main/java/com/volmit/iris/engine/object/common/IRare.java @@ -22,6 +22,6 @@ public interface IRare { int getRarity(); static int get(Object v) { - return v instanceof IRare ? Math.max(1, ((IRare) v).getRarity()) : 1; - } + return v instanceof IRare ? Math.max(1, ((IRare) v).getRarity()) : 1; + } } diff --git a/src/main/java/com/volmit/iris/engine/object/tile/TileData.java b/src/main/java/com/volmit/iris/engine/object/tile/TileData.java index 25ae453d8..0e6b8098b 100644 --- a/src/main/java/com/volmit/iris/engine/object/tile/TileData.java +++ b/src/main/java/com/volmit/iris/engine/object/tile/TileData.java @@ -90,7 +90,8 @@ public interface TileData extends Cloneable { //noinspection unchecked toBukkit((T) t); return true; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -102,7 +103,8 @@ public interface TileData extends Cloneable { //noinspection unchecked fromBukkit((T) t); return true; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } diff --git a/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java index a6fe64847..45f939cc1 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.parallax; -import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.tile.TileData; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java index a88c7d655..89865e50d 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java @@ -19,9 +19,9 @@ package com.volmit.iris.engine.parallax; import com.google.gson.Gson; -import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.engine.hunk.io.HunkIOAdapter; import com.volmit.iris.engine.hunk.io.PaletteHunkIOAdapter; +import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.util.oldnbt.CompoundTag; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java index 180413f66..2efa35307 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java @@ -19,15 +19,15 @@ package com.volmit.iris.engine.parallax; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.hunk.io.HunkIOAdapter; import com.volmit.iris.engine.hunk.io.HunkRegion; import com.volmit.iris.engine.hunk.io.HunkRegionSlice; +import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.parallel.GridLock; +import com.volmit.iris.util.math.M; import com.volmit.iris.util.oldnbt.ByteArrayTag; import com.volmit.iris.util.oldnbt.CompoundTag; -import com.volmit.iris.util.math.M; import com.volmit.iris.util.oldnbt.Tag; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; @@ -145,7 +145,8 @@ public class ParallaxRegion extends HunkRegion { try { getCompound().getValue().put("meta", meta.writeByteArrayTag(metaAdapter, "meta")); dirtyMeta = false; - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java index 58bc28faf..f8cb0cc38 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.parallax; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.util.scheduling.J; +import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.scheduling.J; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; @@ -77,7 +77,8 @@ public class ParallaxWorld implements ParallaxAccess { public void save(ParallaxRegion region) { try { region.save(); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); e.printStackTrace(); } } @@ -222,7 +223,8 @@ public class ParallaxWorld implements ParallaxAccess { cc += i.cleanup(c); } } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } }); diff --git a/src/main/java/com/volmit/iris/engine/parallel/GridLock.java b/src/main/java/com/volmit/iris/engine/parallel/GridLock.java index 6a8885329..d7d93ebef 100644 --- a/src/main/java/com/volmit/iris/engine/parallel/GridLock.java +++ b/src/main/java/com/volmit/iris/engine/parallel/GridLock.java @@ -20,8 +20,8 @@ package com.volmit.iris.engine.parallel; import com.volmit.iris.Iris; import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.util.io.IORunnable; import com.volmit.iris.util.function.NastyRunnable; +import com.volmit.iris.util.io.IORunnable; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java b/src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java index 5c1569679..aed2042f6 100644 --- a/src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java @@ -34,6 +34,7 @@ public class MultiBurst { public MultiBurst(int tc) { this("Iris Generator", 6, tc); } + public MultiBurst(String name, int priority, int tc) { service = Executors.newFixedThreadPool(tc, r -> { tid++; diff --git a/src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java index f4b2a1400..4c0c17ca6 100644 --- a/src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java @@ -40,7 +40,8 @@ public interface ProceduralStream extends ProceduralLayer, Interpolated { try { return of(f, Interpolated.DOUBLE); } catch (IncompatibleClassChangeError e) { - Iris.warn(f.toString());Iris.reportError(e); + Iris.warn(f.toString()); + Iris.reportError(e); e.printStackTrace(); return null; } diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java index 6bc5feba4..7dc9668c0 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.stream.interpolation; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.stream.BasicStream; import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.interpolation.IrisInterpolation; public class BiHermiteStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java index a74c244bd..8ad53e0b5 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.stream.interpolation; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.stream.BasicStream; import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.interpolation.IrisInterpolation; public class BicubicStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java index 74c59f86c..7e6856fd1 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.stream.interpolation; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.stream.BasicStream; import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.interpolation.IrisInterpolation; public class BilinearStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java index fcf706e8b..5d60d1158 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.engine.object.common.CaveResult; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java index 7deeabc6a..2b509d168 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.engine.stream.interpolation; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.InterpolationMethod; import com.volmit.iris.engine.stream.BasicStream; import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.util.function.NoiseProvider; public class InterpolatingStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java index b57c67449..8777e5f26 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.stream.interpolation; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.stream.BasicStream; import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.interpolation.IrisInterpolation; public class TriHermiteStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java index 731c723f0..610fe7362 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.stream.interpolation; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.stream.BasicStream; import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.interpolation.IrisInterpolation; public class TricubicStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java index caeacf672..efbe7bb52 100644 --- a/src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.stream.interpolation; +import com.volmit.iris.engine.interpolation.IrisInterpolation; import com.volmit.iris.engine.stream.BasicStream; import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.engine.interpolation.IrisInterpolation; public class TrilinearStream extends BasicStream implements Interpolator { private final int rx; diff --git a/src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java b/src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java index 03cb9a699..be066a254 100644 --- a/src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java @@ -21,10 +21,10 @@ package com.volmit.iris.engine.stream.utility; import com.volmit.iris.Iris; import com.volmit.iris.engine.stream.BasicStream; import com.volmit.iris.engine.stream.ProceduralStream; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; +import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.RollingSequence; +import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Data; import java.util.concurrent.atomic.AtomicInteger; @@ -74,7 +74,8 @@ public class ProfiledStream extends BasicStream { T t = getTypedSource().get(x, y, z); try { metrics.put(p.getMilliseconds()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } return t; diff --git a/src/main/java/com/volmit/iris/util/board/Board.java b/src/main/java/com/volmit/iris/util/board/Board.java index 01aab86f0..52fb11e3b 100644 --- a/src/main/java/com/volmit/iris/util/board/Board.java +++ b/src/main/java/com/volmit/iris/util/board/Board.java @@ -128,8 +128,8 @@ public class Board { team.setSuffix(entry.getSuffix()); switch (boardSettings.getScoreDirection()) { - case ScoreDirection.UP -> objective.getScore(team.getName()).setScore(1 + i); - case ScoreDirection.DOWN -> objective.getScore(team.getName()).setScore(15 - i); + case UP -> objective.getScore(team.getName()).setScore(1 + i); + case DOWN -> objective.getScore(team.getName()).setScore(15 - i); } } } diff --git a/src/main/java/com/volmit/iris/util/collection/GBiset.java b/src/main/java/com/volmit/iris/util/collection/GBiset.java index 904e66b53..f2c606042 100644 --- a/src/main/java/com/volmit/iris/util/collection/GBiset.java +++ b/src/main/java/com/volmit/iris/util/collection/GBiset.java @@ -74,7 +74,6 @@ public class GBiset implements Serializable { /** * Set the second object - * */ public void setB(B b) { this.b = b; diff --git a/src/main/java/com/volmit/iris/util/data/VanillaBiomeMap.java b/src/main/java/com/volmit/iris/util/data/VanillaBiomeMap.java index e2466bcb9..540aeba57 100644 --- a/src/main/java/com/volmit/iris/util/data/VanillaBiomeMap.java +++ b/src/main/java/com/volmit/iris/util/data/VanillaBiomeMap.java @@ -19,16 +19,18 @@ package com.volmit.iris.util.data; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.inventorygui.RandomColor.Color; +import com.volmit.iris.util.inventorygui.RandomColor.Luminosity; +import com.volmit.iris.util.inventorygui.RandomColor.SaturationType; import org.bukkit.block.Biome; -import com.volmit.iris.util.inventorygui.RandomColor.*; public class VanillaBiomeMap { - private static KMap BIOME_HEX = new KMap<>(); - private static KMap BIOME_COLOR = new KMap<>(); - private static KMap BIOME_LUMINOSITY = new KMap<>(); - private static KMap BIOME_SATURATION = new KMap<>(); - private static KMap BIOME_IDs = new KMap<>(); + private static final KMap BIOME_HEX = new KMap<>(); + private static final KMap BIOME_COLOR = new KMap<>(); + private static final KMap BIOME_LUMINOSITY = new KMap<>(); + private static final KMap BIOME_SATURATION = new KMap<>(); + private static final KMap BIOME_IDs = new KMap<>(); private static void add(Biome biome, int color, short id, Color randomColor, Luminosity luminosity, SaturationType saturation) { BIOME_HEX.put(biome, color); diff --git a/src/main/java/com/volmit/iris/util/fakenews/FakeEngine.java b/src/main/java/com/volmit/iris/util/fakenews/FakeEngine.java index d5e3f9d80..b6fb97c02 100644 --- a/src/main/java/com/volmit/iris/util/fakenews/FakeEngine.java +++ b/src/main/java/com/volmit/iris/util/fakenews/FakeEngine.java @@ -18,17 +18,11 @@ package com.volmit.iris.util.fakenews; -import com.volmit.iris.engine.IrisEngineFramework; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.engine.object.*; -import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.framework.EngineCompound; -import com.volmit.iris.engine.framework.EngineEffects; -import com.volmit.iris.engine.framework.EngineFramework; -import com.volmit.iris.engine.framework.EngineMetrics; -import com.volmit.iris.engine.framework.EngineTarget; -import com.volmit.iris.engine.framework.EngineWorldManager; +import com.volmit.iris.engine.IrisEngineFramework; +import com.volmit.iris.engine.framework.*; import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.object.*; import lombok.Getter; import org.bukkit.World; import org.bukkit.block.Biome; @@ -48,12 +42,12 @@ public class FakeEngine implements Engine { private double maxBiomeDecoratorDensity; @Getter - private IrisDimension dimension; + private final IrisDimension dimension; - private EngineFramework framework; + private final EngineFramework framework; @Getter - private World world; + private final World world; public FakeEngine(IrisDimension dimension, FakeWorld world) { this.dimension = dimension; @@ -63,28 +57,24 @@ public class FakeEngine implements Engine { } private void computeBiomeMaxes() { - for(IrisBiome i : getDimension().getAllBiomes(this)) - { + for (IrisBiome i : getDimension().getAllBiomes(this)) { double density = 0; - for(IrisObjectPlacement j : i.getObjects()) - { + for (IrisObjectPlacement j : i.getObjects()) { density += j.getDensity() * j.getChance(); } maxBiomeObjectDensity = Math.max(maxBiomeObjectDensity, density); density = 0; - for(IrisDecorator j : i.getDecorators()) - { + for (IrisDecorator j : i.getDecorators()) { density += Math.max(j.getStackMax(), 1) * j.getChance(); } maxBiomeDecoratorDensity = Math.max(maxBiomeDecoratorDensity, density); density = 0; - for(IrisBiomePaletteLayer j : i.getLayers()) - { + for (IrisBiomePaletteLayer j : i.getLayers()) { density++; } @@ -93,7 +83,8 @@ public class FakeEngine implements Engine { } @Override - public void close() { } + public void close() { + } @Override public boolean isClosed() { @@ -111,7 +102,8 @@ public class FakeEngine implements Engine { } @Override - public void setParallelism(int parallelism) { } + public void setParallelism(int parallelism) { + } @Override public int getParallelism() { @@ -129,10 +121,12 @@ public class FakeEngine implements Engine { } @Override - public void setMinHeight(int min) { } + public void setMinHeight(int min) { + } @Override - public void recycle() { } + public void recycle() { + } @Override public int getIndex() { @@ -160,7 +154,8 @@ public class FakeEngine implements Engine { } @Override - public void generate(int x, int z, Hunk blocks, Hunk biomes) { } + public void generate(int x, int z, Hunk blocks, Hunk biomes) { + } @Override public EngineMetrics getMetrics() { @@ -183,7 +178,8 @@ public class FakeEngine implements Engine { } @Override - public void fail(String error, Throwable e) { } + public void fail(String error, Throwable e) { + } @Override public boolean hasFailed() { @@ -196,5 +192,6 @@ public class FakeEngine implements Engine { } @Override - public void hotload() { } + public void hotload() { + } } diff --git a/src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java b/src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java index a3403c53e..a86b67185 100644 --- a/src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java +++ b/src/main/java/com/volmit/iris/util/fakenews/FakeWorld.java @@ -19,7 +19,6 @@ package com.volmit.iris.util.fakenews; import lombok.Setter; -import org.bukkit.HeightMap; import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.Block; diff --git a/src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java b/src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java index a91786e06..8176f0cb9 100644 --- a/src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java +++ b/src/main/java/com/volmit/iris/util/fakenews/HeightedFakeWorld.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.fakenews; -import org.bukkit.HeightMap; import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.Block; diff --git a/src/main/java/com/volmit/iris/util/format/C.java b/src/main/java/com/volmit/iris/util/format/C.java index dd1e06f4c..6cc96512b 100644 --- a/src/main/java/com/volmit/iris/util/format/C.java +++ b/src/main/java/com/volmit/iris/util/format/C.java @@ -335,7 +335,6 @@ public enum C { /** * get the dye color for the chatcolor - * */ public DyeColor dye() { return chatToDye(chatColor()); @@ -392,7 +391,8 @@ public enum C { Validate.isTrue(code.length() > 0, "Code must have at least one char"); return BY_CHAR.get(code.charAt(0)); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return C.WHITE; } } @@ -510,7 +510,6 @@ public enum C { /** * Get the ChatColor enum instance instead of C - * */ public ChatColor chatColor() { return ChatColor.getByChar(code); @@ -553,41 +552,41 @@ public enum C { public byte getMeta() { return switch (this) { - case AQUA -> (byte)11; - case BLACK -> (byte)0; - case BLUE, DARK_AQUA -> (byte)9; - case BOLD, UNDERLINE, STRIKETHROUGH, RESET, MAGIC, ITALIC -> (byte)-1; - case DARK_BLUE -> (byte)1; - case DARK_GRAY -> (byte)8; - case DARK_GREEN -> (byte)2; - case DARK_PURPLE -> (byte)5; - case DARK_RED -> (byte)4; - case GOLD -> (byte)6; - case GRAY -> (byte)7; - case GREEN -> (byte)10; - case LIGHT_PURPLE -> (byte)13; - case RED -> (byte)12; - case WHITE -> (byte)15; - case YELLOW -> (byte)14; + case AQUA -> (byte) 11; + case BLACK -> (byte) 0; + case BLUE, DARK_AQUA -> (byte) 9; + case BOLD, UNDERLINE, STRIKETHROUGH, RESET, MAGIC, ITALIC -> (byte) -1; + case DARK_BLUE -> (byte) 1; + case DARK_GRAY -> (byte) 8; + case DARK_GREEN -> (byte) 2; + case DARK_PURPLE -> (byte) 5; + case DARK_RED -> (byte) 4; + case GOLD -> (byte) 6; + case GRAY -> (byte) 7; + case GREEN -> (byte) 10; + case LIGHT_PURPLE -> (byte) 13; + case RED -> (byte) 12; + case WHITE -> (byte) 15; + case YELLOW -> (byte) 14; }; } public byte getItemMeta() { return switch (this) { - case AQUA, DARK_AQUA -> (byte)9; - case BLACK -> (byte)15; - case BLUE -> (byte)3; - case BOLD, UNDERLINE, RESET, STRIKETHROUGH, MAGIC, ITALIC -> (byte)-1; - case DARK_BLUE -> (byte)11; - case DARK_GRAY -> (byte)7; - case DARK_GREEN -> (byte)13; - case DARK_PURPLE -> (byte)10; - case DARK_RED, RED -> (byte)14; - case GOLD, YELLOW -> (byte)4; - case GRAY -> (byte)8; - case GREEN -> (byte)5; - case LIGHT_PURPLE -> (byte)2; - case WHITE -> (byte)0; + case AQUA, DARK_AQUA -> (byte) 9; + case BLACK -> (byte) 15; + case BLUE -> (byte) 3; + case BOLD, UNDERLINE, RESET, STRIKETHROUGH, MAGIC, ITALIC -> (byte) -1; + case DARK_BLUE -> (byte) 11; + case DARK_GRAY -> (byte) 7; + case DARK_GREEN -> (byte) 13; + case DARK_PURPLE -> (byte) 10; + case DARK_RED, RED -> (byte) 14; + case GOLD, YELLOW -> (byte) 4; + case GRAY -> (byte) 8; + case GREEN -> (byte) 5; + case LIGHT_PURPLE -> (byte) 2; + case WHITE -> (byte) 0; }; } diff --git a/src/main/java/com/volmit/iris/util/format/Form.java b/src/main/java/com/volmit/iris/util/format/Form.java index 1bf71be8b..fc043ced5 100644 --- a/src/main/java/com/volmit/iris/util/format/Form.java +++ b/src/main/java/com/volmit/iris/util/format/Form.java @@ -225,7 +225,7 @@ public class Form { /** * Returns a fancy duration up to Years * - * @param duration the duration in ms + * @param duration the duration in ms * @return the fancy duration */ public static String duration(RollingSequence rollingSequence, long duration) { @@ -1047,7 +1047,7 @@ public class Form { /** * nanoseconds to seconds (double) custom decimals * - * @param p number of decimal points + * @param p number of decimal points * @return a formatted string to nanoseconds */ public static String nsMs(long ns, int p) { @@ -1057,7 +1057,7 @@ public class Form { /** * nanoseconds to seconds (double) custom decimals * - * @param p number of decimal points + * @param p number of decimal points * @return a formatted string to nanoseconds */ public static String nsMsd(long ns, int p) { diff --git a/src/main/java/com/volmit/iris/util/function/Consumer7.java b/src/main/java/com/volmit/iris/util/function/Consumer7.java deleted file mode 100644 index 5071142af..000000000 --- a/src/main/java/com/volmit/iris/util/function/Consumer7.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2021 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.volmit.iris.util.function; - -@FunctionalInterface -public interface Consumer7 { - void accept(A a, B b, C c, D d, E e, F f, G g); -} diff --git a/src/main/java/com/volmit/iris/util/inventorygui/Element.java b/src/main/java/com/volmit/iris/util/inventorygui/Element.java index 52cb0afe5..bf1d23d08 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/Element.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/Element.java @@ -18,9 +18,9 @@ package com.volmit.iris.util.inventorygui; -import com.volmit.iris.util.scheduling.Callback; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.MaterialBlock; +import com.volmit.iris.util.scheduling.Callback; import org.bukkit.inventory.ItemStack; @SuppressWarnings("ALL") diff --git a/src/main/java/com/volmit/iris/util/inventorygui/RandomColor.java b/src/main/java/com/volmit/iris/util/inventorygui/RandomColor.java index 25984d367..b25d4c1e6 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/RandomColor.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/RandomColor.java @@ -95,13 +95,13 @@ public class RandomColor { } } - private Random random; + private final Random random; - public static enum SaturationType { + public enum SaturationType { RANDOM, MONOCHROME, HIGH, LOW, MEDIUM } - public static enum Luminosity { + public enum Luminosity { BRIGHT, LIGHT, DARK, RANDOM } @@ -135,14 +135,14 @@ public class RandomColor { } } - private HashMap colors = new HashMap<>(); + private final HashMap colors = new HashMap<>(); public RandomColor() { loadColorBounds(); random = new Random(); } - public RandomColor(long seed){ + public RandomColor(long seed) { loadColorBounds(); random = new Random(); random.setSeed(seed); @@ -154,7 +154,7 @@ public class RandomColor { } private int getColor(int hue, int saturation, int brightness) { - return java.awt.Color.getHSBColor((float)(hue + hueOffset % 360) / 360, (float)saturation / 100, (float)brightness / 100).getRGB(); + return java.awt.Color.getHSBColor((float) (hue + hueOffset % 360) / 360, (float) saturation / 100, (float) brightness / 100).getRGB(); } public int randomColor() { @@ -280,7 +280,7 @@ public class RandomColor { return 0; } - Range saturationRange = colorInfo.getSaturationRange(); + Range saturationRange = colorInfo.getSaturationRange(); int min = saturationRange.start; int max = saturationRange.end; @@ -358,10 +358,10 @@ public class RandomColor { if (saturation >= s1 && saturation <= s2) { - float m = (v2 - v1)/(float) (s2 - s1), - b = v1 - m*s1; + float m = (v2 - v1) / (float) (s2 - s1), + b = v1 - m * s1; - return (int) (m*saturation + b); + return (int) (m * saturation + b); } } @@ -372,10 +372,10 @@ public class RandomColor { private ColorInfo getColorInfo(int hue) { // Maps red colors to make picking hue easier if (hue >= 334 && hue <= 360) { - hue-= 360; + hue -= 360; } - for(String key : colors.keySet()) { + for (String key : colors.keySet()) { ColorInfo colorInfo = colors.get(key); if (colorInfo.getHueRange() != null && colorInfo.getHueRange().contain(hue)) { return colorInfo; @@ -385,8 +385,8 @@ public class RandomColor { return null; } - private int randomWithin (Range range) { - return (int) Math.floor(range.start + random.nextDouble()*(range.end + 1 - range.start)); + private int randomWithin(Range range) { + return (int) Math.floor(range.start + random.nextDouble() * (range.end + 1 - range.start)); } public void defineColor(String name, Range hueRange, List lowerBounds) { @@ -466,7 +466,7 @@ public class RandomColor { defineColor( Color.GREEN.name(), - new Range(63,178), + new Range(63, 178), lowerBounds5 ); @@ -520,7 +520,7 @@ public class RandomColor { ); } - public static enum Color { + public enum Color { MONOCHROME, RED, ORANGE, YELLOW, GREEN, BLUE, PURPLE, PINK } diff --git a/src/main/java/com/volmit/iris/util/inventorygui/UIElement.java b/src/main/java/com/volmit/iris/util/inventorygui/UIElement.java index 33326cd90..339a5554a 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/UIElement.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/UIElement.java @@ -19,9 +19,9 @@ package com.volmit.iris.util.inventorygui; import com.volmit.iris.Iris; -import com.volmit.iris.util.scheduling.Callback; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.MaterialBlock; +import com.volmit.iris.util.scheduling.Callback; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; @@ -166,7 +166,8 @@ public class UIElement implements Element { } catch (NullPointerException e) { Iris.reportError(e); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } @@ -216,7 +217,8 @@ public class UIElement implements Element { is.setItemMeta(im); return is; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java b/src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java index 5fe90731c..ad76278e9 100644 --- a/src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java +++ b/src/main/java/com/volmit/iris/util/inventorygui/UIWindow.java @@ -19,10 +19,10 @@ package com.volmit.iris.util.inventorygui; import com.volmit.iris.Iris; -import com.volmit.iris.util.scheduling.Callback; -import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; +import com.volmit.iris.util.scheduling.Callback; +import com.volmit.iris.util.scheduling.J; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/volmit/iris/util/io/IO.java b/src/main/java/com/volmit/iris/util/io/IO.java index a4544e8fe..2f43b3660 100644 --- a/src/main/java/com/volmit/iris/util/io/IO.java +++ b/src/main/java/com/volmit/iris/util/io/IO.java @@ -111,7 +111,8 @@ public class IO { fullTransfer(din, new VoidOutputStream(), 8192); din.close(); return bytesToHex(din.getMessageDigest().digest()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } @@ -133,8 +134,8 @@ public class IO { * Transfers the length of the buffer amount of data from the input stream to * the output stream * - * @param in the input - * @param out the output + * @param in the input + * @param out the output * @return the actual transfered amount * @throws IOException shit happens */ @@ -307,7 +308,8 @@ public class IO { v.accept(in); } } - } catch (Exception ex) {Iris.reportError(ex); + } catch (Exception ex) { + Iris.reportError(ex); x = ex.getCause(); } finally { file.close(); @@ -329,7 +331,8 @@ public class IO { FileReader fr; try { fr = new FileReader(f); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); throw e; } BufferedReader bu = new BufferedReader(fr); @@ -484,7 +487,8 @@ public class IO { if (input != null) { input.close(); } - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); // ignore } } @@ -502,7 +506,8 @@ public class IO { if (output != null) { output.close(); } - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); // ignore } } @@ -520,7 +525,8 @@ public class IO { if (input != null) { input.close(); } - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); // ignore } } @@ -538,7 +544,8 @@ public class IO { if (output != null) { output.close(); } - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); // ignore } } diff --git a/src/main/java/com/volmit/iris/util/json/HTTPTokener.java b/src/main/java/com/volmit/iris/util/json/HTTPTokener.java index 77e17074d..8f140893b 100644 --- a/src/main/java/com/volmit/iris/util/json/HTTPTokener.java +++ b/src/main/java/com/volmit/iris/util/json/HTTPTokener.java @@ -19,9 +19,6 @@ package com.volmit.iris.util.json; -import com.volmit.iris.util.json.JSONException; -import com.volmit.iris.util.json.JSONTokener; - /** * The HTTPTokener extends the JSONTokener to provide additional methods for the * parsing of HTTP headers. diff --git a/src/main/java/com/volmit/iris/util/json/JSONArray.java b/src/main/java/com/volmit/iris/util/json/JSONArray.java index 3ab5a1f8b..9fff59f9f 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONArray.java +++ b/src/main/java/com/volmit/iris/util/json/JSONArray.java @@ -261,7 +261,8 @@ public class JSONArray implements Iterable { Object object = this.get(index); try { return new BigDecimal(object.toString()); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONArray[" + index + "] could not convert to BigDecimal."); } } @@ -278,7 +279,8 @@ public class JSONArray implements Iterable { Object object = this.get(index); try { return new BigInteger(object.toString()); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONArray[" + index + "] could not convert to BigInteger."); } } @@ -294,7 +296,8 @@ public class JSONArray implements Iterable { Object object = this.get(index); try { return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONArray[" + index + "] is not a number."); } } @@ -343,7 +346,8 @@ public class JSONArray implements Iterable { Object object = this.get(index); try { return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONArray[" + index + "] is not a number."); } } @@ -438,7 +442,8 @@ public class JSONArray implements Iterable { public boolean optBoolean(int index, boolean defaultValue) { try { return this.getBoolean(index); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -467,7 +472,8 @@ public class JSONArray implements Iterable { public double optDouble(int index, double defaultValue) { try { return this.getDouble(index); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -496,7 +502,8 @@ public class JSONArray implements Iterable { public int optInt(int index, int defaultValue) { try { return this.getInt(index); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -534,9 +541,11 @@ public class JSONArray implements Iterable { return myE; } return Enum.valueOf(clazz, val.toString()); - } catch (IllegalArgumentException e) {Iris.reportError(e); + } catch (IllegalArgumentException e) { + Iris.reportError(e); return defaultValue; - } catch (NullPointerException e) {Iris.reportError(e); + } catch (NullPointerException e) { + Iris.reportError(e); return defaultValue; } } @@ -553,7 +562,8 @@ public class JSONArray implements Iterable { public BigInteger optBigInteger(int index, BigInteger defaultValue) { try { return this.getBigInteger(index); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -570,7 +580,8 @@ public class JSONArray implements Iterable { public BigDecimal optBigDecimal(int index, BigDecimal defaultValue) { try { return this.getBigDecimal(index); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -624,7 +635,8 @@ public class JSONArray implements Iterable { public long optLong(int index, long defaultValue) { try { return this.getLong(index); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -937,7 +949,8 @@ public class JSONArray implements Iterable { public String toString() { try { return this.toString(0); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return null; } } diff --git a/src/main/java/com/volmit/iris/util/json/JSONObject.java b/src/main/java/com/volmit/iris/util/json/JSONObject.java index 1b5dd1b48..9d4501245 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONObject.java +++ b/src/main/java/com/volmit/iris/util/json/JSONObject.java @@ -283,7 +283,8 @@ public class JSONObject { String name = names[i]; try { this.putOpt(name, c.getField(name).get(object)); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); } } } @@ -491,7 +492,8 @@ public class JSONObject { Object object = this.get(key); try { return new BigInteger(object.toString()); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONObject[" + quote(key) + "] could not be converted to BigInteger."); } } @@ -508,7 +510,8 @@ public class JSONObject { Object object = this.get(key); try { return new BigDecimal(object.toString()); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONObject[" + quote(key) + "] could not be converted to BigDecimal."); } } @@ -525,7 +528,8 @@ public class JSONObject { Object object = this.get(key); try { return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONObject[" + quote(key) + "] is not a number."); } } @@ -542,7 +546,8 @@ public class JSONObject { Object object = this.get(key); try { return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONObject[" + quote(key) + "] is not an int."); } } @@ -589,7 +594,8 @@ public class JSONObject { Object object = this.get(key); try { return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException("JSONObject[" + quote(key) + "] is not a long."); } } @@ -818,9 +824,11 @@ public class JSONObject { return myE; } return Enum.valueOf(clazz, val.toString()); - } catch (IllegalArgumentException e) {Iris.reportError(e); + } catch (IllegalArgumentException e) { + Iris.reportError(e); return defaultValue; - } catch (NullPointerException e) {Iris.reportError(e); + } catch (NullPointerException e) { + Iris.reportError(e); return defaultValue; } } @@ -848,7 +856,8 @@ public class JSONObject { public boolean optBoolean(String key, boolean defaultValue) { try { return this.getBoolean(key); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -877,7 +886,8 @@ public class JSONObject { public BigInteger optBigInteger(String key, BigInteger defaultValue) { try { return this.getBigInteger(key); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -894,7 +904,8 @@ public class JSONObject { public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) { try { return this.getBigDecimal(key); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -911,7 +922,8 @@ public class JSONObject { public double optDouble(String key, double defaultValue) { try { return this.getDouble(key); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -940,7 +952,8 @@ public class JSONObject { public int optInt(String key, int defaultValue) { try { return this.getInt(key); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -993,7 +1006,8 @@ public class JSONObject { public long optLong(String key, long defaultValue) { try { return this.getLong(key); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return defaultValue; } } @@ -1059,7 +1073,8 @@ public class JSONObject { } } } - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); } } } @@ -1220,7 +1235,8 @@ public class JSONObject { synchronized (sw.getBuffer()) { try { return quote(string, sw).toString(); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); // will never happen - we are writing to a string writer return ""; } @@ -1331,7 +1347,8 @@ public class JSONObject { } } return true; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); return false; } } @@ -1381,7 +1398,8 @@ public class JSONObject { } } } - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); } } return string; @@ -1442,7 +1460,8 @@ public class JSONObject { public String toString() { try { return this.toString(0); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return null; } } @@ -1496,7 +1515,8 @@ public class JSONObject { Object object; try { object = ((JSONString) value).toJSONString(); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException(e); } if (object instanceof String) { @@ -1565,7 +1585,8 @@ public class JSONObject { return object.toString(); } return new JSONObject(object); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); return null; } } @@ -1608,7 +1629,8 @@ public class JSONObject { Object o; try { o = ((JSONString) value).toJSONString(); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); throw new JSONException(e); } writer.write(o != null ? o.toString() : quote(value.toString())); @@ -1674,7 +1696,8 @@ public class JSONObject { } writer.write('}'); return writer; - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); throw new JSONException(e); } } diff --git a/src/main/java/com/volmit/iris/util/json/JSONTokener.java b/src/main/java/com/volmit/iris/util/json/JSONTokener.java index 08549e1cf..52dac1efb 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONTokener.java +++ b/src/main/java/com/volmit/iris/util/json/JSONTokener.java @@ -398,7 +398,8 @@ public class JSONTokener { return c; } } while (c != to); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); throw new JSONException(e); } this.back(); diff --git a/src/main/java/com/volmit/iris/util/json/JSONWriter.java b/src/main/java/com/volmit/iris/util/json/JSONWriter.java index 39d454ba9..e359c3854 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONWriter.java +++ b/src/main/java/com/volmit/iris/util/json/JSONWriter.java @@ -163,7 +163,8 @@ public class JSONWriter { this.pop(mode); try { this.writer.write(c); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); throw new JSONException(e); } this.comma = true; @@ -216,7 +217,8 @@ public class JSONWriter { this.comma = false; this.mode = 'o'; return this; - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); throw new JSONException(e); } } diff --git a/src/main/java/com/volmit/iris/util/json/XML.java b/src/main/java/com/volmit/iris/util/json/XML.java index 4202a8d63..8b4b057cc 100644 --- a/src/main/java/com/volmit/iris/util/json/XML.java +++ b/src/main/java/com/volmit/iris/util/json/XML.java @@ -330,7 +330,8 @@ public class XML { if (value.toString().equals(string)) { return value; } - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); } } return string; diff --git a/src/main/java/com/volmit/iris/util/math/AlignedPoint.java b/src/main/java/com/volmit/iris/util/math/AlignedPoint.java index 3862e1aba..e8135b1ef 100644 --- a/src/main/java/com/volmit/iris/util/math/AlignedPoint.java +++ b/src/main/java/com/volmit/iris/util/math/AlignedPoint.java @@ -23,34 +23,16 @@ public class AlignedPoint { private double y; private double z; - public AlignedPoint(double x, double y, double z) { - this.x = x; - this.y = y; - this.z = z; - } - public double getX() { return x; } - public void setX(double x) { - this.x = x; - } - public double getY() { return y; } - public void setY(double y) { - this.y = y; - } - public double getZ() { return z; } - public void setZ(double z) { - this.z = z; - } - } \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/util/math/Direction.java b/src/main/java/com/volmit/iris/util/math/Direction.java index 2368501d7..7565c7733 100644 --- a/src/main/java/com/volmit/iris/util/math/Direction.java +++ b/src/main/java/com/volmit/iris/util/math/Direction.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.math; -import com.volmit.iris.util.data.Cuboid.CuboidDirection; import com.volmit.iris.util.collection.GBiset; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.data.Cuboid.CuboidDirection; import org.bukkit.Axis; import org.bukkit.block.BlockFace; import org.bukkit.util.Vector; diff --git a/src/main/java/com/volmit/iris/util/math/IrisMathHelper.java b/src/main/java/com/volmit/iris/util/math/IrisMathHelper.java index 0944313bd..1b7b7c426 100644 --- a/src/main/java/com/volmit/iris/util/math/IrisMathHelper.java +++ b/src/main/java/com/volmit/iris/util/math/IrisMathHelper.java @@ -251,7 +251,7 @@ public class IrisMathHelper { } public static long c(final int var0, final int var1, final int var2) { - long var3 = (long) (var0 * 3129871L) ^ var2 * 116129781L ^ (long) var1; + long var3 = (var0 * 3129871L) ^ var2 * 116129781L ^ (long) var1; var3 = var3 * var3 * 42317861L + var3 * 11L; return var3 >> 16; } diff --git a/src/main/java/com/volmit/iris/util/math/M.java b/src/main/java/com/volmit/iris/util/math/M.java index 5b2add262..093d39ff5 100644 --- a/src/main/java/com/volmit/iris/util/math/M.java +++ b/src/main/java/com/volmit/iris/util/math/M.java @@ -86,10 +86,10 @@ public class M { /** * Bilinear interpolation * - * @param a the first point (0, 0) - * @param b the second point (1, 0) - * @param c the third point (0, 1) - * @param d the fourth point (1, 1) + * @param a the first point (0, 0) + * @param b the second point (1, 0) + * @param c the third point (0, 1) + * @param d the fourth point (1, 1) * @return the bilerped value */ public static double bilerp(double a, double b, double c, double d, double x, double y) { diff --git a/src/main/java/com/volmit/iris/util/math/Tuple2d.java b/src/main/java/com/volmit/iris/util/math/Tuple2d.java index 0bd95a412..403df9b0c 100644 --- a/src/main/java/com/volmit/iris/util/math/Tuple2d.java +++ b/src/main/java/com/volmit/iris/util/math/Tuple2d.java @@ -508,7 +508,8 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { // Since there are no arrays we can just use Object.clone() try { return super.clone(); - } catch (CloneNotSupportedException e) {Iris.reportError(e); + } catch (CloneNotSupportedException e) { + Iris.reportError(e); // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/src/main/java/com/volmit/iris/util/math/Tuple2f.java b/src/main/java/com/volmit/iris/util/math/Tuple2f.java index 564ac33af..243fbc8c7 100644 --- a/src/main/java/com/volmit/iris/util/math/Tuple2f.java +++ b/src/main/java/com/volmit/iris/util/math/Tuple2f.java @@ -512,7 +512,8 @@ public abstract class Tuple2f implements java.io.Serializable, Cloneable { // Since there are no arrays we can just use Object.clone() try { return super.clone(); - } catch (CloneNotSupportedException e) {Iris.reportError(e); + } catch (CloneNotSupportedException e) { + Iris.reportError(e); // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/src/main/java/com/volmit/iris/util/math/Tuple3f.java b/src/main/java/com/volmit/iris/util/math/Tuple3f.java index 0a784bc59..59d8bb60f 100644 --- a/src/main/java/com/volmit/iris/util/math/Tuple3f.java +++ b/src/main/java/com/volmit/iris/util/math/Tuple3f.java @@ -582,7 +582,8 @@ public abstract class Tuple3f implements java.io.Serializable, Cloneable { // Since there are no arrays we can just use Object.clone() try { return super.clone(); - } catch (CloneNotSupportedException e) {Iris.reportError(e); + } catch (CloneNotSupportedException e) { + Iris.reportError(e); // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/src/main/java/com/volmit/iris/util/math/Tuple4d.java b/src/main/java/com/volmit/iris/util/math/Tuple4d.java index 75b4509f6..437f85689 100644 --- a/src/main/java/com/volmit/iris/util/math/Tuple4d.java +++ b/src/main/java/com/volmit/iris/util/math/Tuple4d.java @@ -713,7 +713,8 @@ public abstract class Tuple4d implements java.io.Serializable, Cloneable { // Since there are no arrays we can just use Object.clone() try { return super.clone(); - } catch (CloneNotSupportedException e) {Iris.reportError(e); + } catch (CloneNotSupportedException e) { + Iris.reportError(e); // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/src/main/java/com/volmit/iris/util/math/Tuple4f.java b/src/main/java/com/volmit/iris/util/math/Tuple4f.java index b89f5d560..4675cfd89 100644 --- a/src/main/java/com/volmit/iris/util/math/Tuple4f.java +++ b/src/main/java/com/volmit/iris/util/math/Tuple4f.java @@ -637,7 +637,8 @@ public abstract class Tuple4f implements java.io.Serializable, Cloneable { // Since there are no arrays we can just use Object.clone() try { return super.clone(); - } catch (CloneNotSupportedException e) {Iris.reportError(e); + } catch (CloneNotSupportedException e) { + Iris.reportError(e); // this shouldn't happen, since we are Cloneable throw new InternalError(); } diff --git a/src/main/java/com/volmit/iris/util/math/VectorMath.java b/src/main/java/com/volmit/iris/util/math/VectorMath.java index 84c27836f..072035d45 100644 --- a/src/main/java/com/volmit/iris/util/math/VectorMath.java +++ b/src/main/java/com/volmit/iris/util/math/VectorMath.java @@ -18,9 +18,9 @@ package com.volmit.iris.util.math; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.collection.GListAdapter; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.format.Form; import org.bukkit.Axis; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/util/particle/ParticleSenderLegacy.java b/src/main/java/com/volmit/iris/util/particle/ParticleSenderLegacy.java index d7eec3c84..de2f0939d 100644 --- a/src/main/java/com/volmit/iris/util/particle/ParticleSenderLegacy.java +++ b/src/main/java/com/volmit/iris/util/particle/ParticleSenderLegacy.java @@ -148,7 +148,8 @@ class ParticleSenderLegacy implements ParticleSender { try { return getEnumParticle(particle); - } catch (IllegalArgumentException e) {Iris.reportError(e); + } catch (IllegalArgumentException e) { + Iris.reportError(e); return null; } } diff --git a/src/main/java/com/volmit/iris/util/plugin/IActivator.java b/src/main/java/com/volmit/iris/util/plugin/IActivator.java deleted file mode 100644 index 6f8a8ac42..000000000 --- a/src/main/java/com/volmit/iris/util/plugin/IActivator.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2021 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.volmit.iris.util.plugin; - -public interface IActivator { - -} diff --git a/src/main/java/com/volmit/iris/util/plugin/Metrics.java b/src/main/java/com/volmit/iris/util/plugin/Metrics.java index 915f96a87..09ad5b2ea 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Metrics.java +++ b/src/main/java/com/volmit/iris/util/plugin/Metrics.java @@ -156,7 +156,8 @@ public class Metrics { service.getField("B_STATS_VERSION"); // Our identifier :) found = true; // We aren't the first break; - } catch (NoSuchFieldException e) {Iris.reportError(e); + } catch (NoSuchFieldException e) { + Iris.reportError(e); } } // Register our service @@ -255,7 +256,8 @@ public class Metrics { playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class) ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size() : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length; - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed } int onlineMode = Bukkit.getOnlineMode() ? 1 : 0; @@ -314,7 +316,8 @@ public class Metrics { JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject(); pluginData.add(object); } - } catch (ClassNotFoundException e) {Iris.reportError(e); + } catch (ClassNotFoundException e) { + Iris.reportError(e); // minecraft version 1.14+ if (logFailedRequests) { @@ -326,7 +329,8 @@ public class Metrics { Iris.reportError(ignored); } } - } catch (NoSuchFieldException e) {Iris.reportError(e); + } catch (NoSuchFieldException e) { + Iris.reportError(e); } } @@ -337,7 +341,8 @@ public class Metrics { try { // Send the data sendData(plugin, data); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); // Something went wrong! :( if (logFailedRequests) { plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e); @@ -444,7 +449,8 @@ public class Metrics { return null; } chart.add("data", data); - } catch (Throwable t) {Iris.reportError(t); + } catch (Throwable t) { + Iris.reportError(t); if (logFailedRequests) { Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t); } diff --git a/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java b/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java index 0d8fd9d2c..72dcb11bf 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java +++ b/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java @@ -152,7 +152,8 @@ public class MetricsLite { service.getField("B_STATS_VERSION"); // Our identifier :) found = true; // We aren't the first break; - } catch (NoSuchFieldException e) {Iris.reportError(e); + } catch (NoSuchFieldException e) { + Iris.reportError(e); } } // Register our service @@ -232,7 +233,8 @@ public class MetricsLite { // org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection; Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers"); playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class) ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size() : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length; - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed } int onlineMode = Bukkit.getOnlineMode() ? 1 : 0; @@ -291,7 +293,8 @@ public class MetricsLite { JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject(); pluginData.add(object); } - } catch (ClassNotFoundException e) {Iris.reportError(e); + } catch (ClassNotFoundException e) { + Iris.reportError(e); // minecraft version 1.14+ if (logFailedRequests) { this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception ", e); @@ -302,7 +305,8 @@ public class MetricsLite { Iris.reportError(ignored); } } - } catch (NoSuchFieldException e) {Iris.reportError(e); + } catch (NoSuchFieldException e) { + Iris.reportError(e); } } @@ -314,7 +318,8 @@ public class MetricsLite { try { // Send the data sendData(plugin, data); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); // Something went wrong! :( if (logFailedRequests) { plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e); diff --git a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java index 41a8ba1d3..d73e5069d 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/MortarCommand.java @@ -20,8 +20,8 @@ package com.volmit.iris.util.plugin; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.format.C; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.format.C; import org.bukkit.Sound; import java.lang.reflect.Field; diff --git a/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java b/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java index 28c205f87..d27b24bd8 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java +++ b/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java @@ -20,9 +20,9 @@ package com.volmit.iris.util.plugin; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.format.C; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.format.C; import com.volmit.iris.util.reflect.V; import org.bukkit.Bukkit; import org.bukkit.Sound; @@ -58,7 +58,8 @@ public class VirtualCommand { ICommand cmd = (ICommand) i.getType().getConstructor().newInstance(); new V(command, true, true).set(i.getName(), cmd); children.put(cmd.getAllNodes(), new VirtualCommand(cmd, cc.value().trim().isEmpty() ? tag : cc.value().trim())); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java b/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java index 0af3900aa..a8c87ebf4 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java @@ -89,7 +89,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { listenersField.setAccessible(true); //noinspection unchecked listeners = (Map>) listenersField.get(getServer().getPluginManager()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -101,7 +102,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { //noinspection unchecked commands = (Map) knownCommandsField.get(commandMap); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -134,7 +136,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { if (cl instanceof URLClassLoader) { try { ((URLClassLoader) cl).close(); - } catch (IOException e) {Iris.reportError(e); + } catch (IOException e) { + Iris.reportError(e); } } @@ -193,7 +196,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { outputPluginInfo(); outputCommandInfo(); outputPermissionInfo(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } @@ -275,7 +279,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { for (org.bukkit.permissions.Permission i : computePermissions()) { try { Bukkit.getPluginManager().addPermission(i); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } @@ -290,7 +295,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { g.add(toPermission(x)); g.addAll(computePermissions(x)); } catch (IllegalArgumentException | IllegalAccessException | SecurityException e) { - Iris.reportError(e);e.printStackTrace(); + Iris.reportError(e); + e.printStackTrace(); } } } @@ -370,7 +376,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { i.tick(); } catch (Throwable e) { w("Failed to tick controller " + i.getName()); - e.printStackTrace();Iris.reportError(e); + e.printStackTrace(); + Iris.reportError(e); } } } @@ -400,7 +407,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { v("Registered " + pc.getName() + " (" + i.getName() + ")"); } catch (IllegalArgumentException | IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException | SecurityException e) { w("Failed to register controller (field " + i.getName() + ")"); - e.printStackTrace();Iris.reportError(e); + e.printStackTrace(); + Iris.reportError(e); } } } @@ -425,7 +433,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { v("Started " + pc.getName()); } catch (Throwable e) { w("Failed to start controller " + pc.getName()); - e.printStackTrace();Iris.reportError(e); + e.printStackTrace(); + Iris.reportError(e); } } @@ -441,7 +450,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { v("Registered Instance " + i.getName()); } catch (IllegalArgumentException | IllegalAccessException | SecurityException e) { w("Failed to register instance (field " + i.getName() + ")"); - e.printStackTrace();Iris.reportError(e); + e.printStackTrace(); + Iris.reportError(e); } } } @@ -459,7 +469,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { v("Unregistered Instance " + i.getName()); } catch (IllegalArgumentException | IllegalAccessException | SecurityException e) { w("Failed to unregister instance (field " + i.getName() + ")"); - e.printStackTrace();Iris.reportError(e); + e.printStackTrace(); + Iris.reportError(e); } } } @@ -483,7 +494,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { v("Registered Commands /" + pc.getNode() + " (" + i.getName() + ")"); } catch (IllegalArgumentException | IllegalAccessException | InstantiationException | InvocationTargetException | NoSuchMethodException | SecurityException e) { w("Failed to register command (field " + i.getName() + ")"); - e.printStackTrace();Iris.reportError(e); + e.printStackTrace(); + Iris.reportError(e); } } } @@ -591,7 +603,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { } } } catch (Throwable e) { - e.printStackTrace();Iris.reportError(e); + e.printStackTrace(); + Iris.reportError(e); } } @@ -630,7 +643,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { for (VirtualCommand i : commands.v()) { try { unregisterCommand(i.getCommand()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } } @@ -655,7 +669,8 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { unregisterListener(i); i.stop(); v("Stopped " + i.getName()); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); w("Failed to stop controller " + i.getName()); e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/util/reflect/V.java b/src/main/java/com/volmit/iris/util/reflect/V.java index ee606311d..e428206fe 100644 --- a/src/main/java/com/volmit/iris/util/reflect/V.java +++ b/src/main/java/com/volmit/iris/util/reflect/V.java @@ -65,7 +65,8 @@ public class V { public T get(Class t, String mn, Class... pars) { try { return local ? Violator.getDeclaredAnnotation(Violator.getDeclaredMethod(o.getClass(), mn, pars), t) : Violator.getAnnotation(Violator.getMethod(o.getClass(), mn, pars), t); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); if (!suppress) { e.printStackTrace(); } @@ -77,7 +78,8 @@ public class V { public T get(Class t, String mn) { try { return local ? Violator.getDeclaredAnnotation(Violator.getDeclaredField(o.getClass(), mn), t) : Violator.getAnnotation(Violator.getField(o.getClass(), mn), t); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); if (!suppress) { e.printStackTrace(); } @@ -90,7 +92,8 @@ public class V { public T get(String field) { try { return (T) (local ? Violator.getDeclaredField(o.getClass(), field) : Violator.getField(o.getClass(), field)).get(o); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); if (!suppress) { e.printStackTrace(); } @@ -112,7 +115,8 @@ public class V { try { return (local ? Violator.getDeclaredMethod(o.getClass(), method, par.toArray(new Class[0])) : Violator.getMethod(o.getClass(), method, par.toArray(new Class[0]))).invoke(o, parameters); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); if (!suppress) { e.printStackTrace(); } @@ -125,7 +129,8 @@ public class V { try { // https://github.com/VolmitSoftware/Mortar/issues/5 (local ? Violator.getDeclaredField(o.getClass(), field) : Violator.getField(o.getClass(), field)).set(o, value); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); if (!suppress) { e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/util/reflect/Violator.java b/src/main/java/com/volmit/iris/util/reflect/Violator.java index fb47f4099..51b98b4f6 100644 --- a/src/main/java/com/volmit/iris/util/reflect/Violator.java +++ b/src/main/java/com/volmit/iris/util/reflect/Violator.java @@ -135,7 +135,8 @@ public class Violator { Field f = c.getDeclaredField(name); f.setAccessible(true); p(id(c, null) + "." + name, f); - } catch (NoSuchFieldException e) {Iris.reportError(e); + } catch (NoSuchFieldException e) { + Iris.reportError(e); Class s = c.getSuperclass(); if (null == s) { throw e; @@ -180,7 +181,8 @@ public class Violator { try { Constructor co = getConstructor(c, cv.toArray(new Class[0])); return (T) co.newInstance(parameters); - } catch (Exception e) {Iris.reportError(e); + } catch (Exception e) { + Iris.reportError(e); e.printStackTrace(); } diff --git a/src/main/java/com/volmit/iris/util/scheduling/CallbackCV.java b/src/main/java/com/volmit/iris/util/scheduling/CallbackCV.java deleted file mode 100644 index 07c42b723..000000000 --- a/src/main/java/com/volmit/iris/util/scheduling/CallbackCV.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2021 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.volmit.iris.util.scheduling; - -public interface CallbackCV { - void run(T t); -} diff --git a/src/main/java/com/volmit/iris/util/scheduling/Chunker.java b/src/main/java/com/volmit/iris/util/scheduling/Chunker.java deleted file mode 100644 index eadd2ed29..000000000 --- a/src/main/java/com/volmit/iris/util/scheduling/Chunker.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Iris is a World Generator for Minecraft Bukkit Servers - * Copyright (c) 2021 Arcane Arts (Volmit Software) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.volmit.iris.util.scheduling; - -import com.volmit.iris.util.collection.KList; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; - -public class Chunker { - private ExecutorService executor; - private int threads; - private int workload; - private final KList q; - - public Chunker(KList q) { - this.q = q; - } - - public Chunker threads(int threads) { - this.threads = threads; - return this; - } - - public Chunker workload(int workload) { - this.workload = workload; - return this; - } - - public void execute(Consumer consumer, Callback progress, int progressInterval) { - ChronoLatch cl = new ChronoLatch(progressInterval); - Contained consumed = new Contained<>(0); - executor = Executors.newFixedThreadPool(threads); - int length = q.size(); - int remaining = length; - - while (remaining > 0) { - int at = remaining; - remaining -= (Math.min(remaining, workload)); - int to = remaining; - - executor.submit(() -> - { - J.dofor(at, (i) -> i >= to, -1, (i) -> J.attempt(() -> consumer.accept(q.get(i)))); - consumed.mod((c) -> c += workload); - J.doif(() -> progress != null && cl.flip(), () -> progress.run((double) consumed.get() / (double) length)); - }); - } - - executor.shutdown(); - J.attempt(() -> executor.awaitTermination(100, TimeUnit.HOURS)); - } -} diff --git a/src/main/java/com/volmit/iris/util/scheduling/Contained.java b/src/main/java/com/volmit/iris/util/scheduling/Contained.java index 09cf4ac81..27a6ba139 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Contained.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Contained.java @@ -23,14 +23,6 @@ import java.util.function.Function; public class Contained { private T t; - public Contained(T t) { - set(t); - } - - public Contained() { - this(null); - } - public void mod(Function x) { set(x.apply(t)); } diff --git a/src/main/java/com/volmit/iris/util/scheduling/GroupedExecutor.java b/src/main/java/com/volmit/iris/util/scheduling/GroupedExecutor.java index 9454c442f..59de9ccd7 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/GroupedExecutor.java +++ b/src/main/java/com/volmit/iris/util/scheduling/GroupedExecutor.java @@ -21,7 +21,6 @@ package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.function.NastyRunnable; -import com.volmit.iris.util.scheduling.J; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/com/volmit/iris/util/scheduling/J.java b/src/main/java/com/volmit/iris/util/scheduling/J.java index 1da415b8e..483a96d57 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/J.java +++ b/src/main/java/com/volmit/iris/util/scheduling/J.java @@ -63,7 +63,8 @@ public class J { g.run(); return true; } - } catch (NullPointerException e) {Iris.reportError(e); + } catch (NullPointerException e) { + Iris.reportError(e); // TODO: Fix this because this is just a suppression for an NPE on g return false; } @@ -75,7 +76,8 @@ public class J { e.submit(() -> { try { a.run(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); System.out.println("Failed to run async task"); e.printStackTrace(); } @@ -86,7 +88,8 @@ public class J { e.submit(() -> { try { a.run(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); System.out.println("Failed to run async task"); e.printStackTrace(); } @@ -104,7 +107,8 @@ public class J { public static R attemptResult(NastyFuture r, R onError) { try { return r.run(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -114,7 +118,8 @@ public class J { public static R attemptFunction(NastyFunction r, T param, R onError) { try { return r.run(param); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); } @@ -132,7 +137,8 @@ public class J { public static Throwable attemptCatch(NastyRunnable r) { try { r.run(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); return e; } @@ -142,7 +148,8 @@ public class J { public static T attempt(Supplier t, T i) { try { return t.get(); - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); return i; } } diff --git a/src/main/java/com/volmit/iris/util/scheduling/Looper.java b/src/main/java/com/volmit/iris/util/scheduling/Looper.java index d41dff4bf..6cc9cbcc5 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/Looper.java +++ b/src/main/java/com/volmit/iris/util/scheduling/Looper.java @@ -33,9 +33,11 @@ public abstract class Looper extends Thread { //noinspection BusyWait Thread.sleep(m); - } catch (InterruptedException e) {Iris.reportError(e); + } catch (InterruptedException e) { + Iris.reportError(e); break; - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/util/scheduling/TaskExecutor.java b/src/main/java/com/volmit/iris/util/scheduling/TaskExecutor.java index 9edf13cde..e7b57da78 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/TaskExecutor.java +++ b/src/main/java/com/volmit/iris/util/scheduling/TaskExecutor.java @@ -195,7 +195,8 @@ public class TaskExecutor { try { task.run(); state = TaskState.COMPLETED; - } catch (Throwable ex) {Iris.reportError(ex); + } catch (Throwable ex) { + Iris.reportError(ex); ex.printStackTrace(); Iris.reportError(ex); state = TaskState.FAILED; diff --git a/src/main/java/com/volmit/iris/util/scheduling/ThreadMonitor.java b/src/main/java/com/volmit/iris/util/scheduling/ThreadMonitor.java index 71418d58e..740204a8a 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/ThreadMonitor.java +++ b/src/main/java/com/volmit/iris/util/scheduling/ThreadMonitor.java @@ -62,7 +62,8 @@ public class ThreadMonitor extends Thread { if (cl.flip()) { Iris.info("Cycles: " + Form.f(cycles) + " (" + Form.duration(sq.getAverage(), 2) + ")"); } - } catch (Throwable e) {Iris.reportError(e); + } catch (Throwable e) { + Iris.reportError(e); running = false; break; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 622134345..2f34572dc 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,11 +2,11 @@ name: ${name} version: ${version} main: ${main} load: STARTUP -authors: [cyberpwn, NextdoorPsycho] +authors: [ cyberpwn, NextdoorPsycho ] website: volmit.com description: More than a Dimenson! commands: iris: - aliases: [ir, irs] + aliases: [ ir, irs ] api-version: ${apiversion} hotload-dependencies: false \ No newline at end of file