From 09f3e49694016c281f3024524e249152e8459aa3 Mon Sep 17 00:00:00 2001 From: shartte Date: Sun, 31 Dec 2023 15:56:33 +0100 Subject: [PATCH] Datagen & compile fixes --- .../network/crafting/16k_cpu_crafting_storage.json | 4 ++-- .../network/crafting/256k_cpu_crafting_storage.json | 4 ++-- .../recipes/network/crafting/4k_cpu_crafting_storage.json | 4 ++-- .../network/crafting/cpu_crafting_accelerator.json | 4 ++-- .../recipes/network/crafting/cpu_crafting_monitor.json | 4 ++-- .../appeng/core/sync/network/ClientPacketHandler.java | 8 ++++++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/generated/resources/data/ae2/recipes/network/crafting/16k_cpu_crafting_storage.json b/src/generated/resources/data/ae2/recipes/network/crafting/16k_cpu_crafting_storage.json index 366dadaac5a..7afa9edea87 100644 --- a/src/generated/resources/data/ae2/recipes/network/crafting/16k_cpu_crafting_storage.json +++ b/src/generated/resources/data/ae2/recipes/network/crafting/16k_cpu_crafting_storage.json @@ -3,10 +3,10 @@ "category": "misc", "ingredients": [ { - "item": "ae2:cell_component_16k" + "item": "ae2:crafting_unit" }, { - "item": "ae2:crafting_unit" + "item": "ae2:cell_component_16k" } ], "result": { diff --git a/src/generated/resources/data/ae2/recipes/network/crafting/256k_cpu_crafting_storage.json b/src/generated/resources/data/ae2/recipes/network/crafting/256k_cpu_crafting_storage.json index 199bc04737b..2d87ecd5f73 100644 --- a/src/generated/resources/data/ae2/recipes/network/crafting/256k_cpu_crafting_storage.json +++ b/src/generated/resources/data/ae2/recipes/network/crafting/256k_cpu_crafting_storage.json @@ -3,10 +3,10 @@ "category": "misc", "ingredients": [ { - "item": "ae2:cell_component_256k" + "item": "ae2:crafting_unit" }, { - "item": "ae2:crafting_unit" + "item": "ae2:cell_component_256k" } ], "result": { diff --git a/src/generated/resources/data/ae2/recipes/network/crafting/4k_cpu_crafting_storage.json b/src/generated/resources/data/ae2/recipes/network/crafting/4k_cpu_crafting_storage.json index d68f92262f8..9da72b0968e 100644 --- a/src/generated/resources/data/ae2/recipes/network/crafting/4k_cpu_crafting_storage.json +++ b/src/generated/resources/data/ae2/recipes/network/crafting/4k_cpu_crafting_storage.json @@ -3,10 +3,10 @@ "category": "misc", "ingredients": [ { - "item": "ae2:cell_component_4k" + "item": "ae2:crafting_unit" }, { - "item": "ae2:crafting_unit" + "item": "ae2:cell_component_4k" } ], "result": { diff --git a/src/generated/resources/data/ae2/recipes/network/crafting/cpu_crafting_accelerator.json b/src/generated/resources/data/ae2/recipes/network/crafting/cpu_crafting_accelerator.json index 14a28c83438..28b35987b90 100644 --- a/src/generated/resources/data/ae2/recipes/network/crafting/cpu_crafting_accelerator.json +++ b/src/generated/resources/data/ae2/recipes/network/crafting/cpu_crafting_accelerator.json @@ -3,10 +3,10 @@ "category": "misc", "ingredients": [ { - "item": "ae2:engineering_processor" + "item": "ae2:crafting_unit" }, { - "item": "ae2:crafting_unit" + "item": "ae2:engineering_processor" } ], "result": { diff --git a/src/generated/resources/data/ae2/recipes/network/crafting/cpu_crafting_monitor.json b/src/generated/resources/data/ae2/recipes/network/crafting/cpu_crafting_monitor.json index e5220ab539b..ca0c7ba900c 100644 --- a/src/generated/resources/data/ae2/recipes/network/crafting/cpu_crafting_monitor.json +++ b/src/generated/resources/data/ae2/recipes/network/crafting/cpu_crafting_monitor.json @@ -3,10 +3,10 @@ "category": "misc", "ingredients": [ { - "item": "ae2:storage_monitor" + "item": "ae2:crafting_unit" }, { - "item": "ae2:crafting_unit" + "item": "ae2:storage_monitor" } ], "result": { diff --git a/src/main/java/appeng/core/sync/network/ClientPacketHandler.java b/src/main/java/appeng/core/sync/network/ClientPacketHandler.java index 46e05b51b3c..ae232c5534a 100644 --- a/src/main/java/appeng/core/sync/network/ClientPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/ClientPacketHandler.java @@ -18,12 +18,16 @@ package appeng.core.sync.network; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.minecraft.client.Minecraft; -import appeng.core.AELog; import appeng.core.sync.BasePacket; public class ClientPacketHandler { + private static final Logger LOG = LoggerFactory.getLogger(ClientPacketHandler.class); + private ClientPacketHandler() { } @@ -31,7 +35,7 @@ public static void onPacketData(BasePacket packet) { try { packet.clientPacketData(Minecraft.getInstance().player); } catch (final IllegalArgumentException e) { - AELog.debug(e); + LOG.error("Failed handling packet", e); } } }