Stop pick block from deleting tinker tools (#4939)

Uses a "new" forge hook, hence why it was not possible on 1.18
SlimeKnights · Apr 8, 2024 · 8e4ca43 · 8e4ca43
1 parent 27aa457
commit 8e4ca43
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 12 deletions.
diff --git a/src/main/java/slimeknights/tconstruct/library/tools/item/ModifiableArmorItem.java b/src/main/java/slimeknights/tconstruct/library/tools/item/ModifiableArmorItem.java
@@ -88,33 +88,41 @@ public int getMaxStackSize(ItemStack stack) {
   }
 
   @Override
-  public boolean isEnchantable(ItemStack stack) {
-    return false;
+  public boolean makesPiglinsNeutral(ItemStack stack, LivingEntity wearer) {
+    return ModifierUtil.checkVolatileFlag(stack, PIGLIN_NEUTRAL);
   }
 
   @Override
-  public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
-    return false;
+  public boolean canWalkOnPowderedSnow(ItemStack stack, LivingEntity wearer) {
+    return slot == EquipmentSlot.FEET && ModifierUtil.checkVolatileFlag(stack, SNOW_BOOTS);
   }
 
   @Override
-  public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
-    return enchantment.isCurse() && super.canApplyAtEnchantingTable(stack, enchantment);
+  public boolean canPerformAction(ItemStack stack, ToolAction toolAction) {
+    return ModifierUtil.canPerformAction(ToolStack.from(stack), toolAction);
   }
 
   @Override
-  public boolean makesPiglinsNeutral(ItemStack stack, LivingEntity wearer) {
-    return ModifierUtil.checkVolatileFlag(stack, PIGLIN_NEUTRAL);
+  public boolean isNotReplaceableByPickAction(ItemStack stack, Player player, int inventorySlot) {
+    return true;
   }
 
+
+  /* Enchantments */
+
   @Override
-  public boolean canWalkOnPowderedSnow(ItemStack stack, LivingEntity wearer) {
-    return slot == EquipmentSlot.FEET && ModifierUtil.checkVolatileFlag(stack, SNOW_BOOTS);
+  public boolean isEnchantable(ItemStack stack) {
+    return false;
   }
 
   @Override
-  public boolean canPerformAction(ItemStack stack, ToolAction toolAction) {
-    return ModifierUtil.canPerformAction(ToolStack.from(stack), toolAction);
+  public boolean isBookEnchantable(ItemStack stack, ItemStack book) {
+    return false;
+  }
+
+  @Override
+  public boolean canApplyAtEnchantingTable(ItemStack stack, Enchantment enchantment) {
+    return enchantment.isCurse() && super.canApplyAtEnchantingTable(stack, enchantment);
   }
 
   @Override

diff --git a/src/main/java/slimeknights/tconstruct/library/tools/item/ModifiableItem.java b/src/main/java/slimeknights/tconstruct/library/tools/item/ModifiableItem.java
@@ -89,6 +89,14 @@ public int getMaxStackSize(ItemStack stack) {
     return 1;
   }
 
+  @Override
+  public boolean isNotReplaceableByPickAction(ItemStack stack, Player player, int inventorySlot) {
+    return true;
+  }
+
+
+  /* Enchanting */
+
   @Override
   public boolean isEnchantable(ItemStack stack) {
     return false;

diff --git a/src/main/java/slimeknights/tconstruct/library/tools/item/ModifiableLauncherItem.java b/src/main/java/slimeknights/tconstruct/library/tools/item/ModifiableLauncherItem.java
@@ -81,6 +81,14 @@ public int getMaxStackSize(ItemStack stack) {
     return 1;
   }
 
+  @Override
+  public boolean isNotReplaceableByPickAction(ItemStack stack, Player player, int inventorySlot) {
+    return true;
+  }
+
+
+  /* Enchanting */
+
   @Override
   public boolean isEnchantable(ItemStack stack) {
     return false;