39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Thu, 8 Jun 2023 14:45:30 -0700
|
|
Subject: [PATCH] Properly remove the experimental smithing inventory type
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
index c3aeb1b622509ecd9e2230ce82e3bf07899fa540..64e59fe706b0bb37fc2439fa88fd40c3167c9fb5 100644
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
@@ -155,7 +155,7 @@ public enum InventoryType {
|
|
*
|
|
* @deprecated use {@link #SMITHING}
|
|
*/
|
|
- @Deprecated
|
|
+ @Deprecated(forRemoval = true) // Paper
|
|
SMITHING_NEW(4, "Upgrade Gear"),
|
|
;
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java
|
|
index 8d14426eb1ebea27058d5f22ea652f22d00fccb9..ac6c5c7a58c2c88b6cb0f6632fb53e8d67f8a059 100644
|
|
--- a/src/main/java/org/bukkit/inventory/InventoryView.java
|
|
+++ b/src/main/java/org/bukkit/inventory/InventoryView.java
|
|
@@ -370,7 +370,6 @@ public abstract class InventoryView {
|
|
type = InventoryType.SlotType.CRAFTING;
|
|
break;
|
|
case ANVIL:
|
|
- case SMITHING:
|
|
case CARTOGRAPHY:
|
|
case GRINDSTONE:
|
|
case MERCHANT:
|
|
@@ -388,6 +387,7 @@ public abstract class InventoryView {
|
|
}
|
|
break;
|
|
case LOOM:
|
|
+ case SMITHING: // Paper
|
|
case SMITHING_NEW:
|
|
if (slot == 3) {
|
|
type = InventoryType.SlotType.RESULT;
|