From 05693e1b0bad9ab890a986498422c0cd58e0c37b Mon Sep 17 00:00:00 2001 From: fabricator77 Date: Tue, 25 Feb 2014 20:18:39 +1030 Subject: [PATCH 1/3] Restore bucket handler so empty buckets fill correctly. By default clicking on any fluid with an empty bucket will fill it with water. BucketHandler matches the fluid block clicked on with the matching fluid filled bucket (item) --- common/buildcraft/BuildCraftEnergy.java | 9 ++++----- common/buildcraft/energy/BucketHandler.java | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/buildcraft/BuildCraftEnergy.java b/common/buildcraft/BuildCraftEnergy.java index 2a47cf45..628df3f1 100644 --- a/common/buildcraft/BuildCraftEnergy.java +++ b/common/buildcraft/BuildCraftEnergy.java @@ -186,11 +186,10 @@ public class BuildCraftEnergy extends BuildCraftMod { FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluidStack("fuel", FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(bucketFuel), new ItemStack(Items.bucket)); } - // TODO: Are these still really necessary? If not, remove the - // BucketHandler class as well. - //BucketHandler.INSTANCE.buckets.put(blockOil, bucketOil); - //BucketHandler.INSTANCE.buckets.put(blockFuel, bucketFuel); - //MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); + // BucketHandler ensures empty buckets fill with the correct liquid. + BucketHandler.INSTANCE.buckets.put(blockOil, bucketOil); + BucketHandler.INSTANCE.buckets.put(blockFuel, bucketFuel); + MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE); BuildcraftRecipes.refinery.addRecipe(new FluidStack(fluidOil, 1), new FluidStack(fluidFuel, 1), 12, 1); diff --git a/common/buildcraft/energy/BucketHandler.java b/common/buildcraft/energy/BucketHandler.java index efb86e9b..cb647c15 100644 --- a/common/buildcraft/energy/BucketHandler.java +++ b/common/buildcraft/energy/BucketHandler.java @@ -46,7 +46,7 @@ public class BucketHandler { private ItemStack fillCustomBucket(World world, MovingObjectPosition pos) { Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); - Item bucket = Item.getItemFromBlock(block); + Item bucket = buckets.get(block); if (bucket != null && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0) { world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); From ebebba32823b842947eba1aed53f383fab6c7223 Mon Sep 17 00:00:00 2001 From: SpaceToad Date: Sat, 22 Mar 2014 15:49:09 +0100 Subject: [PATCH 2/3] prepare 5.0.4 version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1907a58e..83630748 100755 --- a/build.gradle +++ b/build.gradle @@ -29,12 +29,12 @@ if (System.getenv().BUILD_NUMBER) else logger.lifecycle "SETTING BUILDNUMBER TO 0" -version = "5.0.3" +version = "5.0.4" group= "com.mod-buildcraft" archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] minecraft { - version = "1.7.2-10.12.0.1029" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually. + version = "1.7.2-10.12.0.1047" // McVersion-ForgeVersion this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version. Yeah its stupid, and will be changed eentually. assetDir = "run/assets" // the place for ForgeGradle to download the assets. The assets that the launcher gets and stuff From ec0fe82252b0aabecec3098774da6f59320839aa Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Mon, 24 Mar 2014 14:23:55 -0700 Subject: [PATCH 3/3] Deps are case sensitive --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d41269b..f9f5283a 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ this repository will have to be rejected. add the following to your build.gradle file ``` dependencies { - compile 'com.mod-buildcraft:BuildCraft:5.0.0.+' + compile 'com.mod-buildcraft:buildcraft:5.0.0.+' } ``` where `5.0.0` is the desired version of BuildCraft