diff --git a/dependencies.gradle b/dependencies.gradle index 25fa32aa..6a5b5413 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,19 +1,19 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.4.5-GTNH:dev') api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-268-GTNH-pre:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.6.0:dev') - api("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.0:dev") + api("com.github.GTNewHorizons:WirelessCraftingTerminal:1.10.1:dev") compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.14:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.5.2:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.36:dev') { + compileOnly('com.github.GTNewHorizons:EnderIO:2.5.3:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.49:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') @@ -21,5 +21,5 @@ dependencies { compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.13-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.17:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.9:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.14:dev") { transitive = false } } diff --git a/src/main/java/com/glodblock/github/network/SPacketLevelTerminalUpdate.java b/src/main/java/com/glodblock/github/network/SPacketLevelTerminalUpdate.java index 7e49efa4..91ba9166 100644 --- a/src/main/java/com/glodblock/github/network/SPacketLevelTerminalUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketLevelTerminalUpdate.java @@ -2,7 +2,9 @@ package com.glodblock.github.network; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -16,7 +18,9 @@ import net.minecraftforge.common.util.Constants.NBT; import com.glodblock.github.client.gui.GuiLevelTerminal; +import appeng.core.AEConfig; import appeng.core.AELog; +import appeng.core.features.AEFeature; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -45,6 +49,21 @@ public class SPacketLevelTerminalUpdate implements IMessage { int numEntries = buf.readInt(); for (int i = 0; i < numEntries; ++i) { + if (buf.readableBytes() == 0) { + if (AEConfig.instance.isFeatureEnabled(AEFeature.PacketLogging)) { + AELog.info( + "Corrupted packet commands: (" + i + + ") of (" + + numEntries + + ") -> " + + this.commands.size() + + " : " + + this.commands.stream().map(packetEntry -> packetEntry.getClass().getSimpleName()) + .collect(Collectors.groupingBy(String::new, Collectors.counting()))); + AELog.info("Parsed content: -> " + this.commands); + } + return; + } PacketType type = PacketType.values()[buf.readByte()]; try { @@ -135,6 +154,14 @@ public class SPacketLevelTerminalUpdate implements IMessage { final GuiScreen gs = Minecraft.getMinecraft().currentScreen; if (gs instanceof GuiLevelTerminal levelTerminal) { + if (AEConfig.instance.isFeatureEnabled(AEFeature.PacketLogging)) { + AELog.info( + "Received commands -> " + message.commands.size() + + " : " + + message.commands.stream() + .map(packetEntry -> packetEntry.getClass().getSimpleName()) + .collect(Collectors.groupingBy(String::new, Collectors.counting()))); + } levelTerminal.postUpdate(message.commands, message.statusFlags); } @@ -282,6 +309,38 @@ public class SPacketLevelTerminalUpdate implements IMessage { this.items = payload.getTagList("data", NBT.TAG_COMPOUND); } } + + @Override + public String toString() { + return "PacketAdd{" + "name='" + + name + + '\'' + + ", x=" + + x + + ", y=" + + y + + ", z=" + + z + + ", dim=" + + dim + + ", side=" + + side + + ", rows=" + + rows + + ", rowSize=" + + rowSize + + ", online=" + + online + + ", selfItemStack=" + + selfItemStack + + ", displayItemStack=" + + displayItemStack + + ", items=" + + items + + ", entryId=" + + entryId + + '}'; + } } public static class PacketRemove extends PacketEntry { @@ -302,6 +361,11 @@ public class SPacketLevelTerminalUpdate implements IMessage { @Override protected void read(ByteBuf buf) {} + + @Override + public String toString() { + return "PacketRemove{" + "entryId=" + entryId + '}'; + } } /** @@ -417,6 +481,25 @@ public class SPacketLevelTerminalUpdate implements IMessage { } } } + + @Override + public String toString() { + return "PacketOverwrite{" + "onlineValid=" + + onlineValid + + ", online=" + + online + + ", itemsValid=" + + itemsValid + + ", allItemUpdate=" + + allItemUpdate + + ", validIndices=" + + Arrays.toString(validIndices) + + ", items=" + + items + + ", entryId=" + + entryId + + '}'; + } } /** @@ -446,5 +529,10 @@ public class SPacketLevelTerminalUpdate implements IMessage { protected void read(ByteBuf buf) { newName = ByteBufUtils.readUTF8String(buf); } + + @Override + public String toString() { + return "PacketRename{" + "newName='" + newName + '\'' + ", entryId=" + entryId + '}'; + } } }