Fix #2676, add the missing slot.allowsModification() check, apply t…

…o molds, vessels, and fishing rods
TerraFirmaCraft · Jun 13, 2024 · cc02746 · cc02746
1 parent 110cc00
commit cc02746
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -113,6 +113,8 @@ dependencies {
     //runtimeOnly(fg.deobf("curse.maven:panoramica-426082:4019292"))
     //runtimeOnly(fg.deobf("curse.maven:embeddium-908741:4819807"))
     //runtimeOnly(fg.deobf("curse.maven:rubidium-574856:4767529"))
+    //runtimeOnly(fg.deobf("curse.maven:create-328085:4835191"))
+    //runtimeOnly(fg.deobf("curse.maven:corpse-316582:5157034"))
 
     // JUnit
     // There is not a testImplementation-like configuration, AFAIK, that is available at minecraft runtime, so we use minecraftLibrary

diff --git a/src/main/java/net/dries007/tfc/common/items/MoldItem.java b/src/main/java/net/dries007/tfc/common/items/MoldItem.java
@@ -160,7 +160,7 @@ else if (!mold.getFluidInTank(0).isEmpty())
     @Override
     public boolean overrideOtherStackedOnMe(ItemStack stack, ItemStack carried, Slot slot, ClickAction action, Player player, SlotAccess carriedSlot)
     {
-        if (action == ClickAction.SECONDARY && !player.isCreative())
+        if (action == ClickAction.SECONDARY && !player.isCreative() && slot.allowModification(player))
         {
             final MoldLike mold = MoldLike.get(stack);
             if (mold != null && !mold.isMolten())

diff --git a/src/main/java/net/dries007/tfc/common/items/TFCFishingRodItem.java b/src/main/java/net/dries007/tfc/common/items/TFCFishingRodItem.java
@@ -136,7 +136,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List<Compone
     public boolean overrideOtherStackedOnMe(ItemStack stack, ItemStack carried, Slot slot, ClickAction action, Player player, SlotAccess carriedSlot)
     {
         final BaitType type = getBaitType(carried);
-        if (type != BaitType.NONE && !player.isCreative() && action == ClickAction.SECONDARY)
+        if (type != BaitType.NONE && !player.isCreative() && action == ClickAction.SECONDARY && slot.allowModification(player))
         {
             if (type == BaitType.SMALL && Helpers.isItem(stack, TFCTags.Items.HOLDS_SMALL_FISHING_BAIT))
             {

diff --git a/src/main/java/net/dries007/tfc/common/items/VesselItem.java b/src/main/java/net/dries007/tfc/common/items/VesselItem.java
@@ -103,7 +103,7 @@ public boolean overrideStackedOnOther(ItemStack stack, Slot slot, ClickAction ac
     public boolean overrideOtherStackedOnMe(ItemStack stack, ItemStack carried, Slot slot, ClickAction action, Player player, SlotAccess carriedSlot)
     {
         final VesselLike vessel = getInventoryVessel(stack);
-        if (vessel != null && TFCConfig.SERVER.enableSmallVesselInventoryInteraction.get() && !player.isCreative() && action == ClickAction.SECONDARY)
+        if (vessel != null && TFCConfig.SERVER.enableSmallVesselInventoryInteraction.get() && !player.isCreative() && action == ClickAction.SECONDARY && slot.allowModification(player))
         {
             if (!carried.isEmpty())
             {