From 599bfa221e67636b1fbb9f6daa00f4efa4a51bce Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Wed, 5 Jun 2024 21:13:06 +0800 Subject: [PATCH] Fix build --- patches/server/0030-Leaves-Server-Utils.patch | 2 +- patches/server/0032-Leaves-Jade-Protocol.patch | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/server/0030-Leaves-Server-Utils.patch b/patches/server/0030-Leaves-Server-Utils.patch index dba2823d1..4dae3f2f7 100644 --- a/patches/server/0030-Leaves-Server-Utils.patch +++ b/patches/server/0030-Leaves-Server-Utils.patch @@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves Commit: 6951bdc2153bcb14aa64787ab007fa39fee7c007 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b152cf0c89e735470ea61b4bb0d88f3467f1a8d0..1da09a313f73c35be5b1b46da6b489a599f745f4 100644 +index 0fafe65e9f0ee85469d80a1033078b20a7abbfcf..fd937544baae6835e1826a686676dcbfa58aca33 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -430,6 +430,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0032-Leaves-Jade-Protocol.patch b/patches/server/0032-Leaves-Jade-Protocol.patch index 1edf23b72..7715234e6 100644 --- a/patches/server/0032-Leaves-Jade-Protocol.patch +++ b/patches/server/0032-Leaves-Jade-Protocol.patch @@ -566,7 +566,7 @@ index 0000000000000000000000000000000000000000..14613e35a6785fc599b1520a667e1311 +} diff --git a/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java b/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java new file mode 100644 -index 0000000000000000000000000000000000000000..7ef50f5b7437d8ec918d26b7a564161ed08aabbd +index 0000000000000000000000000000000000000000..baa49383c61c1934742d9154be2b12834dd49240 --- /dev/null +++ b/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java @@ -0,0 +1,142 @@ @@ -589,7 +589,7 @@ index 0000000000000000000000000000000000000000..7ef50f5b7437d8ec918d26b7a564161e +import net.minecraft.world.level.block.entity.BaseContainerBlockEntity; +import net.minecraft.world.level.block.entity.ChestBlockEntity; +import net.minecraft.world.level.block.entity.EnderChestBlockEntity; -+import org.leavesmc.leaves.LeavesLogger; ++import org.leavesmc.leaves.protocol.core.LeavesProtocolManager; +import org.leavesmc.leaves.protocol.jade.JadeProtocol; +import org.leavesmc.leaves.protocol.jade.accessor.BlockAccessor; +import org.leavesmc.leaves.protocol.jade.accessor.RequestAccessor; @@ -647,7 +647,7 @@ index 0000000000000000000000000000000000000000..7ef50f5b7437d8ec918d26b7a564161e + try { + itemCollector = targetCache.get(target, () -> createItemCollector(target)); + } catch (ExecutionException e) { -+ LeavesLogger.LOGGER.severe("Failed to get item collector for " + target); ++ LeavesProtocolManager.LOGGER.fatal("Failed to get item collector for {}", target); + return null; + } + @@ -1597,7 +1597,7 @@ index 0000000000000000000000000000000000000000..d48ef5d8c72b57ff5525ab06b59724d0 +} diff --git a/src/main/java/org/leavesmc/leaves/protocol/jade/util/HierarchyLookup.java b/src/main/java/org/leavesmc/leaves/protocol/jade/util/HierarchyLookup.java new file mode 100644 -index 0000000000000000000000000000000000000000..9e88dc87bd4a86c15b2b0d11ac4b095174b1c3d3 +index 0000000000000000000000000000000000000000..3b5a88fa00bbef9bfcf3d527fdb6877edb880d57 --- /dev/null +++ b/src/main/java/org/leavesmc/leaves/protocol/jade/util/HierarchyLookup.java @@ -0,0 +1,120 @@ @@ -1613,7 +1613,7 @@ index 0000000000000000000000000000000000000000..9e88dc87bd4a86c15b2b0d11ac4b0951 +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import net.minecraft.resources.ResourceLocation; -+import org.leavesmc.leaves.LeavesLogger; ++import org.leavesmc.leaves.protocol.core.LeavesProtocolManager; +import org.leavesmc.leaves.protocol.jade.JadeProtocol; +import org.leavesmc.leaves.protocol.jade.provider.IJadeProvider; + @@ -1669,7 +1669,7 @@ index 0000000000000000000000000000000000000000..9e88dc87bd4a86c15b2b0d11ac4b0951 + return list; + }); + } catch (ExecutionException e) { -+ LeavesLogger.LOGGER.severe(e.getMessage()); ++ LeavesProtocolManager.LOGGER.fatal(e.getMessage()); + } + return List.of(); + } @@ -1994,7 +1994,7 @@ index 0000000000000000000000000000000000000000..4d65e9a8b5224bd268b1bf18bc39a58d +} diff --git a/src/main/java/org/leavesmc/leaves/protocol/jade/util/PairHierarchyLookup.java b/src/main/java/org/leavesmc/leaves/protocol/jade/util/PairHierarchyLookup.java new file mode 100644 -index 0000000000000000000000000000000000000000..580b299d9dc2514d9758c04caac39a82982c0ca1 +index 0000000000000000000000000000000000000000..1f5598ef0ecf8a34c22b1a7d73ec0e042bbed756 --- /dev/null +++ b/src/main/java/org/leavesmc/leaves/protocol/jade/util/PairHierarchyLookup.java @@ -0,0 +1,101 @@ @@ -2006,7 +2006,7 @@ index 0000000000000000000000000000000000000000..580b299d9dc2514d9758c04caac39a82 +import com.google.common.collect.Iterables; +import net.minecraft.resources.ResourceLocation; +import org.apache.commons.lang3.tuple.Pair; -+import org.leavesmc.leaves.LeavesLogger; ++import org.leavesmc.leaves.protocol.core.LeavesProtocolManager; +import org.leavesmc.leaves.protocol.jade.JadeProtocol; +import org.leavesmc.leaves.protocol.jade.provider.IJadeProvider; + @@ -2045,7 +2045,7 @@ index 0000000000000000000000000000000000000000..580b299d9dc2514d9758c04caac39a82 + return ImmutableList.sortedCopyOf(Comparator.comparingInt(JadeProtocol.priorities::byValue), Iterables.concat(firstList, secondList)); + }); + } catch (ExecutionException e) { -+ LeavesLogger.LOGGER.severe(e.getMessage()); ++ LeavesProtocolManager.LOGGER.fatal(e.getMessage()); + } + return List.of(); + }