Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9440)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
This commit is contained in:
Nassim Jahnke
@@ -1,130 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Thu, 8 Jun 2023 14:45:18 -0700
|
||||
Subject: [PATCH] Properly remove the experimental smithing inventory type
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
|
||||
+++ b/src/main/java/net/minecraft/world/inventory/SmithingMenu.java
|
||||
@@ -0,0 +0,0 @@ public class SmithingMenu extends ItemCombinerMenu {
|
||||
return this.bukkitEntity;
|
||||
}
|
||||
|
||||
- org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventorySmithingNew(
|
||||
+ org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventorySmithing( // Paper
|
||||
access.getLocation(), this.inputSlots, this.resultSlots);
|
||||
this.bukkitEntity = new CraftInventoryView(this.player.getBukkitEntity(), inventory, this);
|
||||
return this.bukkitEntity;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java
|
||||
@@ -0,0 +0,0 @@ public class CraftContainer extends AbstractContainerMenu {
|
||||
case STONECUTTER:
|
||||
return MenuType.STONECUTTER;
|
||||
case SMITHING_NEW:
|
||||
+ case SMITHING:
|
||||
return MenuType.SMITHING;
|
||||
case CREATIVE:
|
||||
case CRAFTING:
|
||||
@@ -0,0 +0,0 @@ public class CraftContainer extends AbstractContainerMenu {
|
||||
this.delegate = new HopperMenu(windowId, bottom, top);
|
||||
break;
|
||||
case ANVIL:
|
||||
- case SMITHING:
|
||||
this.setupAnvil(top, bottom); // SPIGOT-6783 - manually set up slots so we can use the delegated inventory and not the automatically created one
|
||||
break;
|
||||
case BEACON:
|
||||
@@ -0,0 +0,0 @@ public class CraftContainer extends AbstractContainerMenu {
|
||||
case MERCHANT:
|
||||
this.delegate = new MerchantMenu(windowId, bottom);
|
||||
break;
|
||||
+ case SMITHING: // Paper
|
||||
case SMITHING_NEW:
|
||||
this.setupSmithing(top, bottom); // SPIGOT-6783 - manually set up slots so we can use the delegated inventory and not the automatically created one
|
||||
break;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
@@ -0,0 +0,0 @@ public class CraftInventory implements Inventory {
|
||||
return InventoryType.COMPOSTER;
|
||||
} else if (this.inventory instanceof JukeboxBlockEntity) {
|
||||
return InventoryType.JUKEBOX;
|
||||
- } else if (this instanceof CraftInventorySmithingNew) {
|
||||
- return InventoryType.SMITHING_NEW;
|
||||
+ // Paper - remove
|
||||
} else {
|
||||
return InventoryType.CHEST;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithing.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithing.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithing.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithing.java
|
||||
@@ -0,0 +0,0 @@ public class CraftInventorySmithing extends CraftResultInventory implements Smit
|
||||
|
||||
@Override
|
||||
public ItemStack getResult() {
|
||||
- return getItem(2);
|
||||
+ return getItem(net.minecraft.world.inventory.SmithingMenu.RESULT_SLOT); // Paper
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setResult(ItemStack item) {
|
||||
- setItem(2, item);
|
||||
+ setItem(net.minecraft.world.inventory.SmithingMenu.RESULT_SLOT, item); // Paper
|
||||
}
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithingNew.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithingNew.java
|
||||
deleted file mode 100644
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventorySmithingNew.java
|
||||
+++ /dev/null
|
||||
@@ -0,0 +0,0 @@
|
||||
-package org.bukkit.craftbukkit.inventory;
|
||||
-
|
||||
-import net.minecraft.world.Container;
|
||||
-import net.minecraft.world.inventory.ResultContainer;
|
||||
-import org.bukkit.Location;
|
||||
-import org.bukkit.inventory.ItemStack;
|
||||
-import org.bukkit.inventory.Recipe;
|
||||
-import org.bukkit.inventory.SmithingInventory;
|
||||
-
|
||||
-public class CraftInventorySmithingNew extends CraftResultInventory implements SmithingInventory {
|
||||
-
|
||||
- private final Location location;
|
||||
-
|
||||
- public CraftInventorySmithingNew(Location location, Container inventory, ResultContainer resultInventory) {
|
||||
- super(inventory, resultInventory);
|
||||
- this.location = location;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public ResultContainer getResultInventory() {
|
||||
- return (ResultContainer) super.getResultInventory();
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Location getLocation() {
|
||||
- return this.location;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public ItemStack getResult() {
|
||||
- return getItem(3);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void setResult(ItemStack item) {
|
||||
- setItem(3, item);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public Recipe getRecipe() {
|
||||
- net.minecraft.world.item.crafting.Recipe recipe = this.getResultInventory().getRecipeUsed();
|
||||
- return (recipe == null) ? null : recipe.toBukkitRecipe();
|
||||
- }
|
||||
-}
|
||||
Reference in New Issue
Block a user