diff --git a/1todos/server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch b/lophine-server/minecraft-patches/features/0023-Leaves-Syncmatica-Protocol.patch similarity index 87% rename from 1todos/server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch rename to lophine-server/minecraft-patches/features/0023-Leaves-Syncmatica-Protocol.patch index 7936d45..208a73b 100644 --- a/1todos/server/minecraft-patches/features/0024-Leaves-Syncmatica-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0023-Leaves-Syncmatica-Protocol.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> +From: Helvetica Volubi Date: Mon, 3 Feb 2025 16:51:01 +0800 Subject: [PATCH] Leaves: Syncmatica Protocol @@ -9,10 +9,10 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d35ef52a6adb9a560138d1a2af32969c3a73f42b..df66e24c61af9d57d619c91849e28f1bec64a036 100644 +index 8e5b79db12882432de575f2a76aa36eac6fc8f51..977a4ac391b8cf8b59c5c77becf9a5951d513526 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -338,9 +338,12 @@ public class ServerGamePacketListenerImpl +@@ -346,9 +346,12 @@ public class ServerGamePacketListenerImpl this.signedMessageDecoder = SignedMessageChain.Decoder.unsigned(player.getUUID(), server::enforceSecureProfile); this.chatMessageChain = new FutureChain(server.chatExecutor); // CraftBukkit - async chat this.tickEndEvent = new io.papermc.paper.event.packet.ClientTickEndEvent(player.getBukkitEntity()); // Paper - add client tick end event diff --git a/1todos/server/minecraft-patches/features/0025-Leaves-BBOR-Protocol.patch b/lophine-server/minecraft-patches/features/0024-Leaves-BBOR-Protocol.patch similarity index 76% rename from 1todos/server/minecraft-patches/features/0025-Leaves-BBOR-Protocol.patch rename to lophine-server/minecraft-patches/features/0024-Leaves-BBOR-Protocol.patch index 49af4d0..544b220 100644 --- a/1todos/server/minecraft-patches/features/0025-Leaves-BBOR-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0024-Leaves-BBOR-Protocol.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> +From: Helvetica Volubi Date: Mon, 3 Feb 2025 13:03:42 +0800 Subject: [PATCH] Leaves: BBOR Protocol @@ -8,12 +8,12 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java -index 435acf0fe5e80ca371d1145befc2cfaa917a89e3..77577d0df9b14a7ad55b2866c2ac31863226458b 100644 +index 4882df428369e87bcf23b532dd970b13b3adfb88..e51f99de547f09f98b9e351bf84d8411994b62bc 100644 --- a/net/minecraft/world/level/chunk/LevelChunk.java +++ b/net/minecraft/world/level/chunk/LevelChunk.java -@@ -758,6 +758,11 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot +@@ -757,6 +757,11 @@ public class LevelChunk extends ChunkAccess implements DebugValueSource, ca.spot - public void setLoaded(boolean loaded) { + public void setLoaded(final boolean loaded) { this.loaded = loaded; + // Leaves start - bbor + if (loaded) { diff --git a/1todos/server/minecraft-patches/features/0027-Leaves-Xaero-Map-Protocol.patch b/lophine-server/minecraft-patches/features/0025-Leaves-Xaero-Map-Protocol.patch similarity index 85% rename from 1todos/server/minecraft-patches/features/0027-Leaves-Xaero-Map-Protocol.patch rename to lophine-server/minecraft-patches/features/0025-Leaves-Xaero-Map-Protocol.patch index d92f805..6d45bc2 100644 --- a/1todos/server/minecraft-patches/features/0027-Leaves-Xaero-Map-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0025-Leaves-Xaero-Map-Protocol.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> +From: Helvetica Volubi Date: Fri, 7 Feb 2025 14:23:43 +0800 Subject: [PATCH] Leaves: Xaero Map Protocol @@ -8,10 +8,10 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java -index 3a5319739f0687fc6f09b2ac8ee31716593fe0de..36cd1a0307ff1a734eb5f4f3cc013781692e7ad8 100644 +index 168702a5ae51a2bc42c5761e13cb14008a8162c4..ebd2f2887780d9c6c3c44983bac23eab732cf43f 100644 --- a/net/minecraft/server/players/PlayerList.java +++ b/net/minecraft/server/players/PlayerList.java -@@ -1126,6 +1126,7 @@ public abstract class PlayerList { +@@ -1105,6 +1105,7 @@ public abstract class PlayerList { //player.connection.send(new ClientboundSetChunkCacheRadiusPacket(io.papermc.paper.FeatureHooks.getViewDistance(level))); // Paper - rewrite chunk system //player.connection.send(new ClientboundSetSimulationDistancePacket(io.papermc.paper.FeatureHooks.getSimulationDistance(level))); // Paper - rewrite chunk system // Paper end - view distances diff --git a/1todos/server/minecraft-patches/features/0028-Leaves-Support-REI-protocol.patch b/lophine-server/minecraft-patches/features/0026-Leaves-Support-REI-protocol.patch similarity index 73% rename from 1todos/server/minecraft-patches/features/0028-Leaves-Support-REI-protocol.patch rename to lophine-server/minecraft-patches/features/0026-Leaves-Support-REI-protocol.patch index bd0a6c0..d3c40e9 100644 --- a/1todos/server/minecraft-patches/features/0028-Leaves-Support-REI-protocol.patch +++ b/lophine-server/minecraft-patches/features/0026-Leaves-Support-REI-protocol.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> +From: Helvetica Volubi Date: Thu, 27 Mar 2025 13:04:35 +0800 Subject: [PATCH] Leaves: Support REI protocol @@ -8,16 +8,16 @@ As a part of : Leaves (https://github.com/LeavesMC/Leaves) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/net/minecraft/world/item/crafting/SmithingTransformRecipe.java b/net/minecraft/world/item/crafting/SmithingTransformRecipe.java -index d02609198253b51f632db46c40afd737d686c520..7296e0b73f1c8e32374f39238d1dfac62bc41afb 100644 +index 33f9870a4f966a887023b1debd4ab9ef9d24378f..89983e7da244434a5346b23b49c748349cd79e34 100644 --- a/net/minecraft/world/item/crafting/SmithingTransformRecipe.java +++ b/net/minecraft/world/item/crafting/SmithingTransformRecipe.java -@@ -82,6 +82,12 @@ public class SmithingTransformRecipe implements SmithingRecipe { +@@ -115,6 +115,12 @@ public class SmithingTransformRecipe extends SimpleSmithingRecipe { ); } + // Leaves start - REI + public SlotDisplay getResult() { -+ return this.result.display(); ++ return new SlotDisplay.ItemStackSlotDisplay(this.result); + } + // Leaves end - REI + @@ -25,10 +25,10 @@ index d02609198253b51f632db46c40afd737d686c520..7296e0b73f1c8e32374f39238d1dfac6 @Override public org.bukkit.inventory.Recipe toBukkitRecipe(org.bukkit.NamespacedKey id) { diff --git a/net/minecraft/world/item/crafting/SmithingTrimRecipe.java b/net/minecraft/world/item/crafting/SmithingTrimRecipe.java -index 6582370cfa3d58a7ac08d574e26e7a93d243bdaa..07501a27e6032e578b823d9b617166a9e78fcb20 100644 +index f9fa7d0eaf9f32959a4bd12b82e5a49ea808a44c..2f3241563ad7e5ed5663b913671d2af056df97bb 100644 --- a/net/minecraft/world/item/crafting/SmithingTrimRecipe.java +++ b/net/minecraft/world/item/crafting/SmithingTrimRecipe.java -@@ -84,6 +84,12 @@ public class SmithingTrimRecipe implements SmithingRecipe { +@@ -109,6 +109,12 @@ public class SmithingTrimRecipe extends SimpleSmithingRecipe { return Optional.of(this.addition); } @@ -40,4 +40,4 @@ index 6582370cfa3d58a7ac08d574e26e7a93d243bdaa..07501a27e6032e578b823d9b617166a9 + @Override public RecipeSerializer getSerializer() { - return RecipeSerializer.SMITHING_TRIM; + return SERIALIZER; diff --git a/1todos/server/minecraft-patches/features/0026-Leaves-Jade-Protocol.patch b/lophine-server/minecraft-patches/features/0027-Leaves-Jade-Protocol.patch similarity index 69% rename from 1todos/server/minecraft-patches/features/0026-Leaves-Jade-Protocol.patch rename to lophine-server/minecraft-patches/features/0027-Leaves-Jade-Protocol.patch index a571779..530a902 100644 --- a/1todos/server/minecraft-patches/features/0026-Leaves-Jade-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0027-Leaves-Jade-Protocol.patch @@ -8,24 +8,11 @@ Co-authored by: violetc <58360096+s-yh-china@users.noreply.github.com> As a part of : Leaves (https://github.com/LeavesMC/Leaves) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) -diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java -index 7c2d53ca863c2e50c6871938efc426ddefff9b5c..8c1e6837b0328c66fdda322c3c7ceba31c4f017f 100644 ---- a/net/minecraft/server/level/ServerPlayer.java -+++ b/net/minecraft/server/level/ServerPlayer.java -@@ -1451,7 +1451,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc - } else if (fun.bm.lophine.config.modules.experiment.EntityDamageSourceTraceConfig.enabled) { - final LivingEntity entitylivingnew = this.getKillCreditOrigin(); - if (entitylivingnew != null) { -- this.damageTransferToAsync(entitylivingnew, cause); -+ this.damageTransferToAsync(entitylivingnew, damageSource); - } - // Luminol End - Cross Region Damage trace - } diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index df66e24c61af9d57d619c91849e28f1bec64a036..8386757c5fd3d8df3ae77a4eeeb25a2f28840cda 100644 +index 977a4ac391b8cf8b59c5c77becf9a5951d513526..bc38b16dd296cca9bc5556b95117794e633a9c27 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3843,7 +3843,7 @@ public class ServerGamePacketListenerImpl +@@ -3902,7 +3902,7 @@ public class ServerGamePacketListenerImpl } @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper - Add PlayerLoadedWorldEvent @@ -35,10 +22,10 @@ index df66e24c61af9d57d619c91849e28f1bec64a036..8386757c5fd3d8df3ae77a4eeeb25a2f this.markClientLoaded(false); } diff --git a/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/net/minecraft/world/entity/animal/armadillo/Armadillo.java -index 901e4e9897e76cd4158d7f8bb8ec829df8ff8196..59b9373c7a14e42d9e5f691354a7616d16856215 100644 +index 03ec05a860781f85e58055d6f58893963781bd97..c15f0a3d419fea50d4349fa864e83bf7fee78b9f 100644 --- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java +++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java -@@ -64,7 +64,7 @@ public class Armadillo extends Animal { +@@ -72,7 +72,7 @@ public class Armadillo extends Animal { public final AnimationState rollOutAnimationState = new AnimationState(); public final AnimationState rollUpAnimationState = new AnimationState(); public final AnimationState peekAnimationState = new AnimationState(); @@ -46,12 +33,12 @@ index 901e4e9897e76cd4158d7f8bb8ec829df8ff8196..59b9373c7a14e42d9e5f691354a7616d + public int scuteTime; // Leaves - private -> public private boolean peekReceivedClient = false; - public Armadillo(EntityType type, Level level) { + public Armadillo(final EntityType type, final Level level) { diff --git a/net/minecraft/world/entity/animal/frog/Tadpole.java b/net/minecraft/world/entity/animal/frog/Tadpole.java -index f65cfb908aac16e6df4d209c6b5c3ee5065289d3..9afada8ca16775752468e1b14cd97daf26325fc4 100644 +index 3d4bfeae2fddb9ace26e7dea8870704d8309862b..d2862d2e6f599265bc319000bba05609e0bea2c3 100644 --- a/net/minecraft/world/entity/animal/frog/Tadpole.java +++ b/net/minecraft/world/entity/animal/frog/Tadpole.java -@@ -244,7 +244,7 @@ public class Tadpole extends AbstractFish { +@@ -255,7 +255,7 @@ public class Tadpole extends AbstractFish { } } @@ -61,12 +48,12 @@ index f65cfb908aac16e6df4d209c6b5c3ee5065289d3..9afada8ca16775752468e1b14cd97daf } diff --git a/net/minecraft/world/level/storage/loot/LootPool.java b/net/minecraft/world/level/storage/loot/LootPool.java -index 43b8f4674602532f0273ebc5a0233476d10f6735..2ed995e68cf7812c74c3ba15b49450b2b5f3f0f8 100644 +index f08a25b76e689c2242e8ef8226c3d8c2dcec1c70..6e76e472bd1e7242f6cd7986c23ebc38d16fd46a 100644 --- a/net/minecraft/world/level/storage/loot/LootPool.java +++ b/net/minecraft/world/level/storage/loot/LootPool.java -@@ -37,7 +37,7 @@ public class LootPool { +@@ -36,7 +36,7 @@ public class LootPool implements Validatable { ) - .apply(instance, LootPool::new) + .apply(i, LootPool::new) ); - private final List entries; + public final List entries; // Leaves - private -> public @@ -74,10 +61,10 @@ index 43b8f4674602532f0273ebc5a0233476d10f6735..2ed995e68cf7812c74c3ba15b49450b2 private final Predicate compositeCondition; private final List functions; diff --git a/net/minecraft/world/level/storage/loot/LootTable.java b/net/minecraft/world/level/storage/loot/LootTable.java -index 35b5154473a3021dcae1f2ad016a77bcfb058c58..3d338b354c3d558a1c4ec20c149e8f26ed27da1e 100644 +index 14fc07badbd14a5a4c8e8c7d237d08a4eb6a6f12..0aaf2240a0f79b5c4aaa9c22dca7b2f0953dac49 100644 --- a/net/minecraft/world/level/storage/loot/LootTable.java +++ b/net/minecraft/world/level/storage/loot/LootTable.java -@@ -50,7 +50,7 @@ public class LootTable { +@@ -49,7 +49,7 @@ public class LootTable implements Validatable { public static final LootTable EMPTY = new LootTable(LootContextParamSets.EMPTY, Optional.empty(), List.of(), List.of()); private final ContextKeySet paramSet; private final Optional randomSequence; @@ -87,10 +74,10 @@ index 35b5154473a3021dcae1f2ad016a77bcfb058c58..3d338b354c3d558a1c4ec20c149e8f26 private final BiFunction compositeFunction; public org.bukkit.craftbukkit.CraftLootTable craftLootTable; // CraftBukkit diff --git a/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java b/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java -index eeaa49e9f70a18b5d39493aeff73f31b05ac2faa..8cd0403d7873c4c37caef75935b06b056c3d951d 100644 +index 53e4375a4af610e54309f2978e59985e6ada15f5..615b533caecef09d967c615ae39ef29c80784575 100644 --- a/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java +++ b/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java -@@ -16,7 +16,7 @@ public abstract class CompositeEntryBase extends LootPoolEntryContainer { +@@ -17,7 +17,7 @@ public abstract class CompositeEntryBase extends LootPoolEntryContainer { return "Empty children list"; } }; @@ -98,22 +85,22 @@ index eeaa49e9f70a18b5d39493aeff73f31b05ac2faa..8cd0403d7873c4c37caef75935b06b05 + public final List children; // Leaves - private -> public private final ComposableEntryContainer composedChildren; - protected CompositeEntryBase(List children, List conditions) { + protected CompositeEntryBase(final List children, final List conditions) { diff --git a/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java b/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java -index cfa05e882d2987cfab4c9d555a2de065b29fdf7e..4bacc9e2fb94d1b24887e7f0e9ce628814393209 100644 +index 83c514c213251dd5470627d0299b5858b850784d..d231f706388e6967d2e29f806a9f52e8f7f5ba61 100644 --- a/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java +++ b/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java -@@ -14,7 +14,7 @@ import net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder; +@@ -15,7 +15,7 @@ import net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder; import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; - public abstract class LootPoolEntryContainer implements ComposableEntryContainer { + public abstract class LootPoolEntryContainer implements ComposableEntryContainer, Validatable { - protected final List conditions; + public final List conditions; // Leaves - private -> public private final Predicate compositeCondition; - protected LootPoolEntryContainer(List conditions) { + protected LootPoolEntryContainer(final List conditions) { diff --git a/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java b/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java -index 141026601cd9a4561426b85fd1f8e7dc0544fbd7..a5d7ebb93c147bf0f806ac3c9b2dc4b878573944 100644 +index 20520b7071f19af2882a797ee40019cddd76e378..11c4333ab28cffcfb97bcd289930b33c4baae993 100644 --- a/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java +++ b/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java @@ -29,7 +29,7 @@ public class NestedLootTable extends LootPoolSingletonContainer { @@ -124,12 +111,12 @@ index 141026601cd9a4561426b85fd1f8e7dc0544fbd7..a5d7ebb93c147bf0f806ac3c9b2dc4b8 + public final Either, LootTable> contents; // Leaves - private -> public private NestedLootTable( - Either, LootTable> contents, int weight, int quality, List conditions, List functions + final Either, LootTable> contents, diff --git a/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java b/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java -index bae72197acc929c7ed3e964f156115d728eb2176..8f3094f42f3366a1313d70c0b27fbe5632b2082a 100644 +index cb821605781050282fd0a28e3d096fa18de833b8..99624ca2e895884a5e92a965af2064803c0d3b14 100644 --- a/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java +++ b/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java -@@ -12,7 +12,7 @@ import net.minecraft.world.level.storage.loot.LootContext; +@@ -12,7 +12,7 @@ import net.minecraft.world.level.storage.loot.Validatable; import net.minecraft.world.level.storage.loot.ValidationContext; public abstract class CompositeLootItemCondition implements LootItemCondition { @@ -137,4 +124,4 @@ index bae72197acc929c7ed3e964f156115d728eb2176..8f3094f42f3366a1313d70c0b27fbe56 + public final List terms; // Leaves - private -> public private final Predicate composedPredicate; - protected CompositeLootItemCondition(List terms, Predicate composedPredicate) { + protected CompositeLootItemCondition(final List terms, final Predicate composedPredicate) { diff --git a/1todos/server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch b/lophine-server/minecraft-patches/features/0028-Leaves-Alternative-block-placement-Protocol.patch similarity index 58% rename from 1todos/server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch rename to lophine-server/minecraft-patches/features/0028-Leaves-Alternative-block-placement-Protocol.patch index db2b9d0..999faf2 100644 --- a/1todos/server/minecraft-patches/features/0030-Leaves-Alternative-block-placement-Protocol.patch +++ b/lophine-server/minecraft-patches/features/0028-Leaves-Alternative-block-placement-Protocol.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> +From: Helvetica Volubi Date: Mon, 3 Feb 2025 13:51:26 +0800 Subject: [PATCH] Leaves: Alternative block placement Protocol @@ -13,62 +13,62 @@ MasaGadget(https://github.com/plusls/MasaGadget) litematica(https://github.com/maruohon/litematica) diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8386757c5fd3d8df3ae77a4eeeb25a2f28840cda..fd74636d911596daae8cfe563c2dd5e3d37a1549 100644 +index bc38b16dd296cca9bc5556b95117794e633a9c27..57aff87cc7be0cb7136689412490cd399eff15eb 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2134,7 +2134,7 @@ public class ServerGamePacketListenerImpl - if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.player.level(), blockPos.getX() >> 4, blockPos.getZ() >> 4, 8) && this.player.isWithinBlockInteractionRange(blockPos, 1.0)) { // Folia - do not allow players to interact with blocks outside the current region - Vec3 vec3 = location.subtract(Vec3.atCenterOf(blockPos)); - double d = 1.0000001; -- if (Math.abs(vec3.x()) < 1.0000001 && Math.abs(vec3.y()) < 1.0000001 && Math.abs(vec3.z()) < 1.0000001) { -+ if (fun.bm.lophine.config.modules.function.protocol.AlternativeBlockPlacementProtocolConfig.needIgnoreDistance() ||Math.abs(vec3.x()) < 1.0000001 && Math.abs(vec3.y()) < 1.0000001 && Math.abs(vec3.z()) < 1.0000001) { // Leaves - disableDistanceCheckForUseItem - Direction direction = hitResult.getDirection(); +@@ -2183,7 +2183,7 @@ public class ServerGamePacketListenerImpl + if (ca.spottedleaf.moonrise.common.util.TickThread.isTickThreadFor(this.player.level(), pos.getX() >> 4, pos.getZ() >> 4, 8) && this.player.isWithinBlockInteractionRange(pos, 1.0)) { // Folia - do not allow players to interact with blocks outside the current region + Vec3 distance = location.subtract(Vec3.atCenterOf(pos)); + double limit = 1.0000001; +- if (Math.abs(distance.x()) < 1.0000001 && Math.abs(distance.y()) < 1.0000001 && Math.abs(distance.z()) < 1.0000001) { ++ if (fun.bm.lophine.config.modules.function.protocol.AlternativeBlockPlacementProtocolConfig.needIgnoreDistance() ||Math.abs(distance.x()) < 1.0000001 && Math.abs(distance.y()) < 1.0000001 && Math.abs(distance.z()) < 1.0000001) { // Leaves - disableDistanceCheckForUseItem + Direction direction = blockHit.getDirection(); this.player.resetLastActionTime(); - int maxY = this.player.level().getMaxY(); + int maxY = level.getMaxY(); diff --git a/net/minecraft/world/item/BlockItem.java b/net/minecraft/world/item/BlockItem.java -index 73ce7c82c0bd28c2e43ca40ba35c4603b21375ad..a5d3caab2072b2c9bf8fdcbdb7c52c2dee16cfaf 100644 +index 3167be4b7c2c61ef725af4a832d759ab6e061af0..2e2a8af12f249ec5bd0935fd13f5acbd0a777b5f 100644 --- a/net/minecraft/world/item/BlockItem.java +++ b/net/minecraft/world/item/BlockItem.java -@@ -147,7 +147,7 @@ public class BlockItem extends Item { +@@ -136,7 +136,7 @@ public class BlockItem extends Item { } - protected @Nullable BlockState getPlacementState(BlockPlaceContext context) { + protected @Nullable BlockState getPlacementState(final BlockPlaceContext context) { - BlockState stateForPlacement = this.getBlock().getStateForPlacement(context); + BlockState stateForPlacement = this.getBlock().getRealStateForPlacement(context); // Leaves - alternativeBlockPlacement return stateForPlacement != null && this.canPlace(context, stateForPlacement) ? stateForPlacement : null; } diff --git a/net/minecraft/world/item/StandingAndWallBlockItem.java b/net/minecraft/world/item/StandingAndWallBlockItem.java -index d75c95d728efc0b4064f562ca80b68b23883feaf..be685383b8e7c8111e976fc560f16d43d6545a34 100644 +index d5d499226d0b2c2adfae7bbb4c28c96c80411c44..cb0a4a9865df69e5504a86de6c144bc4450bd19a 100644 --- a/net/minecraft/world/item/StandingAndWallBlockItem.java +++ b/net/minecraft/world/item/StandingAndWallBlockItem.java @@ -26,14 +26,14 @@ public class StandingAndWallBlockItem extends BlockItem { @Override - protected @Nullable BlockState getPlacementState(BlockPlaceContext context) { -- BlockState stateForPlacement = this.wallBlock.getStateForPlacement(context); -+ BlockState stateForPlacement = this.wallBlock.getRealStateForPlacement(context); // Leaves - alternativeBlockPlacement - BlockState blockState = null; + protected @Nullable BlockState getPlacementState(final BlockPlaceContext context) { +- BlockState wallState = this.wallBlock.getStateForPlacement(context); ++ BlockState wallState = this.wallBlock.getRealStateForPlacement(context); // Leaves - alternativeBlockPlacement + BlockState stateForPlacement = null; LevelReader level = context.getLevel(); - BlockPos clickedPos = context.getClickedPos(); + BlockPos pos = context.getClickedPos(); for (Direction direction : context.getNearestLookingDirections()) { if (direction != this.attachmentDirection.getOpposite()) { -- BlockState blockState1 = direction == this.attachmentDirection ? this.getBlock().getStateForPlacement(context) : stateForPlacement; -+ BlockState blockState1 = direction == this.attachmentDirection ? this.getBlock().getRealStateForPlacement(context) : stateForPlacement; // Leaves - alternativeBlockPlacement - if (blockState1 != null && this.canPlace(level, blockState1, clickedPos)) { - blockState = blockState1; +- BlockState possibleState = direction == this.attachmentDirection ? this.getBlock().getStateForPlacement(context) : wallState; ++ BlockState possibleState = direction == this.attachmentDirection ? this.getBlock().getRealStateForPlacement(context) : wallState; // Leaves - alternativeBlockPlacement + if (possibleState != null && this.canPlace(level, possibleState, pos)) { + stateForPlacement = possibleState; break; diff --git a/net/minecraft/world/level/block/Block.java b/net/minecraft/world/level/block/Block.java -index 492b1615d96133c5082e0f16015f114299f8082f..fb47a2acb0e4232359f5da061c1620a7b1d6c476 100644 +index 0cdd88e530c660b65f3eb331b37cbd2c69fc2ff5..62dec122c5e23150dc107d3fab5a552f86d34565 100644 --- a/net/minecraft/world/level/block/Block.java +++ b/net/minecraft/world/level/block/Block.java -@@ -489,6 +489,32 @@ public class Block extends BlockBehaviour implements ItemLike { - public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) { +@@ -516,6 +516,32 @@ public class Block extends BlockBehaviour implements ItemLike { + public void stepOn(final Level level, final BlockPos pos, final BlockState onState, final Entity entity) { } + // Leaves start - alternativeBlockPlacement -+ public @Nullable BlockState getRealStateForPlacement(BlockPlaceContext context) { ++ public @Nullable BlockState getRealStateForPlacement(final BlockPlaceContext context) { + BlockState vanillaState = this.getStateForPlacement(context); + switch (fun.bm.lophine.config.modules.function.protocol.AlternativeBlockPlacementProtocolConfig.alternativeBlockPlacement) { + case fun.bm.lophine.enums.EnumAlternativePlaceType.CARPET -> { @@ -93,6 +93,6 @@ index 492b1615d96133c5082e0f16015f114299f8082f..fb47a2acb0e4232359f5da061c1620a7 + } + // Leaves end - alternativeBlockPlacement + - public @Nullable BlockState getStateForPlacement(BlockPlaceContext context) { + public @Nullable BlockState getStateForPlacement(final BlockPlaceContext context) { return this.defaultBlockState(); } diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/RedStoneConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/RedStoneConfig.java index bcf12a9..64eeb82 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/RedStoneConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/RedStoneConfig.java @@ -3,7 +3,6 @@ package fun.bm.lophine.config.modules.function; import me.earthme.luminol.config.IConfigModule; import me.earthme.luminol.config.flags.ConfigClassInfo; import me.earthme.luminol.config.flags.ConfigInfo; -import me.earthme.luminol.config.flags.TransformedConfig; import me.earthme.luminol.enums.EnumConfigCategory; @ConfigClassInfo(category = EnumConfigCategory.FUNCTION, name = "redstone") diff --git a/1todos/server/config-files/function/protocol/AlternativeBlockPlacementProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/AlternativeBlockPlacementProtocolConfig.java similarity index 100% rename from 1todos/server/config-files/function/protocol/AlternativeBlockPlacementProtocolConfig.java rename to lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/AlternativeBlockPlacementProtocolConfig.java diff --git a/1todos/server/config-files/function/protocol/AppleSkinProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/AppleSkinProtocolConfig.java similarity index 100% rename from 1todos/server/config-files/function/protocol/AppleSkinProtocolConfig.java rename to lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/AppleSkinProtocolConfig.java diff --git a/1todos/server/config-files/function/protocol/BBORProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/BBORProtocolConfig.java similarity index 100% rename from 1todos/server/config-files/function/protocol/BBORProtocolConfig.java rename to lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/BBORProtocolConfig.java diff --git a/1todos/server/config-files/function/protocol/JadeProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/JadeProtocolConfig.java similarity index 100% rename from 1todos/server/config-files/function/protocol/JadeProtocolConfig.java rename to lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/JadeProtocolConfig.java diff --git a/1todos/server/config-files/function/protocol/REIServerProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/REIServerProtocolConfig.java similarity index 100% rename from 1todos/server/config-files/function/protocol/REIServerProtocolConfig.java rename to lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/REIServerProtocolConfig.java diff --git a/1todos/server/config-files/function/protocol/SyncmaticaProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/SyncmaticaProtocolConfig.java similarity index 100% rename from 1todos/server/config-files/function/protocol/SyncmaticaProtocolConfig.java rename to lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/SyncmaticaProtocolConfig.java diff --git a/1todos/server/config-files/function/protocol/XaeroMapProtocolConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/XaeroMapProtocolConfig.java similarity index 100% rename from 1todos/server/config-files/function/protocol/XaeroMapProtocolConfig.java rename to lophine-server/src/main/java/fun/bm/lophine/config/modules/function/protocol/XaeroMapProtocolConfig.java diff --git a/1todos/server/src/lophine/enums/EnumAlternativePlaceType.java b/lophine-server/src/main/java/fun/bm/lophine/enums/EnumAlternativePlaceType.java similarity index 100% rename from 1todos/server/src/lophine/enums/EnumAlternativePlaceType.java rename to lophine-server/src/main/java/fun/bm/lophine/enums/EnumAlternativePlaceType.java diff --git a/1todos/server/src/leaves/protocol/AppleSkinProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/AppleSkinProtocol.java similarity index 100% rename from 1todos/server/src/leaves/protocol/AppleSkinProtocol.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/AppleSkinProtocol.java diff --git a/1todos/server/src/leaves/protocol/BBORProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/BBORProtocol.java similarity index 100% rename from 1todos/server/src/leaves/protocol/BBORProtocol.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/BBORProtocol.java diff --git a/1todos/server/src/leaves/protocol/CarpetAlternativeBlockPlacement.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/CarpetAlternativeBlockPlacement.java similarity index 100% rename from 1todos/server/src/leaves/protocol/CarpetAlternativeBlockPlacement.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/CarpetAlternativeBlockPlacement.java diff --git a/1todos/server/src/leaves/protocol/CarpetServerProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/CarpetServerProtocol.java similarity index 100% rename from 1todos/server/src/leaves/protocol/CarpetServerProtocol.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/CarpetServerProtocol.java diff --git a/1todos/server/src/leaves/protocol/LitematicaEasyPlaceProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/LitematicaEasyPlaceProtocol.java similarity index 100% rename from 1todos/server/src/leaves/protocol/LitematicaEasyPlaceProtocol.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/LitematicaEasyPlaceProtocol.java diff --git a/1todos/server/src/leaves/protocol/XaeroMapProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/XaeroMapProtocol.java similarity index 100% rename from 1todos/server/src/leaves/protocol/XaeroMapProtocol.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/XaeroMapProtocol.java diff --git a/1todos/server/src/leaves/protocol/jade/JadeProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/JadeProtocol.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java diff --git a/1todos/server/src/leaves/protocol/jade/accessor/Accessor.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/Accessor.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/accessor/Accessor.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/Accessor.java diff --git a/1todos/server/src/leaves/protocol/jade/accessor/BlockAccessor.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessor.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/accessor/BlockAccessor.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/BlockAccessor.java diff --git a/1todos/server/src/leaves/protocol/jade/accessor/EntityAccessor.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/EntityAccessor.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/accessor/EntityAccessor.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/accessor/EntityAccessor.java diff --git a/1todos/server/src/leaves/protocol/jade/payload/ClientHandshakePayload.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ClientHandshakePayload.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/payload/ClientHandshakePayload.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ClientHandshakePayload.java diff --git a/1todos/server/src/leaves/protocol/jade/payload/ReceiveDataPayload.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ReceiveDataPayload.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/payload/ReceiveDataPayload.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ReceiveDataPayload.java diff --git a/1todos/server/src/leaves/protocol/jade/payload/RequestBlockPayload.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/RequestBlockPayload.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/payload/RequestBlockPayload.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/RequestBlockPayload.java diff --git a/1todos/server/src/leaves/protocol/jade/payload/RequestEntityPayload.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/RequestEntityPayload.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/payload/RequestEntityPayload.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/RequestEntityPayload.java diff --git a/1todos/server/src/leaves/protocol/jade/payload/ServerHandshakePayload.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ServerHandshakePayload.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/payload/ServerHandshakePayload.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/payload/ServerHandshakePayload.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageExtensionProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/ItemStorageProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/ItemStorageProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ItemStorageProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/JadeProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/JadeProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/JadeProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/JadeProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/ServerDataProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ServerDataProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/ServerDataProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ServerDataProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/ServerExtensionProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ServerExtensionProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/ServerExtensionProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/ServerExtensionProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/StreamServerDataProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/StreamServerDataProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/StreamServerDataProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/StreamServerDataProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/BeehiveProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/BeehiveProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/BeehiveProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/BeehiveProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/BlockNameProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/BlockNameProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/BlockNameProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/BlockNameProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/BrewingStandProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/BrewingStandProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/BrewingStandProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/BrewingStandProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/CampfireProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/CampfireProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/CampfireProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/CampfireProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/ChiseledBookshelfProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/ChiseledBookshelfProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/ChiseledBookshelfProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/ChiseledBookshelfProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/CommandBlockProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/CommandBlockProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/CommandBlockProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/CommandBlockProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/FurnaceProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/FurnaceProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/FurnaceProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/FurnaceProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/HopperLockProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/HopperLockProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/HopperLockProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/HopperLockProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/JukeboxProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/JukeboxProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/JukeboxProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/JukeboxProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/LecternProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/LecternProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/LecternProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/LecternProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/MobSpawnerCooldownProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/MobSpawnerCooldownProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/MobSpawnerCooldownProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/MobSpawnerCooldownProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/block/RedstoneProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/RedstoneProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/block/RedstoneProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/block/RedstoneProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/entity/AnimalOwnerProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/AnimalOwnerProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/entity/AnimalOwnerProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/AnimalOwnerProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/entity/MobBreedingProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/MobBreedingProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/entity/MobBreedingProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/MobBreedingProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/entity/MobGrowthProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/MobGrowthProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/entity/MobGrowthProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/MobGrowthProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/entity/NextEntityDropProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/NextEntityDropProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/entity/NextEntityDropProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/NextEntityDropProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/entity/PetArmorProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/PetArmorProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/entity/PetArmorProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/PetArmorProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/entity/StatusEffectsProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/StatusEffectsProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/entity/StatusEffectsProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/StatusEffectsProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/provider/entity/ZombieVillagerProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/ZombieVillagerProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/provider/entity/ZombieVillagerProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/provider/entity/ZombieVillagerProvider.java diff --git a/1todos/server/src/leaves/protocol/jade/tool/ShearsToolHandler.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/tool/ShearsToolHandler.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/tool/ShearsToolHandler.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/tool/ShearsToolHandler.java diff --git a/1todos/server/src/leaves/protocol/jade/util/CommonUtil.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/CommonUtil.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/CommonUtil.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/CommonUtil.java diff --git a/1todos/server/src/leaves/protocol/jade/util/HierarchyLookup.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/HierarchyLookup.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/HierarchyLookup.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/HierarchyLookup.java diff --git a/1todos/server/src/leaves/protocol/jade/util/IHierarchyLookup.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/IHierarchyLookup.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/IHierarchyLookup.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/IHierarchyLookup.java diff --git a/1todos/server/src/leaves/protocol/jade/util/ItemCollector.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/ItemCollector.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/ItemCollector.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/ItemCollector.java diff --git a/1todos/server/src/leaves/protocol/jade/util/ItemIterator.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/ItemIterator.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/ItemIterator.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/ItemIterator.java diff --git a/1todos/server/src/leaves/protocol/jade/util/JadeCodec.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/JadeCodec.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/JadeCodec.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/JadeCodec.java diff --git a/1todos/server/src/leaves/protocol/jade/util/LootTableMineableCollector.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/LootTableMineableCollector.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/LootTableMineableCollector.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/LootTableMineableCollector.java diff --git a/1todos/server/src/leaves/protocol/jade/util/PairHierarchyLookup.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/PairHierarchyLookup.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/PairHierarchyLookup.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/PairHierarchyLookup.java diff --git a/1todos/server/src/leaves/protocol/jade/util/PriorityStore.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/PriorityStore.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/PriorityStore.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/PriorityStore.java diff --git a/1todos/server/src/leaves/protocol/jade/util/ViewGroup.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/ViewGroup.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/ViewGroup.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/ViewGroup.java diff --git a/1todos/server/src/leaves/protocol/jade/util/WrappedHierarchyLookup.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/WrappedHierarchyLookup.java similarity index 100% rename from 1todos/server/src/leaves/protocol/jade/util/WrappedHierarchyLookup.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/jade/util/WrappedHierarchyLookup.java diff --git a/1todos/server/src/leaves/protocol/rei/PacketTransformer.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/PacketTransformer.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/PacketTransformer.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/PacketTransformer.java diff --git a/1todos/server/src/leaves/protocol/rei/REIServerProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java similarity index 94% rename from 1todos/server/src/leaves/protocol/rei/REIServerProtocol.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java index ef04d1a..4e21bd9 100644 --- a/1todos/server/src/leaves/protocol/rei/REIServerProtocol.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java @@ -146,12 +146,19 @@ public class REIServerProtocol implements LeavesProtocol { switch (holder.value()) { case ShapedRecipe ignored -> builder.add(new ShapedDisplay((RecipeHolder) holder)); case ShapelessRecipe ignored -> builder.add(new ShapelessDisplay((RecipeHolder) holder)); + // Leaves start - Paper 26.1: map_cloning is a TransmuteRecipe but the client expects a + // shapeless-style display (filled map + empty map → 2 filled maps). Match by identifier + // before the generic TransmuteRecipe case to route correctly. + case TransmuteRecipe ignored when "minecraft:map_cloning".equals(holder.id().identifier().toString()) -> + builder.addAll(Display.ofMapCloningRecipe((RecipeHolder) holder)); + // Leaves end case TransmuteRecipe ignored -> builder.addAll(Display.ofTransmuteRecipe((RecipeHolder) holder)); - case TippedArrowRecipe ignored -> builder.addAll(Display.ofTippedArrowRecipe((RecipeHolder) holder)); case FireworkRocketRecipe ignored -> builder.addAll(Display.ofFireworkRocketRecipe((RecipeHolder) holder)); - case MapCloningRecipe ignored -> builder.addAll(Display.ofMapCloningRecipe((RecipeHolder) holder)); - // ignore ArmorDyeRecipe, BannerDuplicateRecipe, BookCloningRecipe, ShieldDecorationRecipe + // Leaves - Paper 26.1: tipped_arrow is now an ImbueRecipe (replaced the removed TippedArrowRecipe class). + // ImbueRecipe is currently only used for tipped_arrow so a plain type match is safe. + case ImbueRecipe ignored -> builder.addAll(Display.ofTippedArrowRecipe((RecipeHolder) holder)); + // ignore ArmorDyeRecipe, BannerDuplicateRecipe, BookCloningRecipe, ShieldDecorationRecipe, RepairItemRecipe default -> { } } @@ -243,7 +250,7 @@ public class REIServerProtocol implements LeavesProtocol { }); */ } else { - player.displayClientMessage(Component.translatable("text.rei.failed_cheat_items"), false); + player.sendSystemMessage(Component.translatable("text.rei.failed_cheat_items"), false); } }; inboundTransform(player, CREATE_ITEMS_PACKET, buf, consumer); @@ -302,7 +309,7 @@ public class REIServerProtocol implements LeavesProtocol { }); */ } else { - player.displayClientMessage(Component.translatable("text.rei.failed_cheat_items"), false); + player.sendSystemMessage(Component.translatable("text.rei.failed_cheat_items"), false); } }; inboundTransform(player, CREATE_ITEMS_HOTBAR_PACKET, buf, consumer); @@ -376,7 +383,7 @@ public class REIServerProtocol implements LeavesProtocol { if (player.getBukkitEntity().hasPermission(CHEAT_PERMISSION)) { return true; } - player.displayClientMessage(Component.translatable("text.rei.no_permission_cheat").withStyle(ChatFormatting.RED), false); + player.sendSystemMessage(Component.translatable("text.rei.no_permission_cheat").withStyle(ChatFormatting.RED), false); return false; } diff --git a/1todos/server/src/leaves/protocol/rei/display/BlastingDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/BlastingDisplay.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/display/BlastingDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/BlastingDisplay.java diff --git a/1todos/server/src/leaves/protocol/rei/display/CampfireDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CampfireDisplay.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/display/CampfireDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CampfireDisplay.java diff --git a/1todos/server/src/leaves/protocol/rei/display/CookingDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CookingDisplay.java similarity index 96% rename from 1todos/server/src/leaves/protocol/rei/display/CookingDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CookingDisplay.java index 3996fdf..10595cc 100644 --- a/1todos/server/src/leaves/protocol/rei/display/CookingDisplay.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CookingDisplay.java @@ -25,7 +25,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.AbstractCookingRecipe; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.SingleRecipeInput; -import org.bukkit.craftbukkit.CraftRegistry; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.protocol.rei.ingredient.EntryIngredient; @@ -58,7 +57,7 @@ public abstract class CookingDisplay extends Display { public CookingDisplay(RecipeHolder recipe) { this( List.of(EntryIngredient.ofIngredient(recipe.value().input())), - List.of(EntryIngredient.of(recipe.value().assemble(new SingleRecipeInput(ItemStack.EMPTY), CraftRegistry.getMinecraftRegistry()))), + List.of(EntryIngredient.of(recipe.value().assemble(new SingleRecipeInput(ItemStack.EMPTY)))), // Leaves - Paper 26.1: assemble no longer takes RegistryAccess recipe.id().identifier(), recipe.value().experience(), recipe.value().cookingTime() diff --git a/1todos/server/src/leaves/protocol/rei/display/CraftingDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CraftingDisplay.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/display/CraftingDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CraftingDisplay.java diff --git a/1todos/server/src/leaves/protocol/rei/display/CustomDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CustomDisplay.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/display/CustomDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/CustomDisplay.java diff --git a/1todos/server/src/leaves/protocol/rei/display/Display.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/Display.java similarity index 93% rename from 1todos/server/src/leaves/protocol/rei/display/Display.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/Display.java index 9f27dd9..b9a332e 100644 --- a/1todos/server/src/leaves/protocol/rei/display/Display.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/Display.java @@ -33,7 +33,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.alchemy.PotionContents; import net.minecraft.world.item.component.Fireworks; -import net.minecraft.world.item.component.ProvidesTrimMaterial; import net.minecraft.world.item.crafting.*; import net.minecraft.world.item.crafting.display.*; import net.minecraft.world.item.equipment.trim.TrimMaterial; @@ -44,6 +43,8 @@ import org.leavesmc.leaves.protocol.rei.ingredient.EntryIngredient; import java.util.*; import java.util.stream.Stream; +// Leaves - Paper 26.1: CustomRecipe import no longer needed — tipped_arrow is now ImbueRecipe, map_cloning is TransmuteRecipe + /** * A display to be used alongside Roughly Enough Items. *

@@ -101,7 +102,7 @@ public abstract class Display { * see me.shedaniel.rei.plugin.client.categories.crafting.filler.TippedArrowRecipeFiller#apply */ @NotNull - public static Collection ofTippedArrowRecipe(@NotNull RecipeHolder recipeHolder) { + public static Collection ofTippedArrowRecipe(@NotNull RecipeHolder recipeHolder) { // Leaves - Paper 26.1: tipped_arrow is now ImbueRecipe, not CustomRecipe EntryIngredient arrowIngredient = EntryIngredient.of(Items.ARROW); Set registeredPotions = new HashSet<>(); List displays = new ArrayList<>(); @@ -152,7 +153,7 @@ public abstract class Display { * see me.shedaniel.rei.plugin.client.categories.crafting.filler.MapCloningRecipeFiller#apply */ @NotNull - public static Collection ofMapCloningRecipe(@NotNull RecipeHolder recipeHolder) { + public static Collection ofMapCloningRecipe(@NotNull RecipeHolder recipeHolder) { // Leaves - Paper 26.1: map_cloning is now TransmuteRecipe, not CustomRecipe return Collections.singleton( new ShapelessDisplay( List.of(EntryIngredient.of(Items.FILLED_MAP), EntryIngredient.of(Items.MAP)), @@ -205,15 +206,16 @@ public abstract class Display { } private static Optional> getMaterialFromIngredient(HolderLookup.Provider provider, Holder item) { - ProvidesTrimMaterial providesTrimMaterial = new ItemStack(item).get(DataComponents.PROVIDES_TRIM_MATERIAL); - return providesTrimMaterial != null ? providesTrimMaterial.unwrap(provider) : Optional.empty(); + Holder providesTrimMaterial = new ItemStack(item).get(DataComponents.PROVIDES_TRIM_MATERIAL); // Leaves - Paper 26.1: PROVIDES_TRIM_MATERIAL now stores Holder directly + return providesTrimMaterial != null ? Optional.of(providesTrimMaterial) : Optional.empty(); // Leaves - Paper 26.1: direct holder, no unwrap needed } public static EntryIngredient ofSlotDisplay(SlotDisplay slot) { return switch (slot) { case SlotDisplay.Empty ignored -> EntryIngredient.empty(); case SlotDisplay.ItemSlotDisplay s -> EntryIngredient.of(s.item().value()); - case SlotDisplay.ItemStackSlotDisplay s -> EntryIngredient.of(s.stack()); + case SlotDisplay.ItemStackSlotDisplay s -> + EntryIngredient.of(s.stack().create()); // Leaves - Paper 26.1: ItemStackSlotDisplay.stack() now returns ItemStackTemplate case SlotDisplay.TagSlotDisplay s -> ofItemTag(s.tag()); case SlotDisplay.Composite s -> { ArrayList list = new ArrayList<>(); diff --git a/1todos/server/src/leaves/protocol/rei/display/ShapedDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/ShapedDisplay.java similarity index 97% rename from 1todos/server/src/leaves/protocol/rei/display/ShapedDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/ShapedDisplay.java index 88079f2..5dd73dc 100644 --- a/1todos/server/src/leaves/protocol/rei/display/ShapedDisplay.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/ShapedDisplay.java @@ -26,7 +26,6 @@ import net.minecraft.world.item.crafting.CraftingInput; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.item.crafting.display.ShapedCraftingRecipeDisplay; -import org.bukkit.craftbukkit.CraftRegistry; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.protocol.rei.ingredient.EntryIngredient; @@ -57,7 +56,7 @@ public class ShapedDisplay extends CraftingDisplay { public ShapedDisplay(@NotNull RecipeHolder recipeHolder) { super( ofIngredient(recipeHolder.value()), - List.of(EntryIngredient.of(recipeHolder.value().assemble(CraftingInput.EMPTY, CraftRegistry.getMinecraftRegistry()))), + List.of(EntryIngredient.of(recipeHolder.value().assemble(CraftingInput.EMPTY))), // Leaves - Paper 26.1: assemble no longer takes RegistryAccess recipeHolder.id().identifier() ); this.width = recipeHolder.value().getWidth(); diff --git a/1todos/server/src/leaves/protocol/rei/display/ShapelessDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/ShapelessDisplay.java similarity index 96% rename from 1todos/server/src/leaves/protocol/rei/display/ShapelessDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/ShapelessDisplay.java index 7e99fb9..af554ed 100644 --- a/1todos/server/src/leaves/protocol/rei/display/ShapelessDisplay.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/ShapelessDisplay.java @@ -26,7 +26,6 @@ import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.ShapelessRecipe; import net.minecraft.world.item.crafting.display.ShapelessCraftingRecipeDisplay; import org.apache.commons.lang3.NotImplementedException; -import org.bukkit.craftbukkit.CraftRegistry; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.protocol.rei.ingredient.EntryIngredient; @@ -55,7 +54,7 @@ public class ShapelessDisplay extends CraftingDisplay { public ShapelessDisplay(@NotNull RecipeHolder recipeHolder) { this( recipeHolder.value().placementInfo().ingredients().stream().map(EntryIngredient::ofIngredient).toList(), - List.of(EntryIngredient.of(recipeHolder.value().assemble(CraftingInput.EMPTY, CraftRegistry.getMinecraftRegistry()))), + List.of(EntryIngredient.of(recipeHolder.value().assemble(CraftingInput.EMPTY))), // Leaves - Paper 26.1: assemble no longer takes RegistryAccess recipeHolder.id().identifier() ); } diff --git a/1todos/server/src/leaves/protocol/rei/display/SmeltingDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/SmeltingDisplay.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/display/SmeltingDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/SmeltingDisplay.java diff --git a/1todos/server/src/leaves/protocol/rei/display/SmithingDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/SmithingDisplay.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/display/SmithingDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/SmithingDisplay.java diff --git a/1todos/server/src/leaves/protocol/rei/display/SmokingDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/SmokingDisplay.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/display/SmokingDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/SmokingDisplay.java diff --git a/1todos/server/src/leaves/protocol/rei/display/StoneCuttingDisplay.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/StoneCuttingDisplay.java similarity index 95% rename from 1todos/server/src/leaves/protocol/rei/display/StoneCuttingDisplay.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/StoneCuttingDisplay.java index 3d666ed..5489553 100644 --- a/1todos/server/src/leaves/protocol/rei/display/StoneCuttingDisplay.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/display/StoneCuttingDisplay.java @@ -25,7 +25,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.SingleRecipeInput; import net.minecraft.world.item.crafting.StonecutterRecipe; -import org.bukkit.craftbukkit.CraftRegistry; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.protocol.rei.ingredient.EntryIngredient; @@ -55,7 +54,7 @@ public class StoneCuttingDisplay extends Display { public StoneCuttingDisplay(RecipeHolder recipeHolder) { this( List.of(EntryIngredient.ofIngredient(recipeHolder.value().input())), - List.of(EntryIngredient.of(recipeHolder.value().assemble(new SingleRecipeInput(ItemStack.EMPTY), CraftRegistry.getMinecraftRegistry()))), + List.of(EntryIngredient.of(recipeHolder.value().assemble(new SingleRecipeInput(ItemStack.EMPTY)))), // Leaves - Paper 26.1: assemble no longer takes RegistryAccess recipeHolder.id().identifier() ); } diff --git a/1todos/server/src/leaves/protocol/rei/ingredient/EntryIngredient.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/ingredient/EntryIngredient.java similarity index 98% rename from 1todos/server/src/leaves/protocol/rei/ingredient/EntryIngredient.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/ingredient/EntryIngredient.java index 785ae6e..2c74a79 100644 --- a/1todos/server/src/leaves/protocol/rei/ingredient/EntryIngredient.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/ingredient/EntryIngredient.java @@ -53,7 +53,7 @@ public class EntryIngredient { buffer.writeVarInt(0); } else { buffer.writeVarInt(itemStack.getCount()); - ITEM_STREAM_CODEC.encode(buffer, itemStack.getItemHolder()); + ITEM_STREAM_CODEC.encode(buffer, itemStack.typeHolder()); DataComponentPatch.STREAM_CODEC.encode(buffer, itemStack.components.asPatch()); } }); diff --git a/1todos/server/src/leaves/protocol/rei/payload/DisplaySyncPayload.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/payload/DisplaySyncPayload.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/payload/DisplaySyncPayload.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/payload/DisplaySyncPayload.java diff --git a/1todos/server/src/leaves/protocol/rei/transfer/InputSlotCrafter.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/InputSlotCrafter.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/transfer/InputSlotCrafter.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/InputSlotCrafter.java diff --git a/1todos/server/src/leaves/protocol/rei/transfer/ItemRecipeFinder.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/ItemRecipeFinder.java similarity index 97% rename from 1todos/server/src/leaves/protocol/rei/transfer/ItemRecipeFinder.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/ItemRecipeFinder.java index d6f5a4c..1103d78 100644 --- a/1todos/server/src/leaves/protocol/rei/transfer/ItemRecipeFinder.java +++ b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/ItemRecipeFinder.java @@ -87,7 +87,7 @@ public class ItemRecipeFinder { } private ItemKey ofKey(ItemStack itemStack) { - return keys.intern(new ItemKey(itemStack.getItemHolder(), itemStack.getComponentsPatch())); + return keys.intern(new ItemKey(itemStack.typeHolder(), itemStack.getComponentsPatch())); } private Ingredient ofKeys(int index, List itemStack) { diff --git a/1todos/server/src/leaves/protocol/rei/transfer/NewInputSlotCrafter.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/NewInputSlotCrafter.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/transfer/NewInputSlotCrafter.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/NewInputSlotCrafter.java diff --git a/1todos/server/src/leaves/protocol/rei/transfer/RecipeFinder.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/RecipeFinder.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/transfer/RecipeFinder.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/RecipeFinder.java diff --git a/1todos/server/src/leaves/protocol/rei/transfer/slot/PlayerInventorySlotAccessor.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/slot/PlayerInventorySlotAccessor.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/transfer/slot/PlayerInventorySlotAccessor.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/slot/PlayerInventorySlotAccessor.java diff --git a/1todos/server/src/leaves/protocol/rei/transfer/slot/SlotAccessor.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/slot/SlotAccessor.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/transfer/slot/SlotAccessor.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/slot/SlotAccessor.java diff --git a/1todos/server/src/leaves/protocol/rei/transfer/slot/VanillaSlotAccessor.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/slot/VanillaSlotAccessor.java similarity index 100% rename from 1todos/server/src/leaves/protocol/rei/transfer/slot/VanillaSlotAccessor.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/rei/transfer/slot/VanillaSlotAccessor.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/CommunicationManager.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/CommunicationManager.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/CommunicationManager.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/Feature.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/Feature.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/Feature.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/Feature.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/FeatureSet.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/FeatureSet.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/FeatureSet.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/FeatureSet.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/FileStorage.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/FileStorage.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/FileStorage.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/FileStorage.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/LocalLitematicState.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/LocalLitematicState.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/LocalLitematicState.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/LocalLitematicState.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/MessageType.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/MessageType.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/MessageType.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/MessageType.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/PacketType.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/PacketType.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/PacketType.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/PacketType.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/PlayerIdentifier.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/PlayerIdentifier.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/PlayerIdentifier.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/PlayerIdentifier.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/PlayerIdentifierProvider.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/PlayerIdentifierProvider.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/PlayerIdentifierProvider.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/PlayerIdentifierProvider.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/ServerPlacement.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/ServerPlacement.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/ServerPlacement.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/ServerPlacement.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/ServerPosition.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/ServerPosition.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/ServerPosition.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/ServerPosition.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/SubRegionData.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SubRegionData.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/SubRegionData.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SubRegionData.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/SubRegionPlacementModification.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SubRegionPlacementModification.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/SubRegionPlacementModification.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SubRegionPlacementModification.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/SyncmaticManager.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticManager.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/SyncmaticManager.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticManager.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/SyncmaticaPayload.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticaPayload.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/SyncmaticaPayload.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticaPayload.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/SyncmaticaProtocol.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticaProtocol.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/SyncmaticaProtocol.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/SyncmaticaProtocol.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/exchange/AbstractExchange.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/AbstractExchange.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/exchange/AbstractExchange.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/AbstractExchange.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/exchange/DownloadExchange.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/DownloadExchange.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/exchange/DownloadExchange.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/DownloadExchange.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/exchange/Exchange.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/Exchange.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/exchange/Exchange.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/Exchange.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/exchange/ExchangeTarget.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/ExchangeTarget.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/exchange/ExchangeTarget.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/ExchangeTarget.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/exchange/FeatureExchange.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/FeatureExchange.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/exchange/FeatureExchange.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/FeatureExchange.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/exchange/ModifyExchangeServer.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/ModifyExchangeServer.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/exchange/ModifyExchangeServer.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/ModifyExchangeServer.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/exchange/UploadExchange.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/UploadExchange.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/exchange/UploadExchange.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/UploadExchange.java diff --git a/1todos/server/src/leaves/protocol/syncmatica/exchange/VersionHandshakeServer.java b/lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/VersionHandshakeServer.java similarity index 100% rename from 1todos/server/src/leaves/protocol/syncmatica/exchange/VersionHandshakeServer.java rename to lophine-server/src/main/java/org/leavesmc/leaves/protocol/syncmatica/exchange/VersionHandshakeServer.java