mirror of https://github.com/PaperMC/Paper.git
40 lines
1.7 KiB
Diff
40 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 19ba2d948ad83baab2a14ae6f7b3ce43c3d4971f..cbce826add9dc2b3187c7bea00c27b785d7517df 100644
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
|
|
@@ -147,7 +147,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 002acfbdce1db10f7ba1b6a013e678f504ac6e69..77a0cd901038405ed0e267f0432f13deccae3ab5 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;
|