From 5a4d485e69e80592d2999a81ab38d4a21a8a40f5 Mon Sep 17 00:00:00 2001
From: Boy <sivertpaulsen2@gmail.com>
Date: Sat, 2 Nov 2024 17:33:25 +0100
Subject: [PATCH] refactor: rebase onto master

---
 ...3-Vault-API.patch => 0496-Vault-API.patch} | 21 ----------
 ...5-Vault-API.patch => 1060-Vault-API.patch} | 38 -------------------
 2 files changed, 59 deletions(-)
 rename patches/api/{0483-Vault-API.patch => 0496-Vault-API.patch} (71%)
 rename patches/server/{1045-Vault-API.patch => 1060-Vault-API.patch} (80%)

diff --git a/patches/api/0483-Vault-API.patch b/patches/api/0496-Vault-API.patch
similarity index 71%
rename from patches/api/0483-Vault-API.patch
rename to patches/api/0496-Vault-API.patch
index 03231020d8..e73eb36448 100644
--- a/patches/api/0483-Vault-API.patch
+++ b/patches/api/0496-Vault-API.patch
@@ -72,24 +72,3 @@ index 375f41fe4aebdbf140497b5ba1e54e1c72f0cdfc..ace0652cdba2431aa4d622d2d7ef23dd
 +    void setItemsToEject(List<ItemStack> itemsToEject);
 +    // Paper end - Vault API
  }
-diff --git a/src/main/java/org/bukkit/block/data/type/Vault.java b/src/main/java/org/bukkit/block/data/type/Vault.java
-index 87e46dfb951b6e4b753af7c31efd444e549052b9..9a8ee2bcd1b3bd89d11aab87bb5153f0d8e88458 100644
---- a/src/main/java/org/bukkit/block/data/type/Vault.java
-+++ b/src/main/java/org/bukkit/block/data/type/Vault.java
-@@ -16,14 +16,14 @@ public interface Vault extends Directional {
-      * @return the 'vault_state' value
-      */
-     @NotNull
--    State getTrialSpawnerState();
-+    State getVaultState(); // Paper
- 
-     /**
-      * Sets the value of the 'vault_state' property.
-      *
-      * @param state the new 'vault_state' value
-      */
--    void setTrialSpawnerState(@NotNull State state);
-+    void setVaultState(@NotNull State state); // Paper
- 
-     /**
-      * Gets the value of the 'ominous' property.
diff --git a/patches/server/1045-Vault-API.patch b/patches/server/1060-Vault-API.patch
similarity index 80%
rename from patches/server/1045-Vault-API.patch
rename to patches/server/1060-Vault-API.patch
index 2b0069eb22..1705bf1c77 100644
--- a/patches/server/1045-Vault-API.patch
+++ b/patches/server/1060-Vault-API.patch
@@ -235,41 +235,3 @@ index bfee498287c8358cbc8c9c2b7289d861cb90f0ad..d6fecfee5ce3245e6ae4b2cfd05083ad
      @Override
      public CraftVault copy() {
          return new CraftVault(this, null);
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftVault.java b/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftVault.java
-index 5a5f60ba2c6b6ad29693daf75eaab83ac6c1b816..808d3ae5270e5bfe73dd163fd1150b0ab470f643 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftVault.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/data/type/CraftVault.java
-@@ -9,12 +9,12 @@ public abstract class CraftVault extends CraftBlockData implements Vault {
-     private static final net.minecraft.world.level.block.state.properties.BooleanProperty OMINOUS = getBoolean("ominous");
- 
-     @Override
--    public org.bukkit.block.data.type.Vault.State getTrialSpawnerState() {
-+    public org.bukkit.block.data.type.Vault.State getVaultState() { // Paper
-         return this.get(CraftVault.VAULT_STATE, org.bukkit.block.data.type.Vault.State.class);
-     }
- 
-     @Override
--    public void setTrialSpawnerState(org.bukkit.block.data.type.Vault.State state) {
-+    public void setVaultState(org.bukkit.block.data.type.Vault.State state) { // Paper
-         this.set(CraftVault.VAULT_STATE, state);
-     }
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftVault.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftVault.java
-index 4c62caba7dff6538309cac46861fed047223bb5f..3db5ca6fe3d54cfd6285ee57bd242e72a2ec0c3a 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftVault.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftVault.java
-@@ -19,12 +19,12 @@ public final class CraftVault extends org.bukkit.craftbukkit.block.data.CraftBlo
-     private static final net.minecraft.world.level.block.state.properties.BooleanProperty OMINOUS = getBoolean(net.minecraft.world.level.block.VaultBlock.class, "ominous");
- 
-     @Override
--    public org.bukkit.block.data.type.Vault.State getTrialSpawnerState() {
-+    public org.bukkit.block.data.type.Vault.State getVaultState() { // Paper
-         return this.get(CraftVault.VAULT_STATE, org.bukkit.block.data.type.Vault.State.class);
-     }
- 
-     @Override
--    public void setTrialSpawnerState(org.bukkit.block.data.type.Vault.State state) {
-+    public void setVaultState(org.bukkit.block.data.type.Vault.State state) { // Paper
-         this.set(CraftVault.VAULT_STATE, state);
-     }
-