diff --git a/src/main/java/com/volmit/iris/GeneratedChunk.java b/src/main/java/com/volmit/iris/GeneratedChunk.java index 03c064dea..0b5f4a06e 100644 --- a/src/main/java/com/volmit/iris/GeneratedChunk.java +++ b/src/main/java/com/volmit/iris/GeneratedChunk.java @@ -1,10 +1,11 @@ -package ninja.bytecode.iris; +package com.volmit.iris; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; +import com.volmit.iris.util.ChunkPosition; + import lombok.Data; -import ninja.bytecode.iris.util.ChunkPosition; @Data public class GeneratedChunk diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 2bd462f5b..159123e4c 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris; +package com.volmit.iris; import java.io.File; import java.io.IOException; @@ -30,40 +30,38 @@ import org.bukkit.util.Vector; import org.zeroturnaround.zip.ZipUtil; import com.google.gson.Gson; - -import ninja.bytecode.iris.generator.IrisChunkGenerator; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.object.IrisDimension; -import ninja.bytecode.iris.object.IrisGenerator; -import ninja.bytecode.iris.object.IrisObject; -import ninja.bytecode.iris.object.IrisObjectPlacement; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.util.BiomeResult; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.BoardManager; -import ninja.bytecode.iris.util.BoardProvider; -import ninja.bytecode.iris.util.BoardSettings; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.Cuboid; -import ninja.bytecode.iris.util.Cuboid.CuboidDirection; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.Direction; -import ninja.bytecode.iris.util.GroupedExecutor; -import ninja.bytecode.iris.util.IO; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.iris.util.ScoreDirection; -import ninja.bytecode.iris.wand.WandController; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.collections.KMap; -import ninja.bytecode.shuriken.collections.KSet; -import ninja.bytecode.shuriken.execution.J; -import ninja.bytecode.shuriken.format.Form; -import ninja.bytecode.shuriken.json.JSONException; -import ninja.bytecode.shuriken.json.JSONObject; -import ninja.bytecode.shuriken.logging.L; -import ninja.bytecode.shuriken.math.RollingSequence; -import ninja.bytecode.shuriken.reaction.O; -import ninja.bytecode.shuriken.tools.JarScanner; +import com.volmit.iris.generator.IrisChunkGenerator; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.object.IrisGenerator; +import com.volmit.iris.object.IrisObject; +import com.volmit.iris.object.IrisObjectPlacement; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.util.BiomeResult; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.BoardManager; +import com.volmit.iris.util.BoardProvider; +import com.volmit.iris.util.BoardSettings; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.Cuboid; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.Direction; +import com.volmit.iris.util.Form; +import com.volmit.iris.util.GroupedExecutor; +import com.volmit.iris.util.IO; +import com.volmit.iris.util.J; +import com.volmit.iris.util.JSONException; +import com.volmit.iris.util.JSONObject; +import com.volmit.iris.util.JarScanner; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.KSet; +import com.volmit.iris.util.O; +import com.volmit.iris.util.RNG; +import com.volmit.iris.util.RollingSequence; +import com.volmit.iris.util.ScoreDirection; +import com.volmit.iris.util.Cuboid.CuboidDirection; +import com.volmit.iris.wand.WandController; public class Iris extends JavaPlugin implements BoardProvider { @@ -602,16 +600,6 @@ public class Iris extends JavaPlugin implements BoardProvider dim = args[1]; } - boolean obfuscate = false; - - for(String i : args) - { - if(i.equalsIgnoreCase("-o")) - { - obfuscate = true; - } - } - String dimm = dim; IrisDimension dimension = data.getDimensionLoader().load(dimm); File folder = new File(getDataFolder(), "exports/" + dimension.getLoadKey()); @@ -639,18 +627,15 @@ public class Iris extends JavaPlugin implements BoardProvider continue; } - String name = obfuscate ? UUID.randomUUID().toString().replaceAll("-", "") : k; + String name = UUID.randomUUID().toString().replaceAll("-", ""); newNames.add(name); renameObjects.put(k, name); } - if(obfuscate) - { - j.setPlace(newNames); - } + j.setPlace(newNames); } } - + KMap> lookupObjects = renameObjects.flip(); biomes.forEach((i) -> i.getObjects().forEach((j) -> j.getPlace().forEach((k) -> @@ -689,13 +674,13 @@ public class Iris extends JavaPlugin implements BoardProvider IO.writeAll(new File(folder, "biomes/" + i.getLoadKey() + ".json"), new JSONObject(new Gson().toJson(i)).toString(0)); } - ZipUtil.pack(folder, new File(getDataFolder(), "exports/" + dimension.getLoadKey() + ".iris")); + ZipUtil.pack(folder, new File(getDataFolder(), "exports/" + dimension.getLoadKey() + ".iris"), 9); IO.delete(folder); } catch(Throwable e) { - L.ex(e); + e.printStackTrace(); } sender.sendMessage("Done!"); diff --git a/src/main/java/com/volmit/iris/IrisContext.java b/src/main/java/com/volmit/iris/IrisContext.java index b855bd1c9..13c38fddc 100644 --- a/src/main/java/com/volmit/iris/IrisContext.java +++ b/src/main/java/com/volmit/iris/IrisContext.java @@ -1,11 +1,11 @@ -package ninja.bytecode.iris; +package com.volmit.iris; import org.bukkit.World; -import ninja.bytecode.iris.object.IrisDimension; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.util.BiomeResult; -import ninja.bytecode.shuriken.collections.KMap; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.util.BiomeResult; +import com.volmit.iris.util.KMap; public interface IrisContext { diff --git a/src/main/java/com/volmit/iris/IrisDataManager.java b/src/main/java/com/volmit/iris/IrisDataManager.java index 10b1b51cc..454f4db3c 100644 --- a/src/main/java/com/volmit/iris/IrisDataManager.java +++ b/src/main/java/com/volmit/iris/IrisDataManager.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris; +package com.volmit.iris; import java.io.File; @@ -6,19 +6,19 @@ import org.bukkit.World.Environment; import org.bukkit.block.Biome; import com.google.gson.Gson; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisBiomeDecorator; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.object.IrisGenerator; +import com.volmit.iris.object.IrisNoiseGenerator; +import com.volmit.iris.object.IrisObjectPlacement; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.util.IO; +import com.volmit.iris.util.JSONObject; +import com.volmit.iris.util.ObjectResourceLoader; +import com.volmit.iris.util.ResourceLoader; import lombok.Data; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.object.IrisBiomeDecorator; -import ninja.bytecode.iris.object.IrisDimension; -import ninja.bytecode.iris.object.IrisGenerator; -import ninja.bytecode.iris.object.IrisNoiseGenerator; -import ninja.bytecode.iris.object.IrisObjectPlacement; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.util.IO; -import ninja.bytecode.iris.util.ObjectResourceLoader; -import ninja.bytecode.iris.util.ResourceLoader; -import ninja.bytecode.shuriken.json.JSONObject; @Data public class IrisDataManager diff --git a/src/main/java/com/volmit/iris/IrisHotloadManager.java b/src/main/java/com/volmit/iris/IrisHotloadManager.java index 12fbd538e..4d33520c9 100644 --- a/src/main/java/com/volmit/iris/IrisHotloadManager.java +++ b/src/main/java/com/volmit/iris/IrisHotloadManager.java @@ -1,12 +1,12 @@ -package ninja.bytecode.iris; +package com.volmit.iris; import java.io.File; import org.bukkit.Bukkit; -import ninja.bytecode.iris.util.ChronoLatch; -import ninja.bytecode.iris.util.FileWatcher; -import ninja.bytecode.shuriken.collections.KSet; +import com.volmit.iris.util.ChronoLatch; +import com.volmit.iris.util.FileWatcher; +import com.volmit.iris.util.KSet; public class IrisHotloadManager { diff --git a/src/main/java/com/volmit/iris/IrisMetrics.java b/src/main/java/com/volmit/iris/IrisMetrics.java index 9c57fae0d..b60c4cc47 100644 --- a/src/main/java/com/volmit/iris/IrisMetrics.java +++ b/src/main/java/com/volmit/iris/IrisMetrics.java @@ -1,7 +1,8 @@ -package ninja.bytecode.iris; +package com.volmit.iris; + +import com.volmit.iris.util.RollingSequence; import lombok.Data; -import ninja.bytecode.shuriken.math.RollingSequence; @Data public class IrisMetrics @@ -11,11 +12,11 @@ public class IrisMetrics private final RollingSequence loss; public int generators = 0; public int noiseHits = 0; - + public IrisMetrics(int memory) { total = new RollingSequence(memory); perSecond = new RollingSequence(5); loss = new RollingSequence(memory); - } + } } diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/IrisSettings.java index 7d58f403a..d906b247b 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/IrisSettings.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris; +package com.volmit.iris; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/generator/BiomeChunkGenerator.java b/src/main/java/com/volmit/iris/generator/BiomeChunkGenerator.java index a5f2a5cdb..13a2cf10a 100644 --- a/src/main/java/com/volmit/iris/generator/BiomeChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/BiomeChunkGenerator.java @@ -1,28 +1,29 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import java.util.concurrent.locks.ReentrantLock; import org.bukkit.World; +import com.volmit.iris.Iris; +import com.volmit.iris.layer.GenLayerBiome; +import com.volmit.iris.object.InferredType; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisBiomeGeneratorLink; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.object.IrisGenerator; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.util.BiomeResult; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.ChronoLatch; +import com.volmit.iris.util.ChunkPosition; +import com.volmit.iris.util.IrisInterpolation; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.M; +import com.volmit.iris.util.RNG; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.layer.GenLayerBiome; -import ninja.bytecode.iris.object.InferredType; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.object.IrisBiomeGeneratorLink; -import ninja.bytecode.iris.object.IrisDimension; -import ninja.bytecode.iris.object.IrisGenerator; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.util.BiomeResult; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.ChronoLatch; -import ninja.bytecode.iris.util.ChunkPosition; -import ninja.bytecode.iris.util.IrisInterpolation; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.collections.KMap; -import ninja.bytecode.shuriken.math.M; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/volmit/iris/generator/CeilingChunkGenerator.java b/src/main/java/com/volmit/iris/generator/CeilingChunkGenerator.java index 583f74c3e..fd38a9ac2 100644 --- a/src/main/java/com/volmit/iris/generator/CeilingChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/CeilingChunkGenerator.java @@ -1,12 +1,12 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.object.IrisDimension; -import ninja.bytecode.iris.util.InvertedBiomeGrid; -import ninja.bytecode.iris.util.RNG; +import com.volmit.iris.Iris; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.util.InvertedBiomeGrid; +import com.volmit.iris.util.RNG; public abstract class CeilingChunkGenerator extends PostBlockChunkGenerator { diff --git a/src/main/java/com/volmit/iris/generator/ContextualChunkGenerator.java b/src/main/java/com/volmit/iris/generator/ContextualChunkGenerator.java index f16c4cb39..4cf0dbb74 100644 --- a/src/main/java/com/volmit/iris/generator/ContextualChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/ContextualChunkGenerator.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import java.util.List; import java.util.Random; @@ -20,18 +20,18 @@ import org.bukkit.event.world.WorldUnloadEvent; import org.bukkit.generator.BlockPopulator; import org.bukkit.generator.ChunkGenerator; +import com.volmit.iris.Iris; +import com.volmit.iris.IrisContext; +import com.volmit.iris.IrisMetrics; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.ChronoLatch; +import com.volmit.iris.util.PrecisionStopwatch; +import com.volmit.iris.util.RNG; + import lombok.Data; import lombok.EqualsAndHashCode; import net.md_5.bungee.api.ChatColor; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.IrisContext; -import ninja.bytecode.iris.IrisMetrics; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.ChronoLatch; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.bench.PrecisionStopwatch; -import ninja.bytecode.shuriken.logging.L; @Data @EqualsAndHashCode(callSuper = false) @@ -286,7 +286,7 @@ public abstract class ContextualChunkGenerator extends ChunkGenerator implements Iris.instance.imsg(i, ChatColor.RED + "- Then simply run /iris dev"); } - L.ex(e); + e.printStackTrace(); onFailure(e); } diff --git a/src/main/java/com/volmit/iris/generator/DimensionChunkGenerator.java b/src/main/java/com/volmit/iris/generator/DimensionChunkGenerator.java index 18a45ecca..a88c5fb08 100644 --- a/src/main/java/com/volmit/iris/generator/DimensionChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/DimensionChunkGenerator.java @@ -1,16 +1,17 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import org.bukkit.Material; import org.bukkit.block.data.BlockData; +import com.volmit.iris.Iris; +import com.volmit.iris.object.InferredType; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.util.BiomeResult; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.object.InferredType; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.object.IrisDimension; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.util.BiomeResult; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/volmit/iris/generator/IrisChunkGenerator.java b/src/main/java/com/volmit/iris/generator/IrisChunkGenerator.java index 89f89206e..2d102cfee 100644 --- a/src/main/java/com/volmit/iris/generator/IrisChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/IrisChunkGenerator.java @@ -1,18 +1,19 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import java.lang.reflect.Method; import org.bukkit.Chunk; import org.bukkit.entity.Player; +import com.volmit.iris.Iris; +import com.volmit.iris.IrisContext; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.util.BiomeResult; +import com.volmit.iris.util.KMap; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.IrisContext; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.util.BiomeResult; -import ninja.bytecode.shuriken.collections.KMap; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/volmit/iris/generator/ParallaxChunkGenerator.java b/src/main/java/com/volmit/iris/generator/ParallaxChunkGenerator.java index 9a5e05da1..c1520942e 100644 --- a/src/main/java/com/volmit/iris/generator/ParallaxChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/ParallaxChunkGenerator.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; @@ -6,23 +6,24 @@ import java.util.concurrent.locks.ReentrantLock; import org.bukkit.World; import org.bukkit.block.data.BlockData; +import com.volmit.iris.Iris; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisDepositGenerator; +import com.volmit.iris.object.IrisObjectPlacement; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.object.atomics.AtomicSliver; +import com.volmit.iris.object.atomics.AtomicSliverMap; +import com.volmit.iris.object.atomics.AtomicWorldData; +import com.volmit.iris.object.atomics.MasterLock; +import com.volmit.iris.util.BiomeMap; +import com.volmit.iris.util.ChunkPosition; +import com.volmit.iris.util.HeightMap; +import com.volmit.iris.util.IObjectPlacer; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.RNG; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.object.IrisDepositGenerator; -import ninja.bytecode.iris.object.IrisObjectPlacement; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.object.atomics.AtomicSliver; -import ninja.bytecode.iris.object.atomics.AtomicSliverMap; -import ninja.bytecode.iris.object.atomics.AtomicWorldData; -import ninja.bytecode.iris.object.atomics.MasterLock; -import ninja.bytecode.iris.util.BiomeMap; -import ninja.bytecode.iris.util.ChunkPosition; -import ninja.bytecode.iris.util.HeightMap; -import ninja.bytecode.iris.util.IObjectPlacer; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KMap; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/volmit/iris/generator/ParallelChunkGenerator.java b/src/main/java/com/volmit/iris/generator/ParallelChunkGenerator.java index c4742be7d..8e3a32dae 100644 --- a/src/main/java/com/volmit/iris/generator/ParallelChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/ParallelChunkGenerator.java @@ -1,16 +1,17 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import org.bukkit.World; +import com.volmit.iris.Iris; +import com.volmit.iris.object.atomics.AtomicSliver; +import com.volmit.iris.object.atomics.AtomicSliverMap; +import com.volmit.iris.util.BiomeMap; +import com.volmit.iris.util.GroupedExecutor; +import com.volmit.iris.util.HeightMap; +import com.volmit.iris.util.RNG; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.object.atomics.AtomicSliver; -import ninja.bytecode.iris.object.atomics.AtomicSliverMap; -import ninja.bytecode.iris.util.BiomeMap; -import ninja.bytecode.iris.util.GroupedExecutor; -import ninja.bytecode.iris.util.HeightMap; -import ninja.bytecode.iris.util.RNG; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/volmit/iris/generator/PostBlockChunkGenerator.java b/src/main/java/com/volmit/iris/generator/PostBlockChunkGenerator.java index 6012c9003..381ac8bfe 100644 --- a/src/main/java/com/volmit/iris/generator/PostBlockChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/PostBlockChunkGenerator.java @@ -1,20 +1,20 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import java.util.concurrent.locks.ReentrantLock; import org.bukkit.World; import org.bukkit.block.data.BlockData; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.layer.post.PostNippleSmoother; -import ninja.bytecode.iris.layer.post.PostPotholeFiller; -import ninja.bytecode.iris.layer.post.PostSlabber; -import ninja.bytecode.iris.layer.post.PostWallPatcher; -import ninja.bytecode.iris.object.IrisDimension; -import ninja.bytecode.iris.util.IPostBlockAccess; -import ninja.bytecode.iris.util.IrisPostBlockFilter; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; +import com.volmit.iris.Iris; +import com.volmit.iris.layer.post.PostNippleSmoother; +import com.volmit.iris.layer.post.PostPotholeFiller; +import com.volmit.iris.layer.post.PostSlabber; +import com.volmit.iris.layer.post.PostWallPatcher; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.util.IPostBlockAccess; +import com.volmit.iris.util.IrisPostBlockFilter; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; public abstract class PostBlockChunkGenerator extends ParallaxChunkGenerator implements IPostBlockAccess { diff --git a/src/main/java/com/volmit/iris/generator/TerrainChunkGenerator.java b/src/main/java/com/volmit/iris/generator/TerrainChunkGenerator.java index 5061830ab..a6eebe020 100644 --- a/src/main/java/com/volmit/iris/generator/TerrainChunkGenerator.java +++ b/src/main/java/com/volmit/iris/generator/TerrainChunkGenerator.java @@ -1,27 +1,29 @@ -package ninja.bytecode.iris.generator; +package com.volmit.iris.generator; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.data.Bisected; import org.bukkit.block.data.Bisected.Half; + +import com.volmit.iris.layer.GenLayerCave; +import com.volmit.iris.object.DecorationPart; +import com.volmit.iris.object.InferredType; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisBiomeDecorator; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.object.atomics.AtomicSliver; +import com.volmit.iris.util.BiomeMap; +import com.volmit.iris.util.BiomeResult; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.HeightMap; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.M; +import com.volmit.iris.util.RNG; + import org.bukkit.block.data.BlockData; import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.layer.GenLayerCave; -import ninja.bytecode.iris.object.DecorationPart; -import ninja.bytecode.iris.object.InferredType; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.object.IrisBiomeDecorator; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.object.atomics.AtomicSliver; -import ninja.bytecode.iris.util.BiomeMap; -import ninja.bytecode.iris.util.BiomeResult; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.HeightMap; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.math.M; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/volmit/iris/layer/GenLayerBiome.java b/src/main/java/com/volmit/iris/layer/GenLayerBiome.java index 8e2bcc161..95d87ff63 100644 --- a/src/main/java/com/volmit/iris/layer/GenLayerBiome.java +++ b/src/main/java/com/volmit/iris/layer/GenLayerBiome.java @@ -1,17 +1,17 @@ -package ninja.bytecode.iris.layer; +package com.volmit.iris.layer; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.generator.DimensionChunkGenerator; -import ninja.bytecode.iris.object.InferredType; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.object.IrisRegion; -import ninja.bytecode.iris.object.IrisRegionRidge; -import ninja.bytecode.iris.object.IrisRegionSpot; -import ninja.bytecode.iris.util.BiomeResult; -import ninja.bytecode.iris.util.CellGenerator; -import ninja.bytecode.iris.util.GenLayer; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; +import com.volmit.iris.Iris; +import com.volmit.iris.generator.DimensionChunkGenerator; +import com.volmit.iris.object.InferredType; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.object.IrisRegionRidge; +import com.volmit.iris.object.IrisRegionSpot; +import com.volmit.iris.util.BiomeResult; +import com.volmit.iris.util.CellGenerator; +import com.volmit.iris.util.GenLayer; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; public class GenLayerBiome extends GenLayer { diff --git a/src/main/java/com/volmit/iris/layer/GenLayerCave.java b/src/main/java/com/volmit/iris/layer/GenLayerCave.java index 3a34af494..70396f7cb 100644 --- a/src/main/java/com/volmit/iris/layer/GenLayerCave.java +++ b/src/main/java/com/volmit/iris/layer/GenLayerCave.java @@ -1,20 +1,20 @@ -package ninja.bytecode.iris.layer; +package com.volmit.iris.layer; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import ninja.bytecode.iris.generator.DimensionChunkGenerator; -import ninja.bytecode.iris.object.atomics.AtomicSliver; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.CaveResult; -import ninja.bytecode.iris.util.FastNoise; -import ninja.bytecode.iris.util.FastNoise.CellularDistanceFunction; -import ninja.bytecode.iris.util.FastNoise.CellularReturnType; -import ninja.bytecode.iris.util.FastNoise.NoiseType; -import ninja.bytecode.iris.util.GenLayer; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; +import com.volmit.iris.generator.DimensionChunkGenerator; +import com.volmit.iris.object.atomics.AtomicSliver; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.CaveResult; +import com.volmit.iris.util.FastNoise; +import com.volmit.iris.util.GenLayer; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; +import com.volmit.iris.util.FastNoise.CellularDistanceFunction; +import com.volmit.iris.util.FastNoise.CellularReturnType; +import com.volmit.iris.util.FastNoise.NoiseType; public class GenLayerCave extends GenLayer { diff --git a/src/main/java/com/volmit/iris/layer/post/PostNippleSmoother.java b/src/main/java/com/volmit/iris/layer/post/PostNippleSmoother.java index 3636442ef..84a50c95a 100644 --- a/src/main/java/com/volmit/iris/layer/post/PostNippleSmoother.java +++ b/src/main/java/com/volmit/iris/layer/post/PostNippleSmoother.java @@ -1,10 +1,10 @@ -package ninja.bytecode.iris.layer.post; +package com.volmit.iris.layer.post; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import ninja.bytecode.iris.generator.PostBlockChunkGenerator; -import ninja.bytecode.iris.util.IrisPostBlockFilter; +import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.util.IrisPostBlockFilter; public class PostNippleSmoother extends IrisPostBlockFilter { diff --git a/src/main/java/com/volmit/iris/layer/post/PostPotholeFiller.java b/src/main/java/com/volmit/iris/layer/post/PostPotholeFiller.java index 499b8a1e1..536f4a386 100644 --- a/src/main/java/com/volmit/iris/layer/post/PostPotholeFiller.java +++ b/src/main/java/com/volmit/iris/layer/post/PostPotholeFiller.java @@ -1,7 +1,7 @@ -package ninja.bytecode.iris.layer.post; +package com.volmit.iris.layer.post; -import ninja.bytecode.iris.generator.PostBlockChunkGenerator; -import ninja.bytecode.iris.util.IrisPostBlockFilter; +import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.util.IrisPostBlockFilter; public class PostPotholeFiller extends IrisPostBlockFilter { diff --git a/src/main/java/com/volmit/iris/layer/post/PostSlabber.java b/src/main/java/com/volmit/iris/layer/post/PostSlabber.java index 07843dc11..de23419a3 100644 --- a/src/main/java/com/volmit/iris/layer/post/PostSlabber.java +++ b/src/main/java/com/volmit/iris/layer/post/PostSlabber.java @@ -1,12 +1,12 @@ -package ninja.bytecode.iris.layer.post; +package com.volmit.iris.layer.post; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Waterlogged; -import ninja.bytecode.iris.generator.PostBlockChunkGenerator; -import ninja.bytecode.iris.util.IrisPostBlockFilter; -import ninja.bytecode.iris.util.RNG; +import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.util.IrisPostBlockFilter; +import com.volmit.iris.util.RNG; public class PostSlabber extends IrisPostBlockFilter { diff --git a/src/main/java/com/volmit/iris/layer/post/PostWallPatcher.java b/src/main/java/com/volmit/iris/layer/post/PostWallPatcher.java index fed25ab91..4747c52fc 100644 --- a/src/main/java/com/volmit/iris/layer/post/PostWallPatcher.java +++ b/src/main/java/com/volmit/iris/layer/post/PostWallPatcher.java @@ -1,12 +1,12 @@ -package ninja.bytecode.iris.layer.post; +package com.volmit.iris.layer.post; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import ninja.bytecode.iris.generator.PostBlockChunkGenerator; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.iris.util.IrisPostBlockFilter; -import ninja.bytecode.iris.util.RNG; +import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.util.IrisPostBlockFilter; +import com.volmit.iris.util.RNG; public class PostWallPatcher extends IrisPostBlockFilter { diff --git a/src/main/java/com/volmit/iris/object/Blueprint.java b/src/main/java/com/volmit/iris/object/Blueprint.java deleted file mode 100644 index 00ee59e13..000000000 --- a/src/main/java/com/volmit/iris/object/Blueprint.java +++ /dev/null @@ -1,6 +0,0 @@ -package ninja.bytecode.iris.object; - -public class Blueprint -{ - -} diff --git a/src/main/java/com/volmit/iris/object/DecorationPart.java b/src/main/java/com/volmit/iris/object/DecorationPart.java index ae608797a..45aa508bb 100644 --- a/src/main/java/com/volmit/iris/object/DecorationPart.java +++ b/src/main/java/com/volmit/iris/object/DecorationPart.java @@ -1,8 +1,15 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.util.DontObfuscate; public enum DecorationPart { + @DontObfuscate NONE, + + @DontObfuscate SHORE_LINE, + + @DontObfuscate SEA_SURFACE } diff --git a/src/main/java/com/volmit/iris/object/Dispersion.java b/src/main/java/com/volmit/iris/object/Dispersion.java index 51e6e98d3..8cc4cc414 100644 --- a/src/main/java/com/volmit/iris/object/Dispersion.java +++ b/src/main/java/com/volmit/iris/object/Dispersion.java @@ -1,7 +1,12 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.util.DontObfuscate; public enum Dispersion { + @DontObfuscate SCATTER, + + @DontObfuscate WISPY, } diff --git a/src/main/java/com/volmit/iris/object/Envelope.java b/src/main/java/com/volmit/iris/object/Envelope.java index 76a122d39..b5006a0fc 100644 --- a/src/main/java/com/volmit/iris/object/Envelope.java +++ b/src/main/java/com/volmit/iris/object/Envelope.java @@ -1,8 +1,15 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.util.DontObfuscate; public enum Envelope { + @DontObfuscate EVERYWHERE, + + @DontObfuscate CELLS, + + @DontObfuscate VEINS, } diff --git a/src/main/java/com/volmit/iris/object/InferredType.java b/src/main/java/com/volmit/iris/object/InferredType.java index b3c4db94e..579bf2452 100644 --- a/src/main/java/com/volmit/iris/object/InferredType.java +++ b/src/main/java/com/volmit/iris/object/InferredType.java @@ -1,10 +1,21 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.util.DontObfuscate; public enum InferredType { + @DontObfuscate SHORE, + + @DontObfuscate LAND, + + @DontObfuscate SEA, + + @DontObfuscate CAVE, + + @DontObfuscate DEFER; } diff --git a/src/main/java/com/volmit/iris/object/InterpolationMethod.java b/src/main/java/com/volmit/iris/object/InterpolationMethod.java index e7e03bcc6..acf96a951 100644 --- a/src/main/java/com/volmit/iris/object/InterpolationMethod.java +++ b/src/main/java/com/volmit/iris/object/InterpolationMethod.java @@ -1,9 +1,18 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.util.DontObfuscate; public enum InterpolationMethod { + @DontObfuscate NONE, + + @DontObfuscate BILINEAR, + + @DontObfuscate BICUBIC, + + @DontObfuscate HERMITE } diff --git a/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java b/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java index 713ca03a1..8fdda7d76 100644 --- a/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java +++ b/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java @@ -1,21 +1,27 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; import lombok.Data; -import ninja.bytecode.iris.util.Desc; @Desc("Represents a rotation axis with intervals and maxes") @Data public class IrisAxisRotationClamp { + @DontObfuscate @Desc("Should this axis be rotated at all?") private boolean enabled = false; + @DontObfuscate @Desc("The minimum angle (from) or set this and max to zero for any angle degrees") private double min = 0; + @DontObfuscate @Desc("The maximum angle (to) or set this and min to zero for any angle degrees") private double max = 0; + @DontObfuscate @Desc("Iris spins the axis but not freely. For example an interval of 90 would mean 4 possible angles (right angles) degrees") private double interval = 0; diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/object/IrisBiome.java index 249edb9d0..8452f00f1 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/object/IrisBiome.java @@ -1,75 +1,95 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import java.util.concurrent.locks.ReentrantLock; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.CellGenerator; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.CellGenerator; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.logging.L; +@DontObfuscate @Desc("Represents a biome in iris.") @Data @EqualsAndHashCode(callSuper = false) public class IrisBiome extends IrisRegistrant { + @DontObfuscate @Desc("This is the human readable name for this biome. This can and should be different than the file name. This is not used for loading biomes in other objects.") private String name = "A Biome"; + @DontObfuscate @Desc("This changes the dispersion of the biome colors if multiple derivatives are chosen") private Dispersion biomeDispersion = Dispersion.SCATTER; + @DontObfuscate @Desc("This zooms in the biome colors if multiple derivatives are chosen") private double biomeZoom = 1; + @DontObfuscate @Desc("Layers no longer descend from the surface block, they descend from the max possible height the biome can produce (constant) creating mesa like layers.") private boolean lockLayers = false; + @DontObfuscate @Desc("The rarity of this biome (integer)") private int rarity = 1; + @DontObfuscate @Desc("The raw derivative of this biome. This is required or the terrain will not properly generate. Use any vanilla biome type. Look in examples/biome-list.txt") private Biome derivative = Biome.THE_VOID; + @DontObfuscate @Desc("You can instead specify multiple biome derivatives to randomly scatter colors in this biome") private KList biomeScatter = new KList<>(); + @DontObfuscate @Desc("Since 1.13 supports 3D biomes, you can add different derivative colors for anything above the terrain. (Think swampy tree leaves with a desert looking grass surface)") private KList biomeSkyScatter = new KList<>(); + @DontObfuscate @Desc("If this biome has children biomes, and the gen layer chooses one of this biomes children, how much smaller will it be (inside of this biome). Higher values means a smaller biome relative to this biome's size. Set higher than 1.0 and below 3.0 for best results.") private double childShrinkFactor = 1.5; + @DontObfuscate @Desc("List any biome names (file names without.json) here as children. Portions of this biome can sometimes morph into their children. Iris supports cyclic relationships such as A > B > A > B. Iris will stop checking 9 biomes down the tree.") private KList children = new KList<>(); + @DontObfuscate @Desc("The default slab if iris decides to place a slab in this biome. Default is no slab.") private IrisBiomePaletteLayer slab = new IrisBiomePaletteLayer().zero(); + @DontObfuscate @Desc("The default wall if iris decides to place a wall higher than 2 blocks (steep hills or possibly cliffs)") private IrisBiomePaletteLayer wall = new IrisBiomePaletteLayer().zero(); + @DontObfuscate @Desc("This defines the layers of materials in this biome. Each layer has a palette and min/max height and some other properties. Usually a grassy/sandy layer then a dirt layer then a stone layer. Iris will fill in the remaining blocks below your layers with stone.") private KList layers = new KList().qadd(new IrisBiomePaletteLayer()); + @DontObfuscate @Desc("This defines the layers of materials in this biome. Each layer has a palette and min/max height and some other properties. Usually a grassy/sandy layer then a dirt layer then a stone layer. Iris will fill in the remaining blocks below your layers with stone.") private KList seaLayers = new KList(); + @DontObfuscate @Desc("Decorators are used for things like tall grass, bisected flowers, and even kelp or cactus (random heights)") private KList decorators = new KList(); + @DontObfuscate @Desc("Objects define what schematics (iob files) iris will place in this biome") private KList objects = new KList(); + @DontObfuscate @Desc("Generators for this biome. Multiple generators with different interpolation sizes will mix with other biomes how you would expect. This defines your biome height relative to the fluid height. Use negative for oceans.") private KList generators = new KList().qadd(new IrisBiomeGeneratorLink()); + @DontObfuscate @Desc("Define biome deposit generators that add onto the existing regional and global deposit generators") private KList deposits = new KList<>(); @@ -160,7 +180,7 @@ public class IrisBiome extends IrisRegistrant catch(Throwable e) { - L.ex(e); + e.printStackTrace(); } } @@ -202,7 +222,7 @@ public class IrisBiome extends IrisRegistrant catch(Throwable e) { - L.ex(e); + e.printStackTrace(); } } } @@ -275,7 +295,7 @@ public class IrisBiome extends IrisRegistrant catch(Throwable e) { - L.ex(e); + e.printStackTrace(); } } diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeDecorator.java b/src/main/java/com/volmit/iris/object/IrisBiomeDecorator.java index 216c89cdd..1e861e05e 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeDecorator.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeDecorator.java @@ -1,46 +1,58 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import org.bukkit.block.data.BlockData; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.RNG; + import lombok.Data; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.collections.KMap; @Desc("A biome decorator is used for placing flowers, grass, cacti and so on") @Data public class IrisBiomeDecorator { + @DontObfuscate @Desc("The varience dispersion is used when multiple blocks are put in the palette. Scatter scrambles them, Wispy shows streak-looking varience") private Dispersion variance = Dispersion.SCATTER; + @DontObfuscate @Desc("Dispersion is used to pick places to spawn. Scatter randomly places them (vanilla) or Wispy for a streak like patch system.") private Dispersion dispersion = Dispersion.SCATTER; + @DontObfuscate @Desc("If this decorator has a height more than 1 this changes how it picks the height between your maxes. Scatter = random, Wispy = wavy heights") private Dispersion verticalVariance = Dispersion.SCATTER; + @DontObfuscate @Desc("Tells iris where this decoration is a part of. I.e. SHORE_LINE or SEA_SURFACE") private DecorationPart partOf = DecorationPart.NONE; + @DontObfuscate @Desc("The minimum repeat stack height (setting to 3 would stack 3 of on top of each other") private int stackMin = 1; + @DontObfuscate @Desc("The maximum repeat stack height") private int stackMax = 1; + @DontObfuscate @Desc("The zoom is for zooming in or out wispy dispersions. Makes patches bigger the higher this zoom value is/") private double zoom = 1; + @DontObfuscate @Desc("The vertical zoom is for wispy stack heights. Zooming this in makes stack heights more slowly change over a distance") private double verticalZoom = 1; + @DontObfuscate @Desc("The chance for this decorator to decorate at a given X,Y coordinate. This is hit 256 times per chunk (per surface block)") private double chance = 0.1; + @DontObfuscate @Desc("The palette of blocks to pick from when this decorator needs to place.") private KList palette = new KList().qadd("GRASS"); diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java index 2d0608c87..d175b0602 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java @@ -1,20 +1,25 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.Iris; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.IrisInterpolation; import lombok.Data; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.IrisInterpolation; @Desc("This represents a link to a generator for a biome") @Data public class IrisBiomeGeneratorLink { + @DontObfuscate @Desc("The generator id") private String generator = "default"; + @DontObfuscate @Desc("The min block value (value + fluidHeight)") private int min = 0; + @DontObfuscate @Desc("The max block value (value + fluidHeight)") private int max = 0; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java index a8209a49f..35350aa7c 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java @@ -1,32 +1,39 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import java.util.concurrent.locks.ReentrantLock; import org.bukkit.block.data.BlockData; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; + import lombok.Data; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; @Desc("A layer of surface / subsurface material in biomes") @Data public class IrisBiomePaletteLayer { + @DontObfuscate @Desc("The dispersion of materials from the palette") private Dispersion dispersion = Dispersion.SCATTER; + @DontObfuscate @Desc("The min thickness of this layer") private int minHeight = 1; + @DontObfuscate @Desc("The max thickness of this layer") private int maxHeight = 1; + @DontObfuscate @Desc("The terrain zoom mostly for zooming in on a wispy palette") private double terrainZoom = 5; + @DontObfuscate @Desc("The palette of blocks to be used in this layer") private KList palette = new KList().qadd("GRASS_BLOCK"); diff --git a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java index aa303b80c..960e599c9 100644 --- a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java @@ -1,41 +1,51 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import java.util.concurrent.locks.ReentrantLock; import org.bukkit.block.data.BlockData; import org.bukkit.util.BlockVector; +import com.volmit.iris.generator.ParallaxChunkGenerator; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; + import lombok.Data; -import ninja.bytecode.iris.generator.ParallaxChunkGenerator; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; @Data public class IrisDepositGenerator { + @DontObfuscate @Desc("The minimum height this deposit can generate at") private int minHeight = 7; + @DontObfuscate @Desc("The maximum height this deposit can generate at") private int maxHeight = 55; + @DontObfuscate @Desc("The minimum amount of deposit blocks per clump") private int minSize = 3; + @DontObfuscate @Desc("The maximum amount of deposit blocks per clump") private int maxSize = 5; + @DontObfuscate @Desc("The maximum amount of clumps per chunk") private int maxPerChunk = 3; + @DontObfuscate @Desc("The minimum amount of clumps per chunk") private int minPerChunk = 1; + @DontObfuscate @Desc("The palette of blocks to be used in this deposit generator") private KList palette = new KList(); + @DontObfuscate @Desc("Ore varience is how many different objects clumps iris will create") private int varience = 8; diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java index 42eaef0ea..8f92a2bfc 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/object/IrisDimension.java @@ -1,128 +1,166 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import java.util.concurrent.locks.ReentrantLock; import org.bukkit.World.Environment; import org.bukkit.block.data.BlockData; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; @Desc("Represents a dimension") @Data @EqualsAndHashCode(callSuper = false) public class IrisDimension extends IrisRegistrant { + @DontObfuscate @Desc("The human readable name of this dimension") private String name = "A Dimension"; + @DontObfuscate @Desc("The interpolation function for splicing noise maxes together") private InterpolationMethod interpolationFunction = InterpolationMethod.BICUBIC; + @DontObfuscate @Desc("The interpolation distance scale. Increase = more smooth, less detail") private double interpolationScale = 63; + @DontObfuscate @Desc("The Thickness scale of cave veins") private double caveThickness = 1D; + @DontObfuscate @Desc("The cave web scale. Smaller values means scaled up vein networks.") private double caveScale = 1D; + @DontObfuscate @Desc("Shift the Y value of the cave networks up or down.") private double caveShift = 0D; + @DontObfuscate @Desc("Generate caves or not.") private boolean caves = true; + @DontObfuscate @Desc("Carve terrain or not") private boolean carving = true; + @DontObfuscate @Desc("Generate decorations or not") private boolean decorate = true; + @DontObfuscate @Desc("Use post processing features. Usually for production only as there is a gen speed cost.") private boolean postProcess = true; + @DontObfuscate @Desc("The ceiling dimension. Leave blank for normal sky.") private String ceiling = ""; + @DontObfuscate @Desc("Mirrors the generator floor into the ceiling. Think nether but worse...") private boolean mirrorCeiling = false; + @DontObfuscate @Desc("The world environment") private Environment environment = Environment.NORMAL; + @DontObfuscate @Desc("Define all of the regions to include in this dimension. Dimensions -> Regions -> Biomes -> Objects etc") private KList regions = new KList<>(); + @DontObfuscate @Desc("The fluid height for this dimension") private int fluidHeight = 63; + @DontObfuscate @Desc("Keep this either undefined or empty. Setting any biome name into this will force iris to only generate the specified biome. Great for testing.") private String focus = ""; + @DontObfuscate @Desc("Zoom in or out the biome size. Higher = bigger biomes") private double biomeZoom = 5D; + @DontObfuscate @Desc("Zoom in or out the terrain. This stretches the terrain. Due to performance improvements, Higher than 2.0 may cause weird rounding artifacts. Lower = more terrain changes per block. Its a true zoom-out.") private double terrainZoom = 2D; + @DontObfuscate @Desc("You can rotate the input coordinates by an angle. This can make terrain appear more natural (less sharp corners and lines). This literally rotates the entire dimension by an angle. Hint: Try 12 degrees or something not on a 90 or 45 degree angle.") private double dimensionAngleDeg = 0; + @DontObfuscate @Desc("Iris adds a few roughness filters to noise. Increasing this smooths it out. Decreasing this makes it bumpier/scratchy") private double roughnessZoom = 2D; + @DontObfuscate @Desc("The height of the roughness filters") private int roughnessHeight = 3; + @DontObfuscate @Desc("Coordinate fracturing applies noise to the input coordinates. This creates the 'iris swirls' and wavy features. The distance pushes these waves further into places they shouldnt be. This is a block value multiplier.") private double coordFractureDistance = 20; + @DontObfuscate @Desc("Coordinate fracturing zoom. Higher = less frequent warping, Lower = more frequent and rapid warping / swirls.") private double coordFractureZoom = 8; + @DontObfuscate @Desc("This zooms in the land space") private double landZoom = 1; + @DontObfuscate @Desc("This zooms in the cave biome space") private double caveBiomeZoom = 1; + @DontObfuscate @Desc("This can zoom the shores") private double shoreZoom = 1; + @DontObfuscate @Desc("This zooms oceanic biomes") private double seaZoom = 1; + @DontObfuscate @Desc("Zoom in continents") private double continentZoom = 1; + @DontObfuscate @Desc("Change the size of regions") private double regionZoom = 1; + @DontObfuscate @Desc("Disable this to stop placing schematics in biomes") private boolean placeObjects = true; + @DontObfuscate @Desc("Prevent Leaf decay as if placed in creative mode") private boolean preventLeafDecay = false; + @DontObfuscate @Desc("Define global deposit generators") private KList deposits = new KList<>(); + @DontObfuscate @Desc("The dispersion of materials for the rock palette") private Dispersion dispersion = Dispersion.SCATTER; + @DontObfuscate @Desc("The rock zoom mostly for zooming in on a wispy palette") private double rockZoom = 5; + @DontObfuscate @Desc("The palette of blocks for 'stone'") private KList rockPalette = new KList().qadd("STONE"); + @DontObfuscate @Desc("The palette of blocks for 'water'") private KList fluidPalette = new KList().qadd("WATER"); diff --git a/src/main/java/com/volmit/iris/object/IrisGenerator.java b/src/main/java/com/volmit/iris/object/IrisGenerator.java index c01e7c310..b2a646b41 100644 --- a/src/main/java/com/volmit/iris/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisGenerator.java @@ -1,47 +1,60 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.Iris; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.IrisInterpolation; +import com.volmit.iris.util.KList; import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.IrisInterpolation; -import ninja.bytecode.shuriken.collections.KList; @Desc("Represents a composite generator of noise gens") @Data @EqualsAndHashCode(callSuper = false) public class IrisGenerator extends IrisRegistrant { + @DontObfuscate @Desc("The zoom or frequency.") private double zoom = 1; + @DontObfuscate @Desc("The opacity, essentially a multiplier on the output.") private double opacity = 1; + @DontObfuscate @Desc("The offset to shift this noise x") private double offsetX = 0; + @DontObfuscate @Desc("The offset to shift this noise z") private double offsetZ = 0; + @DontObfuscate @Desc("The seed for this generator") private long seed = 1; + @DontObfuscate @Desc("The interpolation method when two biomes use different heights but this same generator") private InterpolationMethod interpolationFunction = InterpolationMethod.BICUBIC; + @DontObfuscate @Desc("The interpolation distance scale (blocks) when two biomes use different heights but this same generator") private double interpolationScale = 7; + @DontObfuscate @Desc("Cliff Height Max. Disable with 0 for min and max") private double cliffHeightMax = 0; + @DontObfuscate @Desc("Cliff Height Min. Disable with 0 for min and max") private double cliffHeightMin = 0; + @DontObfuscate @Desc("The list of noise gens this gen contains.") private KList composite = new KList(); + @DontObfuscate @Desc("The noise gen for cliff height.") private IrisNoiseGenerator cliffHeightGenerator = new IrisNoiseGenerator(); diff --git a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java index 3c704b3b6..23a1451ad 100644 --- a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java @@ -1,56 +1,73 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import java.util.concurrent.locks.ReentrantLock; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.IrisInterpolation; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; + import lombok.Data; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.IrisInterpolation; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; @Desc("A noise generator") @Data public class IrisNoiseGenerator { + @DontObfuscate @Desc("The coordinate input zoom") private double zoom = 1; + @DontObfuscate @Desc("The output multiplier") private double opacity = 1; + @DontObfuscate @Desc("Coordinate offset x") private double offsetX = 0; + @DontObfuscate @Desc("Height output offset y") private double offsetY = 0; + @DontObfuscate @Desc("Coordinate offset z") private double offsetZ = 0; + @DontObfuscate @Desc("The seed") private long seed = 0; + @DontObfuscate @Desc("Apply a parametric curve on the output") private boolean parametric = false; + + @DontObfuscate @Desc("Apply a bezier curve on the output") private boolean bezier = false; + @DontObfuscate @Desc("Apply a sin-center curve on the output (0, and 1 = 0 and 0.5 = 1.0 using a sinoid shape.)") private boolean sinCentered = false; + @DontObfuscate @Desc("The exponent noise^EXPONENT") private double exponent = 1; + @DontObfuscate @Desc("Enable / disable. Outputs offsetY if disabled") private boolean enabled = true; + @DontObfuscate @Desc("If this generator uses the default iris swirly/wispy noise generator. Set to false for pure simplex.") private boolean irisBased = true; + @DontObfuscate @Desc("Multiple octaves for multple generators of changing zooms added together") private int octaves = 1; + @DontObfuscate @Desc("Apply a child noise generator to fracture the input coordinates of this generator") private KList fracture = new KList<>(); diff --git a/src/main/java/com/volmit/iris/object/IrisObject.java b/src/main/java/com/volmit/iris/object/IrisObject.java index 017fc8433..dfc1b28f9 100644 --- a/src/main/java/com/volmit/iris/object/IrisObject.java +++ b/src/main/java/com/volmit/iris/object/IrisObject.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -15,13 +15,14 @@ import org.bukkit.block.data.BlockData; import org.bukkit.block.data.type.Leaves; import org.bukkit.util.BlockVector; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.ChunkPosition; +import com.volmit.iris.util.IObjectPlacer; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.RNG; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.ChunkPosition; -import ninja.bytecode.iris.util.IObjectPlacer; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KMap; @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java index f8f88218e..3e7a35ede 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java @@ -1,41 +1,53 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.Iris; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.RNG; import lombok.Data; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; @Data public class IrisObjectPlacement { + @DontObfuscate @Desc("List of objects to place") private KList place = new KList<>(); + @DontObfuscate @Desc("Find and replace blocks") private KList edit = new KList<>(); + @DontObfuscate @Desc("Translate this object's placement") private IrisObjectTranslate translate = new IrisObjectTranslate(); + @DontObfuscate @Desc("Rotate this objects placement") private IrisObjectRotation rotation = new IrisObjectRotation(); + @DontObfuscate @Desc("The maximum layer level of a snow filter overtop of this placement. Set to 0 to disable. Max of 1.") private double snow = 0; + @DontObfuscate @Desc("The chance for this to place in a chunk. If you need multiple per chunk, set this to 1 and use density.") private double chance = 1; + @DontObfuscate @Desc("If the chance check passes, place this many in a single chunk") private int density = 1; + @DontObfuscate @Desc("If set to true, objects will place on the terrain height, ignoring the water surface.") private boolean underwater = false; + @DontObfuscate @Desc("If set to true, objects will place on the fluid height level Such as boats.") private boolean onwater = false; + @DontObfuscate @Desc("If set to true, this object will only place parts of itself where blocks already exist.") private boolean meld = false; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java index 5d1e8fd68..8093b0ce4 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectReplace.java @@ -1,18 +1,23 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import java.util.concurrent.locks.ReentrantLock; import org.bukkit.block.data.BlockData; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; + import lombok.Data; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.Desc; @Desc("Find and replace object materials") @Data public class IrisObjectReplace { + @DontObfuscate private String find; + + @DontObfuscate private String replace; private transient ReentrantLock lock = new ReentrantLock(); diff --git a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java index 2addb687e..d014d1f91 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java @@ -1,20 +1,29 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import org.bukkit.util.BlockVector; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; + import lombok.Data; -import ninja.bytecode.iris.util.Desc; @Desc("Configures rotation for iris") @Data public class IrisObjectRotation { + @DontObfuscate @Desc("If this rotator is enabled or not") private boolean enabled = true; + + @DontObfuscate @Desc("The x axis rotation") private IrisAxisRotationClamp xAxis = new IrisAxisRotationClamp(); + + @DontObfuscate @Desc("The y axis rotation") private IrisAxisRotationClamp yAxis = new IrisAxisRotationClamp(true, 0, 0, 90); + + @DontObfuscate @Desc("The z axis rotation") private IrisAxisRotationClamp zAxis = new IrisAxisRotationClamp(); diff --git a/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java b/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java index 07d5ff6a5..58c7d351f 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java @@ -1,20 +1,25 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import org.bukkit.util.BlockVector; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; + import lombok.Data; -import ninja.bytecode.iris.util.Desc; @Desc("Translate objects") @Data public class IrisObjectTranslate { + @DontObfuscate @Desc("The x shift in blocks") private int x; + @DontObfuscate @Desc("The x shift in blocks") private int y; + @DontObfuscate @Desc("The x shift in blocks") private int z; diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java index cf93a7333..8f70ee317 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/object/IrisRegion.java @@ -1,51 +1,65 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import java.util.concurrent.locks.ReentrantLock; +import com.volmit.iris.Iris; +import com.volmit.iris.util.CNG; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.KSet; +import com.volmit.iris.util.RNG; + import lombok.Data; import lombok.EqualsAndHashCode; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.util.CNG; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.collections.KMap; -import ninja.bytecode.shuriken.collections.KSet; @Desc("Represents an iris region") @Data @EqualsAndHashCode(callSuper = false) public class IrisRegion extends IrisRegistrant { + @DontObfuscate @Desc("The name of the region") private String name = "A Region"; + + @DontObfuscate @Desc("The shore ration (How much percent of land should be a shore)") private double shoreRatio = 0.13; + @DontObfuscate @Desc("The min shore height") private double shoreHeightMin = 1.2; + @DontObfuscate @Desc("The the max shore height") private double shoreHeightMax = 3.2; + @DontObfuscate @Desc("The varience of the shore height") private double shoreHeightZoom = 3.14; + @DontObfuscate @Desc("The biome implosion ratio, how much to implode biomes into children (chance)") private double biomeImplosionRatio = 0.4; + @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList landBiomes = new KList<>(); + @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList seaBiomes = new KList<>(); + @DontObfuscate @Desc("A list of root-level biomes in this region. Don't specify child biomes of other biomes here. Just the root parents.") private KList shoreBiomes = new KList<>(); + @DontObfuscate @Desc("Ridge biomes create a vein-like network like rivers through this region") private KList ridgeBiomes = new KList<>(); + @DontObfuscate @Desc("Spot biomes splotch themselves across this region like lakes") private KList spotBiomes = new KList<>(); diff --git a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java b/src/main/java/com/volmit/iris/object/IrisRegionRidge.java index 6c8f69095..934b4fa96 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java +++ b/src/main/java/com/volmit/iris/object/IrisRegionRidge.java @@ -1,32 +1,52 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.util.CellGenerator; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.RNG; import lombok.Data; -import ninja.bytecode.iris.util.CellGenerator; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; @Desc("A ridge config") @Data public class IrisRegionRidge { + @DontObfuscate @Desc("The biome name") private String biome; + + @DontObfuscate @Desc("The type this biome should override (land sea or shore)") private InferredType type = InferredType.LAND; + + @DontObfuscate @Desc("What type this spot is (i.e. target SEA but as LAND) like an island. Default matches the target type") private InferredType as = InferredType.DEFER; + + @DontObfuscate @Desc("The chance this biome will be placed in a given spot") private double chance = 0.75; + + @DontObfuscate @Desc("The scale of the biome ridge. Higher values = wider veins & bigger connected cells") private double scale = 5; + + @DontObfuscate @Desc("The chance scale (cell chances)") private double chanceScale = 4; + + @DontObfuscate @Desc("The shuffle, how 'natural' this looks. Compared to pure polygons") private double shuffle = 16; + + @DontObfuscate @Desc("The chance shuffle (polygon cell chances)") private double chanceShuffle = 128; + + @DontObfuscate @Desc("The thickness of the vein") private double thickness = 0.125; + private transient CellGenerator spot; private transient CellGenerator ridge; diff --git a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java b/src/main/java/com/volmit/iris/object/IrisRegionSpot.java index 15a47328a..d4237420f 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java +++ b/src/main/java/com/volmit/iris/object/IrisRegionSpot.java @@ -1,24 +1,37 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; + +import com.volmit.iris.util.CellGenerator; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.RNG; import lombok.Data; -import ninja.bytecode.iris.util.CellGenerator; -import ninja.bytecode.iris.util.Desc; -import ninja.bytecode.iris.util.RNG; @Desc("A spot config") @Data public class IrisRegionSpot { + @DontObfuscate @Desc("The biome to be placed") private String biome; + + @DontObfuscate @Desc("Where this spot overrides. Land sea or shore") private InferredType type = InferredType.LAND; + + @DontObfuscate @Desc("What type this spot is (i.e. target SEA but as LAND) like an island. Default matches the target type") private InferredType as = InferredType.DEFER; + + @DontObfuscate @Desc("The scale of splotches") private double scale = 1; + + @DontObfuscate @Desc("Rarity is how often this splotch appears. higher = less often") private double rarity = 1; + + @DontObfuscate @Desc("The shuffle or how natural the splotch looks like (anti-polygon)") private double shuffle = 128; diff --git a/src/main/java/com/volmit/iris/object/IrisRegistrant.java b/src/main/java/com/volmit/iris/object/IrisRegistrant.java index 51d608f85..5273823bf 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegistrant.java +++ b/src/main/java/com/volmit/iris/object/IrisRegistrant.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.object; +package com.volmit.iris.object; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/atomics/AtomicRegionData.java b/src/main/java/com/volmit/iris/object/atomics/AtomicRegionData.java index 22bf5e558..fa3f1e376 100644 --- a/src/main/java/com/volmit/iris/object/atomics/AtomicRegionData.java +++ b/src/main/java/com/volmit/iris/object/atomics/AtomicRegionData.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.object.atomics; +package com.volmit.iris.object.atomics; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -8,12 +8,12 @@ import java.io.OutputStream; import org.bukkit.World; -import ninja.bytecode.iris.util.ByteArrayTag; -import ninja.bytecode.iris.util.CompoundTag; -import ninja.bytecode.iris.util.NBTInputStream; -import ninja.bytecode.iris.util.NBTOutputStream; -import ninja.bytecode.iris.util.Tag; -import ninja.bytecode.shuriken.collections.KMap; +import com.volmit.iris.util.ByteArrayTag; +import com.volmit.iris.util.CompoundTag; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.NBTInputStream; +import com.volmit.iris.util.NBTOutputStream; +import com.volmit.iris.util.Tag; public class AtomicRegionData { diff --git a/src/main/java/com/volmit/iris/object/atomics/AtomicSliver.java b/src/main/java/com/volmit/iris/object/atomics/AtomicSliver.java index a3447136e..fc2bc8459 100644 --- a/src/main/java/com/volmit/iris/object/atomics/AtomicSliver.java +++ b/src/main/java/com/volmit/iris/object/atomics/AtomicSliver.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.object.atomics; +package com.volmit.iris.object.atomics; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -10,10 +10,11 @@ import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.HeightMap; +import com.volmit.iris.util.KMap; + import lombok.Data; -import ninja.bytecode.iris.util.BlockDataTools; -import ninja.bytecode.iris.util.HeightMap; -import ninja.bytecode.shuriken.collections.KMap; @Data public class AtomicSliver diff --git a/src/main/java/com/volmit/iris/object/atomics/AtomicSliverMap.java b/src/main/java/com/volmit/iris/object/atomics/AtomicSliverMap.java index 3111e4c2b..22ace4fd1 100644 --- a/src/main/java/com/volmit/iris/object/atomics/AtomicSliverMap.java +++ b/src/main/java/com/volmit/iris/object/atomics/AtomicSliverMap.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.object.atomics; +package com.volmit.iris.object.atomics; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -9,8 +9,9 @@ import java.io.OutputStream; import org.bukkit.generator.ChunkGenerator.BiomeGrid; import org.bukkit.generator.ChunkGenerator.ChunkData; +import com.volmit.iris.util.HeightMap; + import lombok.Data; -import ninja.bytecode.iris.util.HeightMap; @Data public class AtomicSliverMap diff --git a/src/main/java/com/volmit/iris/object/atomics/AtomicWorldData.java b/src/main/java/com/volmit/iris/object/atomics/AtomicWorldData.java index 940ce7e25..8b7b6b6e4 100644 --- a/src/main/java/com/volmit/iris/object/atomics/AtomicWorldData.java +++ b/src/main/java/com/volmit/iris/object/atomics/AtomicWorldData.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.object.atomics; +package com.volmit.iris.object.atomics; import java.io.File; import java.io.FileInputStream; @@ -7,11 +7,11 @@ import java.io.IOException; import org.bukkit.World; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.util.ChronoLatch; -import ninja.bytecode.iris.util.ChunkPosition; -import ninja.bytecode.shuriken.collections.KMap; -import ninja.bytecode.shuriken.math.M; +import com.volmit.iris.Iris; +import com.volmit.iris.util.ChronoLatch; +import com.volmit.iris.util.ChunkPosition; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.M; public class AtomicWorldData { diff --git a/src/main/java/com/volmit/iris/object/atomics/MasterLock.java b/src/main/java/com/volmit/iris/object/atomics/MasterLock.java index 9c3cedc95..350f3c48d 100644 --- a/src/main/java/com/volmit/iris/object/atomics/MasterLock.java +++ b/src/main/java/com/volmit/iris/object/atomics/MasterLock.java @@ -1,8 +1,8 @@ -package ninja.bytecode.iris.object.atomics; +package com.volmit.iris.object.atomics; import java.util.concurrent.locks.ReentrantLock; -import ninja.bytecode.shuriken.collections.KMap; +import com.volmit.iris.util.KMap; public class MasterLock { diff --git a/src/main/java/com/volmit/iris/util/Average.java b/src/main/java/com/volmit/iris/util/Average.java index aa00b327d..427a86b61 100644 --- a/src/main/java/com/volmit/iris/util/Average.java +++ b/src/main/java/com/volmit/iris/util/Average.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /** * Provides an incredibly fast averaging object. It swaps values from a sum diff --git a/src/main/java/com/volmit/iris/util/Axis.java b/src/main/java/com/volmit/iris/util/Axis.java index 1e7e7291f..97257e6b2 100644 --- a/src/main/java/com/volmit/iris/util/Axis.java +++ b/src/main/java/com/volmit/iris/util/Axis.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.util.Vector; diff --git a/src/main/java/com/volmit/iris/util/BasePerlinNoiseGenerator.java b/src/main/java/com/volmit/iris/util/BasePerlinNoiseGenerator.java index f353284ad..7b9421941 100644 --- a/src/main/java/com/volmit/iris/util/BasePerlinNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/util/BasePerlinNoiseGenerator.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/util/BiomeDominance.java b/src/main/java/com/volmit/iris/util/BiomeDominance.java index e6e9a2664..3219a63b9 100644 --- a/src/main/java/com/volmit/iris/util/BiomeDominance.java +++ b/src/main/java/com/volmit/iris/util/BiomeDominance.java @@ -1,7 +1,6 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; -import ninja.bytecode.iris.object.IrisBiome; -import ninja.bytecode.shuriken.collections.KMap; +import com.volmit.iris.object.IrisBiome; public class BiomeDominance extends KMap { diff --git a/src/main/java/com/volmit/iris/util/BiomeMap.java b/src/main/java/com/volmit/iris/util/BiomeMap.java index bd915a268..f790ebb73 100644 --- a/src/main/java/com/volmit/iris/util/BiomeMap.java +++ b/src/main/java/com/volmit/iris/util/BiomeMap.java @@ -1,6 +1,6 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; -import ninja.bytecode.iris.object.IrisBiome; +import com.volmit.iris.object.IrisBiome; public class BiomeMap { diff --git a/src/main/java/com/volmit/iris/util/BiomeResult.java b/src/main/java/com/volmit/iris/util/BiomeResult.java index 5d41802b5..212e53d58 100644 --- a/src/main/java/com/volmit/iris/util/BiomeResult.java +++ b/src/main/java/com/volmit/iris/util/BiomeResult.java @@ -1,7 +1,8 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; + +import com.volmit.iris.object.IrisBiome; import lombok.Data; -import ninja.bytecode.iris.object.IrisBiome; @Data public class BiomeResult diff --git a/src/main/java/com/volmit/iris/util/BlockDataTools.java b/src/main/java/com/volmit/iris/util/BlockDataTools.java index d9afb5b83..73d24d4be 100644 --- a/src/main/java/com/volmit/iris/util/BlockDataTools.java +++ b/src/main/java/com/volmit/iris/util/BlockDataTools.java @@ -1,12 +1,10 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.collections.KMap; +import com.volmit.iris.Iris; public class BlockDataTools { diff --git a/src/main/java/com/volmit/iris/util/BlockPosition.java b/src/main/java/com/volmit/iris/util/BlockPosition.java index 3e60ff4fb..f1054337b 100644 --- a/src/main/java/com/volmit/iris/util/BlockPosition.java +++ b/src/main/java/com/volmit/iris/util/BlockPosition.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/Board.java b/src/main/java/com/volmit/iris/util/Board.java index 1649f7749..298599628 100644 --- a/src/main/java/com/volmit/iris/util/Board.java +++ b/src/main/java/com/volmit/iris/util/Board.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/volmit/iris/util/BoardEntry.java b/src/main/java/com/volmit/iris/util/BoardEntry.java index 6448d3847..28572318f 100644 --- a/src/main/java/com/volmit/iris/util/BoardEntry.java +++ b/src/main/java/com/volmit/iris/util/BoardEntry.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import lombok.Getter; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/volmit/iris/util/BoardManager.java b/src/main/java/com/volmit/iris/util/BoardManager.java index d2f8184ec..c45e3ea0f 100644 --- a/src/main/java/com/volmit/iris/util/BoardManager.java +++ b/src/main/java/com/volmit/iris/util/BoardManager.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/util/BoardProvider.java b/src/main/java/com/volmit/iris/util/BoardProvider.java index 21b91ebfa..6e56efeec 100644 --- a/src/main/java/com/volmit/iris/util/BoardProvider.java +++ b/src/main/java/com/volmit/iris/util/BoardProvider.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.entity.Player; import org.bukkit.scoreboard.Objective; diff --git a/src/main/java/com/volmit/iris/util/BoardSettings.java b/src/main/java/com/volmit/iris/util/BoardSettings.java index d2a5dd732..8e9629e3a 100644 --- a/src/main/java/com/volmit/iris/util/BoardSettings.java +++ b/src/main/java/com/volmit/iris/util/BoardSettings.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/util/BoardUpdateTask.java b/src/main/java/com/volmit/iris/util/BoardUpdateTask.java index 365f64e18..f27cd302c 100644 --- a/src/main/java/com/volmit/iris/util/BoardUpdateTask.java +++ b/src/main/java/com/volmit/iris/util/BoardUpdateTask.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/volmit/iris/util/BorderCheck.java b/src/main/java/com/volmit/iris/util/BorderCheck.java index a133cf872..8b89acedc 100644 --- a/src/main/java/com/volmit/iris/util/BorderCheck.java +++ b/src/main/java/com/volmit/iris/util/BorderCheck.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; @FunctionalInterface public interface BorderCheck diff --git a/src/main/java/com/volmit/iris/util/Borders.java b/src/main/java/com/volmit/iris/util/Borders.java index b1ea9c9c3..1c976158c 100644 --- a/src/main/java/com/volmit/iris/util/Borders.java +++ b/src/main/java/com/volmit/iris/util/Borders.java @@ -1,6 +1,4 @@ -package ninja.bytecode.iris.util; - -import ninja.bytecode.shuriken.math.M; +package com.volmit.iris.util; public class Borders { diff --git a/src/main/java/com/volmit/iris/util/ByteArrayTag.java b/src/main/java/com/volmit/iris/util/ByteArrayTag.java index b73bb8ff4..f12b43e21 100644 --- a/src/main/java/com/volmit/iris/util/ByteArrayTag.java +++ b/src/main/java/com/volmit/iris/util/ByteArrayTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/ByteTag.java b/src/main/java/com/volmit/iris/util/ByteTag.java index b25fb4ab4..81da3e50f 100644 --- a/src/main/java/com/volmit/iris/util/ByteTag.java +++ b/src/main/java/com/volmit/iris/util/ByteTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/CDou.java b/src/main/java/com/volmit/iris/util/CDou.java index c4c099d0f..7d59125b5 100644 --- a/src/main/java/com/volmit/iris/util/CDou.java +++ b/src/main/java/com/volmit/iris/util/CDou.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; public class CDou { diff --git a/src/main/java/com/volmit/iris/util/CNG.java b/src/main/java/com/volmit/iris/util/CNG.java index 45e0b5f24..34bb1e1a5 100644 --- a/src/main/java/com/volmit/iris/util/CNG.java +++ b/src/main/java/com/volmit/iris/util/CNG.java @@ -1,6 +1,4 @@ -package ninja.bytecode.iris.util; - -import ninja.bytecode.shuriken.collections.KList; +package com.volmit.iris.util; public class CNG { diff --git a/src/main/java/com/volmit/iris/util/Callback.java b/src/main/java/com/volmit/iris/util/Callback.java new file mode 100644 index 000000000..d8eab4929 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Callback.java @@ -0,0 +1,6 @@ +package com.volmit.iris.util; + +public interface Callback +{ + public void run(T t); +} diff --git a/src/main/java/com/volmit/iris/util/CallbackCV.java b/src/main/java/com/volmit/iris/util/CallbackCV.java index 9cf3374c1..885cf7e8a 100644 --- a/src/main/java/com/volmit/iris/util/CallbackCV.java +++ b/src/main/java/com/volmit/iris/util/CallbackCV.java @@ -1,6 +1,6 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; -public interface Callback +public interface CallbackCV { public void run(T t); } diff --git a/src/main/java/com/volmit/iris/util/CaveResult.java b/src/main/java/com/volmit/iris/util/CaveResult.java index 96bf251c1..d6f817aed 100644 --- a/src/main/java/com/volmit/iris/util/CaveResult.java +++ b/src/main/java/com/volmit/iris/util/CaveResult.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/CellGenerator.java b/src/main/java/com/volmit/iris/util/CellGenerator.java index a24def00a..2309cd435 100644 --- a/src/main/java/com/volmit/iris/util/CellGenerator.java +++ b/src/main/java/com/volmit/iris/util/CellGenerator.java @@ -1,10 +1,11 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; + +import com.volmit.iris.util.FastNoise.CellularDistanceFunction; +import com.volmit.iris.util.FastNoise.CellularReturnType; +import com.volmit.iris.util.FastNoise.NoiseType; import lombok.Getter; import lombok.Setter; -import ninja.bytecode.iris.util.FastNoise.CellularDistanceFunction; -import ninja.bytecode.iris.util.FastNoise.CellularReturnType; -import ninja.bytecode.iris.util.FastNoise.NoiseType; public class CellGenerator { diff --git a/src/main/java/com/volmit/iris/util/ChronoLatch.java b/src/main/java/com/volmit/iris/util/ChronoLatch.java index eed55bf8d..f468f1ff9 100644 --- a/src/main/java/com/volmit/iris/util/ChronoLatch.java +++ b/src/main/java/com/volmit/iris/util/ChronoLatch.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; public class ChronoLatch { diff --git a/src/main/java/com/volmit/iris/util/ChunkPosition.java b/src/main/java/com/volmit/iris/util/ChunkPosition.java index a3b4e4928..ceb00dade 100644 --- a/src/main/java/com/volmit/iris/util/ChunkPosition.java +++ b/src/main/java/com/volmit/iris/util/ChunkPosition.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/util/Chunker.java b/src/main/java/com/volmit/iris/util/Chunker.java new file mode 100644 index 000000000..fc697b048 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Chunker.java @@ -0,0 +1,57 @@ +package com.volmit.iris.util; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; + +public class Chunker +{ + private ExecutorService executor; + private int threads; + private int workload; + private KList q; + + public Chunker(KList q) + { + this.q = q; + } + + public Chunker threads(int threads) + { + this.threads = threads; + return this; + } + + public Chunker workload(int workload) + { + this.workload = workload; + return this; + } + + public void execute(Consumer consumer, Callback progress, int progressInterval) + { + ChronoLatch cl = new ChronoLatch(progressInterval); + Contained consumed = new Contained(0); + executor = Executors.newFixedThreadPool(threads); + int length = q.size(); + int remaining = length; + + while(remaining > 0) + { + int at = remaining; + remaining -= (remaining > workload ? workload : remaining); + int to = remaining; + + executor.submit(() -> + { + J.dofor(at, (i) -> i >= to, -1, (i) -> J.attempt(() -> consumer.accept(q.get(i)))); + consumed.mod((c) -> c += workload); + J.doif(() -> progress != null && cl.flip(), () -> progress.run((double) consumed.get() / (double) length)); + }); + } + + executor.shutdown(); + J.attempt(() -> executor.awaitTermination(100, TimeUnit.HOURS)); + } +} diff --git a/src/main/java/com/volmit/iris/util/CompoundTag.java b/src/main/java/com/volmit/iris/util/CompoundTag.java index e51c0637f..f6df65522 100644 --- a/src/main/java/com/volmit/iris/util/CompoundTag.java +++ b/src/main/java/com/volmit/iris/util/CompoundTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/Consumer2.java b/src/main/java/com/volmit/iris/util/Consumer2.java index 1f6366b26..cf4739ac4 100644 --- a/src/main/java/com/volmit/iris/util/Consumer2.java +++ b/src/main/java/com/volmit/iris/util/Consumer2.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; @FunctionalInterface public interface Consumer2 diff --git a/src/main/java/com/volmit/iris/util/Consumer3.java b/src/main/java/com/volmit/iris/util/Consumer3.java index 38711feea..0bfe71377 100644 --- a/src/main/java/com/volmit/iris/util/Consumer3.java +++ b/src/main/java/com/volmit/iris/util/Consumer3.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; @FunctionalInterface public interface Consumer3 diff --git a/src/main/java/com/volmit/iris/util/Contained.java b/src/main/java/com/volmit/iris/util/Contained.java index 9570b6de6..ec5b93724 100644 --- a/src/main/java/com/volmit/iris/util/Contained.java +++ b/src/main/java/com/volmit/iris/util/Contained.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/util/Cuboid.java b/src/main/java/com/volmit/iris/util/Cuboid.java index c0e99ad54..7d74db104 100644 --- a/src/main/java/com/volmit/iris/util/Cuboid.java +++ b/src/main/java/com/volmit/iris/util/Cuboid.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.ArrayList; import java.util.HashMap; @@ -15,8 +15,6 @@ import org.bukkit.block.Block; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.entity.Entity; -import ninja.bytecode.shuriken.collections.KList; - /** * Cuboids * diff --git a/src/main/java/com/volmit/iris/util/CuboidException.java b/src/main/java/com/volmit/iris/util/CuboidException.java index 212f9f79c..94acd74c9 100644 --- a/src/main/java/com/volmit/iris/util/CuboidException.java +++ b/src/main/java/com/volmit/iris/util/CuboidException.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /** * Represents a cuboid exception diff --git a/src/main/java/com/volmit/iris/util/DOP.java b/src/main/java/com/volmit/iris/util/DOP.java index b36611738..656751e25 100644 --- a/src/main/java/com/volmit/iris/util/DOP.java +++ b/src/main/java/com/volmit/iris/util/DOP.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.util.Vector; diff --git a/src/main/java/com/volmit/iris/util/Desc.java b/src/main/java/com/volmit/iris/util/Desc.java index 1259e38d9..388e1a678 100644 --- a/src/main/java/com/volmit/iris/util/Desc.java +++ b/src/main/java/com/volmit/iris/util/Desc.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; diff --git a/src/main/java/com/volmit/iris/util/Dimension.java b/src/main/java/com/volmit/iris/util/Dimension.java index c9b8a0db6..6df9dc78d 100644 --- a/src/main/java/com/volmit/iris/util/Dimension.java +++ b/src/main/java/com/volmit/iris/util/Dimension.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /** * Dimensions diff --git a/src/main/java/com/volmit/iris/util/DimensionFace.java b/src/main/java/com/volmit/iris/util/DimensionFace.java index 0db5b6b07..dce11d0e6 100644 --- a/src/main/java/com/volmit/iris/util/DimensionFace.java +++ b/src/main/java/com/volmit/iris/util/DimensionFace.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /** * Represents a dimension (coordinates not worlds) diff --git a/src/main/java/com/volmit/iris/util/Direction.java b/src/main/java/com/volmit/iris/util/Direction.java index 1a8388575..4c4d32835 100644 --- a/src/main/java/com/volmit/iris/util/Direction.java +++ b/src/main/java/com/volmit/iris/util/Direction.java @@ -1,13 +1,11 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Axis; import org.bukkit.block.BlockFace; import org.bukkit.util.Vector; -import ninja.bytecode.iris.util.Cuboid.CuboidDirection; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.collections.KMap; +import com.volmit.iris.util.Cuboid.CuboidDirection; /** * Directions diff --git a/src/main/java/com/volmit/iris/util/DontObfuscate.java b/src/main/java/com/volmit/iris/util/DontObfuscate.java new file mode 100644 index 000000000..49a4c7a45 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/DontObfuscate.java @@ -0,0 +1,14 @@ +package com.volmit.iris.util; + +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.RetentionPolicy.*; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Retention(RUNTIME) +@Target({FIELD, TYPE}) +public @interface DontObfuscate +{ + +} diff --git a/src/main/java/com/volmit/iris/util/DoubleArrayUtils.java b/src/main/java/com/volmit/iris/util/DoubleArrayUtils.java index d811feff0..016acee40 100644 --- a/src/main/java/com/volmit/iris/util/DoubleArrayUtils.java +++ b/src/main/java/com/volmit/iris/util/DoubleArrayUtils.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; public class DoubleArrayUtils diff --git a/src/main/java/com/volmit/iris/util/DoubleTag.java b/src/main/java/com/volmit/iris/util/DoubleTag.java index 7e48618e7..655471b2a 100644 --- a/src/main/java/com/volmit/iris/util/DoubleTag.java +++ b/src/main/java/com/volmit/iris/util/DoubleTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/EndTag.java b/src/main/java/com/volmit/iris/util/EndTag.java index db58c6084..c6d88a345 100644 --- a/src/main/java/com/volmit/iris/util/EndTag.java +++ b/src/main/java/com/volmit/iris/util/EndTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/FastNoise.java b/src/main/java/com/volmit/iris/util/FastNoise.java index 822e99bd0..dd827397a 100644 --- a/src/main/java/com/volmit/iris/util/FastNoise.java +++ b/src/main/java/com/volmit/iris/util/FastNoise.java @@ -25,7 +25,7 @@ // The developer's email is jorzixdan.me2@gzixmail.com (for great email, take // off every 'zix'.) // -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import javax.vecmath.Vector2f; import javax.vecmath.Vector3f; diff --git a/src/main/java/com/volmit/iris/util/FastParticle.java b/src/main/java/com/volmit/iris/util/FastParticle.java index c7ef5bc46..24f4f3870 100644 --- a/src/main/java/com/volmit/iris/util/FastParticle.java +++ b/src/main/java/com/volmit/iris/util/FastParticle.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/util/FastReflection.java b/src/main/java/com/volmit/iris/util/FastReflection.java index c330722c7..87de8408e 100644 --- a/src/main/java/com/volmit/iris/util/FastReflection.java +++ b/src/main/java/com/volmit/iris/util/FastReflection.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/util/FileWatcher.java b/src/main/java/com/volmit/iris/util/FileWatcher.java index 5ef247b78..305988be4 100644 --- a/src/main/java/com/volmit/iris/util/FileWatcher.java +++ b/src/main/java/com/volmit/iris/util/FileWatcher.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.io.File; diff --git a/src/main/java/com/volmit/iris/util/FloatTag.java b/src/main/java/com/volmit/iris/util/FloatTag.java index af6cc1057..e4ddbf270 100644 --- a/src/main/java/com/volmit/iris/util/FloatTag.java +++ b/src/main/java/com/volmit/iris/util/FloatTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/Form.java b/src/main/java/com/volmit/iris/util/Form.java new file mode 100644 index 000000000..ac5f83ec6 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Form.java @@ -0,0 +1,1564 @@ +package com.volmit.iris.util; + +import java.math.BigInteger; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.Locale; +import java.util.Map; +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; + +public class Form +{ + private static NumberFormat NF; + private static DecimalFormat DF; + + private static final String NAMES[] = new String[] {"Thousand", "Million", "Billion", "Trillion", "Quadrillion", "Quintillion", "Sextillion", "Septillion", "Octillion", "Nonillion", "Decillion", "Undecillion", "Duodecillion", "Tredecillion", "Quattuordecillion", "Quindecillion", "Sexdecillion", "Septendecillion", "Octodecillion", "Novemdecillion", "Vigintillion",}; + private static final BigInteger THOUSAND = BigInteger.valueOf(1000); + private static final NavigableMap MAP; + + static + { + MAP = new TreeMap(); + for(int i = 0; i < NAMES.length; i++) + { + MAP.put(THOUSAND.pow(i + 1), NAMES[i]); + } + } + + private static void instantiate() + { + if(NF == null) + { + NF = NumberFormat.getInstance(Locale.US); + } + } + + /** + * Scroll text + * + * @param smx + * the text + * @param viewport + * the viewport length + * @param time + * the timeline value + * @return + */ + public static String scroll(String smx, int viewport, long time) + { + String src = Form.repeat(" ", viewport) + smx + Form.repeat(" ", viewport); + int len = src.length(); + int walk = (int) (time % (len - viewport)); + String base = src.substring(walk, M.min(walk + viewport, len - 1)); + base = base.length() < viewport ? base + Form.repeat(" ", (viewport - base.length()) - 3) : base; + + return base; + } + + /** + * Capitalize the first letter + * + * @param s + * the string + * @return the capitalized string + */ + public static String capitalize(String s) + { + String roll = ""; + boolean f = true; + + for(Character i : s.trim().toCharArray()) + { + if(f) + { + roll += Character.toUpperCase(i); + f = false; + } + + else + { + roll += i; + } + } + + return roll; + } + + /** + * Capitalize all words in the string + * + * @param s + * the string + * @return the capitalized string + */ + public static String capitalizeWords(String s) + { + String rollx = ""; + + for(String i : s.trim().split(" ")) + { + rollx += " " + capitalize(i.trim()); + } + + return rollx.substring(1); + } + + /** + * Hard word wrap + * + * @param s + * the words + * @param len + * the length per line + * @return the wrapped string + */ + public static String wrap(String s, int len) + { + return wrap(s, len, (String) null, false); + } + + /** + * Soft Word wrap + * + * @param s + * the string + * @param len + * the length to wrap + * @return the wrapped string + */ + public static String wrapWords(String s, int len) + { + return wrap(s, len, (String) null, true); + } + + /** + * Wrap words + * + * @param s + * the string + * @param len + * the wrap length + * @param newLineSep + * the new line seperator + * @param soft + * should it be soft wrapped or hard wrapped? + * @return the wrapped words + */ + public static String wrap(String s, int len, String newLineSep, boolean soft) + { + return wrap(s, len, newLineSep, soft, " "); + } + + /** + * Wrap words + * + * @param s + * the string + * @param len + * the length + * @param newLineSep + * the new line seperator + * @param soft + * soft or hard wrapping + * @param regex + * the regex + * @return the wrapped string + */ + public static String wrap(String s, int len, String newLineSep, boolean soft, String regex) + { + if(s == null) + { + return null; + } + + else + { + if(newLineSep == null) + { + newLineSep = "\n"; + } + + if(len < 1) + { + len = 1; + } + + if(regex.trim().equals("")) + { + regex = " "; + } + + Pattern arg4 = Pattern.compile(regex); + int arg5 = s.length(); + int arg6 = 0; + StringBuilder arg7 = new StringBuilder(arg5 + 32); + + while(arg6 < arg5) + { + int arg8 = -1; + Matcher arg9 = arg4.matcher(s.substring(arg6, Math.min(arg6 + len + 1, arg5))); + if(arg9.find()) + { + if(arg9.start() == 0) + { + arg6 += arg9.end(); + continue; + } + + arg8 = arg9.start(); + } + + if(arg5 - arg6 <= len) + { + break; + } + + while(arg9.find()) + { + arg8 = arg9.start() + arg6; + } + + if(arg8 >= arg6) + { + arg7.append(s.substring(arg6, arg8)); + arg7.append(newLineSep); + arg6 = arg8 + 1; + } + else if(soft) + { + arg7.append(s.substring(arg6, len + arg6)); + arg7.append(newLineSep); + arg6 += len; + } + else + { + arg9 = arg4.matcher(s.substring(arg6 + len)); + if(arg9.find()) + { + arg8 = arg9.start() + arg6 + len; + } + + if(arg8 >= 0) + { + arg7.append(s.substring(arg6, arg8)); + arg7.append(newLineSep); + arg6 = arg8 + 1; + } + else + { + arg7.append(s.substring(arg6)); + arg6 = arg5; + } + } + } + + arg7.append(s.substring(arg6)); + return arg7.toString(); + } + } + + /** + * Returns a fancy duration up to Years + * + * @param rollingSequence + * + * @param duration + * the duration in ms + * @return the fancy duration + */ + public static String duration(RollingSequence rollingSequence, long duration) + { + String suffix = "Millisecond"; + double phantom = duration; + int div = 1000; + + if(phantom > div) + { + phantom /= div; + suffix = "Second"; + div = 60; + + if(phantom > div) + { + phantom /= div; + suffix = "Minute"; + + if(phantom > div) + { + phantom /= div; + suffix = "Hour"; + div = 24; + + if(phantom > 24) + { + phantom /= div; + suffix = "Day"; + div = 7; + + if(phantom > div) + { + phantom /= div; + suffix = "Week"; + div = 4; + + if(phantom > div) + { + phantom /= div; + suffix = "Month"; + div = 12; + + if(phantom > div) + { + phantom /= div; + suffix = "Year"; + return Form.fd(phantom, 0) + " " + suffix + ((int) phantom == 1 ? "" : "s"); + } + + else + { + return Form.fd(phantom, 0) + " " + suffix + ((int) phantom == 1 ? "" : "s"); + } + } + + else + { + return Form.fd(phantom, 0) + " " + suffix + ((int) phantom == 1 ? "" : "s"); + } + } + + else + { + return Form.fd(phantom, 0) + " " + suffix + ((int) phantom == 1 ? "" : "s"); + } + } + + else + { + return Form.fd(phantom, 0) + " " + suffix + ((int) phantom == 1 ? "" : "s"); + } + } + + else + { + return Form.fd(phantom, 0) + " " + suffix + ((int) phantom == 1 ? "" : "s"); + } + } + + else + { + return Form.fd(phantom, 0) + " " + suffix + ((int) phantom == 1 ? "" : "s"); + } + } + + else + { + return "Under a Second"; + } + } + + /** + * Fixes the minute issue with formatting + * + * @param c + * the calendar + * @return the minute string + */ + public static String fmin(Calendar c) + { + String s = c.get(Calendar.MINUTE) + ""; + if(s.length() == 1) + { + return "0" + s; + } + + return s; + } + + /** + * Get a fancy time stamp + * + * @param time + * the stamp in time (ago) + * @return the fancy stamp in time (ago) + */ + public static String ago(long time) + { + long current = M.ms(); + + if(time > current - TimeUnit.SECONDS.toMillis(30) && time < current) + { + return "Just Now"; + } + + else if(time > current - TimeUnit.SECONDS.toMillis(60) && time < current) + { + return "Seconds Ago"; + } + + else if(time > current - TimeUnit.MINUTES.toMillis(10) && time < current) + { + return "Minutes Ago"; + } + + else + { + Calendar now = Calendar.getInstance(); + Calendar c = Calendar.getInstance(); + c.setTimeInMillis(time); + boolean sameYear = now.get(Calendar.YEAR) == c.get(Calendar.YEAR); + boolean sameDay = now.get(Calendar.DAY_OF_YEAR) == c.get(Calendar.DAY_OF_YEAR); + + if(sameDay) + { + int h = c.get(Calendar.HOUR); + h = h == 0 ? 12 : h; + + return "Today at " + h + ":" + fmin(c) + " " + (c.get(Calendar.AM_PM) == Calendar.PM ? "PM" : "AM"); + } + + else if(sameYear) + { + boolean yesterday = now.get(Calendar.DAY_OF_YEAR) - 1 == c.get(Calendar.DAY_OF_YEAR); + + if(yesterday) + { + int h = c.get(Calendar.HOUR); + h = h == 0 ? 12 : h; + + return "Yesterday at " + h + ":" + fmin(c) + " " + (c.get(Calendar.AM_PM) == Calendar.PM ? "PM" : "AM"); + } + + else + { + int h = c.get(Calendar.HOUR); + h = h == 0 ? 12 : h; + String dow = "Error Day"; + + switch(c.get(Calendar.DAY_OF_WEEK)) + { + case Calendar.SUNDAY: + dow = "Sunday"; + break; + case Calendar.MONDAY: + dow = "Monday"; + break; + case Calendar.TUESDAY: + dow = "Tuesday"; + break; + case Calendar.WEDNESDAY: + dow = "Wednesday"; + break; + case Calendar.THURSDAY: + dow = "Thursday"; + break; + case Calendar.FRIDAY: + dow = "Friday"; + break; + case Calendar.SATURDAY: + dow = "Saturday"; + break; + } + + String monthName = "Error Month"; + int month = c.get(Calendar.MONTH); + + switch(month) + { + case Calendar.JANUARY: + monthName = "Jan"; + break; + case Calendar.FEBRUARY: + monthName = "Feb"; + break; + case Calendar.MARCH: + monthName = "Mar"; + break; + case Calendar.APRIL: + monthName = "Apr"; + break; + case Calendar.MAY: + monthName = "May"; + break; + case Calendar.JUNE: + monthName = "Jun"; + break; + case Calendar.JULY: + monthName = "Jul"; + break; + case Calendar.AUGUST: + monthName = "Aug"; + break; + case Calendar.SEPTEMBER: + monthName = "Sep"; + break; + case Calendar.OCTOBER: + monthName = "Oct"; + break; + case Calendar.NOVEMBER: + monthName = "Nov"; + break; + case Calendar.DECEMBER: + monthName = "Dec"; + break; + } + + int dayOfMonth = c.get(Calendar.DAY_OF_MONTH); + String suffix = numberSuffix(dayOfMonth); + + return dow + ", " + monthName + " " + suffix + " at " + h + ":" + fmin(c) + " " + (c.get(Calendar.AM_PM) == Calendar.PM ? "PM" : "AM"); + } + } + + else + { + int h = c.get(Calendar.HOUR); + h = h == 0 ? 12 : h; + String dow = "Error Day"; + + switch(c.get(Calendar.DAY_OF_WEEK)) + { + case Calendar.SUNDAY: + dow = "Sunday"; + break; + case Calendar.MONDAY: + dow = "Monday"; + break; + case Calendar.TUESDAY: + dow = "Tuesday"; + break; + case Calendar.WEDNESDAY: + dow = "Wednesday"; + break; + case Calendar.THURSDAY: + dow = "Thursday"; + break; + case Calendar.FRIDAY: + dow = "Friday"; + break; + case Calendar.SATURDAY: + dow = "Saturday"; + break; + } + + String monthName = "Error Month"; + int month = c.get(Calendar.MONTH); + + switch(month) + { + case Calendar.JANUARY: + monthName = "Jan"; + break; + case Calendar.FEBRUARY: + monthName = "Feb"; + break; + case Calendar.MARCH: + monthName = "Mar"; + break; + case Calendar.APRIL: + monthName = "Apr"; + break; + case Calendar.MAY: + monthName = "May"; + break; + case Calendar.JUNE: + monthName = "Jun"; + break; + case Calendar.JULY: + monthName = "Jul"; + break; + case Calendar.AUGUST: + monthName = "Aug"; + break; + case Calendar.SEPTEMBER: + monthName = "Sep"; + break; + case Calendar.OCTOBER: + monthName = "Oct"; + break; + case Calendar.NOVEMBER: + monthName = "Nov"; + break; + case Calendar.DECEMBER: + monthName = "Dec"; + break; + } + + int dayOfMonth = c.get(Calendar.DAY_OF_MONTH); + String suffix = numberSuffix(dayOfMonth); + int year = c.get(Calendar.YEAR); + + return year + ", " + dow + ", " + monthName + " " + suffix + " at " + h + ":" + fmin(c) + " " + (c.get(Calendar.AM_PM) == Calendar.PM ? "PM" : "AM"); + } + } + } + + /** + * Get the suffix for a number i.e. 1st 2nd 3rd + * + * @param i + * the number + * @return the suffix + */ + public static String numberSuffix(int i) + { + String[] sufixes = new String[] {"th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th"}; + switch(i % 100) + { + case 11: + case 12: + case 13: + return i + "th"; + default: + return i + sufixes[i % 10]; + + } + } + + /** + * Get a high accuracy but limited range duration (accurate up to a couple + * minutes) + * + * @param ms + * the milliseconds (double) + * @param prec + * the precision (decimal format) + * @return the formatted string + */ + public static String duration(double ms, int prec) + { + if(ms < 1000.0) + { + return Form.f(ms, prec) + "ms"; + } + + if(ms / 1000.0 < 60.0) + { + return Form.f(ms / 1000.0, prec) + "s"; + } + + if(ms / 1000.0 / 60.0 < 60.0) + { + return Form.f(ms / 1000.0 / 60.0, prec) + "m"; + } + + if(ms / 1000.0 / 60.0 / 60.0 < 24.0) + { + return Form.f(ms / 1000.0 / 60.0 / 60.0, prec) + " hours"; + } + + if(ms / 1000.0 / 60.0 / 60.0 / 24.0 < 7) + { + return Form.f(ms / 1000.0 / 60.0 / 24.0, prec) + " days"; + } + + return Form.f(ms, prec) + "ms"; + } + + public static String duration(long ms) + { + return duration(ms, 0); + } + + /** + * Get a duration from milliseconds up to days + * + * @param ms + * the ms + * @param prec + * the precision (decimal format) + * @return the formatted string + */ + public static String duration(long ms, int prec) + { + if(ms < 1000.0) + { + return Form.f(ms, prec) + "ms"; + } + + if(ms / 1000.0 < 60.0) + { + return Form.f(ms / 1000.0, prec) + " seconds"; + } + + if(ms / 1000.0 / 60.0 < 60.0) + { + return Form.f(ms / 1000.0 / 60.0, prec) + " minutes"; + } + + if(ms / 1000.0 / 60.0 / 60.0 < 24.0) + { + return Form.f(ms / 1000.0 / 60.0 / 60.0, prec) + " hours"; + } + + if(ms / 1000.0 / 60.0 / 60.0 / 24.0 < 7) + { + return Form.f(ms / 1000.0 / 60.0 / 24.0, prec) + " days"; + } + + return Form.f(ms, prec) + "ms"; + } + + /** + * Format a big value + * + * @param i + * the number + * @return the full value in string + */ + public static String b(int i) + { + return b(new BigInteger(String.valueOf(i))); + } + + /** + * Format a big value + * + * @param i + * the number + * @return the full value in string + */ + public static String b(long i) + { + return b(new BigInteger(String.valueOf(i))); + } + + /** + * Format a big value + * + * @param i + * the number + * @return the full value in string + */ + public static String b(double i) + { + return b(new BigInteger(String.valueOf((long) i))); + } + + /** + * Format a big number + * + * @param number + * the big number + * @return the value in string + */ + public static String b(BigInteger number) + { + Entry entry = MAP.floorEntry(number); + if(entry == null) + { + return "Nearly nothing"; + } + + BigInteger key = entry.getKey(); + BigInteger d = key.divide(THOUSAND); + BigInteger m = number.divide(d); + float f = m.floatValue() / 1000.0f; + float rounded = ((int) (f * 100.0)) / 100.0f; + + if(rounded % 1 == 0) + { + return ((int) rounded) + " " + entry.getValue(); + } + + return rounded + " " + entry.getValue(); + } + + /** + * Calculate a fancy string representation of a file size. Adds a suffix of B, + * KB, MB, GB, or TB + * + * @param s + * the size (in bytes) + * @return the string + */ + public static String fileSize(long s) + { + return ofSize(s, 1000); + } + + /** + * ":", "a", "b", "c" -> a:b:c + * + * @param splitter + * the splitter that goes in between + * @param strings + * the strings + * @return the result + */ + public static String split(String splitter, String... strings) + { + StringBuilder b = new StringBuilder(); + + for(String i : strings) + { + b.append(splitter); + b.append(i); + } + + return b.toString().substring(splitter.length()); + } + + /** + * Calculate a fancy string representation of a file size. Adds a suffix of B, + * KB, MB, GB, or TB + * + * @param s + * the size (in bytes) + * @return the string + */ + public static String memSize(long s) + { + return ofSize(s, 1024); + } + + public static String memSize(long s, int dec) + { + return ofSize(s, 1024, dec); + } + + /** + * Get the timestamp of the time t (ms since 1970) + * + * @param t + * the time + * @return the stamp + */ + @SuppressWarnings("deprecation") + public static String stamp(long t) + { + Date d = new Date(t); + return d.getMonth() + "-" + d.getDate() + "-" + (d.getYear() + 1900) + " " + d.getHours() + "h " + d.getMinutes() + "m " + d.getSeconds() + "s "; + } + + @SuppressWarnings("deprecation") + public static String stampTime(long t) + { + Date d = new Date(t); + + return Calendar.getInstance().get(Calendar.HOUR_OF_DAY) + ":" + forceDoubleDigit(d.getMinutes()) + ":" + forceDoubleDigit(d.getSeconds()); + } + + public static String forceDoubleDigit(int dig) + { + if(dig < 10) + { + return "0" + dig; + } + + return dig + ""; + } + + @SuppressWarnings("deprecation") + public static String stampDay(long t) + { + Date d = new Date(t); + return d.getMonth() + "-" + d.getDate() + "-" + (d.getYear() + 1900); + } + + /** + * Calculate a fancy string representation of a size in B, KB, MB, GB, or TB + * with a special divisor. The divisor decides how much goes up in the suffix + * chain. + * + * @param s + * the size (in bytes) + * @param div + * the divisor + * @return the string + */ + public static String ofSize(long s, int div) + { + Double d = (double) s; + String sub = "Bytes"; + + if(d > div - 1) + { + d /= div; + sub = "KB"; + + if(d > div - 1) + { + d /= div; + sub = "MB"; + + if(d > div - 1) + { + d /= div; + sub = "GB"; + + if(d > div - 1) + { + d /= div; + sub = "TB"; + } + } + } + } + + if(sub.equals("GB") || sub.equals("TB")) + { + return Form.f(d, 1) + sub; + } + + else + { + return Form.f(d, 0) + sub; + } + } + + /** + * Calculate a fancy string representation of a size in B, KB, MB, GB, or TB + * with a special divisor. The divisor decides how much goes up in the suffix + * chain. + * + * @param s + * the size (in bytes) + * @param div + * the divisor + * @param dec + * the decimal places + * @return the string + */ + public static String ofSize(long s, int div, int dec) + { + Double d = (double) s; + String sub = "Bytes"; + + if(d > div - 1) + { + d /= div; + sub = "KB"; + + if(d > div - 1) + { + d /= div; + sub = "MB"; + + if(d > div - 1) + { + d /= div; + sub = "GB"; + + if(d > div - 1) + { + d /= div; + sub = "TB"; + } + } + } + } + + return Form.f(d, dec) + " " + sub; + } + + /** + * Calculate a fancy string representation of a size in Grams, KG, MG, GG, TG + * with a special divisor. The divisor decides how much goes up in the suffix + * chain. + * + * @param s + * the size (in bytes) + * @param div + * the divisor + * @param dec + * the decimal places + * @return the string + */ + public static String ofSizeMetricWeight(long s, int div, int dec) + { + boolean neg = s < 0; + if(neg) + { + s = -s; + } + Double d = (double) s; + String sub = "Grams"; + + if(d > div - 1) + { + d /= div; + sub = "KG"; + + if(d > div - 1) + { + d /= div; + sub = "MG"; + + if(d > div - 1) + { + d /= div; + sub = "GG"; + + if(d > div - 1) + { + d /= div; + sub = "TG"; + } + } + } + } + + return (neg ? "-" : "") + Form.f(d, dec) + " " + sub; + } + + /** + * Trim a string to a length, then append ... at the end if it extends the limit + * + * @param s + * the string + * @param l + * the limit + * @return the modified string + */ + public static String trim(String s, int l) + { + if(s.length() <= l) + { + return s; + } + + return s.substring(0, l) + "..."; + } + + /** + * Get a class name into a configuration/filename key For example, + * PhantomController.class is converted to phantom-controller + * + * @param clazz + * the class + * @return the string representation + */ + public static String cname(String clazz) + { + String codeName = ""; + + for(Character i : clazz.toCharArray()) + { + if(Character.isUpperCase(i)) + { + codeName = codeName + "-" + Character.toLowerCase(i); + } + + else + { + codeName = codeName + i; + } + } + + if(codeName.startsWith("-")) + { + codeName = codeName.substring(1); + } + + return codeName; + } + + /** + * Get a formatted representation of the memory given in megabytes + * + * @param mb + * the megabytes + * @return the string representation with suffixes + */ + public static String mem(long mb) + { + if(mb < 1024) + { + return f(mb) + " MB"; + } + + else + { + return f(((double) mb / (double) 1024), 1) + " GB"; + } + } + + /** + * Get a formatted representation of the memory given in kilobytes + * + * @param mb + * the kilobytes + * @return the string representation with suffixes + */ + public static String memx(long kb) + { + if(kb < 1024) + { + return fd(kb, 2) + " KB"; + } + + else + { + double mb = (double) kb / 1024.0; + + if(mb < 1024) + { + return fd(mb, 2) + " MB"; + } + + else + { + double gb = (double) mb / 1024.0; + + return fd(gb, 2) + " GB"; + } + } + } + + /** + * Format a long. Changes -10334 into -10,334 + * + * @param i + * the number + * @return the string representation of the number + */ + public static String f(long i) + { + instantiate(); + return NF.format(i); + } + + /** + * Format a number. Changes -10334 into -10,334 + * + * @param i + * the number + * @return the string representation of the number + */ + public static String f(int i) + { + instantiate(); + return NF.format(i); + } + + /** + * Formats a double's decimals to a limit + * + * @param i + * the double + * @param p + * the number of decimal places to use + * @return the formated string + */ + public static String f(double i, int p) + { + String form = "#"; + + if(p > 0) + { + form = form + "." + repeat("#", p); + } + + DF = new DecimalFormat(form); + + return DF.format(i); + } + + /** + * Formats a double's decimals to a limit, however, this will add zeros to the + * decimal places that dont need to be placed down. 2.4343 formatted with 6 + * decimals gets returned as 2.434300 + * + * @param i + * the double + * @param p + * the number of decimal places to use + * @return the formated string + */ + public static String fd(double i, int p) + { + String form = "0"; + + if(p > 0) + { + form = form + "." + repeat("0", p); + } + + DF = new DecimalFormat(form); + + return DF.format(i); + } + + /** + * Formats a float's decimals to a limit + * + * @param i + * the float + * @param p + * the number of decimal places to use + * @return the formated string + */ + public static String f(float i, int p) + { + String form = "#"; + + if(p > 0) + { + form = form + "." + repeat("#", p); + } + + DF = new DecimalFormat(form); + + return DF.format(i); + } + + /** + * Formats a double's decimals (one decimal point) + * + * @param i + * the double + */ + public static String f(double i) + { + return f(i, 1); + } + + /** + * Formats a float's decimals (one decimal point) + * + * @param i + * the float + */ + public static String f(float i) + { + return f(i, 1); + } + + /** + * Get a percent representation of a double and decimal places (0.53) would + * return 53% + * + * @param i + * the double + * @param p + * the number of decimal points + * @return a string + */ + public static String pc(double i, int p) + { + return f(i * 100.0, p) + "%"; + } + + /** + * Get a percent representation of a float and decimal places (0.53) would + * return 53% + * + * @param i + * the float + * @param p + * the number of decimal points + * @return a string + */ + public static String pc(float i, int p) + { + return f(i * 100, p) + "%"; + } + + /** + * Get a percent representation of a double and zero decimal places (0.53) would + * return 53% + * + * @param i + * the double + * @return a string + */ + public static String pc(double i) + { + return f(i * 100, 0) + "%"; + } + + /** + * Get a percent representation of a float and zero decimal places (0.53) would + * return 53% + * + * @param i + * the double + * @return a string + */ + public static String pc(float i) + { + return f(i * 100, 0) + "%"; + } + + /** + * Get a percent as the percent of i out of "of" with custom decimal places + * + * @param i + * the percent out of + * @param of + * of of + * @param p + * the decimal places + * @return the string + */ + public static String pc(int i, int of, int p) + { + return f(100.0 * (((double) i) / ((double) of)), p) + "%"; + } + + /** + * Get a percent as the percent of i out of "of" + * + * @param i + * the percent out of + * @param of + * of of + * @return the string + */ + public static String pc(int i, int of) + { + return pc(i, of, 0); + } + + /** + * Get a percent as the percent of i out of "of" with custom decimal places + * + * @param i + * the percent out of + * @param of + * of of + * @param p + * the decimal places + * @return the string + */ + public static String pc(long i, long of, int p) + { + return f(100.0 * (((double) i) / ((double) of)), p) + "%"; + } + + /** + * Get a percent as the percent of i out of "of" + * + * @param i + * the percent out of + * @param of + * of of + * @return the string + */ + public static String pc(long i, long of) + { + return pc(i, of, 0); + } + + /** + * Milliseconds to seconds (double) + * + * @param ms + * the milliseconds + * @return a formatted string to milliseconds + */ + public static String msSeconds(long ms) + { + return f((double) ms / 1000.0); + } + + /** + * Milliseconds to seconds (double) custom decimals + * + * @param ms + * the milliseconds + * @param p + * number of decimal points + * @return a formatted string to milliseconds + */ + public static String msSeconds(long ms, int p) + { + return f((double) ms / 1000.0, p); + } + + /** + * nanoseconds to seconds (double) + * + * @param ms + * the nanoseconds + * @return a formatted string to nanoseconds + */ + public static String nsMs(long ns) + { + return f((double) ns / 1000000.0); + } + + /** + * nanoseconds to seconds (double) custom decimals + * + * @param ms + * the nanoseconds + * @param p + * number of decimal points + * @return a formatted string to nanoseconds + */ + public static String nsMs(long ns, int p) + { + return f((double) ns / 1000000.0, p); + } + + /** + * nanoseconds to seconds (double) custom decimals + * + * @param ms + * the nanoseconds + * @param p + * number of decimal points + * @return a formatted string to nanoseconds + */ + public static String nsMsd(long ns, int p) + { + return fd((double) ns / 1000000.0, p); + } + + /** + * Get roman numeral representation of the int + * + * @param num + * the int + * @return the numerals + */ + public static String toRoman(int num) + { + LinkedHashMap roman_numerals = new LinkedHashMap(); + + roman_numerals.put("M", 1000); + roman_numerals.put("CM", 900); + roman_numerals.put("D", 500); + roman_numerals.put("CD", 400); + roman_numerals.put("C", 100); + roman_numerals.put("XC", 90); + roman_numerals.put("L", 50); + roman_numerals.put("XL", 40); + roman_numerals.put("X", 10); + roman_numerals.put("IX", 9); + roman_numerals.put("V", 5); + roman_numerals.put("IV", 4); + roman_numerals.put("I", 1); + + String res = ""; + + for(Map.Entry entry : roman_numerals.entrySet()) + { + int matches = num / entry.getValue(); + + res += repeat(entry.getKey(), matches); + num = num % entry.getValue(); + } + + return res; + } + + /** + * Get the number representation from roman numerals. + * + * @param number + * the roman number + * @return the int representation + */ + public static int fromRoman(String number) + { + if(number.isEmpty()) + { + return 0; + } + + number = number.toUpperCase(); + + if(number.startsWith("M")) + { + return 1000 + fromRoman(number.substring(1)); + } + + if(number.startsWith("CM")) + { + return 900 + fromRoman(number.substring(2)); + } + + if(number.startsWith("D")) + { + return 500 + fromRoman(number.substring(1)); + } + + if(number.startsWith("CD")) + { + return 400 + fromRoman(number.substring(2)); + } + + if(number.startsWith("C")) + { + return 100 + fromRoman(number.substring(1)); + } + + if(number.startsWith("XC")) + { + return 90 + fromRoman(number.substring(2)); + } + + if(number.startsWith("L")) + { + return 50 + fromRoman(number.substring(1)); + } + + if(number.startsWith("XL")) + { + return 40 + fromRoman(number.substring(2)); + } + + if(number.startsWith("X")) + { + return 10 + fromRoman(number.substring(1)); + } + + if(number.startsWith("IX")) + { + return 9 + fromRoman(number.substring(2)); + } + + if(number.startsWith("V")) + { + return 5 + fromRoman(number.substring(1)); + } + + if(number.startsWith("IV")) + { + return 4 + fromRoman(number.substring(2)); + } + + if(number.startsWith("I")) + { + return 1 + fromRoman(number.substring(1)); + } + + return 0; + } + + /** + * Repeat a string + * + * @param s + * the string + * @param n + * the amount of times to repeat + * @return the repeated string + */ + public static String repeat(String s, int n) + { + if(s == null) + { + return null; + } + + final StringBuilder sb = new StringBuilder(); + + for(int i = 0; i < n; i++) + { + sb.append(s); + } + + return sb.toString(); + } +} diff --git a/src/main/java/com/volmit/iris/util/Function2.java b/src/main/java/com/volmit/iris/util/Function2.java new file mode 100644 index 000000000..e19f63bb2 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Function2.java @@ -0,0 +1,7 @@ +package com.volmit.iris.util; + +@FunctionalInterface +public interface Function2 +{ + public R apply(A a, B b); +} diff --git a/src/main/java/com/volmit/iris/util/Function3.java b/src/main/java/com/volmit/iris/util/Function3.java new file mode 100644 index 000000000..df65a6815 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Function3.java @@ -0,0 +1,7 @@ +package com.volmit.iris.util; + +@FunctionalInterface +public interface Function3 +{ + public R apply(A a, B b, C c); +} diff --git a/src/main/java/com/volmit/iris/util/Function4.java b/src/main/java/com/volmit/iris/util/Function4.java new file mode 100644 index 000000000..0dfe18d56 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Function4.java @@ -0,0 +1,7 @@ +package com.volmit.iris.util; + +@FunctionalInterface +public interface Function4 +{ + public R apply(A a, B b, C c, D d); +} diff --git a/src/main/java/com/volmit/iris/util/GBiset.java b/src/main/java/com/volmit/iris/util/GBiset.java index 901384c1a..2409d99ab 100644 --- a/src/main/java/com/volmit/iris/util/GBiset.java +++ b/src/main/java/com/volmit/iris/util/GBiset.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.io.Serializable; diff --git a/src/main/java/com/volmit/iris/util/GListAdapter.java b/src/main/java/com/volmit/iris/util/GListAdapter.java index d6c0d702b..a17e9bf7c 100644 --- a/src/main/java/com/volmit/iris/util/GListAdapter.java +++ b/src/main/java/com/volmit/iris/util/GListAdapter.java @@ -1,10 +1,8 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.List; -import ninja.bytecode.shuriken.collections.KList; - /** * Adapts a list of objects into a list of other objects * diff --git a/src/main/java/com/volmit/iris/util/GenLayer.java b/src/main/java/com/volmit/iris/util/GenLayer.java index adbb88c7a..0d8f2b0b0 100644 --- a/src/main/java/com/volmit/iris/util/GenLayer.java +++ b/src/main/java/com/volmit/iris/util/GenLayer.java @@ -1,6 +1,6 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; -import ninja.bytecode.iris.generator.DimensionChunkGenerator; +import com.volmit.iris.generator.DimensionChunkGenerator; public abstract class GenLayer { diff --git a/src/main/java/com/volmit/iris/util/GroupedExecutor.java b/src/main/java/com/volmit/iris/util/GroupedExecutor.java index 36deb3cca..0a49587c2 100644 --- a/src/main/java/com/volmit/iris/util/GroupedExecutor.java +++ b/src/main/java/com/volmit/iris/util/GroupedExecutor.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -7,10 +7,6 @@ import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory; import java.util.concurrent.ForkJoinWorkerThread; import java.util.concurrent.locks.ReentrantLock; -import ninja.bytecode.shuriken.collections.KMap; -import ninja.bytecode.shuriken.execution.J; -import ninja.bytecode.shuriken.execution.NastyRunnable; - public class GroupedExecutor { private int xc; diff --git a/src/main/java/com/volmit/iris/util/HTTP.java b/src/main/java/com/volmit/iris/util/HTTP.java new file mode 100644 index 000000000..66bf0b1aa --- /dev/null +++ b/src/main/java/com/volmit/iris/util/HTTP.java @@ -0,0 +1,201 @@ +package com.volmit.iris.util; + + +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +import java.util.Iterator; + +/** + * Convert an HTTP header to a JSONObject and back. + * + * @author JSON.org + * @version 2014-05-03 + */ +public class HTTP +{ + + /** Carriage return/line feed. */ + public static final String CRLF = "\r\n"; + + /** + * Convert an HTTP header string into a JSONObject. It can be a request + * header or a response header. A request header will contain + * + * 
+	 * {
+	 *    Method: "POST" (for example),
+	 *    "Request-URI": "/" (for example),
+	 *    "HTTP-Version": "HTTP/1.1" (for example)
+	 * }
+	 *
+ * + * A response header will contain + * + * 
+	 * {
+	 *    "HTTP-Version": "HTTP/1.1" (for example),
+	 *    "Status-Code": "200" (for example),
+	 *    "Reason-Phrase": "OK" (for example)
+	 * }
+	 *
+ * + * In addition, the other parameters in the header will be captured, using + * the HTTP field names as JSON names, so that + * + * 
+	 *    Date: Sun, 26 May 2002 18:06:04 GMT
+	 *    Cookie: Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s
+	 *    Cache-Control: no-cache
+	 *
+ * + * become + * + * 
+	 * {...
+	 *    Date: "Sun, 26 May 2002 18:06:04 GMT",
+	 *    Cookie: "Q=q2=PPEAsg--; B=677gi6ouf29bn&b=2&f=s",
+	 *    "Cache-Control": "no-cache",
+	 * ...}
+	 *
+ * + * It does no further checking or conversion. It does not parse dates. It + * does not do '%' transforms on URLs. + * + * @param string + * An HTTP header string. + * @return A JSONObject containing the elements and attributes of the XML + * string. + * @throws JSONException + */ + public static JSONObject toJSONObject(String string) throws JSONException + { + JSONObject jo = new JSONObject(); + HTTPTokener x = new HTTPTokener(string); + String token; + + token = x.nextToken(); + if(token.toUpperCase().startsWith("HTTP")) + { + + // Response + + jo.put("HTTP-Version", token); + jo.put("Status-Code", x.nextToken()); + jo.put("Reason-Phrase", x.nextTo('\0')); + x.next(); + + } else + { + + // Request + + jo.put("Method", token); + jo.put("Request-URI", x.nextToken()); + jo.put("HTTP-Version", x.nextToken()); + } + + // Fields + + while(x.more()) + { + String name = x.nextTo(':'); + x.next(':'); + jo.put(name, x.nextTo('\0')); + x.next(); + } + return jo; + } + + /** + * Convert a JSONObject into an HTTP header. A request header must contain + * + * 
+	 * {
+	 *    Method: "POST" (for example),
+	 *    "Request-URI": "/" (for example),
+	 *    "HTTP-Version": "HTTP/1.1" (for example)
+	 * }
+	 *
+ * + * A response header must contain + * + * 
+	 * {
+	 *    "HTTP-Version": "HTTP/1.1" (for example),
+	 *    "Status-Code": "200" (for example),
+	 *    "Reason-Phrase": "OK" (for example)
+	 * }
+	 *
+ * + * Any other members of the JSONObject will be output as HTTP fields. The + * result will end with two CRLF pairs. + * + * @param jo + * A JSONObject + * @return An HTTP header string. + * @throws JSONException + * if the object does not contain enough information. + */ + public static String toString(JSONObject jo) throws JSONException + { + Iterator keys = jo.keys(); + String string; + StringBuilder sb = new StringBuilder(); + if(jo.has("Status-Code") && jo.has("Reason-Phrase")) + { + sb.append(jo.getString("HTTP-Version")); + sb.append(' '); + sb.append(jo.getString("Status-Code")); + sb.append(' '); + sb.append(jo.getString("Reason-Phrase")); + } else if(jo.has("Method") && jo.has("Request-URI")) + { + sb.append(jo.getString("Method")); + sb.append(' '); + sb.append('"'); + sb.append(jo.getString("Request-URI")); + sb.append('"'); + sb.append(' '); + sb.append(jo.getString("HTTP-Version")); + } else + { + throw new JSONException("Not enough material for an HTTP header."); + } + sb.append(CRLF); + while(keys.hasNext()) + { + string = keys.next(); + if(!"HTTP-Version".equals(string) && !"Status-Code".equals(string) && !"Reason-Phrase".equals(string) && !"Method".equals(string) && !"Request-URI".equals(string) && !jo.isNull(string)) + { + sb.append(string); + sb.append(": "); + sb.append(jo.getString(string)); + sb.append(CRLF); + } + } + sb.append(CRLF); + return sb.toString(); + } +} diff --git a/src/main/java/com/volmit/iris/util/HTTPTokener.java b/src/main/java/com/volmit/iris/util/HTTPTokener.java new file mode 100644 index 000000000..562f86109 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/HTTPTokener.java @@ -0,0 +1,91 @@ +package com.volmit.iris.util; + + +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +/** + * The HTTPTokener extends the JSONTokener to provide additional methods for the + * parsing of HTTP headers. + * + * @author JSON.org + * @version 2014-05-03 + */ +public class HTTPTokener extends JSONTokener +{ + + /** + * Construct an HTTPTokener from a string. + * + * @param string + * A source string. + */ + public HTTPTokener(String string) + { + super(string); + } + + /** + * Get the next token or string. This is used in parsing HTTP headers. + * + * @throws JSONException + * @return A String. + */ + public String nextToken() throws JSONException + { + char c; + char q; + StringBuilder sb = new StringBuilder(); + do + { + c = next(); + } while(Character.isWhitespace(c)); + if(c == '"' || c == '\'') + { + q = c; + for(;;) + { + c = next(); + if(c < ' ') + { + throw syntaxError("Unterminated string."); + } + if(c == q) + { + return sb.toString(); + } + sb.append(c); + } + } + for(;;) + { + if(c == 0 || Character.isWhitespace(c)) + { + return sb.toString(); + } + sb.append(c); + c = next(); + } + } +} diff --git a/src/main/java/com/volmit/iris/util/HeightMap.java b/src/main/java/com/volmit/iris/util/HeightMap.java index 37344e2e4..ea9f4dd13 100644 --- a/src/main/java/com/volmit/iris/util/HeightMap.java +++ b/src/main/java/com/volmit/iris/util/HeightMap.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/util/ING.java b/src/main/java/com/volmit/iris/util/ING.java index 49e9d35ad..326a05b4e 100644 --- a/src/main/java/com/volmit/iris/util/ING.java +++ b/src/main/java/com/volmit/iris/util/ING.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; public class ING { diff --git a/src/main/java/com/volmit/iris/util/IO.java b/src/main/java/com/volmit/iris/util/IO.java index 992e329d4..445b8e605 100644 --- a/src/main/java/com/volmit/iris/util/IO.java +++ b/src/main/java/com/volmit/iris/util/IO.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.io.BufferedInputStream; import java.io.BufferedReader; diff --git a/src/main/java/com/volmit/iris/util/IObjectPlacer.java b/src/main/java/com/volmit/iris/util/IObjectPlacer.java index 6cc0825b7..039d1951a 100644 --- a/src/main/java/com/volmit/iris/util/IObjectPlacer.java +++ b/src/main/java/com/volmit/iris/util/IObjectPlacer.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/util/IPostBlockAccess.java b/src/main/java/com/volmit/iris/util/IPostBlockAccess.java index f5f76d6ce..040cfe60b 100644 --- a/src/main/java/com/volmit/iris/util/IPostBlockAccess.java +++ b/src/main/java/com/volmit/iris/util/IPostBlockAccess.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/util/IntArrayTag.java b/src/main/java/com/volmit/iris/util/IntArrayTag.java index 3e4a4afea..195d1cf20 100644 --- a/src/main/java/com/volmit/iris/util/IntArrayTag.java +++ b/src/main/java/com/volmit/iris/util/IntArrayTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/util/IntTag.java b/src/main/java/com/volmit/iris/util/IntTag.java index 8b16f7196..223a4d32c 100644 --- a/src/main/java/com/volmit/iris/util/IntTag.java +++ b/src/main/java/com/volmit/iris/util/IntTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/InterpolationType.java b/src/main/java/com/volmit/iris/util/InterpolationType.java index 238e0e820..9745f7f5e 100644 --- a/src/main/java/com/volmit/iris/util/InterpolationType.java +++ b/src/main/java/com/volmit/iris/util/InterpolationType.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; public enum InterpolationType { LINEAR, diff --git a/src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java b/src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java index 79bc75815..0a30bb9fa 100644 --- a/src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java +++ b/src/main/java/com/volmit/iris/util/InvertedBiomeGrid.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.block.Biome; import org.bukkit.generator.ChunkGenerator.BiomeGrid; diff --git a/src/main/java/com/volmit/iris/util/IrisInterpolation.java b/src/main/java/com/volmit/iris/util/IrisInterpolation.java index 82ada55ab..2c1bb72c9 100644 --- a/src/main/java/com/volmit/iris/util/IrisInterpolation.java +++ b/src/main/java/com/volmit/iris/util/IrisInterpolation.java @@ -1,6 +1,6 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; -import ninja.bytecode.iris.object.InterpolationMethod; +import com.volmit.iris.object.InterpolationMethod; public class IrisInterpolation { diff --git a/src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java b/src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java index 98d18b905..3b88f7635 100644 --- a/src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java +++ b/src/main/java/com/volmit/iris/util/IrisPostBlockFilter.java @@ -1,8 +1,8 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.block.data.BlockData; -import ninja.bytecode.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.generator.PostBlockChunkGenerator; public abstract class IrisPostBlockFilter implements IPostBlockAccess { diff --git a/src/main/java/com/volmit/iris/util/J.java b/src/main/java/com/volmit/iris/util/J.java new file mode 100644 index 000000000..0f329f99c --- /dev/null +++ b/src/main/java/com/volmit/iris/util/J.java @@ -0,0 +1,137 @@ +package com.volmit.iris.util; + +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; + +import com.volmit.iris.Iris; + +public class J +{ + private static int tid = 0; + private static final ExecutorService e = Executors.newCachedThreadPool(new ThreadFactory() + { + @Override + public Thread newThread(Runnable r) + { + tid++; + Thread t = new Thread(r); + t.setName("Actuator " + tid); + t.setPriority(Thread.MIN_PRIORITY); + t.setUncaughtExceptionHandler((et, e) -> + { + Iris.info("Exception encountered in " + et.getName()); + e.printStackTrace(); + }); + + return t; + } + }); + + public static void dofor(int a, Function c, int ch, Consumer d) + { + for(int i = a; c.apply(i); i += ch) + { + c.apply(i); + } + } + + public static boolean doif(Supplier c, Runnable g) + { + if(c.get()) + { + g.run(); + return true; + } + + return false; + } + + public static void a(Runnable a) + { + e.submit(a); + } + + public static Future a(Callable a) + { + return e.submit(a); + } + + public static void attemptAsync(NastyRunnable r) + { + J.a(() -> J.attempt(r)); + } + + public static R attemptResult(NastyFuture r, R onError) + { + try + { + return r.run(); + } + + catch(Throwable e) + { + + } + + return onError; + } + + public static R attemptFunction(NastyFunction r, T param, R onError) + { + try + { + return r.run(param); + } + + catch(Throwable e) + { + + } + + return onError; + } + + public static boolean sleep(long ms) + { + return J.attempt(() -> Thread.sleep(ms)); + } + + public static boolean attempt(NastyRunnable r) + { + return attemptCatch(r) == null; + } + + public static Throwable attemptCatch(NastyRunnable r) + { + try + { + r.run(); + } + + catch(Throwable e) + { + return e; + } + + return null; + } + + public static T attempt(Supplier t, T i) + { + try + { + return t.get(); + } + + catch(Throwable e) + { + return i; + } + } +} diff --git a/src/main/java/com/volmit/iris/util/JSONArray.java b/src/main/java/com/volmit/iris/util/JSONArray.java new file mode 100644 index 000000000..ed935bcc3 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JSONArray.java @@ -0,0 +1,1252 @@ +package com.volmit.iris.util; + + +/* + Copyright (c) 2002 JSON.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + The Software shall be used for Good, not Evil. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + */ + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.lang.reflect.Array; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; + +/** + * A JSONArray is an ordered sequence of values. Its external text form is a + * string wrapped in square brackets with commas separating the values. The + * internal form is an object having get and opt + * methods for accessing the values by index, and put methods for + * adding or replacing values. The values can be any of these types: + * Boolean, JSONArray, JSONObject, + * Number, String, or the + * JSONObject.NULL object. + *

+ * The constructor can convert a JSON text into a Java object. The + * toString method converts to JSON text. + *

+ * A get method returns a value if one can be found, and throws an + * exception if one cannot be found. An opt method returns a + * default value instead of throwing an exception, and so is useful for + * obtaining optional values. + *

+ * The generic get() and opt() methods return an + * object which you can cast or query for type. There are also typed + * get and opt methods that do type checking and type + * coercion for you. + *

+ * The texts produced by the toString methods strictly conform to + * JSON syntax rules. The constructors are more forgiving in the texts they will + * accept: + *

    + *
  • An extra , (comma) may appear just + * before the closing bracket.
    • + *
  • The null value will be inserted when there is , + *  (comma) elision.
    • + *
  • Strings may be quoted with ' (single + * quote).
    • + *
  • Strings do not need to be quoted at all if they do not begin with a quote + * or single quote, and if they do not contain leading or trailing spaces, and + * if they do not contain any of these characters: + * { } [ ] / \ : , # and if they do not look like numbers and if + * they are not the reserved words true, false, or + * null.
    • + *
+ * + * @author JSON.org + * @version 2015-07-22 + */ +public class JSONArray implements Iterable +{ + + /** + * The arrayList where the JSONArray's properties are kept. + */ + private final ArrayList myArrayList; + + /** + * Construct an empty JSONArray. + */ + public JSONArray() + { + this.myArrayList = new ArrayList(); + } + + /** + * Construct a JSONArray from a JSONTokener. + * + * @param x + * A JSONTokener + * @throws JSONException + * If there is a syntax error. + */ + public JSONArray(JSONTokener x) throws JSONException + { + this(); + if(x.nextClean() != '[') + { + throw x.syntaxError("A JSONArray text must start with '['"); + } + if(x.nextClean() != ']') + { + x.back(); + for(;;) + { + if(x.nextClean() == ',') + { + x.back(); + this.myArrayList.add(JSONObject.NULL); + } else + { + x.back(); + this.myArrayList.add(x.nextValue()); + } + switch(x.nextClean()) + { + case ',': + if(x.nextClean() == ']') + { + return; + } + x.back(); + break; + case ']': + return; + default: + throw x.syntaxError("Expected a ',' or ']'"); + } + } + } + } + + /** + * Construct a JSONArray from a source JSON text. + * + * @param source + * A string that begins with [ (left + * bracket) and ends with ]   + * (right bracket). + * @throws JSONException + * If there is a syntax error. + */ + public JSONArray(String source) throws JSONException + { + this(new JSONTokener(source)); + } + + /** + * Construct a JSONArray from a Collection. + * + * @param collection + * A Collection. + */ + public JSONArray(Collection collection) + { + this.myArrayList = new ArrayList(); + if(collection != null) + { + Iterator iter = collection.iterator(); + while(iter.hasNext()) + { + this.myArrayList.add(JSONObject.wrap(iter.next())); + } + } + } + + /** + * Construct a JSONArray from an array + * + * @throws JSONException + * If not an array. + */ + public JSONArray(Object array) throws JSONException + { + this(); + if(array.getClass().isArray()) + { + int length = Array.getLength(array); + for(int i = 0; i < length; i += 1) + { + this.put(JSONObject.wrap(Array.get(array, i))); + } + } else + { + throw new JSONException("JSONArray initial value should be a string or collection or array."); + } + } + + @Override + public Iterator iterator() + { + return myArrayList.iterator(); + } + + /** + * Get the object value associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return An object value. + * @throws JSONException + * If there is no value for the index. + */ + public Object get(int index) throws JSONException + { + Object object = this.opt(index); + if(object == null) + { + throw new JSONException("JSONArray[" + index + "] not found."); + } + return object; + } + + /** + * Get the boolean value associated with an index. The string values "true" + * and "false" are converted to boolean. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The truth. + * @throws JSONException + * If there is no value for the index or if the value is not + * convertible to boolean. + */ + public boolean getBoolean(int index) throws JSONException + { + Object object = this.get(index); + if(object.equals(Boolean.FALSE) || (object instanceof String && ((String) object).equalsIgnoreCase("false"))) + { + return false; + } else if(object.equals(Boolean.TRUE) || (object instanceof String && ((String) object).equalsIgnoreCase("true"))) + { + return true; + } + throw new JSONException("JSONArray[" + index + "] is not a boolean."); + } + + /** + * Get the double value associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The value. + * @throws JSONException + * If the key is not found or if the value cannot be converted + * to a number. + */ + public double getDouble(int index) throws JSONException + { + Object object = this.get(index); + try + { + return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object); + } catch(Exception e) + { + throw new JSONException("JSONArray[" + index + "] is not a number."); + } + } + + /** + * Get the enum value associated with an index. + * + * @param clazz + * The type of enum to retrieve. + * @param index + * The index must be between 0 and length() - 1. + * @return The enum value at the index location + * @throws JSONException + * if the key is not found or if the value cannot be converted + * to an enum. + */ + public > E getEnum(Class clazz, int index) throws JSONException + { + E val = optEnum(clazz, index); + if(val == null) + { + // JSONException should really take a throwable argument. + // If it did, I would re-implement this with the Enum.valueOf + // method and place any thrown exception in the JSONException + throw new JSONException("JSONObject[" + JSONObject.quote(Integer.toString(index)) + "] is not an enum of type " + JSONObject.quote(clazz.getSimpleName()) + "."); + } + return val; + } + + /** + * Get the BigDecimal value associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The value. + * @throws JSONException + * If the key is not found or if the value cannot be converted + * to a BigDecimal. + */ + public BigDecimal getBigDecimal(int index) throws JSONException + { + Object object = this.get(index); + try + { + return new BigDecimal(object.toString()); + } catch(Exception e) + { + throw new JSONException("JSONArray[" + index + "] could not convert to BigDecimal."); + } + } + + /** + * Get the BigInteger value associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The value. + * @throws JSONException + * If the key is not found or if the value cannot be converted + * to a BigInteger. + */ + public BigInteger getBigInteger(int index) throws JSONException + { + Object object = this.get(index); + try + { + return new BigInteger(object.toString()); + } catch(Exception e) + { + throw new JSONException("JSONArray[" + index + "] could not convert to BigInteger."); + } + } + + /** + * Get the int value associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The value. + * @throws JSONException + * If the key is not found or if the value is not a number. + */ + public int getInt(int index) throws JSONException + { + Object object = this.get(index); + try + { + return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object); + } catch(Exception e) + { + throw new JSONException("JSONArray[" + index + "] is not a number."); + } + } + + /** + * Get the JSONArray associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return A JSONArray value. + * @throws JSONException + * If there is no value for the index. or if the value is not a + * JSONArray + */ + public JSONArray getJSONArray(int index) throws JSONException + { + Object object = this.get(index); + if(object instanceof JSONArray) + { + return (JSONArray) object; + } + throw new JSONException("JSONArray[" + index + "] is not a JSONArray."); + } + + /** + * Get the JSONObject associated with an index. + * + * @param index + * subscript + * @return A JSONObject value. + * @throws JSONException + * If there is no value for the index or if the value is not a + * JSONObject + */ + public JSONObject getJSONObject(int index) throws JSONException + { + Object object = this.get(index); + if(object instanceof JSONObject) + { + return (JSONObject) object; + } + throw new JSONException("JSONArray[" + index + "] is not a JSONObject."); + } + + /** + * Get the long value associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The value. + * @throws JSONException + * If the key is not found or if the value cannot be converted + * to a number. + */ + public long getLong(int index) throws JSONException + { + Object object = this.get(index); + try + { + return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object); + } catch(Exception e) + { + throw new JSONException("JSONArray[" + index + "] is not a number."); + } + } + + /** + * Get the string associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return A string value. + * @throws JSONException + * If there is no string value for the index. + */ + public String getString(int index) throws JSONException + { + Object object = this.get(index); + if(object instanceof String) + { + return (String) object; + } + throw new JSONException("JSONArray[" + index + "] not a string."); + } + + /** + * Determine if the value is null. + * + * @param index + * The index must be between 0 and length() - 1. + * @return true if the value at the index is null, or if there is no value. + */ + public boolean isNull(int index) + { + return JSONObject.NULL.equals(this.opt(index)); + } + + /** + * Make a string from the contents of this JSONArray. The + * separator string is inserted between each element. Warning: + * This method assumes that the data structure is acyclical. + * + * @param separator + * A string that will be inserted between the elements. + * @return a string. + * @throws JSONException + * If the array contains an invalid number. + */ + public String join(String separator) throws JSONException + { + int len = this.length(); + StringBuilder sb = new StringBuilder(); + + for(int i = 0; i < len; i += 1) + { + if(i > 0) + { + sb.append(separator); + } + sb.append(JSONObject.valueToString(this.myArrayList.get(i))); + } + return sb.toString(); + } + + /** + * Get the number of elements in the JSONArray, included nulls. + * + * @return The length (or size). + */ + public int length() + { + return this.myArrayList.size(); + } + + /** + * Get the optional object value associated with an index. + * + * @param index + * The index must be between 0 and length() - 1. + * @return An object value, or null if there is no object at that index. + */ + public Object opt(int index) + { + return (index < 0 || index >= this.length()) ? null : this.myArrayList.get(index); + } + + /** + * Get the optional boolean value associated with an index. It returns false + * if there is no value at that index, or if the value is not Boolean.TRUE + * or the String "true". + * + * @param index + * The index must be between 0 and length() - 1. + * @return The truth. + */ + public boolean optBoolean(int index) + { + return this.optBoolean(index, false); + } + + /** + * Get the optional boolean value associated with an index. It returns the + * defaultValue if there is no value at that index or if it is not a Boolean + * or the String "true" or "false" (case insensitive). + * + * @param index + * The index must be between 0 and length() - 1. + * @param defaultValue + * A boolean default. + * @return The truth. + */ + public boolean optBoolean(int index, boolean defaultValue) + { + try + { + return this.getBoolean(index); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get the optional double value associated with an index. NaN is returned + * if there is no value for the index, or if the value is not a number and + * cannot be converted to a number. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The value. + */ + public double optDouble(int index) + { + return this.optDouble(index, Double.NaN); + } + + /** + * Get the optional double value associated with an index. The defaultValue + * is returned if there is no value for the index, or if the value is not a + * number and cannot be converted to a number. + * + * @param index + * subscript + * @param defaultValue + * The default value. + * @return The value. + */ + public double optDouble(int index, double defaultValue) + { + try + { + return this.getDouble(index); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get the optional int value associated with an index. Zero is returned if + * there is no value for the index, or if the value is not a number and + * cannot be converted to a number. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The value. + */ + public int optInt(int index) + { + return this.optInt(index, 0); + } + + /** + * Get the optional int value associated with an index. The defaultValue is + * returned if there is no value for the index, or if the value is not a + * number and cannot be converted to a number. + * + * @param index + * The index must be between 0 and length() - 1. + * @param defaultValue + * The default value. + * @return The value. + */ + public int optInt(int index, int defaultValue) + { + try + { + return this.getInt(index); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get the enum value associated with a key. + * + * @param clazz + * The type of enum to retrieve. + * @param index + * The index must be between 0 and length() - 1. + * @return The enum value at the index location or null if not found + */ + public > E optEnum(Class clazz, int index) + { + return this.optEnum(clazz, index, null); + } + + /** + * Get the enum value associated with a key. + * + * @param clazz + * The type of enum to retrieve. + * @param index + * The index must be between 0 and length() - 1. + * @param defaultValue + * The default in case the value is not found + * @return The enum value at the index location or defaultValue if the value + * is not found or cannot be assigned to clazz + */ + public > E optEnum(Class clazz, int index, E defaultValue) + { + try + { + Object val = this.opt(index); + if(JSONObject.NULL.equals(val)) + { + return defaultValue; + } + if(clazz.isAssignableFrom(val.getClass())) + { + // we just checked it! + @SuppressWarnings("unchecked") + E myE = (E) val; + return myE; + } + return Enum.valueOf(clazz, val.toString()); + } + + catch(IllegalArgumentException e) + { + return defaultValue; + } + + catch(NullPointerException e) + { + return defaultValue; + } + } + + /** + * Get the optional BigInteger value associated with an index. The + * defaultValue is returned if there is no value for the index, or if the + * value is not a number and cannot be converted to a number. + * + * @param index + * The index must be between 0 and length() - 1. + * @param defaultValue + * The default value. + * @return The value. + */ + public BigInteger optBigInteger(int index, BigInteger defaultValue) + { + try + { + return this.getBigInteger(index); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get the optional BigDecimal value associated with an index. The + * defaultValue is returned if there is no value for the index, or if the + * value is not a number and cannot be converted to a number. + * + * @param index + * The index must be between 0 and length() - 1. + * @param defaultValue + * The default value. + * @return The value. + */ + public BigDecimal optBigDecimal(int index, BigDecimal defaultValue) + { + try + { + return this.getBigDecimal(index); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get the optional JSONArray associated with an index. + * + * @param index + * subscript + * @return A JSONArray value, or null if the index has no value, or if the + * value is not a JSONArray. + */ + public JSONArray optJSONArray(int index) + { + Object o = this.opt(index); + return o instanceof JSONArray ? (JSONArray) o : null; + } + + /** + * Get the optional JSONObject associated with an index. Null is returned if + * the key is not found, or null if the index has no value, or if the value + * is not a JSONObject. + * + * @param index + * The index must be between 0 and length() - 1. + * @return A JSONObject value. + */ + public JSONObject optJSONObject(int index) + { + Object o = this.opt(index); + return o instanceof JSONObject ? (JSONObject) o : null; + } + + /** + * Get the optional long value associated with an index. Zero is returned if + * there is no value for the index, or if the value is not a number and + * cannot be converted to a number. + * + * @param index + * The index must be between 0 and length() - 1. + * @return The value. + */ + public long optLong(int index) + { + return this.optLong(index, 0); + } + + /** + * Get the optional long value associated with an index. The defaultValue is + * returned if there is no value for the index, or if the value is not a + * number and cannot be converted to a number. + * + * @param index + * The index must be between 0 and length() - 1. + * @param defaultValue + * The default value. + * @return The value. + */ + public long optLong(int index, long defaultValue) + { + try + { + return this.getLong(index); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get the optional string value associated with an index. It returns an + * empty string if there is no value at that index. If the value is not a + * string and is not null, then it is coverted to a string. + * + * @param index + * The index must be between 0 and length() - 1. + * @return A String value. + */ + public String optString(int index) + { + return this.optString(index, ""); + } + + /** + * Get the optional string associated with an index. The defaultValue is + * returned if the key is not found. + * + * @param index + * The index must be between 0 and length() - 1. + * @param defaultValue + * The default value. + * @return A String value. + */ + public String optString(int index, String defaultValue) + { + Object object = this.opt(index); + return JSONObject.NULL.equals(object) ? defaultValue : object.toString(); + } + + /** + * Append a boolean value. This increases the array's length by one. + * + * @param value + * A boolean value. + * @return this. + */ + public JSONArray put(boolean value) + { + this.put(value ? Boolean.TRUE : Boolean.FALSE); + return this; + } + + /** + * Put a value in the JSONArray, where the value will be a JSONArray which + * is produced from a Collection. + * + * @param value + * A Collection value. + * @return this. + */ + public JSONArray put(Collection value) + { + this.put(new JSONArray(value)); + return this; + } + + /** + * Append a double value. This increases the array's length by one. + * + * @param value + * A double value. + * @throws JSONException + * if the value is not finite. + * @return this. + */ + public JSONArray put(double value) throws JSONException + { + Double d = new Double(value); + JSONObject.testValidity(d); + this.put(d); + return this; + } + + /** + * Append an int value. This increases the array's length by one. + * + * @param value + * An int value. + * @return this. + */ + public JSONArray put(int value) + { + this.put(new Integer(value)); + return this; + } + + /** + * Append an long value. This increases the array's length by one. + * + * @param value + * A long value. + * @return this. + */ + public JSONArray put(long value) + { + this.put(new Long(value)); + return this; + } + + /** + * Put a value in the JSONArray, where the value will be a JSONObject which + * is produced from a Map. + * + * @param value + * A Map value. + * @return this. + */ + public JSONArray put(Map value) + { + this.put(new JSONObject(value)); + return this; + } + + /** + * Append an object value. This increases the array's length by one. + * + * @param value + * An object value. The value should be a Boolean, Double, + * Integer, JSONArray, JSONObject, Long, or String, or the + * JSONObject.NULL object. + * @return this. + */ + public JSONArray put(Object value) + { + this.myArrayList.add(value); + return this; + } + + /** + * Put or replace a boolean value in the JSONArray. If the index is greater + * than the length of the JSONArray, then null elements will be added as + * necessary to pad it out. + * + * @param index + * The subscript. + * @param value + * A boolean value. + * @return this. + * @throws JSONException + * If the index is negative. + */ + public JSONArray put(int index, boolean value) throws JSONException + { + this.put(index, value ? Boolean.TRUE : Boolean.FALSE); + return this; + } + + /** + * Put a value in the JSONArray, where the value will be a JSONArray which + * is produced from a Collection. + * + * @param index + * The subscript. + * @param value + * A Collection value. + * @return this. + * @throws JSONException + * If the index is negative or if the value is not finite. + */ + public JSONArray put(int index, Collection value) throws JSONException + { + this.put(index, new JSONArray(value)); + return this; + } + + /** + * Put or replace a double value. If the index is greater than the length of + * the JSONArray, then null elements will be added as necessary to pad it + * out. + * + * @param index + * The subscript. + * @param value + * A double value. + * @return this. + * @throws JSONException + * If the index is negative or if the value is not finite. + */ + public JSONArray put(int index, double value) throws JSONException + { + this.put(index, new Double(value)); + return this; + } + + /** + * Put or replace an int value. If the index is greater than the length of + * the JSONArray, then null elements will be added as necessary to pad it + * out. + * + * @param index + * The subscript. + * @param value + * An int value. + * @return this. + * @throws JSONException + * If the index is negative. + */ + public JSONArray put(int index, int value) throws JSONException + { + this.put(index, new Integer(value)); + return this; + } + + /** + * Put or replace a long value. If the index is greater than the length of + * the JSONArray, then null elements will be added as necessary to pad it + * out. + * + * @param index + * The subscript. + * @param value + * A long value. + * @return this. + * @throws JSONException + * If the index is negative. + */ + public JSONArray put(int index, long value) throws JSONException + { + this.put(index, new Long(value)); + return this; + } + + /** + * Put a value in the JSONArray, where the value will be a JSONObject that + * is produced from a Map. + * + * @param index + * The subscript. + * @param value + * The Map value. + * @return this. + * @throws JSONException + * If the index is negative or if the the value is an invalid + * number. + */ + public JSONArray put(int index, Map value) throws JSONException + { + this.put(index, new JSONObject(value)); + return this; + } + + /** + * Put or replace an object value in the JSONArray. If the index is greater + * than the length of the JSONArray, then null elements will be added as + * necessary to pad it out. + * + * @param index + * The subscript. + * @param value + * The value to put into the array. The value should be a + * Boolean, Double, Integer, JSONArray, JSONObject, Long, or + * String, or the JSONObject.NULL object. + * @return this. + * @throws JSONException + * If the index is negative or if the the value is an invalid + * number. + */ + public JSONArray put(int index, Object value) throws JSONException + { + JSONObject.testValidity(value); + if(index < 0) + { + throw new JSONException("JSONArray[" + index + "] not found."); + } + if(index < this.length()) + { + this.myArrayList.set(index, value); + } else + { + while(index != this.length()) + { + this.put(JSONObject.NULL); + } + this.put(value); + } + return this; + } + + /** + * Remove an index and close the hole. + * + * @param index + * The index of the element to be removed. + * @return The value that was associated with the index, or null if there + * was no value. + */ + public Object remove(int index) + { + return index >= 0 && index < this.length() ? this.myArrayList.remove(index) : null; + } + + /** + * Determine if two JSONArrays are similar. They must contain similar + * sequences. + * + * @param other + * The other JSONArray + * @return true if they are equal + */ + public boolean similar(Object other) + { + if(!(other instanceof JSONArray)) + { + return false; + } + int len = this.length(); + if(len != ((JSONArray) other).length()) + { + return false; + } + for(int i = 0; i < len; i += 1) + { + Object valueThis = this.get(i); + Object valueOther = ((JSONArray) other).get(i); + if(valueThis instanceof JSONObject) + { + if(!((JSONObject) valueThis).similar(valueOther)) + { + return false; + } + } else if(valueThis instanceof JSONArray) + { + if(!((JSONArray) valueThis).similar(valueOther)) + { + return false; + } + } else if(!valueThis.equals(valueOther)) + { + return false; + } + } + return true; + } + + /** + * Produce a JSONObject by combining a JSONArray of names with the values of + * this JSONArray. + * + * @param names + * A JSONArray containing a list of key strings. These will be + * paired with the values. + * @return A JSONObject, or null if there are no names or if this JSONArray + * has no values. + * @throws JSONException + * If any of the names are null. + */ + public JSONObject toJSONObject(JSONArray names) throws JSONException + { + if(names == null || names.length() == 0 || this.length() == 0) + { + return null; + } + JSONObject jo = new JSONObject(); + for(int i = 0; i < names.length(); i += 1) + { + jo.put(names.getString(i), this.opt(i)); + } + return jo; + } + + /** + * Make a JSON text of this JSONArray. For compactness, no unnecessary + * whitespace is added. If it is not possible to produce a syntactically + * correct JSON text then null will be returned instead. This could occur if + * the array contains an invalid number. + *

+ * Warning: This method assumes that the data structure is acyclical. + * + * @return a printable, displayable, transmittable representation of the + * array. + */ + @Override + public String toString() + { + try + { + return this.toString(0); + } catch(Exception e) + { + return null; + } + } + + /** + * Make a prettyprinted JSON text of this JSONArray. Warning: This method + * assumes that the data structure is acyclical. + * + * @param indentFactor + * The number of spaces to add to each level of indentation. + * @return a printable, displayable, transmittable representation of the + * object, beginning with [ (left + * bracket) and ending with ]   + * (right bracket). + * @throws JSONException + */ + public String toString(int indentFactor) throws JSONException + { + StringWriter sw = new StringWriter(); + synchronized(sw.getBuffer()) + { + return this.write(sw, indentFactor, 0).toString(); + } + } + + /** + * Write the contents of the JSONArray as JSON text to a writer. For + * compactness, no whitespace is added. + *

+ * Warning: This method assumes that the data structure is acyclical. + * + * @return The writer. + * @throws JSONException + */ + public Writer write(Writer writer) throws JSONException + { + return this.write(writer, 0, 0); + } + + /** + * Write the contents of the JSONArray as JSON text to a writer. For + * compactness, no whitespace is added. + *

+ * Warning: This method assumes that the data structure is acyclical. + * + * @param indentFactor + * The number of spaces to add to each level of indentation. + * @param indent + * The indention of the top level. + * @return The writer. + * @throws JSONException + */ + Writer write(Writer writer, int indentFactor, int indent) throws JSONException + { + try + { + boolean commanate = false; + int length = this.length(); + writer.write('['); + + if(length == 1) + { + JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent); + } else if(length != 0) + { + final int newindent = indent + indentFactor; + + for(int i = 0; i < length; i += 1) + { + if(commanate) + { + writer.write(','); + } + if(indentFactor > 0) + { + writer.write('\n'); + } + JSONObject.indent(writer, newindent); + JSONObject.writeValue(writer, this.myArrayList.get(i), indentFactor, newindent); + commanate = true; + } + if(indentFactor > 0) + { + writer.write('\n'); + } + JSONObject.indent(writer, indent); + } + writer.write(']'); + return writer; + } catch(IOException e) + { + throw new JSONException(e); + } + } +} diff --git a/src/main/java/com/volmit/iris/util/JSONException.java b/src/main/java/com/volmit/iris/util/JSONException.java new file mode 100644 index 000000000..4d6430452 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JSONException.java @@ -0,0 +1,50 @@ +package com.volmit.iris.util; + + +/** + * The JSONException is thrown by the JSON.org classes when things are amiss. + * + * @author JSON.org + * @version 2014-05-03 + */ +public class JSONException extends RuntimeException +{ + private static final long serialVersionUID = 0; + private Throwable cause; + + /** + * Constructs a JSONException with an explanatory message. + * + * @param message + * Detail about the reason for the exception. + */ + public JSONException(String message) + { + super(message); + } + + /** + * Constructs a new JSONException with the specified cause. + * + * @param cause + * The cause. + */ + public JSONException(Throwable cause) + { + super(cause.getMessage()); + this.cause = cause; + } + + /** + * Returns the cause of this exception or null if the cause is nonexistent + * or unknown. + * + * @return the cause of this exception or null if the cause is nonexistent + * or unknown. + */ + @Override + public Throwable getCause() + { + return this.cause; + } +} diff --git a/src/main/java/com/volmit/iris/util/JSONML.java b/src/main/java/com/volmit/iris/util/JSONML.java new file mode 100644 index 000000000..a90f38ed1 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JSONML.java @@ -0,0 +1,555 @@ +package com.volmit.iris.util; + + +/* +Copyright (c) 2008 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +import java.util.Iterator; + +/** + * This provides static methods to convert an XML text into a JSONArray or + * JSONObject, and to covert a JSONArray or JSONObject into an XML text using + * the JsonML transform. + * + * @author JSON.org + * @version 2014-05-03 + */ +public class JSONML +{ + + /** + * Parse XML values and store them in a JSONArray. + * + * @param x + * The XMLTokener containing the source string. + * @param arrayForm + * true if array form, false if object form. + * @param ja + * The JSONArray that is containing the current tag or null if we + * are at the outermost level. + * @return A JSONArray if the value is the outermost tag, otherwise null. + * @throws JSONException + */ + private static Object parse(XMLTokener x, boolean arrayForm, JSONArray ja) throws JSONException + { + String attribute; + char c; + String closeTag = null; + int i; + JSONArray newja = null; + JSONObject newjo = null; + Object token; + String tagName = null; + + // Test for and skip past these forms: + // + // + // + // + + while(true) + { + if(!x.more()) + { + throw x.syntaxError("Bad XML"); + } + token = x.nextContent(); + if(token == XML.LT) + { + token = x.nextToken(); + if(token instanceof Character) + { + if(token == XML.SLASH) + { + + // Close tag "); + } else + { + x.back(); + } + } else if(c == '[') + { + token = x.nextToken(); + if(token.equals("CDATA") && x.next() == '[') + { + if(ja != null) + { + ja.put(x.nextCDATA()); + } + } else + { + throw x.syntaxError("Expected 'CDATA['"); + } + } else + { + i = 1; + do + { + token = x.nextMeta(); + if(token == null) + { + throw x.syntaxError("Missing '>' after ' 0); + } + } else if(token == XML.QUEST) + { + + // "); + } else + { + throw x.syntaxError("Misshaped tag"); + } + + // Open tag < + + } else + { + if(!(token instanceof String)) + { + throw x.syntaxError("Bad tagName '" + token + "'."); + } + tagName = (String) token; + newja = new JSONArray(); + newjo = new JSONObject(); + if(arrayForm) + { + newja.put(tagName); + if(ja != null) + { + ja.put(newja); + } + } else + { + newjo.put("tagName", tagName); + if(ja != null) + { + ja.put(newjo); + } + } + token = null; + for(;;) + { + if(token == null) + { + token = x.nextToken(); + } + if(token == null) + { + throw x.syntaxError("Misshaped tag"); + } + if(!(token instanceof String)) + { + break; + } + + // attribute = value + + attribute = (String) token; + if(!arrayForm && ("tagName".equals(attribute) || "childNode".equals(attribute))) + { + throw x.syntaxError("Reserved attribute."); + } + token = x.nextToken(); + if(token == XML.EQ) + { + token = x.nextToken(); + if(!(token instanceof String)) + { + throw x.syntaxError("Missing value"); + } + newjo.accumulate(attribute, XML.stringToValue((String) token)); + token = null; + } else + { + newjo.accumulate(attribute, ""); + } + } + if(arrayForm && newjo.length() > 0) + { + newja.put(newjo); + } + + // Empty tag <.../> + + if(token == XML.SLASH) + { + if(x.nextToken() != XML.GT) + { + throw x.syntaxError("Misshaped tag"); + } + if(ja == null) + { + if(arrayForm) + { + return newja; + } else + { + return newjo; + } + } + + // Content, between <...> and + + } else + { + if(token != XML.GT) + { + throw x.syntaxError("Misshaped tag"); + } + closeTag = (String) parse(x, arrayForm, newja); + if(closeTag != null) + { + if(!closeTag.equals(tagName)) + { + throw x.syntaxError("Mismatched '" + tagName + "' and '" + closeTag + "'"); + } + tagName = null; + if(!arrayForm && newja.length() > 0) + { + newjo.put("childNodes", newja); + } + if(ja == null) + { + if(arrayForm) + { + return newja; + } else + { + return newjo; + } + } + } + } + } + } else + { + if(ja != null) + { + ja.put(token instanceof String ? XML.stringToValue((String) token) : token); + } + } + } + } + + /** + * Convert a well-formed (but not necessarily valid) XML string into a + * JSONArray using the JsonML transform. Each XML tag is represented as a + * JSONArray in which the first element is the tag name. If the tag has + * attributes, then the second element will be JSONObject containing the + * name/value pairs. If the tag contains children, then strings and + * JSONArrays will represent the child tags. Comments, prologs, DTDs, and + * <[ [ ]]> are ignored. + * + * @param string + * The source string. + * @return A JSONArray containing the structured data from the XML string. + * @throws JSONException + */ + public static JSONArray toJSONArray(String string) throws JSONException + { + return toJSONArray(new XMLTokener(string)); + } + + /** + * Convert a well-formed (but not necessarily valid) XML string into a + * JSONArray using the JsonML transform. Each XML tag is represented as a + * JSONArray in which the first element is the tag name. If the tag has + * attributes, then the second element will be JSONObject containing the + * name/value pairs. If the tag contains children, then strings and + * JSONArrays will represent the child content and tags. Comments, prologs, + * DTDs, and <[ [ ]]> are ignored. + * + * @param x + * An XMLTokener. + * @return A JSONArray containing the structured data from the XML string. + * @throws JSONException + */ + public static JSONArray toJSONArray(XMLTokener x) throws JSONException + { + return (JSONArray) parse(x, true, null); + } + + /** + * Convert a well-formed (but not necessarily valid) XML string into a + * JSONObject using the JsonML transform. Each XML tag is represented as a + * JSONObject with a "tagName" property. If the tag has attributes, then the + * attributes will be in the JSONObject as properties. If the tag contains + * children, the object will have a "childNodes" property which will be an + * array of strings and JsonML JSONObjects. + * + * Comments, prologs, DTDs, and <[ [ ]]> are ignored. + * + * @param x + * An XMLTokener of the XML source text. + * @return A JSONObject containing the structured data from the XML string. + * @throws JSONException + */ + public static JSONObject toJSONObject(XMLTokener x) throws JSONException + { + return (JSONObject) parse(x, false, null); + } + + /** + * Convert a well-formed (but not necessarily valid) XML string into a + * JSONObject using the JsonML transform. Each XML tag is represented as a + * JSONObject with a "tagName" property. If the tag has attributes, then the + * attributes will be in the JSONObject as properties. If the tag contains + * children, the object will have a "childNodes" property which will be an + * array of strings and JsonML JSONObjects. + * + * Comments, prologs, DTDs, and <[ [ ]]> are ignored. + * + * @param string + * The XML source text. + * @return A JSONObject containing the structured data from the XML string. + * @throws JSONException + */ + public static JSONObject toJSONObject(String string) throws JSONException + { + return toJSONObject(new XMLTokener(string)); + } + + /** + * Reverse the JSONML transformation, making an XML text from a JSONArray. + * + * @param ja + * A JSONArray. + * @return An XML string. + * @throws JSONException + */ + public static String toString(JSONArray ja) throws JSONException + { + int i; + JSONObject jo; + String key; + Iterator keys; + int length; + Object object; + StringBuilder sb = new StringBuilder(); + String tagName; + String value; + + // Emit = length) + { + sb.append('/'); + sb.append('>'); + } else + { + sb.append('>'); + do + { + object = ja.get(i); + i += 1; + if(object != null) + { + if(object instanceof String) + { + sb.append(XML.escape(object.toString())); + } else if(object instanceof JSONObject) + { + sb.append(toString((JSONObject) object)); + } else if(object instanceof JSONArray) + { + sb.append(toString((JSONArray) object)); + } else + { + sb.append(object.toString()); + } + } + } while(i < length); + sb.append('<'); + sb.append('/'); + sb.append(tagName); + sb.append('>'); + } + return sb.toString(); + } + + /** + * Reverse the JSONML transformation, making an XML text from a JSONObject. + * The JSONObject must contain a "tagName" property. If it has children, + * then it must have a "childNodes" property containing an array of objects. + * The other properties are attributes with string values. + * + * @param jo + * A JSONObject. + * @return An XML string. + * @throws JSONException + */ + public static String toString(JSONObject jo) throws JSONException + { + StringBuilder sb = new StringBuilder(); + int i; + JSONArray ja; + String key; + Iterator keys; + int length; + Object object; + String tagName; + String value; + + // Emit '); + } else + { + sb.append('>'); + length = ja.length(); + for(i = 0; i < length; i += 1) + { + object = ja.get(i); + if(object != null) + { + if(object instanceof String) + { + sb.append(XML.escape(object.toString())); + } else if(object instanceof JSONObject) + { + sb.append(toString((JSONObject) object)); + } else if(object instanceof JSONArray) + { + sb.append(toString((JSONArray) object)); + } else + { + sb.append(object.toString()); + } + } + } + sb.append('<'); + sb.append('/'); + sb.append(tagName); + sb.append('>'); + } + return sb.toString(); + } +} diff --git a/src/main/java/com/volmit/iris/util/JSONObject.java b/src/main/java/com/volmit/iris/util/JSONObject.java new file mode 100644 index 000000000..3ab4a6115 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JSONObject.java @@ -0,0 +1,2072 @@ +package com.volmit.iris.util; + + +/* + Copyright (c) 2002 JSON.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + The Software shall be used for Good, not Evil. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + */ + +import java.io.IOException; +import java.io.StringWriter; +import java.io.Writer; +import java.lang.reflect.Field; +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.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.Map; +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 + * form is a string wrapped in curly braces with colons between the names and + * values, and commas between the values and names. The internal form is an + * object having get and opt methods for accessing the + * values by name, and put methods for adding or replacing values + * by name. The values can be any of these types: Boolean, + * JSONArray, JSONObject, Number, + * String, or the JSONObject.NULL object. A JSONObject + * constructor can be used to convert an external form JSON text into an + * internal form whose values can be retrieved with the get and + * opt methods, or to convert values into a JSON text using the + * put and toString methods. A get method + * returns a value if one can be found, and throws an exception if one cannot be + * found. An opt method returns a default value instead of throwing + * an exception, and so is useful for obtaining optional values. + *

+ * The generic get() and opt() methods return an + * object, which you can cast or query for type. There are also typed + * get and opt methods that do type checking and type + * coercion for you. The opt methods differ from the get methods in that they do + * not throw. Instead, they return a specified value, such as null. + *

+ * The put methods add or replace values in an object. For example, + * + * 

+ * myString = new JSONObject().put("JSON", "Hello, World!").toString();
+ *
+ * + * produces the string {"JSON": "Hello, World"}. + *

+ * The texts produced by the toString methods strictly conform to + * the JSON syntax rules. The constructors are more forgiving in the texts they + * will accept: + *

    + *
  • An extra , (comma) may appear just + * before the closing brace.
    • + *
  • Strings may be quoted with ' (single + * quote).
    • + *
  • Strings do not need to be quoted at all if they do not begin with a quote + * or single quote, and if they do not contain leading or trailing spaces, and + * if they do not contain any of these characters: + * { } [ ] / \ : , # and if they do not look like numbers and if + * they are not the reserved words true, false, or + * null.
    • + *
+ * + * @author JSON.org + * @version 2015-07-22 + */ +public class JSONObject +{ + /** + * JSONObject.NULL is equivalent to the value that JavaScript calls null, + * whilst Java's null is equivalent to the value that JavaScript calls + * undefined. + */ + private static final class Null + { + + /** + * There is only intended to be a single instance of the NULL object, so + * the clone method returns itself. + * + * @return NULL. + */ + @Override + protected final Object clone() + { + return this; + } + + /** + * A Null object is equal to the null value and to itself. + * + * @param object + * An object to test for nullness. + * @return true if the object parameter is the JSONObject.NULL object or + * null. + */ + @Override + public boolean equals(Object object) + { + return object == null || object == this; + } + + /** + * Get the "null" string value. + * + * @return The string "null". + */ + public String toString() + { + return "null"; + } + } + + /** + * The map where the JSONObject's properties are kept. + */ + private final Map map; + + /** + * It is sometimes more convenient and less ambiguous to have a + * NULL object than to use Java's null value. + * JSONObject.NULL.equals(null) returns true. + * JSONObject.NULL.toString() returns "null". + */ + public static final Object NULL = new Null(); + + /** + * Construct an empty JSONObject. + */ + public JSONObject() + { + this.map = new HashMap(); + } + + /** + * Construct a JSONObject from a subset of another JSONObject. An array of + * strings is used to identify the keys that should be copied. Missing keys + * are ignored. + * + * @param jo + * A JSONObject. + * @param names + * An array of strings. + * @throws JSONException + * @exception JSONException + * If a value is a non-finite number or if a name is + * duplicated. + */ + public JSONObject(JSONObject jo, String[] names) + { + this(); + for(int i = 0; i < names.length; i += 1) + { + try + { + this.putOnce(names[i], jo.opt(names[i])); + } catch(Exception ignore) + { + } + } + } + + /** + * Construct a JSONObject from a JSONTokener. + * + * @param x + * A JSONTokener object containing the source string. + * @throws JSONException + * If there is a syntax error in the source string or a + * duplicated key. + */ + public JSONObject(JSONTokener x) throws JSONException + { + this(); + char c; + String key; + + if(x.nextClean() != '{') + { + throw x.syntaxError("A JSONObject text must begin with '{'"); + } + for(;;) + { + c = x.nextClean(); + switch(c) + { + case 0: + throw x.syntaxError("A JSONObject text must end with '}'"); + case '}': + return; + default: + x.back(); + key = x.nextValue().toString(); + } + + // The key is followed by ':'. + + c = x.nextClean(); + if(c != ':') + { + throw x.syntaxError("Expected a ':' after a key"); + } + this.putOnce(key, x.nextValue()); + + // Pairs are separated by ','. + + switch(x.nextClean()) + { + case ';': + case ',': + if(x.nextClean() == '}') + { + return; + } + x.back(); + break; + case '}': + return; + default: + throw x.syntaxError("Expected a ',' or '}'"); + } + } + } + + /** + * Construct a JSONObject from a Map. + * + * @param map + * A map object that can be used to initialize the contents of + * the JSONObject. + * @throws JSONException + */ + public JSONObject(Map map) + { + this.map = new HashMap(); + if(map != null) + { + Iterator> i = map.entrySet().iterator(); + while(i.hasNext()) + { + Entry entry = i.next(); + Object value = entry.getValue(); + if(value != null) + { + this.map.put(entry.getKey(), wrap(value)); + } + } + } + } + + /** + * Construct a JSONObject from an Object using bean getters. It reflects on + * all of the public methods of the object. For each of the methods with no + * parameters and a name starting with "get" or + * "is" followed by an uppercase letter, the method is invoked, + * and a key and the value returned from the getter method are put into the + * new JSONObject. + * + * The key is formed by removing the "get" or "is" + * prefix. If the second remaining character is not upper case, then the + * first character is converted to lower case. + * + * For example, if an object has a method named "getName", and + * if the result of calling object.getName() is + * "Larry Fine", then the JSONObject will contain + * "name": "Larry Fine". + * + * @param bean + * An object that has getter methods that should be used to make + * a JSONObject. + */ + public JSONObject(Object bean) + { + this(); + this.populateMap(bean); + } + + /** + * Construct a JSONObject from an Object, using reflection to find the + * public members. The resulting JSONObject's keys will be the strings from + * the names array, and the values will be the field values associated with + * those keys in the object. If a key is not found or not visible, then it + * will not be copied into the new JSONObject. + * + * @param object + * An object that has fields that should be used to make a + * JSONObject. + * @param names + * An array of strings, the names of the fields to be obtained + * from the object. + */ + public JSONObject(Object object, String names[]) + { + this(); + Class c = object.getClass(); + for(int i = 0; i < names.length; i += 1) + { + String name = names[i]; + try + { + this.putOpt(name, c.getField(name).get(object)); + } catch(Exception ignore) + { + } + } + } + + /** + * Construct a JSONObject from a source JSON text string. This is the most + * commonly used JSONObject constructor. + * + * @param source + * A string beginning with { (left + * brace) and ending with }   + * (right brace). + * @exception JSONException + * If there is a syntax error in the source string or a + * duplicated key. + */ + public JSONObject(String source) throws JSONException + { + this(new JSONTokener(source)); + } + + /** + * Construct a JSONObject from a ResourceBundle. + * + * @param baseName + * The ResourceBundle base name. + * @param locale + * The Locale to load the ResourceBundle for. + * @throws JSONException + * If any JSONExceptions are detected. + */ + public JSONObject(String baseName, Locale locale) throws JSONException + { + this(); + ResourceBundle bundle = ResourceBundle.getBundle(baseName, locale, Thread.currentThread().getContextClassLoader()); + + // Iterate through the keys in the bundle. + + Enumeration keys = bundle.getKeys(); + while(keys.hasMoreElements()) + { + Object key = keys.nextElement(); + if(key != null) + { + + // Go through the path, ensuring that there is a nested + // JSONObject for each + // segment except the last. Add the value using the last + // segment's name into + // the deepest nested JSONObject. + + String[] path = ((String) key).split("\\."); + int last = path.length - 1; + JSONObject target = this; + for(int i = 0; i < last; i += 1) + { + String segment = path[i]; + JSONObject nextTarget = target.optJSONObject(segment); + if(nextTarget == null) + { + nextTarget = new JSONObject(); + target.put(segment, nextTarget); + } + target = nextTarget; + } + target.put(path[last], bundle.getString((String) key)); + } + } + } + + /** + * Accumulate values under a key. It is similar to the put method except + * that if there is already an object stored under the key then a JSONArray + * is stored under the key to hold all of the accumulated values. If there + * is already a JSONArray, then the new value is appended to it. In + * contrast, the put method replaces the previous value. + * + * If only one value is accumulated that is not a JSONArray, then the result + * will be the same as using put. But if multiple values are accumulated, + * then the result will be like append. + * + * @param key + * A key string. + * @param value + * An object to be accumulated under the key. + * @return this. + * @throws JSONException + * If the value is an invalid number or if the key is null. + */ + public JSONObject accumulate(String key, Object value) throws JSONException + { + testValidity(value); + Object object = this.opt(key); + if(object == null) + { + this.put(key, value instanceof JSONArray ? new JSONArray().put(value) : value); + } else if(object instanceof JSONArray) + { + ((JSONArray) object).put(value); + } else + { + this.put(key, new JSONArray().put(object).put(value)); + } + return this; + } + + /** + * Append values to the array under a key. If the key does not exist in the + * JSONObject, then the key is put in the JSONObject with its value being a + * JSONArray containing the value parameter. If the key was already + * associated with a JSONArray, then the value parameter is appended to it. + * + * @param key + * A key string. + * @param value + * An object to be accumulated under the key. + * @return this. + * @throws JSONException + * If the key is null or if the current value associated with + * the key is not a JSONArray. + */ + public JSONObject append(String key, Object value) throws JSONException + { + testValidity(value); + Object object = this.opt(key); + if(object == null) + { + this.put(key, new JSONArray().put(value)); + } else if(object instanceof JSONArray) + { + this.put(key, ((JSONArray) object).put(value)); + } else + { + throw new JSONException("JSONObject[" + key + "] is not a JSONArray."); + } + return this; + } + + /** + * Produce a string from a double. The string "null" will be returned if the + * number is not finite. + * + * @param d + * A double. + * @return A String. + */ + public static String doubleToString(double d) + { + if(Double.isInfinite(d) || Double.isNaN(d)) + { + return "null"; + } + + // Shave off trailing zeros and decimal point, if possible. + + String string = Double.toString(d); + if(string.indexOf('.') > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) + { + while(string.endsWith("0")) + { + string = string.substring(0, string.length() - 1); + } + if(string.endsWith(".")) + { + string = string.substring(0, string.length() - 1); + } + } + return string; + } + + /** + * Get the value object associated with a key. + * + * @param key + * A key string. + * @return The object associated with the key. + * @throws JSONException + * if the key is not found. + */ + public Object get(String key) throws JSONException + { + if(key == null) + { + throw new JSONException("Null key."); + } + Object object = this.opt(key); + if(object == null) + { + throw new JSONException("JSONObject[" + quote(key) + "] not found."); + } + return object; + } + + /** + * Get the enum value associated with a key. + * + * @param clazz + * The type of enum to retrieve. + * @param key + * A key string. + * @return The enum value associated with the key + * @throws JSONException + * if the key is not found or if the value cannot be converted + * to an enum. + */ + public > E getEnum(Class clazz, String key) throws JSONException + { + E val = optEnum(clazz, key); + if(val == null) + { + // JSONException should really take a throwable argument. + // If it did, I would re-implement this with the Enum.valueOf + // method and place any thrown exception in the JSONException + throw new JSONException("JSONObject[" + quote(key) + "] is not an enum of type " + quote(clazz.getSimpleName()) + "."); + } + return val; + } + + /** + * Get the boolean value associated with a key. + * + * @param key + * A key string. + * @return The truth. + * @throws JSONException + * if the value is not a Boolean or the String "true" or + * "false". + */ + public boolean getBoolean(String key) throws JSONException + { + Object object = this.get(key); + if(object.equals(Boolean.FALSE) || (object instanceof String && ((String) object).equalsIgnoreCase("false"))) + { + return false; + } else if(object.equals(Boolean.TRUE) || (object instanceof String && ((String) object).equalsIgnoreCase("true"))) + { + return true; + } + throw new JSONException("JSONObject[" + quote(key) + "] is not a Boolean."); + } + + /** + * Get the BigInteger value associated with a key. + * + * @param key + * A key string. + * @return The numeric value. + * @throws JSONException + * if the key is not found or if the value cannot be converted + * to BigInteger. + */ + public BigInteger getBigInteger(String key) throws JSONException + { + Object object = this.get(key); + try + { + return new BigInteger(object.toString()); + } catch(Exception e) + { + throw new JSONException("JSONObject[" + quote(key) + "] could not be converted to BigInteger."); + } + } + + /** + * Get the BigDecimal value associated with a key. + * + * @param key + * A key string. + * @return The numeric value. + * @throws JSONException + * if the key is not found or if the value cannot be converted + * to BigDecimal. + */ + public BigDecimal getBigDecimal(String key) throws JSONException + { + Object object = this.get(key); + try + { + return new BigDecimal(object.toString()); + } catch(Exception e) + { + throw new JSONException("JSONObject[" + quote(key) + "] could not be converted to BigDecimal."); + } + } + + /** + * Get the double value associated with a key. + * + * @param key + * A key string. + * @return The numeric value. + * @throws JSONException + * if the key is not found or if the value is not a Number + * object and cannot be converted to a number. + */ + public double getDouble(String key) throws JSONException + { + Object object = this.get(key); + try + { + return object instanceof Number ? ((Number) object).doubleValue() : Double.parseDouble((String) object); + } catch(Exception e) + { + throw new JSONException("JSONObject[" + quote(key) + "] is not a number."); + } + } + + /** + * Get the int value associated with a key. + * + * @param key + * A key string. + * @return The integer value. + * @throws JSONException + * if the key is not found or if the value cannot be converted + * to an integer. + */ + public int getInt(String key) throws JSONException + { + Object object = this.get(key); + try + { + return object instanceof Number ? ((Number) object).intValue() : Integer.parseInt((String) object); + } catch(Exception e) + { + throw new JSONException("JSONObject[" + quote(key) + "] is not an int."); + } + } + + /** + * Get the JSONArray value associated with a key. + * + * @param key + * A key string. + * @return A JSONArray which is the value. + * @throws JSONException + * if the key is not found or if the value is not a JSONArray. + */ + public JSONArray getJSONArray(String key) throws JSONException + { + Object object = this.get(key); + if(object instanceof JSONArray) + { + return (JSONArray) object; + } + throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONArray."); + } + + /** + * Get the JSONObject value associated with a key. + * + * @param key + * A key string. + * @return A JSONObject which is the value. + * @throws JSONException + * if the key is not found or if the value is not a JSONObject. + */ + public JSONObject getJSONObject(String key) throws JSONException + { + Object object = this.get(key); + if(object instanceof JSONObject) + { + return (JSONObject) object; + } + throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONObject."); + } + + /** + * Get the long value associated with a key. + * + * @param key + * A key string. + * @return The long value. + * @throws JSONException + * if the key is not found or if the value cannot be converted + * to a long. + */ + public long getLong(String key) throws JSONException + { + Object object = this.get(key); + try + { + return object instanceof Number ? ((Number) object).longValue() : Long.parseLong((String) object); + } catch(Exception e) + { + throw new JSONException("JSONObject[" + quote(key) + "] is not a long."); + } + } + + /** + * Get an array of field names from a JSONObject. + * + * @return An array of field names, or null if there are no names. + */ + public static String[] getNames(JSONObject jo) + { + int length = jo.length(); + if(length == 0) + { + return null; + } + Iterator iterator = jo.keys(); + String[] names = new String[length]; + int i = 0; + while(iterator.hasNext()) + { + names[i] = iterator.next(); + i += 1; + } + return names; + } + + /** + * Get an array of field names from an Object. + * + * @return An array of field names, or null if there are no names. + */ + public static String[] getNames(Object object) + { + if(object == null) + { + return null; + } + Class klass = object.getClass(); + Field[] fields = klass.getFields(); + int length = fields.length; + if(length == 0) + { + return null; + } + String[] names = new String[length]; + for(int i = 0; i < length; i += 1) + { + names[i] = fields[i].getName(); + } + return names; + } + + /** + * Get the string associated with a key. + * + * @param key + * A key string. + * @return A string which is the value. + * @throws JSONException + * if there is no string value for the key. + */ + public String getString(String key) throws JSONException + { + Object object = this.get(key); + if(object instanceof String) + { + return (String) object; + } + throw new JSONException("JSONObject[" + quote(key) + "] not a string."); + } + + /** + * Determine if the JSONObject contains a specific key. + * + * @param key + * A key string. + * @return true if the key exists in the JSONObject. + */ + public boolean has(String key) + { + return this.map.containsKey(key); + } + + /** + * Increment a property of a JSONObject. If there is no such property, + * create one with a value of 1. If there is such a property, and if it is + * an Integer, Long, Double, or Float, then add one to it. + * + * @param key + * A key string. + * @return this. + * @throws JSONException + * If there is already a property with this name that is not an + * Integer, Long, Double, or Float. + */ + public JSONObject increment(String key) throws JSONException + { + Object value = this.opt(key); + if(value == null) + { + this.put(key, 1); + } else if(value instanceof BigInteger) + { + this.put(key, ((BigInteger) value).add(BigInteger.ONE)); + } else if(value instanceof BigDecimal) + { + this.put(key, ((BigDecimal) value).add(BigDecimal.ONE)); + } else if(value instanceof Integer) + { + this.put(key, (Integer) value + 1); + } else if(value instanceof Long) + { + this.put(key, (Long) value + 1); + } else if(value instanceof Double) + { + this.put(key, (Double) value + 1); + } else if(value instanceof Float) + { + this.put(key, (Float) value + 1); + } else + { + throw new JSONException("Unable to increment [" + quote(key) + "]."); + } + return this; + } + + /** + * Determine if the value associated with the key is null or if there is no + * value. + * + * @param key + * A key string. + * @return true if there is no value associated with the key or if the value + * is the JSONObject.NULL object. + */ + public boolean isNull(String key) + { + return JSONObject.NULL.equals(this.opt(key)); + } + + /** + * Get an enumeration of the keys of the JSONObject. + * + * @return An iterator of the keys. + */ + public Iterator keys() + { + return this.keySet().iterator(); + } + + /** + * Get a set of keys of the JSONObject. + * + * @return A keySet. + */ + public Set keySet() + { + return this.map.keySet(); + } + + /** + * Get the number of keys stored in the JSONObject. + * + * @return The number of keys in the JSONObject. + */ + public int length() + { + return this.map.size(); + } + + /** + * Produce a JSONArray containing the names of the elements of this + * JSONObject. + * + * @return A JSONArray containing the key strings, or null if the JSONObject + * is empty. + */ + public JSONArray names() + { + JSONArray ja = new JSONArray(); + Iterator keys = this.keys(); + while(keys.hasNext()) + { + ja.put(keys.next()); + } + return ja.length() == 0 ? null : ja; + } + + /** + * Produce a string from a Number. + * + * @param number + * A Number + * @return A String. + * @throws JSONException + * If n is a non-finite number. + */ + public static String numberToString(Number number) throws JSONException + { + if(number == null) + { + throw new JSONException("Null pointer"); + } + testValidity(number); + + // Shave off trailing zeros and decimal point, if possible. + + String string = number.toString(); + if(string.indexOf('.') > 0 && string.indexOf('e') < 0 && string.indexOf('E') < 0) + { + while(string.endsWith("0")) + { + string = string.substring(0, string.length() - 1); + } + if(string.endsWith(".")) + { + string = string.substring(0, string.length() - 1); + } + } + return string; + } + + /** + * Get an optional value associated with a key. + * + * @param key + * A key string. + * @return An object which is the value, or null if there is no value. + */ + public Object opt(String key) + { + return key == null ? null : this.map.get(key); + } + + /** + * Get the enum value associated with a key. + * + * @param clazz + * The type of enum to retrieve. + * @param key + * A key string. + * @return The enum value associated with the key or null if not found + */ + public > E optEnum(Class clazz, String key) + { + return this.optEnum(clazz, key, null); + } + + /** + * Get the enum value associated with a key. + * + * @param clazz + * The type of enum to retrieve. + * @param key + * A key string. + * @param defaultValue + * The default in case the value is not found + * @return The enum value associated with the key or defaultValue if the + * value is not found or cannot be assigned to clazz + */ + public > E optEnum(Class clazz, String key, E defaultValue) + { + try + { + Object val = this.opt(key); + if(NULL.equals(val)) + { + return defaultValue; + } + if(clazz.isAssignableFrom(val.getClass())) + { + // we just checked it! + @SuppressWarnings("unchecked") + E myE = (E) val; + return myE; + } + return Enum.valueOf(clazz, val.toString()); + } + + catch(IllegalArgumentException e) + { + return defaultValue; + } + + catch(NullPointerException e) + { + return defaultValue; + } + } + + /** + * Get an optional boolean associated with a key. It returns false if there + * is no such key, or if the value is not Boolean.TRUE or the String "true". + * + * @param key + * A key string. + * @return The truth. + */ + public boolean optBoolean(String key) + { + return this.optBoolean(key, false); + } + + /** + * Get an optional boolean associated with a key. It returns the + * defaultValue if there is no such key, or if it is not a Boolean or the + * String "true" or "false" (case insensitive). + * + * @param key + * A key string. + * @param defaultValue + * The default. + * @return The truth. + */ + public boolean optBoolean(String key, boolean defaultValue) + { + try + { + return this.getBoolean(key); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get an optional double associated with a key, or NaN if there is no such + * key or if its value is not a number. If the value is a string, an attempt + * will be made to evaluate it as a number. + * + * @param key + * A string which is the key. + * @return An object which is the value. + */ + public double optDouble(String key) + { + return this.optDouble(key, Double.NaN); + } + + /** + * Get an optional BigInteger associated with a key, or the defaultValue if + * there is no such key or if its value is not a number. If the value is a + * string, an attempt will be made to evaluate it as a number. + * + * @param key + * A key string. + * @param defaultValue + * The default. + * @return An object which is the value. + */ + public BigInteger optBigInteger(String key, BigInteger defaultValue) + { + try + { + return this.getBigInteger(key); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get an optional BigDecimal associated with a key, or the defaultValue if + * there is no such key or if its value is not a number. If the value is a + * string, an attempt will be made to evaluate it as a number. + * + * @param key + * A key string. + * @param defaultValue + * The default. + * @return An object which is the value. + */ + public BigDecimal optBigDecimal(String key, BigDecimal defaultValue) + { + try + { + return this.getBigDecimal(key); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get an optional double associated with a key, or the defaultValue if + * there is no such key or if its value is not a number. If the value is a + * string, an attempt will be made to evaluate it as a number. + * + * @param key + * A key string. + * @param defaultValue + * The default. + * @return An object which is the value. + */ + public double optDouble(String key, double defaultValue) + { + try + { + return this.getDouble(key); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get an optional int value associated with a key, or zero if there is no + * such key or if the value is not a number. If the value is a string, an + * attempt will be made to evaluate it as a number. + * + * @param key + * A key string. + * @return An object which is the value. + */ + public int optInt(String key) + { + return this.optInt(key, 0); + } + + /** + * Get an optional int value associated with a key, or the default if there + * is no such key or if the value is not a number. If the value is a string, + * an attempt will be made to evaluate it as a number. + * + * @param key + * A key string. + * @param defaultValue + * The default. + * @return An object which is the value. + */ + public int optInt(String key, int defaultValue) + { + try + { + return this.getInt(key); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get an optional JSONArray associated with a key. It returns null if there + * is no such key, or if its value is not a JSONArray. + * + * @param key + * A key string. + * @return A JSONArray which is the value. + */ + public JSONArray optJSONArray(String key) + { + Object o = this.opt(key); + return o instanceof JSONArray ? (JSONArray) o : null; + } + + /** + * Get an optional JSONObject associated with a key. It returns null if + * there is no such key, or if its value is not a JSONObject. + * + * @param key + * A key string. + * @return A JSONObject which is the value. + */ + public JSONObject optJSONObject(String key) + { + Object object = this.opt(key); + return object instanceof JSONObject ? (JSONObject) object : null; + } + + /** + * Get an optional long value associated with a key, or zero if there is no + * such key or if the value is not a number. If the value is a string, an + * attempt will be made to evaluate it as a number. + * + * @param key + * A key string. + * @return An object which is the value. + */ + public long optLong(String key) + { + return this.optLong(key, 0); + } + + /** + * Get an optional long value associated with a key, or the default if there + * is no such key or if the value is not a number. If the value is a string, + * an attempt will be made to evaluate it as a number. + * + * @param key + * A key string. + * @param defaultValue + * The default. + * @return An object which is the value. + */ + public long optLong(String key, long defaultValue) + { + try + { + return this.getLong(key); + } catch(Exception e) + { + return defaultValue; + } + } + + /** + * Get an optional string associated with a key. It returns an empty string + * if there is no such key. If the value is not a string and is not null, + * then it is converted to a string. + * + * @param key + * A key string. + * @return A string which is the value. + */ + public String optString(String key) + { + return this.optString(key, ""); + } + + /** + * Get an optional string associated with a key. It returns the defaultValue + * if there is no such key. + * + * @param key + * A key string. + * @param defaultValue + * The default. + * @return A string which is the value. + */ + public String optString(String key, String defaultValue) + { + Object object = this.opt(key); + return NULL.equals(object) ? defaultValue : object.toString(); + } + + private void populateMap(Object bean) + { + Class klass = bean.getClass(); + + // If klass is a System class then set includeSuperClass to false. + + boolean includeSuperClass = klass.getClassLoader() != null; + + Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods(); + for(int i = 0; i < methods.length; i += 1) + { + try + { + Method method = methods[i]; + if(Modifier.isPublic(method.getModifiers())) + { + String name = method.getName(); + String key = ""; + if(name.startsWith("get")) + { + if("getClass".equals(name) || "getDeclaringClass".equals(name)) + { + key = ""; + } else + { + key = name.substring(3); + } + } else if(name.startsWith("is")) + { + key = name.substring(2); + } + if(key.length() > 0 && Character.isUpperCase(key.charAt(0)) && method.getParameterTypes().length == 0) + { + if(key.length() == 1) + { + key = key.toLowerCase(); + } else if(!Character.isUpperCase(key.charAt(1))) + { + key = key.substring(0, 1).toLowerCase() + key.substring(1); + } + + Object result = method.invoke(bean, (Object[]) null); + if(result != null) + { + this.map.put(key, wrap(result)); + } + } + } + } catch(Exception ignore) + { + } + } + } + + /** + * Put a key/boolean pair in the JSONObject. + * + * @param key + * A key string. + * @param value + * A boolean which is the value. + * @return this. + * @throws JSONException + * If the key is null. + */ + public JSONObject put(String key, boolean value) throws JSONException + { + this.put(key, value ? Boolean.TRUE : Boolean.FALSE); + return this; + } + + /** + * Put a key/value pair in the JSONObject, where the value will be a + * JSONArray which is produced from a Collection. + * + * @param key + * A key string. + * @param value + * A Collection value. + * @return this. + * @throws JSONException + */ + public JSONObject put(String key, Collection value) throws JSONException + { + this.put(key, new JSONArray(value)); + return this; + } + + /** + * Put a key/double pair in the JSONObject. + * + * @param key + * A key string. + * @param value + * A double which is the value. + * @return this. + * @throws JSONException + * If the key is null or if the number is invalid. + */ + public JSONObject put(String key, double value) throws JSONException + { + this.put(key, new Double(value)); + return this; + } + + /** + * Put a key/int pair in the JSONObject. + * + * @param key + * A key string. + * @param value + * An int which is the value. + * @return this. + * @throws JSONException + * If the key is null. + */ + public JSONObject put(String key, int value) throws JSONException + { + this.put(key, new Integer(value)); + return this; + } + + /** + * Put a key/long pair in the JSONObject. + * + * @param key + * A key string. + * @param value + * A long which is the value. + * @return this. + * @throws JSONException + * If the key is null. + */ + public JSONObject put(String key, long value) throws JSONException + { + this.put(key, new Long(value)); + return this; + } + + /** + * Put a key/value pair in the JSONObject, where the value will be a + * JSONObject which is produced from a Map. + * + * @param key + * A key string. + * @param value + * A Map value. + * @return this. + * @throws JSONException + */ + public JSONObject put(String key, Map value) throws JSONException + { + this.put(key, new JSONObject(value)); + return this; + } + + /** + * Put a key/value pair in the JSONObject. If the value is null, then the + * key will be removed from the JSONObject if it is present. + * + * @param key + * A key string. + * @param value + * An object which is the value. It should be of one of these + * types: Boolean, Double, Integer, JSONArray, JSONObject, Long, + * String, or the JSONObject.NULL object. + * @return this. + * @throws JSONException + * If the value is non-finite number or if the key is null. + */ + public JSONObject put(String key, Object value) throws JSONException + { + if(key == null) + { + throw new NullPointerException("Null key."); + } + if(value != null) + { + testValidity(value); + this.map.put(key, value); + } else + { + this.remove(key); + } + return this; + } + + /** + * Put a key/value pair in the JSONObject, but only if the key and the value + * are both non-null, and only if there is not already a member with that + * name. + * + * @param key + * string + * @param value + * object + * @return this. + * @throws JSONException + * if the key is a duplicate + */ + public JSONObject putOnce(String key, Object value) throws JSONException + { + if(key != null && value != null) + { + if(this.opt(key) != null) + { + throw new JSONException("Duplicate key \"" + key + "\""); + } + this.put(key, value); + } + return this; + } + + /** + * Put a key/value pair in the JSONObject, but only if the key and the value + * are both non-null. + * + * @param key + * A key string. + * @param value + * An object which is the value. It should be of one of these + * types: Boolean, Double, Integer, JSONArray, JSONObject, Long, + * String, or the JSONObject.NULL object. + * @return this. + * @throws JSONException + * If the value is a non-finite number. + */ + public JSONObject putOpt(String key, Object value) throws JSONException + { + if(key != null && value != null) + { + this.put(key, value); + } + return this; + } + + /** + * Produce a string in double quotes with backslash sequences in all the + * right places. A backslash will be inserted within = '\u0080' && c < '\u00a0') || (c >= '\u2000' && c < '\u2100')) + { + w.write("\\u"); + hhhh = Integer.toHexString(c); + w.write("0000", 0, 4 - hhhh.length()); + w.write(hhhh); + } else + { + w.write(c); + } + } + } + w.write('"'); + return w; + } + + /** + * Remove a name and its value, if present. + * + * @param key + * The name to be removed. + * @return The value that was associated with the name, or null if there was + * no value. + */ + public Object remove(String key) + { + return this.map.remove(key); + } + + /** + * Determine if two JSONObjects are similar. They must contain the same set + * of names which must be associated with similar values. + * + * @param other + * The other JSONObject + * @return true if they are equal + */ + public boolean similar(Object other) + { + try + { + if(!(other instanceof JSONObject)) + { + return false; + } + Set set = this.keySet(); + if(!set.equals(((JSONObject) other).keySet())) + { + return false; + } + Iterator iterator = set.iterator(); + while(iterator.hasNext()) + { + String name = iterator.next(); + Object valueThis = this.get(name); + Object valueOther = ((JSONObject) other).get(name); + if(valueThis instanceof JSONObject) + { + if(!((JSONObject) valueThis).similar(valueOther)) + { + return false; + } + } else if(valueThis instanceof JSONArray) + { + if(!((JSONArray) valueThis).similar(valueOther)) + { + return false; + } + } else if(!valueThis.equals(valueOther)) + { + return false; + } + } + return true; + } catch(Throwable exception) + { + return false; + } + } + + /** + * Try to convert a string into a number, boolean, or null. If the string + * can't be converted, return the string. + * + * @param string + * A String. + * @return A simple JSON value. + */ + public static Object stringToValue(String string) + { + Double d; + if(string.equals("")) + { + return string; + } + if(string.equalsIgnoreCase("true")) + { + return Boolean.TRUE; + } + if(string.equalsIgnoreCase("false")) + { + return Boolean.FALSE; + } + if(string.equalsIgnoreCase("null")) + { + return JSONObject.NULL; + } + + /* + * If it might be a number, try converting it. If a number cannot be + * produced, then the value will just be a string. + */ + + char b = string.charAt(0); + if((b >= '0' && b <= '9') || b == '-') + { + try + { + if(string.indexOf('.') > -1 || string.indexOf('e') > -1 || string.indexOf('E') > -1) + { + d = Double.valueOf(string); + if(!d.isInfinite() && !d.isNaN()) + { + return d; + } + } else + { + Long myLong = new Long(string); + if(string.equals(myLong.toString())) + { + if(myLong == myLong.intValue()) + { + return myLong.intValue(); + } else + { + return myLong; + } + } + } + } catch(Exception ignore) + { + } + } + return string; + } + + /** + * Throw an exception if the object is a NaN or infinite number. + * + * @param o + * The object to test. + * @throws JSONException + * If o is a non-finite number. + */ + public static void testValidity(Object o) throws JSONException + { + if(o != null) + { + if(o instanceof Double) + { + if(((Double) o).isInfinite() || ((Double) o).isNaN()) + { + throw new JSONException("JSON does not allow non-finite numbers."); + } + } else if(o instanceof Float) + { + if(((Float) o).isInfinite() || ((Float) o).isNaN()) + { + throw new JSONException("JSON does not allow non-finite numbers."); + } + } + } + } + + /** + * Produce a JSONArray containing the values of the members of this + * JSONObject. + * + * @param names + * A JSONArray containing a list of key strings. This determines + * the sequence of the values in the result. + * @return A JSONArray of values. + * @throws JSONException + * If any of the values are non-finite numbers. + */ + public JSONArray toJSONArray(JSONArray names) throws JSONException + { + if(names == null || names.length() == 0) + { + return null; + } + JSONArray ja = new JSONArray(); + for(int i = 0; i < names.length(); i += 1) + { + ja.put(this.opt(names.getString(i))); + } + return ja; + } + + /** + * Make a JSON text of this JSONObject. For compactness, no whitespace is + * added. If this would not result in a syntactically correct JSON text, + * then null will be returned instead. + *

+ * Warning: This method assumes that the data structure is acyclical. + * + * @return a printable, displayable, portable, transmittable representation + * of the object, beginning with { (left + * brace) and ending with } (right + * brace). + */ + public String toString() + { + try + { + return this.toString(0); + } catch(Exception e) + { + return null; + } + } + + /** + * Make a prettyprinted JSON text of this JSONObject. + *

+ * Warning: This method assumes that the data structure is acyclical. + * + * @param indentFactor + * The number of spaces to add to each level of indentation. + * @return a printable, displayable, portable, transmittable representation + * of the object, beginning with { (left + * brace) and ending with } (right + * brace). + * @throws JSONException + * If the object contains an invalid number. + */ + public String toString(int indentFactor) throws JSONException + { + StringWriter w = new StringWriter(); + synchronized(w.getBuffer()) + { + return this.write(w, indentFactor, 0).toString(); + } + } + + /** + * Make a JSON text of an Object value. If the object has an + * value.toJSONString() method, then that method will be used to produce the + * JSON text. The method is required to produce a strictly conforming text. + * If the object does not contain a toJSONString method (which is the most + * common case), then a text will be produced by other means. If the value + * is an array or Collection, then a JSONArray will be made from it and its + * toJSONString method will be called. If the value is a MAP, then a + * JSONObject will be made from it and its toJSONString method will be + * called. Otherwise, the value's toString method will be called, and the + * result will be quoted. + * + *

+ * Warning: This method assumes that the data structure is acyclical. + * + * @param value + * The value to be serialized. + * @return a printable, displayable, transmittable representation of the + * object, beginning with { (left + * brace) and ending with } (right + * brace). + * @throws JSONException + * If the value is or contains an invalid number. + */ + public static String valueToString(Object value) throws JSONException + { + if(value == null || value.equals(null)) + { + return "null"; + } + if(value instanceof JSONString) + { + Object object; + try + { + object = ((JSONString) value).toJSONString(); + } catch(Exception e) + { + throw new JSONException(e); + } + if(object instanceof String) + { + return (String) object; + } + throw new JSONException("Bad value from toJSONString: " + object); + } + if(value instanceof Number) + { + return numberToString((Number) value); + } + if(value instanceof Boolean || value instanceof JSONObject || value instanceof JSONArray) + { + return value.toString(); + } + if(value instanceof Map) + { + @SuppressWarnings("unchecked") + Map map = (Map) value; + return new JSONObject(map).toString(); + } + if(value instanceof Collection) + { + @SuppressWarnings("unchecked") + Collection coll = (Collection) value; + return new JSONArray(coll).toString(); + } + if(value.getClass().isArray()) + { + return new JSONArray(value).toString(); + } + return quote(value.toString()); + } + + /** + * Wrap an object, if necessary. If the object is null, return the NULL + * object. If it is an array or collection, wrap it in a JSONArray. If it is + * a map, wrap it in a JSONObject. If it is a standard property (Double, + * String, et al) then it is already wrapped. Otherwise, if it comes from + * one of the java packages, turn it into a string. And if it doesn't, try + * to wrap it in a JSONObject. If the wrapping fails, then null is returned. + * + * @param object + * The object to wrap + * @return The wrapped value + */ + public static Object wrap(Object object) + { + try + { + if(object == null) + { + return NULL; + } + if(object instanceof JSONObject || object instanceof JSONArray || NULL.equals(object) || object instanceof JSONString || object instanceof Byte || object instanceof Character || object instanceof Short || object instanceof Integer || object instanceof Long || object instanceof Boolean || object instanceof Float || object instanceof Double || object instanceof String || object instanceof BigInteger || object instanceof BigDecimal) + { + return object; + } + + if(object instanceof Collection) + { + @SuppressWarnings("unchecked") + Collection coll = (Collection) object; + return new JSONArray(coll); + } + if(object.getClass().isArray()) + { + return new JSONArray(object); + } + if(object instanceof Map) + { + @SuppressWarnings("unchecked") + Map map = (Map) object; + return new JSONObject(map); + } + Package objectPackage = object.getClass().getPackage(); + String objectPackageName = objectPackage != null ? objectPackage.getName() : ""; + if(objectPackageName.startsWith("java.") || objectPackageName.startsWith("javax.") || object.getClass().getClassLoader() == null) + { + return object.toString(); + } + return new JSONObject(object); + } catch(Exception exception) + { + return null; + } + } + + /** + * Write the contents of the JSONObject as JSON text to a writer. For + * compactness, no whitespace is added. + *

+ * Warning: This method assumes that the data structure is acyclical. + * + * @return The writer. + * @throws JSONException + */ + public Writer write(Writer writer) throws JSONException + { + return this.write(writer, 0, 0); + } + + static final Writer writeValue(Writer writer, Object value, int indentFactor, int indent) throws JSONException, IOException + { + if(value == null || value.equals(null)) + { + writer.write("null"); + } else if(value instanceof JSONObject) + { + ((JSONObject) value).write(writer, indentFactor, indent); + } else if(value instanceof JSONArray) + { + ((JSONArray) value).write(writer, indentFactor, indent); + } else if(value instanceof Map) + { + @SuppressWarnings("unchecked") + Map map = (Map) value; + new JSONObject(map).write(writer, indentFactor, indent); + } else if(value instanceof Collection) + { + @SuppressWarnings("unchecked") + Collection coll = (Collection) value; + new JSONArray(coll).write(writer, indentFactor, indent); + } else if(value.getClass().isArray()) + { + new JSONArray(value).write(writer, indentFactor, indent); + } else if(value instanceof Number) + { + writer.write(numberToString((Number) value)); + } else if(value instanceof Boolean) + { + writer.write(value.toString()); + } else if(value instanceof JSONString) + { + Object o; + try + { + o = ((JSONString) value).toJSONString(); + } catch(Exception e) + { + throw new JSONException(e); + } + writer.write(o != null ? o.toString() : quote(value.toString())); + } else + { + quote(value.toString(), writer); + } + return writer; + } + + static final void indent(Writer writer, int indent) throws IOException + { + for(int i = 0; i < indent; i += 1) + { + writer.write(' '); + } + } + + /** + * Write the contents of the JSONObject as JSON text to a writer. For + * compactness, no whitespace is added. + *

+ * Warning: This method assumes that the data structure is acyclical. + * + * @return The writer. + * @throws JSONException + */ + Writer write(Writer writer, int indentFactor, int indent) throws JSONException + { + try + { + boolean commanate = false; + final int length = this.length(); + Iterator keys = this.keys(); + writer.write('{'); + + if(length == 1) + { + Object key = keys.next(); + writer.write(quote(key.toString())); + writer.write(':'); + if(indentFactor > 0) + { + writer.write(' '); + } + writeValue(writer, this.map.get(key), indentFactor, indent); + } else if(length != 0) + { + final int newindent = indent + indentFactor; + while(keys.hasNext()) + { + Object key = keys.next(); + if(commanate) + { + writer.write(','); + } + if(indentFactor > 0) + { + writer.write('\n'); + } + indent(writer, newindent); + writer.write(quote(key.toString())); + writer.write(':'); + if(indentFactor > 0) + { + writer.write(' '); + } + writeValue(writer, this.map.get(key), indentFactor, newindent); + commanate = true; + } + if(indentFactor > 0) + { + writer.write('\n'); + } + indent(writer, indent); + } + writer.write('}'); + return writer; + } catch(IOException exception) + { + throw new JSONException(exception); + } + } +} diff --git a/src/main/java/com/volmit/iris/util/JSONString.java b/src/main/java/com/volmit/iris/util/JSONString.java new file mode 100644 index 000000000..7fdaaf662 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JSONString.java @@ -0,0 +1,21 @@ +package com.volmit.iris.util; + + +/** + * The JSONString interface allows a toJSONString() + * method so that a class can change the behavior of + * JSONObject.toString(), JSONArray.toString(), and + * JSONWriter.value(Object). The + * toJSONString method will be used instead of the default behavior + * of using the Object's toString() method and quoting the result. + */ +public interface JSONString +{ + /** + * The toJSONString method allows a class to produce its own + * JSON serialization. + * + * @return A strictly syntactically correct JSON text. + */ + public String toJSONString(); +} diff --git a/src/main/java/com/volmit/iris/util/JSONStringer.java b/src/main/java/com/volmit/iris/util/JSONStringer.java new file mode 100644 index 000000000..4e19d6f5f --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JSONStringer.java @@ -0,0 +1,86 @@ +package com.volmit.iris.util; + + +/* +Copyright (c) 2006 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +import java.io.StringWriter; + +/** + * JSONStringer provides a quick and convenient way of producing JSON text. The + * texts produced strictly conform to JSON syntax rules. No whitespace is added, + * so the results are ready for transmission or storage. Each instance of + * JSONStringer can produce one JSON text. + *

+ * A JSONStringer instance provides a value method for appending + * values to the text, and a key method for adding keys before + * values in objects. There are array and endArray + * methods that make and bound array values, and object and + * endObject methods which make and bound object values. All of + * these methods return the JSONWriter instance, permitting cascade style. For + * example, + * + * 

+ * myString = new JSONStringer().object().key("JSON").value("Hello, World!").endObject().toString();
+ *
+ * + * which produces the string + * + * 
+ * {"JSON":"Hello, World!"}
+ *
+ *

+ * The first method called must be array or object. + * There are no methods for adding commas or colons. JSONStringer adds them for + * you. Objects and arrays can be nested up to 20 levels deep. + *

+ * This can sometimes be easier than using a JSONObject to build a string. + * + * @author JSON.org + * @version 2008-09-18 + */ +public class JSONStringer extends JSONWriter +{ + /** + * Make a fresh JSONStringer. It can be used to build one JSON text. + */ + public JSONStringer() + { + super(new StringWriter()); + } + + /** + * Return the JSON text. This method is used to obtain the product of the + * JSONStringer instance. It will return null if there was a + * problem in the construction of the JSON text (such as the calls to + * array were not properly balanced with calls to + * endArray). + * + * @return The JSON text. + */ + public String toString() + { + return this.mode == 'd' ? this.writer.toString() : null; + } +} diff --git a/src/main/java/com/volmit/iris/util/JSONTokener.java b/src/main/java/com/volmit/iris/util/JSONTokener.java new file mode 100644 index 000000000..4b09e6830 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JSONTokener.java @@ -0,0 +1,504 @@ +package com.volmit.iris.util; + + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; + +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +/** + * A JSONTokener takes a source string and extracts characters and tokens from + * it. It is used by the JSONObject and JSONArray constructors to parse JSON + * source strings. + * + * @author JSON.org + * @version 2014-05-03 + */ +public class JSONTokener +{ + + private long character; + private boolean eof; + private long index; + private long line; + private char previous; + private Reader reader; + private boolean usePrevious; + + /** + * Construct a JSONTokener from a Reader. + * + * @param reader + * A reader. + */ + public JSONTokener(Reader reader) + { + this.reader = reader.markSupported() ? reader : new BufferedReader(reader); + this.eof = false; + this.usePrevious = false; + this.previous = 0; + this.index = 0; + this.character = 1; + this.line = 1; + } + + /** + * Construct a JSONTokener from an InputStream. + * + * @param inputStream + * The source. + */ + public JSONTokener(InputStream inputStream) throws JSONException + { + this(new InputStreamReader(inputStream)); + } + + /** + * Construct a JSONTokener from a string. + * + * @param s + * A source string. + */ + public JSONTokener(String s) + { + this(new StringReader(s)); + } + + /** + * Back up one character. This provides a sort of lookahead capability, so + * that you can test for a digit or letter before attempting to parse the + * next number or identifier. + */ + public void back() throws JSONException + { + if(this.usePrevious || this.index <= 0) + { + throw new JSONException("Stepping back two steps is not supported"); + } + this.index -= 1; + this.character -= 1; + this.usePrevious = true; + this.eof = false; + } + + /** + * Get the hex value of a character (base16). + * + * @param c + * A character between '0' and '9' or between 'A' and 'F' or + * between 'a' and 'f'. + * @return An int between 0 and 15, or -1 if c was not a hex digit. + */ + public static int dehexchar(char c) + { + if(c >= '0' && c <= '9') + { + return c - '0'; + } + if(c >= 'A' && c <= 'F') + { + return c - ('A' - 10); + } + if(c >= 'a' && c <= 'f') + { + return c - ('a' - 10); + } + return -1; + } + + public boolean end() + { + return this.eof && !this.usePrevious; + } + + /** + * Determine if the source string still contains characters that next() can + * consume. + * + * @return true if not yet at the end of the source. + */ + public boolean more() throws JSONException + { + this.next(); + if(this.end()) + { + return false; + } + this.back(); + return true; + } + + /** + * Get the next character in the source string. + * + * @return The next character, or 0 if past the end of the source string. + */ + public char next() throws JSONException + { + int c; + if(this.usePrevious) + { + this.usePrevious = false; + c = this.previous; + } else + { + try + { + c = this.reader.read(); + } catch(IOException exception) + { + throw new JSONException(exception); + } + + if(c <= 0) + { // End of stream + this.eof = true; + c = 0; + } + } + this.index += 1; + if(this.previous == '\r') + { + this.line += 1; + this.character = c == '\n' ? 0 : 1; + } else if(c == '\n') + { + this.line += 1; + this.character = 0; + } else + { + this.character += 1; + } + this.previous = (char) c; + return this.previous; + } + + /** + * Consume the next character, and check that it matches a specified + * character. + * + * @param c + * The character to match. + * @return The character. + * @throws JSONException + * if the character does not match. + */ + public char next(char c) throws JSONException + { + char n = this.next(); + if(n != c) + { + throw this.syntaxError("Expected '" + c + "' and instead saw '" + n + "'"); + } + return n; + } + + /** + * Get the next n characters. + * + * @param n + * The number of characters to take. + * @return A string of n characters. + * @throws JSONException + * Substring bounds error if there are not n characters + * remaining in the source string. + */ + public String next(int n) throws JSONException + { + if(n == 0) + { + return ""; + } + + char[] chars = new char[n]; + int pos = 0; + + while(pos < n) + { + chars[pos] = this.next(); + if(this.end()) + { + throw this.syntaxError("Substring bounds error"); + } + pos += 1; + } + return new String(chars); + } + + /** + * Get the next char in the string, skipping whitespace. + * + * @throws JSONException + * @return A character, or 0 if there are no more characters. + */ + public char nextClean() throws JSONException + { + for(;;) + { + char c = this.next(); + if(c == 0 || c > ' ') + { + return c; + } + } + } + + /** + * Return the characters up to the next close quote character. Backslash + * processing is done. The formal JSON format does not allow strings in + * single quotes, but an implementation is allowed to accept them. + * + * @param quote + * The quoting character, either "  + * (double quote) or '  + * (single quote). + * @return A String. + * @throws JSONException + * Unterminated string. + */ + public String nextString(char quote) throws JSONException + { + char c; + StringBuilder sb = new StringBuilder(); + for(;;) + { + c = this.next(); + switch(c) + { + case 0: + case '\n': + case '\r': + throw this.syntaxError("Unterminated string"); + case '\\': + c = this.next(); + switch(c) + { + case 'b': + sb.append('\b'); + break; + case 't': + sb.append('\t'); + break; + case 'n': + sb.append('\n'); + break; + case 'f': + sb.append('\f'); + break; + case 'r': + sb.append('\r'); + break; + case 'u': + sb.append((char) Integer.parseInt(this.next(4), 16)); + break; + case '"': + case '\'': + case '\\': + case '/': + sb.append(c); + break; + default: + throw this.syntaxError("Illegal escape."); + } + break; + default: + if(c == quote) + { + return sb.toString(); + } + sb.append(c); + } + } + } + + /** + * Get the text up but not including the specified character or the end of + * line, whichever comes first. + * + * @param delimiter + * A delimiter character. + * @return A string. + */ + public String nextTo(char delimiter) throws JSONException + { + StringBuilder sb = new StringBuilder(); + for(;;) + { + char c = this.next(); + if(c == delimiter || c == 0 || c == '\n' || c == '\r') + { + if(c != 0) + { + this.back(); + } + return sb.toString().trim(); + } + sb.append(c); + } + } + + /** + * Get the text up but not including one of the specified delimiter + * characters or the end of line, whichever comes first. + * + * @param delimiters + * A set of delimiter characters. + * @return A string, trimmed. + */ + public String nextTo(String delimiters) throws JSONException + { + char c; + StringBuilder sb = new StringBuilder(); + for(;;) + { + c = this.next(); + if(delimiters.indexOf(c) >= 0 || c == 0 || c == '\n' || c == '\r') + { + if(c != 0) + { + this.back(); + } + return sb.toString().trim(); + } + sb.append(c); + } + } + + /** + * Get the next value. The value can be a Boolean, Double, Integer, + * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object. + * + * @throws JSONException + * If syntax error. + * + * @return An object. + */ + public Object nextValue() throws JSONException + { + char c = this.nextClean(); + String string; + + switch(c) + { + case '"': + case '\'': + return this.nextString(c); + case '{': + this.back(); + return new JSONObject(this); + case '[': + this.back(); + return new JSONArray(this); + } + + /* + * Handle unquoted text. This could be the values true, false, or null, + * or it can be a number. An implementation (such as this one) is + * allowed to also accept non-standard forms. + * + * Accumulate characters until we reach the end of the text or a + * formatting character. + */ + + StringBuilder sb = new StringBuilder(); + while(c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) + { + sb.append(c); + c = this.next(); + } + this.back(); + + string = sb.toString().trim(); + if("".equals(string)) + { + throw this.syntaxError("Missing value"); + } + return JSONObject.stringToValue(string); + } + + /** + * Skip characters until the next character is the requested character. If + * the requested character is not found, no characters are skipped. + * + * @param to + * A character to skip to. + * @return The requested character, or zero if the requested character is + * not found. + */ + public char skipTo(char to) throws JSONException + { + char c; + try + { + long startIndex = this.index; + long startCharacter = this.character; + long startLine = this.line; + this.reader.mark(1000000); + do + { + c = this.next(); + if(c == 0) + { + this.reader.reset(); + this.index = startIndex; + this.character = startCharacter; + this.line = startLine; + return c; + } + } while(c != to); + } catch(IOException exception) + { + throw new JSONException(exception); + } + this.back(); + return c; + } + + /** + * Make a JSONException to signal a syntax error. + * + * @param message + * The error message. + * @return A JSONException object, suitable for throwing + */ + public JSONException syntaxError(String message) + { + return new JSONException(message + this.toString()); + } + + /** + * Make a printable string of this JSONTokener. + * + * @return " at {index} [character {character} line {line}]" + */ + public String toString() + { + return " at " + this.index + " [character " + this.character + " line " + this.line + "]"; + } +} diff --git a/src/main/java/com/volmit/iris/util/JSONWriter.java b/src/main/java/com/volmit/iris/util/JSONWriter.java new file mode 100644 index 000000000..2b662635b --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JSONWriter.java @@ -0,0 +1,388 @@ +package com.volmit.iris.util; + + +import java.io.IOException; +import java.io.Writer; + +/* +Copyright (c) 2006 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +/** + * JSONWriter provides a quick and convenient way of producing JSON text. The + * texts produced strictly conform to JSON syntax rules. No whitespace is added, + * so the results are ready for transmission or storage. Each instance of + * JSONWriter can produce one JSON text. + *

+ * A JSONWriter instance provides a value method for appending + * values to the text, and a key method for adding keys before + * values in objects. There are array and endArray + * methods that make and bound array values, and object and + * endObject methods which make and bound object values. All of + * these methods return the JSONWriter instance, permitting a cascade style. For + * example, + * + * 

+ * new JSONWriter(myWriter).object().key("JSON").value("Hello, World!").endObject();
+ *
+ * + * which writes + * + * 
+ * {"JSON":"Hello, World!"}
+ *
+ *

+ * The first method called must be array or object. + * There are no methods for adding commas or colons. JSONWriter adds them for + * you. Objects and arrays can be nested up to 20 levels deep. + *

+ * This can sometimes be easier than using a JSONObject to build a string. + * + * @author JSON.org + * @version 2011-11-24 + */ +public class JSONWriter +{ + private static final int maxdepth = 200; + + /** + * The comma flag determines if a comma should be output before the next + * value. + */ + private boolean comma; + + /** + * The current mode. Values: 'a' (array), 'd' (done), 'i' (initial), 'k' + * (key), 'o' (object). + */ + protected char mode; + + /** + * The object/array stack. + */ + private final JSONObject stack[]; + + /** + * The stack top index. A value of 0 indicates that the stack is empty. + */ + private int top; + + /** + * The writer that will receive the output. + */ + protected Writer writer; + + /** + * Make a fresh JSONWriter. It can be used to build one JSON text. + */ + public JSONWriter(Writer w) + { + this.comma = false; + this.mode = 'i'; + this.stack = new JSONObject[maxdepth]; + this.top = 0; + this.writer = w; + } + + /** + * Append a value. + * + * @param string + * A string value. + * @return this + * @throws JSONException + * If the value is out of sequence. + */ + private JSONWriter append(String string) throws JSONException + { + if(string == null) + { + throw new JSONException("Null pointer"); + } + if(this.mode == 'o' || this.mode == 'a') + { + try + { + if(this.comma && this.mode == 'a') + { + this.writer.write(','); + } + this.writer.write(string); + } catch(IOException e) + { + throw new JSONException(e); + } + if(this.mode == 'o') + { + this.mode = 'k'; + } + this.comma = true; + return this; + } + throw new JSONException("Value out of sequence."); + } + + /** + * Begin appending a new array. All values until the balancing + * endArray will be appended to this array. The + * endArray method must be called to mark the array's end. + * + * @return this + * @throws JSONException + * If the nesting is too deep, or if the object is started in + * the wrong place (for example as a key or after the end of the + * outermost array or object). + */ + public JSONWriter array() throws JSONException + { + if(this.mode == 'i' || this.mode == 'o' || this.mode == 'a') + { + this.push(null); + this.append("["); + this.comma = false; + return this; + } + throw new JSONException("Misplaced array."); + } + + /** + * End something. + * + * @param mode + * Mode + * @param c + * Closing character + * @return this + * @throws JSONException + * If unbalanced. + */ + private JSONWriter end(char mode, char c) throws JSONException + { + if(this.mode != mode) + { + throw new JSONException(mode == 'a' ? "Misplaced endArray." : "Misplaced endObject."); + } + this.pop(mode); + try + { + this.writer.write(c); + } catch(IOException e) + { + throw new JSONException(e); + } + this.comma = true; + return this; + } + + /** + * End an array. This method most be called to balance calls to + * array. + * + * @return this + * @throws JSONException + * If incorrectly nested. + */ + public JSONWriter endArray() throws JSONException + { + return this.end('a', ']'); + } + + /** + * End an object. This method most be called to balance calls to + * object. + * + * @return this + * @throws JSONException + * If incorrectly nested. + */ + public JSONWriter endObject() throws JSONException + { + return this.end('k', '}'); + } + + /** + * Append a key. The key will be associated with the next value. In an + * object, every value must be preceded by a key. + * + * @param string + * A key string. + * @return this + * @throws JSONException + * If the key is out of place. For example, keys do not belong + * in arrays or if the key is null. + */ + public JSONWriter key(String string) throws JSONException + { + if(string == null) + { + throw new JSONException("Null key."); + } + if(this.mode == 'k') + { + try + { + this.stack[this.top - 1].putOnce(string, Boolean.TRUE); + if(this.comma) + { + this.writer.write(','); + } + this.writer.write(JSONObject.quote(string)); + this.writer.write(':'); + this.comma = false; + this.mode = 'o'; + return this; + } catch(IOException e) + { + throw new JSONException(e); + } + } + throw new JSONException("Misplaced key."); + } + + /** + * Begin appending a new object. All keys and values until the balancing + * endObject will be appended to this object. The + * endObject method must be called to mark the object's end. + * + * @return this + * @throws JSONException + * If the nesting is too deep, or if the object is started in + * the wrong place (for example as a key or after the end of the + * outermost array or object). + */ + public JSONWriter object() throws JSONException + { + if(this.mode == 'i') + { + this.mode = 'o'; + } + if(this.mode == 'o' || this.mode == 'a') + { + this.append("{"); + this.push(new JSONObject()); + this.comma = false; + return this; + } + throw new JSONException("Misplaced object."); + + } + + /** + * Pop an array or object scope. + * + * @param c + * The scope to close. + * @throws JSONException + * If nesting is wrong. + */ + private void pop(char c) throws JSONException + { + if(this.top <= 0) + { + throw new JSONException("Nesting error."); + } + char m = this.stack[this.top - 1] == null ? 'a' : 'k'; + if(m != c) + { + throw new JSONException("Nesting error."); + } + this.top -= 1; + this.mode = this.top == 0 ? 'd' : this.stack[this.top - 1] == null ? 'a' : 'k'; + } + + /** + * Push an array or object scope. + * + * @param jo + * The scope to open. + * @throws JSONException + * If nesting is too deep. + */ + private void push(JSONObject jo) throws JSONException + { + if(this.top >= maxdepth) + { + throw new JSONException("Nesting too deep."); + } + this.stack[this.top] = jo; + this.mode = jo == null ? 'a' : 'k'; + this.top += 1; + } + + /** + * Append either the value true or the value false + * . + * + * @param b + * A boolean. + * @return this + * @throws JSONException + */ + public JSONWriter value(boolean b) throws JSONException + { + return this.append(b ? "true" : "false"); + } + + /** + * Append a double value. + * + * @param d + * A double. + * @return this + * @throws JSONException + * If the number is not finite. + */ + public JSONWriter value(double d) throws JSONException + { + return this.value(new Double(d)); + } + + /** + * Append a long value. + * + * @param l + * A long. + * @return this + * @throws JSONException + */ + public JSONWriter value(long l) throws JSONException + { + return this.append(Long.toString(l)); + } + + /** + * Append an object value. + * + * @param object + * The object to append. It can be null, or a Boolean, Number, + * String, JSONObject, or JSONArray, or an object that implements + * JSONString. + * @return this + * @throws JSONException + * If the value is out of sequence. + */ + public JSONWriter value(Object object) throws JSONException + { + return this.append(JSONObject.valueToString(object)); + } +} diff --git a/src/main/java/com/volmit/iris/util/JarScanner.java b/src/main/java/com/volmit/iris/util/JarScanner.java new file mode 100644 index 000000000..cb53f513f --- /dev/null +++ b/src/main/java/com/volmit/iris/util/JarScanner.java @@ -0,0 +1,89 @@ +package com.volmit.iris.util; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +public class JarScanner +{ + private final KSet> classes; + private final File jar; + private final String superPackage; + + /** + * Create a scanner + * + * @param jar + * the path to the jar + */ + public JarScanner(File jar, String superPackage) + { + this.jar = jar; + this.classes = new KSet>(); + this.superPackage = superPackage; + } + + /** + * Scan the jar + * + * @throws IOException + * bad things happen + */ + public void scan() throws IOException + { + classes.clear(); + FileInputStream fin = new FileInputStream(jar); + ZipInputStream zip = new ZipInputStream(fin); + + for(ZipEntry entry = zip.getNextEntry(); entry != null; entry = zip.getNextEntry()) + { + if(!entry.isDirectory() && entry.getName().endsWith(".class")) + { + if(entry.getName().contains("$")) + { + continue; + } + + String c = entry.getName().replaceAll("/", ".").replace(".class", ""); + + if(c.startsWith(superPackage)) + { + try + { + Class clazz = Class.forName(c); + classes.add(clazz); + } + + catch(ClassNotFoundException e) + { + e.printStackTrace(); + } + } + } + } + + zip.close(); + } + + /** + * Get the scanned clases + * + * @return a gset of classes + */ + public KSet> getClasses() + { + return classes; + } + + /** + * Get the file object for the jar + * + * @return a file object representing the jar + */ + public File getJar() + { + return jar; + } +} \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/util/KList.java b/src/main/java/com/volmit/iris/util/KList.java new file mode 100644 index 000000000..c1029c7ac --- /dev/null +++ b/src/main/java/com/volmit/iris/util/KList.java @@ -0,0 +1,666 @@ +package com.volmit.iris.util; + +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.function.Function; + +public class KList extends ArrayList implements List +{ + private static final long serialVersionUID = -2892550695744823337L; + + @SafeVarargs + public KList(T... ts) + { + super(); + add(ts); + } + + public KList() + { + super(); + } + + public KList(Collection values) + { + super(); + add(values); + } + + public KList(Enumeration e) + { + super(); + add(e); + } + + /** + * Remove the last element + */ + public KList removeLast() + { + remove(last()); + + return this; + } + + private KList add(Enumeration e) + { + while(e.hasMoreElements()) + { + add(e.nextElement()); + } + + return this; + } + + public KList add(Collection values) + { + addAll(values); + return this; + } + + /** + * Create a Map out of this list where this list becomes the values of the + * returned map. You must specify each key for each value in this list. In the + * function, returning null will not add the keyval pair. + * + * @param + * the inferred key type + * @param f + * the function + * @return the new map + */ + public KMap asValues(Function f) + { + KMap m = new KMap(); + forEach((i) -> m.putNonNull(f.apply(i), i)); + return m; + } + + /** + * Create a Map out of this list where this list becomes the keys of the + * returned map. You must specify each value for each key in this list. In the + * function, returning null will not add the keyval pair. + * + * @param + * the inferred value type + * @param f + * the function + * @return the new map + */ + public KMap asKeys(Function f) + { + KMap m = new KMap(); + forEach((i) -> m.putNonNull(i, f.apply(i))); + return m; + } + + /** + * Cut this list into targetCount sublists + * + * @param targetCount + * the target count of sublists + * @return the list of sublists + */ + public KList> divide(int targetCount) + { + return split(size() / targetCount); + } + + /** + * Split this list into a list of sublists with roughly targetSize elements of T + * per sublist + * + * @param targetSize + * the target size + * @return the list of sublists + */ + public KList> split(int targetSize) + { + targetSize = targetSize < 1 ? 1 : targetSize; + KList> gg = new KList<>(); + KList b = new KList<>(); + + for(T i : this) + { + if(b.size() >= targetSize) + { + gg.add(b.copy()); + b.clear(); + } + + b.add(i); + } + + if(!b.isEmpty()) + { + gg.add(b); + } + + return gg; + } + + /** + * Rewrite this list by checking each value and changing the value (or not). + * Return null to remove the element in the function + * + * @param t + * the function + * @return the same list (not a copy) + */ + public KList rewrite(Function t) + { + KList m = copy(); + clear(); + + for(T i : m) + { + addNonNull(t.apply(i)); + } + + return this; + } + + /** + * To array + * + * @return the array + */ + @SuppressWarnings("unchecked") + public T[] array() + { + return (T[]) toArray(); + } + + /** + * Return a copy of this list + * + * @return the copy + */ + public KList copy() + { + return new KList().add(this); + } + + /** + * Shuffle the list + * + * @return the same list + */ + public KList shuffle() + { + Collections.shuffle(this); + return this; + } + + /** + * Sort the list (based on toString comparison) + * + * @return the same list + */ + public KList sort() + { + Collections.sort(this, (a, b) -> a.toString().compareTo(b.toString())); + return this; + } + + /** + * Reverse this list + * + * @return the same list + */ + public KList reverse() + { + Collections.reverse(this); + return this; + } + + @Override + public String toString() + { + return "[" + toString(", ") + "]"; + } + + /** + * Tostring with a seperator for each item in the list + * + * @param split + * the seperator + * @return the string representing this object + */ + public String toString(String split) + { + if(isEmpty()) + { + return ""; + } + + if(size() == 1) + { + return get(0).toString(); + } + + StringBuilder b = new StringBuilder(); + + for(String i : toStringList()) + { + b.append(split + i); + } + + return b.toString().substring(split.length()); + } + + /** + * Invoke tostring on each value in the list into a string list + * + * @return the string list + */ + public KList toStringList() + { + return convert((t) -> t.toString()); + } + + /** + * Add the contents of the given list (v) into this list using a converter + * + * @param + * the type of the forign list + * @param v + * the forign (given) list + * @param converter + * the converter that converts the forign type into this list type + * @return this list (builder) + */ + public KList addFrom(List v, Function converter) + { + v.forEach((g) -> add(converter.apply(g))); + return this; + } + + /** + * Convert this list into another list type. Such as GList to + * GList. list.convert((i) -> "" + i); + * + * @param + * @param converter + * @return + */ + public KList convert(Function converter) + { + KList v = new KList(); + forEach((t) -> v.addNonNull(converter.apply(t))); + return v; + } + + /** + * Adds T to the list, ignores if null + * + * @param t + * the value to add + * @return the same list + */ + public KList addNonNull(T t) + { + if(t != null) + { + super.add(t); + } + + return this; + } + + /** + * Swaps the values of index a and b. For example "hello", "world", "!" swap(1, + * 2) would change the list to "hello", "!", "world" + * + * @param a + * the first index + * @param b + * the second index + * @return the same list (builder), not a copy + */ + public KList swapIndexes(int a, int b) + { + T aa = remove(a); + T bb = get(b); + add(a, bb); + remove(b); + add(b, aa); + + return this; + } + + /** + * Remove a number of elements from the list + * + * @param t + * the elements + * @return this list + */ + @SuppressWarnings("unchecked") + public KList remove(T... t) + { + for(T i : t) + { + super.remove(i); + } + + return this; + } + + /** + * Add another glist's contents to this one (addall builder) + * + * @param t + * the list + * @return the same list + */ + public KList add(KList t) + { + super.addAll(t); + return this; + } + + /** + * Add a number of values to this list + * + * @param t + * the list + * @return this list + */ + @SuppressWarnings("unchecked") + public KList add(T... t) + { + for(T i : t) + { + super.add(i); + } + + return this; + } + + /** + * Check if this list has an index at the given index + * + * @param index + * the given index + * @return true if size > index + */ + public boolean hasIndex(int index) + { + return size() > index && index >= 0; + } + + /** + * Get the last index of this list (size - 1) + * + * @return the last index of this list + */ + public int last() + { + return size() - 1; + } + + /** + * Deduplicate this list by converting to linked hash set and back + * + * @return the deduplicated list + */ + public KList dedupe() + { + LinkedHashSet lhs = new LinkedHashSet(this); + return qclear().add(lhs); + } + + /** + * Clear this list (and return it) + * + * @return the same list + */ + public KList qclear() + { + super.clear(); + return this; + } + + /** + * Simply !isEmpty() + * + * @return true if this list has 1 or more element(s) + */ + public boolean hasElements() + { + return !isEmpty(); + } + + /** + * Simply !isEmpty() + * + * @return true if this list has 1 or more element(s) + */ + public boolean isNotEmpty() + { + return !isEmpty(); + } + + /** + * Pop the first item off this list and return it + * + * @return the popped off item or null if the list is empty + */ + public T pop() + { + if(isEmpty()) + { + return null; + } + + return remove(0); + } + + /** + * Pop the last item off this list and return it + * + * @return the popped off item or null if the list is empty + */ + public T popLast() + { + if(isEmpty()) + { + return null; + } + + return remove(last()); + } + + public T popRandom() + { + if(isEmpty()) + { + return null; + } + + if(size() == 1) + { + return pop(); + } + + return remove(M.irand(0, last())); + } + + public static KList fromJSONAny(JSONArray oo) + { + KList s = new KList(); + + for(int i = 0; i < oo.length(); i++) + { + s.add(oo.get(i).toString()); + } + + return s; + } + + public KList sub(int f, int t) + { + KList g = new KList<>(); + + for(int i = f; i < M.min(size(), t); i++) + { + g.add(get(i)); + } + + return g; + } + + public JSONArray toJSONStringArray() + { + JSONArray j = new JSONArray(); + + for(Object i : this) + { + j.put(i.toString()); + } + + return j; + } + + public static KList asStringList(List oo) + { + KList s = new KList(); + + for(Object i : oo) + { + s.add(i.toString()); + } + + return s; + } + + @SuppressWarnings("unchecked") + public KList forceAdd(Object[] values) + { + for(Object i : values) + { + add((T) i); + } + + return this; + } + + @SuppressWarnings("unchecked") + public KList forceAdd(int[] values) + { + for(Object i : values) + { + add((T) i); + } + + return this; + } + + @SuppressWarnings("unchecked") + public KList forceAdd(double[] values) + { + for(Object i : values) + { + add((T) i); + } + + return this; + } + + @SuppressWarnings("unchecked") + public KList forceAdd(float[] values) + { + for(Object i : values) + { + add((T) i); + } + + return this; + } + + @SuppressWarnings("unchecked") + public KList forceAdd(byte[] values) + { + for(Object i : values) + { + add((T) i); + } + + return this; + } + + @SuppressWarnings("unchecked") + public KList forceAdd(short[] values) + { + for(Object i : values) + { + add((T) i); + } + + return this; + } + + @SuppressWarnings("unchecked") + public KList forceAdd(long[] values) + { + for(Object i : values) + { + add((T) i); + } + + return this; + } + + @SuppressWarnings("unchecked") + public KList forceAdd(boolean[] values) + { + for(Object i : values) + { + add((T) i); + } + + return this; + } + + public T middleValue() + { + return get(middleIndex()); + } + + private int middleIndex() + { + return size() % 2 == 0 ? (size() / 2) : ((size() / 2) + 1); + } + + public T getRandom() + { + if(isEmpty()) + { + return null; + } + + if(size() == 1) + { + return get(0); + } + + return get(M.irand(0, last())); + } + + public KList qdel(T t) + { + remove(t); + return this; + } + + public KList qadd(T t) + { + add(t); + return this; + } +} diff --git a/src/main/java/com/volmit/iris/util/KMap.java b/src/main/java/com/volmit/iris/util/KMap.java new file mode 100644 index 000000000..9a855da2b --- /dev/null +++ b/src/main/java/com/volmit/iris/util/KMap.java @@ -0,0 +1,424 @@ +package com.volmit.iris.util; + +import java.util.Collections; +import java.util.Comparator; +import java.util.Enumeration; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +public class KMap extends ConcurrentHashMap +{ + private static final long serialVersionUID = 7288942695300448163L; + + public KMap() + { + super(); + } + + public KMap(KMap gMap) + { + this(); + put(gMap); + } + + /** + * Puts a value into a map-value-list based on the key such that if GMap> where V is GList + * + * @param + * the list type in the value type + * @param k + * the key to look for + * @param vs + * the values to put into the list of the given key + * @return the same list (builder) + */ + @SuppressWarnings("unchecked") + public KMap putValueList(K k, S... vs) + { + try + { + KMap> s = (KMap>) this; + + if(!s.containsKey(k)) + { + s.put(k, new KList()); + } + + s.get(k).add(vs); + } + + catch(Throwable e) + { + + } + + return this; + } + + /** + * Returns a sorted list of keys from this map, based on the sorting order of + * the values. + * + * @return the value-sorted key list + */ + public KList sortK() + { + KList k = new KList(); + KList v = v(); + + Collections.sort(v, new Comparator() + { + @Override + public int compare(V v, V t1) + { + return v.toString().compareTo(t1.toString()); + } + }); + + for(V i : v) + { + for(K j : k()) + { + if(get(j).equals(i)) + { + k.add(j); + } + } + } + + k.dedupe(); + return k; + } + + /** + * Returns a sorted list of keys from this map, based on the sorting order of + * the values. Sorting is based on numerical values + * + * @return the value-sorted key list + */ + public KList sortKNumber() + { + KList k = new KList(); + KList v = v(); + + Collections.sort(v, new Comparator() + { + @Override + public int compare(V v, V t1) + { + Number n1 = (Number) v; + Number n2 = (Number) t1; + + return (int) ((n1.doubleValue() - n2.doubleValue()) * 1000); + } + }); + + for(V i : v) + { + for(K j : k()) + { + if(get(j).equals(i)) + { + k.add(j); + } + } + } + + k.dedupe(); + return k; + } + + /** + * Put another map's values into this map + * + * @param m + * the map to insert + * @return this map (builder) + */ + public KMap put(Map m) + { + putAll(m); + return this; + } + + /** + * Return a copy of this map + * + * @return the copied map + */ + public KMap copy() + { + return new KMap(this); + } + + /** + * Loop through each keyvalue set (copy of it) with the map parameter + * + * @param f + * the function + * @return the same gmap + */ + public KMap rewrite(Consumer3> f) + { + KMap m = copy(); + + for(K i : m.k()) + { + f.accept(i, get(i), this); + } + + return this; + } + + /** + * Loop through each keyvalue set (copy of it) + * + * @param f + * the function + * @return the same gmap + */ + public KMap each(Consumer2 f) + { + for(K i : k()) + { + f.accept(i, get(i)); + } + + return this; + } + + /** + * Flip the hashmap and flatten the value list even if there are multiple keys + * + * @return the flipped and flattened hashmap + */ + public KMap flipFlatten() + { + KMap> f = flip(); + KMap m = new KMap<>(); + + for(V i : f.k()) + { + m.putNonNull(i, m.isEmpty() ? null : m.get(0)); + } + + return m; + } + + /** + * Flip the hashmap so keys are now list-keys in the value position + * + * @return the flipped hashmap + */ + public KMap> flip() + { + KMap> flipped = new KMap>(); + + for(K i : keySet()) + { + if(i == null) + { + continue; + } + + if(!flipped.containsKey(get(i))) + { + flipped.put(get(i), new KList()); + } + + flipped.get(get(i)).add(i); + } + + return flipped; + } + + /** + * Sort values based on the keys sorting order + * + * @return the values (sorted) + */ + public KList sortV() + { + KList v = new KList(); + KList k = k(); + + Collections.sort(k, new Comparator() + { + @Override + public int compare(K v, K t1) + { + return v.toString().compareTo(t1.toString()); + } + }); + + for(K i : k) + { + for(V j : v()) + { + if(get(i).equals(j)) + { + v.add(j); + } + } + } + + v.dedupe(); + return v; + } + + public KList sortVNoDedupe() + { + KList v = new KList(); + KList k = k(); + + Collections.sort(k, new Comparator() + { + @Override + public int compare(K v, K t1) + { + return v.toString().compareTo(t1.toString()); + } + }); + + for(K i : k) + { + for(V j : v()) + { + if(get(i).equals(j)) + { + v.add(j); + } + } + } + + return v; + } + + /** + * Get a copy of this maps keys + * + * @return the keys + */ + public KList k() + { + KList k = new KList(); + Enumeration kk = keys(); + + while(kk.hasMoreElements()) + { + K kkk = kk.nextElement(); + k.add(kkk); + } + + return k; + } + + /** + * Get a copy of this maps values + * + * @return the values + */ + public KList v() + { + return new KList(values()); + } + + /** + * Still works as it normally should except it returns itself (builder) + * + * @param key + * the key + * @param value + * the value (single only supported) + * @return + */ + public KMap qput(K key, V value) + { + super.put(key, value); + return this; + } + + /** + * Works just like put, except it wont put anything unless the key and value are + * nonnull + * + * @param key + * the nonnull key + * @param value + * the nonnull value + * @return the same map + */ + public KMap putNonNull(K key, V value) + { + if(key != null || value != null) + { + put(key, value); + } + + return this; + } + + public V putThen(K key, V valueIfKeyNotPresent) + { + if(!containsKey(key)) + { + put(key, valueIfKeyNotPresent); + } + + return get(key); + } + + /** + * Clear this map and return it + * + * @return the cleared map + */ + public KMap qclear() + { + super.clear(); + return this; + } + + /** + * Convert this map to keypairs + * + * @return the keypair list + */ + public KList> keypair() + { + KList> g = new KList<>(); + each((k, v) -> g.add(new KeyPair(k, v))); + return g; + } + + /** + * Create a keypair queue + * + * @return the queue + */ + public Queue> enqueue() + { + return Queue.create(keypair()); + } + + /** + * Create a key queue + * + * @return the queue + */ + public Queue enqueueKeys() + { + return Queue.create(k()); + } + + /** + * Create a value queue + * + * @return the queue + */ + public Queue enqueueValues() + { + return Queue.create(v()); + } +} diff --git a/src/main/java/com/volmit/iris/util/KSet.java b/src/main/java/com/volmit/iris/util/KSet.java new file mode 100644 index 000000000..95284fa98 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/KSet.java @@ -0,0 +1,29 @@ +package com.volmit.iris.util; + +import java.util.Collection; +import java.util.HashSet; + +public class KSet extends HashSet +{ + private static final long serialVersionUID = 1L; + + public KSet() + { + super(); + } + + public KSet(Collection c) + { + super(c); + } + + public KSet(int initialCapacity, float loadFactor) + { + super(initialCapacity, loadFactor); + } + + public KSet(int initialCapacity) + { + super(initialCapacity); + } +} diff --git a/src/main/java/com/volmit/iris/util/KeyPair.java b/src/main/java/com/volmit/iris/util/KeyPair.java new file mode 100644 index 000000000..3e98b3da8 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/KeyPair.java @@ -0,0 +1,45 @@ +package com.volmit.iris.util; + +/** + * Represents a keypair + * @author cyberpwn + * + * @param the key type + * @param the value type + */ +public class KeyPair +{ + private K k; + private V v; + + /** + * Create a keypair + * @param k the key + * @param v the value + */ + public KeyPair(K k, V v) + { + this.k = k; + this.v = v; + } + + public K getK() + { + return k; + } + + public void setK(K k) + { + this.k = k; + } + + public V getV() + { + return v; + } + + public void setV(V v) + { + this.v = v; + } +} diff --git a/src/main/java/com/volmit/iris/util/ListTag.java b/src/main/java/com/volmit/iris/util/ListTag.java index 0df76693e..357335145 100644 --- a/src/main/java/com/volmit/iris/util/ListTag.java +++ b/src/main/java/com/volmit/iris/util/ListTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/LongTag.java b/src/main/java/com/volmit/iris/util/LongTag.java index 828f13e56..6a835b6b9 100644 --- a/src/main/java/com/volmit/iris/util/LongTag.java +++ b/src/main/java/com/volmit/iris/util/LongTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/Looper.java b/src/main/java/com/volmit/iris/util/Looper.java new file mode 100644 index 000000000..9204306d5 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Looper.java @@ -0,0 +1,38 @@ +package com.volmit.iris.util; + +import com.volmit.iris.Iris; + +public abstract class Looper extends Thread +{ + public void run() + { + while(!interrupted()) + { + try + { + long m = loop(); + + if(m < 0) + { + break; + } + + Thread.sleep(m); + } + + catch(InterruptedException e) + { + break; + } + + catch(Throwable e) + { + e.printStackTrace(); + } + } + + Iris.info("Thread " + getName() + " Shutdown."); + } + + protected abstract long loop(); +} diff --git a/src/main/java/com/volmit/iris/util/M.java b/src/main/java/com/volmit/iris/util/M.java new file mode 100644 index 000000000..1662e7047 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/M.java @@ -0,0 +1,443 @@ +package com.volmit.iris.util; + +import java.util.regex.Matcher; + +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; + +/** + * Math + * + * @author cyberpwn + */ +public class M +{ + private static final int precision = 128; + private static final int modulus = 360 * precision; + private static final float[] sin = new float[modulus]; + + /** + * Scales B by an external range change so that
+ *
+ * BMIN < B < BMAX
+ * AMIN < RESULT < AMAX
+ *
+ * So Given rangeScale(0, 20, 0, 10, 5) -> 10
+ * 0 < 5 < 10
+ * 0 < ? < 20
+ *
+ * would return 10 + * + * @param amin + * the resulting minimum + * @param amax + * the resulting maximum + * @param bmin + * the initial minimum + * @param bmax + * the initial maximum + * @param b + * the initial value + * @return the resulting value + */ + public static double rangeScale(double amin, double amax, double bmin, double bmax, double b) + { + return amin + ((amax - amin) * ((b - bmin) / (bmax - bmin))); + } + + /** + * Get the percent (inverse lerp) from "from" to "to" where "at". + * + * If from = 0 and to = 100 and at = 25 then it would return 0.25 + * + * @param from + * the from + * @param to + * the to + * @param at + * the at + * @return the percent + */ + public static double lerpInverse(double from, double to, double at) + { + return M.rangeScale(0, 1, from, to, at); + } + + /** + * Linear interpolation from a to b where f is the percent across + * + * @param a + * the first pos (0) + * @param b + * the second pos (1) + * @param f + * the percent + * @return the value + */ + public static double lerp(double a, double b, double f) + { + return a + (f * (b - a)); + } + + /** + * Bilinear interpolation + * + * @param a + * the first point (0, 0) + * @param b + * the second point (1, 0) + * @param c + * the third point (0, 1) + * @param d + * the fourth point (1, 1) + * @param tx + * the x + * @param ty + * the y + * @return the bilerped value + */ + public static double bilerp(double a, double b, double c, double d, double x, double y) + { + return lerp(lerp(a, b, x), lerp(c, d, x), y); + } + + /** + * Trilinear interpolation + * + * @param a + * the first point (0, 0, 0) + * @param b + * the second point (1, 0, 0) + * @param c + * the third point (0, 0, 1) + * @param d + * the fourth point (1, 0, 1) + * @param e + * the fifth point (0, 1, 0) + * @param f + * the sixth point (1, 1, 0) + * @param g + * the seventh point (0, 1, 1) + * @param h + * the eighth point (1, 1, 1) + * @param x + * the x + * @param y + * the y + * @param z + * the z + * @return the trilerped value + */ + public static double trilerp(double a, double b, double c, double d, double e, double f, double g, double h, double x, double y, double z) + { + return lerp(bilerp(a, b, c, d, x, y), bilerp(e, f, g, h, x, y), z); + } + + /** + * Clip a value + * + * @param value + * the value + * @param min + * the min + * @param max + * the max + * @return the clipped value + */ + @SuppressWarnings("unchecked") + public static T clip(T value, T min, T max) + { + return (T) Double.valueOf(Math.min(max.doubleValue(), Math.max(min.doubleValue(), value.doubleValue()))); + } + + /** + * Get true or false based on random percent + * + * @param d + * between 0 and 1 + * @return true if true + */ + public static boolean r(Double d) + { + if(d == null) + { + return Math.random() < 0.5; + } + + return Math.random() < d; + } + + /** + * Get the ticks per second from a time in nanoseconds, the rad can be used for + * multiple ticks + * + * @param ns + * the time in nanoseconds + * @param rad + * the radius of the time + * @return the ticks per second in double form + */ + public static double tps(long ns, int rad) + { + return (20.0 * (ns / 50000000.0)) / rad; + } + + /** + * Get the number of ticks from a time in nanoseconds + * + * @param ns + * the nanoseconds + * @return the amount of ticks + */ + public static double ticksFromNS(long ns) + { + return (ns / 50000000.0); + } + + /** + * Get a random int from to (inclusive) + * + * @param f + * the from + * @param t + * the to + * @return the value + */ + public static int irand(int f, int t) + { + return f + (int) (Math.random() * ((t - f) + 1)); + } + + /** + * Get a random float from to (inclusive) + * + * @param f + * the from + * @param t + * the to + * @return the value + */ + public static float frand(float f, float t) + { + return f + (float) (Math.random() * ((t - f) + 1)); + } + + /** + * Get a random double from to (inclusive) + * + * @param f + * the from + * @param t + * the to + * @return the value + */ + public static double drand(double f, double t) + { + return f + (Math.random() * ((t - f) + 1)); + } + + /** + * Get system Nanoseconds + * + * @return nanoseconds (current) + */ + public static long ns() + { + return System.nanoTime(); + } + + /** + * Get the current millisecond time + * + * @return milliseconds + */ + public static long ms() + { + return System.currentTimeMillis(); + } + + /** + * Fast sin function + * + * @param a + * the number + * @return the sin + */ + public static float sin(float a) + { + return sinLookup((int) (a * precision + 0.5f)); + } + + /** + * Fast cos function + * + * @param a + * the number + * @return the cos + */ + public static float cos(float a) + { + return sinLookup((int) ((a + 90f) * precision + 0.5f)); + } + + /** + * Fast tan function + * + * @param a + * the number + * @return the tan + */ + public static float tan(float a) + { + float c = cos(a); + return sin(a) / (c == 0 ? 0.0000001f : c); + } + + /** + * Biggest number + * + * @param numbers + * the numbers + * @return the biggest one + */ + @SuppressWarnings("unchecked") + public static T max(T... doubles) + { + double max = Double.MIN_VALUE; + + for(T i : doubles) + { + if(i.doubleValue() > max) + { + max = i.doubleValue(); + } + } + + return (T) Double.valueOf(max); + } + + /** + * Smallest number + * + * @param doubles + * the numbers + * @return the smallest one + */ + @SuppressWarnings("unchecked") + public static T min(T... doubles) + { + double min = Double.MAX_VALUE; + + for(T i : doubles) + { + if(i.doubleValue() < min) + { + min = i.doubleValue(); + } + } + + return (T) Double.valueOf(min); + } + + /** + * Evaluates an expression using javascript engine and returns the double + * result. This can take variable parameters, so you need to define them. + * Parameters are defined as $[0-9]. For example evaluate("4$0/$1", 1, 2); This + * makes the expression (4x1)/2 == 2. Keep note that you must use 0-9, you + * cannot skip, or start at a number other than 0. + * + * @param expression + * the expression with variables + * @param args + * the arguments/variables + * @return the resulting double value + * @throws ScriptException + * ... gg + * @throws IndexOutOfBoundsException + * learn to count + */ + public static double evaluate(String expression, Double... args) throws ScriptException, IndexOutOfBoundsException + { + for(int i = 0; i < args.length; i++) + { + String current = "$" + i; + + if(expression.contains(current)) + { + expression = expression.replaceAll(Matcher.quoteReplacement(current), args[i] + ""); + } + } + + return evaluate(expression); + } + + /** + * Evaluates an expression using javascript engine and returns the double + * + * @param expression + * the mathimatical expression + * @return the double result + * @throws ScriptException + * ... gg + */ + public static double evaluate(String expression) throws ScriptException + { + ScriptEngineManager mgr = new ScriptEngineManager(); + ScriptEngine scriptEngine = mgr.getEngineByName("JavaScript"); + + return Double.valueOf(scriptEngine.eval(expression).toString()); + } + + /** + * is the number "is" within from-to + * + * @param from + * the lower end + * @param to + * the upper end + * @param is + * the check + * @return true if its within + */ + public static boolean within(int from, int to, int is) + { + return is >= from && is <= to; + } + + /** + * Get the amount of days past since the epoch time (1970 jan 1 utc) + * + * @return the epoch days + */ + public static long epochDays() + { + return epochDays(M.ms()); + } + + /** + * Get the amount of days past since the epoch time (1970 jan 1 utc) + * + * @param ms + * the time in milliseconds + * @return the epoch days + */ + private static long epochDays(long ms) + { + return ms / 1000 / 60 / 60 / 24; + } + + static + { + for(int i = 0; i < sin.length; i++) + { + sin[i] = (float) Math.sin((i * Math.PI) / (precision * 180)); + } + } + + private static float sinLookup(int a) + { + return a >= 0 ? sin[a % (modulus)] : -sin[-a % (modulus)]; + } + +} diff --git a/src/main/java/com/volmit/iris/util/NBTConstants.java b/src/main/java/com/volmit/iris/util/NBTConstants.java index 3da22a163..25b6e8452 100644 --- a/src/main/java/com/volmit/iris/util/NBTConstants.java +++ b/src/main/java/com/volmit/iris/util/NBTConstants.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/NBTInputStream.java b/src/main/java/com/volmit/iris/util/NBTInputStream.java index 374ee89be..d5f892557 100644 --- a/src/main/java/com/volmit/iris/util/NBTInputStream.java +++ b/src/main/java/com/volmit/iris/util/NBTInputStream.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/NBTOutputStream.java b/src/main/java/com/volmit/iris/util/NBTOutputStream.java index 9de2bb73c..7a16202e9 100644 --- a/src/main/java/com/volmit/iris/util/NBTOutputStream.java +++ b/src/main/java/com/volmit/iris/util/NBTOutputStream.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/NBTUtils.java b/src/main/java/com/volmit/iris/util/NBTUtils.java index 268d1454f..a890f5f4d 100644 --- a/src/main/java/com/volmit/iris/util/NBTUtils.java +++ b/src/main/java/com/volmit/iris/util/NBTUtils.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/NastyFunction.java b/src/main/java/com/volmit/iris/util/NastyFunction.java new file mode 100644 index 000000000..60d58a129 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/NastyFunction.java @@ -0,0 +1,6 @@ +package com.volmit.iris.util; + +public interface NastyFunction +{ + public R run(T t) throws Throwable; +} diff --git a/src/main/java/com/volmit/iris/util/NastyFuture.java b/src/main/java/com/volmit/iris/util/NastyFuture.java new file mode 100644 index 000000000..a5f813b8e --- /dev/null +++ b/src/main/java/com/volmit/iris/util/NastyFuture.java @@ -0,0 +1,6 @@ +package com.volmit.iris.util; + +public interface NastyFuture +{ + public R run() throws Throwable; +} diff --git a/src/main/java/com/volmit/iris/util/NastyRunnable.java b/src/main/java/com/volmit/iris/util/NastyRunnable.java new file mode 100644 index 000000000..815b20448 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/NastyRunnable.java @@ -0,0 +1,6 @@ +package com.volmit.iris.util; + +public interface NastyRunnable +{ + public void run() throws Throwable; +} diff --git a/src/main/java/com/volmit/iris/util/NoiseGenerator.java b/src/main/java/com/volmit/iris/util/NoiseGenerator.java index 9ec5b32d0..624593d28 100644 --- a/src/main/java/com/volmit/iris/util/NoiseGenerator.java +++ b/src/main/java/com/volmit/iris/util/NoiseGenerator.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /** * Base class for all noise generators diff --git a/src/main/java/com/volmit/iris/util/NoiseInjector.java b/src/main/java/com/volmit/iris/util/NoiseInjector.java index 28e0dfde5..bab689cfa 100644 --- a/src/main/java/com/volmit/iris/util/NoiseInjector.java +++ b/src/main/java/com/volmit/iris/util/NoiseInjector.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; @FunctionalInterface public interface NoiseInjector diff --git a/src/main/java/com/volmit/iris/util/NoiseProvider.java b/src/main/java/com/volmit/iris/util/NoiseProvider.java index 41f5f6e14..d119b64d2 100644 --- a/src/main/java/com/volmit/iris/util/NoiseProvider.java +++ b/src/main/java/com/volmit/iris/util/NoiseProvider.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; @FunctionalInterface public interface NoiseProvider { diff --git a/src/main/java/com/volmit/iris/util/O.java b/src/main/java/com/volmit/iris/util/O.java new file mode 100644 index 000000000..6abd89e6d --- /dev/null +++ b/src/main/java/com/volmit/iris/util/O.java @@ -0,0 +1,53 @@ +package com.volmit.iris.util; + +public class O implements Observable +{ + private T t = null; + private KList> observers; + + @Override + public T get() + { + return t; + } + + @Override + public O set(T t) + { + T x = t; + this.t = t; + + if(observers != null && observers.hasElements()) + { + observers.forEach((o) -> o.onChanged(x, t)); + } + + return this; + } + + @Override + public boolean has() + { + return t != null; + } + + @Override + public O clearObservers() + { + observers.clear(); + return this; + } + + @Override + public O observe(Observer t) + { + if(observers == null) + { + observers = new KList<>(); + } + + observers.add(t); + + return this; + } +} diff --git a/src/main/java/com/volmit/iris/util/ObjectConverter.java b/src/main/java/com/volmit/iris/util/ObjectConverter.java index 32f4b3eef..e5d89c6cb 100644 --- a/src/main/java/com/volmit/iris/util/ObjectConverter.java +++ b/src/main/java/com/volmit/iris/util/ObjectConverter.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; public class ObjectConverter { diff --git a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java index 9296f727e..2f04e06ca 100644 --- a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java @@ -1,13 +1,11 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.io.File; import org.bukkit.util.BlockVector; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.object.IrisObject; -import ninja.bytecode.shuriken.collections.KMap; -import ninja.bytecode.shuriken.math.M; +import com.volmit.iris.Iris; +import com.volmit.iris.object.IrisObject; public class ObjectResourceLoader extends ResourceLoader { diff --git a/src/main/java/com/volmit/iris/util/Observable.java b/src/main/java/com/volmit/iris/util/Observable.java new file mode 100644 index 000000000..e6e0ecb54 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Observable.java @@ -0,0 +1,14 @@ +package com.volmit.iris.util; + +public interface Observable +{ + public T get(); + + public Observable set(T t); + + public boolean has(); + + public Observable clearObservers(); + + public Observable observe(Observer t); +} diff --git a/src/main/java/com/volmit/iris/util/Observer.java b/src/main/java/com/volmit/iris/util/Observer.java new file mode 100644 index 000000000..092d44eb5 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Observer.java @@ -0,0 +1,7 @@ +package com.volmit.iris.util; + +@FunctionalInterface +public interface Observer +{ + public void onChanged(T from, T to); +} diff --git a/src/main/java/com/volmit/iris/util/ParticleSender.java b/src/main/java/com/volmit/iris/util/ParticleSender.java index 1c725aa1a..d80794d8d 100644 --- a/src/main/java/com/volmit/iris/util/ParticleSender.java +++ b/src/main/java/com/volmit/iris/util/ParticleSender.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Bukkit; import org.bukkit.Color; diff --git a/src/main/java/com/volmit/iris/util/ParticleSenderLegacy.java b/src/main/java/com/volmit/iris/util/ParticleSenderLegacy.java index 02f3713f4..738c4d589 100644 --- a/src/main/java/com/volmit/iris/util/ParticleSenderLegacy.java +++ b/src/main/java/com/volmit/iris/util/ParticleSenderLegacy.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Color; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/util/ParticleType.java b/src/main/java/com/volmit/iris/util/ParticleType.java index f8429c15c..5c999630e 100644 --- a/src/main/java/com/volmit/iris/util/ParticleType.java +++ b/src/main/java/com/volmit/iris/util/ParticleType.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Color; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/volmit/iris/util/PerlinNoise.java b/src/main/java/com/volmit/iris/util/PerlinNoise.java index 6b74faf34..7ac1560cd 100644 --- a/src/main/java/com/volmit/iris/util/PerlinNoise.java +++ b/src/main/java/com/volmit/iris/util/PerlinNoise.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/util/PhasicBiomeStorage.java b/src/main/java/com/volmit/iris/util/PhasicBiomeStorage.java index 5c1e1aa32..a3bec5c1d 100644 --- a/src/main/java/com/volmit/iris/util/PhasicBiomeStorage.java +++ b/src/main/java/com/volmit/iris/util/PhasicBiomeStorage.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/util/PolygonGenerator.java b/src/main/java/com/volmit/iris/util/PolygonGenerator.java index 568c80810..485a580f5 100644 --- a/src/main/java/com/volmit/iris/util/PolygonGenerator.java +++ b/src/main/java/com/volmit/iris/util/PolygonGenerator.java @@ -1,11 +1,7 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.function.Function; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.collections.KMap; -import ninja.bytecode.shuriken.math.M; - public class PolygonGenerator { private double[] rarity; diff --git a/src/main/java/com/volmit/iris/util/PrecisionStopwatch.java b/src/main/java/com/volmit/iris/util/PrecisionStopwatch.java new file mode 100644 index 000000000..ecf051c58 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/PrecisionStopwatch.java @@ -0,0 +1,101 @@ +package com.volmit.iris.util; + +public class PrecisionStopwatch { + private long nanos; + private long startNano; + private long millis; + private long startMillis; + private double time; + private boolean profiling; + + public static PrecisionStopwatch start() { + PrecisionStopwatch p = new PrecisionStopwatch(); + p.begin(); + + return p; + } + + public PrecisionStopwatch() { + reset(); + profiling = false; + } + + public void begin() { + profiling = true; + startNano = System.nanoTime(); + startMillis = System.currentTimeMillis(); + } + + public void end() { + if (!profiling) { + return; + } + + profiling = false; + nanos = System.nanoTime() - startNano; + millis = System.currentTimeMillis() - startMillis; + time = (double) nanos / 1000000.0; + time = (double) millis - time > 1.01 ? millis : time; + } + + public void reset() { + nanos = -1; + millis = -1; + startNano = -1; + startMillis = -1; + time = -0; + profiling = false; + } + + public double getTicks() { + return getMilliseconds() / 50.0; + } + + public double getSeconds() { + return getMilliseconds() / 1000.0; + } + + public double getMinutes() { + return getSeconds() / 60.0; + } + + public double getHours() { + return getMinutes() / 60.0; + } + + public double getMilliseconds() { + nanos = System.nanoTime() - startNano; + millis = System.currentTimeMillis() - startMillis; + time = (double) nanos / 1000000.0; + time = (double) millis - time > 1.01 ? millis : time; + return time; + } + + public long getNanoseconds() { + return (long) (time * 1000000.0); + } + + public long getNanos() { + return nanos; + } + + public long getStartNano() { + return startNano; + } + + public long getMillis() { + return millis; + } + + public long getStartMillis() { + return startMillis; + } + + public double getTime() { + return time; + } + + public boolean isProfiling() { + return profiling; + } +} diff --git a/src/main/java/com/volmit/iris/util/Queue.java b/src/main/java/com/volmit/iris/util/Queue.java new file mode 100644 index 000000000..8216d8af5 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Queue.java @@ -0,0 +1,31 @@ +package com.volmit.iris.util; + +public interface Queue +{ + public Queue queue(T t); + + public Queue queue(KList t); + + public boolean hasNext(int amt); + + public boolean hasNext(); + + public T next(); + + public KList next(int amt); + + public Queue clear(); + + public int size(); + + public static Queue create(KList t) + { + return new ShurikenQueue().queue(t); + } + + @SuppressWarnings("unchecked") + public static Queue create(T... t) + { + return new ShurikenQueue().queue(new KList().add(t)); + } +} diff --git a/src/main/java/com/volmit/iris/util/QueueExecutor.java b/src/main/java/com/volmit/iris/util/QueueExecutor.java new file mode 100644 index 000000000..fb53688a9 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/QueueExecutor.java @@ -0,0 +1,53 @@ +package com.volmit.iris.util; + +public class QueueExecutor extends Looper +{ + private Queue queue; + private boolean shutdown; + + public QueueExecutor() + { + queue = new ShurikenQueue(); + shutdown = false; + } + + public Queue queue() + { + return queue; + } + + @Override + protected long loop() + { + while(queue.hasNext()) + { + try + { + queue.next().run(); + } + + catch(Throwable e) + { + e.printStackTrace(); + } + } + + if(shutdown && !queue.hasNext()) + { + interrupt(); + return -1; + } + + return Math.max(500, (long) getRunTime() * 10); + } + + public double getRunTime() + { + return 0; + } + + public void shutdown() + { + shutdown = true; + } +} diff --git a/src/main/java/com/volmit/iris/util/RNG.java b/src/main/java/com/volmit/iris/util/RNG.java index f14330f1f..14e71e676 100644 --- a/src/main/java/com/volmit/iris/util/RNG.java +++ b/src/main/java/com/volmit/iris/util/RNG.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.nio.charset.StandardCharsets; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/util/ResourceLoader.java b/src/main/java/com/volmit/iris/util/ResourceLoader.java index f13a27c70..7dc6f722e 100644 --- a/src/main/java/com/volmit/iris/util/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ResourceLoader.java @@ -1,14 +1,11 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.io.File; import java.util.concurrent.locks.ReentrantLock; import com.google.gson.Gson; - -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.object.IrisRegistrant; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.collections.KMap; +import com.volmit.iris.Iris; +import com.volmit.iris.object.IrisRegistrant; public class ResourceLoader { diff --git a/src/main/java/com/volmit/iris/util/RollingSequence.java b/src/main/java/com/volmit/iris/util/RollingSequence.java new file mode 100644 index 000000000..bff3165ab --- /dev/null +++ b/src/main/java/com/volmit/iris/util/RollingSequence.java @@ -0,0 +1,101 @@ +package com.volmit.iris.util; + +public class RollingSequence extends Average +{ + private double median; + private double max; + private double min; + private boolean dirtyMedian; + private int dirtyExtremes; + private boolean precision; + + public RollingSequence(int size) + { + super(size); + median = 0; + min = 0; + max = 0; + setPrecision(false); + } + + public double addLast(int amt) + { + double f = 0; + + for(int i = 0; i < Math.min(values.length, amt); i++) + { + f += values[i]; + } + + return f; + } + + public void setPrecision(boolean p) + { + this.precision = p; + } + + public boolean isPrecision() + { + return precision; + } + + public double getMin() + { + if(dirtyExtremes > (isPrecision() ? 0 : values.length)) + { + resetExtremes(); + } + + return min; + } + + public double getMax() + { + if(dirtyExtremes > (isPrecision() ? 0 : values.length)) + { + resetExtremes(); + } + + return max; + } + + public double getMedian() + { + if(dirtyMedian) + { + recalculateMedian(); + } + + return median; + } + + private void recalculateMedian() + { + median = new KList().forceAdd(values).sort().middleValue(); + dirtyMedian = false; + } + + public void resetExtremes() + { + max = Integer.MIN_VALUE; + min = Integer.MAX_VALUE; + + for(double i : values) + { + max = M.max(max, i); + min = M.min(min, i); + } + + dirtyExtremes = 0; + } + + public void put(double i) + { + super.put(i); + dirtyMedian = true; + dirtyExtremes++; + max = M.max(max, i); + min = M.min(min, i); + } +} diff --git a/src/main/java/com/volmit/iris/util/SNG.java b/src/main/java/com/volmit/iris/util/SNG.java index fb210cb46..8de39ee7e 100644 --- a/src/main/java/com/volmit/iris/util/SNG.java +++ b/src/main/java/com/volmit/iris/util/SNG.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/util/ScoreDirection.java b/src/main/java/com/volmit/iris/util/ScoreDirection.java index 881e2e6b0..df00b0e54 100644 --- a/src/main/java/com/volmit/iris/util/ScoreDirection.java +++ b/src/main/java/com/volmit/iris/util/ScoreDirection.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /** * @author Missionary (missionarymc@gmail.com) diff --git a/src/main/java/com/volmit/iris/util/ShortTag.java b/src/main/java/com/volmit/iris/util/ShortTag.java index e59e2969e..9cafbff87 100644 --- a/src/main/java/com/volmit/iris/util/ShortTag.java +++ b/src/main/java/com/volmit/iris/util/ShortTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/Shrinkwrap.java b/src/main/java/com/volmit/iris/util/Shrinkwrap.java index c8bd024d6..94d762b32 100644 --- a/src/main/java/com/volmit/iris/util/Shrinkwrap.java +++ b/src/main/java/com/volmit/iris/util/Shrinkwrap.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; public class Shrinkwrap { diff --git a/src/main/java/com/volmit/iris/util/ShurikenQueue.java b/src/main/java/com/volmit/iris/util/ShurikenQueue.java new file mode 100644 index 000000000..b3b76d216 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/ShurikenQueue.java @@ -0,0 +1,88 @@ +package com.volmit.iris.util; + +public class ShurikenQueue implements Queue +{ + private KList queue; + private boolean randomPop; + private boolean reversePop; + + public ShurikenQueue() + { + clear(); + } + + public ShurikenQueue responsiveMode() + { + reversePop = true; + return this; + } + + public ShurikenQueue randomMode() + { + randomPop = true; + return this; + } + + @Override + public ShurikenQueue queue(T t) + { + queue.add(t); + return this; + } + + @Override + public ShurikenQueue queue(KList t) + { + queue.add(t); + return this; + } + + @Override + public boolean hasNext(int amt) + { + return queue.size() >= amt; + } + + @Override + public boolean hasNext() + { + return !queue.isEmpty(); + } + + @Override + public T next() + { + return reversePop ? queue.popLast() : randomPop ? queue.popRandom() : queue.pop(); + } + + @Override + public KList next(int amt) + { + KList t = new KList<>(); + + for(int i = 0; i < amt; i++) + { + if(!hasNext()) + { + break; + } + + t.add(next()); + } + + return t; + } + + @Override + public ShurikenQueue clear() + { + queue = new KList(); + return this; + } + + @Override + public int size() + { + return queue.size(); + } +} diff --git a/src/main/java/com/volmit/iris/util/StringTag.java b/src/main/java/com/volmit/iris/util/StringTag.java index d8a48ab43..5823d4076 100644 --- a/src/main/java/com/volmit/iris/util/StringTag.java +++ b/src/main/java/com/volmit/iris/util/StringTag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/Switch.java b/src/main/java/com/volmit/iris/util/Switch.java new file mode 100644 index 000000000..0daadd99e --- /dev/null +++ b/src/main/java/com/volmit/iris/util/Switch.java @@ -0,0 +1,29 @@ +package com.volmit.iris.util; + +public class Switch +{ + private volatile boolean b; + + /** + * Defaulted off + */ + public Switch() + { + b = false; + } + + public void flip() + { + b = true; + } + + public boolean isFlipped() + { + return b; + } + + public void reset() + { + b = false; + } +} diff --git a/src/main/java/com/volmit/iris/util/Tag.java b/src/main/java/com/volmit/iris/util/Tag.java index 33f171b09..e4c0d9b58 100644 --- a/src/main/java/com/volmit/iris/util/Tag.java +++ b/src/main/java/com/volmit/iris/util/Tag.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; /* * JNBT License diff --git a/src/main/java/com/volmit/iris/util/TaskExecutor.java b/src/main/java/com/volmit/iris/util/TaskExecutor.java new file mode 100644 index 000000000..da1eb93d1 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/TaskExecutor.java @@ -0,0 +1,226 @@ +package com.volmit.iris.util; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ForkJoinPool.ForkJoinWorkerThreadFactory; +import java.util.concurrent.ForkJoinWorkerThread; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +public class TaskExecutor +{ + private int xc; + private ExecutorService service; + + public TaskExecutor(int threadLimit, int priority, String name) + { + xc = 1; + + if(threadLimit == 1) + { + service = Executors.newSingleThreadExecutor((r) -> + { + Thread t = new Thread(r); + t.setName(name); + t.setPriority(priority); + + return t; + }); + } + + else if(threadLimit > 1) + { + final ForkJoinWorkerThreadFactory factory = new ForkJoinWorkerThreadFactory() + { + @Override + public ForkJoinWorkerThread newThread(ForkJoinPool pool) + { + final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool); + worker.setName(name + " " + xc++); + worker.setPriority(priority); + return worker; + } + }; + + service = new ForkJoinPool(threadLimit, factory, null, false); + } + + else + { + service = Executors.newCachedThreadPool((r) -> + { + Thread t = new Thread(r); + t.setName(name + " " + xc++); + t.setPriority(priority); + + return t; + }); + } + } + + public TaskGroup startWork() + { + return new TaskGroup(this); + } + + public void close() + { + J.a(() -> + { + J.sleep(10000); + service.shutdown(); + }); + } + + public void closeNow() + { + service.shutdown(); + } + + public static class TaskGroup + { + private KList tasks; + private TaskExecutor e; + + public TaskGroup(TaskExecutor e) + { + tasks = new KList<>(); + this.e = e; + } + + public TaskGroup queue(NastyRunnable... r) + { + for(NastyRunnable i : r) + { + tasks.add(new AssignedTask(i)); + } + + return this; + } + + public TaskGroup queue(KList r) + { + for(NastyRunnable i : r) + { + tasks.add(new AssignedTask(i)); + } + + return this; + } + + public TaskResult execute() + { + double timeElapsed = 0; + int tasksExecuted = 0; + int tasksFailed = 0; + int tasksCompleted = 0; + tasks.forEach((t) -> t.go(e)); + long msv = M.ns(); + + waiting: while(true) + { + try + { + Thread.sleep(0); + } + + catch(InterruptedException e1) + { + + } + + for(AssignedTask i : tasks) + { + if(i.state.equals(TaskState.QUEUED) || i.state.equals(TaskState.RUNNING)) + { + continue waiting; + } + } + + timeElapsed = (double) (M.ns() - msv) / 1000000D; + + for(AssignedTask i : tasks) + { + if(i.state.equals(TaskState.COMPLETED)) + { + tasksCompleted++; + } + + else + { + tasksFailed++; + } + + tasksExecuted++; + } + + break; + } + + return new TaskResult(timeElapsed, tasksExecuted, tasksFailed, tasksCompleted); + } + } + + @ToString + public static class TaskResult + { + public TaskResult(double timeElapsed, int tasksExecuted, int tasksFailed, int tasksCompleted) + { + this.timeElapsed = timeElapsed; + this.tasksExecuted = tasksExecuted; + this.tasksFailed = tasksFailed; + this.tasksCompleted = tasksCompleted; + } + + public final double timeElapsed; + public final int tasksExecuted; + public final int tasksFailed; + public final int tasksCompleted; + } + + public enum TaskState + { + QUEUED, + RUNNING, + COMPLETED, + FAILED; + } + + public static class AssignedTask + { + @Getter + @Setter + private TaskState state; + + @Getter + private NastyRunnable task; + + public AssignedTask(NastyRunnable task) + { + this.task = task; + state = TaskState.QUEUED; + } + + public void go(TaskExecutor e) + { + e.service.execute(() -> + { + state = TaskState.RUNNING; + try + { + task.run(); + state = TaskState.COMPLETED; + } + + catch(Throwable ex) + { + ex.printStackTrace(); + state = TaskState.FAILED; + } + }); + } + } +} diff --git a/src/main/java/com/volmit/iris/util/ThreadMonitor.java b/src/main/java/com/volmit/iris/util/ThreadMonitor.java new file mode 100644 index 000000000..7e212a05c --- /dev/null +++ b/src/main/java/com/volmit/iris/util/ThreadMonitor.java @@ -0,0 +1,88 @@ +package com.volmit.iris.util; + +import com.volmit.iris.Iris; + +/** + * Not particularly efficient or perfectly accurate but is great at fast thread + * switching detection + * + * @author dan + * + */ +public class ThreadMonitor extends Thread +{ + private Thread monitor; + private boolean running; + private State lastState; + private ChronoLatch cl; + private PrecisionStopwatch st; + int cycles = 0; + private RollingSequence sq = new RollingSequence(3); + + private ThreadMonitor(Thread monitor) + { + running = true; + st = PrecisionStopwatch.start(); + this.monitor = monitor; + lastState = State.NEW; + cl = new ChronoLatch(1000); + start(); + } + + public void run() + { + while(running) + { + try + { + Thread.sleep(0); + State s = monitor.getState(); + if(lastState != s) + { + cycles++; + pushState(s); + } + + lastState = s; + + if(cl.flip()) + { + Iris.info("Cycles: " + Form.f(cycles) + " (" + Form.duration(sq.getAverage(), 2) + ")"); + } + } + + catch(Throwable e) + { + running = false; + break; + } + } + } + + public void pushState(State s) + { + if(s != State.RUNNABLE) + { + if(st != null) + { + sq.put(st.getMilliseconds()); + } + } + + else + { + + st = PrecisionStopwatch.start(); + } + } + + public void unbind() + { + running = false; + } + + public static ThreadMonitor bind(Thread monitor) + { + return new ThreadMonitor(monitor); + } +} diff --git a/src/main/java/com/volmit/iris/util/VectorMath.java b/src/main/java/com/volmit/iris/util/VectorMath.java index 99cdf3e87..c0061c8a0 100644 --- a/src/main/java/com/volmit/iris/util/VectorMath.java +++ b/src/main/java/com/volmit/iris/util/VectorMath.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.util; +package com.volmit.iris.util; import org.bukkit.Axis; import org.bukkit.Bukkit; @@ -7,9 +7,6 @@ import org.bukkit.block.BlockFace; import org.bukkit.entity.Entity; import org.bukkit.util.Vector; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.format.Form; - /** * Vector utilities * diff --git a/src/main/java/com/volmit/iris/util/WeightMap.java b/src/main/java/com/volmit/iris/util/WeightMap.java index 322e91201..2a1556a09 100644 --- a/src/main/java/com/volmit/iris/util/WeightMap.java +++ b/src/main/java/com/volmit/iris/util/WeightMap.java @@ -1,53 +1,51 @@ -package ninja.bytecode.iris.util; - -import ninja.bytecode.shuriken.collections.KMap; +package com.volmit.iris.util; public class WeightMap extends KMap { private static final long serialVersionUID = 87558033900969389L; private boolean modified = false; private double lastWeight = 0; - + public double getPercentChance(T t) { if(totalWeight() <= 0) { return 0; } - + return getWeight(t) / totalWeight(); } - + public void clear() { modified = true; } - + public WeightMap setWeight(T t, double weight) { modified = true; put(t, weight); - + return this; } - + public double getWeight(T t) { return get(t); } - + public double totalWeight() { if(!modified) { return lastWeight; } - + modified = false; Shrinkwrap s = new Shrinkwrap(0D); forEachKey(Integer.MAX_VALUE, (d) -> s.set(s.get() + 1)); lastWeight = s.get(); - + return lastWeight; } } diff --git a/src/main/java/com/volmit/iris/util/XML.java b/src/main/java/com/volmit/iris/util/XML.java new file mode 100644 index 000000000..d3feaacc0 --- /dev/null +++ b/src/main/java/com/volmit/iris/util/XML.java @@ -0,0 +1,584 @@ +package com.volmit.iris.util; + + +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +import java.util.Iterator; + +/** + * This provides static methods to convert an XML text into a JSONObject, and to + * covert a JSONObject into an XML text. + * + * @author JSON.org + * @version 2014-05-03 + */ +public class XML +{ + + /** The Character '&'. */ + public static final Character AMP = '&'; + + /** The Character '''. */ + public static final Character APOS = '\''; + + /** The Character '!'. */ + public static final Character BANG = '!'; + + /** The Character '='. */ + public static final Character EQ = '='; + + /** The Character '>'. */ + public static final Character GT = '>'; + + /** The Character '<'. */ + public static final Character LT = '<'; + + /** The Character '?'. */ + public static final Character QUEST = '?'; + + /** The Character '"'. */ + public static final Character QUOT = '"'; + + /** The Character '/'. */ + public static final Character SLASH = '/'; + + /** + * Replace special characters with XML escapes: + * + * 

+	 * & (ampersand) is replaced by &amp;
+	 * < (less than) is replaced by &lt;
+	 * > (greater than) is replaced by &gt;
+	 * " (double quote) is replaced by &quot;
+	 *
+ * + * @param string + * The string to be escaped. + * @return The escaped string. + */ + public static String escape(String string) + { + StringBuilder sb = new StringBuilder(string.length()); + for(int i = 0, length = string.length(); i < length; i++) + { + char c = string.charAt(i); + switch(c) + { + case '&': + sb.append("&"); + break; + case '<': + sb.append("<"); + break; + case '>': + sb.append(">"); + break; + case '"': + sb.append("""); + break; + case '\'': + sb.append("'"); + break; + default: + sb.append(c); + } + } + return sb.toString(); + } + + /** + * Throw an exception if the string contains whitespace. Whitespace is not + * allowed in tagNames and attributes. + * + * @param string + * A string. + * @throws JSONException + */ + public static void noSpace(String string) throws JSONException + { + int i, length = string.length(); + if(length == 0) + { + throw new JSONException("Empty string."); + } + for(i = 0; i < length; i += 1) + { + if(Character.isWhitespace(string.charAt(i))) + { + throw new JSONException("'" + string + "' contains a space character."); + } + } + } + + /** + * Scan the content following the named tag, attaching it to the context. + * + * @param x + * The XMLTokener containing the source string. + * @param context + * The JSONObject that will include the new material. + * @param name + * The tag name. + * @return true if the close tag is processed. + * @throws JSONException + */ + private static boolean parse(XMLTokener x, JSONObject context, String name) throws JSONException + { + char c; + int i; + JSONObject jsonobject = null; + String string; + String tagName; + Object token; + + // Test for and skip past these forms: + // + // + // + // + // Report errors for these forms: + // <> + // <= + // << + + token = x.nextToken(); + + // "); + return false; + } + x.back(); + } else if(c == '[') + { + token = x.nextToken(); + if("CDATA".equals(token)) + { + if(x.next() == '[') + { + string = x.nextCDATA(); + if(string.length() > 0) + { + context.accumulate("content", string); + } + return false; + } + } + throw x.syntaxError("Expected 'CDATA['"); + } + i = 1; + do + { + token = x.nextMeta(); + if(token == null) + { + throw x.syntaxError("Missing '>' after ' 0); + return false; + } else if(token == QUEST) + { + + // "); + return false; + } else if(token == SLASH) + { + + // Close tag + + } else if(token == SLASH) + { + if(x.nextToken() != GT) + { + throw x.syntaxError("Misshaped tag"); + } + if(jsonobject.length() > 0) + { + context.accumulate(tagName, jsonobject); + } else + { + context.accumulate(tagName, ""); + } + return false; + + // Content, between <...> and + + } else if(token == GT) + { + for(;;) + { + token = x.nextContent(); + if(token == null) + { + if(tagName != null) + { + throw x.syntaxError("Unclosed tag " + tagName); + } + return false; + } else if(token instanceof String) + { + string = (String) token; + if(string.length() > 0) + { + jsonobject.accumulate("content", XML.stringToValue(string)); + } + + // Nested element + + } else if(token == LT) + { + if(parse(x, jsonobject, tagName)) + { + if(jsonobject.length() == 0) + { + context.accumulate(tagName, ""); + } else if(jsonobject.length() == 1 && jsonobject.opt("content") != null) + { + context.accumulate(tagName, jsonobject.opt("content")); + } else + { + context.accumulate(tagName, jsonobject); + } + return false; + } + } + } + } else + { + throw x.syntaxError("Misshaped tag"); + } + } + } + } + + /** + * Try to convert a string into a number, boolean, or null. If the string + * can't be converted, return the string. This is much less ambitious than + * JSONObject.stringToValue, especially because it does not attempt to + * convert plus forms, octal forms, hex forms, or E forms lacking decimal + * points. + * + * @param string + * A String. + * @return A simple JSON value. + */ + public static Object stringToValue(String string) + { + if("true".equalsIgnoreCase(string)) + { + return Boolean.TRUE; + } + if("false".equalsIgnoreCase(string)) + { + return Boolean.FALSE; + } + if("null".equalsIgnoreCase(string)) + { + return JSONObject.NULL; + } + + // If it might be a number, try converting it, first as a Long, and then + // as a + // Double. If that doesn't work, return the string. + + try + { + char initial = string.charAt(0); + if(initial == '-' || (initial >= '0' && initial <= '9')) + { + Long value = new Long(string); + if(value.toString().equals(string)) + { + return value; + } + } + } catch(Exception ignore) + { + try + { + Double value = new Double(string); + if(value.toString().equals(string)) + { + return value; + } + } catch(Exception ignoreAlso) + { + } + } + return string; + } + + /** + * Convert a well-formed (but not necessarily valid) XML string into a + * JSONObject. Some information may be lost in this transformation because + * JSON is a data format and XML is a document format. XML uses elements, + * attributes, and content text, while JSON uses unordered collections of + * name/value pairs and arrays of values. JSON does not does not like to + * distinguish between elements and attributes. Sequences of similar + * elements are represented as JSONArrays. Content text may be placed in a + * "content" member. Comments, prologs, DTDs, and <[ [ ]]> + * are ignored. + * + * @param string + * The source string. + * @return A JSONObject containing the structured data from the XML string. + * @throws JSONException + */ + public static JSONObject toJSONObject(String string) throws JSONException + { + JSONObject jo = new JSONObject(); + XMLTokener x = new XMLTokener(string); + while(x.more() && x.skipPast("<")) + { + parse(x, jo, null); + } + return jo; + } + + /** + * Convert a JSONObject into a well-formed, element-normal XML string. + * + * @param object + * A JSONObject. + * @return A string. + * @throws JSONException + */ + public static String toString(Object object) throws JSONException + { + return toString(object, null); + } + + /** + * Convert a JSONObject into a well-formed, element-normal XML string. + * + * @param object + * A JSONObject. + * @param tagName + * The optional name of the enclosing tag. + * @return A string. + * @throws JSONException + */ + public static String toString(Object object, String tagName) throws JSONException + { + StringBuilder sb = new StringBuilder(); + int i; + JSONArray ja; + JSONObject jo; + String key; + Iterator keys; + int length; + String string; + Object value; + if(object instanceof JSONObject) + { + + // Emit + + if(tagName != null) + { + sb.append('<'); + sb.append(tagName); + sb.append('>'); + } + + // Loop thru the keys. + + jo = (JSONObject) object; + keys = jo.keys(); + while(keys.hasNext()) + { + key = keys.next(); + value = jo.opt(key); + if(value == null) + { + value = ""; + } + string = value instanceof String ? (String) value : null; + + // Emit content in body + + if("content".equals(key)) + { + if(value instanceof JSONArray) + { + ja = (JSONArray) value; + length = ja.length(); + for(i = 0; i < length; i += 1) + { + if(i > 0) + { + sb.append('\n'); + } + sb.append(escape(ja.get(i).toString())); + } + } else + { + sb.append(escape(value.toString())); + } + + // Emit an array of similar keys + + } else if(value instanceof JSONArray) + { + ja = (JSONArray) value; + length = ja.length(); + for(i = 0; i < length; i += 1) + { + value = ja.get(i); + if(value instanceof JSONArray) + { + sb.append('<'); + sb.append(key); + sb.append('>'); + sb.append(toString(value)); + sb.append("'); + } else + { + sb.append(toString(value, key)); + } + } + } else if("".equals(value)) + { + sb.append('<'); + sb.append(key); + sb.append("/>"); + + // Emit a new tag + + } else + { + sb.append(toString(value, key)); + } + } + if(tagName != null) + { + + // Emit the close tag + + sb.append("'); + } + return sb.toString(); + + // XML does not have good support for arrays. If an array appears in + // a place + // where XML is lacking, synthesize an element. + + } else + { + if(object.getClass().isArray()) + { + object = new JSONArray(object); + } + if(object instanceof JSONArray) + { + ja = (JSONArray) object; + length = ja.length(); + for(i = 0; i < length; i += 1) + { + sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName)); + } + return sb.toString(); + } else + { + string = (object == null) ? "null" : escape(object.toString()); + return (tagName == null) ? "\"" + string + "\"" : (string.length() == 0) ? "<" + tagName + "/>" : "<" + tagName + ">" + string + ""; + } + } + } +} diff --git a/src/main/java/com/volmit/iris/util/XMLTokener.java b/src/main/java/com/volmit/iris/util/XMLTokener.java new file mode 100644 index 000000000..562944f8f --- /dev/null +++ b/src/main/java/com/volmit/iris/util/XMLTokener.java @@ -0,0 +1,425 @@ +package com.volmit.iris.util; + + +/* +Copyright (c) 2002 JSON.org + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +The Software shall be used for Good, not Evil. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +/** + * The XMLTokener extends the JSONTokener to provide additional methods for the + * parsing of XML texts. + * + * @author JSON.org + * @version 2014-05-03 + */ +public class XMLTokener extends JSONTokener +{ + + /** + * The table of entity values. It initially contains Character values for + * amp, apos, gt, lt, quot. + */ + public static final java.util.HashMap entity; + + static + { + entity = new java.util.HashMap(8); + entity.put("amp", XML.AMP); + entity.put("apos", XML.APOS); + entity.put("gt", XML.GT); + entity.put("lt", XML.LT); + entity.put("quot", XML.QUOT); + } + + /** + * Construct an XMLTokener from a string. + * + * @param s + * A source string. + */ + public XMLTokener(String s) + { + super(s); + } + + /** + * Get the text in the CDATA block. + * + * @return The string up to the ]]>. + * @throws JSONException + * If the ]]> is not found. + */ + public String nextCDATA() throws JSONException + { + char c; + int i; + StringBuilder sb = new StringBuilder(); + for(;;) + { + c = next(); + if(end()) + { + throw syntaxError("Unclosed CDATA"); + } + sb.append(c); + i = sb.length() - 3; + if(i >= 0 && sb.charAt(i) == ']' && sb.charAt(i + 1) == ']' && sb.charAt(i + 2) == '>') + { + sb.setLength(i); + return sb.toString(); + } + } + } + + /** + * Get the next XML outer token, trimming whitespace. There are two kinds of + * tokens: the '<' character which begins a markup tag, and the content text + * between markup tags. + * + * @return A string, or a '<' Character, or null if there is no more source + * text. + * @throws JSONException + */ + public Object nextContent() throws JSONException + { + char c; + StringBuilder sb; + do + { + c = next(); + } while(Character.isWhitespace(c)); + if(c == 0) + { + return null; + } + if(c == '<') + { + return XML.LT; + } + sb = new StringBuilder(); + for(;;) + { + if(c == '<' || c == 0) + { + back(); + return sb.toString().trim(); + } + if(c == '&') + { + sb.append(nextEntity(c)); + } else + { + sb.append(c); + } + c = next(); + } + } + + /** + * Return the next entity. These entities are translated to Characters: + * & ' > < ". + * + * @param ampersand + * An ampersand character. + * @return A Character or an entity String if the entity is not recognized. + * @throws JSONException + * If missing ';' in XML entity. + */ + public Object nextEntity(char ampersand) throws JSONException + { + StringBuilder sb = new StringBuilder(); + for(;;) + { + char c = next(); + if(Character.isLetterOrDigit(c) || c == '#') + { + sb.append(Character.toLowerCase(c)); + } else if(c == ';') + { + break; + } else + { + throw syntaxError("Missing ';' in XML entity: &" + sb); + } + } + String string = sb.toString(); + Object object = entity.get(string); + return object != null ? object : ampersand + string + ";"; + } + + /** + * Returns the next XML meta token. This is used for skipping over + * and structures. + * + * @return Syntax characters (< > / = ! ?) are returned as + * Character, and strings and names are returned as Boolean. We + * don't care what the values actually are. + * @throws JSONException + * If a string is not properly closed or if the XML is badly + * structured. + */ + public Object nextMeta() throws JSONException + { + char c; + char q; + do + { + c = next(); + } while(Character.isWhitespace(c)); + switch(c) + { + case 0: + throw syntaxError("Misshaped meta tag"); + case '<': + return XML.LT; + case '>': + return XML.GT; + case '/': + return XML.SLASH; + case '=': + return XML.EQ; + case '!': + return XML.BANG; + case '?': + return XML.QUEST; + case '"': + case '\'': + q = c; + for(;;) + { + c = next(); + if(c == 0) + { + throw syntaxError("Unterminated string"); + } + if(c == q) + { + return Boolean.TRUE; + } + } + default: + for(;;) + { + c = next(); + if(Character.isWhitespace(c)) + { + return Boolean.TRUE; + } + switch(c) + { + case 0: + case '<': + case '>': + case '/': + case '=': + case '!': + case '?': + case '"': + case '\'': + back(); + return Boolean.TRUE; + } + } + } + } + + /** + * Get the next XML Token. These tokens are found inside of angle brackets. + * It may be one of these characters: / > = ! ? or it may be a + * string wrapped in single quotes or double quotes, or it may be a name. + * + * @return a String or a Character. + * @throws JSONException + * If the XML is not well formed. + */ + public Object nextToken() throws JSONException + { + char c; + char q; + StringBuilder sb; + do + { + c = next(); + } while(Character.isWhitespace(c)); + switch(c) + { + case 0: + throw syntaxError("Misshaped element"); + case '<': + throw syntaxError("Misplaced '<'"); + case '>': + return XML.GT; + case '/': + return XML.SLASH; + case '=': + return XML.EQ; + case '!': + return XML.BANG; + case '?': + return XML.QUEST; + + // Quoted string + + case '"': + case '\'': + q = c; + sb = new StringBuilder(); + for(;;) + { + c = next(); + if(c == 0) + { + throw syntaxError("Unterminated string"); + } + if(c == q) + { + return sb.toString(); + } + if(c == '&') + { + sb.append(nextEntity(c)); + } else + { + sb.append(c); + } + } + default: + + // Name + + sb = new StringBuilder(); + for(;;) + { + sb.append(c); + c = next(); + if(Character.isWhitespace(c)) + { + return sb.toString(); + } + switch(c) + { + case 0: + return sb.toString(); + case '>': + case '/': + case '=': + case '!': + case '?': + case '[': + case ']': + back(); + return sb.toString(); + case '<': + case '"': + case '\'': + throw syntaxError("Bad character in a name"); + } + } + } + } + + /** + * Skip characters until past the requested string. If it is not found, we + * are left at the end of the source with a result of false. + * + * @param to + * A string to skip past. + * @throws JSONException + */ + public boolean skipPast(String to) throws JSONException + { + boolean b; + char c; + int i; + int j; + int offset = 0; + int length = to.length(); + char[] circle = new char[length]; + + /* + * First fill the circle buffer with as many characters as are in the to + * string. If we reach an early end, bail. + */ + + for(i = 0; i < length; i += 1) + { + c = next(); + if(c == 0) + { + return false; + } + circle[i] = c; + } + + /* We will loop, possibly for all of the remaining characters. */ + + for(;;) + { + j = offset; + b = true; + + /* Compare the circle buffer with the to string. */ + + for(i = 0; i < length; i += 1) + { + if(circle[j] != to.charAt(i)) + { + b = false; + break; + } + j += 1; + if(j >= length) + { + j -= length; + } + } + + /* If we exit the loop with b intact, then victory is ours. */ + + if(b) + { + return true; + } + + /* + * Get the next character. If there isn't one, then defeat is ours. + */ + + c = next(); + if(c == 0) + { + return false; + } + /* + * Shove the character in the circle buffer and advance the circle + * offset. The offset is mod n. + */ + circle[offset] = c; + offset += 1; + if(offset >= length) + { + offset -= length; + } + } + } +} diff --git a/src/main/java/com/volmit/iris/wand/WandController.java b/src/main/java/com/volmit/iris/wand/WandController.java index e1e38529c..15612e2e0 100644 --- a/src/main/java/com/volmit/iris/wand/WandController.java +++ b/src/main/java/com/volmit/iris/wand/WandController.java @@ -1,4 +1,4 @@ -package ninja.bytecode.iris.wand; +package com.volmit.iris.wand; import java.awt.Color; import java.util.Iterator; @@ -23,11 +23,11 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.util.BlockVector; import org.bukkit.util.Vector; -import ninja.bytecode.iris.Iris; -import ninja.bytecode.iris.object.IrisObject; -import ninja.bytecode.iris.util.Cuboid; -import ninja.bytecode.shuriken.collections.KList; -import ninja.bytecode.shuriken.math.M; +import com.volmit.iris.Iris; +import com.volmit.iris.object.IrisObject; +import com.volmit.iris.util.Cuboid; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.M; public class WandController implements Listener { diff --git a/src/main/resources/WHERE DID PACK GO.txt b/src/main/resources/WHERE DID PACK GO.txt deleted file mode 100644 index 7799b703a..000000000 --- a/src/main/resources/WHERE DID PACK GO.txt +++ /dev/null @@ -1,10 +0,0 @@ -1. Ensure your test server is NOT RUNNING! -2. Ensure Iris is up to date (gitkraken) -3. Delete plugins/Iris/pack (server) (keep the folder Iris there) -4. Delete plugins/Iris.jar (server) -5. Make a new tab in gitkraken, click on clone a repository (github) -6. Select "IrisPack" and set the clone path to yourserver/plugins/Iris -7. Set the repository name to "pack" and click Clone, then Open Now -8. Build Iris (eclipse) -9. Start Server -10. Profit \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 66fe82995..66a220612 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ${project.name} version: ${project.version} -main: ninja.bytecode.iris.Iris +main: com.volmit.iris.Iris load: STARTUP commands: iris: