diff --git a/build.properties b/build.properties index afab433db..580ed074c 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Sat May 28 11:07:09 CDT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=12.17.0.1922-1.9.4 +forge_version=12.17.0.1948 mc_version=1.9.4 dir_repo=./ build_number=309 diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index a975d4755..96055aede 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -26,6 +26,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; @@ -80,19 +85,33 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { item.setDead(); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); } + + return true; } } - if(!hasWater() && !hasLava()) { - if(stack.getItem() == Items.WATER_BUCKET && !worldObj.isRemote) { - setWater(true); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - stack.setItem(Items.BUCKET); - } else if(stack.getItem() == Items.LAVA_BUCKET && !worldObj.isRemote) { - setLava(true); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - stack.setItem(Items.BUCKET); - } else return false; + if(!hasWater() && !hasLava() && !worldObj.isRemote) { + + if(stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null)) { + IFluidHandler fluidHandler = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + + FluidStack drainWater = fluidHandler.drain(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), false); + FluidStack drainLava = fluidHandler.drain(new FluidStack(FluidRegistry.LAVA, Fluid.BUCKET_VOLUME), false); + + if(drainWater != null && drainWater.getFluid() == FluidRegistry.WATER && drainWater.amount == Fluid.BUCKET_VOLUME) { + setWater(true); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + fluidHandler.drain(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), true); + return true; + } else if(drainLava != null && drainLava.getFluid() == FluidRegistry.LAVA && drainLava.amount == Fluid.BUCKET_VOLUME) { + setLava(true); + worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + fluidHandler.drain(new FluidStack(FluidRegistry.LAVA, Fluid.BUCKET_VOLUME), true); + return true; + } + } + + return false; } if(hasLava()) { diff --git a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java index 6c3cae147..32024fa7c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java +++ b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java @@ -10,41 +10,47 @@ */ package vazkii.botania.common.item; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidContainerItem; +import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple; import vazkii.botania.common.lib.LibItemNames; -public class ItemWaterBowl extends ItemMod implements IFluidContainerItem { +import javax.annotation.Nonnull; - private static final FluidStack STACK = new FluidStack(FluidRegistry.WATER, FluidContainerRegistry.BUCKET_VOLUME); +public class ItemWaterBowl extends ItemMod { public ItemWaterBowl() { super(LibItemNames.WATER_BOWL); setMaxStackSize(1); } - // Needed for rendering water dynamic model - + @Nonnull @Override - public FluidStack getFluid(ItemStack container) { - return STACK; + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { + return new Handler(stack); } - @Override - public int getCapacity(ItemStack container) { - return 0; + private static class Handler extends FluidHandlerItemStackSimple.SwapEmpty { + + private Handler(ItemStack stack) { + super(stack, new ItemStack(Items.BOWL), Fluid.BUCKET_VOLUME); + setFluid(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME)); + } + + @Override + public boolean canFillFluidType(FluidStack fluid) { + return false; + } + + @Override + public boolean canDrainFluidType(FluidStack fluid) { + return fluid.getFluid() == FluidRegistry.WATER; + } } - @Override - public int fill(ItemStack container, FluidStack resource, boolean doFill) { - return 0; - } - - @Override - public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { - return null; - } } diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 0995a4ce5..283ac2679 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -17,7 +17,7 @@ public final class LibMisc { public static final String MOD_NAME = MOD_ID; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1922,];required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[12.17.0.1948,];required-after:Baubles;after:Thaumcraft"; public static final String MC_VERSIONS = "[1.9.4]"; public static final String UPDATE_JSON = "https://raw.githubusercontent.com/williewillus/Botania/MC19/version/update.json";