From 0f0232469ea38e625fef393f19405a783cd7c681 Mon Sep 17 00:00:00 2001 From: malte0811 Date: Fri, 26 May 2017 12:31:19 +0200 Subject: [PATCH] Fixed energy loss when not transmitting any energy, closes #7 --- changelog.md | 1 + .../wire/TileEntityIC2ConnectorTin.java | 22 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/changelog.md b/changelog.md index acc3bc4..f5cd504 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,7 @@ #####Version 1.4-9 - added Control Panels - They can be used to control and monitor a lot of redstone signals from a few blocks + #####Version 1.3-8 - the converters and the motor don't have missing textures any more when using Chisel #####Version 1.3-7 diff --git a/src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java b/src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java index 82fdf0d..2c8c61b 100644 --- a/src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java +++ b/src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java @@ -17,16 +17,6 @@ */ package malte0811.industrialWires.blocks.wire; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import malte0811.industrialWires.blocks.IBlockBoundsIW; -import net.minecraft.util.math.AxisAlignedBB; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import blusunrize.immersiveengineering.api.ApiUtils; import blusunrize.immersiveengineering.api.TargetingInfo; import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable; @@ -35,7 +25,6 @@ import blusunrize.immersiveengineering.api.energy.wires.ImmersiveNetHandler.Abst import blusunrize.immersiveengineering.api.energy.wires.ImmersiveNetHandler.Connection; import blusunrize.immersiveengineering.api.energy.wires.TileEntityImmersiveConnectable; import blusunrize.immersiveengineering.api.energy.wires.WireType; -import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IBlockBounds; import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces.IDirectionalTile; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; @@ -44,13 +33,22 @@ import ic2.api.energy.tile.IEnergyEmitter; import ic2.api.energy.tile.IEnergySink; import ic2.api.energy.tile.IEnergySource; import malte0811.industrialWires.IIC2Connector; +import malte0811.industrialWires.blocks.IBlockBoundsIW; import malte0811.industrialWires.wires.IC2Wiretype; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.ITickable; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; import net.minecraftforge.common.MinecraftForge; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public class TileEntityIC2ConnectorTin extends TileEntityImmersiveConnectable implements IEnergySource, IEnergySink, IDirectionalTile, ITickable, IIC2Connector, IBlockBoundsIW { EnumFacing f = EnumFacing.NORTH; @@ -86,7 +84,7 @@ public class TileEntityIC2ConnectorTin extends TileEntityImmersiveConnectable im for (AbstractConnection c:conns) { IImmersiveConnectable iic = ApiUtils.toIIC(c.end, worldObj); if (iic instanceof IIC2Connector) { - double tmp = inBuffer-((IIC2Connector)iic).insertEnergy(outputMax, true); + double tmp = outputMax-((IIC2Connector)iic).insertEnergy(outputMax, true); if (tmp>.00000001) { maxOutputs.put(c, new ImmutablePair<>((IIC2Connector)iic, tmp)); sum+=tmp;