Move legacy crap out (atomics)

2025-12-30 04:29:05 +00:00 · 2020-11-14 15:05:56 -05:00
parent b85efcd85a
commit 468448ff6e
40 changed files with 164 additions and 296 deletions
--- a/src/main/java/com/volmit/iris/object/IrisBiome.java
+++ b/src/main/java/com/volmit/iris/object/IrisBiome.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.scaffold.data.DataProvider;
--- a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
+++ b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.scaffold.data.DataProvider;
 import com.volmit.iris.util.*;
 import lombok.AllArgsConstructor;
--- a/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java
+++ b/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
--- a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java
+++ b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.ArrayType;
--- a/src/main/java/com/volmit/iris/object/IrisBlockData.java
+++ b/src/main/java/com/volmit/iris/object/IrisBlockData.java
@@ -1,7 +1,7 @@
 package com.volmit.iris.object;

 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.util.B;
 import com.volmit.iris.util.Desc;
--- a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java
+++ b/src/main/java/com/volmit/iris/object/IrisBlockDrops.java
@@ -3,7 +3,7 @@ package com.volmit.iris.object;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
--- a/src/main/java/com/volmit/iris/object/IrisCarveLayer.java
+++ b/src/main/java/com/volmit/iris/object/IrisCarveLayer.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
--- a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java
+++ b/src/main/java/com/volmit/iris/object/IrisCaveFluid.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.util.B;
 import com.volmit.iris.util.Desc;
--- a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java
+++ b/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java
@@ -1,7 +1,7 @@
 package com.volmit.iris.object;

 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.util.B;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
--- a/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java
+++ b/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java
@@ -3,7 +3,7 @@ package com.volmit.iris.object;
 import org.bukkit.Material;

 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.util.B;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
--- a/src/main/java/com/volmit/iris/object/IrisDecorator.java
+++ b/src/main/java/com/volmit/iris/object/IrisDecorator.java
@@ -1,7 +1,7 @@
 package com.volmit.iris.object;

 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.ArrayType;
--- a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java
+++ b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.util.*;
 import lombok.AllArgsConstructor;
--- a/src/main/java/com/volmit/iris/object/IrisDimension.java
+++ b/src/main/java/com/volmit/iris/object/IrisDimension.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.scaffold.engine.GeneratorAccess;
 import com.volmit.iris.util.*;
--- a/src/main/java/com/volmit/iris/object/IrisEffect.java
+++ b/src/main/java/com/volmit/iris/object/IrisEffect.java
@@ -1,7 +1,7 @@
 package com.volmit.iris.object;

 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.scaffold.engine.GeneratorAccess;
 import com.volmit.iris.util.*;
 import lombok.AllArgsConstructor;
--- a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java
+++ b/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.scaffold.engine.IrisAccess;
 import com.volmit.iris.util.*;
 import lombok.AllArgsConstructor;
--- a/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java
+++ b/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.scaffold.engine.IrisAccess;
 import com.volmit.iris.util.*;
 import lombok.AllArgsConstructor;
--- a/src/main/java/com/volmit/iris/object/IrisGenerator.java
+++ b/src/main/java/com/volmit/iris/object/IrisGenerator.java
@@ -3,7 +3,7 @@ package com.volmit.iris.object;
 import java.util.List;

 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CellGenerator;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
--- a/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java
+++ b/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
--- a/src/main/java/com/volmit/iris/object/IrisLoot.java
+++ b/src/main/java/com/volmit/iris/object/IrisLoot.java
@@ -12,7 +12,7 @@ import org.bukkit.inventory.meta.LeatherArmorMeta;
 import org.bukkit.material.Colorable;

 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.B;
--- a/src/main/java/com/volmit/iris/object/IrisLootReference.java
+++ b/src/main/java/com/volmit/iris/object/IrisLootReference.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
--- a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java
+++ b/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.ArrayType;
--- a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java
+++ b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
--- a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java
+++ b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.scaffold.data.DataProvider;
 import com.volmit.iris.util.*;
--- a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java
+++ b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.manager.IrisDataManager;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.ArrayType;
--- a/src/main/java/com/volmit/iris/object/IrisPotionEffect.java
+++ b/src/main/java/com/volmit/iris/object/IrisPotionEffect.java
@@ -5,7 +5,7 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;

 import com.volmit.iris.Iris;
-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
 import com.volmit.iris.util.MaxNumber;
--- a/src/main/java/com/volmit/iris/object/IrisRegion.java
+++ b/src/main/java/com/volmit/iris/object/IrisRegion.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.scaffold.data.DataProvider;
 import com.volmit.iris.util.*;
--- a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java
+++ b/src/main/java/com/volmit/iris/object/IrisRegionRidge.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CellGenerator;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
--- a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java
+++ b/src/main/java/com/volmit/iris/object/IrisRegionSpot.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CellGenerator;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;
--- a/src/main/java/com/volmit/iris/object/IrisStructure.java
+++ b/src/main/java/com/volmit/iris/object/IrisStructure.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CNG;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.BlockPosition;
--- a/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java
+++ b/src/main/java/com/volmit/iris/object/IrisStructurePlacement.java
@@ -1,6 +1,6 @@
 package com.volmit.iris.object;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.generator.noise.CellGenerator;
 import com.volmit.iris.scaffold.data.DataProvider;
 import com.volmit.iris.util.*;
--- a/src/main/java/com/volmit/iris/object/IrisStructureTile.java
+++ b/src/main/java/com/volmit/iris/object/IrisStructureTile.java
@@ -2,7 +2,7 @@ package com.volmit.iris.object;

 import java.util.Objects;

-import com.volmit.iris.generator.legacy.atomics.AtomicCache;
+import com.volmit.iris.scaffold.cache.AtomicCache;
 import com.volmit.iris.util.ArrayType;
 import com.volmit.iris.util.Desc;
 import com.volmit.iris.util.DontObfuscate;