From 8dae18254c639d84c50c043411cd25df5bc891ef Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 15 Aug 2014 14:40:15 +0800 Subject: [PATCH 01/15] Insulated redstone conduits now auto connection to MFR / RedNet machines. --- resources/assets/enderio/lang/en_US.lang | 1 + .../redstone/InsulatedRedstoneConduit.java | 37 +++++++++++++++---- .../machine/spawner/TilePoweredSpawner.java | 2 - 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index e0b25b4d..c763b974 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -70,6 +70,7 @@ item.itemModItemFilter.tooltip.detailed.line1=Selects only items for a specified item.itemModItemFilter.tooltip.detailed.line2=mod/s item.itemExtractSpeedUpgrade.name=Item Conduit Speed Upgrade +item.itemExtractSpeedUpgrade.tooltip.basic.line1=Upgrade for item conduits item.itemExtractSpeedUpgrade.tooltip.detailed.line1=Increases speed by 4 item.itemExtractSpeedUpgrade.tooltip.detailed.line2=items per extraction item.itemExtractSpeedUpgrade.tooltip.detailed.line3=Max upgrades is 15 diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index 4a554410..4df15851 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -59,18 +59,19 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula } }); - } + } private static List VANILLA_CONECTABLES = Arrays.asList(Blocks.redstone_lamp, Blocks.redstone_torch, Blocks.redstone_wire, Blocks.redstone_block, Blocks.dispenser, Blocks.lever, Blocks.wooden_button, Blocks.stone_button, Blocks.wooden_pressure_plate, Blocks.stone_pressure_plate, - Blocks.dropper, Blocks.daylight_detector, Blocks.command_block, Blocks.golden_rail); - //TODO:1.7 need to map all these - // 23, 25, 27, 28, 29, 33, 46, 55, 64, 69, 70, 71, 72, 75, 76, 77, 93, 94, - // 96, 107, 123, 124, 131, 143, 147, 148, 149, 150, 151, 152, 154, 157, 158); + Blocks.dropper, Blocks.daylight_detector, Blocks.command_block, Blocks.golden_rail, Blocks.trapped_chest); + + private static Set> CONNECTABLE_CLASSES = null; + private Map forcedConnections = new HashMap(); private Map signalColors = new HashMap(); + @Override public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { @@ -270,13 +271,33 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula World world = getBundle().getEntity().getWorldObj(); TileEntity te = world.getTileEntity(loc.x, loc.y, loc.z); - if(te instanceof IPowerEmitter || te instanceof IRedstoneControl || te instanceof AbstractMachineEntity) { - return true; - } + + Collection> conectableInterfaces = getConectableInterfaces(); + for(Class conectable : conectableInterfaces) { + if( (te != null && conectable.isAssignableFrom(te.getClass()) ) || (block != null && conectable.isAssignableFrom(block.getClass()))) { + return true; + } + } return false; } + private static Collection> getConectableInterfaces() { + if(CONNECTABLE_CLASSES == null) { + CONNECTABLE_CLASSES = new HashSet>(); + CONNECTABLE_CLASSES.add(IPowerEmitter.class); + CONNECTABLE_CLASSES.add(IRedstoneControl.class); + CONNECTABLE_CLASSES.add(AbstractMachineEntity.class); + try{ + Class conInterface = Class.forName("powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection"); + CONNECTABLE_CLASSES.add(conInterface); + } catch(Throwable e) { + } + + } + return CONNECTABLE_CLASSES; + } + @Override public int isProvidingWeakPower(ForgeDirection toDirection) { if(getConectionMode(toDirection.getOpposite()) != ConnectionMode.IN_OUT) { diff --git a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java index b1330a63..351b7ab6 100644 --- a/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java +++ b/src/main/java/crazypants/enderio/machine/spawner/TilePoweredSpawner.java @@ -45,8 +45,6 @@ public class TilePoweredSpawner extends AbstractPoweredTaskEntity { public TilePoweredSpawner() { super(new SlotDefinition(0, 0)); - //logic.setEntityName("Zombie"); - //logic.setEntityName("Skeleton"); logic.setEntityName(NULL_ENTITY_NAME); } From 2f27c8198bb7c1748dca45ddb19c9171e08899be Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 15 Aug 2014 15:56:57 +0800 Subject: [PATCH 02/15] Fixed rendering of conduit switch. --- .../enderio/conduit/redstone/RedstoneSwitchRenderer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java index e2ba1738..830d81f5 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java @@ -55,8 +55,7 @@ public class RedstoneSwitchRenderer extends DefaultConduitRenderer { for (int i = 0; i < icons.length; i++) { icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(); } - icons[1] = sw.getSwitchIcon(); - ; + icons[3] = sw.getSwitchIcon(); Vector3d trans = ConduitGeometryUtil.instance.getTranslation(ForgeDirection.UNKNOWN, bundle.getOffset(IRedstoneConduit.class, ForgeDirection.UNKNOWN)); BoundingBox bb = switchBounds.translate(trans); From 78c70836bd6c948c8c01bb2aad790f338eb53694 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 15 Aug 2014 16:18:41 +0800 Subject: [PATCH 03/15] #874 Shift click with con. probe not working if no active connections --- .../conduit/gui/GuiExternalConnectionSelector.java | 13 ++++++++++++- .../conduit/packet/PacketConnectionMode.java | 8 +++++++- .../enderio/machine/monitor/ItemConduitProbe.java | 13 ++++++------- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java index 5a95be3b..d4ebf7f4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnectionSelector.java @@ -15,6 +15,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.util.BlockCoord; @@ -28,7 +29,17 @@ public class GuiExternalConnectionSelector extends GuiScreen { this.cb = cb; cons = new HashSet(); for (IConduit con : cb.getConduits()) { - cons.addAll(con.getExternalConnections()); + if(con instanceof IInsulatedRedstoneConduit) { + Set conCons = con.getConduitConnections(); + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(!conCons.contains(dir)) { + cons.add(dir); + } + } + + } else { + cons.addAll(con.getExternalConnections()); + } } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java index 87cf77bf..3399d43b 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; public class PacketConnectionMode extends AbstractConduitPacket implements IMessageHandler{ @@ -39,7 +40,12 @@ public class PacketConnectionMode extends AbstractConduitPacket implem @Override public IMessage onMessage(PacketConnectionMode message, MessageContext ctx) { - message.getTileCasted(ctx).setConnectionMode(message.dir, message.mode); + IConduit conduit = message.getTileCasted(ctx); + if(conduit instanceof IInsulatedRedstoneConduit) { + ((IInsulatedRedstoneConduit)conduit).forceConnectionMode(message.dir, message.mode); + } else { + conduit.setConnectionMode(message.dir, message.mode); + } message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); return null; } diff --git a/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java b/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java index b695d933..ee7c685e 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java +++ b/src/main/java/crazypants/enderio/machine/monitor/ItemConduitProbe.java @@ -21,6 +21,7 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; @@ -46,11 +47,6 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider { @Override public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - - Block blk = world.getBlock(x, y, z); - if(blk != null) { - System.out.println("ItemConduitProbe.onItemUse: " + blk.getUnlocalizedName()); - } if(player.isSneaking()) { @@ -58,11 +54,14 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider { if(te instanceof IConduitBundle) { IConduitBundle cb = (IConduitBundle) te; Set cons = new HashSet(); + boolean hasInsulated = false; for (IConduit con : cb.getConduits()) { cons.addAll(con.getExternalConnections()); + if(con instanceof IInsulatedRedstoneConduit) { + hasInsulated = true; + } } - - if(cons.isEmpty()) { + if(cons.isEmpty() && !hasInsulated) { return false; } if(cons.size() == 1) { From 04ee947c8dd401bc3e41c787c4e1331cabd4cc16 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Fri, 15 Aug 2014 22:22:14 +0800 Subject: [PATCH 04/15] #852 Basic Fluid Conduit causes performance issues with small fluid volumes. --- .../conduit/liquid/LiquidConduitNetwork.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java index b3af4519..2f5805ed 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java @@ -24,6 +24,8 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork 0 && curTime != timeAtLastApply) { timeAtLastApply = curTime; ConduitNetworkTickHandler.instance.addListener(tickHandler); - //doTick(curTime); } } @@ -76,10 +77,22 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork 40) { + setFluidType(null); + ticksEmpty = 0; + } + } + return; + } + + ticksEmpty = 0; long curTime = cons.get(0).getBundle().getEntity().getWorldObj().getTotalWorldTime(); // 1000 water, 6000 lava - if(liquidType != null && liquidType.getFluid() != null) { + if(liquidType != null && liquidType.getFluid() != null && !isEmpty()) { int visc = Math.max(1000, liquidType.getFluid().getViscosity()); if(curTime % (visc / 500) == 0) { long start = System.nanoTime(); @@ -90,9 +103,6 @@ public class LiquidConduitNetwork extends AbstractTankConduitNetwork Date: Fri, 15 Aug 2014 22:48:31 +0800 Subject: [PATCH 05/15] #875 Item conduit/Crafting station(TC) issue --- .../enderio/conduit/item/NetworkedInventory.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 4dfde36a..c89ec87c 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -175,18 +175,10 @@ public class NetworkedInventory { if(numInserted <= 0) { return false; } - ItemStack curStack = getInventory().getStackInSlot(slot); if(curStack != null) { - curStack = curStack.copy(); - curStack.stackSize -= numInserted; - if(curStack.stackSize > 0) { - getInventory().setInventorySlotContents(slot, curStack); - getInventory().markDirty(); - } else { - getInventory().setInventorySlotContents(slot, null); - getInventory().markDirty(); - } + getInventory().decrStackSize(slot, numInserted); + getInventory().markDirty(); } con.itemsExtracted(numInserted, slot); tickDeficit = Math.round(numInserted * con.getTickTimePerItem(conDir)); From ddcea52d977c1be9292137967186f6e61c22964d Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 16 Aug 2014 00:44:44 +0800 Subject: [PATCH 06/15] What the hell. Its killer joe. --- resources/assets/enderio/lang/en_US.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index c763b974..32d18e39 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -254,7 +254,7 @@ tile.blockZombieGenerator.tooltip.detailed.line2=to generate power enderio.zombieGenerator.fuelTank=Nutrient Tank -tile.blockKillerJoe.name=Caged Killer +tile.blockKillerJoe.name=Killer Joe tile.blockKillerJoe.tooltip.detailed.line1=Attacks nearby creatures when tile.blockKillerJoe.tooltip.detailed.line2=supplied with a sword and tile.blockKillerJoe.tooltip.detailed.line3=Nutrient Distillation From 9446ca681358d29fe0443277dffea68ef854bbf2 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 16 Aug 2014 21:33:17 +0800 Subject: [PATCH 07/15] #876 Item conduit with TE4 caches tranfer only 64 items and stop. Reverted changes in #875 so it only applies to the TiC crafting station. --- .../conduit/item/NetworkedInventory.java | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index c89ec87c..5b012609 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -38,6 +38,9 @@ public class NetworkedInventory { //work around for a vanilla chest changing into a double chest without doing unneeded checks all the time boolean recheckInv = false; + //Hack for TiC crafting station not working correctly when setting output slot to null + boolean ticHack = false; + World world; ItemConduitNetwork network; @@ -51,7 +54,9 @@ public class NetworkedInventory { world = con.getBundle().getWorld(); TileEntity te = world.getTileEntity(location.x, location.y, location.z); - if(te.getClass().getName().contains("cpw.mods.ironchest")) { + if(te.getClass().getName().equals("tconstruct.tools.logic.CraftingStationLogic")) { + ticHack = true; + } else if(te.getClass().getName().contains("cpw.mods.ironchest")) { recheckInv = true; } else if(te instanceof TileEntityChest) { recheckInv = true; @@ -81,8 +86,8 @@ public class NetworkedInventory { boolean isSticky() { return con.getOutputFilter(conDir) != null && con.getOutputFilter(conDir).isValid() && con.getOutputFilter(conDir).isSticky(); } - - int getPriority() { + + int getPriority() { return con.getOutputPriority(conDir); } @@ -177,8 +182,20 @@ public class NetworkedInventory { } ItemStack curStack = getInventory().getStackInSlot(slot); if(curStack != null) { - getInventory().decrStackSize(slot, numInserted); - getInventory().markDirty(); + if(ticHack) { + getInventory().decrStackSize(slot, numInserted); + getInventory().markDirty(); + } else { + curStack = curStack.copy(); + curStack.stackSize -= numInserted; + if(curStack.stackSize > 0) { + getInventory().setInventorySlotContents(slot, curStack); + getInventory().markDirty(); + } else { + getInventory().setInventorySlotContents(slot, null); + getInventory().markDirty(); + } + } } con.itemsExtracted(numInserted, slot); tickDeficit = Math.round(numInserted * con.getTickTimePerItem(conDir)); @@ -329,7 +346,7 @@ public class NetworkedInventory { BlockCoord targetConLoc = null; if(target != null && target.inv != null && target.inv.con != null) { targetConLoc = target.inv.con.getLocation(); - } + } if(targetConLoc != null && target.inv.conDir == dir && targetConLoc.equals(con.getLocation())) { return target; } @@ -344,7 +361,7 @@ public class NetworkedInventory { public ISidedInventory getInventory() { return inv; } - + public int getInventorySide() { return inventorySide; } @@ -352,7 +369,7 @@ public class NetworkedInventory { public void setInventorySide(int inventorySide) { this.inventorySide = inventorySide; } - + static class Target implements Comparable { NetworkedInventory inv; int distance; @@ -375,7 +392,7 @@ public class NetworkedInventory { return 1; } if(priority != o.priority) { - return ItemConduitNetwork.compare(o.priority,priority); + return ItemConduitNetwork.compare(o.priority, priority); } return ItemConduitNetwork.compare(distance, o.distance); } From 14853652a61a764e24e358a30a00ebcb33eba3dd Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 16 Aug 2014 21:40:47 +0800 Subject: [PATCH 08/15] #877 Existing Item Filter GUI button "Show" does not go away when removing filter --- .../enderio/conduit/gui/item/ExistingItemFilterGui.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index 09114375..07cffda4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -192,6 +192,7 @@ public class ExistingItemFilterGui implements IItemFilterGui { stickyB.detach(); gui.removeButton(snapshotB); gui.removeButton(clearB); + gui.removeButton(showB); } public void renderCustomOptions(int top, float par1, int par2, int par3) { From f1d0c916d2332a9a36245226aa3cc575eb8ffcfd Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 16 Aug 2014 22:58:05 +0800 Subject: [PATCH 09/15] #882 SAG Mill doesn't stop crafting silicon from sand when outputs --- .../enderio/machine/AbstractPoweredTaskEntity.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 21606a29..0afeaf2f 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -262,13 +262,22 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { ResultStack[] nextResults = nextRecipe.getCompletedResult(chance, getInputs()); List outputStacks = new ArrayList(slotDefinition.getNumOutputSlots()); if(slotDefinition.getNumOutputSlots() > 0) { + boolean allFull = true; for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { ItemStack st = inventory[i]; if(st != null) { st = st.copy(); + if(allFull && st.stackSize < st.getMaxStackSize()) { + allFull = false; + } + } else { + allFull = false; } outputStacks.add(st); } + if(allFull) { + return false; + } } for (ResultStack result : nextResults) { From a46a155e27bd9ce1c90fbcab2bf0d97a0b4157e1 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sun, 17 Aug 2014 01:13:57 +0800 Subject: [PATCH 10/15] #883 Crash when opening Killer Joe GUI SMP --- .../enderio/machine/killera/TileKillerJoe.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index f14511cc..7811737d 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -115,14 +115,6 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle return 0; } - @Override - public void setInventorySlotContents(int slot, ItemStack contents) { - super.setInventorySlotContents(slot, contents); - if(slot == 0) { - getAttackera().inventory.setInventorySlotContents(0, contents); - } - } - @Override public void updateEntity() { updateArmSwingProgress(); @@ -141,8 +133,6 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle return false; } - //addExperience(1); - if(tanksDirty) { PacketHandler.sendToAllAround(new PacketNutrientLevel(this), this); tanksDirty = false; From 79c4c764ca57740408aa97b4ccbb5080fe54dbed Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 18 Aug 2014 01:25:09 +0800 Subject: [PATCH 11/15] #890 Infinite Energy with BuildCraft engines --- .../crazypants/enderio/machine/power/TileCapacitorBank.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index 43a19c5d..00c5919a 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -263,7 +263,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe } //input any BC energy, yes, after output to avoid losing energy if we can if(powerHandler != null && powerHandler.getEnergyStored() > 0) { - storedEnergy += powerHandler.getEnergyStored(); + storedEnergy += powerHandler.getEnergyStored(); powerHandler.setEnergy(0); } if(isCreative) { @@ -652,7 +652,7 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerRe int canAccept = (int) Math.min(space, maxInput); if(powerHandler == null || canAccept != mjBuf) { mjBuf = canAccept; - powerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(maxInput, mjBuf, maxOutput), this, Type.STORAGE); + powerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(maxInput, mjBuf, maxOutput), this, Type.PIPE); } return powerHandler; } From d53273083925dfdc53801ff91d6d46d739f736c1 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 18 Aug 2014 01:36:57 +0800 Subject: [PATCH 12/15] #881 farmer doesn't stop when full bug --- .../enderio/machine/farm/TileFarmStation.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 06617f81..154f5570 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -290,6 +290,11 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt FarmersCommune.instance.prepareBlock(this, bc, block, meta); block = worldObj.getBlock(bc.x, bc.y, bc.z); } + + if(isOutputFull()) { + return false; + } + if(!isOpen(bc) && hasPower()) { IHarvestResult harvest = FarmersCommune.instance.harvestBlock(this, bc, block, meta); if(harvest != null) { @@ -310,6 +315,16 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt return false; } + private boolean isOutputFull() { + for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { + ItemStack curStack = inventory[i]; + if(curStack == null || curStack.stackSize < curStack.getMaxStackSize()) { + return false; + } + } + return true; + } + public boolean hasSeed(ItemStack seeds, BlockCoord bc) { int slot = getSupplySlotForCoord(bc); ItemStack inv = inventory[slot]; From d8c73b15ad86fa2b9721d025e64584197ee7088b Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 18 Aug 2014 01:56:39 +0800 Subject: [PATCH 13/15] #888 Improved death message for Killer Joe --- .../enderio/machine/killera/BlockKillerJoe.java | 14 ++++++++++++++ .../enderio/machine/killera/TileKillerJoe.java | 8 +++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java index d675a37e..80b816c3 100644 --- a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java @@ -6,8 +6,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fluids.FluidStack; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; @@ -29,12 +32,16 @@ import crazypants.util.Util; */ public class BlockKillerJoe extends AbstractMachineBlock { + static final String USERNAME = "KillerJoe"; + public static BlockKillerJoe create() { PacketHandler.INSTANCE.registerMessage(PacketNutrientLevel.class, PacketNutrientLevel.class, PacketHandler.nextID(), Side.CLIENT); PacketHandler.INSTANCE.registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT); PacketHandler.INSTANCE.registerMessage(PacketExperianceTotal.class, PacketExperianceTotal.class, PacketHandler.nextID(), Side.CLIENT); PacketHandler.INSTANCE.registerMessage(PacketUseXP.class, PacketUseXP.class, PacketHandler.nextID(), Side.SERVER); + BlockKillerJoe res = new BlockKillerJoe(); + MinecraftForge.EVENT_BUS.register(res); res.init(); return res; } @@ -49,6 +56,13 @@ public class BlockKillerJoe extends AbstractMachineBlock { return 2000; } + @SubscribeEvent + public void getKillDisplayName(PlayerEvent.NameFormat nameEvt) { + if(nameEvt.username != null && nameEvt.username.startsWith(USERNAME)) { + nameEvt.displayname = getLocalizedName(); + } + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 7811737d..c356c6e9 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -7,6 +7,8 @@ import java.util.Map; import com.google.common.collect.Multimap; import com.mojang.authlib.GameProfile; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; import net.minecraft.command.IEntitySelector; @@ -33,6 +35,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; @@ -344,11 +347,10 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle FakePlayer getAttackera() { if(attackera == null) { - attackera = new FakePlayer(MinecraftServer.getServer().worldServerForDimension(worldObj.provider.dimensionId), new GameProfile(null, "KillerJoe" - + getLocation())); + attackera = new FakePlayer(MinecraftServer.getServer().worldServerForDimension(worldObj.provider.dimensionId), new GameProfile(null, BlockKillerJoe.USERNAME + ":" + getLocation())); attackera.posX = xCoord + 0.5; attackera.posY = yCoord + 0.5; - attackera.posZ = zCoord + 0.5; + attackera.posZ = zCoord + 0.5; } return attackera; } From e40167b2009b39f8d9a15e2a4dc8912400c9ea53 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 18 Aug 2014 02:06:30 +0800 Subject: [PATCH 14/15] #885 Have Killer Joe face away from player when placed --- .../enderio/machine/AbstractMachineBlock.java | 33 +++++++++---------- .../machine/killera/BlockKillerJoe.java | 14 ++++++++ 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 68498b17..28bd9879 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -253,23 +253,8 @@ public abstract class AbstractMachineBlock exte public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, player, stack); int heading = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; - AbstractMachineEntity te = (AbstractMachineEntity) world.getTileEntity(x, y, z); - switch (heading) { - case 0: - te.setFacing((short) 2); - break; - case 1: - te.setFacing((short) 5); - break; - case 2: - te.setFacing((short) 3); - break; - case 3: - te.setFacing((short) 4); - break; - default: - break; - } + AbstractMachineEntity te = (AbstractMachineEntity) world.getTileEntity(x, y, z); + te.setFacing(getFacingForHeading(heading)); te.readFromItemStack(stack); if(world.isRemote) { return; @@ -277,6 +262,20 @@ public abstract class AbstractMachineBlock exte world.markBlockForUpdate(x, y, z); } + protected short getFacingForHeading(int heading) { + switch (heading) { + case 0: + return 2; + case 1: + return 5; + case 2: + return 3; + case 3: + default: + return 4; + } + } + @Override public void onBlockAdded(World world, int x, int y, int z) { super.onBlockAdded(world, x, y, z); diff --git a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java index 80b816c3..9884885e 100644 --- a/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/BlockKillerJoe.java @@ -128,4 +128,18 @@ public class BlockKillerJoe extends AbstractMachineBlock { return false; } + protected short getFacingForHeading(int heading) { + switch (heading) { + case 0: + return 3; + case 1: + return 4; + case 2: + return 2; + case 3: + default: + return 5; + } + } + } From 73408bb709d7d8973b92509d6954afbbad646f8c Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 18 Aug 2014 02:20:43 +0800 Subject: [PATCH 15/15] #887 Quite Clear Glass dripping --- .../crazypants/enderio/material/BlockFusedQuartz.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index d9d8f3e1..0ec84928 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -154,7 +154,15 @@ public class BlockFusedQuartz extends BlockEio { } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + if(side == ForgeDirection.UP) { //stop drips + return false; + } + return true; + } + + @Override + public boolean canPlaceTorchOnTop(World arg0, int arg1, int arg2, int arg3) { return true; }