From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/events/BucketHandler.java | 73 +++++++++++++--------- 1 file changed, 42 insertions(+), 31 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/events/BucketHandler.java (limited to 'src/main/java/darkknight/jewelrycraft/events/BucketHandler.java') diff --git a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java old mode 100644 new mode 100755 index 9aae0d7..1b79a0b --- a/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/BucketHandler.java @@ -1,14 +1,15 @@ /** * Copyright (c) SpaceToad, 2011 http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public License - * 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located + * in http://www.mod-buildcraft.com/MMPL-1.0.txt */ package darkknight.jewelrycraft.events; import java.util.HashMap; import java.util.Map; + import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import darkknight.jewelrycraft.block.BlockMoltenMetal; @@ -21,32 +22,42 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.FillBucketEvent; -public class BucketHandler -{ - public static BucketHandler INSTANCE = new BucketHandler(); - public Map buckets = new HashMap(); - - private BucketHandler() - {} - - @SubscribeEvent - public void onBucketFill(FillBucketEvent event) - { - ItemStack result = fillCustomBucket(event.world, event.target); - if (result == null) return; - event.result = result; - event.setResult(Result.ALLOW); - } - - private ItemStack fillCustomBucket(World world, MovingObjectPosition pos) - { - Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); - Item bucket = buckets.get(block); - if (bucket != null && world.getBlock(pos.blockX, pos.blockY, pos.blockZ) != Blocks.air && world.getBlock(pos.blockX, pos.blockY, pos.blockZ) instanceof BlockMoltenMetal){ - ItemStack item = new ItemStack(bucket); - if(BlockMoltenMetal.getTileEntity(world, pos.blockX, pos.blockY, pos.blockZ) != null) JewelryNBT.addMetal(item, BlockMoltenMetal.getTileEntity(world, pos.blockX, pos.blockY, pos.blockZ).getMetal()); - world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); - return item; - }else return null; - } +public class BucketHandler { + public static BucketHandler INSTANCE = new BucketHandler(); + public Map buckets = new HashMap(); + + private BucketHandler() { + } + + @SubscribeEvent + public void onBucketFill(FillBucketEvent event) { + ItemStack result = fillCustomBucket(event.world, event.target); + if (result == null) + return; + event.result = result; + event.setResult(Result.ALLOW); + } + + private ItemStack fillCustomBucket(World world, + MovingObjectPosition pos) { + Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); + Item bucket = buckets.get(block); + if (bucket != null + && world.getBlock(pos.blockX, pos.blockY, + pos.blockZ) != Blocks.air + && world.getBlock(pos.blockX, pos.blockY, + pos.blockZ) instanceof BlockMoltenMetal) { + ItemStack item = new ItemStack(bucket); + if (BlockMoltenMetal.getTileEntity(world, pos.blockX, + pos.blockY, pos.blockZ) != null) + JewelryNBT.addMetal(item, + BlockMoltenMetal + .getTileEntity(world, pos.blockX, + pos.blockY, pos.blockZ) + .getMetal()); + world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); + return item; + } else + return null; + } } \ No newline at end of file -- cgit v1.2.3