From d679660e8a970d095644049fd5d0425a77e93e03 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 1 Aug 2020 09:57:42 -0400 Subject: [PATCH] Move --- .../volmit/iris/gen/BiomeChunkGenerator.java | 4 +- .../iris/gen/CeilingChunkGenerator.java | 4 +- .../iris/gen/ContextualChunkGenerator.java | 2 +- .../iris/gen/DimensionChunkGenerator.java | 9 +++- .../volmit/iris/gen/IrisChunkGenerator.java | 6 +-- .../volmit/iris/gen/LitChunkGenerator.java | 46 ++++++++++++++++++ .../iris/gen/ParallaxChunkGenerator.java | 10 ++-- .../iris/gen/ParallelChunkGenerator.java | 6 +-- .../iris/gen/PostBlockChunkGenerator.java | 2 +- .../iris/gen/TerrainChunkGenerator.java | 47 +++---------------- .../iris/gen/atomics/AtomicRegionData.java | 2 +- .../volmit/iris/gen/atomics/AtomicSliver.java | 2 +- .../iris/gen/atomics/AtomicSliverMap.java | 2 +- .../iris/gen/atomics/AtomicWorldData.java | 2 +- .../volmit/iris/gen/atomics/MasterLock.java | 2 +- .../iris/gen/layer/BiomeDataProvider.java | 2 +- .../volmit/iris/gen/layer/GenLayerBiome.java | 4 +- .../volmit/iris/gen/layer/GenLayerCarve.java | 4 +- .../volmit/iris/gen/layer/GenLayerCave.java | 6 +-- .../java/com/volmit/iris/gen/post/Post.java | 2 +- .../iris/gen/post/PostFloatingNibDeleter.java | 4 +- .../volmit/iris/gen/post/PostNibSmoother.java | 4 +- .../iris/gen/post/PostPotholeFiller.java | 4 +- .../com/volmit/iris/gen/post/PostSlabber.java | 4 +- .../volmit/iris/gen/post/PostWallPatcher.java | 4 +- .../volmit/iris/gen/post/PostWaterlogger.java | 4 +- .../com/volmit/iris/util/BlockDataTools.java | 15 ++++++ .../java/com/volmit/iris/util/Command.java | 2 +- .../java/com/volmit/iris/util/Control.java | 2 +- .../java/com/volmit/iris/util/Controller.java | 2 +- .../java/com/volmit/iris/util/ICommand.java | 4 +- .../com/volmit/iris/util/IController.java | 2 +- .../java/com/volmit/iris/util/Instance.java | 2 +- .../com/volmit/iris/util/MortarCommand.java | 4 +- .../volmit/iris/util/MortarPermission.java | 4 +- .../com/volmit/iris/util/MortarPlugin.java | 11 ++--- .../com/volmit/iris/util/MortarSender.java | 2 +- .../java/com/volmit/iris/util/Permission.java | 2 +- .../com/volmit/iris/util/RouterCommand.java | 2 +- .../com/volmit/iris/util/VirtualCommand.java | 5 +- 40 files changed, 134 insertions(+), 113 deletions(-) create mode 100644 src/main/java/com/volmit/iris/gen/LitChunkGenerator.java diff --git a/src/main/java/com/volmit/iris/gen/BiomeChunkGenerator.java b/src/main/java/com/volmit/iris/gen/BiomeChunkGenerator.java index a49b1d401..243193d7d 100644 --- a/src/main/java/com/volmit/iris/gen/BiomeChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/BiomeChunkGenerator.java @@ -1,11 +1,11 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; 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.gen.layer.GenLayerBiome; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBiomeGeneratorLink; diff --git a/src/main/java/com/volmit/iris/gen/CeilingChunkGenerator.java b/src/main/java/com/volmit/iris/gen/CeilingChunkGenerator.java index fd38a9ac2..0fa3e3461 100644 --- a/src/main/java/com/volmit/iris/gen/CeilingChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/CeilingChunkGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -8,7 +8,7 @@ import com.volmit.iris.object.IrisDimension; import com.volmit.iris.util.InvertedBiomeGrid; import com.volmit.iris.util.RNG; -public abstract class CeilingChunkGenerator extends PostBlockChunkGenerator +public abstract class CeilingChunkGenerator extends LitChunkGenerator { protected boolean generatingCeiling = false; protected boolean ceilingCached = false; diff --git a/src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java b/src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java index 13f881c6d..d7ef41b5f 100644 --- a/src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/ContextualChunkGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java b/src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java index d7acc10c0..4fb0e4b7f 100644 --- a/src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/DimensionChunkGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -21,11 +21,18 @@ public abstract class DimensionChunkGenerator extends ContextualChunkGenerator protected static final BlockData AIR = Material.AIR.createBlockData(); protected static final BlockData CAVE_AIR = Material.CAVE_AIR.createBlockData(); protected static final BlockData BEDROCK = Material.BEDROCK.createBlockData(); + protected LitChunkGenerator thisLight; public DimensionChunkGenerator(String dimensionName) { super(); this.dimensionName = dimensionName; + thisLight = (LitChunkGenerator) this; + } + + protected void lit(int x, int y, int z, BlockData d) + { + thisLight.queueLight(x, y, z, d); } public IrisDimension getDimension() diff --git a/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java b/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java index fc8b2bbd2..5e3b1a66f 100644 --- a/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/IrisChunkGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; import java.io.IOException; import java.lang.reflect.Method; @@ -10,9 +10,9 @@ import org.bukkit.entity.Player; import com.volmit.iris.Iris; import com.volmit.iris.IrisContext; +import com.volmit.iris.gen.atomics.AtomicRegionData; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.object.atomics.AtomicRegionData; import com.volmit.iris.util.BiomeResult; import com.volmit.iris.util.CNG; import com.volmit.iris.util.KMap; @@ -119,7 +119,7 @@ public class IrisChunkGenerator extends CeilingChunkGenerator implements IrisCon @Override protected void onChunkLoaded(Chunk c) { - + super.onChunkLoaded(c); } @Override diff --git a/src/main/java/com/volmit/iris/gen/LitChunkGenerator.java b/src/main/java/com/volmit/iris/gen/LitChunkGenerator.java new file mode 100644 index 000000000..b77fa53cc --- /dev/null +++ b/src/main/java/com/volmit/iris/gen/LitChunkGenerator.java @@ -0,0 +1,46 @@ +package com.volmit.iris.gen; + +import org.bukkit.Chunk; +import org.bukkit.block.Block; +import org.bukkit.block.data.BlockData; + +import com.volmit.iris.Iris; +import com.volmit.iris.util.BlockDataTools; +import com.volmit.iris.util.BlockPosition; +import com.volmit.iris.util.KList; + +public abstract class LitChunkGenerator extends PostBlockChunkGenerator +{ + private KList lit; + + public LitChunkGenerator(String dimensionName, int threads) + { + super(dimensionName, threads); + lit = new KList<>(); + } + + protected void queueLight(int x, int y, int z, BlockData d) + { + if(BlockDataTools.isLit(d)) + { + lit.add(new BlockPosition(x, y, z)); + } + } + + @Override + protected void onChunkLoaded(Chunk c) + { + for(BlockPosition i : lit.copy()) + { + if(i.getChunkX() == c.getX() && i.getChunkZ() == c.getZ()) + { + Block b = getWorld().getBlockAt(i.getX(), i.getY(), i.getZ()); + // BlockData d = b.getBlockData(); + b.getState().update(true, true); + lit.remove(i); + } + } + + Iris.info("Lit: " + lit.size()); + } +} diff --git a/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java b/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java index bd5d72a61..e07b826ef 100644 --- a/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; import java.io.IOException; import java.util.concurrent.locks.ReentrantLock; @@ -7,13 +7,13 @@ import org.bukkit.World; import org.bukkit.block.data.BlockData; import com.volmit.iris.Iris; +import com.volmit.iris.gen.atomics.AtomicSliver; +import com.volmit.iris.gen.atomics.AtomicSliverMap; +import com.volmit.iris.gen.atomics.AtomicWorldData; +import com.volmit.iris.gen.atomics.MasterLock; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBiomeMutation; import com.volmit.iris.object.IrisObjectPlacement; -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.CaveResult; import com.volmit.iris.util.ChunkPosition; diff --git a/src/main/java/com/volmit/iris/gen/ParallelChunkGenerator.java b/src/main/java/com/volmit/iris/gen/ParallelChunkGenerator.java index 1b2bfc0d0..df4f41a20 100644 --- a/src/main/java/com/volmit/iris/gen/ParallelChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/ParallelChunkGenerator.java @@ -1,12 +1,12 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; import java.util.concurrent.locks.ReentrantLock; 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.gen.atomics.AtomicSliver; +import com.volmit.iris.gen.atomics.AtomicSliverMap; import com.volmit.iris.util.BiomeMap; import com.volmit.iris.util.GroupedExecutor; import com.volmit.iris.util.HeightMap; diff --git a/src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java b/src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java index c1140429b..2fb01d7d9 100644 --- a/src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/PostBlockChunkGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java b/src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java index edb09dc3d..e94796cdc 100644 --- a/src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/TerrainChunkGenerator.java @@ -1,4 +1,4 @@ -package com.volmit.iris.generator; +package com.volmit.iris.gen; import java.util.concurrent.locks.ReentrantLock; @@ -9,15 +9,15 @@ import org.bukkit.block.data.Bisected.Half; import org.bukkit.block.data.BlockData; import com.volmit.iris.Iris; -import com.volmit.iris.layer.GenLayerCarve; -import com.volmit.iris.layer.GenLayerCave; +import com.volmit.iris.gen.atomics.AtomicSliver; +import com.volmit.iris.gen.layer.GenLayerCarve; +import com.volmit.iris.gen.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.IrisDepositGenerator; 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; @@ -188,6 +188,7 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator } sliver.set(k, block); + lit(rx, k, rz, block); highestPlaced = Math.max(highestPlaced, k); if(!cavernSurface && (k == height && block.getMaterial().isSolid() && k < fluidHeight)) @@ -281,40 +282,6 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator } } - protected boolean canPlace(Material mat, Material onto) - { - if(onto.equals(Material.GRASS_BLOCK) && mat.equals(Material.DEAD_BUSH)) - { - return false; - } - - if(onto.equals(Material.GRASS_PATH)) - { - if(!mat.isSolid()) - { - return false; - } - } - - if(onto.equals(Material.STONE) || onto.equals(Material.GRAVEL) || onto.equals(Material.GRAVEL) || onto.equals(Material.ANDESITE) || onto.equals(Material.GRANITE) || onto.equals(Material.DIORITE) || onto.equals(Material.BLACKSTONE) || onto.equals(Material.BASALT)) - { - if(mat.equals(Material.POPPY) || mat.equals(Material.DANDELION) || mat.equals(Material.CORNFLOWER) || mat.equals(Material.ORANGE_TULIP) || mat.equals(Material.PINK_TULIP) || mat.equals(Material.RED_TULIP) || mat.equals(Material.WHITE_TULIP) || mat.equals(Material.FERN) || mat.equals(Material.LARGE_FERN) || mat.equals(Material.GRASS) || mat.equals(Material.TALL_GRASS)) - { - return false; - } - } - - if(onto.equals(Material.ACACIA_LEAVES) || onto.equals(Material.BIRCH_LEAVES) || onto.equals(Material.DARK_OAK_LEAVES) || onto.equals(Material.JUNGLE_LEAVES) || onto.equals(Material.OAK_LEAVES) || onto.equals(Material.SPRUCE_LEAVES)) - { - if(!mat.isSolid()) - { - return false; - } - } - - return true; - } - private void decorateLand(IrisBiome biome, AtomicSliver sliver, double wx, int k, double wz, int rx, int rz, BlockData block) { if(!getDimension().isDecorate()) @@ -335,7 +302,7 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator if(d != null) { - if(!canPlace(d.getMaterial(), block.getMaterial())) + if(!BlockDataTools.canPlaceOnto(d.getMaterial(), block.getMaterial())) { continue; } @@ -396,7 +363,7 @@ public abstract class TerrainChunkGenerator extends ParallelChunkGenerator if(d != null) { - if(!canPlace(d.getMaterial(), block.getMaterial())) + if(!BlockDataTools.canPlaceOnto(d.getMaterial(), block.getMaterial())) { continue; } diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java index 4bf18de59..3e8e8ad6a 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicRegionData.java @@ -1,4 +1,4 @@ -package com.volmit.iris.object.atomics; +package com.volmit.iris.gen.atomics; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java index 5fe786cfb..34324975e 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliver.java @@ -1,4 +1,4 @@ -package com.volmit.iris.object.atomics; +package com.volmit.iris.gen.atomics; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java index 4adbf69f0..970b995ec 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicSliverMap.java @@ -1,4 +1,4 @@ -package com.volmit.iris.object.atomics; +package com.volmit.iris.gen.atomics; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java b/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java index 55553d780..7743caf05 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java +++ b/src/main/java/com/volmit/iris/gen/atomics/AtomicWorldData.java @@ -1,4 +1,4 @@ -package com.volmit.iris.object.atomics; +package com.volmit.iris.gen.atomics; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java b/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java index 350f3c48d..cd2c128a6 100644 --- a/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java +++ b/src/main/java/com/volmit/iris/gen/atomics/MasterLock.java @@ -1,4 +1,4 @@ -package com.volmit.iris.object.atomics; +package com.volmit.iris.gen.atomics; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java b/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java index 420ad2d51..14b16f4e1 100644 --- a/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java +++ b/src/main/java/com/volmit/iris/gen/layer/BiomeDataProvider.java @@ -1,4 +1,4 @@ -package com.volmit.iris.layer; +package com.volmit.iris.gen.layer; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisRegion; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java index 3deecfb48..74ba3e7ea 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerBiome.java @@ -1,7 +1,7 @@ -package com.volmit.iris.layer; +package com.volmit.iris.gen.layer; import com.volmit.iris.Iris; -import com.volmit.iris.generator.DimensionChunkGenerator; +import com.volmit.iris.gen.DimensionChunkGenerator; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisRegion; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java index bf4ab0684..b3d44b048 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerCarve.java @@ -1,6 +1,6 @@ -package com.volmit.iris.layer; +package com.volmit.iris.gen.layer; -import com.volmit.iris.generator.DimensionChunkGenerator; +import com.volmit.iris.gen.DimensionChunkGenerator; import com.volmit.iris.util.CellGenerator; import com.volmit.iris.util.GenLayer; import com.volmit.iris.util.IrisInterpolation; diff --git a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java b/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java index 0e173ec12..18af52c07 100644 --- a/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java +++ b/src/main/java/com/volmit/iris/gen/layer/GenLayerCave.java @@ -1,10 +1,10 @@ -package com.volmit.iris.layer; +package com.volmit.iris.gen.layer; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import com.volmit.iris.generator.DimensionChunkGenerator; -import com.volmit.iris.object.atomics.AtomicSliver; +import com.volmit.iris.gen.DimensionChunkGenerator; +import com.volmit.iris.gen.atomics.AtomicSliver; import com.volmit.iris.util.BlockDataTools; import com.volmit.iris.util.CNG; import com.volmit.iris.util.CaveResult; diff --git a/src/main/java/com/volmit/iris/gen/post/Post.java b/src/main/java/com/volmit/iris/gen/post/Post.java index f9fcac318..55c23c9f2 100644 --- a/src/main/java/com/volmit/iris/gen/post/Post.java +++ b/src/main/java/com/volmit/iris/gen/post/Post.java @@ -1,4 +1,4 @@ -package com.volmit.iris.layer.post; +package com.volmit.iris.gen.post; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; diff --git a/src/main/java/com/volmit/iris/gen/post/PostFloatingNibDeleter.java b/src/main/java/com/volmit/iris/gen/post/PostFloatingNibDeleter.java index cb287ca20..93c40fbd5 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostFloatingNibDeleter.java +++ b/src/main/java/com/volmit/iris/gen/post/PostFloatingNibDeleter.java @@ -1,8 +1,8 @@ -package com.volmit.iris.layer.post; +package com.volmit.iris.gen.post; import org.bukkit.block.data.BlockData; -import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.gen.PostBlockChunkGenerator; import com.volmit.iris.util.BlockDataTools; import com.volmit.iris.util.IrisPostBlockFilter; diff --git a/src/main/java/com/volmit/iris/gen/post/PostNibSmoother.java b/src/main/java/com/volmit/iris/gen/post/PostNibSmoother.java index bfe53d0a6..06a85f5b3 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostNibSmoother.java +++ b/src/main/java/com/volmit/iris/gen/post/PostNibSmoother.java @@ -1,9 +1,9 @@ -package com.volmit.iris.layer.post; +package com.volmit.iris.gen.post; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.gen.PostBlockChunkGenerator; import com.volmit.iris.util.IrisPostBlockFilter; @Post("nib-smoother") diff --git a/src/main/java/com/volmit/iris/gen/post/PostPotholeFiller.java b/src/main/java/com/volmit/iris/gen/post/PostPotholeFiller.java index 05887987f..b3c87048b 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostPotholeFiller.java +++ b/src/main/java/com/volmit/iris/gen/post/PostPotholeFiller.java @@ -1,6 +1,6 @@ -package com.volmit.iris.layer.post; +package com.volmit.iris.gen.post; -import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.gen.PostBlockChunkGenerator; import com.volmit.iris.util.IrisPostBlockFilter; @Post("pothole-filler") diff --git a/src/main/java/com/volmit/iris/gen/post/PostSlabber.java b/src/main/java/com/volmit/iris/gen/post/PostSlabber.java index b38c12249..98eaae1a1 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostSlabber.java +++ b/src/main/java/com/volmit/iris/gen/post/PostSlabber.java @@ -1,9 +1,9 @@ -package com.volmit.iris.layer.post; +package com.volmit.iris.gen.post; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.gen.PostBlockChunkGenerator; import com.volmit.iris.util.IrisPostBlockFilter; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/gen/post/PostWallPatcher.java b/src/main/java/com/volmit/iris/gen/post/PostWallPatcher.java index b5c25042c..bc7b47f6a 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostWallPatcher.java +++ b/src/main/java/com/volmit/iris/gen/post/PostWallPatcher.java @@ -1,9 +1,9 @@ -package com.volmit.iris.layer.post; +package com.volmit.iris.gen.post; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.gen.PostBlockChunkGenerator; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.util.IrisPostBlockFilter; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/gen/post/PostWaterlogger.java b/src/main/java/com/volmit/iris/gen/post/PostWaterlogger.java index 271eacfdf..6ebd2f85e 100644 --- a/src/main/java/com/volmit/iris/gen/post/PostWaterlogger.java +++ b/src/main/java/com/volmit/iris/gen/post/PostWaterlogger.java @@ -1,10 +1,10 @@ -package com.volmit.iris.layer.post; +package com.volmit.iris.gen.post; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.Waterlogged; -import com.volmit.iris.generator.PostBlockChunkGenerator; +import com.volmit.iris.gen.PostBlockChunkGenerator; import com.volmit.iris.util.BlockDataTools; import com.volmit.iris.util.IrisPostBlockFilter; diff --git a/src/main/java/com/volmit/iris/util/BlockDataTools.java b/src/main/java/com/volmit/iris/util/BlockDataTools.java index 5af7a2c0a..8543e9aa0 100644 --- a/src/main/java/com/volmit/iris/util/BlockDataTools.java +++ b/src/main/java/com/volmit/iris/util/BlockDataTools.java @@ -78,6 +78,21 @@ public class BlockDataTools return null; } + public static boolean isLit(BlockData mat) + { + return isLit(mat.getMaterial()); + } + + public static boolean isLit(Material mat) + { + if(mat.equals(Material.GLOWSTONE) || mat.equals(Material.TORCH) || mat.equals(Material.REDSTONE_TORCH) || mat.equals(Material.SOUL_TORCH) || mat.equals(Material.REDSTONE_WALL_TORCH) || mat.equals(Material.WALL_TORCH) || mat.equals(Material.SOUL_WALL_TORCH) || mat.equals(Material.LANTERN) || mat.equals(Material.JACK_O_LANTERN) || mat.equals(Material.REDSTONE_LAMP) || mat.equals(Material.MAGMA_BLOCK) || mat.equals(Material.SEA_LANTERN) || mat.equals(Material.SOUL_LANTERN) || mat.equals(Material.FIRE) || mat.equals(Material.SOUL_FIRE) || mat.equals(Material.SEA_PICKLE) || mat.equals(Material.BREWING_STAND) || mat.equals(Material.REDSTONE_ORE)) + { + return true; + } + + return false; + } + public static boolean canPlaceOnto(Material mat, Material onto) { if(onto.equals(Material.GRASS_BLOCK) && mat.equals(Material.DEAD_BUSH)) diff --git a/src/main/java/com/volmit/iris/util/Command.java b/src/main/java/com/volmit/iris/util/Command.java index 4fa425439..63d8177f7 100644 --- a/src/main/java/com/volmit/iris/util/Command.java +++ b/src/main/java/com/volmit/iris/util/Command.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.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/Control.java b/src/main/java/com/volmit/iris/util/Control.java index 1c7330ed9..352f43bd0 100644 --- a/src/main/java/com/volmit/iris/util/Control.java +++ b/src/main/java/com/volmit/iris/util/Control.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.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/Controller.java b/src/main/java/com/volmit/iris/util/Controller.java index 53e03d548..e9cedf1b9 100644 --- a/src/main/java/com/volmit/iris/util/Controller.java +++ b/src/main/java/com/volmit/iris/util/Controller.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.util; +package com.volmit.iris.util; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/util/ICommand.java b/src/main/java/com/volmit/iris/util/ICommand.java index 22f1dad09..d1bf34b4b 100644 --- a/src/main/java/com/volmit/iris/util/ICommand.java +++ b/src/main/java/com/volmit/iris/util/ICommand.java @@ -1,6 +1,4 @@ -package com.volmit.iris.command.util; - -import com.volmit.iris.util.KList; +package com.volmit.iris.util; /** * Represents a pawn command diff --git a/src/main/java/com/volmit/iris/util/IController.java b/src/main/java/com/volmit/iris/util/IController.java index 52acb0f83..03bf662d9 100644 --- a/src/main/java/com/volmit/iris/util/IController.java +++ b/src/main/java/com/volmit/iris/util/IController.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.util; +package com.volmit.iris.util; import org.bukkit.event.Listener; diff --git a/src/main/java/com/volmit/iris/util/Instance.java b/src/main/java/com/volmit/iris/util/Instance.java index 7c4c2ba6c..dbdb027a9 100644 --- a/src/main/java/com/volmit/iris/util/Instance.java +++ b/src/main/java/com/volmit/iris/util/Instance.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.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/MortarCommand.java b/src/main/java/com/volmit/iris/util/MortarCommand.java index 7e03db0ca..c3a7e4c85 100644 --- a/src/main/java/com/volmit/iris/util/MortarCommand.java +++ b/src/main/java/com/volmit/iris/util/MortarCommand.java @@ -1,12 +1,10 @@ -package com.volmit.iris.command.util; +package com.volmit.iris.util; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import org.bukkit.ChatColor; -import com.volmit.iris.util.KList; - /** * Represents a pawn command * diff --git a/src/main/java/com/volmit/iris/util/MortarPermission.java b/src/main/java/com/volmit/iris/util/MortarPermission.java index 1557493bd..b774a6401 100644 --- a/src/main/java/com/volmit/iris/util/MortarPermission.java +++ b/src/main/java/com/volmit/iris/util/MortarPermission.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.util; +package com.volmit.iris.util; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -6,8 +6,6 @@ import java.lang.reflect.Modifier; import org.bukkit.command.CommandSender; -import com.volmit.iris.util.KList; - public abstract class MortarPermission { private MortarPermission parent; diff --git a/src/main/java/com/volmit/iris/util/MortarPlugin.java b/src/main/java/com/volmit/iris/util/MortarPlugin.java index 8f614dab5..a6a33c372 100644 --- a/src/main/java/com/volmit/iris/util/MortarPlugin.java +++ b/src/main/java/com/volmit/iris/util/MortarPlugin.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.util; +package com.volmit.iris.util; import java.io.File; import java.io.IOException; @@ -22,11 +22,6 @@ import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.java.JavaPlugin; import com.volmit.iris.Iris; -import com.volmit.iris.util.IO; -import com.volmit.iris.util.J; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.KMap; -import com.volmit.iris.util.M; public abstract class MortarPlugin extends JavaPlugin implements Listener { @@ -419,13 +414,13 @@ public abstract class MortarPlugin extends JavaPlugin implements Listener for(Field i : getClass().getDeclaredFields()) { - if(i.isAnnotationPresent(com.volmit.iris.command.util.Command.class)) + if(i.isAnnotationPresent(com.volmit.iris.util.Command.class)) { try { i.setAccessible(true); MortarCommand pc = (MortarCommand) i.getType().getConstructor().newInstance(); - com.volmit.iris.command.util.Command c = i.getAnnotation(com.volmit.iris.command.util.Command.class); + com.volmit.iris.util.Command c = i.getAnnotation(com.volmit.iris.util.Command.class); registerCommand(pc, c.value()); commandCache.add(pc); v("Registered Commands /" + pc.getNode() + " (" + i.getName() + ")"); diff --git a/src/main/java/com/volmit/iris/util/MortarSender.java b/src/main/java/com/volmit/iris/util/MortarSender.java index 14a3212a5..b1239af77 100644 --- a/src/main/java/com/volmit/iris/util/MortarSender.java +++ b/src/main/java/com/volmit/iris/util/MortarSender.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.util; +package com.volmit.iris.util; import java.util.Set; diff --git a/src/main/java/com/volmit/iris/util/Permission.java b/src/main/java/com/volmit/iris/util/Permission.java index 8ad0803f1..dc447d888 100644 --- a/src/main/java/com/volmit/iris/util/Permission.java +++ b/src/main/java/com/volmit/iris/util/Permission.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.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/RouterCommand.java b/src/main/java/com/volmit/iris/util/RouterCommand.java index 78f49aa32..762e745d6 100644 --- a/src/main/java/com/volmit/iris/util/RouterCommand.java +++ b/src/main/java/com/volmit/iris/util/RouterCommand.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.util; +package com.volmit.iris.util; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/com/volmit/iris/util/VirtualCommand.java b/src/main/java/com/volmit/iris/util/VirtualCommand.java index 2390c17d3..c97970efb 100644 --- a/src/main/java/com/volmit/iris/util/VirtualCommand.java +++ b/src/main/java/com/volmit/iris/util/VirtualCommand.java @@ -1,4 +1,4 @@ -package com.volmit.iris.command.util; +package com.volmit.iris.util; import java.lang.reflect.Field; @@ -7,9 +7,6 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import com.volmit.iris.Iris; -import com.volmit.iris.util.KList; -import com.volmit.iris.util.KMap; -import com.volmit.iris.util.V; /** * Represents a virtual command. A chain of iterative processing through