mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-23 08:59:23 +00:00
5365c49680
Upstream has released updates that appear to apply and compile correctly Gale Changes: Dreeam-qwq/Gale@1e0ebad Clean up Dreeam-qwq/Gale@9ce20fa throw MissingPaletteEntryException for null entries in hash palette Dreeam-qwq/Gale@751637d Final clean up imports
46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: nostalgic853 <yuu8583@proton.me>
|
|
Date: Sun, 23 Oct 2022 23:21:45 +0800
|
|
Subject: [PATCH] KeYi: Add an option for spigot item merging mechanism
|
|
|
|
Original license: MIT
|
|
Original project: https://github.com/KeYiMC/KeYi
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
index 3e89e3f5760690f30221b64e40e69bccb18178fa..a5b392364c2dfceafbee4523699431381db7e7f9 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
@@ -354,7 +354,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
|
|
ItemStack itemstack1 = other.getItem();
|
|
|
|
if (Objects.equals(this.target, other.target) && ItemEntity.areMergable(itemstack, itemstack1)) {
|
|
- if (true || itemstack1.getCount() < itemstack.getCount()) { // Spigot
|
|
+ if (org.dreeam.leaf.config.modules.gameplay.UseSpigotItemMergingMech.enabled || itemstack1.getCount() < itemstack.getCount()) { // Spigot // Leaf - KeYi - Configurable spigot item merging mechanism
|
|
ItemEntity.merge(this, itemstack, other, itemstack1);
|
|
} else {
|
|
ItemEntity.merge(other, itemstack1, this, itemstack);
|
|
diff --git a/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseSpigotItemMergingMech.java b/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseSpigotItemMergingMech.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..25373d9cc5319795b2b572a336d8834b608c5279
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseSpigotItemMergingMech.java
|
|
@@ -0,0 +1,18 @@
|
|
+package org.dreeam.leaf.config.modules.gameplay;
|
|
+
|
|
+import org.dreeam.leaf.config.ConfigModules;
|
|
+import org.dreeam.leaf.config.EnumConfigCategory;
|
|
+
|
|
+public class UseSpigotItemMergingMech extends ConfigModules {
|
|
+
|
|
+ public String getBasePath() {
|
|
+ return EnumConfigCategory.GAMEPLAY.getBaseKeyName() + ".use-spigot-item-merging-mechanism";
|
|
+ }
|
|
+
|
|
+ public static boolean enabled = true;
|
|
+
|
|
+ @Override
|
|
+ public void onLoaded() {
|
|
+ enabled = config.getBoolean(getBasePath(), enabled);
|
|
+ }
|
|
+}
|