From ed9ee0c18029deed8dfe86e9b2e3acddc44a0b91 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 7 Jun 2014 03:22:55 -0400 Subject: [PATCH 1/3] How many times do you think we can fix the same bug? --- .../enderio/machine/PacketCurrentTask.java | 12 +++++++----- .../machine/generator/zombie/PacketZombieTank.java | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java b/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java index 06242212..8295e4ab 100644 --- a/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java +++ b/src/main/java/crazypants/enderio/machine/PacketCurrentTask.java @@ -43,11 +43,13 @@ public class PacketCurrentTask extends MessageTileEntity imp public IMessage onMessage(PacketZombieTank message, MessageContext ctx) { EntityPlayer player = EnderIO.proxy.getClientPlayer(); TileZombieGenerator tile = message.getTileEntity(player.worldObj); - if(tile != null && message.nbtRoot.hasKey("tank")) { - NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("tank"); - tile.fuelTank.readFromNBT(tankRoot); - } else { - tile.fuelTank.setFluid(null); + if (tile != null) { + if(message.nbtRoot.hasKey("tank")) { + NBTTagCompound tankRoot = message.nbtRoot.getCompoundTag("tank"); + tile.fuelTank.readFromNBT(tankRoot); + } else { + tile.fuelTank.setFluid(null); + } } return null; } From dcdb8c3ed7f84d589d1064fd6a7c81d8ee43612b Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 8 Jun 2014 00:54:09 -0400 Subject: [PATCH 2/3] Fix DimTrans packet bug (#739), farm now plants over replaceable blocks --- .../enderio/machine/farm/NetherWartFarmer.java | 2 +- .../java/crazypants/enderio/machine/farm/SeedFarmer.java | 2 +- .../crazypants/enderio/machine/farm/TileFarmStation.java | 9 +++++---- .../enderio/machine/hypercube/PacketChannelList.java | 2 +- .../enderio/machine/hypercube/PacketClientState.java | 8 ++++---- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java b/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java index 28ff9a78..7cdf4bcb 100644 --- a/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/NetherWartFarmer.java @@ -17,7 +17,7 @@ public class NetherWartFarmer extends SeedFarmer { @Override public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!farm.isAir(bc)) { + if(!farm.isOpen(bc)) { return false; } World worldObj = farm.getWorldObj(); diff --git a/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java b/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java index bde9fd39..145337c7 100644 --- a/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/SeedFarmer.java @@ -66,7 +66,7 @@ public class SeedFarmer implements IFarmerJoe { @Override public boolean prepareBlock(TileFarmStation farm, BlockCoord bc, Block block, int meta) { - if(!farm.isAir(bc)) { + if(!farm.isOpen(bc)) { return false; } if(requiresFarmland()) { diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 64f03815..67940616 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -178,8 +178,9 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt return worldObj.getBlockMetadata(bc.x, bc.y, bc.z); } - public boolean isAir(BlockCoord bc) { - return worldObj.isAirBlock(bc.x, bc.y, bc.z); + public boolean isOpen(BlockCoord bc) { + Block block = worldObj.getBlock(bc.x, bc.y, bc.z); + return block.isAir(worldObj, bc.x, bc.y, bc.z) || block.isReplaceable(worldObj, bc.x, bc.y, bc.z); } @Override @@ -229,11 +230,11 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt } - if(isAir(bc)) { + if(isOpen(bc)) { FarmersComune.instance.prepareBlock(this, bc, block, meta); block = worldObj.getBlock(bc.x, bc.y, bc.z); } - if(!isAir(bc) && hasPower()) { + if(!isOpen(bc) && hasPower()) { IHarvestResult harvest = FarmersComune.instance.harvestBlock(this, bc, block, meta); if(harvest != null) { if(harvest.getDrops() != null) { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java index 2fb9a4c2..48beaa9d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketChannelList.java @@ -77,7 +77,7 @@ public class PacketChannelList implements IMessage, IMessageHandler Date: Sun, 8 Jun 2014 01:26:37 -0400 Subject: [PATCH 3/3] Fix tank bug. Closes #733 --- .../enderio/machine/crusher/CrusherRecipeManager.java | 2 +- .../java/crazypants/enderio/machine/tank/TileTank.java | 7 ++++--- src/main/java/crazypants/util/FluidUtil.java | 8 +++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index 08bf59d2..b44354d0 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -85,7 +85,7 @@ public class CrusherRecipeManager { MachineRecipeRegistry.instance.registerRecipe(ModObject.blockSagMill.unlocalisedName, new CrusherMachineRecipe()); } - public void addCustumRecipes(String xmlDef) { + public void addCustomRecipes(String xmlDef) { RecipeConfig config; try { config = RecipeConfigParser.parse(xmlDef, null); diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index 740bf53b..7718dd3f 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -306,9 +306,6 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { return false; //can't empty the entire thing } fill(ForgeDirection.UP, fluid, true); - if(emptyItem == null) { - return true; - } fillFrom = fillFrom.copy(); fillFrom.stackSize--; @@ -318,6 +315,10 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { setInventorySlotContents(0, fillFrom); } + if(emptyItem == null) { + return true; + } + if(inventory[2] == null) { setInventorySlotContents(2, emptyItem); } else { diff --git a/src/main/java/crazypants/util/FluidUtil.java b/src/main/java/crazypants/util/FluidUtil.java index cc816bae..3e40760c 100644 --- a/src/main/java/crazypants/util/FluidUtil.java +++ b/src/main/java/crazypants/util/FluidUtil.java @@ -1,6 +1,7 @@ package crazypants.util; import net.minecraft.init.Items; +import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; @@ -50,7 +51,12 @@ public class FluidUtil { if(stack.getItem().hasContainerItem(stack)) { return stack.getItem().getContainerItem(stack); } - return null; + else if (stack.getItem() instanceof ItemPotion && stack.stackTagCompound == null) { + return new ItemStack(Items.glass_bottle); + } + else { + return null; + } }