diff options
6 files changed, 24 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 3f30d148b0..2963c6d257 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ hs_err_pid* /build /out /.gradle -/venv
\ No newline at end of file +/venv +/libs
\ No newline at end of file diff --git a/build.properties b/build.properties index cda875cf39..73a08cc9c0 100644 --- a/build.properties +++ b/build.properties @@ -23,8 +23,8 @@ mc_version=1.7.10 majorUpdate=0 minorUpdate=3 -buildNumber=19 +buildNumber=20 APIVersion=3 ic2.version=2.2.828-experimental gregtech.version=5.09.32.36 -gregtech.jenkinsbuild=143 +gregtech.jenkinsbuild=143
\ No newline at end of file diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java index 1d48b16f2e..f8206768bb 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java @@ -51,6 +51,9 @@ import org.apache.logging.log4j.Logger; modid = MainMod.MOD_ID, name = MainMod.NAME, version = MainMod.VERSION, dependencies = "required-after:IC2; " + "required-after:gregtech; " + + "after:berriespp;" + + "after:dreamcraft;" + + "after:miscutils;" ) public final class MainMod { public static final String NAME = "BartWorks"; diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java index 34dc223140..4944355722 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java @@ -68,7 +68,8 @@ public class BW_TileEntityContainer extends BlockContainer implements ITileAddsI final TileEntity tile = worldObj.getTileEntity(x, y, z); if (tile instanceof BW_TileEntity_HeatedWaterPump) { if (player.getHeldItem() != null && (player.getHeldItem().getItem().equals(Items.bucket) || player.getHeldItem().getItem() instanceof IFluidContainerItem) && ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, false) != null) - if (player.getHeldItem().getItem().equals(Items.bucket)) { + if (player.getHeldItem().getItem().equals(Items.bucket) && ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, false).amount == 1000) { + ((BW_TileEntity_HeatedWaterPump) tile).drain(1000, true); player.getHeldItem().stackSize--; if (player.getHeldItem().stackSize <= 0) player.inventory.setInventorySlotContents(player.inventory.currentItem, null); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java index 05c63ef0cb..0b827b27a0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java @@ -316,7 +316,7 @@ public class BioRecipeLoader extends RecipeLoader { new ItemStack[]{new ItemStack(Items.sugar, 64)}, new FluidStack[]{new FluidStack(fluidStack, 100)}, BioCulture.BIO_CULTURE_ARRAY_LIST.get(1), - new FluidStack[]{(Loader.isModLoaded("berriespp") ? FluidRegistry.getFluidStack("potion.GHP", 1) : Materials.Ethanol.getFluid(1L))}, + new FluidStack[]{(Loader.isModLoaded("berriespp") ? FluidRegistry.getFluidStack("potion.ghp", 1) : Materials.Ethanol.getFluid(1L))}, 350, BW_Util.getMachineVoltageFromTier(4) ); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java index 0a69480775..cb582e8e5d 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_DEHP.java @@ -155,6 +155,11 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { protected boolean workingUpward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) { if (mMode != 3) { this.isPickingPipes = false; + try { + Field workState = this.getClass().getField("workState"); + workState.setInt(this, 0); + } catch (NoSuchFieldError | NoSuchFieldException | IllegalAccessException e) { + } return true; } return super.workingUpward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); @@ -162,6 +167,8 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { @Override public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + if (this.getBaseMetaTileEntity().getWorld().isRemote) + return; ++mMode; if (mMode >= 4) mMode = 0; @@ -172,6 +179,11 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { protected boolean workingDownward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) { if (mMode == 3) { this.isPickingPipes = true; + try { + Field workState = this.getClass().getSuperclass().getDeclaredField("workState"); + workState.setInt(this, 2); + } catch (NoSuchFieldError | NoSuchFieldException | IllegalAccessException e) { + } return true; } @@ -179,6 +191,8 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { if (this.waitForPipes()) { return false; } else { + if (mMode == 0) + mMode = 1; if (ConfigHandler.DEHPDirectSteam) { if (mMode == 1) { long steamProduced = (mTier * 600 * 2L * this.mEfficiency / 10000L); @@ -223,8 +237,6 @@ public class GT_TileEntity_DEHP extends GT_MetaTileEntity_DrillerBase { } private boolean consumeFluid(Fluid fluid, long ammount) { - - if (ammount > Integer.MAX_VALUE) { int[] tmp = new int[(int) (ammount / Integer.MAX_VALUE)]; Arrays.fill(tmp, (int) (ammount / Integer.MAX_VALUE)); |