From 7973444fc5ace54b2b684f0f3c95122cf5ef80bc Mon Sep 17 00:00:00 2001 From: Vatuu <21113232+Vatuu@users.noreply.github.com> Date: Fri, 7 Oct 2022 23:58:21 +0200 Subject: [PATCH] Code Cleanup. --- .../volmit/iris/core/ServerConfigurator.java | 2 - .../iris/core/commands/CommandEdit.java | 10 +---- .../iris/core/commands/CommandIris.java | 1 - .../iris/core/commands/CommandObject.java | 17 +-------- .../iris/core/commands/CommandStudio.java | 33 +--------------- .../volmit/iris/core/edit/JigsawEditor.java | 7 +--- .../iris/core/gui/NoiseExplorerGUI.java | 21 ++-------- .../volmit/iris/core/gui/PregeneratorJob.java | 8 +--- .../com/volmit/iris/core/gui/VisionGUI.java | 10 +---- .../core/gui/components/IrisRenderer.java | 2 +- .../iris/core/gui/components/Renderer.java | 2 +- .../com/volmit/iris/core/loader/IrisData.java | 7 +--- .../iris/core/loader/IrisRegistrant.java | 2 +- .../iris/core/loader/ResourceLoader.java | 14 +------ .../core/nms/v19_2/CustomBiomeSource.java | 4 -- .../iris/core/nms/v19_2/NMSBinding19_2.java | 17 ++------- .../core/pregenerator/IrisPregenerator.java | 1 - .../methods/AsyncPregenMethod.java | 2 - .../methods/HybridPregenMethod.java | 6 --- .../volmit/iris/core/project/IrisProject.java | 14 +------ .../iris/core/project/SchemaBuilder.java | 2 +- .../iris/core/service/ConversionSVC.java | 7 +--- .../com/volmit/iris/core/service/TreeSVC.java | 17 +-------- .../volmit/iris/core/service/VillageSVC.java | 4 -- .../com/volmit/iris/core/service/WandSVC.java | 6 +-- .../volmit/iris/core/tools/IrisCreator.java | 6 +-- .../volmit/iris/core/tools/IrisToolbelt.java | 2 - .../volmit/iris/core/wand/WandSelection.java | 2 +- .../com/volmit/iris/engine/IrisComplex.java | 11 +----- .../com/volmit/iris/engine/IrisEngine.java | 17 +-------- .../volmit/iris/engine/IrisEngineMantle.java | 8 +--- .../volmit/iris/engine/IrisWorldManager.java | 6 +-- .../engine/actuator/IrisDecorantActuator.java | 7 +--- .../engine/data/chunk/LinkedTerrainChunk.java | 1 - .../iris/engine/data/io/Deserializer.java | 7 +--- .../iris/engine/data/io/Serializer.java | 7 +--- .../engine/data/io/StringDeserializer.java | 8 +--- .../iris/engine/data/io/StringSerializer.java | 8 +--- .../volmit/iris/engine/framework/Engine.java | 2 +- .../framework/EngineAssignedWorldManager.java | 4 -- .../iris/engine/framework/EngineMode.java | 4 -- .../iris/engine/jigsaw/PlannedPiece.java | 11 +----- .../iris/engine/jigsaw/PlannedStructure.java | 11 +----- .../components/MantleJigsawComponent.java | 7 +--- .../engine/modifier/IrisCarveModifier.java | 7 +--- .../engine/object/IrisAttributeModifier.java | 6 +-- .../engine/object/IrisAxisRotationClamp.java | 7 +--- .../volmit/iris/engine/object/IrisBiome.java | 10 +---- .../iris/engine/object/IrisBiomeCustom.java | 10 +---- .../object/IrisBiomeCustomParticle.java | 6 +-- .../engine/object/IrisBiomeCustomSpawn.java | 6 +-- .../engine/object/IrisBiomeGeneratorLink.java | 8 +--- .../engine/object/IrisBiomePaletteLayer.java | 8 +--- .../iris/engine/object/IrisBlockData.java | 6 +-- .../iris/engine/object/IrisCavePlacer.java | 6 +-- .../volmit/iris/engine/object/IrisColor.java | 2 +- .../engine/object/IrisCommandRegistry.java | 7 +--- .../iris/engine/object/IrisDecorator.java | 8 +--- .../engine/object/IrisDepositGenerator.java | 7 +--- .../iris/engine/object/IrisDimension.java | 7 +--- .../volmit/iris/engine/object/IrisEffect.java | 8 +--- .../iris/engine/object/IrisElipsoid.java | 6 +-- .../volmit/iris/engine/object/IrisEntity.java | 20 ++-------- .../iris/engine/object/IrisEntitySpawn.java | 6 +-- .../iris/engine/object/IrisGenerator.java | 6 +-- .../engine/object/IrisGeneratorStyle.java | 7 +--- .../volmit/iris/engine/object/IrisImage.java | 2 +- .../engine/object/IrisInterpolator3D.java | 6 +-- .../object/IrisJigsawPieceConnector.java | 9 +---- .../engine/object/IrisJigsawPlacement.java | 6 +-- .../engine/object/IrisJigsawStructure.java | 7 +--- .../volmit/iris/engine/object/IrisLake.java | 6 +-- .../volmit/iris/engine/object/IrisLoot.java | 10 +---- .../iris/engine/object/IrisLootReference.java | 6 +-- .../engine/object/IrisMaterialPalette.java | 6 +-- .../volmit/iris/engine/object/IrisMod.java | 7 +--- .../engine/object/IrisModBiomeInjector.java | 6 +-- .../engine/object/IrisModBiomeReplacer.java | 6 +-- .../object/IrisModNoiseStyleReplacer.java | 6 +-- .../IrisModObjectPlacementBiomeInjector.java | 6 +-- .../IrisModObjectPlacementRegionInjector.java | 6 +-- .../engine/object/IrisModObjectReplacer.java | 6 +-- .../engine/object/IrisModRegionReplacer.java | 6 +-- .../engine/object/IrisNoiseGenerator.java | 7 +--- .../volmit/iris/engine/object/IrisObject.java | 9 +---- .../iris/engine/object/IrisObjectLoot.java | 6 +-- .../iris/engine/object/IrisObjectMarker.java | 8 +--- .../engine/object/IrisObjectPlacement.java | 8 +--- .../iris/engine/object/IrisObjectReplace.java | 7 +--- .../engine/object/IrisObjectRotation.java | 6 +-- .../engine/object/IrisObjectTranslate.java | 6 +-- .../iris/engine/object/IrisPotionEffect.java | 6 +-- .../iris/engine/object/IrisPyramid.java | 6 +-- .../iris/engine/object/IrisRareObject.java | 6 +-- .../iris/engine/object/IrisRavinePlacer.java | 6 +-- .../volmit/iris/engine/object/IrisRegion.java | 9 +---- .../volmit/iris/engine/object/IrisRiver.java | 6 +-- .../object/IrisShapedGeneratorStyle.java | 6 +-- .../volmit/iris/engine/object/IrisSphere.java | 6 +-- .../engine/object/IrisVillagerOverride.java | 6 +-- .../iris/engine/object/IrisVillagerTrade.java | 7 +--- .../volmit/iris/engine/object/IrisWorld.java | 6 +-- .../engine/object/annotations/ArrayType.java | 2 +- .../engine/object/annotations/DependsOn.java | 4 +- .../iris/engine/object/annotations/Desc.java | 2 +- .../engine/object/annotations/MaxNumber.java | 4 +- .../engine/object/annotations/MinNumber.java | 4 +- .../RegistryListBiomeDownfallType.java | 2 +- .../annotations/RegistryListBlockType.java | 2 +- .../object/annotations/RegistryListFont.java | 2 +- .../annotations/RegistryListItemType.java | 2 +- .../annotations/RegistryListResource.java | 2 +- .../RegistryListSpecialEntity.java | 2 +- .../engine/object/annotations/Required.java | 2 +- .../engine/object/annotations/Snippet.java | 4 +- .../matter/IrisMatterPlacementLocation.java | 2 - .../object/matter/IrisMatterTranslate.java | 1 - .../engine/platform/BukkitChunkGenerator.java | 16 +------- .../engine/platform/DummyBiomeProvider.java | 1 - .../volmit/iris/util/cache/ArrayCache.java | 3 -- .../volmit/iris/util/cache/ChunkCache2D.java | 2 - .../volmit/iris/util/cache/DataBitCache.java | 1 - .../volmit/iris/util/cache/FloatCache.java | 7 +--- .../com/volmit/iris/util/cache/IntCache.java | 2 - .../volmit/iris/util/cache/WorldCache2D.java | 10 ----- .../volmit/iris/util/collection/KList.java | 8 +--- .../iris/util/context/ChunkContext.java | 1 - .../iris/util/context/ChunkedDataCache.java | 2 - .../volmit/iris/util/context/IrisContext.java | 1 - .../java/com/volmit/iris/util/data/B.java | 6 +-- .../com/volmit/iris/util/data/Cuboid.java | 12 +----- .../com/volmit/iris/util/data/KCache.java | 4 -- .../decree/handlers/DimensionHandler.java | 1 - .../com/volmit/iris/util/format/Form.java | 10 +---- .../java/com/volmit/iris/util/hunk/Hunk.java | 35 ++--------------- .../iris/util/hunk/bits/DataContainer.java | 6 +-- .../util/hunk/view/BiomeGridHunkView.java | 1 - .../util/hunk/view/ChunkDataHunkHolder.java | 4 -- .../util/interpolation/IrisInterpolation.java | 1 - src/main/java/com/volmit/iris/util/io/IO.java | 28 +------------- .../com/volmit/iris/util/json/JSONObject.java | 9 +---- .../volmit/iris/util/json/JSONTokener.java | 7 +--- .../iris/util/mantle/TectonicPlate.java | 7 +--- .../com/volmit/iris/util/matter/Matter.java | 9 +---- .../util/matter/slices/BiomeInjectMatter.java | 1 - .../iris/util/nbt/io/NBTInputStream.java | 15 +------- .../iris/util/nbt/io/NBTOutputStream.java | 15 +------- .../com/volmit/iris/util/nbt/io/NBTUtil.java | 8 +--- .../volmit/iris/util/nbt/io/SNBTParser.java | 16 +------- .../volmit/iris/util/nbt/io/SNBTWriter.java | 15 +------- .../com/volmit/iris/util/nbt/mca/Chunk.java | 7 +--- .../volmit/iris/util/nbt/tag/CompoundTag.java | 6 +-- .../com/volmit/iris/util/nbt/tag/ListTag.java | 6 +-- .../java/com/volmit/iris/util/network/DL.java | 7 +--- .../java/com/volmit/iris/util/noise/CNG.java | 3 -- .../volmit/iris/util/noise/CachedNoise.java | 2 - .../iris/util/noise/CachedNoiseMap.java | 1 - .../volmit/iris/util/parallel/MultiBurst.java | 7 +--- .../com/volmit/iris/util/plugin/Command.java | 4 +- .../com/volmit/iris/util/plugin/Control.java | 4 +- .../com/volmit/iris/util/plugin/Instance.java | 4 +- .../com/volmit/iris/util/plugin/Metrics.java | 15 +------- .../volmit/iris/util/plugin/MetricsLite.java | 7 +--- .../volmit/iris/util/plugin/Permission.java | 4 +- .../volmit/iris/util/plugin/VolmitPlugin.java | 5 +-- .../volmit/iris/util/plugin/VolmitSender.java | 1 - .../iris/util/stream/ProceduralStream.java | 38 ++----------------- .../util/stream/utility/CachedStream2D.java | 3 -- .../utility/ContextInjectingStream.java | 3 -- .../util/stream/utility/WasteDetector.java | 2 - .../volmit/iris/util/uniques/UFeature.java | 5 --- .../iris/util/uniques/UFeatureMeta.java | 2 - .../com/volmit/iris/util/uniques/UMeta.java | 7 ---- .../iris/util/uniques/UniqueRenderer.java | 4 -- .../util/uniques/features/UFInterpolator.java | 2 - .../iris/util/uniques/features/UFNOOP.java | 2 - .../uniques/features/UFWarpedBackground.java | 1 - .../util/uniques/features/UFWarpedCircle.java | 2 - 178 files changed, 171 insertions(+), 1027 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/ServerConfigurator.java b/src/main/java/com/volmit/iris/core/ServerConfigurator.java index e7d8bee09..dded4b582 100644 --- a/src/main/java/com/volmit/iris/core/ServerConfigurator.java +++ b/src/main/java/com/volmit/iris/core/ServerConfigurator.java @@ -27,10 +27,8 @@ import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.format.C; -import com.volmit.iris.util.io.IO; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; -import com.volmit.iris.util.scheduling.Queue; import org.bukkit.Bukkit; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/com/volmit/iris/core/commands/CommandEdit.java b/src/main/java/com/volmit/iris/core/commands/CommandEdit.java index e1cb05399..30afeafb8 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandEdit.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandEdit.java @@ -20,20 +20,14 @@ package com.volmit.iris.core.commands; import com.volmit.iris.Iris; import com.volmit.iris.core.service.StudioSVC; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisCave; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPool; -import com.volmit.iris.engine.object.IrisJigsawStructure; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.decree.DecreeExecutor; import com.volmit.iris.util.decree.DecreeOrigin; import com.volmit.iris.util.decree.annotations.Decree; import com.volmit.iris.util.decree.annotations.Param; import com.volmit.iris.util.format.C; -import java.awt.Desktop; +import java.awt.*; @Decree(name = "edit", origin = DecreeOrigin.PLAYER, studio = true, description = "Edit something") diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java index 23e9c6e9c..9b46bccd7 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java @@ -38,7 +38,6 @@ import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.jobs.QueueJob; -import com.volmit.iris.util.stream.utility.ProfiledStream; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/core/commands/CommandObject.java b/src/main/java/com/volmit/iris/core/commands/CommandObject.java index 4f6c2d15e..e3d7f25a1 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandObject.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandObject.java @@ -25,13 +25,7 @@ import com.volmit.iris.core.service.ObjectSVC; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.service.WandSVC; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.IObjectPlacer; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisObjectPlacementScaleInterpolator; -import com.volmit.iris.engine.object.IrisObjectRotation; -import com.volmit.iris.engine.object.TileData; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.decree.DecreeExecutor; import com.volmit.iris.util.decree.DecreeOrigin; @@ -53,14 +47,7 @@ import org.bukkit.util.Vector; import java.io.File; import java.io.IOException; 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; @Decree(name = "object", aliases = "o", origin = DecreeOrigin.PLAYER, studio = true, description = "Iris object manipulation") diff --git a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java index 9e5bc84f3..f5f1df1f5 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java @@ -28,20 +28,7 @@ import com.volmit.iris.core.service.ConversionSVC; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.InventorySlotType; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBiomePaletteLayer; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisEntity; -import com.volmit.iris.engine.object.IrisGenerator; -import com.volmit.iris.engine.object.IrisInterpolator; -import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.IrisNoiseGenerator; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.object.IrisScript; -import com.volmit.iris.engine.object.NoiseStyle; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -61,28 +48,15 @@ import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.math.Spiraler; import com.volmit.iris.util.noise.CNG; -import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.O; import com.volmit.iris.util.scheduling.PrecisionStopwatch; -import com.volmit.iris.util.scheduling.jobs.Job; -import com.volmit.iris.util.scheduling.jobs.JobCollection; -import com.volmit.iris.util.scheduling.jobs.QueueJob; -import com.volmit.iris.util.scheduling.jobs.SingleJob; import io.papermc.lib.PaperLib; - -import org.bukkit.Bukkit; -import org.bukkit.Chunk; -import org.bukkit.FluidCollisionMode; -import org.bukkit.GameMode; -import org.bukkit.Location; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.util.BlockVector; import org.bukkit.util.Vector; -import java.awt.*; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -93,9 +67,6 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.Objects; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.function.Consumer; import java.util.function.Supplier; @Decree(name = "studio", aliases = {"std", "s"}, description = "Studio Commands", studio = true) diff --git a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java index d4b2db1f4..2c824bf4a 100644 --- a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java +++ b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java @@ -19,14 +19,9 @@ package com.volmit.iris.core.edit; import com.google.gson.Gson; -import com.google.gson.JsonObject; import com.volmit.iris.Iris; import com.volmit.iris.core.service.WandSVC; -import com.volmit.iris.engine.object.IrisDirection; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.Cuboid; 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 9b96b988b..f7fb935f0 100644 --- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java @@ -35,24 +35,9 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import javax.imageio.ImageIO; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.JLayeredPane; -import javax.swing.JPanel; -import javax.swing.JViewport; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.EventQueue; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionListener; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java b/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java index 99289913e..8c94ad84d 100644 --- a/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java +++ b/src/main/java/com/volmit/iris/core/gui/PregeneratorJob.java @@ -35,12 +35,8 @@ import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; -import javax.swing.JFrame; -import javax.swing.JPanel; -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.Graphics2D; +import javax.swing.*; +import java.awt.*; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.image.BufferedImage; 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 4677cfc55..aabad54da 100644 --- a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java @@ -44,16 +44,10 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import javax.imageio.ImageIO; -import javax.swing.JFrame; -import javax.swing.JPanel; +import javax.swing.*; import javax.swing.event.MouseInputListener; import java.awt.*; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionListener; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; +import java.awt.event.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java b/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java index f7bfe2dc3..5d0fee0a8 100644 --- a/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java +++ b/src/main/java/com/volmit/iris/core/gui/components/IrisRenderer.java @@ -21,7 +21,7 @@ package com.volmit.iris.core.gui.components; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.util.interpolation.IrisInterpolation; -import java.awt.Color; +import java.awt.*; import java.awt.image.BufferedImage; import java.util.function.BiFunction; diff --git a/src/main/java/com/volmit/iris/core/gui/components/Renderer.java b/src/main/java/com/volmit/iris/core/gui/components/Renderer.java index b236d52db..f6ca29398 100644 --- a/src/main/java/com/volmit/iris/core/gui/components/Renderer.java +++ b/src/main/java/com/volmit/iris/core/gui/components/Renderer.java @@ -18,7 +18,7 @@ package com.volmit.iris.core.gui.components; -import java.awt.Color; +import java.awt.*; @FunctionalInterface public interface Renderer { diff --git a/src/main/java/com/volmit/iris/core/loader/IrisData.java b/src/main/java/com/volmit/iris/core/loader/IrisData.java index f082f1655..b6f7833c6 100644 --- a/src/main/java/com/volmit/iris/core/loader/IrisData.java +++ b/src/main/java/com/volmit/iris/core/loader/IrisData.java @@ -18,12 +18,7 @@ package com.volmit.iris.core.loader; -import com.google.gson.ExclusionStrategy; -import com.google.gson.FieldAttributes; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.TypeAdapter; -import com.google.gson.TypeAdapterFactory; +import com.google.gson.*; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; diff --git a/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java b/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java index 7625b9b46..1c97ecde1 100644 --- a/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java +++ b/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java @@ -29,7 +29,7 @@ import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; import lombok.Data; -import java.awt.Desktop; +import java.awt.*; import java.io.File; @Data diff --git a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java index 5cc7b2780..505fba67c 100644 --- a/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/core/loader/ResourceLoader.java @@ -41,20 +41,8 @@ import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Data; -import java.io.DataInput; -import java.io.DataInputStream; -import java.io.DataOutput; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; +import java.io.*; import java.util.Locale; -import java.util.Map; -import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; diff --git a/src/main/java/com/volmit/iris/core/nms/v19_2/CustomBiomeSource.java b/src/main/java/com/volmit/iris/core/nms/v19_2/CustomBiomeSource.java index dcd4c999f..82c3b6217 100644 --- a/src/main/java/com/volmit/iris/core/nms/v19_2/CustomBiomeSource.java +++ b/src/main/java/com/volmit/iris/core/nms/v19_2/CustomBiomeSource.java @@ -12,7 +12,6 @@ import net.minecraft.core.Holder; import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.Climate; @@ -21,9 +20,6 @@ import org.bukkit.World; import org.bukkit.craftbukkit.v1_19_R1.CraftServer; import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock; -import org.bukkit.craftbukkit.v1_19_R1.generator.CustomChunkGenerator; -import org.bukkit.craftbukkit.v1_19_R1.generator.InternalChunkGenerator; -import org.bukkit.generator.BiomeProvider; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java b/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java index 3d46e42eb..76b5a8f50 100644 --- a/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java +++ b/src/main/java/com/volmit/iris/core/nms/v19_2/NMSBinding19_2.java @@ -28,19 +28,13 @@ import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.matter.MatterBiomeInject; import com.volmit.iris.util.nbt.io.NBTUtil; import com.volmit.iris.util.nbt.mca.NBTWorld; -import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer; -import com.volmit.iris.util.nbt.mca.palette.MCAChunkBiomeContainer; -import com.volmit.iris.util.nbt.mca.palette.MCAGlobalPalette; -import com.volmit.iris.util.nbt.mca.palette.MCAIdMap; -import com.volmit.iris.util.nbt.mca.palette.MCAIdMapper; -import com.volmit.iris.util.nbt.mca.palette.MCAPalette; -import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess; -import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer; -import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer; +import com.volmit.iris.util.nbt.mca.palette.*; import com.volmit.iris.util.nbt.tag.CompoundTag; import it.unimi.dsi.fastutil.objects.Object2IntMap; -import net.minecraft.core.*; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; import net.minecraft.core.Registry; +import net.minecraft.core.RegistryAccess; import net.minecraft.nbt.NbtIo; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; @@ -51,8 +45,6 @@ import net.minecraft.world.level.chunk.LevelChunk; import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; - - import org.bukkit.craftbukkit.v1_19_R1.CraftChunk; import org.bukkit.craftbukkit.v1_19_R1.CraftServer; import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; @@ -66,7 +58,6 @@ import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Iterator; import java.util.List; diff --git a/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java b/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java index 5a5c9baea..ff44310b0 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/IrisPregenerator.java @@ -29,7 +29,6 @@ import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.Looper; -import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; 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 61fbaeda9..6d76d29a4 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 @@ -19,7 +19,6 @@ package com.volmit.iris.core.pregenerator.methods; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregeneratorMethod; import com.volmit.iris.core.tools.IrisToolbelt; @@ -32,7 +31,6 @@ import org.bukkit.Chunk; import org.bukkit.World; import java.util.Objects; -import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; public class AsyncPregenMethod implements PregeneratorMethod { diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java index 4cb537a2d..6a091fe9b 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java @@ -18,17 +18,11 @@ package com.volmit.iris.core.pregenerator.methods; -import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregeneratorMethod; -import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.util.mantle.Mantle; -import com.volmit.iris.util.math.Position2; import org.bukkit.World; -import java.io.File; - public class HybridPregenMethod implements PregeneratorMethod { private final PregeneratorMethod inWorld; private final World world; 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 fd629970e..9dc1597c8 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -25,16 +25,7 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.core.loader.ResourceLoader; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBlockData; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisEntity; -import com.volmit.iris.engine.object.IrisGenerator; -import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.object.IrisSpawner; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.annotations.Snippet; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; @@ -60,8 +51,7 @@ import org.bukkit.GameMode; import org.bukkit.World; import org.zeroturnaround.zip.ZipUtil; -import java.awt.Desktop; -import java.awt.GraphicsEnvironment; +import java.awt.*; import java.io.File; import java.io.IOException; import java.util.Objects; 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 5db9495e8..f39095fdf 100644 --- a/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java +++ b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java @@ -31,7 +31,7 @@ import com.volmit.iris.util.json.JSONObject; import org.bukkit.enchantments.Enchantment; import org.bukkit.potion.PotionEffectType; -import java.awt.GraphicsEnvironment; +import java.awt.*; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; diff --git a/src/main/java/com/volmit/iris/core/service/ConversionSVC.java b/src/main/java/com/volmit/iris/core/service/ConversionSVC.java index 3186f12b7..29db2e48c 100644 --- a/src/main/java/com/volmit/iris/core/service/ConversionSVC.java +++ b/src/main/java/com/volmit/iris/core/service/ConversionSVC.java @@ -20,12 +20,7 @@ package com.volmit.iris.core.service; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.IrisDirection; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.IrisJigsawPool; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/core/service/TreeSVC.java b/src/main/java/com/volmit/iris/core/service/TreeSVC.java index fb9584e52..bd93cba0e 100644 --- a/src/main/java/com/volmit/iris/core/service/TreeSVC.java +++ b/src/main/java/com/volmit/iris/core/service/TreeSVC.java @@ -22,15 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.IObjectPlacer; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.object.IrisTreeModes; -import com.volmit.iris.engine.object.IrisTreeSize; -import com.volmit.iris.engine.object.TileData; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; @@ -39,12 +31,7 @@ import com.volmit.iris.util.math.BlockPosition; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.plugin.IrisService; import com.volmit.iris.util.scheduling.J; -import org.bukkit.Bukkit; -import org.bukkit.HeightMap; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.TreeType; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.TileState; diff --git a/src/main/java/com/volmit/iris/core/service/VillageSVC.java b/src/main/java/com/volmit/iris/core/service/VillageSVC.java index 06160b129..d8497e003 100644 --- a/src/main/java/com/volmit/iris/core/service/VillageSVC.java +++ b/src/main/java/com/volmit/iris/core/service/VillageSVC.java @@ -21,17 +21,13 @@ package com.volmit.iris.core.service; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.object.IrisDimension; -import com.volmit.iris.engine.object.IrisVillagerOverride; -import com.volmit.iris.engine.object.IrisVillagerTrade; import com.volmit.iris.util.format.C; import com.volmit.iris.util.plugin.IrisService; import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.entity.Villager; import org.bukkit.event.EventHandler; -import org.bukkit.event.entity.VillagerAcquireTradeEvent; import org.bukkit.event.entity.VillagerCareerChangeEvent; import java.util.List; diff --git a/src/main/java/com/volmit/iris/core/service/WandSVC.java b/src/main/java/com/volmit/iris/core/service/WandSVC.java index f86721180..8c847e44e 100644 --- a/src/main/java/com/volmit/iris/core/service/WandSVC.java +++ b/src/main/java/com/volmit/iris/core/service/WandSVC.java @@ -33,11 +33,7 @@ import com.volmit.iris.util.matter.WorldMatter; import com.volmit.iris.util.plugin.IrisService; import com.volmit.iris.util.plugin.VolmitSender; import com.volmit.iris.util.scheduling.J; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.Particle; -import org.bukkit.Sound; +import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/core/tools/IrisCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisCreator.java index 95b32a2b3..f4aeab0f8 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisCreator.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisCreator.java @@ -34,11 +34,7 @@ import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.O; import lombok.Data; import lombok.experimental.Accessors; -import org.bukkit.Bukkit; -import org.bukkit.GameRule; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.WorldCreator; +import org.bukkit.*; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java b/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java index c2da5a844..6ad776d38 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java @@ -32,12 +32,10 @@ import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.plugin.VolmitSender; import org.bukkit.Bukkit; import org.bukkit.World; -import org.bukkit.block.data.BlockData; import org.bukkit.entity.Player; import java.io.File; import java.io.IOException; -import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/volmit/iris/core/wand/WandSelection.java b/src/main/java/com/volmit/iris/core/wand/WandSelection.java index 8321e3815..1cd543f37 100644 --- a/src/main/java/com/volmit/iris/core/wand/WandSelection.java +++ b/src/main/java/com/volmit/iris/core/wand/WandSelection.java @@ -26,7 +26,7 @@ import org.bukkit.Particle; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import java.awt.Color; +import java.awt.*; public class WandSelection { private final Cuboid c; diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index 2ad1c02cd..e08efba40 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -23,13 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.InferredType; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorationPart; -import com.volmit.iris.engine.object.IrisDecorator; -import com.volmit.iris.engine.object.IrisGenerator; -import com.volmit.iris.engine.object.IrisInterpolator; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -40,14 +34,11 @@ 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 com.volmit.iris.util.stream.utility.WasteDetector; import lombok.Data; import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import java.lang.reflect.Field; -import java.util.List; import java.util.UUID; @Data diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index c373df9a5..9a2d78fba 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -27,22 +27,9 @@ import com.volmit.iris.core.gui.PregeneratorJob; import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.service.PreservationSVC; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.framework.EngineEffects; -import com.volmit.iris.engine.framework.EngineMetrics; -import com.volmit.iris.engine.framework.EngineMode; -import com.volmit.iris.engine.framework.EngineTarget; -import com.volmit.iris.engine.framework.EngineWorldManager; -import com.volmit.iris.engine.framework.SeedManager; -import com.volmit.iris.engine.framework.WrongEngineBroException; +import com.volmit.iris.engine.framework.*; import com.volmit.iris.engine.mantle.EngineMantle; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBiomePaletteLayer; -import com.volmit.iris.engine.object.IrisDecorator; -import com.volmit.iris.engine.object.IrisEngineData; -import com.volmit.iris.engine.object.IrisJigsawStructure; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.scripting.EngineExecutionEnvironment; import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java index 7e1ad4c01..da581458c 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java @@ -27,13 +27,7 @@ import com.volmit.iris.engine.mantle.components.MantleCarvingComponent; import com.volmit.iris.engine.mantle.components.MantleFluidBodyComponent; import com.volmit.iris.engine.mantle.components.MantleJigsawComponent; import com.volmit.iris.engine.mantle.components.MantleObjectComponent; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDepositGenerator; -import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisObjectScale; -import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index f74d393ba..a87ca9d52 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -21,7 +21,6 @@ package com.volmit.iris.engine; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.core.nms.INMS; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedWorldManager; import com.volmit.iris.engine.object.*; @@ -34,12 +33,13 @@ import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.matter.MatterBiomeInject; import com.volmit.iris.util.matter.MatterMarker; import com.volmit.iris.util.parallel.MultiBurst; import com.volmit.iris.util.plugin.Chunks; import com.volmit.iris.util.plugin.VolmitSender; -import com.volmit.iris.util.scheduling.*; +import com.volmit.iris.util.scheduling.ChronoLatch; +import com.volmit.iris.util.scheduling.J; +import com.volmit.iris.util.scheduling.Looper; import com.volmit.iris.util.scheduling.jobs.QueueJob; import io.papermc.lib.PaperLib; import lombok.Data; 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 9002ea03e..99ed90824 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.actuator; -import com.volmit.iris.engine.decorator.IrisCeilingDecorator; -import com.volmit.iris.engine.decorator.IrisSeaFloorDecorator; -import com.volmit.iris.engine.decorator.IrisSeaSurfaceDecorator; -import com.volmit.iris.engine.decorator.IrisShoreLineDecorator; -import com.volmit.iris.engine.decorator.IrisSurfaceDecorator; +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; @@ -31,7 +27,6 @@ import com.volmit.iris.util.context.ChunkContext; 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/data/chunk/LinkedTerrainChunk.java b/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java index dc7775b19..20462b50d 100644 --- a/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java +++ b/src/main/java/com/volmit/iris/engine/data/chunk/LinkedTerrainChunk.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.data.chunk; -import com.volmit.iris.Iris; import com.volmit.iris.core.nms.BiomeBaseInjector; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.util.data.IrisBiomeStorage; diff --git a/src/main/java/com/volmit/iris/engine/data/io/Deserializer.java b/src/main/java/com/volmit/iris/engine/data/io/Deserializer.java index 5c758f97e..9f03302ae 100644 --- a/src/main/java/com/volmit/iris/engine/data/io/Deserializer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/Deserializer.java @@ -18,12 +18,7 @@ package com.volmit.iris.engine.data.io; -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.net.URL; public interface Deserializer { diff --git a/src/main/java/com/volmit/iris/engine/data/io/Serializer.java b/src/main/java/com/volmit/iris/engine/data/io/Serializer.java index fad4e86a5..3040d8075 100644 --- a/src/main/java/com/volmit/iris/engine/data/io/Serializer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/Serializer.java @@ -18,12 +18,7 @@ package com.volmit.iris.engine.data.io; -import java.io.BufferedOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; public interface Serializer { diff --git a/src/main/java/com/volmit/iris/engine/data/io/StringDeserializer.java b/src/main/java/com/volmit/iris/engine/data/io/StringDeserializer.java index 3b69e387f..cef77db77 100644 --- a/src/main/java/com/volmit/iris/engine/data/io/StringDeserializer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/StringDeserializer.java @@ -18,13 +18,7 @@ package com.volmit.iris.engine.data.io; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; +import java.io.*; public interface StringDeserializer extends Deserializer { diff --git a/src/main/java/com/volmit/iris/engine/data/io/StringSerializer.java b/src/main/java/com/volmit/iris/engine/data/io/StringSerializer.java index 021eea997..7b7dc4f31 100644 --- a/src/main/java/com/volmit/iris/engine/data/io/StringSerializer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/StringSerializer.java @@ -18,13 +18,7 @@ package com.volmit.iris.engine.data.io; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.io.Writer; +import java.io.*; public interface StringSerializer extends Serializer { 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 628aa138f..b527b904d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -70,7 +70,7 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.ItemStack; -import java.awt.Color; +import java.awt.*; import java.util.Arrays; import java.util.Set; import java.util.UUID; 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 aa4998226..b6e85f86f 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java @@ -24,8 +24,6 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.plugin.VolmitSender; -import com.volmit.iris.util.stream.utility.WasteDetector; -import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Sound; @@ -33,12 +31,10 @@ import org.bukkit.entity.EnderSignal; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.entity.EntitySpawnEvent; -import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.WorldSaveEvent; import org.bukkit.event.world.WorldUnloadEvent; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineMode.java b/src/main/java/com/volmit/iris/engine/framework/EngineMode.java index fb09eb619..a79b3177f 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineMode.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineMode.java @@ -18,19 +18,15 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.Iris; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.util.context.ChunkContext; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.documentation.BlockCoordinates; -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.math.RollingSequence; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java index b33facb9e..644beb1af 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java @@ -21,16 +21,7 @@ package com.volmit.iris.engine.jigsaw; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.IObjectPlacer; -import com.volmit.iris.engine.object.InventorySlotType; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.IrisLootTable; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectRotation; -import com.volmit.iris.engine.object.IrisObjectTranslate; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.TileData; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.context.IrisContext; 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 33378aeb0..4f60227ec 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -23,16 +23,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.IObjectPlacer; -import com.volmit.iris.engine.object.IrisDirection; -import com.volmit.iris.engine.object.IrisJigsawPiece; -import com.volmit.iris.engine.object.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.IrisJigsawStructure; -import com.volmit.iris.engine.object.IrisObject; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.object.IrisObjectRotation; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.ObjectPlaceMode; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index 0f2a3bf91..a0b019948 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -22,12 +22,7 @@ import com.volmit.iris.engine.jigsaw.PlannedStructure; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.MantleWriter; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisJigsawStructure; -import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.IrisPosition; -import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.engine.object.NoiseStyle; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.context.ChunkContext; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java index 693688c7d..018ccdefb 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java @@ -22,15 +22,10 @@ import com.volmit.iris.engine.actuator.IrisDecorantActuator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.object.InferredType; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisDecorationPart; -import com.volmit.iris.engine.object.IrisDecorator; -import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.context.ChunkContext; -import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.data.B; import com.volmit.iris.util.function.Consumer4; import com.volmit.iris.util.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java b/src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java index b2705e8fa..a352ff238 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java b/src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java index b65a95f38..636178bae 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java @@ -18,12 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.DependsOn; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.M; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java index 933cb543f..7712c7af2 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java @@ -25,13 +25,7 @@ import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.DependsOn; -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.engine.object.annotations.Required; +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.collection.KSet; @@ -52,7 +46,7 @@ import org.bukkit.Material; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import java.awt.Color; +import java.awt.*; @Accessors(chain = true) @NoArgsConstructor diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java index 3bd9a2b68..065ec4d71 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java @@ -19,13 +19,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.DependsOn; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.json.JSONArray; @@ -35,7 +29,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import java.awt.Color; +import java.awt.*; import java.util.Locale; @Snippet("custom-biome") diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java index 5af8fdb08..756310b26 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java index 9fd78d1b9..f064c775a 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java index eeb967a07..71af6ce5e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java @@ -19,13 +19,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.annotations.DependsOn; -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.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java index dd3a8beae..649ea3e3d 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java @@ -20,13 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.DependsOn; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java b/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java index 384337348..40fe5aa72 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java @@ -22,11 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; -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.RegistryListBlockType; -import com.volmit.iris.engine.object.annotations.Required; +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; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java b/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java index 9ff719397..f0031f816 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java @@ -23,11 +23,7 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisColor.java b/src/main/java/com/volmit/iris/engine/object/IrisColor.java index 82912c407..2d6494bbf 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisColor.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisColor.java @@ -28,7 +28,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import java.awt.Color; +import java.awt.*; @Snippet("color") @Accessors(chain = true) diff --git a/src/main/java/com/volmit/iris/engine/object/IrisCommandRegistry.java b/src/main/java/com/volmit/iris/engine/object/IrisCommandRegistry.java index 20a424869..3df5d6270 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisCommandRegistry.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCommandRegistry.java @@ -18,12 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.DependsOn; -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.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java index 51b7c70dd..8a4439581 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java @@ -21,13 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.DependsOn; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java index 6a7ea1b29..2e4b2dd59 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java @@ -20,12 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; 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.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; 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/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index c41a1bf17..0a4598df7 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -22,12 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.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.MaxNumber; -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.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.io.IO; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java index 6a426b8fe..b20b4d5b3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java @@ -21,13 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.DependsOn; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java b/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java index d031fd9b1..82c5a9b41 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java @@ -21,11 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.slices.CavernMatter; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEntity.java b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java index c2e16324b..4dc771ad1 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEntity.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java @@ -22,11 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.framework.Engine; -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.RegistryListSpecialEntity; -import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.json.JSONObject; @@ -41,20 +37,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.NamespacedKey; -import org.bukkit.Particle; -import org.bukkit.Sound; +import org.bukkit.*; import org.bukkit.attribute.Attributable; -import org.bukkit.entity.Ageable; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Mob; -import org.bukkit.entity.Panda; +import org.bukkit.entity.*; import org.bukkit.entity.Panda.Gene; -import org.bukkit.entity.Villager; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.loot.LootContext; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java index 6bb199431..0a46568e7 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java @@ -21,11 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterMarker; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java index b658aa7d7..1d1ddd95b 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java @@ -20,11 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.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.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; +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.json.JSONObject; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java index 123a1d247..5639f3cc3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java @@ -20,12 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.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.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.RegistryListResource; -import com.volmit.iris.engine.object.annotations.Snippet; -import com.volmit.iris.util.interpolation.IrisInterpolation; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.noise.ExpressionNoise; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisImage.java b/src/main/java/com/volmit/iris/engine/object/IrisImage.java index 973360f2f..5960d576c 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisImage.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisImage.java @@ -24,7 +24,7 @@ import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; import javax.imageio.ImageIO; -import java.awt.Color; +import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisInterpolator3D.java b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator3D.java index 09ad75c8a..7c3caf098 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisInterpolator3D.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator3D.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.function.NoiseProvider3; import com.volmit.iris.util.interpolation.InterpolationMethod3D; import com.volmit.iris.util.interpolation.IrisInterpolation; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java index 3e4f412d4..bc5fce61b 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java @@ -18,14 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.DependsOn; -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.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java index a60c18603..8494550e7 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.RegistryListResource; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java index 62a26ac81..cd80710a9 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java @@ -21,12 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.annotations.ArrayType; -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.engine.object.annotations.Required; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLake.java b/src/main/java/com/volmit/iris/engine/object/IrisLake.java index ce321e563..49c306f17 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLake.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLake.java @@ -21,11 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java index 44eb194a7..e8e81211b 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java @@ -22,13 +22,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.volmit.iris.Iris; import com.volmit.iris.core.service.ExternalDataSVC; 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.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.RegistryListItemType; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +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; @@ -54,7 +48,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.material.Colorable; -import java.awt.Color; +import java.awt.*; import java.util.Optional; @Snippet("loot") diff --git a/src/main/java/com/volmit/iris/engine/object/IrisLootReference.java b/src/main/java/com/volmit/iris/engine/object/IrisLootReference.java index 0063dd54c..7ba05cf65 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisLootReference.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLootReference.java @@ -19,11 +19,7 @@ package com.volmit.iris.engine.object; 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.MinNumber; -import com.volmit.iris.engine.object.annotations.RegistryListResource; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.DataProvider; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java index 24dbf0419..64bcbdfdc 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java @@ -20,11 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; 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.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +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; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisMod.java b/src/main/java/com/volmit/iris/engine/object/IrisMod.java index 53cff7298..8a7dab5d2 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisMod.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMod.java @@ -19,12 +19,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.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.MaxNumber; -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.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java index 7beb598f6..911e77714 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java index a0142ef68..a87e374da 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModNoiseStyleReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModNoiseStyleReplacer.java index a873087ae..66fa4081a 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModNoiseStyleReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModNoiseStyleReplacer.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementBiomeInjector.java b/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementBiomeInjector.java index 19174e0ea..2846df593 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementBiomeInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementBiomeInjector.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementRegionInjector.java b/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementRegionInjector.java index b49f93a69..70b0e3d5e 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementRegionInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementRegionInjector.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModObjectReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModObjectReplacer.java index 11348a2e3..90a400da4 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModObjectReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModObjectReplacer.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModRegionReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModRegionReplacer.java index f8eb96261..0b1ec5c94 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModRegionReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModRegionReplacer.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java index db0f33f35..3a669eaac 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java @@ -20,12 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; 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.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObject.java b/src/main/java/com/volmit/iris/engine/object/IrisObject.java index 349a0bc29..d3c5c0b93 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObject.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObject.java @@ -57,14 +57,7 @@ import org.bukkit.block.data.type.Leaves; import org.bukkit.util.BlockVector; import org.bukkit.util.Vector; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java index cddc5edd5..1b95d28e4 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java @@ -20,11 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; 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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectMarker.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectMarker.java index 83cebb084..667854494 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectMarker.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectMarker.java @@ -20,13 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; 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.MaxNumber; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java index d090439f1..130cfd18f 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java @@ -21,13 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; 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.MaxNumber; -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.annotations.Snippet; +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; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java index e09ac75e4..6a832cc9c 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java @@ -20,12 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; 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.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java index 7a6521050..31fb0ac97 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java @@ -29,11 +29,7 @@ import lombok.experimental.Accessors; import org.bukkit.Axis; import org.bukkit.Material; import org.bukkit.block.BlockFace; -import org.bukkit.block.data.BlockData; -import org.bukkit.block.data.Directional; -import org.bukkit.block.data.MultipleFacing; -import org.bukkit.block.data.Orientable; -import org.bukkit.block.data.Rotatable; +import org.bukkit.block.data.*; import org.bukkit.util.BlockVector; import java.util.List; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java index 53a3392e8..c0a4af4f9 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java index a185310d4..ba994d7c3 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java @@ -20,11 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java b/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java index a05071df9..40cdfb5d8 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java @@ -21,11 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.slices.CavernMatter; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRareObject.java b/src/main/java/com/volmit/iris/engine/object/IrisRareObject.java index 86946cf42..3cb042989 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRareObject.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRareObject.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.RegistryListResource; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRavinePlacer.java b/src/main/java/com/volmit/iris/engine/object/IrisRavinePlacer.java index ee885957a..081f7fae9 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRavinePlacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRavinePlacer.java @@ -23,11 +23,7 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java index 8322bdbc0..5e3f0ee1c 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java @@ -23,12 +23,7 @@ import com.volmit.iris.core.gui.components.RenderType; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.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.MaxNumber; -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.annotations.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; @@ -46,7 +41,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.bukkit.block.data.BlockData; -import java.awt.Color; +import java.awt.*; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisRiver.java b/src/main/java/com/volmit/iris/engine/object/IrisRiver.java index 10fb8155b..2e9ca75f2 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisRiver.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRiver.java @@ -21,11 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java index 8aa25febd..990f3eb0b 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java @@ -19,11 +19,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.MaxNumber; -import com.volmit.iris.engine.object.annotations.MinNumber; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisSphere.java b/src/main/java/com/volmit/iris/engine/object/IrisSphere.java index 06fd43f21..434926bec 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisSphere.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSphere.java @@ -21,11 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; -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.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.slices.CavernMatter; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisVillagerOverride.java b/src/main/java/com/volmit/iris/engine/object/IrisVillagerOverride.java index 69c5edd38..6fd4981ca 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisVillagerOverride.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisVillagerOverride.java @@ -18,11 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.DependsOn; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/IrisVillagerTrade.java b/src/main/java/com/volmit/iris/engine/object/IrisVillagerTrade.java index f59e1a977..d9eba51a4 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisVillagerTrade.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisVillagerTrade.java @@ -20,12 +20,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -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.RegistryListItemType; -import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.annotations.Snippet; +import com.volmit.iris.engine.object.annotations.*; 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/IrisWorld.java b/src/main/java/com/volmit/iris/engine/object/IrisWorld.java index 2b5090d20..155388bf2 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisWorld.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisWorld.java @@ -21,11 +21,7 @@ package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.util.collection.KList; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; +import lombok.*; import lombok.experimental.Accessors; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/ArrayType.java b/src/main/java/com/volmit/iris/engine/object/annotations/ArrayType.java index 226012cdb..dfb46e3af 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/ArrayType.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/ArrayType.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/DependsOn.java b/src/main/java/com/volmit/iris/engine/object/annotations/DependsOn.java index c33a2f236..6d6ecd252 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/DependsOn.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/DependsOn.java @@ -21,8 +21,8 @@ package com.volmit.iris.engine.object.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/Desc.java b/src/main/java/com/volmit/iris/engine/object/annotations/Desc.java index 48509c137..9cec49518 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/Desc.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/Desc.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/MaxNumber.java b/src/main/java/com/volmit/iris/engine/object/annotations/MaxNumber.java index d5928e49d..b2c78c577 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/MaxNumber.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/MaxNumber.java @@ -21,8 +21,8 @@ package com.volmit.iris.engine.object.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/MinNumber.java b/src/main/java/com/volmit/iris/engine/object/annotations/MinNumber.java index 54dab8fac..067e6f597 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/MinNumber.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/MinNumber.java @@ -21,8 +21,8 @@ package com.volmit.iris.engine.object.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListBiomeDownfallType.java b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListBiomeDownfallType.java index 50711e581..9b19e51e3 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListBiomeDownfallType.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListBiomeDownfallType.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListBlockType.java b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListBlockType.java index 8170fb9d8..07170f0cf 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListBlockType.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListBlockType.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListFont.java b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListFont.java index 2a2964e9f..0d3b743fd 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListFont.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListFont.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListItemType.java b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListItemType.java index aea5013bb..c3420c2b8 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListItemType.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListItemType.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListResource.java b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListResource.java index 9475b7a69..d5fab0f82 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListResource.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListResource.java @@ -24,7 +24,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListSpecialEntity.java b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListSpecialEntity.java index 34a292a3c..53976a3cb 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListSpecialEntity.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/RegistryListSpecialEntity.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/Required.java b/src/main/java/com/volmit/iris/engine/object/annotations/Required.java index dcb6828b0..50035d8a0 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/Required.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/Required.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({PARAMETER, TYPE, FIELD}) diff --git a/src/main/java/com/volmit/iris/engine/object/annotations/Snippet.java b/src/main/java/com/volmit/iris/engine/object/annotations/Snippet.java index b0dbae401..3c17225e9 100644 --- a/src/main/java/com/volmit/iris/engine/object/annotations/Snippet.java +++ b/src/main/java/com/volmit/iris/engine/object/annotations/Snippet.java @@ -21,8 +21,8 @@ package com.volmit.iris.engine.object.annotations; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target({TYPE}) diff --git a/src/main/java/com/volmit/iris/engine/object/matter/IrisMatterPlacementLocation.java b/src/main/java/com/volmit/iris/engine/object/matter/IrisMatterPlacementLocation.java index 20f175cb4..b72ec4020 100644 --- a/src/main/java/com/volmit/iris/engine/object/matter/IrisMatterPlacementLocation.java +++ b/src/main/java/com/volmit/iris/engine/object/matter/IrisMatterPlacementLocation.java @@ -3,8 +3,6 @@ package com.volmit.iris.engine.object.matter; import com.volmit.iris.engine.IrisEngine; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.function.Function3; - -import java.util.function.Function; @Desc("WHERE THINGS PLACE") public enum IrisMatterPlacementLocation { SURFACE((e, x, z) -> e.getHeight(x, z, true)), diff --git a/src/main/java/com/volmit/iris/engine/object/matter/IrisMatterTranslate.java b/src/main/java/com/volmit/iris/engine/object/matter/IrisMatterTranslate.java index 7b7e599c9..2c86dbe6c 100644 --- a/src/main/java/com/volmit/iris/engine/object/matter/IrisMatterTranslate.java +++ b/src/main/java/com/volmit/iris/engine/object/matter/IrisMatterTranslate.java @@ -1,7 +1,6 @@ package com.volmit.iris.engine.object.matter; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.IrisEngine; import com.volmit.iris.engine.object.IrisStyledRange; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java index b96543410..29cc2bc2a 100644 --- a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java @@ -32,7 +32,6 @@ import com.volmit.iris.engine.object.StudioMode; import com.volmit.iris.engine.platform.studio.StudioGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.IrisBiomeStorage; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.view.BiomeGridHunkHolder; import com.volmit.iris.util.hunk.view.ChunkDataHunkHolder; @@ -40,26 +39,14 @@ import com.volmit.iris.util.io.ReactiveFolder; import com.volmit.iris.util.scheduling.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.Looper; -import com.volmit.iris.util.scheduling.PrecisionStopwatch; -import com.volmit.iris.util.stream.utility.ProfiledStream; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Setter; import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.ServerLevelAccessor; -import net.minecraft.world.level.WorldGenLevel; -import org.apache.commons.lang3.reflect.FieldUtils; -import org.bukkit.Bukkit; -import org.bukkit.Chunk; -import org.bukkit.HeightMap; -import org.bukkit.Material; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_19_R1.CraftServer; import org.bukkit.craftbukkit.v1_19_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R1.generator.CustomChunkGenerator; -import org.bukkit.craftbukkit.v1_19_R1.generator.InternalChunkGenerator; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -75,7 +62,6 @@ import sun.misc.Unsafe; import java.io.File; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.List; import java.util.Random; import java.util.concurrent.Semaphore; diff --git a/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java b/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java index 5a5f4c4b7..c453d5a62 100644 --- a/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java +++ b/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java @@ -1,6 +1,5 @@ package com.volmit.iris.engine.platform; -import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; import org.bukkit.block.Biome; import org.bukkit.generator.BiomeProvider; diff --git a/src/main/java/com/volmit/iris/util/cache/ArrayCache.java b/src/main/java/com/volmit/iris/util/cache/ArrayCache.java index 8b578898e..30fe51778 100644 --- a/src/main/java/com/volmit/iris/util/cache/ArrayCache.java +++ b/src/main/java/com/volmit/iris/util/cache/ArrayCache.java @@ -18,11 +18,8 @@ package com.volmit.iris.util.cache; -import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.util.hunk.bits.Writable; -import java.io.DataInput; -import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/util/cache/ChunkCache2D.java b/src/main/java/com/volmit/iris/util/cache/ChunkCache2D.java index a0fa5261a..fa7c94f2c 100644 --- a/src/main/java/com/volmit/iris/util/cache/ChunkCache2D.java +++ b/src/main/java/com/volmit/iris/util/cache/ChunkCache2D.java @@ -1,10 +1,8 @@ package com.volmit.iris.util.cache; -import com.volmit.iris.util.data.ChunkCache; import com.volmit.iris.util.function.Function2; import java.util.concurrent.atomic.AtomicReferenceArray; -import java.util.function.Function; public class ChunkCache2D { private final AtomicReferenceArray cache; diff --git a/src/main/java/com/volmit/iris/util/cache/DataBitCache.java b/src/main/java/com/volmit/iris/util/cache/DataBitCache.java index ba8ff7ebf..9e9479707 100644 --- a/src/main/java/com/volmit/iris/util/cache/DataBitCache.java +++ b/src/main/java/com/volmit/iris/util/cache/DataBitCache.java @@ -21,7 +21,6 @@ package com.volmit.iris.util.cache; import com.volmit.iris.util.hunk.bits.DataContainer; import lombok.Getter; -import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/util/cache/FloatCache.java b/src/main/java/com/volmit/iris/util/cache/FloatCache.java index 334922a52..a0ece2311 100644 --- a/src/main/java/com/volmit/iris/util/cache/FloatCache.java +++ b/src/main/java/com/volmit/iris/util/cache/FloatCache.java @@ -20,12 +20,7 @@ package com.volmit.iris.util.cache; import lombok.Getter; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; +import java.io.*; public class FloatCache implements ArrayCache { @Getter diff --git a/src/main/java/com/volmit/iris/util/cache/IntCache.java b/src/main/java/com/volmit/iris/util/cache/IntCache.java index 63509466e..482357027 100644 --- a/src/main/java/com/volmit/iris/util/cache/IntCache.java +++ b/src/main/java/com/volmit/iris/util/cache/IntCache.java @@ -18,8 +18,6 @@ package com.volmit.iris.util.cache; -import com.volmit.iris.util.hunk.bits.DataContainer; -import com.volmit.iris.util.hunk.bits.Writable; import lombok.Getter; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/util/cache/WorldCache2D.java b/src/main/java/com/volmit/iris/util/cache/WorldCache2D.java index 2ccfbe77d..e79b87aeb 100644 --- a/src/main/java/com/volmit/iris/util/cache/WorldCache2D.java +++ b/src/main/java/com/volmit/iris/util/cache/WorldCache2D.java @@ -1,18 +1,8 @@ package com.volmit.iris.util.cache; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.context.ChunkedDataCache; import com.volmit.iris.util.data.KCache; import com.volmit.iris.util.function.Function2; -import com.volmit.iris.util.mantle.Mantle; -import com.volmit.iris.util.scheduling.ChronoLatch; -import it.unimi.dsi.fastutil.longs.Long2LongMaps; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.locks.ReentrantLock; public class WorldCache2D { private final KCache> chunks; diff --git a/src/main/java/com/volmit/iris/util/collection/KList.java b/src/main/java/com/volmit/iris/util/collection/KList.java index 2da64a039..c077ea46d 100644 --- a/src/main/java/com/volmit/iris/util/collection/KList.java +++ b/src/main/java/com/volmit/iris/util/collection/KList.java @@ -23,13 +23,7 @@ import com.volmit.iris.util.json.JSONArray; import com.volmit.iris.util.math.M; import com.volmit.iris.util.math.RNG; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Random; +import java.util.*; import java.util.function.Function; import java.util.function.Predicate; diff --git a/src/main/java/com/volmit/iris/util/context/ChunkContext.java b/src/main/java/com/volmit/iris/util/context/ChunkContext.java index 9986d8983..818a6fe7c 100644 --- a/src/main/java/com/volmit/iris/util/context/ChunkContext.java +++ b/src/main/java/com/volmit/iris/util/context/ChunkContext.java @@ -3,7 +3,6 @@ package com.volmit.iris.util.context; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisRegion; -import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; diff --git a/src/main/java/com/volmit/iris/util/context/ChunkedDataCache.java b/src/main/java/com/volmit/iris/util/context/ChunkedDataCache.java index c8a58b481..6be0d2335 100644 --- a/src/main/java/com/volmit/iris/util/context/ChunkedDataCache.java +++ b/src/main/java/com/volmit/iris/util/context/ChunkedDataCache.java @@ -6,8 +6,6 @@ import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.stream.ProceduralStream; import lombok.Data; -import java.util.HashSet; - @Data public class ChunkedDataCache { private final int x; diff --git a/src/main/java/com/volmit/iris/util/context/IrisContext.java b/src/main/java/com/volmit/iris/util/context/IrisContext.java index f8e133b1c..87c56ba02 100644 --- a/src/main/java/com/volmit/iris/util/context/IrisContext.java +++ b/src/main/java/com/volmit/iris/util/context/IrisContext.java @@ -24,7 +24,6 @@ import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.scheduling.ChronoLatch; -import lombok.AllArgsConstructor; import lombok.Data; @Data 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 f74116f1f..4746d359c 100644 --- a/src/main/java/com/volmit/iris/util/data/B.java +++ b/src/main/java/com/volmit/iris/util/data/B.java @@ -24,11 +24,7 @@ import com.volmit.iris.core.service.ExternalDataSVC; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.scheduling.ChronoLatch; -import it.unimi.dsi.fastutil.ints.Int2IntMap; -import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; -import it.unimi.dsi.fastutil.ints.IntOpenHashSet; -import it.unimi.dsi.fastutil.ints.IntSet; -import it.unimi.dsi.fastutil.ints.IntSets; +import it.unimi.dsi.fastutil.ints.*; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.NamespacedKey; diff --git a/src/main/java/com/volmit/iris/util/data/Cuboid.java b/src/main/java/com/volmit/iris/util/data/Cuboid.java index a2ade169c..fc0d2d8bd 100644 --- a/src/main/java/com/volmit/iris/util/data/Cuboid.java +++ b/src/main/java/com/volmit/iris/util/data/Cuboid.java @@ -20,20 +20,12 @@ package com.volmit.iris.util.data; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.Direction; -import org.bukkit.Bukkit; -import org.bukkit.Chunk; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.block.Block; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.entity.Entity; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Cuboids diff --git a/src/main/java/com/volmit/iris/util/data/KCache.java b/src/main/java/com/volmit/iris/util/data/KCache.java index c596e8844..b6d47fc96 100644 --- a/src/main/java/com/volmit/iris/util/data/KCache.java +++ b/src/main/java/com/volmit/iris/util/data/KCache.java @@ -24,10 +24,6 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import com.volmit.iris.engine.framework.MeteredCache; import com.volmit.iris.util.math.RollingSequence; -import java.time.Duration; -import java.time.temporal.TemporalUnit; -import java.util.concurrent.TimeUnit; - public class KCache implements MeteredCache { private final long max; private CacheLoader loader; diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java index 3b073a51f..16cbbd93a 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java @@ -28,7 +28,6 @@ import com.volmit.iris.util.decree.DecreeParameterHandler; import com.volmit.iris.util.decree.exceptions.DecreeParsingException; import java.io.File; -import java.util.stream.Collectors; public class DimensionHandler implements DecreeParameterHandler { @Override diff --git a/src/main/java/com/volmit/iris/util/format/Form.java b/src/main/java/com/volmit/iris/util/format/Form.java index d7745bf92..ba4d2dd96 100644 --- a/src/main/java/com/volmit/iris/util/format/Form.java +++ b/src/main/java/com/volmit/iris/util/format/Form.java @@ -24,16 +24,8 @@ import com.volmit.iris.util.math.RollingSequence; import java.math.BigInteger; import java.text.DecimalFormat; import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.NavigableMap; -import java.util.TreeMap; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; 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 56f7d3b6f..cc6f43bbb 100644 --- a/src/main/java/com/volmit/iris/util/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/Hunk.java @@ -21,38 +21,9 @@ package com.volmit.iris.util.hunk; import com.volmit.iris.Iris; import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.function.Consumer2; -import com.volmit.iris.util.function.Consumer3; -import com.volmit.iris.util.function.Consumer4; -import com.volmit.iris.util.function.Consumer4IO; -import com.volmit.iris.util.function.Consumer5; -import com.volmit.iris.util.function.Consumer6; -import com.volmit.iris.util.function.Consumer8; -import com.volmit.iris.util.function.Function3; -import com.volmit.iris.util.function.Function4; -import com.volmit.iris.util.function.NoiseProvider; -import com.volmit.iris.util.function.NoiseProvider3; -import com.volmit.iris.util.function.Supplier3R; -import com.volmit.iris.util.hunk.storage.ArrayHunk; -import com.volmit.iris.util.hunk.storage.AtomicDoubleHunk; -import com.volmit.iris.util.hunk.storage.AtomicHunk; -import com.volmit.iris.util.hunk.storage.AtomicIntegerHunk; -import com.volmit.iris.util.hunk.storage.AtomicLongHunk; -import com.volmit.iris.util.hunk.storage.MappedHunk; -import com.volmit.iris.util.hunk.storage.SynchronizedArrayHunk; -import com.volmit.iris.util.hunk.view.BiomeGridHunkView; -import com.volmit.iris.util.hunk.view.ChunkBiomeHunkView; -import com.volmit.iris.util.hunk.view.ChunkDataHunkView; -import com.volmit.iris.util.hunk.view.ChunkHunkView; -import com.volmit.iris.util.hunk.view.DriftHunkView; -import com.volmit.iris.util.hunk.view.FringedHunkView; -import com.volmit.iris.util.hunk.view.FunctionalHunkView; -import com.volmit.iris.util.hunk.view.HunkView; -import com.volmit.iris.util.hunk.view.InvertedHunkView; -import com.volmit.iris.util.hunk.view.ListeningHunk; -import com.volmit.iris.util.hunk.view.ReadOnlyHunk; -import com.volmit.iris.util.hunk.view.SynchronizedHunkView; -import com.volmit.iris.util.hunk.view.WriteTrackHunk; +import com.volmit.iris.util.function.*; +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; diff --git a/src/main/java/com/volmit/iris/util/hunk/bits/DataContainer.java b/src/main/java/com/volmit/iris/util/hunk/bits/DataContainer.java index c864c04a2..2bf3915b1 100644 --- a/src/main/java/com/volmit/iris/util/hunk/bits/DataContainer.java +++ b/src/main/java/com/volmit/iris/util/hunk/bits/DataContainer.java @@ -20,11 +20,7 @@ package com.volmit.iris.util.hunk.bits; import com.volmit.iris.util.data.Varint; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java index 005738f22..8ff5361dd 100644 --- a/src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/BiomeGridHunkView.java @@ -18,7 +18,6 @@ package com.volmit.iris.util.hunk.view; -import com.volmit.iris.Iris; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.engine.data.chunk.LinkedTerrainChunk; import com.volmit.iris.util.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/util/hunk/view/ChunkDataHunkHolder.java b/src/main/java/com/volmit/iris/util/hunk/view/ChunkDataHunkHolder.java index e110ad4dc..82894a1fb 100644 --- a/src/main/java/com/volmit/iris/util/hunk/view/ChunkDataHunkHolder.java +++ b/src/main/java/com/volmit/iris/util/hunk/view/ChunkDataHunkHolder.java @@ -18,15 +18,11 @@ package com.volmit.iris.util.hunk.view; -import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.storage.AtomicHunk; -import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; -import java.util.concurrent.atomic.AtomicReferenceArray; - @SuppressWarnings("ClassCanBeRecord") public class ChunkDataHunkHolder extends AtomicHunk { private static final BlockData AIR = Material.AIR.createBlockData(); 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 2810296db..167467228 100644 --- a/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java +++ b/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java @@ -19,7 +19,6 @@ package com.volmit.iris.util.interpolation; import com.google.common.util.concurrent.AtomicDouble; -import com.volmit.iris.engine.data.chunk.LinkedTerrainChunk; import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.function.Consumer2; diff --git a/src/main/java/com/volmit/iris/util/io/IO.java b/src/main/java/com/volmit/iris/util/io/IO.java index 4b4728f72..5f68157fe 100644 --- a/src/main/java/com/volmit/iris/util/io/IO.java +++ b/src/main/java/com/volmit/iris/util/io/IO.java @@ -21,36 +21,12 @@ package com.volmit.iris.util.io; import com.volmit.iris.Iris; import com.volmit.iris.util.format.Form; -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.CharArrayWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.io.Reader; -import java.io.StringWriter; -import java.io.Writer; +import java.io.*; import java.nio.charset.StandardCharsets; import java.security.DigestInputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.List; +import java.util.*; import java.util.function.Consumer; import java.util.zip.GZIPInputStream; import java.util.zip.ZipEntry; diff --git a/src/main/java/com/volmit/iris/util/json/JSONObject.java b/src/main/java/com/volmit/iris/util/json/JSONObject.java index f94d1f102..f84a28422 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONObject.java +++ b/src/main/java/com/volmit/iris/util/json/JSONObject.java @@ -28,15 +28,8 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.math.BigDecimal; import java.math.BigInteger; -import java.util.Collection; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Locale; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.ResourceBundle; -import java.util.Set; /** * A JSONObject is an unordered collection of name/value pairs. Its external diff --git a/src/main/java/com/volmit/iris/util/json/JSONTokener.java b/src/main/java/com/volmit/iris/util/json/JSONTokener.java index 14a57dd7a..08b29a00f 100644 --- a/src/main/java/com/volmit/iris/util/json/JSONTokener.java +++ b/src/main/java/com/volmit/iris/util/json/JSONTokener.java @@ -21,12 +21,7 @@ package com.volmit.iris.util.json; import com.volmit.iris.Iris; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringReader; +import java.io.*; /** * A JSONTokener takes a source string and extracts characters and tokens from diff --git a/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java b/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java index 6d1a88342..c48da80e1 100644 --- a/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java +++ b/src/main/java/com/volmit/iris/util/mantle/TectonicPlate.java @@ -27,12 +27,7 @@ import com.volmit.iris.util.format.Form; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Getter; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; +import java.io.*; import java.util.concurrent.atomic.AtomicReferenceArray; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; 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 3bc390a83..5d9c65aca 100644 --- a/src/main/java/com/volmit/iris/util/matter/Matter.java +++ b/src/main/java/com/volmit/iris/util/matter/Matter.java @@ -29,14 +29,7 @@ import org.bukkit.block.data.BlockData; import org.bukkit.entity.Entity; import org.bukkit.util.BlockVector; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.util.Map; import java.util.Set; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/BiomeInjectMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/BiomeInjectMatter.java index 2db4194b3..ec36a60ab 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/BiomeInjectMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/BiomeInjectMatter.java @@ -20,7 +20,6 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.util.data.palette.Palette; import com.volmit.iris.util.matter.MatterBiomeInject; -import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.Sliced; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/util/nbt/io/NBTInputStream.java b/src/main/java/com/volmit/iris/util/nbt/io/NBTInputStream.java index ee14af5c0..08f7819dd 100644 --- a/src/main/java/com/volmit/iris/util/nbt/io/NBTInputStream.java +++ b/src/main/java/com/volmit/iris/util/nbt/io/NBTInputStream.java @@ -20,20 +20,7 @@ package com.volmit.iris.util.nbt.io; import com.volmit.iris.engine.data.io.ExceptionBiFunction; import com.volmit.iris.engine.data.io.MaxDepthIO; -import com.volmit.iris.util.nbt.tag.ByteArrayTag; -import com.volmit.iris.util.nbt.tag.ByteTag; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.DoubleTag; -import com.volmit.iris.util.nbt.tag.EndTag; -import com.volmit.iris.util.nbt.tag.FloatTag; -import com.volmit.iris.util.nbt.tag.IntArrayTag; -import com.volmit.iris.util.nbt.tag.IntTag; -import com.volmit.iris.util.nbt.tag.ListTag; -import com.volmit.iris.util.nbt.tag.LongArrayTag; -import com.volmit.iris.util.nbt.tag.LongTag; -import com.volmit.iris.util.nbt.tag.ShortTag; -import com.volmit.iris.util.nbt.tag.StringTag; -import com.volmit.iris.util.nbt.tag.Tag; +import com.volmit.iris.util.nbt.tag.*; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/util/nbt/io/NBTOutputStream.java b/src/main/java/com/volmit/iris/util/nbt/io/NBTOutputStream.java index ee4290bcb..95bb97d63 100644 --- a/src/main/java/com/volmit/iris/util/nbt/io/NBTOutputStream.java +++ b/src/main/java/com/volmit/iris/util/nbt/io/NBTOutputStream.java @@ -20,20 +20,7 @@ package com.volmit.iris.util.nbt.io; import com.volmit.iris.engine.data.io.ExceptionTriConsumer; import com.volmit.iris.engine.data.io.MaxDepthIO; -import com.volmit.iris.util.nbt.tag.ByteArrayTag; -import com.volmit.iris.util.nbt.tag.ByteTag; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.DoubleTag; -import com.volmit.iris.util.nbt.tag.EndTag; -import com.volmit.iris.util.nbt.tag.FloatTag; -import com.volmit.iris.util.nbt.tag.IntArrayTag; -import com.volmit.iris.util.nbt.tag.IntTag; -import com.volmit.iris.util.nbt.tag.ListTag; -import com.volmit.iris.util.nbt.tag.LongArrayTag; -import com.volmit.iris.util.nbt.tag.LongTag; -import com.volmit.iris.util.nbt.tag.ShortTag; -import com.volmit.iris.util.nbt.tag.StringTag; -import com.volmit.iris.util.nbt.tag.Tag; +import com.volmit.iris.util.nbt.tag.*; import java.io.DataOutputStream; import java.io.IOException; 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 a28df3aca..febc02576 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,13 +20,7 @@ package com.volmit.iris.util.nbt.io; import com.volmit.iris.util.nbt.tag.Tag; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PushbackInputStream; +import java.io.*; import java.util.zip.GZIPInputStream; public final class NBTUtil { diff --git a/src/main/java/com/volmit/iris/util/nbt/io/SNBTParser.java b/src/main/java/com/volmit/iris/util/nbt/io/SNBTParser.java index 2321cb7bf..532f289c4 100644 --- a/src/main/java/com/volmit/iris/util/nbt/io/SNBTParser.java +++ b/src/main/java/com/volmit/iris/util/nbt/io/SNBTParser.java @@ -20,21 +20,7 @@ package com.volmit.iris.util.nbt.io; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.io.MaxDepthIO; -import com.volmit.iris.util.nbt.tag.ArrayTag; -import com.volmit.iris.util.nbt.tag.ByteArrayTag; -import com.volmit.iris.util.nbt.tag.ByteTag; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.DoubleTag; -import com.volmit.iris.util.nbt.tag.EndTag; -import com.volmit.iris.util.nbt.tag.FloatTag; -import com.volmit.iris.util.nbt.tag.IntArrayTag; -import com.volmit.iris.util.nbt.tag.IntTag; -import com.volmit.iris.util.nbt.tag.ListTag; -import com.volmit.iris.util.nbt.tag.LongArrayTag; -import com.volmit.iris.util.nbt.tag.LongTag; -import com.volmit.iris.util.nbt.tag.ShortTag; -import com.volmit.iris.util.nbt.tag.StringTag; -import com.volmit.iris.util.nbt.tag.Tag; +import com.volmit.iris.util.nbt.tag.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/volmit/iris/util/nbt/io/SNBTWriter.java b/src/main/java/com/volmit/iris/util/nbt/io/SNBTWriter.java index f8d68e0c2..5937fb952 100644 --- a/src/main/java/com/volmit/iris/util/nbt/io/SNBTWriter.java +++ b/src/main/java/com/volmit/iris/util/nbt/io/SNBTWriter.java @@ -19,20 +19,7 @@ package com.volmit.iris.util.nbt.io; import com.volmit.iris.engine.data.io.MaxDepthIO; -import com.volmit.iris.util.nbt.tag.ByteArrayTag; -import com.volmit.iris.util.nbt.tag.ByteTag; -import com.volmit.iris.util.nbt.tag.CompoundTag; -import com.volmit.iris.util.nbt.tag.DoubleTag; -import com.volmit.iris.util.nbt.tag.EndTag; -import com.volmit.iris.util.nbt.tag.FloatTag; -import com.volmit.iris.util.nbt.tag.IntArrayTag; -import com.volmit.iris.util.nbt.tag.IntTag; -import com.volmit.iris.util.nbt.tag.ListTag; -import com.volmit.iris.util.nbt.tag.LongArrayTag; -import com.volmit.iris.util.nbt.tag.LongTag; -import com.volmit.iris.util.nbt.tag.ShortTag; -import com.volmit.iris.util.nbt.tag.StringTag; -import com.volmit.iris.util.nbt.tag.Tag; +import com.volmit.iris.util.nbt.tag.*; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java b/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java index 3eba24125..5b6dc03dc 100644 --- a/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java +++ b/src/main/java/com/volmit/iris/util/nbt/mca/Chunk.java @@ -28,12 +28,7 @@ import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer; import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.nbt.tag.ListTag; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.RandomAccessFile; +import java.io.*; import static com.volmit.iris.util.nbt.mca.LoadFlags.*; diff --git a/src/main/java/com/volmit/iris/util/nbt/tag/CompoundTag.java b/src/main/java/com/volmit/iris/util/nbt/tag/CompoundTag.java index d610eab3a..9262dc793 100644 --- a/src/main/java/com/volmit/iris/util/nbt/tag/CompoundTag.java +++ b/src/main/java/com/volmit/iris/util/nbt/tag/CompoundTag.java @@ -21,11 +21,7 @@ package com.volmit.iris.util.nbt.tag; import com.volmit.iris.engine.data.io.MaxDepthIO; import com.volmit.iris.util.collection.KMap; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.function.BiConsumer; @SuppressWarnings("ALL") diff --git a/src/main/java/com/volmit/iris/util/nbt/tag/ListTag.java b/src/main/java/com/volmit/iris/util/nbt/tag/ListTag.java index 8e71fc360..fcb42fa75 100644 --- a/src/main/java/com/volmit/iris/util/nbt/tag/ListTag.java +++ b/src/main/java/com/volmit/iris/util/nbt/tag/ListTag.java @@ -21,11 +21,7 @@ package com.volmit.iris.util.nbt.tag; import com.volmit.iris.engine.data.io.MaxDepthIO; import com.volmit.iris.util.collection.KList; -import java.util.Collection; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Consumer; diff --git a/src/main/java/com/volmit/iris/util/network/DL.java b/src/main/java/com/volmit/iris/util/network/DL.java index 7fb46f07f..6320f9ea3 100644 --- a/src/main/java/com/volmit/iris/util/network/DL.java +++ b/src/main/java/com/volmit/iris/util/network/DL.java @@ -22,12 +22,7 @@ import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.scheduling.ChronoLatch; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.net.URL; import java.net.URLConnection; import java.util.Arrays; 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 2c4b069b2..96b84d90e 100644 --- a/src/main/java/com/volmit/iris/util/noise/CNG.java +++ b/src/main/java/com/volmit/iris/util/noise/CNG.java @@ -19,10 +19,8 @@ package com.volmit.iris.util.noise; import com.volmit.iris.Iris; -import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.IRare; import com.volmit.iris.engine.object.NoiseStyle; -import com.volmit.iris.util.cache.FloatBitCache; import com.volmit.iris.util.cache.FloatCache; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.Form; @@ -37,7 +35,6 @@ import lombok.Data; import java.io.DataOutputStream; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/volmit/iris/util/noise/CachedNoise.java b/src/main/java/com/volmit/iris/util/noise/CachedNoise.java index e33ed2ccf..3033ee2d5 100644 --- a/src/main/java/com/volmit/iris/util/noise/CachedNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/CachedNoise.java @@ -18,8 +18,6 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.util.math.RNG; - public class CachedNoise implements NoiseGenerator { private final CachedNoiseMap n; diff --git a/src/main/java/com/volmit/iris/util/noise/CachedNoiseMap.java b/src/main/java/com/volmit/iris/util/noise/CachedNoiseMap.java index 8d9ca13a2..c8f919a5f 100644 --- a/src/main/java/com/volmit/iris/util/noise/CachedNoiseMap.java +++ b/src/main/java/com/volmit/iris/util/noise/CachedNoiseMap.java @@ -19,7 +19,6 @@ package com.volmit.iris.util.noise; import com.volmit.iris.util.hunk.bits.Writable; -import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.matter.IrisMatter; import com.volmit.iris.util.matter.Matter; import com.volmit.iris.util.matter.MatterSlice; diff --git a/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java b/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java index 4280f8aed..a7b017c83 100644 --- a/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/util/parallel/MultiBurst.java @@ -26,12 +26,7 @@ import com.volmit.iris.util.math.M; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.ForkJoinWorkerThread; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicLong; public class MultiBurst { diff --git a/src/main/java/com/volmit/iris/util/plugin/Command.java b/src/main/java/com/volmit/iris/util/plugin/Command.java index 4698693c4..bd9cd546c 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Command.java +++ b/src/main/java/com/volmit/iris/util/plugin/Command.java @@ -21,8 +21,8 @@ package com.volmit.iris.util.plugin; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target(FIELD) diff --git a/src/main/java/com/volmit/iris/util/plugin/Control.java b/src/main/java/com/volmit/iris/util/plugin/Control.java index d78e8cd83..ed71caad8 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Control.java +++ b/src/main/java/com/volmit/iris/util/plugin/Control.java @@ -21,8 +21,8 @@ package com.volmit.iris.util.plugin; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target(FIELD) diff --git a/src/main/java/com/volmit/iris/util/plugin/Instance.java b/src/main/java/com/volmit/iris/util/plugin/Instance.java index 824cf6f8c..9eac62fc7 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Instance.java +++ b/src/main/java/com/volmit/iris/util/plugin/Instance.java @@ -21,8 +21,8 @@ package com.volmit.iris.util.plugin; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target(FIELD) diff --git a/src/main/java/com/volmit/iris/util/plugin/Metrics.java b/src/main/java/com/volmit/iris/util/plugin/Metrics.java index 551a63660..ad2969008 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Metrics.java +++ b/src/main/java/com/volmit/iris/util/plugin/Metrics.java @@ -31,23 +31,12 @@ import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.ServicePriority; import javax.net.ssl.HttpsURLConnection; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; +import java.io.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Timer; -import java.util.TimerTask; -import java.util.UUID; +import java.util.*; import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.zip.GZIPOutputStream; diff --git a/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java b/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java index 2eaf4e5c9..bf8c51fa1 100644 --- a/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java +++ b/src/main/java/com/volmit/iris/util/plugin/MetricsLite.java @@ -30,12 +30,7 @@ import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.ServicePriority; import javax.net.ssl.HttpsURLConnection; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; +import java.io.*; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URL; diff --git a/src/main/java/com/volmit/iris/util/plugin/Permission.java b/src/main/java/com/volmit/iris/util/plugin/Permission.java index ef5dcbcd2..e13a18a3a 100644 --- a/src/main/java/com/volmit/iris/util/plugin/Permission.java +++ b/src/main/java/com/volmit/iris/util/plugin/Permission.java @@ -21,8 +21,8 @@ package com.volmit.iris.util.plugin; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import static java.lang.annotation.ElementType.*; -import static java.lang.annotation.RetentionPolicy.*; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; @Retention(RUNTIME) @Target(FIELD) 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 0044a8e38..955369b25 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitPlugin.java @@ -27,10 +27,7 @@ import com.volmit.iris.util.reflect.V; import com.volmit.iris.util.scheduling.J; import org.bukkit.Bukkit; import org.bukkit.command.Command; -import org.bukkit.command.CommandMap; -import org.bukkit.command.CommandSender; -import org.bukkit.command.PluginCommand; -import org.bukkit.command.SimpleCommandMap; +import org.bukkit.command.*; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java index 51864039a..1e0e3bbb1 100644 --- a/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java +++ b/src/main/java/com/volmit/iris/util/plugin/VolmitSender.java @@ -51,7 +51,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; /** * Represents a volume sender. A command sender with extra crap in it 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 fe2b70327..c6ed6bcff 100644 --- a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java @@ -32,47 +32,15 @@ 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.parallel.BurstExecutor; -import com.volmit.iris.util.parallel.GridLock; import com.volmit.iris.util.parallel.MultiBurst; -import com.volmit.iris.util.stream.arithmetic.AddingStream; -import com.volmit.iris.util.stream.arithmetic.ClampedStream; -import com.volmit.iris.util.stream.arithmetic.CoordinateBitShiftLeftStream; -import com.volmit.iris.util.stream.arithmetic.CoordinateBitShiftRightStream; -import com.volmit.iris.util.stream.arithmetic.DividingStream; -import com.volmit.iris.util.stream.arithmetic.FittedStream; -import com.volmit.iris.util.stream.arithmetic.MaxingStream; -import com.volmit.iris.util.stream.arithmetic.MinningStream; -import com.volmit.iris.util.stream.arithmetic.ModuloStream; -import com.volmit.iris.util.stream.arithmetic.MultiplyingStream; -import com.volmit.iris.util.stream.arithmetic.OffsetStream; -import com.volmit.iris.util.stream.arithmetic.RadialStream; -import com.volmit.iris.util.stream.arithmetic.RoundingDoubleStream; -import com.volmit.iris.util.stream.arithmetic.SlopeStream; -import com.volmit.iris.util.stream.arithmetic.SubtractingStream; -import com.volmit.iris.util.stream.arithmetic.ZoomStream; -import com.volmit.iris.util.stream.convert.AwareConversionStream2D; -import com.volmit.iris.util.stream.convert.AwareConversionStream3D; -import com.volmit.iris.util.stream.convert.CachedConversionStream; -import com.volmit.iris.util.stream.convert.ConversionStream; -import com.volmit.iris.util.stream.convert.ForceDoubleStream; -import com.volmit.iris.util.stream.convert.RoundingStream; -import com.volmit.iris.util.stream.convert.SelectionStream; -import com.volmit.iris.util.stream.convert.SignificanceStream; -import com.volmit.iris.util.stream.convert.To3DStream; +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.CachedStream2D; -import com.volmit.iris.util.stream.utility.CachedStream3D; -import com.volmit.iris.util.stream.utility.ContextInjectingStream; -import com.volmit.iris.util.stream.utility.NullSafeStream; -import com.volmit.iris.util.stream.utility.ProfiledStream; -import com.volmit.iris.util.stream.utility.SemaphoreStream; -import com.volmit.iris.util.stream.utility.SynchronizedStream; -import com.volmit.iris.util.stream.utility.WasteDetector; +import com.volmit.iris.util.stream.utility.*; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.CompletableFuture; import java.util.function.Function; @SuppressWarnings("ALL") diff --git a/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java index fb834874e..18d07d696 100644 --- a/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/CachedStream2D.java @@ -20,13 +20,10 @@ package com.volmit.iris.util.stream.utility; import com.volmit.iris.Iris; import com.volmit.iris.core.service.PreservationSVC; -import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.MeteredCache; import com.volmit.iris.util.cache.WorldCache2D; import com.volmit.iris.util.data.KCache; -import com.volmit.iris.util.hunk.Hunk; -import com.volmit.iris.util.hunk.storage.ArrayHunk; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; diff --git a/src/main/java/com/volmit/iris/util/stream/utility/ContextInjectingStream.java b/src/main/java/com/volmit/iris/util/stream/utility/ContextInjectingStream.java index bb887855e..0b9a05fa6 100644 --- a/src/main/java/com/volmit/iris/util/stream/utility/ContextInjectingStream.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/ContextInjectingStream.java @@ -1,14 +1,11 @@ package com.volmit.iris.util.stream.utility; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.context.ChunkContext; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.function.Function3; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; -import java.util.concurrent.atomic.AtomicInteger; - public class ContextInjectingStream extends BasicStream { private final Function3 contextAccessor; diff --git a/src/main/java/com/volmit/iris/util/stream/utility/WasteDetector.java b/src/main/java/com/volmit/iris/util/stream/utility/WasteDetector.java index b1006e855..6fab36e03 100644 --- a/src/main/java/com/volmit/iris/util/stream/utility/WasteDetector.java +++ b/src/main/java/com/volmit/iris/util/stream/utility/WasteDetector.java @@ -3,11 +3,9 @@ package com.volmit.iris.util.stream.utility; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.format.C; import com.volmit.iris.util.stream.BasicStream; import com.volmit.iris.util.stream.ProceduralStream; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/com/volmit/iris/util/uniques/UFeature.java b/src/main/java/com/volmit/iris/util/uniques/UFeature.java index a06ccd00b..e9d5a7c97 100644 --- a/src/main/java/com/volmit/iris/util/uniques/UFeature.java +++ b/src/main/java/com/volmit/iris/util/uniques/UFeature.java @@ -1,16 +1,11 @@ package com.volmit.iris.util.uniques; -import com.volmit.iris.engine.object.NoiseStyle; -import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.NoiseInjector; import com.volmit.iris.util.interpolation.InterpolationMethod; 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 java.awt.*; -import java.awt.image.BufferedImage; import java.util.List; import java.util.function.Consumer; diff --git a/src/main/java/com/volmit/iris/util/uniques/UFeatureMeta.java b/src/main/java/com/volmit/iris/util/uniques/UFeatureMeta.java index faa87fef1..df04f0a52 100644 --- a/src/main/java/com/volmit/iris/util/uniques/UFeatureMeta.java +++ b/src/main/java/com/volmit/iris/util/uniques/UFeatureMeta.java @@ -3,9 +3,7 @@ package com.volmit.iris.util.uniques; import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.function.NoiseInjector; import com.volmit.iris.util.interpolation.InterpolationMethod; -import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.noise.CNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/uniques/UMeta.java b/src/main/java/com/volmit/iris/util/uniques/UMeta.java index f5ba9aae6..bdac42e38 100644 --- a/src/main/java/com/volmit/iris/util/uniques/UMeta.java +++ b/src/main/java/com/volmit/iris/util/uniques/UMeta.java @@ -1,14 +1,8 @@ package com.volmit.iris.util.uniques; -import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.volmit.iris.engine.object.NoiseStyle; -import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.io.IO; -import com.volmit.iris.util.noise.CNG; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,7 +10,6 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import java.util.List; @Data @NoArgsConstructor diff --git a/src/main/java/com/volmit/iris/util/uniques/UniqueRenderer.java b/src/main/java/com/volmit/iris/util/uniques/UniqueRenderer.java index a8b80e3fe..cc2d629c8 100644 --- a/src/main/java/com/volmit/iris/util/uniques/UniqueRenderer.java +++ b/src/main/java/com/volmit/iris/util/uniques/UniqueRenderer.java @@ -1,6 +1,5 @@ package com.volmit.iris.util.uniques; -import com.volmit.iris.Iris; import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; @@ -11,15 +10,12 @@ import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.math.RNG; 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.ChronoLatch; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import com.volmit.iris.util.stream.ProceduralStream; import com.volmit.iris.util.uniques.features.*; -import javax.imageio.ImageIO; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.util.List; diff --git a/src/main/java/com/volmit/iris/util/uniques/features/UFInterpolator.java b/src/main/java/com/volmit/iris/util/uniques/features/UFInterpolator.java index e2cfecf8f..e615f5575 100644 --- a/src/main/java/com/volmit/iris/util/uniques/features/UFInterpolator.java +++ b/src/main/java/com/volmit/iris/util/uniques/features/UFInterpolator.java @@ -3,13 +3,11 @@ package com.volmit.iris.util.uniques.features; 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.math.M; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.uniques.UFeature; import com.volmit.iris.util.uniques.UFeatureMeta; import com.volmit.iris.util.uniques.UImage; -import com.volmit.iris.util.uniques.UniqueRenderer; import java.awt.*; import java.util.function.Consumer; diff --git a/src/main/java/com/volmit/iris/util/uniques/features/UFNOOP.java b/src/main/java/com/volmit/iris/util/uniques/features/UFNOOP.java index 76c4db56b..084bdda34 100644 --- a/src/main/java/com/volmit/iris/util/uniques/features/UFNOOP.java +++ b/src/main/java/com/volmit/iris/util/uniques/features/UFNOOP.java @@ -1,12 +1,10 @@ package com.volmit.iris.util.uniques.features; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.uniques.UFeature; import com.volmit.iris.util.uniques.UFeatureMeta; import com.volmit.iris.util.uniques.UImage; -import java.awt.*; import java.util.function.Consumer; public class UFNOOP implements UFeature { diff --git a/src/main/java/com/volmit/iris/util/uniques/features/UFWarpedBackground.java b/src/main/java/com/volmit/iris/util/uniques/features/UFWarpedBackground.java index da5f0e411..d3c347ee3 100644 --- a/src/main/java/com/volmit/iris/util/uniques/features/UFWarpedBackground.java +++ b/src/main/java/com/volmit/iris/util/uniques/features/UFWarpedBackground.java @@ -6,7 +6,6 @@ import com.volmit.iris.util.uniques.UFeature; import com.volmit.iris.util.uniques.UFeatureMeta; import com.volmit.iris.util.uniques.UImage; -import java.awt.*; import java.util.function.Consumer; public class UFWarpedBackground implements UFeature { diff --git a/src/main/java/com/volmit/iris/util/uniques/features/UFWarpedCircle.java b/src/main/java/com/volmit/iris/util/uniques/features/UFWarpedCircle.java index 2d73ee01b..bad5e9c63 100644 --- a/src/main/java/com/volmit/iris/util/uniques/features/UFWarpedCircle.java +++ b/src/main/java/com/volmit/iris/util/uniques/features/UFWarpedCircle.java @@ -6,8 +6,6 @@ import com.volmit.iris.util.uniques.UFeature; import com.volmit.iris.util.uniques.UFeatureMeta; import com.volmit.iris.util.uniques.UImage; -import java.awt.*; -import java.awt.image.BufferedImage; import java.util.function.Consumer; public class UFWarpedCircle implements UFeature {