From 6d97c88a1b0169853f0f616b2fdf62139e4184de Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Wed, 5 Mar 2014 16:47:58 +0800 Subject: [PATCH 01/10] #529 Using travel anchor with an empty hand causes crash --- common/crazypants/enderio/teleport/TravelController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/crazypants/enderio/teleport/TravelController.java b/common/crazypants/enderio/teleport/TravelController.java index 06f935a6..53e317d3 100644 --- a/common/crazypants/enderio/teleport/TravelController.java +++ b/common/crazypants/enderio/teleport/TravelController.java @@ -231,6 +231,9 @@ public class TravelController implements ITickHandler { } public int getRequiredPower(EntityPlayer player, TravelSource source, BlockCoord coord) { + if(!ItemTravelStaff.isEquipped(player)) { + return 0; + } int requiredPower; ItemStack staff = player.getCurrentEquippedItem(); requiredPower = (int) (getDistance(player, coord) * source.powerCostPerBlockTraveledRF); From a5870ff9d5c00bcc33cf24a0179d4d3df8c6fd70 Mon Sep 17 00:00:00 2001 From: Felix Treede Date: Thu, 13 Mar 2014 17:46:31 +0100 Subject: [PATCH 02/10] Crash-Bugfix Prevents a NPE in some cases --- common/crazypants/enderio/conduit/power/PowerConduit.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/crazypants/enderio/conduit/power/PowerConduit.java b/common/crazypants/enderio/conduit/power/PowerConduit.java index 9310aa72..3412896b 100644 --- a/common/crazypants/enderio/conduit/power/PowerConduit.java +++ b/common/crazypants/enderio/conduit/power/PowerConduit.java @@ -362,7 +362,7 @@ public class PowerConduit extends AbstractConduit implements IPowerConduit { @Override public boolean onNeighborBlockChange(int blockId) { redstoneStateDirty = true; - if(network != null) { + if(network != null && network.powerManager != null) { network.powerManager.receptorsChanged(); } return super.onNeighborBlockChange(blockId); From c0b8ca90d380b94b9e4dc149eaaf4312101719a2 Mon Sep 17 00:00:00 2001 From: ProgrammedSoul Date: Fri, 14 Mar 2014 16:14:55 -0400 Subject: [PATCH 03/10] Localization for zh_CN I have played with EnderIO for a while. This is really a cool mod but the localization of zh_CN is not updated and even some old translation seems to be less than perfect. So I decide to make one by my own. --- resources/assets/enderio/lang/zh_CN.lang | 276 +++++++++++++---------- 1 file changed, 156 insertions(+), 120 deletions(-) diff --git a/resources/assets/enderio/lang/zh_CN.lang b/resources/assets/enderio/lang/zh_CN.lang index bf4c0946..247e4ec4 100644 --- a/resources/assets/enderio/lang/zh_CN.lang +++ b/resources/assets/enderio/lang/zh_CN.lang @@ -1,193 +1,229 @@ //*** Ender IO *****// //Power -enderio.power.mj=MJ -enderio.power.rf=RF -enderio.power.tick=/t enderio.power.maxOutput=最大输出 //Ender IO / Enderface enderio.blockEnderIo=末影接口 -enderio.itemEnderface=末影面 +item.enderio.itemEnderface.name=末影面板 //Conduits -enderio.blockConduitBundle=管道包层 -enderio.blockConduitFacade=管道表面 -enderio.itemConduitFacade=管道表面 +enderio.blockConduitBundle=导管束 +enderio.blockConduitFacade=导管框架 +item.enderio.itemConduitFacade.name=导管框架 -enderio.itemPowerConduit=能量管道 -enderio.itemPowerConduitEnhanced=强化能量管道 -enderio.itemPowerConduitEnder=末影能量管道 +enderio.itemPowerConduit.name=能量导管 +enderio.itemPowerConduitEnhanced.name=强化能量导管 +enderio.itemPowerConduitEnder.name=末影能量导管 -enderio.itemRedstoneConduit=红石管道 -enderio.itemRedstoneConduitSwitch=管道开关 -enderio.itemRedstoneConduitInsulated=绝缘红石管道 +enderio.itemRedstoneConduit.name=红石导管 +enderio.itemRedstoneConduitSwitch.name=导管开关 +enderio.itemRedstoneConduitInsulated.name=绝缘红石导管 -enderio.itemLiquidConduit=流体管道 +enderio.itemLiquidConduit.name=液体导管 +enderio.itemLiquidConduitAdvanced.name=加压液体导管 +enderio.itemLiquidConduit.lockedType=液体种类锁定为 +enderio.itemLiquidConduit.unlockedType=液体种类解锁 -enderio.itemItemConduit=物品管道 -enderio.itemItemConduitEmpowered=授权物品管道 +enderio.itemItemConduit.name=物品导管 +enderio.itemItemConduitEmpowered.name=充能物品导管 + +enderio.itemMeConduit.name=ME导管 //Materials -enderio.itemMaterial=材料 -enderio.silicon=硅 -enderio.conduitBinder=管道粘合剂 -enderio.binderComposite=复合粘合剂 -enderio.phasedIronNugget=脉动铁粒 +enderio.itemMaterial.name=材料 +enderio.silicon.name=硅 +enderio.conduitBinder.name=管道箍 +enderio.binderComposite.name=复合管道箍 +enderio.phasedIronNugget.name=脉冲铁合金粒 -enderio.itemMachinePart=机器部件 -enderio.blockFusedQuartz= 熔凝石英 -enderio.itemFusedQuartzFrame= 熔凝石英框架 -enderio.itemPowderIngot=粉末&金属锭 +//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=合金 -enderio.electricalSteel=电工钢 -enderio.energeticAlloy=充能合金 -enderio.phasedGold=激能合金 -enderio.redstoneAlloy=红石合金 -enderio.conductiveIron=传导铁 -enderio.phasedIron=脉动铁 +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=煤粉 -enderio.powderIron=铁粉 -enderio.powderGold=金粉 -enderio.powderCopper=铜粉 -enderio.powderTin=锡粉 -enderio.powderEnder=末影珍珠粉 +enderio.powderCoal.name=煤粉 +enderio.powderIron.name=铁粉 +enderio.powderGold.name=金粉 +enderio.powderCopper.name=铜粉 +enderio.powderTin.name=锡粉 +enderio.powderEnder.name=末影珍珠粉 //Capacitors -enderio.itemBasicCapacitor=电容器 -enderio.basicCapacitor=基本电容器 -enderio.activatedCapacitor=双层电容器 -enderio.enderCapacitor=八合一电容器 - +enderio.itemBasicCapacitor.name=电容 +enderio.basicCapacitor.name=基础电容 +enderio.activatedCapacitor.name=双层电容 +enderio.enderCapacitor.name=层基电容 //Machines -enderio.blockStirlingGenerator=斯特林发电机 -enderio.blockReservoir=蓄水池 -enderio.blockAlloySmelter=合金冶炼机 -enderio.blockSolarPanel=光电池 -enderio.blockElectricLight=充能灯 -enderio.blockCapacitorBank=电容组 -enderio.blockCrusher=半自磨机 -enderio.blockHyperCube=跨位面收发器 -enderio.blockPowerMonitor=能量显示器 +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=SAG磨床 +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 -enderio.blockPainter=上色机 -enderio.blockCustomFence=染色栅栏 -enderio.blockCustomFenceGate=染色栅栏门 -enderio.blockCustomWall=染色墙壁 -enderio.blockCustomStair=染色楼梯 -enderio.blockCustomSlab=染色台阶 -enderio.blockCustomDoubleSlab=染色台阶 +tile.enderio.blockPainter.name=粉刷机 +enderio.blockPainter.paintedWith=绘有: +enderio.blockCustomFence=彩绘框架 +enderio.blockCustomFenceGate=彩绘门 +enderio.blockCustomWall=彩绘墙 +enderio.blockCustomStair=彩绘楼梯 +enderio.blockCustomSlab=彩绘台阶 +enderio.blockCustomDoubleSlab=彩绘台阶 //Items -enderio.itemYetaWrench=耶塔扳手 -enderio.itemMJReader=能量探头 +item.enderio.itemYetaWrench.name=以太扳手 +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 -//General -enderio.color.black=黑色 -enderio.color.red=红色 -enderio.color.green=绿色 -enderio.color.brown=棕色 -enderio.color.blue=蓝色 -enderio.color.purple=紫色 -enderio.color.cyan=青色 -enderio.color.lightGray=浅灰色 -enderio.color.gray=灰色 -enderio.color.pink=粉色 -enderio.color.lime=柠檬色 -enderio.color.yellow=黄色 -enderio.color.lightBlue=浅蓝色 -enderio.color.magenta=品红色 -enderio.color.orange=橙色 -enderio.color.white=白色 - enderio.gui.enabled=启用 enderio.gui.disabled=禁用 enderio.gui.send=发送 enderio.gui.recieve=接收 -enderio.gui.sendRecieve=发送&接收 +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=从不激活 +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.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秒平均输入 +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=每tick需求范围 -enderio.gui.mjReader.currentRequest=当前需求 +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=最大I/O +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.activateChannel=开启频道 enderio.gui.trans.powerMode=能量模式 -enderio.gui.trans.fluidMode=流体模式 +enderio.gui.trans.fluidMode=液体模式 enderio.gui.trans.itemMode=物品模式 enderio.gui.trans.publicHeading=公共 -enderio.gui.trans.privateHeading=私人 +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.inOut=输入图/输出 enderio.gui.conduit.ioMode.input=提取 -enderio.gui.conduit.ioMode.output=插入 -enderio.gui.conduit.ioMode.disabled=禁用 +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.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.stickyEnabled=粘滞模式开启.选定的物品只会被传送到这个或别的粘滞输出. +enderio.gui.conduit.item.stickyDisbaled=粘滞模式关闭 enderio.gui.conduit.item.ignoreNBT=忽略NBT数据 enderio.gui.conduit.item.matchNBT=匹配NBT数据 -enderio.gui.conduit.item.oreDicEnabled=矿物辞典启用 -enderio.gui.conduit.item.oreDicDisabled=矿物辞典禁用 -enderio.gui.conduit.item.selfFeedEnabled=自我饲育启用 -enderio.gui.conduit.item.selfFeedDisabled=自我饲育禁用 +enderio.gui.conduit.item.oreDicEnabled=开启矿石检索 +enderio.gui.conduit.item.oreDicDisabled=关闭矿石检索 +enderio.gui.conduit.item.selfFeedEnabled=自供给开启 +enderio.gui.conduit.item.selfFeedDisabled=自供给关闭 enderio.gui.conduit.redstone.signalColor=信号颜色 enderio.gui.conduit.redstone.color=颜色 From 04cd560258516e6daed617cb6643854babc6d643 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 17 Mar 2014 09:35:11 +0800 Subject: [PATCH 04/10] #545 Crash with Conduit Probe --- common/crazypants/enderio/PacketHandler.java | 2 + .../GuiExternalConnectionSelector.java | 4 ++ .../enderio/machine/monitor/ItemMJReader.java | 2 +- .../monitor/MJReaderPacketHandler.java | 43 ++++++++++++++++++- 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/common/crazypants/enderio/PacketHandler.java b/common/crazypants/enderio/PacketHandler.java index f7c67692..78bf8726 100644 --- a/common/crazypants/enderio/PacketHandler.java +++ b/common/crazypants/enderio/PacketHandler.java @@ -57,6 +57,8 @@ public class PacketHandler implements IPacketHandler { public static final int ID_ME_TERMINAL = 28; + public static final int ID_MJ_READER_OPEN_CONDUIT_UI = 29; + public static final String CHANNEL = "EnderIO"; public static PacketHandler instance; diff --git a/common/crazypants/enderio/conduit/GuiExternalConnectionSelector.java b/common/crazypants/enderio/conduit/GuiExternalConnectionSelector.java index 7e0a0714..7b4f621c 100644 --- a/common/crazypants/enderio/conduit/GuiExternalConnectionSelector.java +++ b/common/crazypants/enderio/conduit/GuiExternalConnectionSelector.java @@ -12,8 +12,10 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.Tessellator; import net.minecraftforge.common.ForgeDirection; import appeng.api.WorldCoord; +import cpw.mods.fml.common.network.PacketDispatcher; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; +import crazypants.enderio.machine.monitor.MJReaderPacketHandler; import crazypants.render.ColorUtil; public class GuiExternalConnectionSelector extends GuiScreen { @@ -34,6 +36,8 @@ public class GuiExternalConnectionSelector extends GuiScreen { ForgeDirection dir = ForgeDirection.values()[b.id]; EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; WorldCoord loc = cb.getLocation(); + + PacketDispatcher.sendPacketToServer(MJReaderPacketHandler.createOpenConduitGuiPacket(cb, dir)); player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + dir.ordinal(), player.worldObj, loc.x, loc.y, loc.z); } diff --git a/common/crazypants/enderio/machine/monitor/ItemMJReader.java b/common/crazypants/enderio/machine/monitor/ItemMJReader.java index 7ffa7e5a..3f1dc43f 100644 --- a/common/crazypants/enderio/machine/monitor/ItemMJReader.java +++ b/common/crazypants/enderio/machine/monitor/ItemMJReader.java @@ -44,7 +44,7 @@ public class ItemMJReader extends Item { } @Override - public boolean onItemUseFirst(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, + public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { if(player.isSneaking()) { diff --git a/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java b/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java index 4feaef3b..6d045eba 100644 --- a/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java +++ b/common/crazypants/enderio/machine/monitor/MJReaderPacketHandler.java @@ -20,10 +20,13 @@ import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; import cpw.mods.fml.common.network.Player; +import crazypants.enderio.EnderIO; +import crazypants.enderio.GuiHandler; import crazypants.enderio.IPacketProcessor; import crazypants.enderio.Log; import crazypants.enderio.PacketHandler; import crazypants.enderio.conduit.ConnectionMode; +import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.ItemConduitNetwork; @@ -60,6 +63,27 @@ public class MJReaderPacketHandler implements IPacketProcessor { private static final String REQUEST_RANGE = " " + Lang.localize("gui.mjReader.requestRange") + ": ";; private static final String CUR_REQUEST = " " + Lang.localize("gui.mjReader.currentRequest") + ": ";; + public static Packet createOpenConduitGuiPacket(IConduitBundle bundle, ForgeDirection dir) { + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + DataOutputStream dos = new DataOutputStream(bos); + try { + dos.writeInt(PacketHandler.ID_MJ_READER_OPEN_CONDUIT_UI); + TileEntity te = bundle.getEntity(); + dos.writeInt(te.xCoord); + dos.writeInt(te.yCoord); + dos.writeInt(te.zCoord); + dos.writeInt(dir.ordinal()); + } catch (IOException e) { + // never thrown + } + Packet250CustomPayload pkt = new Packet250CustomPayload(); + pkt.channel = PacketHandler.CHANNEL; + pkt.data = bos.toByteArray(); + pkt.length = bos.size(); + pkt.isChunkDataPacket = true; + return pkt; + } + public static boolean canCreatePacket(World world, int x, int y, int z) { int id = world.getBlockId(x, y, z); TileEntity te = world.getBlockTileEntity(x, y, z); @@ -105,18 +129,35 @@ public class MJReaderPacketHandler implements IPacketProcessor { @Override public boolean canProcessPacket(int packetID) { - return PacketHandler.ID_MJ_READER_INFO_REQUEST == packetID; + return PacketHandler.ID_MJ_READER_INFO_REQUEST == packetID || PacketHandler.ID_MJ_READER_OPEN_CONDUIT_UI == packetID; } @Override public void processPacket(int packetID, INetworkManager manager, DataInputStream data, Player player) throws IOException { if(packetID == PacketHandler.ID_MJ_READER_INFO_REQUEST) { sendInfoMessage(data, player); + } else if(packetID == PacketHandler.ID_MJ_READER_OPEN_CONDUIT_UI) { + handleUiPacket(data, player); } else { Log.error("MJReaderPacketHandler.processPacket: Recieved unkown packet with ID " + packetID); } } + private void handleUiPacket(DataInputStream data, Player p) throws IOException { + int x = data.readInt(); + int y = data.readInt(); + int z = data.readInt(); + int side = data.readInt(); + + EntityPlayer player = (EntityPlayer) p; + World world = player.worldObj; + if(world == null) { + Log.warn("MJReaderPacketHandler.sendInfoMessage: Could not handle packet as player world was null."); + return; + } + player.openGui(EnderIO.instance, GuiHandler.GUI_ID_EXTERNAL_CONNECTION_BASE + side, player.worldObj, x, y, z); + } + private void sendInfoMessage(DataInputStream data, Player p) throws IOException { int x = data.readInt(); int y = data.readInt(); From 54be78eddc7081f5b024163e0d905d311760513c Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 17 Mar 2014 16:40:37 +0800 Subject: [PATCH 05/10] #548 AE Crashes with Dim. Trans. --- .../enderio/machine/hypercube/CompositeInventory.java | 2 +- .../enderio/machine/hypercube/TileHyperCube.java | 3 +++ common/crazypants/util/InventoryWrapper.java | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/crazypants/enderio/machine/hypercube/CompositeInventory.java b/common/crazypants/enderio/machine/hypercube/CompositeInventory.java index d17fd22a..3b10a68b 100644 --- a/common/crazypants/enderio/machine/hypercube/CompositeInventory.java +++ b/common/crazypants/enderio/machine/hypercube/CompositeInventory.java @@ -27,7 +27,7 @@ public class CompositeInventory implements ISidedInventory { return; } inventories.add(new InvEntry(inv, size, side)); - size += inv.getSizeInventory(); + updateSize(); } public void removeInventory(IInventory inv) { diff --git a/common/crazypants/enderio/machine/hypercube/TileHyperCube.java b/common/crazypants/enderio/machine/hypercube/TileHyperCube.java index 2056850c..7e87225c 100644 --- a/common/crazypants/enderio/machine/hypercube/TileHyperCube.java +++ b/common/crazypants/enderio/machine/hypercube/TileHyperCube.java @@ -739,6 +739,9 @@ public class TileHyperCube extends TileEntity implements IInternalPowerReceptor, } for (TileHyperCube cube : cubes) { if(cube != this && cube != null && cube.canRecieveItems()) { + if(cube.inventoriesDirty) { + cube.updateInventories(); + } res.addInventory(cube.localInventory); } } diff --git a/common/crazypants/util/InventoryWrapper.java b/common/crazypants/util/InventoryWrapper.java index e16a4cd7..eb85d19f 100644 --- a/common/crazypants/util/InventoryWrapper.java +++ b/common/crazypants/util/InventoryWrapper.java @@ -52,7 +52,9 @@ public class InventoryWrapper implements ISidedInventory { @Override public void setInventorySlotContents(int slot, ItemStack itemStack) { - inv.setInventorySlotContents(slot, itemStack); + if(slot >= 0 && slot < inv.getSizeInventory()) { + inv.setInventorySlotContents(slot, itemStack); + } } @Override @@ -92,7 +94,7 @@ public class InventoryWrapper implements ISidedInventory { @Override public boolean isItemValidForSlot(int slot, ItemStack itemStack) { - return inv.isItemValidForSlot(slot, itemStack); + return slot >= 0 && slot < getSizeInventory() && inv.isItemValidForSlot(slot, itemStack); } @Override @@ -111,6 +113,6 @@ public class InventoryWrapper implements ISidedInventory { @Override public boolean canExtractItem(int slot, ItemStack itemStack, int side) { - return true; + return slot >= 0 && slot < getSizeInventory(); } } \ No newline at end of file From ba0d9c96026d93ac5a0f55ee02371599d550cf87 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 17 Mar 2014 17:17:12 +0800 Subject: [PATCH 06/10] #556 Fluid conduit [extract:Active without signal] still extracts liquid even if you apply a signal. --- .../enderio/conduit/liquid/AbstractLiquidConduit.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/common/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index bbe268e1..6afe6c78 100644 --- a/common/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/common/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -134,10 +134,14 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I DyeColor col = getExtractionSignalColor(dir); int signal = ConduitUtil.getInternalSignalForColor(getBundle(), col); - if(mode.isConditionMet(mode, signal)) { + if(mode.isConditionMet(mode, signal) && mode != RedstoneControlMode.OFF) { return true; } + return isConditionMetByExternalSignal(dir, mode, col); + } + + private boolean isConditionMetByExternalSignal(ForgeDirection dir, RedstoneControlMode mode, DyeColor col) { int externalSignal = 0; if(col == DyeColor.RED) { Integer val = externalRedstoneSignals.get(dir); From 05f4ba149c847c0ce327ad84732127a8aa49ca95 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 17 Mar 2014 20:11:59 +0800 Subject: [PATCH 07/10] #539 Capacitor bank content can go negative --- .../crazypants/enderio/machine/power/TileCapacitorBank.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/crazypants/enderio/machine/power/TileCapacitorBank.java b/common/crazypants/enderio/machine/power/TileCapacitorBank.java index 16ed47a8..d1f88e37 100644 --- a/common/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/common/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -514,7 +514,7 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep float freeSpace = maxStoredEnergy - storedEnergy; int result = (int) Math.min(maxReceive / 10, freeSpace); if(!simulate) { - storedEnergy += result; + doAddEnergy(result); } return result * 10; } @@ -631,7 +631,7 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep } void doAddEnergy(float add) { - storedEnergy = Math.min(maxStoredEnergy, storedEnergy + add); + storedEnergy = Math.max(0, Math.min(maxStoredEnergy, storedEnergy + add)); } void doSetMaxInput(int in) { @@ -680,6 +680,8 @@ public class TileCapacitorBank extends TileEntity implements IInternalPowerRecep private void updatePowerHandler() { if(storedEnergy > maxStoredEnergy) { storedEnergy = maxStoredEnergy; + } else if(storedEnergy < 0) { + storedEnergy = 0; } powerHandler = null; } From 1d4888c703582dc92372109332b44ef5eff4f7d7 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Mon, 17 Mar 2014 20:47:21 +0800 Subject: [PATCH 08/10] #533 NullPointerException --- .../enderio/conduit/power/NetworkPowerManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/crazypants/enderio/conduit/power/NetworkPowerManager.java b/common/crazypants/enderio/conduit/power/NetworkPowerManager.java index 544a4cb5..c78d7e70 100644 --- a/common/crazypants/enderio/conduit/power/NetworkPowerManager.java +++ b/common/crazypants/enderio/conduit/power/NetworkPowerManager.java @@ -14,6 +14,7 @@ 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.ConduitNetworkTickHandler.TickListener; import crazypants.enderio.conduit.power.PowerConduitNetwork.ReceptorEntry; @@ -587,7 +588,11 @@ public class NetworkPowerManager { @Override public void tickEnd(EnumSet type, Object... tickData) { - doApplyRecievedPower(); + try { + doApplyRecievedPower(); + } catch (Exception e) { + Log.warn("NetworkPowerManager: Exception thrown when updating power network " + e); + } } } From 478e4b82f0ccd5745a9b60278694f43234dc05e9 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 18 Mar 2014 14:48:39 +0800 Subject: [PATCH 09/10] #557 Conduits eating items after upgrading an iron chest #521 Item conduits only fill one half of large chests when placing the second chest after connecting the conduits --- .../conduit/item/ItemConduitNetwork.java | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java b/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java index 9d423f3f..6236bf64 100644 --- a/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java +++ b/common/crazypants/enderio/conduit/item/ItemConduitNetwork.java @@ -231,10 +231,9 @@ public class ItemConduitNetwork extends AbstractConduitNetwork 0) { toExtract.stackSize -= inserted; @@ -419,6 +415,16 @@ public class ItemConduitNetwork extends AbstractConduitNetwork result = new HashMap(); List result = new ArrayList(); for (NetworkedInventory other : inventories) { @@ -449,7 +453,6 @@ public class ItemConduitNetwork extends AbstractConduitNetwork Date: Tue, 18 Mar 2014 15:00:18 +0800 Subject: [PATCH 10/10] 0.11.4 - #521 Item conduits only fill one half of large chests when placing the second chest after connecting the conduits - #529 Using travel anchor causes crash - #533 NullPointerException - #539 Capacitor bank content can go negative - #545 Crash with Conduit Probe - #548 AE Crashes - #552 Fixed NPE crash(Xfel) - #553 OpenBlocks XP Bottler crash - #554 Updated localization for zh_CN (ProgrammedSoul) - #556 Fluid Conduit 'Active Without Signal' not working - #557 Conduits eating items after upgrading an iron chest --- ReleaseNotes.txt | 13 +++++++++++++ build.xml | 2 +- common/crazypants/enderio/EnderIO.java | 2 +- resources/mcmod.info | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 7cca3156..44b57ef1 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,16 @@ +0.11.4 +- #521 Item conduits only fill one half of large chests when placing the second chest after connecting the conduits +- #529 Using travel anchor causes crash +- #533 NullPointerException +- #539 Capacitor bank content can go negative +- #545 Crash with Conduit Probe +- #548 AE Crashes +- #552 Fixed NPE crash(Xfel) +- #553 OpenBlocks XP Bottler crash +- #554 Updated localization for zh_CN (ProgrammedSoul) +- #556 Fluid Conduit 'Active Without Signal' not working +- #557 Conduits eating items after upgrading an iron chest + 0.11.3 - #523 Crash - #524 Ender IO Item conduits are eating items diff --git a/build.xml b/build.xml index f9080147..cc38298c 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 bafe5503..acc7a440 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 = "0.11.3", dependencies = "required-after:Forge@[9.11.0.883,)") +@Mod(name = "EnderIO", modid = "EnderIO", version = "0.11.4", 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 546fb1b0..f4032ecd 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": "0.11.3", + "version": "0.11.4", "mcversion": "1.6.4", "url": "http://www.minecraftforum.net/topic/1937619-162152-ender-io-how-many-pipes-in-one-block-updated-198/", "updateUrl": "",