From 093a69ed1355becbc7f6c3a3390cde6e053bbdfb Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 12 Nov 2015 17:56:57 +0100 Subject: [PATCH] Made Laser Outputting less unnecessarily for-loopy --- .../java/ellpeck/actuallyadditions/blocks/InitBlocks.java | 6 +++--- .../java/ellpeck/actuallyadditions/items/InitItems.java | 6 +++--- .../actuallyadditions/misc/LaserRelayConnectionHandler.java | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java index 93fee9833..666b963ee 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java @@ -101,13 +101,13 @@ public class InitBlocks{ public static Block blockLaserRelay; public static Block blockBlackLotus; - //public static Block blockCrystal; + public static Block blockCrystal; public static void init(){ ModUtil.LOGGER.info("Initializing Blocks..."); - //blockCrystal = new BlockCrystal(); - //BlockUtil.register(blockCrystal, BlockCrystal.TheItemBlock.class); + blockCrystal = new BlockCrystal(); + BlockUtil.register(blockCrystal, BlockCrystal.TheItemBlock.class); blockBlackLotus = new BlockBlackLotus(); BlockUtil.register(blockBlackLotus); diff --git a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java index c9117e370..2b06cbecb 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/InitItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java @@ -128,13 +128,13 @@ public class InitItems{ public static Item itemChestToCrateUpgrade; public static Item itemLaserWrench; - //public static Item itemCrystal; + public static Item itemCrystal; public static void init(){ ModUtil.LOGGER.info("Initializing Items..."); - //itemCrystal = new ItemCrystal(); - //ItemUtil.register(itemCrystal); + itemCrystal = new ItemCrystal(); + ItemUtil.register(itemCrystal); itemLaserWrench = new ItemLaserWrench(); ItemUtil.register(itemLaserWrench); diff --git a/src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java b/src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java index a8905c153..d88374dad 100644 --- a/src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/misc/LaserRelayConnectionHandler.java @@ -185,6 +185,11 @@ public class LaserRelayConnectionHandler{ transmitted += ((IEnergyReceiver)tile).receiveEnergy(side.getOpposite(), theoreticalReceived-deduct, simulate); transmitted += deduct; + + //If everything that could be transmitted was transmitted + if(transmitted >= maxTransfer){ + return transmitted; + } } } }