diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 78210752e..7a446280a 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -1,6 +1,6 @@ name: Iris Bug Report description: File a bug report for Iris -labels: [bug] +labels: [ bug ] body: - type: markdown attributes: diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml index afcfb2031..3994c8103 100644 --- a/.github/ISSUE_TEMPLATE/feature.yml +++ b/.github/ISSUE_TEMPLATE/feature.yml @@ -1,6 +1,6 @@ name: Iris Feature Request description: File a feature request for Iris. If you want to report a bug this is not the place. -labels: [feature] +labels: [ feature ] body: - type: markdown attributes: diff --git a/README.md b/README.md index b7e56f28c..32c904584 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,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) ## Iris Toolbelt @@ -16,26 +17,26 @@ package com.volmit.iris.core.tools IrisToolbelt.access(anyWorld).getCompound().getData(); // Get Default Engine from world -IrisToolbelt.access(anyWorld).getCompound().getDefaultEngine(); + IrisToolbelt.access(anyWorld).getCompound().getDefaultEngine(); // Get the engine at the given height -IrisToolbelt.access(anyWorld).getCompound().getEngineForHeight(68); + IrisToolbelt.access(anyWorld).getCompound().getEngineForHeight(68); // IS THIS THING ON? -boolean yes = IrisToolbelt.isIrisWorld(world); + boolean yes=IrisToolbelt.isIrisWorld(world); // GTFO for worlds (moves players to any other world, just not this one) -IrisToolbelt.evacuate(world); + IrisToolbelt.evacuate(world); -IrisAccess access = IrisToolbelt.createWorld() // If you like builders... - .name("myWorld") // The world name - .dimension("terrifyinghands") - .seed(69133742) // The world seed - .headless(true) // Headless make gen go fast - .pregen(PregenTask // Define a pregen job to run + IrisAccess access=IrisToolbelt.createWorld() // If you like builders... + .name("myWorld") // The world name + .dimension("terrifyinghands") + .seed(69133742) // The world seed + .headless(true) // Headless make gen go fast + .pregen(PregenTask // Define a pregen job to run .builder() - .center(new Position2(0,0)) // REGION coords (1 region = 32x32 chunks) - .radius(4) // Radius in REGIONS. Rad of 4 means a 9x9 Region map. + .center(new Position2(0,0)) // REGION coords (1 region = 32x32 chunks) + .radius(4) // Radius in REGIONS. Rad of 4 means a 9x9 Region map. .build()) - .create(); + .create(); ``` diff --git a/build.gradle b/build.gradle index b3da408b6..b7f137b41 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,3 @@ - /* * Iris is a World Generator for Minecraft Bukkit Servers * Copyright (c) 2021 Arcane Arts (Volmit Software) @@ -108,16 +107,16 @@ repositories { } shadowJar -{ - append("plugin.yml") - minimize() - relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic' - relocate 'io.papermc.lib', 'com.volmit.iris.util.paper' - dependencies { - include(dependency('io.papermc:paperlib:1.0.5')) - include(dependency('com.dfsek:Paralithic:0.4.0')) - } -} + { + append("plugin.yml") + minimize() + relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic' + relocate 'io.papermc.lib', 'com.volmit.iris.util.paper' + dependencies { + include(dependency('io.papermc:paperlib:1.0.5')) + include(dependency('com.dfsek:Paralithic:0.4.0')) + } + } manifest() diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 69e5ac73c..f9cdb8c63 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -33,9 +33,6 @@ import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomeCustom; import com.volmit.iris.engine.object.compat.IrisCompat; import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.util.io.JarScanner; -import com.volmit.iris.util.matter.Sliced; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.format.C; @@ -43,8 +40,10 @@ import com.volmit.iris.util.format.Form; import com.volmit.iris.util.function.NastyRunnable; import com.volmit.iris.util.io.FileWatcher; import com.volmit.iris.util.io.IO; +import com.volmit.iris.util.io.JarScanner; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.Metrics; import com.volmit.iris.util.plugin.Permission; import com.volmit.iris.util.plugin.VolmitPlugin; @@ -67,7 +66,6 @@ import org.bukkit.plugin.Plugin; import java.io.*; import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.util.Date; @@ -108,10 +106,8 @@ public class Iris extends VolmitPlugin implements Listener { JarScanner js = new JarScanner(instance.getJarFile(), s); KList v = new KList<>(); J.attempt(js::scan); - for(Class i : js.getClasses()) - { - if(slicedClass == null || i.isAnnotationPresent(slicedClass)) - { + for (Class i : js.getClasses()) { + if (slicedClass == null || i.isAnnotationPresent(slicedClass)) { try { v.add(i.getDeclaredConstructor().newInstance()); } catch (Throwable ignored) { @@ -123,7 +119,6 @@ public class Iris extends VolmitPlugin implements Listener { return v; } - public void onEnable() { instance = this; compat = IrisCompat.configured(getDataFile("compat.json")); diff --git a/src/main/java/com/volmit/iris/core/ConversionManager.java b/src/main/java/com/volmit/iris/core/ConversionManager.java index 70a785a2f..a36579004 100644 --- a/src/main/java/com/volmit/iris/core/ConversionManager.java +++ b/src/main/java/com/volmit/iris/core/ConversionManager.java @@ -20,12 +20,6 @@ package com.volmit.iris.core; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.util.nbt.mca.NBTWorld; -import com.volmit.iris.util.nbt.io.NBTUtil; -import com.volmit.iris.util.nbt.io.NamedTag; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.IntTag; -import com.volmit.iris.util.nbt.tag.ListTag; import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece; import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector; @@ -40,6 +34,12 @@ import com.volmit.iris.util.io.Converter; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.io.SKConversion; import com.volmit.iris.util.json.JSONObject; +import com.volmit.iris.util.nbt.io.NBTUtil; +import com.volmit.iris.util.nbt.io.NamedTag; +import com.volmit.iris.util.nbt.mca.NBTWorld; +import com.volmit.iris.util.nbt.tag.CompoundTag; +import com.volmit.iris.util.nbt.tag.IntTag; +import com.volmit.iris.util.nbt.tag.ListTag; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/core/IrisBoardManager.java b/src/main/java/com/volmit/iris/core/IrisBoardManager.java index be8d269a7..b7306f266 100644 --- a/src/main/java/com/volmit/iris/core/IrisBoardManager.java +++ b/src/main/java/com/volmit/iris/core/IrisBoardManager.java @@ -119,10 +119,9 @@ public class IrisBoardManager implements BoardProvider, Listener { } Engine engine = g.getCompound().getEngineForHeight(y); - if(ecl.flip()) - { + if (ecl.flip()) { energyBar.setProgress(Math.min(1000D, engine.getWorldManager().getEnergy()) / 1000D); - energyBar.setTitle("Spawner Energy: " + Form.f((int)Math.min(1000D, engine.getWorldManager().getEnergy()))); + energyBar.setTitle("Spawner Energy: " + Form.f((int) Math.min(1000D, engine.getWorldManager().getEnergy()))); } int parallaxChunks = 0; diff --git a/src/main/java/com/volmit/iris/core/WandManager.java b/src/main/java/com/volmit/iris/core/WandManager.java index 627783f92..a0896ed58 100644 --- a/src/main/java/com/volmit/iris/core/WandManager.java +++ b/src/main/java/com/volmit/iris/core/WandManager.java @@ -74,6 +74,7 @@ public class WandManager implements Listener { /** * Draw the outline of a selected region + * * @param d The cuboid * @param p The player to show it to */ @@ -83,6 +84,7 @@ public class WandManager implements Listener { /** * Draw the outline of a selected region + * * @param d A pair of locations * @param p The player to show them to */ @@ -191,6 +193,7 @@ public class WandManager implements Listener { /** * Creates an Iris Object from the 2 coordinates selected with a wand + * * @param wand The wand itemstack * @return The new object */ @@ -223,6 +226,7 @@ public class WandManager implements Listener { /** * Converts a user friendly location string to an actual Location + * * @param s The string * @return The location */ @@ -239,6 +243,7 @@ public class WandManager implements Listener { /** * Get a user friendly string of a location + * * @param loc The location * @return The string */ @@ -252,6 +257,7 @@ public class WandManager implements Listener { /** * Create a new blank Iris wand + * * @return The wand itemstack */ public static ItemStack createWand() { @@ -260,6 +266,7 @@ public class WandManager implements Listener { /** * Create a new dust itemstack + * * @return The stack */ public static ItemStack createDust() { @@ -277,6 +284,7 @@ public class WandManager implements Listener { /** * Is the player holding Dust? + * * @param p The player * @return True if they are */ @@ -287,6 +295,7 @@ public class WandManager implements Listener { /** * Is the itemstack passed Iris dust? + * * @param is The itemstack * @return True if it is */ @@ -296,8 +305,9 @@ public class WandManager implements Listener { /** * Update the location on an Iris wand + * * @param left True for first location, false for second - * @param a The location + * @param a The location * @param item The wand * @return The updated wand */ @@ -318,6 +328,7 @@ public class WandManager implements Listener { /** * Finds an existing wand in a users inventory + * * @param inventory The inventory to search * @return The slot number the wand is in. Or -1 if none are found */ @@ -341,6 +352,7 @@ public class WandManager implements Listener { /** * Creates an Iris wand. The locations should be the currently selected locations, or null + * * @param a Location A * @param b Location B * @return A new wand @@ -360,6 +372,7 @@ public class WandManager implements Listener { /** * Get a pair of locations that are selected in an Iris wand + * * @param is The wand item * @return An array with the 2 locations */ @@ -370,6 +383,7 @@ public class WandManager implements Listener { /** * Is a player holding an Iris wand + * * @param p The player * @return True if they are */ @@ -380,6 +394,7 @@ public class WandManager implements Listener { /** * Is the itemstack passed an Iris wand + * * @param is The itemstack * @return True if it is */ 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 7e407056f..09c2e9a69 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 @@ -23,8 +23,8 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.tools.IrisWorlds; import com.volmit.iris.engine.jigsaw.PlannedStructure; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure; import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure; 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/CommandIrisObjectAnalyze.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectAnalyze.java index 9d56cd321..4977ac8ea 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectAnalyze.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectAnalyze.java @@ -17,14 +17,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; import java.util.stream.Collectors; public class CommandIrisObjectAnalyze extends MortarCommand { @@ -99,7 +92,7 @@ public class CommandIrisObjectAnalyze extends MortarCommand { } else - amounts.put(block, amounts.get(block) + 1); + amounts.put(block, amounts.get(block) + 1); if (!materials.containsKey(block.getMaterial())) { materials.put(block.getMaterial(), 1); @@ -130,7 +123,7 @@ public class CommandIrisObjectAnalyze extends MortarCommand { if (data.getAsString(true).contains("[")) { string = string + " --> [" + data.getAsString(true).split("\\[")[1] .replaceAll("true", ChatColor.GREEN + "true" + ChatColor.GRAY) - .replaceAll("false", ChatColor.RED + "false" + ChatColor.GRAY)+ "*" + dataAmount; + .replaceAll("false", ChatColor.RED + "false" + ChatColor.GRAY) + "*" + dataAmount; } sender.sendMessage(string); 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 be5786e3a..0c0148f46 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 @@ -24,21 +24,17 @@ import com.volmit.iris.core.ProjectManager; import com.volmit.iris.core.WandManager; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.tools.IrisWorlds; +import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.objects.IrisObjectPlacementScaleInterpolator; import com.volmit.iris.engine.object.objects.IrisObjectRotation; -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.RNG; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; -import org.bukkit.HeightMap; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Sound; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.TileState; @@ -188,7 +184,7 @@ public class CommandIrisObjectPaste extends MortarCommand { //WandManager.pasteSchematic(obj, block); Map futureChanges = new HashMap<>(); - obj.place(block.getBlockX(), block.getBlockY() + (int)obj.getCenter().getY(), block.getBlockZ(), createPlacer(sender.player(), block.getWorld(), futureChanges), placement, new RNG(), null); + obj.place(block.getBlockX(), block.getBlockY() + (int) obj.getCenter().getY(), block.getBlockZ(), createPlacer(sender.player(), block.getWorld(), futureChanges), placement, new RNG(), null); CommandIrisObjectUndo.addChanges(sender.player(), futureChanges); if (intoWand) { @@ -231,7 +227,7 @@ public class CommandIrisObjectPaste extends MortarCommand { @Override public int getHighest(int x, int z, IrisData data, boolean ignoreFluid) { - return world.getHighestBlockYAt(x, z, ignoreFluid ? HeightMap.OCEAN_FLOOR: HeightMap.MOTION_BLOCKING); + return world.getHighestBlockYAt(x, z, ignoreFluid ? HeightMap.OCEAN_FLOOR : HeightMap.MOTION_BLOCKING); } @Override diff --git a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectUndo.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectUndo.java index 6fe187a4b..dd1c08990 100644 --- a/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectUndo.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectUndo.java @@ -29,12 +29,8 @@ import org.bukkit.OfflinePlayer; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.UUID; + +import java.util.*; public class CommandIrisObjectUndo extends MortarCommand { @@ -147,6 +143,7 @@ public class CommandIrisObjectUndo extends MortarCommand { /** * Reverts all the block changes provided, 200 blocks per tick + * * @param blocks The blocks to remove */ private static void revert(Map blocks) { 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 898525556..7a0c4a449 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 @@ -107,7 +107,7 @@ public class CommandIrisStudioGoto extends MortarCommand { J.s(() -> sender.player().teleport(l)); } }); - }else if (s != null) { + } else if (s != null) { J.a(() -> { Location l = g.lookForRegion(r, 60000, (v) -> sender.sendMessage(C.BOLD + "" + C.WHITE + r.getName() + C.RESET + C.GRAY + ": Checked " + Form.f(v) + " Places")); 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 fe7c4b989..22c6b127f 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 @@ -22,8 +22,8 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.tools.IrisWorlds; import com.volmit.iris.engine.framework.IrisAccess; -import com.volmit.iris.engine.object.meta.InventorySlotType; import com.volmit.iris.engine.object.loot.IrisLootTable; +import com.volmit.iris.engine.object.meta.InventorySlotType; 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/CommandIrisStudioProfile.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java index 36567e917..65e3cbe5c 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 @@ -22,7 +22,6 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; import com.volmit.iris.engine.object.noise.IrisGenerator; @@ -30,13 +29,14 @@ import com.volmit.iris.engine.object.noise.IrisInterpolator; import com.volmit.iris.engine.object.noise.IrisNoiseGenerator; import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.function.NoiseProvider; +import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java index 041ca9dcf..780985b46 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; -import com.volmit.iris.util.data.B; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java index 8a51b8c67..30a3bf329 100644 --- a/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatFeatures.java @@ -52,16 +52,12 @@ public class CommandIrisWhatFeatures extends MortarCommand { Player p = sender.player(); Chunk c = p.getLocation().getChunk(); - if(IrisWorlds.isIrisWorld(c.getWorld())) - {int m = 1; - for(IrisFeaturePositional i : ((Engine)IrisWorlds.access(c.getWorld()).getEngineAccess(p.getLocation().getBlockY())).getFramework().getEngineParallax().getFeaturesInChunk(c)) - { + if (IrisWorlds.isIrisWorld(c.getWorld())) { + int m = 1; + for (IrisFeaturePositional i : ((Engine) IrisWorlds.access(c.getWorld()).getEngineAccess(p.getLocation().getBlockY())).getFramework().getEngineParallax().getFeaturesInChunk(c)) { sender.sendMessage("#" + m++ + " " + new JSONObject(new Gson().toJson(i)).toString(4)); } - } - - else - { + } else { sender.sendMessage("Iris worlds only."); } } else { diff --git a/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java index 25efdcb68..907af5e53 100644 --- a/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisVerify.java @@ -20,13 +20,13 @@ package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.nbt.mca.Chunk; import com.volmit.iris.util.nbt.mca.MCAFile; import com.volmit.iris.util.nbt.mca.MCAUtil; -import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java index 92f9c549e..d0969827d 100644 --- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java @@ -20,15 +20,15 @@ package com.volmit.iris.core.gui; import com.volmit.iris.Iris; import com.volmit.iris.core.events.IrisEngineHotloadEvent; -import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.util.parallel.BurstExecutor; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.RollingSequence; +import com.volmit.iris.util.noise.CNG; +import com.volmit.iris.util.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java index d2b82a74c..db2dfb07e 100644 --- a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java @@ -26,8 +26,8 @@ import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.object.common.IrisWorld; +import com.volmit.iris.engine.object.regional.IrisRegion; 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/pregenerator/methods/AsyncPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java index fb23ac99d..43e9ca166 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/AsyncPregenMethod.java @@ -21,8 +21,8 @@ package com.volmit.iris.core.pregenerator.methods; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregeneratorMethod; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.J; import io.papermc.lib.PaperLib; import org.bukkit.Chunk; diff --git a/src/main/java/com/volmit/iris/core/project/IrisProject.java b/src/main/java/com/volmit/iris/core/project/IrisProject.java index 575519761..75a095e20 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -40,7 +40,6 @@ import com.volmit.iris.engine.object.noise.IrisGenerator; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.object.spawners.IrisSpawner; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -51,6 +50,7 @@ import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONArray; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.math.M; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; diff --git a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java index 71a251b3e..a2abcf944 100644 --- a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java +++ b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java @@ -21,10 +21,10 @@ package com.volmit.iris.core.project; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.project.loader.ResourceLoader; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.json.JSONArray; import com.volmit.iris.util.json.JSONObject; import org.bukkit.enchantments.Enchantment; diff --git a/src/main/java/com/volmit/iris/core/project/loader/IrisRegistrant.java b/src/main/java/com/volmit/iris/core/project/loader/IrisRegistrant.java index 54f92083c..fa7a3a775 100644 --- a/src/main/java/com/volmit/iris/core/project/loader/IrisRegistrant.java +++ b/src/main/java/com/volmit/iris/core/project/loader/IrisRegistrant.java @@ -19,7 +19,6 @@ package com.volmit.iris.core.project.loader; import com.volmit.iris.Iris; -import com.volmit.iris.core.project.loader.IrisData; import lombok.Data; import java.awt.*; diff --git a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java index 62cd09835..2be88107a 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java @@ -20,8 +20,8 @@ package com.volmit.iris.core.tools; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.framework.EngineCompositeGenerator; -import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.object.common.IrisWorld; +import com.volmit.iris.engine.object.dimensional.IrisDimension; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index fa5987f42..d62d89e90 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -22,11 +22,11 @@ import com.google.common.util.concurrent.AtomicDouble; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator; -import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.modifier.IrisCaveModifier; import com.volmit.iris.engine.object.biome.InferredType; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.common.CaveResult; import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.engine.object.dimensional.IrisTerrainMode; @@ -34,14 +34,14 @@ import com.volmit.iris.engine.object.feature.IrisFeaturePositional; import com.volmit.iris.engine.object.noise.IrisGenerator; import com.volmit.iris.engine.object.noise.IrisInterpolator; import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import lombok.Data; import org.bukkit.Material; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 6b9824c95..8ce46e91a 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -24,18 +24,18 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.events.IrisEngineHotloadEvent; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.*; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; import com.volmit.iris.engine.object.decoration.IrisDecorator; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.engine.IrisEngineData; +import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.J; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java index dd2f8f518..63256bc7c 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java @@ -25,12 +25,10 @@ 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.util.hunk.Hunk; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.dimensional.IrisDimensionIndex; import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.util.parallel.MultiBurst; +import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.dimensional.IrisDimensionIndex; import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; @@ -38,6 +36,8 @@ import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 1cafc2aa7..759c7c110 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -82,15 +82,11 @@ public class IrisWorldManager extends EngineAssignedWorldManager { looper = new Looper() { @Override protected long loop() { - if(precount != null) - { + if (precount != null) { entityCount = 0; - for(Entity i : precount) - { - if(i instanceof LivingEntity) - { - if(!i.isDead()) - { + for (Entity i : precount) { + if (i instanceof LivingEntity) { + if (!i.isDead()) { entityCount++; } } @@ -99,10 +95,8 @@ public class IrisWorldManager extends EngineAssignedWorldManager { precount = null; } - if(energy < 650) - { - if(ecl.flip()) - { + if (energy < 650) { + if (ecl.flip()) { energy *= 1 + (0.02 * M.clip((1D - getEntitySaturation()), 0D, 1D)); fixEnergy(); } @@ -121,8 +115,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { private boolean onAsyncTick() { actuallySpawned = 0; - if(energy < 100) - { + if (energy < 100) { J.sleep(200); return false; } @@ -156,10 +149,8 @@ public class IrisWorldManager extends EngineAssignedWorldManager { int spawnBuffer = RNG.r.i(2, 12); Chunk[] cc = getEngine().getWorld().realWorld().getLoadedChunks(); - while(spawnBuffer-- > 0) - { - if(cc.length == 0) - { + while (spawnBuffer-- > 0) { + if (cc.length == 0) { Iris.debug("Can't spawn. No chunks!"); return false; } @@ -180,10 +171,8 @@ public class IrisWorldManager extends EngineAssignedWorldManager { } private void spawnIn(Chunk c, IrisBiome biome, IrisRegion region, int max) { - for(Entity i : c.getEntities()) - { - if(i instanceof LivingEntity) - { + for (Entity i : c.getEntities()) { + if (i instanceof LivingEntity) { return; } } @@ -214,7 +203,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { private void spawn(Chunk c, IrisEntitySpawn i) { int s = i.spawn(getEngine(), c, RNG.r); - actuallySpawned+= s; + actuallySpawned += s; if (s > 0) { getCooldown(i.getReferenceSpawner()).spawn(getEngine()); energy -= s * ((i.getEnergyMultiplier() * i.getReferenceSpawner().getEnergyMultiplier() * 1)); @@ -280,13 +269,9 @@ public class IrisWorldManager extends EngineAssignedWorldManager { @Override public void onChunkLoad(Chunk e, boolean generated) { - if(generated) - { + if (generated) { energy += 1.2; - } - - else - { + } else { energy += 0.3; } @@ -367,8 +352,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { @Override public double getEntitySaturation() { - if(!getEngine().getWorld().hasRealWorld()) - { + if (!getEngine().getWorld().hasRealWorld()) { return 1; } 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 247689e45..b78f27264 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java @@ -23,11 +23,11 @@ import com.volmit.iris.core.nms.INMS; 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.util.hunk.Hunk; -import com.volmit.iris.util.hunk.view.BiomeGridHunkView; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomeCustom; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.hunk.view.BiomeGridHunkView; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.block.Biome; 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 882817522..6184b62a6 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -22,10 +22,10 @@ import com.volmit.iris.engine.decorator.*; 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.util.hunk.Hunk; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.carve.IrisCaveLayer; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java index 34c3cb462..d67da5335 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainIslandActuator.java @@ -20,10 +20,10 @@ package com.volmit.iris.engine.actuator; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java index 2a371497d..3d4b13800 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java @@ -20,12 +20,12 @@ package com.volmit.iris.engine.actuator; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; import org.bukkit.Material; 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 b48091d65..d1cd2985f 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; 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 e50399c5e..0da7bc64d 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java @@ -23,8 +23,8 @@ import com.volmit.iris.engine.data.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.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; 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 70454d5cd..e51fee6fc 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; 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 b3d34103d..0a4298c2c 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; 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 20ac71ba7..ac2e946ac 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; 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 b02669ca7..38351ea8a 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java @@ -21,12 +21,12 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.biome.InferredType; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.decoration.IrisDecorationPart; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.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 b953cce82..31e830a78 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -23,27 +23,27 @@ import com.volmit.iris.core.gui.components.RenderType; import com.volmit.iris.core.gui.components.Renderer; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.util.data.B; -import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.engine.object.basic.IrisColor; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.common.IrisWorld; import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.engine.IrisEngineData; +import com.volmit.iris.engine.object.loot.IrisLootMode; import com.volmit.iris.engine.object.loot.IrisLootReference; import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.loot.IrisLootMode; import com.volmit.iris.engine.object.meta.InventorySlotType; import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.object.engine.IrisEngineData; import com.volmit.iris.engine.parallax.ParallaxAccess; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.B; +import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Chunk; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java b/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java index 36fb43b59..1530d1bda 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; public interface EngineActuator extends EngineComponent { @BlockCoordinates diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java index 81d5526f2..77eae4f29 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; public abstract class EngineAssignedActuator extends EngineAssignedComponent implements EngineActuator { public EngineAssignedActuator(Engine engine, String name) { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java index 6bbdf4a34..6bcbd2267 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; public abstract class EngineAssignedModifier extends EngineAssignedComponent implements EngineModifier { public EngineAssignedModifier(Engine engine, String name) { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java index 2c9b18096..eb222f423 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java @@ -59,25 +59,21 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent @EventHandler public void on(EntitySpawnEvent e) { if (e.getEntity().getWorld().equals(getTarget().getWorld().realWorld())) { - if(e.getEntityType().equals(EntityType.ENDER_SIGNAL)) - { + if (e.getEntityType().equals(EntityType.ENDER_SIGNAL)) { KList p = getEngine().getDimension().getStrongholds(getEngine().getWorld().seed()); Position2 px = new Position2(e.getEntity().getLocation().getBlockX(), e.getEntity().getLocation().getBlockZ()); Position2 pr = null; double d = Double.MAX_VALUE; - for(Position2 i : p) - { + for (Position2 i : p) { double dx = i.distance(px); - if(dx < d) - { + if (dx < d) { d = dx; pr = i; } } - if(pr != null) - { + if (pr != null) { e.getEntity().getWorld().playSound(e.getEntity().getLocation(), Sound.ITEM_TRIDENT_THROW, 1f, 1.6f); ((EnderSignal) e.getEntity()).setTargetLocation(new Location(e.getEntity().getWorld(), pr.getX(), 40, pr.getZ())); } 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 b9da63fa9..c3a2265d6 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java @@ -25,25 +25,25 @@ import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregenTask; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.IrisEngineCompound; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.data.chunk.MCATerrainChunk; import com.volmit.iris.engine.data.chunk.TerrainChunk; -import com.volmit.iris.util.nbt.mca.NBTWorld; -import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.engine.framework.headless.HeadlessGenerator; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.util.parallel.BurstExecutor; -import com.volmit.iris.util.parallel.MultiBurst; +import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.io.ReactiveFolder; import com.volmit.iris.util.math.M; +import com.volmit.iris.util.nbt.mca.NBTWorld; +import com.volmit.iris.util.nbt.tag.CompoundTag; +import com.volmit.iris.util.parallel.BurstExecutor; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.reflect.V; import com.volmit.iris.util.scheduling.ChronoLatch; @@ -101,19 +101,15 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce @Override protected long loop() { PrecisionStopwatch p = PrecisionStopwatch.start(); - if(!tickHotloader()) - { + if (!tickHotloader()) { hotloaderMisses++; - } - - else - { + } else { hotloaderMisses = 0; } - lastHotloadTime+= p.getMilliseconds(); + lastHotloadTime += p.getMilliseconds(); lastHotloadTime /= 2; - return 120 + (long)(lastHotloadTime/2) + Math.min(hotloaderMisses * 125, 1375); + return 120 + (long) (lastHotloadTime / 2) + Math.min(hotloaderMisses * 125, 1375); } }; ticker.setPriority(Thread.MIN_PRIORITY); @@ -122,8 +118,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce cleaner = new Looper() { @Override protected long loop() { - if(getComposite() != null) - { + if (getComposite() != null) { getComposite().clean(); } @@ -134,8 +129,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce cleaner.setName("Iris Parallax Manager"); cleaner.start(); - if(isStudio()) - { + if (isStudio()) { ticker.start(); } @@ -733,8 +727,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce @Override public void close() { - if(isStudio()) - { + if (isStudio()) { ticker.interrupt(); } 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 b97c6d25c..662892b8e 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java @@ -21,15 +21,15 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.actuator.IrisTerrainNormalActuator; -import com.volmit.iris.util.data.DataProvider; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.util.parallel.MultiBurst; +import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.data.DataProvider; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.parallel.MultiBurst; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import org.bukkit.command.CommandSender; 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 72bc16138..91528e54c 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java @@ -18,10 +18,10 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.util.data.B; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; import org.bukkit.block.data.BlockData; public interface EngineDecorator extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java index 350c40413..3df7d8086 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.documentation.BlockCoordinates; +import com.volmit.iris.util.hunk.Hunk; public interface EngineModifier extends EngineComponent { @BlockCoordinates 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 fc18fd7ed..6530674e0 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java @@ -22,11 +22,11 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.util.data.B; -import com.volmit.iris.util.data.DataProvider; +import com.volmit.iris.engine.jigsaw.PlannedStructure; import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomeMutation; +import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; import com.volmit.iris.engine.object.feature.IrisFeature; import com.volmit.iris.engine.object.feature.IrisFeaturePositional; @@ -37,22 +37,22 @@ import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.objects.IrisObjectScale; import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.jigsaw.PlannedStructure; -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.util.parallel.BurstExecutor; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; +import com.volmit.iris.util.data.B; +import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.function.Consumer4; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Chunk; @@ -225,10 +225,10 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { } } - pos.add(forEachFeature(x<<4, z<<4)); - pos.add(forEachFeature(((x+1)<<4)-1, z<<4)); - pos.add(forEachFeature(x<<4, ((z+1)<<4)-1)); - pos.add(forEachFeature(((x+1)<<4)-1, ((z+1)<<4)-1)); + pos.add(forEachFeature(x << 4, z << 4)); + pos.add(forEachFeature(((x + 1) << 4) - 1, z << 4)); + pos.add(forEachFeature(x << 4, ((z + 1) << 4) - 1)); + pos.add(forEachFeature(((x + 1) << 4) - 1, ((z + 1) << 4) - 1)); pos.removeDuplicates(); return pos; } @@ -598,10 +598,9 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { } for (IrisFeaturePotential j : p.getAddFeatures()) { - if(j.hasZone(rng, xx >> 4, zz >> 4)) - { + if (j.hasZone(rng, xx >> 4, zz >> 4)) { ParallaxChunkMeta rw = getParallaxAccess().getMetaRW(xx >> 4, zz >> 4); - rw.getFeatures().add(new IrisFeaturePositional(xx+1, zz-1, j.getZone())); + rw.getFeatures().add(new IrisFeaturePositional(xx + 1, zz - 1, j.getZone())); } } } @@ -646,10 +645,9 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { } for (IrisFeaturePotential j : objectPlacement.getAddFeatures()) { - if(j.hasZone(rng, xx >> 4, zz >> 4)) - { + if (j.hasZone(rng, xx >> 4, zz >> 4)) { ParallaxChunkMeta rw = getParallaxAccess().getMetaRW(xx >> 4, zz >> 4); - rw.getFeatures().add(new IrisFeaturePositional(xx+1, zz-1, j.getZone())); + rw.getFeatures().add(new IrisFeaturePositional(xx + 1, zz - 1, j.getZone())); } } } diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java index 4679b675b..56235322b 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java @@ -20,8 +20,8 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.object.common.IrisWorld; +import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.parallax.ParallaxWorld; import com.volmit.iris.util.parallel.MultiBurst; import lombok.Data; 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 aae2befcb..7c5cabf85 100644 --- a/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java +++ b/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.core.gui.components.Renderer; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.parallax.ParallaxAccess; +import com.volmit.iris.util.data.DataProvider; public interface GeneratorAccess extends DataProvider, Renderer { IrisRegion getRegion(int x, int z); 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 caf624a54..9eb9dcb14 100644 --- a/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java +++ b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java @@ -21,16 +21,16 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.util.data.DataProvider; -import com.volmit.iris.util.nbt.mca.NBTWorld; import com.volmit.iris.engine.framework.headless.HeadlessGenerator; import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.util.parallel.MultiBurst; +import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.nbt.mca.NBTWorld; +import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/engine/framework/LootProvider.java b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java index 1244a3264..b2a662031 100644 --- a/src/main/java/com/volmit/iris/engine/framework/LootProvider.java +++ b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.object.meta.InventorySlotType; import com.volmit.iris.engine.object.loot.IrisLootReference; import com.volmit.iris.engine.object.loot.IrisLootTable; +import com.volmit.iris.engine.object.meta.InventorySlotType; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import org.bukkit.block.Block; 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 4f6c7e5ce..5bcc2df6a 100644 --- a/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java +++ b/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.data.chunk.TerrainChunk; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/engine/framework/headless/HeadlessGenerator.java b/src/main/java/com/volmit/iris/engine/framework/headless/HeadlessGenerator.java index 6ae42195c..33078370e 100644 --- a/src/main/java/com/volmit/iris/engine/framework/headless/HeadlessGenerator.java +++ b/src/main/java/com/volmit/iris/engine/framework/headless/HeadlessGenerator.java @@ -20,12 +20,12 @@ package com.volmit.iris.engine.framework.headless; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.pregenerator.PregenListener; -import com.volmit.iris.util.nbt.mca.MCAUtil; -import com.volmit.iris.util.nbt.mca.NBTWorld; import com.volmit.iris.engine.framework.EngineCompositeGenerator; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.Position2; +import com.volmit.iris.util.nbt.mca.MCAUtil; +import com.volmit.iris.util.nbt.mca.NBTWorld; +import com.volmit.iris.util.parallel.MultiBurst; import lombok.Data; import java.io.File; diff --git a/src/main/java/com/volmit/iris/engine/framework/headless/HeadlessWorld.java b/src/main/java/com/volmit/iris/engine/framework/headless/HeadlessWorld.java index 9228ac9ba..401e83bc8 100644 --- a/src/main/java/com/volmit/iris/engine/framework/headless/HeadlessWorld.java +++ b/src/main/java/com/volmit/iris/engine/framework/headless/HeadlessWorld.java @@ -22,8 +22,8 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.tools.IrisWorlds; import com.volmit.iris.engine.framework.EngineCompositeGenerator; -import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.object.common.IrisWorld; +import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.util.plugin.VolmitSender; import lombok.Data; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java b/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java index 7902ac9b4..10c614a03 100644 --- a/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java +++ b/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.framework.placer; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.common.IObjectPlacer; +import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.util.math.RNG; import org.bukkit.block.TileState; 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 e6efe60b8..0cc946770 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -25,7 +25,6 @@ import com.volmit.iris.core.tools.IrisWorlds; import com.volmit.iris.engine.framework.EngineParallaxManager; import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.object.entity.IrisEntity; import com.volmit.iris.engine.object.feature.IrisFeature; @@ -36,6 +35,7 @@ import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure; import com.volmit.iris.engine.object.objects.*; import com.volmit.iris.engine.parallax.ParallaxChunkMeta; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.math.RNG; import lombok.Data; import org.bukkit.Axis; 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 c54ad9ec3..13ab2cd30 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java @@ -18,17 +18,17 @@ package com.volmit.iris.engine.modifier; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.noise.FastNoiseDouble; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.carve.IrisCaveLayer; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.B; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.FastNoiseDouble; +import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier2.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier2.java index 7a0bb1acc..bb496eaae 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier2.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier2.java @@ -18,15 +18,15 @@ package com.volmit.iris.engine.modifier; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.noise.FastNoiseDouble; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.B; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.FastNoiseDouble; +import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.block.data.BlockData; 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 0f349a031..2bf4694e2 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java @@ -20,12 +20,12 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.data.HeightMap; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.block.data.BlockData; 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 fb58f0c29..303686b51 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -19,12 +19,12 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.Iris; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.common.CaveResult; +import com.volmit.iris.util.data.B; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Material; 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 e0b9f118a..8563d032c 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java @@ -18,16 +18,16 @@ package com.volmit.iris.engine.modifier; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.noise.NoiseStyle; +import com.volmit.iris.util.data.B; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.MathHelper; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java index 7e0b8a8ba..e4a7310c6 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java @@ -24,11 +24,11 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.project.loader.IrisRegistrant; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.B; -import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.block.IrisBlockDrops; +import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.engine.object.decoration.IrisDecorator; import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; import com.volmit.iris.engine.object.feature.IrisFeaturePotential; @@ -41,15 +41,15 @@ import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.spawners.IrisSpawner; -import com.volmit.iris.util.noise.CNG; -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.collection.KMap; import com.volmit.iris.util.collection.KSet; +import com.volmit.iris.util.data.B; +import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.data.VanillaBiomeMap; import com.volmit.iris.util.inventorygui.RandomColor; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeGeneratorLink.java index a9794ac3b..0eae19230 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeGeneratorLink.java @@ -19,10 +19,10 @@ package com.volmit.iris.engine.object.biome; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.DataProvider; -import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.noise.IrisGenerator; +import com.volmit.iris.util.data.DataProvider; +import com.volmit.iris.util.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java index 6d0d3b371..b0b01981c 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java +++ b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeMutation.java @@ -19,12 +19,12 @@ package com.volmit.iris.engine.object.biome; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KSet; +import com.volmit.iris.util.data.DataProvider; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java index 263f3a8c7..914ff0d03 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java @@ -20,14 +20,14 @@ package com.volmit.iris.engine.object.biome; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.block.IrisBlockData; import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; import com.volmit.iris.engine.object.noise.IrisSlopeClip; import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java b/src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java index eef41d48d..c8fa40f38 100644 --- a/src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java +++ b/src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java @@ -20,12 +20,12 @@ package com.volmit.iris.engine.object.block; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.B; import com.volmit.iris.core.project.loader.IrisRegistrant; +import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.data.B; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/block/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/engine/object/block/IrisMaterialPalette.java index adcf5f975..6e85779e7 100644 --- a/src/main/java/com/volmit/iris/engine/object/block/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/engine/object/block/IrisMaterialPalette.java @@ -20,15 +20,15 @@ package com.volmit.iris.engine.object.block; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.util.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.engine.object.noise.IrisGeneratorStyle; +import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/carve/IrisCarveLayer.java b/src/main/java/com/volmit/iris/engine/object/carve/IrisCarveLayer.java index 8cbbadd9e..17df021a5 100644 --- a/src/main/java/com/volmit/iris/engine/object/carve/IrisCarveLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/carve/IrisCarveLayer.java @@ -20,17 +20,17 @@ package com.volmit.iris.engine.object.carve; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.interpolation.IrisInterpolation; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.util.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.stream.ProceduralStream; -import com.volmit.iris.util.stream.interpolation.Interpolated; +import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; +import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/carve/IrisCaveFluid.java b/src/main/java/com/volmit/iris/engine/object/carve/IrisCaveFluid.java index cb303a93f..fad1f51c4 100644 --- a/src/main/java/com/volmit/iris/engine/object/carve/IrisCaveFluid.java +++ b/src/main/java/com/volmit/iris/engine/object/carve/IrisCaveFluid.java @@ -20,12 +20,12 @@ package com.volmit.iris.engine.object.carve; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.B; -import com.volmit.iris.engine.object.block.IrisBlockData; 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.block.IrisBlockData; +import com.volmit.iris.util.data.B; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/carve/IrisCavernZone.java b/src/main/java/com/volmit/iris/engine/object/carve/IrisCavernZone.java index 17eddfa15..24e233b81 100644 --- a/src/main/java/com/volmit/iris/engine/object/carve/IrisCavernZone.java +++ b/src/main/java/com/volmit/iris/engine/object/carve/IrisCavernZone.java @@ -25,8 +25,8 @@ import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.stream.ProceduralStream; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/carve/IrisCaverns.java b/src/main/java/com/volmit/iris/engine/object/carve/IrisCaverns.java index 202deeae2..9e9da1f56 100644 --- a/src/main/java/com/volmit/iris/engine/object/carve/IrisCaverns.java +++ b/src/main/java/com/volmit/iris/engine/object/carve/IrisCaverns.java @@ -25,10 +25,10 @@ import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; import com.volmit.iris.engine.object.noise.IrisInterpolator3D; import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java b/src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java index b76bcd709..3e7b6b4a1 100644 --- a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java +++ b/src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java @@ -20,8 +20,8 @@ package com.volmit.iris.engine.object.compat; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.util.data.B; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.scheduling.J; diff --git a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityBlockFilter.java b/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityBlockFilter.java index 3ab45634a..c4249d5eb 100644 --- a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityBlockFilter.java +++ b/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityBlockFilter.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.object.compat; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.util.data.B; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityItemFilter.java b/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityItemFilter.java index 1dee92005..50de87a6a 100644 --- a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityItemFilter.java +++ b/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityItemFilter.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.object.compat; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.B; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.util.data.B; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; diff --git a/src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java b/src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java index b5a5e5874..7703d2840 100644 --- a/src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java @@ -21,14 +21,14 @@ package com.volmit.iris.engine.object.decoration; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.block.IrisBlockData; import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java index 3f09d990c..c78be70e0 100644 --- a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.project.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.DataProvider; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.biome.InferredType; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomeCustom; @@ -46,12 +46,12 @@ import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.engine.object.trees.IrisTreeSettings; -import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -340,19 +340,17 @@ public class IrisDimension extends IrisRegistrant { private final transient AtomicCache featuresUsed = new AtomicCache<>(); private final transient AtomicCache> strongholdsCache = new AtomicCache<>(); - public KList getStrongholds(long seed) - { + public KList getStrongholds(long seed) { return strongholdsCache.aquire(() -> { KList pos = new KList<>(); int jump = strongholdJumpDistance; RNG rng = new RNG((seed * 223) + 12945); - for(int i = 0; i < maxStrongholds; i++) - { + for (int i = 0; i < maxStrongholds; i++) { int m = i + 1; pos.add(new Position2( - (int) ((rng.i( jump * i) + (jump * i)) * (rng.b() ? -1D : 1D)), - (int) ((rng.i( jump * i) + (jump * i)) * (rng.b() ? -1D : 1D)) + (int) ((rng.i(jump * i) + (jump * i)) * (rng.b() ? -1D : 1D)), + (int) ((rng.i(jump * i) + (jump * i)) * (rng.b() ? -1D : 1D)) )); } diff --git a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java b/src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java index b0450d25f..56887612f 100644 --- a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java +++ b/src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java @@ -157,8 +157,7 @@ public class IrisEntity extends IrisRegistrant { public Entity spawn(Engine gen, Location at, RNG rng) { Entity e = doSpawn(at); - if(e == null) - { + if (e == null) { return null; } @@ -291,13 +290,9 @@ public class IrisEntity extends IrisRegistrant { // Due to the structure of iris, we will call it sync and busy wait until it's done. AtomicReference ae = new AtomicReference<>(); - try - { + try { J.s(() -> ae.set(doSpawn(at))); - } - - catch(Throwable e) - { + } catch (Throwable e) { return null; } PrecisionStopwatch p = PrecisionStopwatch.start(); @@ -305,8 +300,7 @@ public class IrisEntity extends IrisRegistrant { while (ae.get() == null) { J.sleep(25); - if(p.getMilliseconds() > 500) - { + if (p.getMilliseconds() > 500) { return null; } } diff --git a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java b/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java index dbd2692c4..c6913ba2a 100644 --- a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java @@ -24,14 +24,14 @@ import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineFramework; import com.volmit.iris.engine.modifier.IrisCaveModifier; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.common.CaveResult; import com.volmit.iris.engine.object.common.IRare; +import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.RNG; @@ -136,7 +136,8 @@ public class IrisEntitySpawn implements IRare { try { IrisEntity irisEntity = getRealEntity(g); - if (!irisEntity.getSurface().matches(at.clone().subtract(0, 1, 0).getBlock().getState())) return null; //Make sure it can spawn on the block + if (!irisEntity.getSurface().matches(at.clone().subtract(0, 1, 0).getBlock().getState())) + return null; //Make sure it can spawn on the block Entity e = irisEntity.spawn(g, at.add(0.5, 0, 0.5), rng.aquire(() -> new RNG(g.getTarget().getWorld().seed() + 4))); if (e != null) { diff --git a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeature.java b/src/main/java/com/volmit/iris/engine/object/feature/IrisFeature.java index f9cd01fca..833b1ee73 100644 --- a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeature.java +++ b/src/main/java/com/volmit/iris/engine/object/feature/IrisFeature.java @@ -20,13 +20,13 @@ package com.volmit.iris.engine.object.feature; import com.google.gson.Gson; import com.volmit.iris.engine.data.cache.AtomicCache; +import com.volmit.iris.engine.object.annotations.*; +import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; +import com.volmit.iris.engine.object.spawners.IrisSpawner; +import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.interpolation.IrisInterpolation; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.spawners.IrisSpawner; -import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java b/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java index c1e10a6fe..dc686bb91 100644 --- a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java +++ b/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java @@ -21,12 +21,12 @@ package com.volmit.iris.engine.object.feature; import com.google.gson.Gson; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.interpolation.IrisInterpolation; -import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.function.NoiseProvider; +import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java b/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java index 04134af90..87e9e2526 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java +++ b/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java @@ -19,16 +19,16 @@ package com.volmit.iris.engine.object.jigsaw; import com.volmit.iris.Iris; -import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.core.project.loader.IrisRegistrant; -import com.volmit.iris.engine.object.objects.ObjectPlaceMode; +import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; +import com.volmit.iris.engine.object.objects.ObjectPlaceMode; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPieceConnector.java b/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPieceConnector.java index 2bad62050..05cde512f 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPieceConnector.java +++ b/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPieceConnector.java @@ -18,10 +18,10 @@ package com.volmit.iris.engine.object.jigsaw; -import com.volmit.iris.engine.object.objects.IrisDirection; -import com.volmit.iris.engine.object.entity.IrisEntity; -import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.engine.object.annotations.*; +import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.entity.IrisEntity; +import com.volmit.iris.engine.object.objects.IrisDirection; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java b/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java index eb65b3390..143427054 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java +++ b/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java @@ -19,10 +19,10 @@ package com.volmit.iris.engine.object.jigsaw; import com.volmit.iris.Iris; -import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.feature.IrisFeature; import com.volmit.iris.core.project.loader.IrisRegistrant; +import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; +import com.volmit.iris.engine.object.feature.IrisFeature; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/loot/IrisLoot.java b/src/main/java/com/volmit/iris/engine/object/loot/IrisLoot.java index 6df2f090c..5eea41af5 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/loot/IrisLoot.java @@ -20,17 +20,17 @@ package com.volmit.iris.engine.object.loot; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.B; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.meta.InventorySlotType; import com.volmit.iris.engine.object.meta.IrisAttributeModifier; import com.volmit.iris.engine.object.meta.IrisEnchantment; import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java b/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java index 5bf2c01d6..5c1630ac6 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java +++ b/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java @@ -19,12 +19,12 @@ package com.volmit.iris.engine.object.loot; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.DataProvider; 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.RegistryListResource; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.data.DataProvider; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java b/src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java index 5f75769a4..2f6a2656e 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java +++ b/src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.object.loot; -import com.volmit.iris.engine.object.meta.InventorySlotType; import com.volmit.iris.core.project.loader.IrisRegistrant; 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.engine.object.meta.InventorySlotType; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java b/src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java index c03f14e60..0dc83583e 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java +++ b/src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.object.mods; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.core.project.loader.IrisRegistrant; import com.volmit.iris.engine.object.annotations.*; +import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.engine.object.objects.IrisObjectReplace; +import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeInjector.java b/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeInjector.java index 8a39727f1..ab3c7e441 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeInjector.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.object.mods; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeReplacer.java b/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeReplacer.java index d08416ce6..bca8cc168 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeReplacer.java @@ -18,11 +18,11 @@ package com.volmit.iris.engine.object.mods; -import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModNoiseStyleReplacer.java b/src/main/java/com/volmit/iris/engine/object/mods/IrisModNoiseStyleReplacer.java index 4ca456eb4..b1d33d44a 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModNoiseStyleReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/mods/IrisModNoiseStyleReplacer.java @@ -18,13 +18,13 @@ package com.volmit.iris.engine.object.mods; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; +import com.volmit.iris.engine.object.noise.NoiseStyle; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementBiomeInjector.java b/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementBiomeInjector.java index ee2dfd618..7f456d30e 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementBiomeInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementBiomeInjector.java @@ -18,11 +18,11 @@ package com.volmit.iris.engine.object.mods; -import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementRegionInjector.java b/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementRegionInjector.java index 524e410a0..f9a1c8a72 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementRegionInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementRegionInjector.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.object.mods; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; +import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectReplacer.java b/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectReplacer.java index 4f01a2c8f..eee5ea9c1 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectReplacer.java @@ -18,11 +18,11 @@ package com.volmit.iris.engine.object.mods; -import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModRegionReplacer.java b/src/main/java/com/volmit/iris/engine/object/mods/IrisModRegionReplacer.java index b9359509d..ba4697761 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModRegionReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/mods/IrisModRegionReplacer.java @@ -18,11 +18,11 @@ package com.volmit.iris.engine.object.mods; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java index 085e87df8..578070b1d 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java @@ -22,15 +22,15 @@ import com.dfsek.paralithic.Expression; import com.dfsek.paralithic.eval.parser.Parser; import com.dfsek.paralithic.eval.parser.Scope; import com.volmit.iris.Iris; -import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.core.project.loader.IrisRegistrant; +import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java index bcb8fedd5..c393bdd3f 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java @@ -22,8 +22,8 @@ import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.stream.ProceduralStream; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java index eb72ef5c8..bbc1393d0 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java @@ -19,14 +19,14 @@ package com.volmit.iris.engine.object.noise; import com.volmit.iris.Iris; -import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.core.project.loader.IrisRegistrant; -import com.volmit.iris.util.noise.CellGenerator; +import com.volmit.iris.engine.data.cache.AtomicCache; 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.interpolation.IrisInterpolation; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CellGenerator; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java index 7bcefd51a..2bcf60bcc 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java @@ -20,13 +20,13 @@ package com.volmit.iris.engine.object.noise; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.util.noise.ExpressionNoise; 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.RegistryListResource; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; +import com.volmit.iris.util.noise.ExpressionNoise; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator.java index d73057ad7..c38fbcade 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator.java @@ -18,13 +18,13 @@ package com.volmit.iris.engine.object.noise; -import com.volmit.iris.util.interpolation.InterpolationMethod; -import com.volmit.iris.util.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.util.interpolation.InterpolationMethod; +import com.volmit.iris.util.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator3D.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator3D.java index 9afcff605..9154cee0b 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator3D.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator3D.java @@ -18,13 +18,13 @@ package com.volmit.iris.engine.object.noise; -import com.volmit.iris.util.interpolation.InterpolationMethod3D; -import com.volmit.iris.util.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.NoiseProvider3; +import com.volmit.iris.util.interpolation.InterpolationMethod3D; +import com.volmit.iris.util.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisNoiseGenerator.java index 0ff34c708..7a9118bf5 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisNoiseGenerator.java @@ -20,11 +20,11 @@ package com.volmit.iris.engine.object.noise; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.interpolation.IrisInterpolation; -import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisStyledRange.java b/src/main/java/com/volmit/iris/engine/object/noise/IrisStyledRange.java index 877992bd7..a421d15c3 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisStyledRange.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/IrisStyledRange.java @@ -20,10 +20,10 @@ package com.volmit.iris.engine.object.noise; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.stream.ProceduralStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java b/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java index 620a8a185..7eebe66c6 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.object.noise; +import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.noise.CNGFactory; import com.volmit.iris.util.noise.NoiseType; -import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.math.RNG; @Desc("Styles of noise") diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java b/src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java index c80e4b2c3..ab1e824fa 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java +++ b/src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java @@ -20,17 +20,17 @@ package com.volmit.iris.engine.object.objects; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.B; -import com.volmit.iris.engine.framework.placer.HeightmapObjectPlacer; -import com.volmit.iris.util.interpolation.IrisInterpolation; -import com.volmit.iris.engine.object.basic.IrisPosition; import com.volmit.iris.core.project.loader.IrisRegistrant; +import com.volmit.iris.engine.data.cache.AtomicCache; +import com.volmit.iris.engine.framework.placer.HeightmapObjectPlacer; +import com.volmit.iris.engine.object.basic.IrisPosition; 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.util.collection.KList; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.data.B; +import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.math.AxisAlignedBB; import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.Position2; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLoot.java b/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLoot.java index 97c422c34..5382111ca 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLoot.java @@ -20,12 +20,12 @@ package com.volmit.iris.engine.object.objects; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.loot.IrisLootTable; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.block.IrisBlockData; +import com.volmit.iris.engine.object.loot.IrisLootTable; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacement.java index b0fd57680..c8217d27a 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacement.java @@ -21,9 +21,7 @@ package com.volmit.iris.engine.object.objects; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.B; -import com.volmit.iris.util.data.DataProvider; -import com.volmit.iris.util.interpolation.InterpolationMethod; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.feature.IrisFeaturePotential; import com.volmit.iris.engine.object.loot.IrisLootTable; import com.volmit.iris.engine.object.noise.CarvingMode; @@ -32,12 +30,14 @@ import com.volmit.iris.engine.object.noise.IrisNoiseGenerator; import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.engine.object.trees.IrisTree; import com.volmit.iris.engine.object.trees.IrisTreeSize; -import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; 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; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectReplace.java b/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectReplace.java index c11087b61..0176b19ca 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectReplace.java @@ -20,12 +20,12 @@ package com.volmit.iris.engine.object.objects; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.block.IrisBlockData; import com.volmit.iris.engine.object.block.IrisMaterialPalette; -import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java index da26068a9..3818dda10 100644 --- a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java @@ -23,10 +23,11 @@ import com.volmit.iris.core.gui.components.RenderType; import com.volmit.iris.core.project.loader.IrisData; import com.volmit.iris.core.project.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.util.data.DataProvider; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.biome.InferredType; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.block.IrisBlockDrops; +import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; import com.volmit.iris.engine.object.feature.IrisFeaturePotential; import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; @@ -36,15 +37,14 @@ import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.engine.object.spawners.IrisSpawner; -import com.volmit.iris.util.noise.CNG; -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.collection.KMap; import com.volmit.iris.util.collection.KSet; +import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.data.VanillaBiomeMap; import com.volmit.iris.util.inventorygui.RandomColor; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegionRidge.java b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegionRidge.java index c6aadc065..91d04e104 100644 --- a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegionRidge.java +++ b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegionRidge.java @@ -19,12 +19,12 @@ package com.volmit.iris.engine.object.regional; import com.volmit.iris.engine.data.cache.AtomicCache; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.engine.object.biome.InferredType; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; -import com.volmit.iris.util.noise.CellGenerator; -import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CellGenerator; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegionSpot.java b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegionSpot.java index 100dd9326..12b15dad3 100644 --- a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegionSpot.java +++ b/src/main/java/com/volmit/iris/engine/object/regional/IrisRegionSpot.java @@ -19,15 +19,15 @@ package com.volmit.iris.engine.object.regional; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.biome.InferredType; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; -import com.volmit.iris.util.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.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.biome.InferredType; +import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CellGenerator; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawnGroup.java b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawnGroup.java index 1b2318b8c..fa5183c95 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawnGroup.java +++ b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawnGroup.java @@ -19,7 +19,6 @@ package com.volmit.iris.engine.object.spawners; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.RegistryListResource; @Desc("Terrain modes are used to decide the generator type currently used") public enum IrisSpawnGroup { diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java index 1f9d5c8d0..762fa32f9 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java +++ b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java @@ -18,12 +18,12 @@ package com.volmit.iris.engine.object.spawners; -import com.volmit.iris.engine.object.basic.IrisRate; import com.volmit.iris.core.project.loader.IrisRegistrant; -import com.volmit.iris.engine.object.basic.IrisTimeBlock; -import com.volmit.iris.engine.object.basic.IrisWeather; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; +import com.volmit.iris.engine.object.basic.IrisRate; +import com.volmit.iris.engine.object.basic.IrisTimeBlock; +import com.volmit.iris.engine.object.basic.IrisWeather; import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.engine.object.entity.IrisEntitySpawn; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java index 0fcf5e9f3..e3d5fad68 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java +++ b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.object.spawners; -import com.volmit.iris.Iris; import com.volmit.iris.engine.object.annotations.Desc; import org.bukkit.Material; import org.bukkit.block.BlockState; @@ -44,6 +43,7 @@ public enum IrisSurface { /** * Check if this Iris surface matches the blockstate provided + * * @param state The blockstate * @return True if it matches */ 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 a03520d42..48fca4570 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 @@ -19,8 +19,8 @@ package com.volmit.iris.engine.object.tile; import com.volmit.iris.Iris; -import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.nbt.tag.CompoundTag; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.TileState; 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 8ce9bda6b..146ce0772 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java @@ -18,10 +18,10 @@ package com.volmit.iris.engine.parallax; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; +import com.volmit.iris.util.hunk.Hunk; 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 b12178e1e..27e4c3589 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.feature.IrisFeaturePositional; import com.volmit.iris.util.hunk.io.HunkIOAdapter; import com.volmit.iris.util.hunk.io.PaletteHunkIOAdapter; -import com.volmit.iris.engine.object.feature.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 7ab5263ec..3e917b9cc 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java @@ -20,19 +20,19 @@ 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.util.format.C; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.io.HunkIOAdapter; import com.volmit.iris.util.hunk.io.HunkRegion; import com.volmit.iris.util.hunk.io.HunkRegionSlice; -import com.volmit.iris.engine.object.tile.TileData; -import com.volmit.iris.util.parallel.GridLock; -import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.parallel.NOOPGridLock; -import com.volmit.iris.util.format.C; 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.oldnbt.Tag; +import com.volmit.iris.util.parallel.GridLock; +import com.volmit.iris.util.parallel.MultiBurst; +import com.volmit.iris.util.parallel.NOOPGridLock; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; 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 00e9226af..332d2c903 100644 --- a/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java @@ -20,14 +20,14 @@ package com.volmit.iris.engine.parallax; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.tile.TileData; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.documentation.RegionCoordinates; import com.volmit.iris.util.format.C; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.parallel.MultiBurst; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/util/data/B.java b/src/main/java/com/volmit/iris/util/data/B.java index a464185b6..b13d3bd65 100644 --- a/src/main/java/com/volmit/iris/util/data/B.java +++ b/src/main/java/com/volmit/iris/util/data/B.java @@ -203,7 +203,8 @@ public class B { //If we get to here, the state is okay so we can use it newStates.put(key, stateMap.get(key)); - } catch (IllegalArgumentException ignored) { } + } catch (IllegalArgumentException ignored) { + } } //Combine all the "good" states again diff --git a/src/main/java/com/volmit/iris/util/data/DataPalette.java b/src/main/java/com/volmit/iris/util/data/DataPalette.java index dbe99d16c..95d9edc11 100644 --- a/src/main/java/com/volmit/iris/util/data/DataPalette.java +++ b/src/main/java/com/volmit/iris/util/data/DataPalette.java @@ -39,12 +39,9 @@ public class DataPalette { return palette; } - public T get(int index) - { - synchronized (palette) - { - if(!palette.hasIndex(index)) - { + public T get(int index) { + synchronized (palette) { + if (!palette.hasIndex(index)) { return null; } diff --git a/src/main/java/com/volmit/iris/util/hunk/Hunk.java b/src/main/java/com/volmit/iris/util/hunk/Hunk.java index ad277c19b..1d8ecc118 100644 --- a/src/main/java/com/volmit/iris/util/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/Hunk.java @@ -18,19 +18,19 @@ package com.volmit.iris.util.hunk; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.function.*; import com.volmit.iris.util.hunk.io.HunkIOAdapter; import com.volmit.iris.util.hunk.storage.*; import com.volmit.iris.util.hunk.view.*; import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.interpolation.InterpolationMethod3D; import com.volmit.iris.util.interpolation.IrisInterpolation; +import com.volmit.iris.util.math.BlockPosition; +import com.volmit.iris.util.oldnbt.ByteArrayTag; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.stream.interpolation.Interpolated; -import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.function.*; -import com.volmit.iris.util.math.BlockPosition; -import com.volmit.iris.util.oldnbt.ByteArrayTag; import org.bukkit.Chunk; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; @@ -984,23 +984,19 @@ public interface Hunk { return getRaw(x >= getWidth() ? getWidth() - 1 : x < 0 ? 0 : x, y >= getHeight() ? getHeight() - 1 : y < 0 ? 0 : y, z >= getDepth() ? getDepth() - 1 : z < 0 ? 0 : z); } - default BlockPosition getCenter() - { + default BlockPosition getCenter() { return new BlockPosition(getCenterX(), getCenterY(), getCenterZ()); } - default int getCenterX() - { + default int getCenterX() { return Math.round(getWidth() / 2); } - default int getCenterY() - { + default int getCenterY() { return Math.round(getHeight() / 2); } - default int getCenterZ() - { + default int getCenterZ() { return Math.round(getDepth() / 2); } diff --git a/src/main/java/com/volmit/iris/util/hunk/io/BasicHunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/BasicHunkIOAdapter.java index 5249917f2..29971a726 100644 --- a/src/main/java/com/volmit/iris/util/hunk/io/BasicHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/BasicHunkIOAdapter.java @@ -19,8 +19,8 @@ package com.volmit.iris.util.hunk.io; import com.volmit.iris.Iris; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.hunk.Hunk; import java.io.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/com/volmit/iris/util/hunk/io/HunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/HunkIOAdapter.java index e82284ac2..4348c2745 100644 --- a/src/main/java/com/volmit/iris/util/hunk/io/HunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/HunkIOAdapter.java @@ -19,8 +19,8 @@ package com.volmit.iris.util.hunk.io; import com.volmit.iris.util.data.IOAdapter; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.io.CustomOutputStream; import com.volmit.iris.util.oldnbt.ByteArrayTag; diff --git a/src/main/java/com/volmit/iris/util/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/util/hunk/io/HunkRegionSlice.java index b4a9f3966..c7d7b00f3 100644 --- a/src/main/java/com/volmit/iris/util/hunk/io/HunkRegionSlice.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/HunkRegionSlice.java @@ -19,19 +19,19 @@ package com.volmit.iris.util.hunk.io; import com.volmit.iris.Iris; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.engine.object.tile.TileData; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.oldnbt.ByteArrayTag; import com.volmit.iris.util.oldnbt.CompoundTag; import com.volmit.iris.util.oldnbt.Tag; +import com.volmit.iris.util.parallel.MultiBurst; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/util/hunk/io/PaletteHunkIOAdapter.java b/src/main/java/com/volmit/iris/util/hunk/io/PaletteHunkIOAdapter.java index 852447353..fc34f5de7 100644 --- a/src/main/java/com/volmit/iris/util/hunk/io/PaletteHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/util/hunk/io/PaletteHunkIOAdapter.java @@ -20,8 +20,8 @@ package com.volmit.iris.util.hunk.io; import com.volmit.iris.Iris; import com.volmit.iris.util.data.DataPalette; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.hunk.Hunk; import java.io.*; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java b/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java index 713ab508c..85e726a5e 100644 --- a/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/storage/MappedHunk.java @@ -18,9 +18,9 @@ package com.volmit.iris.util.hunk.storage; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.function.Consumer4; +import com.volmit.iris.util.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/util/hunk/view/ListeningHunk.java b/src/main/java/com/volmit/iris/util/hunk/view/ListeningHunk.java index 293c3199a..14d118009 100644 --- a/src/main/java/com/volmit/iris/util/hunk/view/ListeningHunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/ListeningHunk.java @@ -18,8 +18,8 @@ package com.volmit.iris.util.hunk.view; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.Consumer4; +import com.volmit.iris.util.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class ListeningHunk implements Hunk { diff --git a/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java b/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java index d7bd3f50e..eddfb304f 100644 --- a/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java +++ b/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java @@ -19,12 +19,12 @@ package com.volmit.iris.util.interpolation; import com.google.common.util.concurrent.AtomicDouble; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.noise.CNG; import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.function.NoiseProvider3; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.CNG; import java.util.HashMap; diff --git a/src/main/java/com/volmit/iris/util/io/FolderWatcher.java b/src/main/java/com/volmit/iris/util/io/FolderWatcher.java index 516cc4d12..055364668 100644 --- a/src/main/java/com/volmit/iris/util/io/FolderWatcher.java +++ b/src/main/java/com/volmit/iris/util/io/FolderWatcher.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.io; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.math.M; import java.io.File; @@ -96,8 +95,7 @@ public class FolderWatcher extends FileWatcher { } public boolean checkModifiedFast() { - if(watchers == null || watchers.isEmpty()) - { + if (watchers == null || watchers.isEmpty()) { return checkModified(); } diff --git a/src/main/java/com/volmit/iris/util/matter/IrisMatter.java b/src/main/java/com/volmit/iris/util/matter/IrisMatter.java index 92f68641a..071cc21fe 100644 --- a/src/main/java/com/volmit/iris/util/matter/IrisMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/IrisMatter.java @@ -20,15 +20,9 @@ package com.volmit.iris.util.matter; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.io.JarScanner; -import com.volmit.iris.util.matter.slices.BlockMatter; -import com.volmit.iris.util.matter.slices.BooleanMatter; import lombok.Getter; -import org.bukkit.block.data.BlockData; -import java.util.Map; - -public class IrisMatter implements Matter{ +public class IrisMatter implements Matter { private static final KMap, MatterSlice> slicers = buildSlicers(); @Getter @@ -46,8 +40,7 @@ public class IrisMatter implements Matter{ @Getter private KMap, MatterSlice> sliceMap; - public IrisMatter(int width, int height, int depth) - { + public IrisMatter(int width, int height, int depth) { this.width = width; this.height = height; this.depth = depth; @@ -58,8 +51,7 @@ public class IrisMatter implements Matter{ public MatterSlice createSlice(Class type, Matter m) { MatterSlice slice = slicers.get(type); - if(slice == null) - { + if (slice == null) { return null; } @@ -68,8 +60,7 @@ public class IrisMatter implements Matter{ private static KMap, MatterSlice> buildSlicers() { KMap, MatterSlice> c = new KMap<>(); - for(Object i : Iris.initialize("com.volmit.iris.util.matter.slices", Sliced.class)) - { + for (Object i : Iris.initialize("com.volmit.iris.util.matter.slices", Sliced.class)) { MatterSlice s = (MatterSlice) i; c.put(s.getType(), s); } diff --git a/src/main/java/com/volmit/iris/util/matter/Matter.java b/src/main/java/com/volmit/iris/util/matter/Matter.java index 45c43cb58..35cfb335d 100644 --- a/src/main/java/com/volmit/iris/util/matter/Matter.java +++ b/src/main/java/com/volmit/iris/util/matter/Matter.java @@ -28,7 +28,7 @@ import java.util.function.Function; /** * When Red Matter isn't enough - * + *

* UVI width * UVI height * UVI depth @@ -36,135 +36,136 @@ import java.util.function.Function; * UTF author * UVL createdAt * UVI version - * UTF sliceType (canonical class name) - * UVI nodeCount (for each slice) - * UVI position [(z * w * h) + (y * w) + x] - * ??? nodeData - * + * UTF sliceType (canonical class name) + * UVI nodeCount (for each slice) + * UVI position [(z * w * h) + (y * w) + x] + * ??? nodeData */ public interface Matter { int VERSION = 1; /** * Get the header information + * * @return the header info */ MatterHeader getHeader(); /** * Get the width of this matter + * * @return the width */ int getWidth(); /** * Get the height of this matter + * * @return the height */ int getHeight(); /** * Get the depth of this matter + * * @return the depth */ int getDepth(); /** * Get the center of this matter + * * @return the center */ - default BlockPosition getCenter() - { + default BlockPosition getCenter() { return new BlockPosition(getCenterX(), getCenterY(), getCenterZ()); } /** * Create a slice from the given type - * @param type the type class + * + * @param type the type class * @param matter the matter this slice will go into (size provider) - * @param the type + * @param the type * @return the slice (or null if not supported) */ MatterSlice createSlice(Class type, Matter matter); /** * Get the size of this matter + * * @return the size */ - default BlockPosition getSize() - { + default BlockPosition getSize() { return new BlockPosition(getWidth(), getHeight(), getDepth()); } /** * Get the center X of this matter + * * @return the center X */ - default int getCenterX() - { + default int getCenterX() { return Math.round(getWidth() / 2); } /** * Get the center Y of this matter + * * @return the center Y */ - default int getCenterY() - { + default int getCenterY() { return Math.round(getHeight() / 2); } /** * Get the center Z of this matter + * * @return the center Z */ - default int getCenterZ() - { + default int getCenterZ() { return Math.round(getDepth() / 2); } /** * Return the slice for the given type - * @param t the type class + * + * @param t the type class * @param the type * @return the slice or null */ - default MatterSlice getSlice(Class t) - { + default MatterSlice getSlice(Class t) { return (MatterSlice) getSliceMap().get(t); } /** * Delete the slice for the given type - * @param c the type class + * + * @param c the type class * @param the type * @return the deleted slice, or null if it diddn't exist */ - default MatterSlice deleteSlice(Class c) - { + default MatterSlice deleteSlice(Class c) { return (MatterSlice) getSliceMap().remove(c); } /** * Put a given slice type - * @param c the slice type class + * + * @param c the slice type class * @param slice the slice to assign to the type - * @param the slice type + * @param the slice type * @return the overwritten slice if there was an existing slice of that type */ - default MatterSlice putSlice(Class c, MatterSlice slice) - { + default MatterSlice putSlice(Class c, MatterSlice slice) { return (MatterSlice) getSliceMap().put(c, slice); } - default MatterSlice slice(Class c) - { - if(!hasSlice(c)) - { + default MatterSlice slice(Class c) { + if (!hasSlice(c)) { MatterSlice s = createSlice(c, this); - if(s == null) - { + if (s == null) { return null; } @@ -176,33 +177,33 @@ public interface Matter { /** * Check if a slice exists for a given type + * * @param c the slice class type * @return true if it exists */ - default boolean hasSlice(Class c) - { + default boolean hasSlice(Class c) { return getSlice(c) != null; } /** * Remove all slices */ - default void clearSlices() - { + default void clearSlices() { getSliceMap().clear(); } /** * Get the set backing the slice map keys (slice types) + * * @return the slice types */ - default Set> getSliceTypes() - { + default Set> getSliceTypes() { return getSliceMap().keySet(); } /** * Get all slices + * * @return the real slice map */ Map, MatterSlice> getSliceMap(); @@ -210,11 +211,11 @@ public interface Matter { /** * Writes the data to the output stream. The data will be flushed to the provided output * stream however the provided stream will NOT BE CLOSED, so be sure to actually close it + * * @param out the output stream * @throws IOException shit happens yo */ - default void write(OutputStream out) throws IOException - { + default void write(OutputStream out) throws IOException { DataOutputStream dos = new DataOutputStream(out); // Write size Varint.writeUnsignedVarInt(getWidth(), dos); @@ -223,8 +224,7 @@ public interface Matter { dos.writeByte(getSliceTypes().size() + Byte.MIN_VALUE); getHeader().write(dos); - for(Class i : getSliceTypes()) - { + for (Class i : getSliceTypes()) { getSlice(i).write(dos); } @@ -234,7 +234,8 @@ public interface Matter { /** * Reads the input stream into a matter object using a matter factory. * Does not close the input stream. Be a man, close it yourself. - * @param in the input stream + * + * @param in the input stream * @param matterFactory the matter factory (size) -> new MatterImpl(size); * @return the matter object * @throws IOException shit happens yo @@ -249,8 +250,7 @@ public interface Matter { int sliceCount = din.readByte() - Byte.MIN_VALUE; matter.getHeader().read(din); - while(sliceCount-- > 0) - { + while (sliceCount-- > 0) { Class type = Class.forName(din.readUTF()); MatterSlice slice = matter.createSlice(type, matter); slice.read(din); diff --git a/src/main/java/com/volmit/iris/util/matter/MatterHeader.java b/src/main/java/com/volmit/iris/util/matter/MatterHeader.java index 5bb119c1b..3548439f3 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterHeader.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterHeader.java @@ -32,15 +32,13 @@ public class MatterHeader { private long createdAt = M.ms(); private int version = Matter.VERSION; - public void write(DataOutputStream out) throws IOException - { + public void write(DataOutputStream out) throws IOException { out.writeUTF(author); Varint.writeUnsignedVarLong(createdAt, out); Varint.writeUnsignedVarInt(version, out); } - public void read(DataInputStream din) throws IOException - { + public void read(DataInputStream din) throws IOException { setAuthor(din.readUTF()); setCreatedAt(Varint.readUnsignedVarLong(din)); setVersion(Varint.readUnsignedVarInt(din)); diff --git a/src/main/java/com/volmit/iris/util/matter/MatterHunk.java b/src/main/java/com/volmit/iris/util/matter/MatterHunk.java index de0590ccf..ef3a5d2e5 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterHunk.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterHunk.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.matter; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.hunk.storage.StorageHunk; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.function.Consumer4; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.hunk.storage.StorageHunk; import lombok.Data; import lombok.EqualsAndHashCode; @@ -38,8 +38,7 @@ public class MatterHunk extends StorageHunk implements Hunk { data = new KMap<>(); } - public int getCount() - { + public int getCount() { return data.size(); } diff --git a/src/main/java/com/volmit/iris/util/matter/MatterPalette.java b/src/main/java/com/volmit/iris/util/matter/MatterPalette.java index 5f8c7bfb2..b4b7e6210 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterPalette.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterPalette.java @@ -18,10 +18,8 @@ package com.volmit.iris.util.matter; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.DataPalette; import com.volmit.iris.util.data.IOAdapter; -import com.volmit.iris.util.data.NibbleDataPalette; import com.volmit.iris.util.data.Varint; import java.io.DataInputStream; @@ -32,8 +30,7 @@ public class MatterPalette implements IOAdapter { private final MatterSlice slice; private final DataPalette palette; - public MatterPalette(MatterSlice slice) - { + public MatterPalette(MatterSlice slice) { this.slice = slice; palette = new DataPalette(); } diff --git a/src/main/java/com/volmit/iris/util/matter/MatterSlice.java b/src/main/java/com/volmit/iris/util/matter/MatterSlice.java index 6e00376ea..a6906fbd9 100644 --- a/src/main/java/com/volmit/iris/util/matter/MatterSlice.java +++ b/src/main/java/com/volmit/iris/util/matter/MatterSlice.java @@ -19,38 +19,35 @@ package com.volmit.iris.util.matter; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.data.Varint; +import com.volmit.iris.util.hunk.Hunk; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -public interface MatterSlice extends Hunk -{ +public interface MatterSlice extends Hunk { Class getType(); void writeNode(T b, DataOutputStream dos) throws IOException; T readNode(DataInputStream din) throws IOException; - default void write(DataOutputStream dos) throws IOException - { + default void write(DataOutputStream dos) throws IOException { int w = getWidth(); int h = getHeight(); dos.writeUTF(getType().getCanonicalName()); MatterPalette palette = new MatterPalette(this); - iterateSync((x,y,z,b) -> palette.assign(b)); + iterateSync((x, y, z, b) -> palette.assign(b)); palette.writePalette(dos); Varint.writeUnsignedVarInt(((MatterHunk) this).getCount(), dos); - iterateSyncIO((x,y,z,b) -> { + iterateSyncIO((x, y, z, b) -> { Varint.writeUnsignedVarInt((z * w * h) + (y * w) + x, dos); palette.writeNode(b, dos); }); } - default void read(DataInputStream din) throws IOException - { + default void read(DataInputStream din) throws IOException { int w = getWidth(); int h = getHeight(); @@ -59,8 +56,7 @@ public interface MatterSlice extends Hunk int nodes = Varint.readUnsignedVarInt(din); int[] pos; - while(nodes-- > 0) - { + while (nodes-- > 0) { pos = Cache.to3D(Varint.readUnsignedVarInt(din), w, h); setRaw(pos[0], pos[1], pos[2], palette.readNode(din)); } diff --git a/src/main/java/com/volmit/iris/util/matter/slices/BlockMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/BlockMatter.java index e906f66b8..c1be8facf 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/BlockMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/BlockMatter.java @@ -29,11 +29,9 @@ import java.io.DataOutputStream; import java.io.IOException; @Sliced -public class BlockMatter extends RawMatter -{ - public BlockMatter() - { - this(1,1,1); +public class BlockMatter extends RawMatter { + public BlockMatter() { + this(1, 1, 1); } public BlockMatter(int width, int height, int depth) { diff --git a/src/main/java/com/volmit/iris/util/matter/slices/BooleanMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/BooleanMatter.java index 0e00a73e1..75bd83e81 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/BooleanMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/BooleanMatter.java @@ -25,11 +25,9 @@ import java.io.DataOutputStream; import java.io.IOException; @Sliced -public class BooleanMatter extends RawMatter -{ - public BooleanMatter() - { - this(1,1,1); +public class BooleanMatter extends RawMatter { + public BooleanMatter() { + this(1, 1, 1); } public BooleanMatter(int width, int height, int depth) { diff --git a/src/main/java/com/volmit/iris/util/matter/slices/CompoundMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/CompoundMatter.java index 827e306b2..18c38fc86 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/CompoundMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/CompoundMatter.java @@ -22,11 +22,9 @@ import com.volmit.iris.util.matter.Sliced; import com.volmit.iris.util.nbt.tag.CompoundTag; @Sliced -public class CompoundMatter extends NBTMatter -{ - public CompoundMatter() - { - this(1,1,1); +public class CompoundMatter extends NBTMatter { + public CompoundMatter() { + this(1, 1, 1); } public CompoundMatter(int width, int height, int depth) { diff --git a/src/main/java/com/volmit/iris/util/matter/slices/IntMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/IntMatter.java index b4be32d94..a50f6ed6d 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/IntMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/IntMatter.java @@ -26,12 +26,11 @@ import java.io.DataOutputStream; import java.io.IOException; @Sliced -public class IntMatter extends RawMatter -{ - public IntMatter() - { - this(1,1,1); +public class IntMatter extends RawMatter { + public IntMatter() { + this(1, 1, 1); } + public IntMatter(int width, int height, int depth) { super(width, height, depth, Integer.class); } diff --git a/src/main/java/com/volmit/iris/util/matter/slices/LongMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/LongMatter.java index badb2467f..56c20f516 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/LongMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/LongMatter.java @@ -26,12 +26,11 @@ import java.io.DataOutputStream; import java.io.IOException; @Sliced -public class LongMatter extends RawMatter -{ - public LongMatter() - { - this(1,1,1); +public class LongMatter extends RawMatter { + public LongMatter() { + this(1, 1, 1); } + public LongMatter(int width, int height, int depth) { super(width, height, depth, Long.class); } diff --git a/src/main/java/com/volmit/iris/util/matter/slices/NBTMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/NBTMatter.java index a1695720b..e7d18d09a 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/NBTMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/NBTMatter.java @@ -19,16 +19,13 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.nbt.io.NBTUtil; -import com.volmit.iris.util.nbt.io.NamedTag; -import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.nbt.tag.Tag; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -public class NBTMatter> extends RawMatter -{ +public class NBTMatter> extends RawMatter { public NBTMatter(int width, int height, int depth, Class c) { super(width, height, depth, c); } diff --git a/src/main/java/com/volmit/iris/util/matter/slices/RawMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/RawMatter.java index e101fcb1b..05dbe373b 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/RawMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/RawMatter.java @@ -20,8 +20,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.matter.MatterHunk; import com.volmit.iris.util.matter.MatterSlice; -import lombok.AllArgsConstructor; -import lombok.Data; import lombok.Getter; import java.io.DataInputStream; @@ -32,8 +30,7 @@ public abstract class RawMatter extends MatterHunk implements MatterSlice< @Getter private final Class type; - public RawMatter(int width, int height, int depth, Class type) - { + public RawMatter(int width, int height, int depth, Class type) { super(width, height, depth); this.type = type; } diff --git a/src/main/java/com/volmit/iris/util/matter/slices/StringMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/StringMatter.java index 7736e751c..4646a8f4e 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/StringMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/StringMatter.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.matter.slices; -import com.volmit.iris.util.matter.MatterSlice; import com.volmit.iris.util.matter.Sliced; import java.io.DataInputStream; @@ -26,12 +25,11 @@ import java.io.DataOutputStream; import java.io.IOException; @Sliced -public class StringMatter extends RawMatter -{ - public StringMatter() - { - this(1,1,1); +public class StringMatter extends RawMatter { + public StringMatter() { + this(1, 1, 1); } + public StringMatter(int width, int height, int depth) { super(width, height, depth, String.class); } diff --git a/src/main/java/com/volmit/iris/util/nbt/io/NBTUtil.java b/src/main/java/com/volmit/iris/util/nbt/io/NBTUtil.java index 3691bc6e1..ff11d6d59 100644 --- a/src/main/java/com/volmit/iris/util/nbt/io/NBTUtil.java +++ b/src/main/java/com/volmit/iris/util/nbt/io/NBTUtil.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.nbt.io; import com.volmit.iris.util.nbt.tag.Tag; -import javax.inject.Named; import java.io.*; import java.util.zip.GZIPInputStream; diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/MCAFile.java b/src/main/java/com/volmit/iris/util/nbt/mca/MCAFile.java index a02c1421c..42d3e1b5b 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/MCAFile.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/MCAFile.java @@ -18,9 +18,9 @@ package com.volmit.iris.util.nbt.mca; -import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.Position2; +import com.volmit.iris.util.nbt.tag.CompoundTag; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/NBTWorld.java b/src/main/java/com/volmit/iris/util/nbt/mca/NBTWorld.java index 592bad464..3c278c14e 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/NBTWorld.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/NBTWorld.java @@ -21,12 +21,12 @@ package com.volmit.iris.util.nbt.mca; import com.volmit.iris.Iris; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.util.data.B; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.StringTag; import com.volmit.iris.util.collection.KMap; +import com.volmit.iris.util.data.B; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.M; +import com.volmit.iris.util.nbt.tag.CompoundTag; +import com.volmit.iris.util.nbt.tag.StringTag; import com.volmit.iris.util.scheduling.IrisLock; import org.bukkit.NamespacedKey; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/Section.java b/src/main/java/com/volmit/iris/util/nbt/mca/Section.java index 23c1ff656..901de03af 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/Section.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/Section.java @@ -19,11 +19,11 @@ package com.volmit.iris.util.nbt.mca; import com.volmit.iris.Iris; +import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.nbt.tag.ByteArrayTag; import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.nbt.tag.ListTag; import com.volmit.iris.util.nbt.tag.LongArrayTag; -import com.volmit.iris.util.collection.KMap; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/volmit/iris/util/noise/CNG.java b/src/main/java/com/volmit/iris/util/noise/CNG.java index b5e05ed25..fe8c39c7f 100644 --- a/src/main/java/com/volmit/iris/util/noise/CNG.java +++ b/src/main/java/com/volmit/iris/util/noise/CNG.java @@ -19,14 +19,14 @@ package com.volmit.iris.util.noise; import com.volmit.iris.Iris; -import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.engine.object.common.IRare; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.function.NoiseInjector; +import com.volmit.iris.util.interpolation.IrisInterpolation; +import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.stream.arithmetic.FittedStream; import com.volmit.iris.util.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 lombok.Data; import java.util.List; diff --git a/src/main/java/com/volmit/iris/util/noise/FractalBillowPerlinNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalBillowPerlinNoise.java index a24abf169..8127b6c61 100644 --- a/src/main/java/com/volmit/iris/util/noise/FractalBillowPerlinNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalBillowPerlinNoise.java @@ -18,8 +18,8 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; public class FractalBillowPerlinNoise implements NoiseGenerator, OctaveNoise { private final FastNoiseDouble n; diff --git a/src/main/java/com/volmit/iris/util/noise/FractalBillowSimplexNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalBillowSimplexNoise.java index ffaa392e3..2748311e5 100644 --- a/src/main/java/com/volmit/iris/util/noise/FractalBillowSimplexNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalBillowSimplexNoise.java @@ -18,8 +18,8 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; public class FractalBillowSimplexNoise implements NoiseGenerator, OctaveNoise { private final FastNoiseDouble n; diff --git a/src/main/java/com/volmit/iris/util/noise/FractalCubicNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalCubicNoise.java index 3a77f5444..b6e8fd7a6 100644 --- a/src/main/java/com/volmit/iris/util/noise/FractalCubicNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalCubicNoise.java @@ -18,8 +18,8 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; public class FractalCubicNoise implements NoiseGenerator { private final FastNoiseDouble n; diff --git a/src/main/java/com/volmit/iris/util/noise/FractalFBMSimplexNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalFBMSimplexNoise.java index aa2663d89..6d4c88dca 100644 --- a/src/main/java/com/volmit/iris/util/noise/FractalFBMSimplexNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalFBMSimplexNoise.java @@ -18,8 +18,8 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; public class FractalFBMSimplexNoise implements NoiseGenerator, OctaveNoise { private final FastNoiseDouble n; diff --git a/src/main/java/com/volmit/iris/util/noise/FractalRigidMultiSimplexNoise.java b/src/main/java/com/volmit/iris/util/noise/FractalRigidMultiSimplexNoise.java index 3f0547ffa..e660356ba 100644 --- a/src/main/java/com/volmit/iris/util/noise/FractalRigidMultiSimplexNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/FractalRigidMultiSimplexNoise.java @@ -18,8 +18,8 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.noise.FastNoiseDouble.FractalType; public class FractalRigidMultiSimplexNoise implements NoiseGenerator, OctaveNoise { private final FastNoiseDouble n; diff --git a/src/main/java/com/volmit/iris/util/noise/InterpolatedNoise.java b/src/main/java/com/volmit/iris/util/noise/InterpolatedNoise.java index af4efb689..f270ffc70 100644 --- a/src/main/java/com/volmit/iris/util/noise/InterpolatedNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/InterpolatedNoise.java @@ -18,9 +18,9 @@ package com.volmit.iris.util.noise; +import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.interpolation.IrisInterpolation; -import com.volmit.iris.util.function.NoiseProvider; public class InterpolatedNoise implements NoiseGenerator { private final InterpolationMethod method; diff --git a/src/main/java/com/volmit/iris/util/parallel/GridLock.java b/src/main/java/com/volmit/iris/util/parallel/GridLock.java index af791ae2f..12886f205 100644 --- a/src/main/java/com/volmit/iris/util/parallel/GridLock.java +++ b/src/main/java/com/volmit/iris/util/parallel/GridLock.java @@ -19,8 +19,8 @@ package com.volmit.iris.util.parallel; import com.volmit.iris.Iris; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.function.NastyRunnable; +import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.io.IORunnable; import java.io.IOException; 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 7642afd6d..3a607a0bb 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java @@ -152,8 +152,7 @@ public abstract class VolmitPlugin extends JavaPlugin implements Listener { }).start(); } - public File getJarFile() - { + public File getJarFile() { return getFile(); } 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 392012233..1f3c10c33 100644 --- a/src/main/java/com/volmit/iris/util/scheduling/J.java +++ b/src/main/java/com/volmit/iris/util/scheduling/J.java @@ -19,12 +19,12 @@ package com.volmit.iris.util.scheduling; import com.volmit.iris.Iris; -import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.NastyFunction; import com.volmit.iris.util.function.NastyFuture; import com.volmit.iris.util.function.NastyRunnable; import com.volmit.iris.util.math.FinalInteger; +import com.volmit.iris.util.parallel.MultiBurst; import org.bukkit.Bukkit; import java.util.concurrent.Callable; diff --git a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java index 9846d16f5..1b22dc511 100644 --- a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java @@ -20,19 +20,19 @@ package com.volmit.iris.util.stream; import com.volmit.iris.Iris; import com.volmit.iris.core.project.loader.IrisData; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.engine.object.noise.IrisStyledRange; import com.volmit.iris.engine.object.common.IRare; +import com.volmit.iris.engine.object.noise.IrisStyledRange; +import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.function.Function2; +import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.function.Function4; +import com.volmit.iris.util.hunk.Hunk; +import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.stream.arithmetic.*; import com.volmit.iris.util.stream.convert.*; import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.stream.sources.FunctionStream; import com.volmit.iris.util.stream.utility.*; -import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.function.Function2; -import com.volmit.iris.util.function.Function3; -import com.volmit.iris.util.function.Function4; -import com.volmit.iris.util.math.RNG; import java.util.List; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/util/stream/arithmetic/AddingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/AddingStream.java index 5b1fb6063..f9db98818 100644 --- a/src/main/java/com/volmit/iris/util/stream/arithmetic/AddingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/AddingStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class AddingStream extends BasicStream { private final Function3 add; diff --git a/src/main/java/com/volmit/iris/util/stream/arithmetic/DividingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/DividingStream.java index a8467f135..8386367d4 100644 --- a/src/main/java/com/volmit/iris/util/stream/arithmetic/DividingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/DividingStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class DividingStream extends BasicStream implements ProceduralStream { private final Function3 add; diff --git a/src/main/java/com/volmit/iris/util/stream/arithmetic/MaxingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/MaxingStream.java index e8cff1343..bf1c64379 100644 --- a/src/main/java/com/volmit/iris/util/stream/arithmetic/MaxingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/MaxingStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class MaxingStream extends BasicStream { private final Function3 add; diff --git a/src/main/java/com/volmit/iris/util/stream/arithmetic/MinningStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/MinningStream.java index 7be723f42..a593b3b9d 100644 --- a/src/main/java/com/volmit/iris/util/stream/arithmetic/MinningStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/MinningStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class MinningStream extends BasicStream { private final Function3 add; diff --git a/src/main/java/com/volmit/iris/util/stream/arithmetic/ModuloStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/ModuloStream.java index 3b1756dcf..e95700ad9 100644 --- a/src/main/java/com/volmit/iris/util/stream/arithmetic/ModuloStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/ModuloStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class ModuloStream extends BasicStream { private final Function3 add; diff --git a/src/main/java/com/volmit/iris/util/stream/arithmetic/MultiplyingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/MultiplyingStream.java index 30c4ddb5e..b03537a91 100644 --- a/src/main/java/com/volmit/iris/util/stream/arithmetic/MultiplyingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/MultiplyingStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class MultiplyingStream extends BasicStream { private final Function3 add; diff --git a/src/main/java/com/volmit/iris/util/stream/arithmetic/SubtractingStream.java b/src/main/java/com/volmit/iris/util/stream/arithmetic/SubtractingStream.java index 080a484d7..2d8e5f8ae 100644 --- a/src/main/java/com/volmit/iris/util/stream/arithmetic/SubtractingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/arithmetic/SubtractingStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.stream.arithmetic; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; public class SubtractingStream extends BasicStream { private final Function3 add; diff --git a/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream2D.java b/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream2D.java index 73df91515..e381c75bf 100644 --- a/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream2D.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream2D.java @@ -18,9 +18,9 @@ package com.volmit.iris.util.stream.convert; +import com.volmit.iris.util.function.Function3; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.function.Function3; public class AwareConversionStream2D extends BasicStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream3D.java b/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream3D.java index 8cf476667..b4296c437 100644 --- a/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream3D.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/AwareConversionStream3D.java @@ -18,9 +18,9 @@ package com.volmit.iris.util.stream.convert; +import com.volmit.iris.util.function.Function4; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.function.Function4; public class AwareConversionStream3D extends BasicStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/util/stream/convert/CachedConversionStream.java b/src/main/java/com/volmit/iris/util/stream/convert/CachedConversionStream.java index 257e5021b..72c14923c 100644 --- a/src/main/java/com/volmit/iris/util/stream/convert/CachedConversionStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/CachedConversionStream.java @@ -18,9 +18,9 @@ package com.volmit.iris.util.stream.convert; +import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.stream.BasicLayer; import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.collection.KMap; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/util/stream/convert/SignificanceStream.java b/src/main/java/com/volmit/iris/util/stream/convert/SignificanceStream.java index 696cf15e0..f617bbac5 100644 --- a/src/main/java/com/volmit/iris/util/stream/convert/SignificanceStream.java +++ b/src/main/java/com/volmit/iris/util/stream/convert/SignificanceStream.java @@ -18,11 +18,11 @@ package com.volmit.iris.util.stream.convert; +import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.stream.ArraySignificance; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.stream.Significance; -import com.volmit.iris.util.collection.KList; public class SignificanceStream, T> extends BasicStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java b/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java index a07ef21f0..3c334354a 100644 --- a/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java @@ -19,9 +19,9 @@ package com.volmit.iris.util.stream.interpolation; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; +import com.volmit.iris.util.stream.ProceduralStream; import org.bukkit.block.data.BlockData; import java.util.UUID; diff --git a/src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatingStream.java b/src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatingStream.java index 1d5118caf..e4b2ce9be 100644 --- a/src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/InterpolatingStream.java @@ -18,11 +18,11 @@ package com.volmit.iris.util.stream.interpolation; +import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.function.NoiseProvider; public class InterpolatingStream extends BasicStream implements Interpolator { private final InterpolationMethod type; diff --git a/src/main/java/com/volmit/iris/util/stream/sources/FunctionStream.java b/src/main/java/com/volmit/iris/util/stream/sources/FunctionStream.java index c620ac9a2..444c2bb74 100644 --- a/src/main/java/com/volmit/iris/util/stream/sources/FunctionStream.java +++ b/src/main/java/com/volmit/iris/util/stream/sources/FunctionStream.java @@ -18,10 +18,10 @@ package com.volmit.iris.util.stream.sources; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.interpolation.Interpolated; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.interpolation.Interpolated; public class FunctionStream extends BasicStream { private final Function2 f2; diff --git a/src/main/java/com/volmit/iris/util/stream/utility/CachedStream3D.java b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream3D.java index b454bed8e..e7160e107 100644 --- a/src/main/java/com/volmit/iris/util/stream/utility/CachedStream3D.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream3D.java @@ -19,9 +19,9 @@ package com.volmit.iris.util.stream.utility; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; +import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; -import com.volmit.iris.util.math.BlockPosition; public class CachedStream3D extends BasicStream implements ProceduralStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/util/stream/utility/ProfiledStream.java b/src/main/java/com/volmit/iris/util/stream/utility/ProfiledStream.java index 587314b2b..b62969dfe 100644 --- a/src/main/java/com/volmit/iris/util/stream/utility/ProfiledStream.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/ProfiledStream.java @@ -19,12 +19,12 @@ package com.volmit.iris.util.stream.utility; import com.volmit.iris.Iris; -import com.volmit.iris.util.stream.BasicStream; -import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.RollingSequence; import com.volmit.iris.util.scheduling.PrecisionStopwatch; +import com.volmit.iris.util.stream.BasicStream; +import com.volmit.iris.util.stream.ProceduralStream; import lombok.Data; import java.util.concurrent.atomic.AtomicInteger;