From 92f525aa2ab2b5b0e35e8fdef8b796c36b2c5b5f Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 23 Apr 2014 10:04:59 +0800 Subject: [PATCH 01/20] #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT --- ReleaseNotes.txt | 3 +++ .../enderio/teleport/TileTravelAnchor.java | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index f49c6c66..fdb48172 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,6 @@ +1.0.2 +- #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT + 1.0.1 - #567 Improved server startup times when using large EnderIO power networks - #580 Fixed infinite power when mixing TE and EIO conduits in certain ways diff --git a/common/crazypants/enderio/teleport/TileTravelAnchor.java b/common/crazypants/enderio/teleport/TileTravelAnchor.java index 303cf508..2a32b868 100644 --- a/common/crazypants/enderio/teleport/TileTravelAnchor.java +++ b/common/crazypants/enderio/teleport/TileTravelAnchor.java @@ -175,7 +175,9 @@ public class TileTravelAnchor extends TileEntity implements ITravelAccessable { public void writeToNBT(NBTTagCompound root) { super.writeToNBT(root); root.setShort("accessMode", (short) accessMode.ordinal()); - root.setString("placedBy", placedBy); + if(placedBy != null && placedBy.trim().length() > 0) { + root.setString("placedBy", placedBy); + } for (int i = 0; i < password.length; i++) { ItemStack stack = password[i]; if(stack != null) { @@ -186,10 +188,14 @@ public class TileTravelAnchor extends TileEntity implements ITravelAccessable { } StringBuffer userStr = new StringBuffer(); for (String user : authorisedUsers) { - userStr.append(user); - userStr.append(","); + if(user != null && user.trim().length() > 0) { + userStr.append(user); + userStr.append(","); + } + } + if(authorisedUsers.size() > 0) { + root.setString("authorisedUsers", userStr.toString()); } - root.setString("authorisedUsers", userStr.toString()); } @Override From 443c62dce2190521dd338db4a4c198a732dd4c2e Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 23 Apr 2014 10:08:45 +0800 Subject: [PATCH 02/20] Changed default access mode for travel anchors to public. --- common/crazypants/enderio/teleport/TileTravelAnchor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/crazypants/enderio/teleport/TileTravelAnchor.java b/common/crazypants/enderio/teleport/TileTravelAnchor.java index 2a32b868..a3b98a5f 100644 --- a/common/crazypants/enderio/teleport/TileTravelAnchor.java +++ b/common/crazypants/enderio/teleport/TileTravelAnchor.java @@ -23,7 +23,7 @@ public class TileTravelAnchor extends TileEntity implements ITravelAccessable { PROTECTED } - private AccessMode accessMode = AccessMode.PRIVATE; + private AccessMode accessMode = AccessMode.PUBLIC; private ItemStack[] password = new ItemStack[5]; From 9fa7cbf0aecdadbe0f6a762f88a3b9f39f8b6bb6 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 29 Apr 2014 09:24:57 +0800 Subject: [PATCH 03/20] #617 Dynamic Tanks / Mekanism Tanks + EnderIO Conduit crash. --- ReleaseNotes.txt | 1 + .../liquid/AdvancedLiquidConduitNetwork.java | 15 +++++++++++++++ .../enderio/conduit/liquid/LiquidConduit.java | 14 ++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index fdb48172..1e779def 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,5 +1,6 @@ 1.0.2 - #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT +- #617 Dynamic Tanks / Mekanism Tanks + EnderIO Conduit crash. 1.0.1 - #567 Improved server startup times when using large EnderIO power networks diff --git a/common/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java b/common/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java index 7e004ba7..1ab6e688 100644 --- a/common/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java +++ b/common/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java @@ -9,6 +9,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import buildcraft.api.transport.IPipeTile; import buildcraft.api.transport.IPipeTile.PipeType; @@ -241,6 +242,20 @@ public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork 0) { + foundFluid = true; + } + } + } + if(!foundFluid) { + return false; + } + FluidStack drained = extTank.drain(dir.getOpposite(), couldDrain, true); if(drained == null || drained.amount <= 0) { return false; diff --git a/common/crazypants/enderio/conduit/liquid/LiquidConduit.java b/common/crazypants/enderio/conduit/liquid/LiquidConduit.java index 4c143118..00f396b7 100644 --- a/common/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/common/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -137,6 +137,20 @@ public class LiquidConduit extends AbstractTankConduit { IFluidHandler extTank = getTankContainer(getLocation().getLocation(dir)); if(extTank != null) { + + boolean foundFluid = false; + FluidTankInfo[] info = extTank.getTankInfo(dir.getOpposite()); + if(info != null) { + for (FluidTankInfo inf : info) { + if(inf != null && inf.fluid != null && inf.fluid.amount > 0) { + foundFluid = true; + } + } + } + if(!foundFluid) { + return; + } + FluidStack couldDrain = extTank.drain(dir.getOpposite(), MAX_EXTRACT_PER_TICK, false); if(couldDrain != null && couldDrain.amount > 0 && canFill(dir, couldDrain.getFluid())) { int used = pushLiquid(dir, couldDrain, true, network == null ? -1 : network.getNextPushToken()); From c05611c61fd3642659f4b9f80f1f2f3927417609 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 29 Apr 2014 12:10:13 +0800 Subject: [PATCH 04/20] #602 SMP crash with MrCraysFurniture mod. --- common/crazypants/enderio/conduit/BlockConduitBundle.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/crazypants/enderio/conduit/BlockConduitBundle.java b/common/crazypants/enderio/conduit/BlockConduitBundle.java index 63a0bceb..ef9d62ae 100644 --- a/common/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/common/crazypants/enderio/conduit/BlockConduitBundle.java @@ -483,7 +483,11 @@ public class BlockConduitBundle extends Block implements ITileEntityProvider, IC @Override public void breakBlock(World world, int x, int y, int z, int par5, int par6) { - IConduitBundle te = (IConduitBundle) world.getBlockTileEntity(x, y, z); + TileEntity tile = world.getBlockTileEntity(x, y, z); + if(!(tile instanceof IConduitBundle)) { + return; + } + IConduitBundle te = (IConduitBundle) tile; if(te != null) { te.onBlockRemoved(); } From 3cd991ccf4f8e0ddfb2ee050b2df748764135c04 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 29 Apr 2014 12:24:38 +0800 Subject: [PATCH 05/20] #601 Capacitor bank overcharges with BC kinetic pipes --- .../enderio/machine/power/TileCapacitorBank.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/common/crazypants/enderio/machine/power/TileCapacitorBank.java b/common/crazypants/enderio/machine/power/TileCapacitorBank.java index cee900b2..46653ac1 100644 --- a/common/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -64,6 +64,8 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep private int maxOutput; + private int mjBuf = 0; + private boolean multiblockDirty = false; private RedstoneControlMode inputControlMode; @@ -602,9 +604,14 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep PowerHandler doGetPowerHandler() { if(inputEnabled) { - if(powerHandler == null) { - powerHandler = PowerHandlerUtil.createHandler(new BasicCapacitor(maxInput, maxInput, maxOutput), this, Type.STORAGE); + float space = getMaxEnergyStored() - getEnergyStored(); + 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); } + return powerHandler; } return getDisabledPowerHandler(); From 0a15d2cbb9ae10da465b4e512332587743f95d21 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 29 Apr 2014 12:34:22 +0800 Subject: [PATCH 06/20] #607 LiquidConduit modifies FluidStack passed to fill --- ReleaseNotes.txt | 7 +++++-- .../crazypants/enderio/conduit/liquid/LiquidConduit.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 1e779def..82db6f61 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,7 +1,10 @@ 1.0.2 -- #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT +- #601 Capacitor bank overcharges with BC kinetic pipes +- #602 SMP crash with MrCraysFurniture mod. +- #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT +- #607 LiquidConduit modifies FluidStack passed to fill - #617 Dynamic Tanks / Mekanism Tanks + EnderIO Conduit crash. - + 1.0.1 - #567 Improved server startup times when using large EnderIO power networks - #580 Fixed infinite power when mixing TE and EIO conduits in certain ways diff --git a/common/crazypants/enderio/conduit/liquid/LiquidConduit.java b/common/crazypants/enderio/conduit/liquid/LiquidConduit.java index 00f396b7..8b625708 100644 --- a/common/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/common/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -222,7 +222,7 @@ public class LiquidConduit extends AbstractTankConduit { } else { return 0; } - //int recieveAmount = resource.amount; + resource = resource.copy(); resource.amount = Math.min(MAX_IO_PER_TICK, resource.amount); if(doPush) { From 214baaea331138f7e17fb66695e19d51d894c6a4 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 29 Apr 2014 13:30:23 +0800 Subject: [PATCH 07/20] #606 Fixed performance issue when EIO machines where full. --- ReleaseNotes.txt | 1 + .../enderio/machine/AbstractMachineEntity.java | 15 ++++++++++----- .../machine/AbstractPoweredTaskEntity.java | 17 ++++++++++++++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 82db6f61..d7680165 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -2,6 +2,7 @@ - #601 Capacitor bank overcharges with BC kinetic pipes - #602 SMP crash with MrCraysFurniture mod. - #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT +- #606 Fixed performance issue when EIO machines where full. - #607 LiquidConduit modifies FluidStack passed to fill - #617 Dynamic Tanks / Mekanism Tanks + EnderIO Conduit crash. diff --git a/common/crazypants/enderio/machine/AbstractMachineEntity.java b/common/crazypants/enderio/machine/AbstractMachineEntity.java index e44db9e1..e4f9b4b2 100644 --- a/common/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/common/crazypants/enderio/machine/AbstractMachineEntity.java @@ -29,6 +29,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven protected int ticksSinceSync = -1; protected boolean forceClientUpdate = true; protected boolean lastActive; + protected int ticksSinceActiveChanged = 0; protected float lastSyncPowerStored = -1; // Power @@ -221,7 +222,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven @Override public void updateEntity() { - + if(worldObj == null) { // sanity check return; } @@ -229,19 +230,23 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven if(worldObj.isRemote) { // check if the block on the client needs to update its texture if(isActive() != lastActive) { - worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + ticksSinceActiveChanged++; + if(ticksSinceActiveChanged > 20 || isActive()) { + ticksSinceActiveChanged = 0; + worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + lastActive = isActive(); + } } - lastActive = isActive(); return; } // else is server, do all logic only on the server - + storedEnergy = powerHandler.getEnergyStored(); boolean requiresClientSync = forceClientUpdate; if(forceClientUpdate) { // First update, send state to client - forceClientUpdate = false; + forceClientUpdate = false; } boolean prevRedCheck = redstoneCheckPassed; diff --git a/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 03dd375d..aab4c325 100644 --- a/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -13,6 +13,9 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im private final Random random = new Random(); + protected int ticksSinceCheckedRecipe = 0; + protected boolean startFailed = false; + public AbstractPoweredTaskEntity(SlotDefinition slotDefinition) { super(slotDefinition); } @@ -88,11 +91,23 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im return requiresClientSync; } + if(startFailed) { + ticksSinceCheckedRecipe++; + if(ticksSinceCheckedRecipe < 20) { + return false; + } + } + ticksSinceCheckedRecipe = 0; + float chance = random.nextFloat(); // Then see if we need to start a new one IMachineRecipe nextRecipe = canStartNextTask(chance); if(nextRecipe != null) { - requiresClientSync |= startNextTask(nextRecipe, chance); + boolean started = startNextTask(nextRecipe, chance); + startFailed = !started; + requiresClientSync |= started; + } else { + startFailed = true; } return requiresClientSync; } From 55cf30d5f430de2c33df97bbd164e4004ac9acb4 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 29 Apr 2014 13:52:06 +0800 Subject: [PATCH 08/20] #611 Dimensional Transceiver crashing servers with ArrayIndexOutOfBounds --- ReleaseNotes.txt | 3 ++- common/crazypants/enderio/machine/hypercube/TileHyperCube.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index d7680165..7cafc9d2 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -4,7 +4,8 @@ - #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT - #606 Fixed performance issue when EIO machines where full. - #607 LiquidConduit modifies FluidStack passed to fill -- #617 Dynamic Tanks / Mekanism Tanks + EnderIO Conduit crash. +- #611 Dimensional Transceiver crashing servers with ArrayIndexOutOfBounds +- #617 Dynamic Tanks / Mekanism Tanks + EnderIO Conduit crash. 1.0.1 - #567 Improved server startup times when using large EnderIO power networks diff --git a/common/crazypants/enderio/machine/hypercube/TileHyperCube.java b/common/crazypants/enderio/machine/hypercube/TileHyperCube.java index cdf78e07..579751f4 100644 --- a/common/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/common/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -243,6 +243,7 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, fluidHandlersDirty = true; inventoriesDirty = true; redstoneStateDirty = true; + updateInventories(); } @Override From 3ae517ff21704855f76f2d2f54536f48f08ac5c6 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 29 Apr 2014 14:33:49 +0800 Subject: [PATCH 09/20] #621 Staff of Traveling tool tip showing 10x the actual power stored --- ReleaseNotes.txt | 1 + common/crazypants/enderio/teleport/ItemTravelStaff.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 7cafc9d2..34b346fc 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -6,6 +6,7 @@ - #607 LiquidConduit modifies FluidStack passed to fill - #611 Dimensional Transceiver crashing servers with ArrayIndexOutOfBounds - #617 Dynamic Tanks / Mekanism Tanks + EnderIO Conduit crash. +- #621 Staff of Travelling tooltip showing 10x the actual power stored 1.0.1 - #567 Improved server startup times when using large EnderIO power networks diff --git a/common/crazypants/enderio/teleport/ItemTravelStaff.java b/common/crazypants/enderio/teleport/ItemTravelStaff.java index d3e893dd..b08e9b42 100644 --- a/common/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/common/crazypants/enderio/teleport/ItemTravelStaff.java @@ -117,8 +117,8 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) { super.addInformation(itemStack, par2EntityPlayer, list, par4); - String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/" - + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation(); + String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack) / 10) + "/" + + PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack) / 10) + " " + PowerDisplayUtil.abrevation(); list.add(str); } From e1cbd4b6984150461d2895e0e63a83ab69acff4a Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 29 Apr 2014 14:36:16 +0800 Subject: [PATCH 10/20] 1.0.2 - #601 Capacitor bank overcharges with BC kinetic pipes - #602 SMP crash with MrCraysFurniture mod. - #605 Server Crashing - java.lang.IllegalArgumentException: Empty string not allowed/NBT - #606 Fixed performance issue when EIO machines where full. - #607 LiquidConduit modifies FluidStack passed to fill - #611 Dimensional Transceiver crashing servers with ArrayIndexOutOfBounds - #617 Dynamic Tanks / Mekanism Tanks + EnderIO Conduit crash. - #621 Staff of Travelling tooltip showing 10x the actual power stored --- build.xml | 2 +- common/crazypants/enderio/EnderIO.java | 2 +- resources/mcmod.info | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 86b524ed..d7b8fa29 100644 --- a/build.xml +++ b/build.xml @@ -20,7 +20,7 @@ - + diff --git a/common/crazypants/enderio/EnderIO.java b/common/crazypants/enderio/EnderIO.java index 81b2c269..0e4b2492 100644 --- a/common/crazypants/enderio/EnderIO.java +++ b/common/crazypants/enderio/EnderIO.java @@ -70,7 +70,7 @@ import crazypants.enderio.teleport.TeleportRecipes; import crazypants.enderio.trigger.TriggerEnderIO; import crazypants.enderio.trigger.TriggerProviderEIO; -@Mod(name = "EnderIO", modid = "EnderIO", version = "1.0.1", dependencies = "required-after:Forge@[9.11.0.883,)") +@Mod(name = "EnderIO", modid = "EnderIO", version = "1.0.2", dependencies = "required-after:Forge@[9.11.0.883,)") @NetworkMod(clientSideRequired = true, serverSideRequired = true, channels = { "EnderIO" }, packetHandler = PacketHandler.class) public class EnderIO { diff --git a/resources/mcmod.info b/resources/mcmod.info index 7f12069f..d47b52cd 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "EnderIO", "name": "Ender IO", "description": "Compact conduits, painted things and access to your stuff through an eye of ender.", - "version": "1.0.1", + "version": "1.0.2", "mcversion": "1.6.4", "url": "http://enderio.com", "updateUrl": "", From 19449065752689e8b8e57758a9191b97af8cf191 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 29 Apr 2014 21:14:02 -0400 Subject: [PATCH 11/20] Change Ouput to Output --- 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 bada3cf2..49a57903 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -173,7 +173,7 @@ enderio.gui.capBank.inputRs=Input Redstone Mode enderio.gui.capBank.outputRs=Output Redstone Mode enderio.gui.capBank.maxIo=Max I/O enderio.gui.capBank.maxInput=Max Input -enderio.gui.capBank.maxOutput=Max Ouput +enderio.gui.capBank.maxOutput=Max Output //Transceiver enderio.gui.trans.publicChannel=Public Channel From 1d5b93a320ffc1ed163d2414692e133532bed1d3 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 29 Apr 2014 23:39:37 -0400 Subject: [PATCH 12/20] Fixed a bug for multiblock Cap banks in Creative Fixes a bug where multiblock capacitor banks do not update their multiblock configuration in creative. To duplicate original problem, switch to creative mode then create a single block capacitor bank, then attach another single block to create a multiblock, then remove the second capacitor bank to create a single block. The resulting single block capacitor has 200MJ/t and shows an outline which includes the deleted capacitor block area. --- .../machine/power/BlockCapacitorBank.java | 34 +++++++++++++------ .../machine/power/TileCapacitorBank.java | 4 +++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/common/crazypants/enderio/machine/power/BlockCapacitorBank.java b/common/crazypants/enderio/machine/power/BlockCapacitorBank.java index 052e9bd9..d12836c4 100644 --- a/common/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -236,23 +236,36 @@ public class BlockCapacitorBank extends Block implements ITileEntityProvider, IG @Override public boolean removeBlockByPlayer(World world, EntityPlayer player, int x, int y, int z) { - if(!world.isRemote && (!player.capabilities.isCreativeMode || "true".equalsIgnoreCase(System.getProperty("blockCapBankAllwaysDrop")))) { + System.out.println("Block removed by player at "+x+", "+y+", "+z); + System.out.println("world.isRemote: "+world.isRemote); + + if(!world.isRemote) { + System.out.println("I care now!"); + TileEntity te = world.getBlockTileEntity(x, y, z); + if(te instanceof TileCapacitorBank) { TileCapacitorBank cb = (TileCapacitorBank) te; cb.onBreakBlock(); - ItemStack itemStack = - BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); + // If we are not in Creative or blockCapBankAllwaysDrop is set to true, allow the item drop. + // This option allows creative players to pick up broken capacitor banks + + if (!player.capabilities.isCreativeMode || "true".equalsIgnoreCase(System.getProperty("blockCapBankAllwaysDrop"))) { + ItemStack itemStack = + BlockItemCapacitorBank.createItemStackWithPower(cb.doGetEnergyStored()); + float f = 0.7F; + double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; + EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); + entityitem.delayBeforeCanPickup = 10; + world.spawnEntityInWorld(entityitem); + } } } + + System.out.println("Super!"); return super.removeBlockByPlayer(world, player, x, y, z); } @@ -281,6 +294,7 @@ public class BlockCapacitorBank extends Block implements ITileEntityProvider, IG @Override public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + System.out.println("Break block!"); if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { TileEntity te = world.getBlockTileEntity(x, y, z); if(!(te instanceof TileCapacitorBank)) { diff --git a/common/crazypants/enderio/machine/power/TileCapacitorBank.java b/common/crazypants/enderio/machine/power/TileCapacitorBank.java index 46653ac1..06b4d81a 100644 --- a/common/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -709,6 +709,7 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep } public void onBreakBlock() { + System.out.println("On break block!!!!!!!!!!!!!!!"); TileCapacitorBank controller = getController(); controller.clearCurrentMultiblock(); } @@ -763,7 +764,10 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep private void setMultiblock(BlockCoord[] mb) { + if (mb != null) + System.out.println("Incoming multiblock size: "+mb.length); if(multiblock != null && isMaster()) { + // split up current multiblock and reconfigure all the internal capacitors float powerPerBlock = storedEnergy / multiblock.length; for (BlockCoord bc : multiblock) { From b4bb9c201176035e5bddb4f6b971e4f2ed2c78b3 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 29 Apr 2014 23:44:42 -0400 Subject: [PATCH 13/20] Clean up debug statements --- .../enderio/machine/power/BlockCapacitorBank.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/crazypants/enderio/machine/power/BlockCapacitorBank.java b/common/crazypants/enderio/machine/power/BlockCapacitorBank.java index d12836c4..294fd187 100644 --- a/common/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -236,12 +236,7 @@ public class BlockCapacitorBank extends Block implements ITileEntityProvider, IG @Override public boolean removeBlockByPlayer(World world, EntityPlayer player, int x, int y, int z) { - System.out.println("Block removed by player at "+x+", "+y+", "+z); - System.out.println("world.isRemote: "+world.isRemote); - if(!world.isRemote) { - System.out.println("I care now!"); - TileEntity te = world.getBlockTileEntity(x, y, z); if(te instanceof TileCapacitorBank) { @@ -265,7 +260,6 @@ public class BlockCapacitorBank extends Block implements ITileEntityProvider, IG } } - System.out.println("Super!"); return super.removeBlockByPlayer(world, player, x, y, z); } @@ -294,7 +288,6 @@ public class BlockCapacitorBank extends Block implements ITileEntityProvider, IG @Override public void breakBlock(World world, int x, int y, int z, int par5, int par6) { - System.out.println("Break block!"); if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { TileEntity te = world.getBlockTileEntity(x, y, z); if(!(te instanceof TileCapacitorBank)) { From bda094460c952e8142ee71d6c17a963d6f7559b1 Mon Sep 17 00:00:00 2001 From: Liam Date: Tue, 29 Apr 2014 23:48:55 -0400 Subject: [PATCH 14/20] Cleanup of debug code --- .../crazypants/enderio/machine/power/TileCapacitorBank.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/crazypants/enderio/machine/power/TileCapacitorBank.java b/common/crazypants/enderio/machine/power/TileCapacitorBank.java index 06b4d81a..f5aa469c 100644 --- a/common/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -709,7 +709,6 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep } public void onBreakBlock() { - System.out.println("On break block!!!!!!!!!!!!!!!"); TileCapacitorBank controller = getController(); controller.clearCurrentMultiblock(); } @@ -763,11 +762,7 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep } private void setMultiblock(BlockCoord[] mb) { - - if (mb != null) - System.out.println("Incoming multiblock size: "+mb.length); if(multiblock != null && isMaster()) { - // split up current multiblock and reconfigure all the internal capacitors float powerPerBlock = storedEnergy / multiblock.length; for (BlockCoord bc : multiblock) { From 710501f3e2389b731950c4a2ac03c6b4c739f2f0 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 30 Apr 2014 00:56:04 -0400 Subject: [PATCH 15/20] Makes cap upgrades remember their limits This change makes capacitor banks remember the limits which were set to them before being expanded. This way, a single block capacitor bank with an IO of 100MJ/t and user-specified output of 50 MJ/t, when expanded with another bank next to it will become a bank with IO of 200MJ/t and user-specified output of... 50MJ/t! However, if you have a bank which has maximum input or output, that will expand. Since input and output is handled seperately, you can have an output limit while still expanding the input limit. --- .../machine/power/TileCapacitorBank.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/common/crazypants/enderio/machine/power/TileCapacitorBank.java b/common/crazypants/enderio/machine/power/TileCapacitorBank.java index f5aa469c..f4106e27 100644 --- a/common/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -745,6 +745,17 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep mb[i] = new BlockCoord(blocks.get(i)); } + TileCapacitorBank secondary = blocks.get(1); + maxInput = maxOutput = -1; + + if (secondary.maxInput != secondary.maxIO) { + maxInput = secondary.maxInput; + } + + if (secondary.maxOutput != secondary.maxIO) { + maxOutput = secondary.maxOutput; + } + for (TileCapacitorBank cb : blocks) { cb.setMultiblock(mb); } @@ -770,8 +781,8 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep if(cb != null) { cb.maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); cb.maxIO = BASE_CAP.getMaxEnergyExtracted(); - cb.maxInput = cb.maxIO; - cb.maxOutput = cb.maxIO; + cb.maxInput = Math.min(cb.maxInput, cb.maxIO); + cb.maxOutput = Math.min(cb.maxOutput, cb.maxIO); cb.storedEnergy = powerPerBlock; cb.updatePowerHandler(); cb.multiblockDirty = true; @@ -804,14 +815,15 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep storedEnergy = totalStored; maxStoredEnergy = totalCap; maxIO = totalIO; - maxInput = maxIO; - maxOutput = maxIO; + maxInput = maxInput < 0 ? maxIO : Math.min(maxInput, maxIO); + maxOutput = maxOutput < 0 ? maxIO : Math.min(maxOutput, maxIO); + for (BlockCoord bc : multiblock) { TileCapacitorBank cb = getCapBank(bc); - if(cb != null) { + if(cb != null && cb != this) { cb.maxIO = totalIO; - cb.maxInput = maxIO; - cb.maxOutput = maxIO; + cb.maxInput = maxInput; + cb.maxOutput = maxOutput; } } @@ -1002,7 +1014,7 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep render = true; } } - + maxIO = nbtRoot.getInteger("maxIO"); if(nbtRoot.hasKey("maxInput")) { maxInput = nbtRoot.getInteger("maxInput"); From 207bc57512ede70a612733867a214b88b28ce803 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 2 May 2014 00:21:04 -0400 Subject: [PATCH 16/20] Important: Please see related issue #580, as this modifies code added to prevent that situation. Activating Extract mode causes the receivedTicks collection to be created. This collection is never removed and is not updated except when receiving energy, which is not done when Insert or In/Out is active. This change overrides AbstractPowerConduit.setConnectionMode() to handle clearing the extra state added by Extract mode, which allows Insert or In/Out to be used on cap banks after Extract has been selected once. This issue was initially reported as Insert mode not working when initially set. After the server was restarted the conduit would then work properly. The problem was actually the scrolling past Extract mode on the way to Insert. --- common/crazypants/enderio/conduit/power/PowerConduit.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/crazypants/enderio/conduit/power/PowerConduit.java b/common/crazypants/enderio/conduit/power/PowerConduit.java index 3b4df3e4..2fd7b81a 100644 --- a/common/crazypants/enderio/conduit/power/PowerConduit.java +++ b/common/crazypants/enderio/conduit/power/PowerConduit.java @@ -386,6 +386,12 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { return super.onNeighborBlockChange(blockId); } + @Override + public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { + super.setConnectionMode(dir, mode); + recievedTicks = null; + } + @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { if(getMaxEnergyRecieved(from) == 0 || maxReceive <= 0) { From a708ea2603daa6bac3a4246967a8fb682dec7967 Mon Sep 17 00:00:00 2001 From: Liam Date: Fri, 2 May 2014 01:51:06 -0400 Subject: [PATCH 17/20] Fixes ItemUtil bug, validity of move not checked Capacitors will no longer fill up with non-chargeable items when next to a dimensional transceiver which is receiving items. --- common/crazypants/util/ItemUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/crazypants/util/ItemUtil.java b/common/crazypants/util/ItemUtil.java index 32d4deee..1da819fb 100644 --- a/common/crazypants/util/ItemUtil.java +++ b/common/crazypants/util/ItemUtil.java @@ -105,6 +105,9 @@ public class ItemUtil { } } + if (!inv.isItemValidForSlot(slot, toInsert)) + inserted = 0; + if(inserted > 0) { numInserted += inserted; numToInsert -= inserted; From b0946b2f93ecbd42dfa27c948365dc249b2f0d60 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 5 May 2014 14:07:37 +0800 Subject: [PATCH 18/20] Russian localization (ZigTheHedge) --- ReleaseNotes.txt | 1 + resources/assets/enderio/lang/ru_RU.lang | 234 +++++++++++++++++++++++ 2 files changed, 235 insertions(+) create mode 100644 resources/assets/enderio/lang/ru_RU.lang diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4298cc0f..245bb277 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -2,6 +2,7 @@ - Capacitor Banks remember their IO limits when block are added/removed. (William Lahti) - #627 Insert mode on Conduit stops transfer (William Lahti) - #638 Capacitor Banks charging slots filling with junk (William Lahti) +- Russian localization (ZigTheHedge) 1.0.2 - #601 Capacitor bank overcharges with BC kinetic pipes diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang new file mode 100644 index 00000000..b72c52d7 --- /dev/null +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -0,0 +1,234 @@ +//*** Ender IO *****// + +//Power +enderio.power.mj=MJ +enderio.power.rf=RF +enderio.power.tick=/тик +enderio.power.maxOutput=Макс. выход + +//Ender IO / Enderface +tile.blockEnderIo.name=Интерфейс края +item.enderio.itemEnderface.name=Лицо края + +//Conduits +enderio.blockConduitBundle=Связка труб +enderio.blockConduitFacade=Фасад +item.enderio.itemConduitFacade.name=Фасад + +enderio.itemPowerConduit.name=Энегротруба +enderio.itemPowerConduitEnhanced.name=Расширенная энерготруба +enderio.itemPowerConduitEnder.name=Энерготруба края + +enderio.itemRedstoneConduit.name=Труба редстоуна +enderio.itemRedstoneConduitSwitch.name=Переключатель труб +enderio.itemRedstoneConduitInsulated.name=Изолированная труба редстоуна + +enderio.itemLiquidConduit.name=Жидкостная труба +enderio.itemLiquidConduitAdvanced.name=Жидкостная труба высокого давления +enderio.itemLiquidConduit.lockedType=Тип жидкости установлен на +enderio.itemLiquidConduit.unlockedType=Тип жидкости не установлен + +enderio.itemItemConduit.name=Вещевая труба +enderio.itemItemConduitEmpowered.name=Усиленная вещевая труба + +enderio.itemMeConduit.name=Труба ME + +//Materials +enderio.itemMaterial.name=Материалы +enderio.silicon.name=Кремний +enderio.conduitBinder.name=Связующий элемент труб +enderio.binderComposite.name=Составной связующий элемент +enderio.phasedIronNugget.name=Самородок пульсирующего железа + +//Crafting components +enderio.itemMachinePart.name=Мелкие детали +enderio.machineChassi.name=Шасси +enderio.basicGear.name=Шестеренка +enderio.pulsatingCrystal.name=Пульсирующий кристалл +enderio.vibrantCrystal.name=Вибрирущий кристалл + + +//Quartz / Glass +enderio.blockFusedQuartz=Расплавленный кварц +enderio.blockFusedQuartz.fusedQuartz.name=Расплавленный кварц +enderio.blockFusedQuartz.fusedGlass.name=Почти прозрачное стекло + +item.enderio.itemFusedQuartzFrame.name=Рамка из расплавленного кварца +enderio.itemPowderIngot=Порошки и слитки + +//Alloys +enderio.itemAlloy.name=Сплав +enderio.electricalSteel.name=Наэлектризованная сталь +enderio.energeticAlloy.name=Энергетический сплав +enderio.phasedGold.name=Вибрирующий сплав +enderio.redstoneAlloy.name=Сплав из редстоуна +enderio.conductiveIron.name=Проводящее железо +enderio.phasedIron.name=Пульсирующее железо +enderio.vibrantNugget.name=Вибрирующий самородок + +//Powder / Ingot +enderio.powderCoal.name=Угольный порошок +enderio.powderIron.name=Железный порошок +enderio.powderGold.name=Золотой порошок +enderio.powderCopper.name=Медный порошок +enderio.powderTin.name=Оловянный порошок +enderio.powderEnder.name=Порошок из жемчуга края + +//Capacitors +enderio.itemBasicCapacitor.name=Конденсатор +enderio.basicCapacitor.name=Базовый конденсатор +enderio.activatedCapacitor.name=Двуслойный конденсатор +enderio.enderCapacitor.name=Восьмислойный конденсатор + +//Machines +tile.enderio.blockStirlingGenerator.name=Генератор Стирлинга +tile.enderio.blockReservoir.name=Резервуар +tile.enderio.blockAlloySmelter.name=Завод сплавов +tile.enderio.blockSolarPanel.name=Фотовольтовая ячейка +tile.enderio.blockElectricLight.name=Электрический светильник +tile.enderio.blockCapacitorBank.name=Блок конденсаторов +tile.enderio.blockCapacitorBank.tooltipPrefix=Содержит +tile.enderio.blockCrusher.name=Дробилка +tile.enderio.blockHyperCube.name=Пространственный трансивер +tile.enderio.blockPowerMonitor.name=Индикатор мощности + +//Travel +tile.enderio.blockTravelPlatform.name=Путеводный якорь +enderio.blockTravelPlatform.invalidTarget=Место назначения заблокировано +enderio.blockTravelPlatform.outOfRange=Место назначения за пределами радиуса действия +item.enderio.itemTravelStaff.name=Посох путешественника +enderio.itemTravelStaff.notEnoughPower=Недостаточно энергии + +//Painter +tile.enderio.blockPainter.name=Покрасочная машина +enderio.blockPainter.paintedWith=Покрашено в: +enderio.blockCustomFence=Покрашенный забор +enderio.blockCustomFenceGate=Покрашенная калитка +enderio.blockCustomWall=Покрашенная стена +enderio.blockCustomStair=Покрашенные ступени +enderio.blockCustomSlab=Покрашенная платформа +enderio.blockCustomDoubleSlab=Покрашенная платформа + +//Items +item.enderio.itemYetaWrench.name=Ключ Yeta +item.enderio.itemMJReader.name=Зонд + +enderio.itemEnderface.wrongDimension=Интерфейс края находится в другом измерении. +enderio.itemEnderface.tooFar=Интерфейс края слишком далеко. +enderio.itemEnderface.destroyed=Интерфейс края был уничтожен. +enderio.itemEnderface.noSync=Лицо края не синхронизировано с Интерфейсом края. + + +//------GUI + +enderio.gui.enabled=Включено +enderio.gui.disabled=Выключено +enderio.gui.send=Отправлять +enderio.gui.recieve=Получать +enderio.gui.sendRecieve=Отправлять и получать + +//Redstone controls +enderio.gui.tooltip.redstoneControlMode=Режим редстоуна +enderio.gui.tooltip.redstoneControlMode.ignore=Всегда активен +enderio.gui.tooltip.redstoneControlMode.on=Активен по сигналу +enderio.gui.tooltip.redstoneControlMode.off=Активен без сигнала +enderio.gui.tooltip.redstoneControlMode.never=Всегда выключен + +//Power Monitor +enderio.gui.powerMonitor.engineControl=Управление двигателем +enderio.gui.powerMonitor.emit=Подавать сигнал +enderio.gui.powerMonitor.engineSection1=Подать сигнал, если хранилище заполнено меньше +enderio.gui.powerMonitor.engineSection2=чем на +enderio.gui.powerMonitor.engineSection3=%. +enderio.gui.powerMonitor.engineSection4= Остановиться, если хранилище заполнено более +enderio.gui.powerMonitor.engineSection5=или точно +enderio.gui.powerMonitor.of=на +enderio.gui.powerMonitor.monHeading1=Энергия в трубе +enderio.gui.powerMonitor.monHeading2=Энергия в Блоке конденсаторов +enderio.gui.powerMonitor.monHeading3=Энергия в машине +enderio.gui.powerMonitor.monHeading4=Средний вывод за 5 секунд +enderio.gui.powerMonitor.monHeading5=Средний ввод за 5 секунд + +//MJ Reader +enderio.gui.mjReader.networkHeading=Силовая сеть +enderio.gui.mjReader.conduitBuffer=Встроенный буфер +enderio.gui.mjReader.requestRange=Диапазон запросов за тик +enderio.gui.mjReader.currentRequest=Текущее потребление +enderio.gui.mjReader.itemHeading=Вещевая труба +enderio.gui.mjReader.itemNoConnections=не имеет внешних соединений +enderio.gui.mjReader.noPowerFromSide=не может получать энергию с этой стороны +enderio.gui.mjReader.connectionDir=соединение с +enderio.gui.mjReader.extractedItems=Экспортируемые предметы +enderio.gui.mjReader.extractedItem=Предмет +enderio.gui.mjReader.noOutputs=нет доступных выводов +enderio.gui.mjReader.insertedInto=будет направлен: +enderio.gui.mjReader.noItems=Не получает предметов. +enderio.gui.mjReader.noItem=Не может получать +enderio.gui.mjReader.receiveItems=Может получать предметы от: +enderio.gui.mjReader.receiveItem1=Может получать +enderio.gui.mjReader.receiveItem2=от: + +//CapactorBank +enderio.gui.capBank.inputRs=Режим редстоуна на вводе +enderio.gui.capBank.outputRs=Режим редстоуна на выводе +enderio.gui.capBank.maxIo=Максимальный Ввод-Вывод +enderio.gui.capBank.maxInput=Макисмальный ввод +enderio.gui.capBank.maxOutput=Максимальный вывод + +//Transceiver +enderio.gui.trans.publicChannel=Общедоступный канал +enderio.gui.trans.privateChannel=Частный канал +enderio.gui.trans.addChannel=Добавить канал +enderio.gui.trans.deleteChannel=Удалить канал +enderio.gui.trans.activateChannel=Активировать канал +enderio.gui.trans.powerMode=Режим энергии +enderio.gui.trans.fluidMode=Режим жидкости +enderio.gui.trans.itemMode=Режим предметов +enderio.gui.trans.publicHeading=Общедоступный +enderio.gui.trans.privateHeading=Частный + +//Alloy Smelter +enderio.gui.alloy.mode.heading=Режим печи +enderio.gui.alloy.mode.all=Пережарка всех материалов +enderio.gui.alloy.mode.alloy=Только сплавы +enderio.gui.alloy.mode.furnace=Только обычные рецепты + +//Travel Blocks +enderio.gui.travelAccessable.privateBlock1=Только +enderio.gui.travelAccessable.privateBlock2=может управлять настройками этого блока. +enderio.gui.travelAccessable.public=Общедоступный +enderio.gui.travelAccessable.private=Частный +enderio.gui.travelAccessable.protected=Защищенный +enderio.gui.travelAccessable.unauthorised=Вам запрещен доступ к этому блоку. +enderio.gui.travelAccessable.enterCode=Требуется код доступа +enderio.gui.travelAccessable.ok=Авторизоваться + +//conduits +enderio.gui.conduit.ioMode=Режим +enderio.gui.conduit.ioMode.inOut=Ввод / Вывод +enderio.gui.conduit.ioMode.input=Извлекать +enderio.gui.conduit.ioMode.output=Помещать +enderio.gui.conduit.ioMode.disabled=Отключен +enderio.gui.conduit.ioMode.notSet=По-умолчанию + +enderio.gui.conduit.item.insertionFilter=Фильтр на помещение +enderio.gui.conduit.item.extractionFilter=Фильтр на извлечение +enderio.gui.conduit.item.sigCol=Цвет сигнала +enderio.gui.conduit.item.channel=Канал +enderio.gui.conduit.item.ignoreMetaData=Игнорировать META +enderio.gui.conduit.item.matchMetaData=Соблюдать META +enderio.gui.conduit.item.whitelist=Белый список +enderio.gui.conduit.item.blacklist=Черный список +enderio.gui.conduit.item.stickyEnabled=Включен "липкий" режим|Выбранные предметы будут|отправляться только на|"липкие" выводы. +enderio.gui.conduit.item.stickyDisbaled="Липкий" режим выключен +enderio.gui.conduit.item.ignoreNBT=Игнорировать NBT +enderio.gui.conduit.item.matchNBT=Соблюдать NBT +enderio.gui.conduit.item.oreDicEnabled=Использовать Ore Dictionary +enderio.gui.conduit.item.oreDicDisabled=Игнорировать Ore Dictionary +enderio.gui.conduit.item.selfFeedEnabled=Автоподача активна +enderio.gui.conduit.item.selfFeedDisabled=Автоподача отключена + +enderio.gui.conduit.redstone.signalColor=Цвет сигнала +enderio.gui.conduit.redstone.color=Цвет + +enderio.gui.conduit.fluid.autoExtract=Автопомпа From 31548eda41b997e71eee9e2b671e0c8b4aa8bc17 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 7 May 2014 00:21:21 -0400 Subject: [PATCH 19/20] Fixes #634 and #658 First, only include caps connected with In/Out in expected balance ratio / fill+max numbers. Second, only include caps connected with In/Out in actual balance operations --- .../conduit/power/NetworkPowerManager.java | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/common/crazypants/enderio/conduit/power/NetworkPowerManager.java b/common/crazypants/enderio/conduit/power/NetworkPowerManager.java index d6c1b174..0280fb70 100644 --- a/common/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/common/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -10,12 +10,14 @@ import java.util.Map; import java.util.Set; import net.minecraft.world.World; +import net.minecraftforge.common.ForgeDirection; import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; import cpw.mods.fml.common.TickType; import crazypants.enderio.Config; import crazypants.enderio.Log; import crazypants.enderio.conduit.ConduitNetworkTickHandler; +import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener; import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry; import crazypants.enderio.machine.power.TileCapacitorBank; @@ -453,6 +455,10 @@ public class NetworkPowerManager { canFill = 0; stored = 0; maxCap = 0; + + float toBalance = 0; + float maxToBalance = 0; + for (ReceptorEntry rec : storageReceptors) { TileCapacitorBank cb = (TileCapacitorBank) rec.powerInterface.getDelegate(); cb = cb.getController(); @@ -464,6 +470,11 @@ public class NetworkPowerManager { maxCap += cb.getMaxEnergyStored(); capBanks.add(cb); + if (rec.emmiter.getConectionMode(rec.direction) == ConnectionMode.IN_OUT) { + toBalance += cb.getEnergyStored(); + maxToBalance += cb.getMaxEnergyStored(); + } + float canGet = 0; if(cb.isOutputEnabled(rec.direction.getOpposite())) { @@ -477,14 +488,15 @@ public class NetworkPowerManager { canFill = Math.min(canFill, rec.emmiter.getMaxEnergyExtracted(rec.direction)); this.canFill += canFill; } - enteries.add(new CapBankSupplyEntry(cb, canGet, canFill, rec.emmiter)); + + enteries.add(new CapBankSupplyEntry(cb, canGet, canFill, rec.emmiter, rec.direction)); } } filledRatio = 0; - if(maxCap > 0) { - filledRatio = stored / maxCap; + if(maxToBalance > 0) { + filledRatio = toBalance / maxToBalance; } } @@ -496,6 +508,8 @@ public class NetworkPowerManager { int canRemove = 0; int canAdd = 0; for (CapBankSupplyEntry entry : enteries) { + if (entry.emmiter.getConectionMode(entry.direction) != ConnectionMode.IN_OUT) + continue; entry.calcToBalance(filledRatio); if(entry.toBalance < 0) { canRemove += -entry.toBalance; @@ -508,6 +522,8 @@ public class NetworkPowerManager { for (int i = 0; i < enteries.size() && toalTransferAmount > 0; i++) { CapBankSupplyEntry from = enteries.get(i); + if (from.emmiter.getConectionMode(from.direction) != ConnectionMode.IN_OUT) + continue; float amount = from.toBalance; amount = minAbs(amount, toalTransferAmount); from.capBank.addEnergy(amount); @@ -574,11 +590,14 @@ public class NetworkPowerManager { final float canFill; float toBalance; IPowerConduit emmiter; + ForgeDirection direction; - private CapBankSupplyEntry(TileCapacitorBank capBank, float available, float canFill, IPowerConduit emmiter) { + private CapBankSupplyEntry(TileCapacitorBank capBank, float available, float canFill, IPowerConduit emmiter, ForgeDirection direction) { this.capBank = capBank; this.canExtract = available; this.canFill = canFill; + this.direction = direction; + this.emmiter = emmiter; } void calcToBalance(float targetRatio) { From 145a8f47bced69f7d268a0f30fa064cdc8dbe7fd Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 9 May 2014 19:19:53 +0400 Subject: [PATCH 20/20] Update ru_RU.lang --- resources/assets/enderio/lang/ru_RU.lang | 88 ++++++++++++------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index b72c52d7..12723bde 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -1,51 +1,51 @@ //*** Ender IO *****// //Power -enderio.power.mj=MJ -enderio.power.rf=RF +enderio.power.mj=мДЖ +enderio.power.rf=РФ enderio.power.tick=/тик enderio.power.maxOutput=Макс. выход //Ender IO / Enderface -tile.blockEnderIo.name=Интерфейс края -item.enderio.itemEnderface.name=Лицо края +enderio.blockEnderIo=Интерфейс Края +item.enderio.itemEnderface.name=Лицо Края //Conduits enderio.blockConduitBundle=Связка труб -enderio.blockConduitFacade=Фасад -item.enderio.itemConduitFacade.name=Фасад +enderio.blockConduitFacade=Фасад для труб +item.enderio.itemConduitFacade.name=Фасад для труб -enderio.itemPowerConduit.name=Энегротруба -enderio.itemPowerConduitEnhanced.name=Расширенная энерготруба -enderio.itemPowerConduitEnder.name=Энерготруба края +enderio.itemPowerConduit.name=Энергетическая труба +enderio.itemPowerConduitEnhanced.name=Расширенная энергетическая труба +enderio.itemPowerConduitEnder.name=Энергетическая труба Края -enderio.itemRedstoneConduit.name=Труба редстоуна +enderio.itemRedstoneConduit.name=Красная труба enderio.itemRedstoneConduitSwitch.name=Переключатель труб -enderio.itemRedstoneConduitInsulated.name=Изолированная труба редстоуна +enderio.itemRedstoneConduitInsulated.name=Изолированная красная труба enderio.itemLiquidConduit.name=Жидкостная труба enderio.itemLiquidConduitAdvanced.name=Жидкостная труба высокого давления enderio.itemLiquidConduit.lockedType=Тип жидкости установлен на enderio.itemLiquidConduit.unlockedType=Тип жидкости не установлен -enderio.itemItemConduit.name=Вещевая труба -enderio.itemItemConduitEmpowered.name=Усиленная вещевая труба +enderio.itemItemConduit.name=Предметная труба +enderio.itemItemConduitEmpowered.name=Усиленная предметная труба -enderio.itemMeConduit.name=Труба ME +enderio.itemMeConduit.name=МЭ труба //Materials enderio.itemMaterial.name=Материалы enderio.silicon.name=Кремний enderio.conduitBinder.name=Связующий элемент труб enderio.binderComposite.name=Составной связующий элемент -enderio.phasedIronNugget.name=Самородок пульсирующего железа +enderio.phasedIronNugget.name=Пульсирующий железный самородок //Crafting components -enderio.itemMachinePart.name=Мелкие детали -enderio.machineChassi.name=Шасси -enderio.basicGear.name=Шестеренка +enderio.itemMachinePart.name=Детали механизма +enderio.machineChassi.name=Шасси механизма +enderio.basicGear.name=Обычная шестерня enderio.pulsatingCrystal.name=Пульсирующий кристалл -enderio.vibrantCrystal.name=Вибрирущий кристалл +enderio.vibrantCrystal.name=Вибрирующий кристалл //Quartz / Glass @@ -61,7 +61,7 @@ enderio.itemAlloy.name=Сплав enderio.electricalSteel.name=Наэлектризованная сталь enderio.energeticAlloy.name=Энергетический сплав enderio.phasedGold.name=Вибрирующий сплав -enderio.redstoneAlloy.name=Сплав из редстоуна +enderio.redstoneAlloy.name=Сплав из красного камня enderio.conductiveIron.name=Проводящее железо enderio.phasedIron.name=Пульсирующее железо enderio.vibrantNugget.name=Вибрирующий самородок @@ -72,12 +72,12 @@ enderio.powderIron.name=Железный порошок enderio.powderGold.name=Золотой порошок enderio.powderCopper.name=Медный порошок enderio.powderTin.name=Оловянный порошок -enderio.powderEnder.name=Порошок из жемчуга края +enderio.powderEnder.name=Порошок из жемчуга Края //Capacitors enderio.itemBasicCapacitor.name=Конденсатор enderio.basicCapacitor.name=Базовый конденсатор -enderio.activatedCapacitor.name=Двуслойный конденсатор +enderio.activatedCapacitor.name=Двухслойный конденсатор enderio.enderCapacitor.name=Восьмислойный конденсатор //Machines @@ -100,23 +100,23 @@ item.enderio.itemTravelStaff.name=Посох путешественника enderio.itemTravelStaff.notEnoughPower=Недостаточно энергии //Painter -tile.enderio.blockPainter.name=Покрасочная машина +tile.enderio.blockPainter.name=Покрасочный механизм enderio.blockPainter.paintedWith=Покрашено в: enderio.blockCustomFence=Покрашенный забор enderio.blockCustomFenceGate=Покрашенная калитка enderio.blockCustomWall=Покрашенная стена enderio.blockCustomStair=Покрашенные ступени -enderio.blockCustomSlab=Покрашенная платформа -enderio.blockCustomDoubleSlab=Покрашенная платформа +enderio.blockCustomSlab=Покрашенная плита +enderio.blockCustomDoubleSlab=Покрашенная плита //Items item.enderio.itemYetaWrench.name=Ключ Yeta item.enderio.itemMJReader.name=Зонд -enderio.itemEnderface.wrongDimension=Интерфейс края находится в другом измерении. -enderio.itemEnderface.tooFar=Интерфейс края слишком далеко. -enderio.itemEnderface.destroyed=Интерфейс края был уничтожен. -enderio.itemEnderface.noSync=Лицо края не синхронизировано с Интерфейсом края. +enderio.itemEnderface.wrongDimension=Интерфейс Края находится в другом измерении. +enderio.itemEnderface.tooFar=Интерфейс Края слишком далеко. +enderio.itemEnderface.destroyed=Интерфейс Края был уничтожен. +enderio.itemEnderface.noSync=Лицо Края не синхронизировано с интерфейсом Края. //------GUI @@ -128,7 +128,7 @@ enderio.gui.recieve=Получать enderio.gui.sendRecieve=Отправлять и получать //Redstone controls -enderio.gui.tooltip.redstoneControlMode=Режим редстоуна +enderio.gui.tooltip.redstoneControlMode=Режим красного камня enderio.gui.tooltip.redstoneControlMode.ignore=Всегда активен enderio.gui.tooltip.redstoneControlMode.on=Активен по сигналу enderio.gui.tooltip.redstoneControlMode.off=Активен без сигнала @@ -144,8 +144,8 @@ enderio.gui.powerMonitor.engineSection4= Остановиться, если хр enderio.gui.powerMonitor.engineSection5=или точно enderio.gui.powerMonitor.of=на enderio.gui.powerMonitor.monHeading1=Энергия в трубе -enderio.gui.powerMonitor.monHeading2=Энергия в Блоке конденсаторов -enderio.gui.powerMonitor.monHeading3=Энергия в машине +enderio.gui.powerMonitor.monHeading2=Энергия в блоке конденсаторов +enderio.gui.powerMonitor.monHeading3=Энергия в механизме enderio.gui.powerMonitor.monHeading4=Средний вывод за 5 секунд enderio.gui.powerMonitor.monHeading5=Средний ввод за 5 секунд @@ -154,7 +154,7 @@ enderio.gui.mjReader.networkHeading=Силовая сеть enderio.gui.mjReader.conduitBuffer=Встроенный буфер enderio.gui.mjReader.requestRange=Диапазон запросов за тик enderio.gui.mjReader.currentRequest=Текущее потребление -enderio.gui.mjReader.itemHeading=Вещевая труба +enderio.gui.mjReader.itemHeading=Предметная труба enderio.gui.mjReader.itemNoConnections=не имеет внешних соединений enderio.gui.mjReader.noPowerFromSide=не может получать энергию с этой стороны enderio.gui.mjReader.connectionDir=соединение с @@ -169,10 +169,10 @@ enderio.gui.mjReader.receiveItem1=Может получать enderio.gui.mjReader.receiveItem2=от: //CapactorBank -enderio.gui.capBank.inputRs=Режим редстоуна на вводе -enderio.gui.capBank.outputRs=Режим редстоуна на выводе +enderio.gui.capBank.inputRs=Режим красного камня на вводе +enderio.gui.capBank.outputRs=Режим красного камня на выводе enderio.gui.capBank.maxIo=Максимальный Ввод-Вывод -enderio.gui.capBank.maxInput=Макисмальный ввод +enderio.gui.capBank.maxInput=Максимальный ввод enderio.gui.capBank.maxOutput=Максимальный вывод //Transceiver @@ -189,7 +189,7 @@ enderio.gui.trans.privateHeading=Частный //Alloy Smelter enderio.gui.alloy.mode.heading=Режим печи -enderio.gui.alloy.mode.all=Пережарка всех материалов +enderio.gui.alloy.mode.all=Выплавка всех материалов enderio.gui.alloy.mode.alloy=Только сплавы enderio.gui.alloy.mode.furnace=Только обычные рецепты @@ -199,9 +199,9 @@ enderio.gui.travelAccessable.privateBlock2=может управлять нас enderio.gui.travelAccessable.public=Общедоступный enderio.gui.travelAccessable.private=Частный enderio.gui.travelAccessable.protected=Защищенный -enderio.gui.travelAccessable.unauthorised=Вам запрещен доступ к этому блоку. +enderio.gui.travelAccessable.unauthorised=Вам запрещён доступ к этому блоку. enderio.gui.travelAccessable.enterCode=Требуется код доступа -enderio.gui.travelAccessable.ok=Авторизоваться +enderio.gui.travelAccessable.ok=Авторизироваться //conduits enderio.gui.conduit.ioMode=Режим @@ -215,11 +215,11 @@ enderio.gui.conduit.item.insertionFilter=Фильтр на помещение enderio.gui.conduit.item.extractionFilter=Фильтр на извлечение enderio.gui.conduit.item.sigCol=Цвет сигнала enderio.gui.conduit.item.channel=Канал -enderio.gui.conduit.item.ignoreMetaData=Игнорировать META -enderio.gui.conduit.item.matchMetaData=Соблюдать META +enderio.gui.conduit.item.ignoreMetaData=Игнорировать Meta данные +enderio.gui.conduit.item.matchMetaData=Соблюдать Meta данные enderio.gui.conduit.item.whitelist=Белый список -enderio.gui.conduit.item.blacklist=Черный список -enderio.gui.conduit.item.stickyEnabled=Включен "липкий" режим|Выбранные предметы будут|отправляться только на|"липкие" выводы. +enderio.gui.conduit.item.blacklist=Чёрный список +enderio.gui.conduit.item.stickyEnabled=Включён "липкий" режим|Выбранные предметы будут|отправляться только на|"липкие" выводы. enderio.gui.conduit.item.stickyDisbaled="Липкий" режим выключен enderio.gui.conduit.item.ignoreNBT=Игнорировать NBT enderio.gui.conduit.item.matchNBT=Соблюдать NBT @@ -231,4 +231,4 @@ enderio.gui.conduit.item.selfFeedDisabled=Автоподача отключен enderio.gui.conduit.redstone.signalColor=Цвет сигнала enderio.gui.conduit.redstone.color=Цвет -enderio.gui.conduit.fluid.autoExtract=Автопомпа +enderio.gui.conduit.fluid.autoExtract=Автоизвлечение