From 2a6b99bd1522ee6c19b114f701429da435ad152f Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 26 Aug 2014 20:24:28 +0800 Subject: [PATCH 1/3] #925 EnderIO Machines will not accept power from Universal Cables (Mekanism) --- .../java/crazypants/enderio/power/PowerHandlerUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java index a4354a77..85b21fc4 100644 --- a/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerHandlerUtil.java @@ -113,17 +113,17 @@ public class PowerHandlerUtil { } public static int recieveRedstoneFlux(ForgeDirection from, PowerHandler powerHandler, int maxReceive, boolean simulate, boolean tickPH) { - int canRecieve = (int) getMaxEnergyRecievedMj(powerHandler, maxReceive / 10, from); + double canRecieve = getMaxEnergyRecievedMj(powerHandler, maxReceive / 10d, from); if(!simulate) { if(tickPH) { doBuildCraftEnergyTick(powerHandler, from); } powerHandler.setEnergy(powerHandler.getEnergyStored() + canRecieve); } - return canRecieve * 10; + return (int)(canRecieve * 10); } - public static float getMaxEnergyRecievedMj(PowerHandler ph, float max, ForgeDirection from) { + public static double getMaxEnergyRecievedMj(PowerHandler ph, double max, ForgeDirection from) { if(ph == null) { return 0; } @@ -133,7 +133,7 @@ public class PowerHandlerUtil { if(canRecieve <= ph.getMinEnergyReceived()) { return 0; } - return (float) canRecieve; + return canRecieve; } public static void doBuildCraftEnergyTick(PowerHandler ph, ForgeDirection from) { From 05de916abd2c07baab820e0d20e43106dba0b231 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 26 Aug 2014 23:05:09 +0800 Subject: [PATCH 2/3] #923 Item FIlter Dupe Bug --- .../enderio/conduit/item/filter/ClearFilterRecipe.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java b/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java index 047ec520..f715f731 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java @@ -35,6 +35,7 @@ public class ClearFilterRecipe implements IRecipe{ if (count == 1 && FilterRegister.isFilterSet(input)) { ItemStack out = input.copy(); + out.stackSize = 1; out.stackTagCompound = null; this.output = out; } else { From e84c6e50b7475fdc7626f02f7f02d9f947c8077d Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 26 Aug 2014 23:09:54 +0800 Subject: [PATCH 3/3] #926 Increased the default dim. trans. power transmit limit so it can support the top tier conduits --- src/main/java/crazypants/enderio/config/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index da2374ea..cc4b99f0 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -78,7 +78,7 @@ public final class Config { public static double transceiverBucketTransmissionCost = 1; - public static int transceiverMaxIO = 256; + public static int transceiverMaxIO = 2048; public static File configDirectory;