diff --git a/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java b/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java index 0cda4e8e3..5d4daf2e1 100644 --- a/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java +++ b/src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java @@ -35,7 +35,6 @@ import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess; import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer; import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer; import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.scheduling.J; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.minecraft.core.BlockPos; import net.minecraft.core.IdMap; @@ -67,7 +66,6 @@ import java.io.DataOutputStream; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -166,10 +164,8 @@ public class NMSBinding18_1 implements INMSBinding { public Object getBiomeBaseFromId(int id) { try { return byIdRef.aquire(() -> { - for(Method i : IdMap.class.getDeclaredMethods()) - { - if(i.getParameterCount() == 1 && i.getParameterTypes()[0].equals(int.class)) - { + for(Method i : IdMap.class.getDeclaredMethods()) { + if(i.getParameterCount() == 1 && i.getParameterTypes()[0].equals(int.class)) { Iris.info("[NMS] Found byId method in " + IdMap.class.getSimpleName() + "." + i.getName() + "(int) => " + Biome.class.getSimpleName()); return i; } 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 922c41c44..6504d6614 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java @@ -25,7 +25,6 @@ import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisBiomeCustom; -import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.view.BiomeGridHunkView; @@ -108,15 +107,11 @@ public class IrisBiomeActuator extends EngineAssignedActuator { } else { Biome v = ib.getSkyBiome(rng, x, 0, z); - if(v != null) - { + if(v != null) { for(int i = 0; i < maxHeight; i++) { h.set(finalXf, i, zf, v); } - } - - else if(cl.flip()) - { + } else if(cl.flip()) { Iris.error("No biome provided for " + ib.getLoadKey()); } } diff --git a/src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java b/src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java index f664b81f8..0e65fdd5a 100644 --- a/src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java +++ b/src/main/java/com/volmit/iris/engine/data/chunk/MCATerrainChunk.java @@ -82,7 +82,7 @@ public class MCATerrainChunk implements TerrainChunk { int zz = (z + oz) & 15; if(y > getMaxHeight() || y < getMinHeight()) { - return; + return; } if(blockData == null) { 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 177ce0e4d..285c4cae6 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -78,7 +78,6 @@ import org.bukkit.block.BlockFace; import org.bukkit.block.data.BlockData; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.generator.ChunkGenerator; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; 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 6a2ef9f2c..0e7aff574 100644 --- a/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java +++ b/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java @@ -24,7 +24,6 @@ import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import org.bukkit.generator.ChunkGenerator; import java.util.concurrent.atomic.AtomicBoolean; 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 4271d3036..64166d240 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -230,14 +230,12 @@ public class IrisDimension extends IrisRegistrant { @ArrayType(type = IrisOreGenerator.class, min = 1) private KList ores = new KList<>(); - public int getMaxHeight() - { + public int getMaxHeight() { return 320; // return (int) getDimensionHeight().getMax(); } - public int getMinHeight() - { + public int getMinHeight() { return -64; // return (int) getDimensionHeight().getMin(); } diff --git a/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java b/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java index b59e903be..e9e34c06f 100644 --- a/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java @@ -44,7 +44,6 @@ import lombok.Data; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.data.BlockData; -import org.bukkit.generator.ChunkGenerator; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java b/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java index 83dba6f87..6d42b82cc 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java @@ -34,7 +34,6 @@ import java.io.ByteArrayOutputStream; import java.io.FileInputStream; import java.io.IOException; import java.io.RandomAccessFile; -import java.util.concurrent.atomic.AtomicReferenceArray; import static com.volmit.iris.util.nbt.mca.LoadFlags.*; @@ -638,8 +637,7 @@ public class Chunk { if(structures != null) level.put("Structures", structures); ListTag sections = new ListTag<>(CompoundTag.class); - for(int i : this.sections.keySet()) - { + for(int i : this.sections.keySet()) { if(this.sections.get(i) != null) { sections.add(this.sections.get(i).updateHandle(i)); }