diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java similarity index 55% rename from src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java rename to src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java index 6abbd0d3..95eaa4b9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/TranquilityHandler.java +++ b/src/main/java/WayofTime/bloodmagic/api/incense/ITranquilityHandler.java @@ -5,7 +5,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public abstract class TranquilityHandler +public interface ITranquilityHandler { - public abstract TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state); + TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state); } diff --git a/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java b/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java index e0783b33..28fb4754 100644 --- a/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/incense/IncenseTranquilityRegistry.java @@ -10,16 +10,16 @@ import java.util.List; public class IncenseTranquilityRegistry { - public static List handlerList = new ArrayList(); + public static List handlerList = new ArrayList(); - public static void registerTranquilityHandler(TranquilityHandler handler) + public static void registerTranquilityHandler(ITranquilityHandler handler) { handlerList.add(handler); } public static TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) { - for (TranquilityHandler handler : handlerList) + for (ITranquilityHandler handler : handlerList) { TranquilityStack tranq = handler.getTranquilityOfBlock(world, pos, block, state); if (tranq != null) diff --git a/src/main/java/WayofTime/bloodmagic/incense/CropTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/CropTranquilityHandler.java deleted file mode 100644 index f2c2f6a7..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/CropTranquilityHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class CropTranquilityHandler extends TranquilityHandler -{ - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) - { - if (block == Blocks.potatoes || block == Blocks.carrots || block == Blocks.wheat || block == Blocks.nether_wart) - { - return new TranquilityStack(EnumTranquilityType.CROP, 1); - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/EarthTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/EarthTranquilityHandler.java deleted file mode 100644 index 5b6def6e..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/EarthTranquilityHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import net.minecraft.block.Block; -import net.minecraft.block.BlockGrass; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class EarthTranquilityHandler extends TranquilityHandler -{ - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) - { - if (block == Blocks.dirt) - { - return new TranquilityStack(EnumTranquilityType.EARTHEN, 0.25); - } - - if (block instanceof BlockGrass) - { - return new TranquilityStack(EnumTranquilityType.EARTHEN, 0.5); - } - - if (block == Blocks.farmland) - { - return new TranquilityStack(EnumTranquilityType.EARTHEN, 1); - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/FireTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/FireTranquilityHandler.java deleted file mode 100644 index 602c3e88..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/FireTranquilityHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import net.minecraft.block.Block; -import net.minecraft.block.BlockFire; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class FireTranquilityHandler extends TranquilityHandler -{ - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) - { - if (block instanceof BlockFire) - { - return new TranquilityStack(EnumTranquilityType.FIRE, 1); - } - - if (block == Blocks.netherrack) - { - return new TranquilityStack(EnumTranquilityType.FIRE, 0.5); - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/LavaTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/LavaTranquilityHandler.java deleted file mode 100644 index d2cd8f5a..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/LavaTranquilityHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class LavaTranquilityHandler extends TranquilityHandler -{ - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) - { - if (block == Blocks.lava || block == Blocks.flowing_lava) - { - return new TranquilityStack(EnumTranquilityType.LAVA, 1.2); - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/PlantTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/PlantTranquilityHandler.java deleted file mode 100644 index e34324e6..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/PlantTranquilityHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLeaves; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class PlantTranquilityHandler extends TranquilityHandler -{ - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) - { - if (block instanceof BlockLeaves) - { - return new TranquilityStack(EnumTranquilityType.PLANT, 1); - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java new file mode 100644 index 00000000..c631a113 --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/incense/TranquilityHandlers.java @@ -0,0 +1,132 @@ +package WayofTime.bloodmagic.incense; + +import WayofTime.bloodmagic.api.incense.EnumTranquilityType; +import WayofTime.bloodmagic.api.incense.ITranquilityHandler; +import WayofTime.bloodmagic.api.incense.TranquilityStack; +import WayofTime.bloodmagic.registry.ModBlocks; +import net.minecraft.block.*; +import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Blocks; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class TranquilityHandlers { + + public static class Plant implements ITranquilityHandler + { + @Override + public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) + { + if (block instanceof BlockLeaves) + { + return new TranquilityStack(EnumTranquilityType.PLANT, 1); + } + + return null; + } + } + + public static class Lava implements ITranquilityHandler + { + @Override + public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) + { + if (block == Blocks.lava || block == Blocks.flowing_lava) + { + return new TranquilityStack(EnumTranquilityType.LAVA, 1.2); + } + + return null; + } + } + + public static class Fire implements ITranquilityHandler + { + @Override + public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) + { + if (block instanceof BlockFire) + { + return new TranquilityStack(EnumTranquilityType.FIRE, 1); + } + + if (block == Blocks.netherrack) + { + return new TranquilityStack(EnumTranquilityType.FIRE, 0.5); + } + + return null; + } + } + + public static class Earth implements ITranquilityHandler + { + @Override + public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) + { + if (block == Blocks.dirt) + { + return new TranquilityStack(EnumTranquilityType.EARTHEN, 0.25); + } + + if (block instanceof BlockGrass) + { + return new TranquilityStack(EnumTranquilityType.EARTHEN, 0.5); + } + + if (block == Blocks.farmland) + { + return new TranquilityStack(EnumTranquilityType.EARTHEN, 1); + } + + return null; + } + } + + public static class Crop implements ITranquilityHandler + { + @Override + public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) + { + if (block == Blocks.potatoes || block == Blocks.carrots || block == Blocks.wheat || block == Blocks.nether_wart) + { + return new TranquilityStack(EnumTranquilityType.CROP, 1); + } + + return null; + } + } + + public static class Tree implements ITranquilityHandler + { + @Override + public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) + { + if (block instanceof BlockLog) + { + return new TranquilityStack(EnumTranquilityType.TREE, 1); + } + + return null; + } + } + + public static class Water implements ITranquilityHandler + { + @Override + public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) + { + if (block == Blocks.water || block == Blocks.flowing_water) + { + return new TranquilityStack(EnumTranquilityType.WATER, 1); + } + + if (block == ModBlocks.lifeEssence) + { + return new TranquilityStack(EnumTranquilityType.WATER, 1.5); + } + + return null; + } + } +} diff --git a/src/main/java/WayofTime/bloodmagic/incense/TreeTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/TreeTranquilityHandler.java deleted file mode 100644 index 2eeb7a71..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/TreeTranquilityHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLog; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class TreeTranquilityHandler extends TranquilityHandler -{ - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) - { - if (block instanceof BlockLog) - { - return new TranquilityStack(EnumTranquilityType.TREE, 1); - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/incense/WaterTranquilityHandler.java b/src/main/java/WayofTime/bloodmagic/incense/WaterTranquilityHandler.java deleted file mode 100644 index aea5f573..00000000 --- a/src/main/java/WayofTime/bloodmagic/incense/WaterTranquilityHandler.java +++ /dev/null @@ -1,30 +0,0 @@ -package WayofTime.bloodmagic.incense; - -import WayofTime.bloodmagic.api.incense.EnumTranquilityType; -import WayofTime.bloodmagic.api.incense.TranquilityHandler; -import WayofTime.bloodmagic.api.incense.TranquilityStack; -import WayofTime.bloodmagic.registry.ModBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class WaterTranquilityHandler extends TranquilityHandler -{ - @Override - public TranquilityStack getTranquilityOfBlock(World world, BlockPos pos, Block block, IBlockState state) - { - if (block == Blocks.water || block == Blocks.flowing_water) - { - return new TranquilityStack(EnumTranquilityType.WATER, 1); - } - - if (block == ModBlocks.lifeEssence) - { - return new TranquilityStack(EnumTranquilityType.WATER, 1.5); - } - - return null; - } -} diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java index 1aa5dda9..0c7c8c4b 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModTranquilityHandlers.java @@ -7,12 +7,12 @@ public class ModTranquilityHandlers { public static void init() { - IncenseTranquilityRegistry.registerTranquilityHandler(new PlantTranquilityHandler()); - IncenseTranquilityRegistry.registerTranquilityHandler(new CropTranquilityHandler()); - IncenseTranquilityRegistry.registerTranquilityHandler(new WaterTranquilityHandler()); - IncenseTranquilityRegistry.registerTranquilityHandler(new EarthTranquilityHandler()); - IncenseTranquilityRegistry.registerTranquilityHandler(new FireTranquilityHandler()); - IncenseTranquilityRegistry.registerTranquilityHandler(new LavaTranquilityHandler()); - IncenseTranquilityRegistry.registerTranquilityHandler(new TreeTranquilityHandler()); + IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Plant()); + IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Crop()); + IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Water()); + IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Earth()); + IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Fire()); + IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Lava()); + IncenseTranquilityRegistry.registerTranquilityHandler(new TranquilityHandlers.Tree()); } }