From 6a03b4b125fbe2697003aba7ae259b73057aefe2 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 28 Oct 2020 00:29:37 -0400 Subject: [PATCH] Delete fbd --- .../structures/StructureObject.java | 1 - .../iris/command/CommandIrisWhatBlock.java | 1 - .../iris/gen/DimensionalTerrainProvider.java | 1 - .../volmit/iris/gen/IrisTerrainProvider.java | 1 - .../iris/gen/ParallaxTerrainProvider.java | 1 - .../iris/gen/PostBlockTerrainProvider.java | 1 - .../iris/gen/TopographicTerrainProvider.java | 1 - .../volmit/iris/gen/atomics/AtomicSliver.java | 1 - .../volmit/iris/gen/layer/GenLayerCave.java | 1 - .../volmit/iris/gen/layer/GenLayerRavine.java | 1 - .../volmit/iris/gen/layer/GenLayerText.java | 1 - .../volmit/iris/gen/layer/GenLayerUpdate.java | 1 - .../iris/gen/post/PostMasterPatcher.java | 1 - .../iris/gen/provisions/ProvisionBukkit.java | 1 - .../com/volmit/iris/gen/v2/IrisComplex.java | 1 - .../v2/scaffold/hunk/view/ChunkHunkView.java | 1 - .../com/volmit/iris/manager/EditManager.java | 1 - .../com/volmit/iris/manager/WandManager.java | 1 - .../com/volmit/iris/object/IrisBiome.java | 1 - .../iris/object/IrisBiomePaletteLayer.java | 1 - .../com/volmit/iris/object/IrisBlockData.java | 1 - .../volmit/iris/object/IrisBlockDrops.java | 1 - .../com/volmit/iris/object/IrisCaveFluid.java | 1 - .../com/volmit/iris/object/IrisCompat.java | 1 - .../object/IrisCompatabilityBlockFilter.java | 1 - .../com/volmit/iris/object/IrisDecorator.java | 1 - .../iris/object/IrisDepositGenerator.java | 1 - .../com/volmit/iris/object/IrisDimension.java | 1 - .../iris/object/IrisMaterialPalette.java | 1 - .../com/volmit/iris/object/IrisObject.java | 1 - .../volmit/iris/object/IrisObjectReplace.java | 1 - .../iris/object/IrisObjectRotation.java | 1 - .../iris/structure/StructureTemplate.java | 1 - .../com/volmit/iris/util/FastBlockData.java | 142 ------------------ 34 files changed, 175 deletions(-) delete mode 100644 src/main/java/com/volmit/iris/util/FastBlockData.java diff --git a/src/main/java/com/minelazz/epicworldgenerator/structures/StructureObject.java b/src/main/java/com/minelazz/epicworldgenerator/structures/StructureObject.java index 7efdc5851..fd9dc8b59 100644 --- a/src/main/java/com/minelazz/epicworldgenerator/structures/StructureObject.java +++ b/src/main/java/com/minelazz/epicworldgenerator/structures/StructureObject.java @@ -15,7 +15,6 @@ import org.bukkit.util.BlockVector; import com.volmit.iris.Iris; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.B; -import com.volmit.iris.util.FastBlockData; public class StructureObject implements Serializable { diff --git a/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java index 2737d64b6..a3d3957a9 100644 --- a/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/command/CommandIrisWhatBlock.java @@ -7,7 +7,6 @@ import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.util.B; import com.volmit.iris.util.C; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java b/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java index 629d6a2d7..436b7bb7a 100644 --- a/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/DimensionalTerrainProvider.java @@ -14,7 +14,6 @@ import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisRegion; import com.volmit.iris.util.B; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.MortarSender; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java index 5febc7ba9..3f2b4ce97 100644 --- a/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/IrisTerrainProvider.java @@ -34,7 +34,6 @@ import com.volmit.iris.object.IrisEffect; import com.volmit.iris.object.IrisEntityInitialSpawn; import com.volmit.iris.object.IrisEntitySpawnOverride; import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.Form; import com.volmit.iris.util.IrisStructureResult; import com.volmit.iris.util.J; diff --git a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java b/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java index 8b6748667..da6035083 100644 --- a/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/ParallaxTerrainProvider.java @@ -28,7 +28,6 @@ import com.volmit.iris.util.BiomeMap; import com.volmit.iris.util.CarveResult; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.ChunkPosition; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.HeightMap; import com.volmit.iris.util.IObjectPlacer; import com.volmit.iris.util.IrisLock; diff --git a/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java b/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java index 01eb44e3f..89f9b2a2a 100644 --- a/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/PostBlockTerrainProvider.java @@ -8,7 +8,6 @@ import com.volmit.iris.gen.scaffold.GeneratedChunk; import com.volmit.iris.gen.scaffold.TerrainChunk; import com.volmit.iris.gen.scaffold.TerrainTarget; import com.volmit.iris.util.CaveResult; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.IPostBlockAccess; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java b/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java index cf5555863..5971dec69 100644 --- a/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java +++ b/src/main/java/com/volmit/iris/gen/TopographicTerrainProvider.java @@ -30,7 +30,6 @@ import com.volmit.iris.util.B; import com.volmit.iris.util.BiomeMap; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.ChronoLatch; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.HeightMap; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java index 8dd634304..64e20e711 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java @@ -11,7 +11,6 @@ import org.bukkit.generator.ChunkGenerator.ChunkData; import com.volmit.iris.Iris; import com.volmit.iris.util.B; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.HeightMap; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java index c1010b095..160cf4c92 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java @@ -13,7 +13,6 @@ import com.volmit.iris.noise.FastNoiseDouble.NoiseType; import com.volmit.iris.object.IrisCaveLayer; import com.volmit.iris.util.B; import com.volmit.iris.util.CaveResult; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.GenLayer; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java index d2b4eed7b..300ebdb6b 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerRavine.java @@ -11,7 +11,6 @@ import com.volmit.iris.util.B; import com.volmit.iris.util.BiomeMap; import com.volmit.iris.util.BlockPosition; import com.volmit.iris.util.ChunkPosition; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.GenLayer; import com.volmit.iris.util.HeightMap; import com.volmit.iris.util.MathHelper; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java index 077de310d..9a17c804b 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerText.java @@ -11,7 +11,6 @@ import com.volmit.iris.gen.atomics.AtomicCache; import com.volmit.iris.object.IrisMaterialPalette; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.B; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.GenLayer; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java index 27ca46172..aea790f3e 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerUpdate.java @@ -25,7 +25,6 @@ import com.volmit.iris.object.IrisLootTable; import com.volmit.iris.object.IrisRegion; import com.volmit.iris.object.LootMode; import com.volmit.iris.util.B; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.IrisStructureResult; import com.volmit.iris.util.KList; import com.volmit.iris.util.PrecisionStopwatch; diff --git a/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java b/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java index 213181941..508d1628a 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java +++ b/src/main/java/com/volmit/iris/gen/post/PostMasterPatcher.java @@ -12,7 +12,6 @@ import com.volmit.iris.object.IrisBiome; import com.volmit.iris.util.B; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.IrisPostBlockFilter; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/gen/provisions/ProvisionBukkit.java b/src/main/java/com/volmit/iris/gen/provisions/ProvisionBukkit.java index 46a8b094e..8c2a90bd2 100644 --- a/src/main/java/com/volmit/iris/gen/provisions/ProvisionBukkit.java +++ b/src/main/java/com/volmit/iris/gen/provisions/ProvisionBukkit.java @@ -21,7 +21,6 @@ import com.volmit.iris.gen.scaffold.Provisioned; import com.volmit.iris.gen.scaffold.TerrainChunk; import com.volmit.iris.gen.scaffold.TerrainProvider; import com.volmit.iris.util.ChunkPosition; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/gen/v2/IrisComplex.java b/src/main/java/com/volmit/iris/gen/v2/IrisComplex.java index 6165446e9..ebccfbdda 100644 --- a/src/main/java/com/volmit/iris/gen/v2/IrisComplex.java +++ b/src/main/java/com/volmit/iris/gen/v2/IrisComplex.java @@ -17,7 +17,6 @@ import com.volmit.iris.object.IrisBiomePaletteLayer; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisGenerator; import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.M; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java index 8bf76beab..ebebedcc4 100644 --- a/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java +++ b/src/main/java/com/volmit/iris/gen/v2/scaffold/hunk/view/ChunkHunkView.java @@ -5,7 +5,6 @@ import org.bukkit.Chunk; import org.bukkit.block.data.BlockData; import com.volmit.iris.Iris; -import com.volmit.iris.util.FastBlockData; public class ChunkHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/manager/EditManager.java b/src/main/java/com/volmit/iris/manager/EditManager.java index 45418b149..f17d69f93 100644 --- a/src/main/java/com/volmit/iris/manager/EditManager.java +++ b/src/main/java/com/volmit/iris/manager/EditManager.java @@ -12,7 +12,6 @@ import com.volmit.iris.IrisSettings; import com.volmit.iris.edit.BlockEditor; import com.volmit.iris.edit.BukkitBlockEditor; import com.volmit.iris.edit.WEBlockEditor; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KMap; import com.volmit.iris.util.M; diff --git a/src/main/java/com/volmit/iris/manager/WandManager.java b/src/main/java/com/volmit/iris/manager/WandManager.java index 4fe43d67e..78177ca20 100644 --- a/src/main/java/com/volmit/iris/manager/WandManager.java +++ b/src/main/java/com/volmit/iris/manager/WandManager.java @@ -26,7 +26,6 @@ import com.volmit.iris.Iris; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.C; import com.volmit.iris.util.Cuboid; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.M; diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/object/IrisBiome.java index 71681b1f6..b2cc8b5fe 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/object/IrisBiome.java @@ -15,7 +15,6 @@ import com.volmit.iris.util.B; import com.volmit.iris.util.DependsOn; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.IRare; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java index 324e04912..d066db864 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java @@ -7,7 +7,6 @@ import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.DependsOn; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisBlockData.java b/src/main/java/com/volmit/iris/object/IrisBlockData.java index c11911295..5f5485018 100644 --- a/src/main/java/com/volmit/iris/object/IrisBlockData.java +++ b/src/main/java/com/volmit/iris/object/IrisBlockData.java @@ -6,7 +6,6 @@ import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java b/src/main/java/com/volmit/iris/object/IrisBlockDrops.java index 007a69c33..f49afc2b6 100644 --- a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java +++ b/src/main/java/com/volmit/iris/object/IrisBlockDrops.java @@ -7,7 +7,6 @@ import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; import com.volmit.iris.util.Required; diff --git a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java b/src/main/java/com/volmit/iris/object/IrisCaveFluid.java index 4bb31d28d..af4fa0cdf 100644 --- a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java +++ b/src/main/java/com/volmit/iris/object/IrisCaveFluid.java @@ -5,7 +5,6 @@ import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; import com.volmit.iris.util.Required; diff --git a/src/main/java/com/volmit/iris/object/IrisCompat.java b/src/main/java/com/volmit/iris/object/IrisCompat.java index eaff4653e..1ec6e98ab 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompat.java +++ b/src/main/java/com/volmit/iris/object/IrisCompat.java @@ -8,7 +8,6 @@ import org.bukkit.Material; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.volmit.iris.util.B; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.IO; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java b/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java index ccd8d6021..72d7eebf6 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java +++ b/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java @@ -5,7 +5,6 @@ import com.volmit.iris.gen.atomics.AtomicCache; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.Required; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisDecorator.java b/src/main/java/com/volmit/iris/object/IrisDecorator.java index afa6b3823..36c63b275 100644 --- a/src/main/java/com/volmit/iris/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/object/IrisDecorator.java @@ -8,7 +8,6 @@ import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.DependsOn; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java index 4577382f8..04ea14366 100644 --- a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java @@ -12,7 +12,6 @@ import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.HeightMap; import com.volmit.iris.util.KList; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java index 3c33a62d5..ecdc1a773 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/object/IrisDimension.java @@ -14,7 +14,6 @@ import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.ChunkPosition; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.Form; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.IrisPostBlockFilter; diff --git a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java index 12cd9e6bb..a8e40c2b6 100644 --- a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java @@ -6,7 +6,6 @@ import com.volmit.iris.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.MinNumber; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/object/IrisObject.java b/src/main/java/com/volmit/iris/object/IrisObject.java index d04a51760..68fd3d9d7 100644 --- a/src/main/java/com/volmit/iris/object/IrisObject.java +++ b/src/main/java/com/volmit/iris/object/IrisObject.java @@ -22,7 +22,6 @@ import com.volmit.iris.util.B; import com.volmit.iris.util.BlockPosition; import com.volmit.iris.util.CarveResult; import com.volmit.iris.util.ChunkPosition; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.IObjectPlacer; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java index 485326e34..3167c6fe4 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java @@ -6,7 +6,6 @@ import com.volmit.iris.noise.CNG; import com.volmit.iris.util.ArrayType; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; import com.volmit.iris.util.Required; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java index 12f23b920..0eda862e0 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java @@ -11,7 +11,6 @@ import org.bukkit.util.BlockVector; import com.volmit.iris.util.Desc; import com.volmit.iris.util.DontObfuscate; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.KList; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/structure/StructureTemplate.java b/src/main/java/com/volmit/iris/structure/StructureTemplate.java index 053995c04..19310397b 100644 --- a/src/main/java/com/volmit/iris/structure/StructureTemplate.java +++ b/src/main/java/com/volmit/iris/structure/StructureTemplate.java @@ -41,7 +41,6 @@ import com.volmit.iris.util.B; import com.volmit.iris.util.C; import com.volmit.iris.util.ChronoLatch; import com.volmit.iris.util.Cuboid; -import com.volmit.iris.util.FastBlockData; import com.volmit.iris.util.Form; import com.volmit.iris.util.IO; import com.volmit.iris.util.IObjectPlacer; diff --git a/src/main/java/com/volmit/iris/util/FastBlockData.java b/src/main/java/com/volmit/iris/util/FastBlockData.java deleted file mode 100644 index 9059ab8f6..000000000 --- a/src/main/java/com/volmit/iris/util/FastBlockData.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.volmit.iris.util; - -import org.bukkit.Material; -import org.bukkit.block.data.BlockData; - -public class FastBlockData -{ - private static final KMap defaultBlockData = new KMap<>(); - private BlockData blockData; - private Material type; - - private FastBlockData(BlockData d) - { - this.blockData = d; - this.type = null; - optimize(); - } - - private FastBlockData(Material m) - { - this.type = m; - this.blockData = null; - } - - public Material getMaterial() - { - return type != null ? type : blockData.getMaterial(); - } - - public static FastBlockData of(Material type) - { - return new FastBlockData(type); - } - - public static FastBlockData of(BlockData type) - { - return new FastBlockData(type); - } - - public Material getType() - { - return type != null ? type : blockData.getMaterial(); - } - - public FastBlockData optimize() - { - if(hasBlockData()) - { - BlockData f = getDefaultBlockData(getMaterial()); - - if(f.hashCode() == getBlockData().hashCode()) - { - type = getBlockData().getMaterial(); - blockData = null; - return this; - } - } - - return this; - } - - private static BlockData getDefaultBlockData(Material type) - { - return defaultBlockData.compute(type, (k, v) -> v != null ? v : type.createBlockData()); - } - - public boolean hasBlockData() - { - return blockData != null; - } - - public BlockData createBlockData() - { - if(blockData != null) - { - return blockData; - } - - return type.createBlockData(); - } - - public BlockData getBlockData() - { - if(blockData == null) - { - blockData = createBlockData(); - } - - return blockData; - } - - @Override - public int hashCode() - { - if(hasBlockData()) - { - return getBlockData().hashCode(); - } - - return getType().hashCode(); - } - - public boolean matEquals(FastBlockData obj) - { - return getMaterial().equals(obj.getMaterial()); - } - - @Override - public boolean equals(Object obj) - { - if(this == obj) - { - return true; - } - if(obj == null) - { - return false; - } - if(getClass() != obj.getClass()) - { - return false; - } - FastBlockData other = (FastBlockData) obj; - - if(other.hashCode() == hashCode()) - { - return true; - } - - return false; - } - - public FastBlockData clone() - { - return hasBlockData() ? new FastBlockData(blockData.clone()) : new FastBlockData(getType()); - } - - public boolean matches(FastBlockData data) - { - return (data.hasBlockData() && hasBlockData() && getBlockData().matches(data.getBlockData())) || (!data.hasBlockData() && !hasBlockData() && getType().equals(data.getType())); - } -}