Cleanup

src/main/java/com/volmit/iris/core/commands/CommandJigsaw.java

@@ -1,3 +1,21 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
 package com.volmit.iris.core.commands;
 
 import com.volmit.iris.Iris;

src/main/java/com/volmit/iris/core/commands/CommandObject.java

@@ -1,3 +1,21 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
 package com.volmit.iris.core.commands;
 
 import com.volmit.iris.Iris;

src/main/java/com/volmit/iris/core/commands/CommandStudio.java

@@ -18,7 +18,6 @@
 
 package com.volmit.iris.core.commands;
 
-import com.google.gson.Gson;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.gui.NoiseExplorerGUI;

src/main/java/com/volmit/iris/core/commands/CommandWhat.java

@@ -1,6 +1,23 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
 package com.volmit.iris.core.commands;
 
-import com.google.gson.Gson;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.edit.BlockSignal;
 import com.volmit.iris.core.nms.INMS;
@@ -12,7 +29,6 @@ import com.volmit.iris.util.decree.DecreeOrigin;
 import com.volmit.iris.util.decree.annotations.Decree;
 import com.volmit.iris.util.decree.annotations.Param;
 import com.volmit.iris.util.format.C;
-import com.volmit.iris.util.json.JSONObject;
 import com.volmit.iris.util.matter.MatterMarker;
 import com.volmit.iris.util.scheduling.J;
 import org.bukkit.Chunk;

src/main/java/com/volmit/iris/core/service/ObjectSVC.java

@@ -1,3 +1,21 @@
+/*
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
 package com.volmit.iris.core.service;
 
 import com.volmit.iris.util.plugin.IrisService;

src/main/java/com/volmit/iris/engine/IrisComplex.java

@@ -18,7 +18,6 @@
 
 package com.volmit.iris.engine;
 
-import com.google.common.util.concurrent.AtomicDouble;
 import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.loader.IrisData;
@@ -296,8 +295,7 @@ public class IrisComplex implements DataProvider {
         return biome;
     }
 
-    private double getInterpolatedHeight(Engine engine, double x, double z, long seed)
+    private double getInterpolatedHeight(Engine engine, double x, double z, long seed) {
-    {
         double h = 0;
 
         for (IrisInterpolator i : generators.keySet()) {
@@ -307,8 +305,7 @@ public class IrisComplex implements DataProvider {
                     IrisBiome bx = baseBiomeStream.get(xx, zz);
                     double b = 0;
 
-                    for(IrisGenerator gen : generators.get(i))
+                    for (IrisGenerator gen : generators.get(i)) {
-                    {
                         b += M.lerp(bx.getGenLinkMin(gen.getLoadKey()),
                                 bx.getGenLinkMax(gen.getLoadKey()),
                                 gen.getHeight(x, z, seed + 239945));

src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java

@@ -33,15 +33,12 @@ import com.volmit.iris.engine.object.IrisObjectRotation;
 import com.volmit.iris.engine.object.IrisPosition;
 import com.volmit.iris.engine.object.ObjectPlaceMode;
 import com.volmit.iris.util.collection.KList;
-import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.math.RNG;
 import lombok.Data;
 import org.bukkit.Axis;
 import org.bukkit.World;
 
-import java.util.function.Consumer;
-
 @Data
 public class PlannedStructure {
     private static transient ConcurrentLinkedHashMap<String, IrisObject> objectRotationCache

src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java

@@ -18,7 +18,6 @@
 
 package com.volmit.iris.engine.mantle;
 
-import com.volmit.iris.Iris;
 import com.volmit.iris.core.IrisSettings;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.IrisComplex;
@@ -42,13 +41,10 @@ import com.volmit.iris.util.matter.MatterMarker;
 import com.volmit.iris.util.matter.slices.UpdateMatter;
 import com.volmit.iris.util.parallel.BurstExecutor;
 import com.volmit.iris.util.parallel.MultiBurst;
-import org.bukkit.Chunk;
 import org.bukkit.block.TileState;
 import org.bukkit.block.data.BlockData;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 
 // TODO: MOVE PLACER OUT OF MATTER INTO ITS OWN THING
 public interface EngineMantle extends IObjectPlacer {

src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java

@@ -26,8 +26,6 @@ import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.mantle.MantleFlag;
 import com.volmit.iris.util.parallel.BurstExecutor;
 
-import java.util.function.Consumer;
-
 public interface MantleComponent {
     default int getRadius() {
         return getEngineMantle().getRealRadius();

src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java

@@ -29,8 +29,6 @@ import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.MantleFlag;
 import com.volmit.iris.util.math.RNG;
 
-import java.util.function.Consumer;
-
 public class MantleCarvingComponent extends IrisMantleComponent {
     public MantleCarvingComponent(EngineMantle engineMantle) {
         super(engineMantle, MantleFlag.CARVED);

src/main/java/com/volmit/iris/engine/mantle/components/MantleFluidBodyComponent.java

@@ -29,8 +29,6 @@ import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.MantleFlag;
 import com.volmit.iris.util.math.RNG;
 
-import java.util.function.Consumer;
-
 public class MantleFluidBodyComponent extends IrisMantleComponent {
     public MantleFluidBodyComponent(EngineMantle engineMantle) {
         super(engineMantle, MantleFlag.FLUID_BODIES);

src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java

@@ -36,7 +36,6 @@ import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
 
 import java.util.List;
-import java.util.function.Consumer;
 
 public class MantleJigsawComponent extends IrisMantleComponent {
     private final CNG cng;

src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java

@@ -32,8 +32,6 @@ import com.volmit.iris.util.documentation.ChunkCoordinates;
 import com.volmit.iris.util.mantle.MantleFlag;
 import com.volmit.iris.util.math.RNG;
 
-import java.util.function.Consumer;
-
 public class MantleObjectComponent extends IrisMantleComponent {
     public MantleObjectComponent(EngineMantle engineMantle) {
         super(engineMantle, MantleFlag.OBJECT);

src/main/java/com/volmit/iris/engine/object/IrisGenerator.java

@@ -18,7 +18,6 @@
 
 package com.volmit.iris.engine.object;
 
-import com.volmit.iris.Iris;
 import com.volmit.iris.core.loader.IrisRegistrant;
 import com.volmit.iris.engine.data.cache.AtomicCache;
 import com.volmit.iris.engine.object.annotations.ArrayType;
@@ -218,18 +217,14 @@ public class IrisGenerator extends IrisRegistrant {
         double h = multiplicitive ? 1 : 0;
         double tp = 0;
 
-        if(composite.size() == 1)
+        if (composite.size() == 1) {
-        {
             if (multiplicitive) {
                 h *= composite.get(0).getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
             } else {
                 tp += composite.get(0).getOpacity();
                 h += composite.get(0).getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());
             }
-        }
+        } else {
-
-        else
-        {
             for (IrisNoiseGenerator i : composite) {
                 if (multiplicitive) {
                     h *= i.getNoise(seed + superSeed + hc, (rx + offsetX) / zoom, (rz + offsetZ) / zoom, getLoader());

src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java

@@ -22,7 +22,6 @@ 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.object.annotations.Snippet;
 import com.volmit.iris.util.function.NoiseProvider;
 import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.util.interpolation.IrisInterpolation;
@@ -52,16 +51,13 @@ public class IrisInterpolator {
     private double horizontalScale = 7;
 
     @Override
-    public int hashCode()
+    public int hashCode() {
-    {
         return Objects.hash(horizontalScale, function);
     }
 
     @Override
-    public boolean equals(Object o)
+    public boolean equals(Object o) {
-    {
+        if (o instanceof IrisInterpolator i) {
-        if(o instanceof IrisInterpolator i)
-        {
             return i.getFunction().equals(function) && i.getHorizontalScale() == horizontalScale;
         }
 

src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java

@@ -33,7 +33,6 @@ import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.data.B;
 import com.volmit.iris.util.data.DataProvider;
 import com.volmit.iris.util.data.WeightedRandom;
-import com.volmit.iris.util.interpolation.InterpolationMethod;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.noise.CNG;
 import lombok.AllArgsConstructor;
@@ -87,7 +86,7 @@ public class IrisObjectPlacement {
     @MinNumber(-1)
     @Desc("When bore is enabled, lower min-y of the cuboid it removes")
     private int boreExtendMinY = 0;
-     @Desc("If set to true, objects will place on the terrain height, ignoring the water surface.")
+    @Desc("If set to true, objects will place on the terrain height, ignoring the water surface.")
     private boolean underwater = false;
     @Desc("If set to true, objects will place in carvings (such as underground) or under an overhang.")
     private CarvingMode carvingSupport = CarvingMode.SURFACE_ONLY;