From c9fff986add8158168d1746b33cc6ec50592fce2 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 14 Dec 2014 02:23:46 -0500 Subject: [PATCH 1/4] Fix vat crash from badly registered fluid container --- src/main/java/crazypants/enderio/machine/still/BlockVat.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/machine/still/BlockVat.java b/src/main/java/crazypants/enderio/machine/still/BlockVat.java index 52a42bc6..e8c6c785 100644 --- a/src/main/java/crazypants/enderio/machine/still/BlockVat.java +++ b/src/main/java/crazypants/enderio/machine/still/BlockVat.java @@ -141,7 +141,7 @@ public class BlockVat extends AbstractMachineBlock { if(filled == null) { //this shouldn't be necessary but it appears to be a bug as the above method doesnt work FluidContainerData[] datas = FluidContainerRegistry.getRegisteredFluidContainerData(); for (FluidContainerData data : datas) { - if(data != null && data.fluid.getFluid().getName().equals(available.getFluid().getName()) && data.emptyContainer.isItemEqual(item)) { + if(data != null && data.fluid != null && data.fluid.getFluid().getName().equals(available.getFluid().getName()) && data.emptyContainer.isItemEqual(item)) { res = data.filledContainer.copy(); filled = FluidContainerRegistry.getFluidForFilledItem(res); } From d5cdce3d8797a895927b42c2f412ffc1642b41f9 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 14 Dec 2014 23:24:07 -0500 Subject: [PATCH 2/4] Fix change in conduit connections not firing TE update --- src/main/java/crazypants/enderio/conduit/TileConduitBundle.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 6816765f..fc719259 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -219,6 +219,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { if(conduitsDirty) { if(!worldObj.isRemote) { worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + markDirty(); } conduitsDirty = false; } From 9ccd93b94008b46cad490679d198399267027777 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 14 Dec 2014 23:24:23 -0500 Subject: [PATCH 3/4] Update to WAILA 1.5.6a --- gradle.properties | 2 +- .../java/crazypants/enderio/waila/WailaCompat.java | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9ab39ab2..d234f982 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ mod_version=2.2.3 #mod_appendix=beta buildcraft_version=6.1.5 -waila_version=1.5.5_1.7.10 +waila_version=1.5.6a_1.7.10 ae2_version=rv1-stable-1 ttCore_version=MC1.7.10-0.0.3-33 diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 2aaf1d0e..7d3a65d0 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -71,7 +71,10 @@ public class WailaCompat implements IWailaDataProvider { IFacade bundle = (IFacade) accessor.getBlock(); Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal()); if (facade != null) { - return facade.getPickBlock(pos, accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ); + accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, bundle.getFacadeMetadata(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, 0), 0); + ItemStack ret = facade.getPickBlock(pos, accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ); + accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, 0, 0); + return ret; } } } else if(accessor.getBlock() instanceof BlockDarkSteelAnvil) { @@ -195,8 +198,12 @@ public class WailaCompat implements IWailaDataProvider { return currenttip; } - public static NBTTagCompound getNBTData() - { + @Override + public NBTTagCompound getNBTData(TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { + return tag; + } + + public static NBTTagCompound getNBTData() { return _accessor.getNBTData(); } } From f7fe12e223e2a59e2ac5412be76c6a047f748602 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 14 Dec 2014 23:26:11 -0500 Subject: [PATCH 4/4] Remove WIP code --- src/main/java/crazypants/enderio/conduit/ConduitRecipes.java | 2 -- src/main/java/crazypants/enderio/waila/WailaCompat.java | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index e64e97bf..f92151c7 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -7,8 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.ShapedOreRecipe; import appeng.api.AEApi; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 7d3a65d0..ff27335b 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -71,9 +71,10 @@ public class WailaCompat implements IWailaDataProvider { IFacade bundle = (IFacade) accessor.getBlock(); Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal()); if (facade != null) { - accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, bundle.getFacadeMetadata(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, 0), 0); + //accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, bundle.getFacadeMetadata(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, 0), 0); + // TODO metadata is wrong, this gives the wrong output ItemStack ret = facade.getPickBlock(pos, accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ); - accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, 0, 0); + //accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, 0, 0); return ret; } }