Remove dead repos

base/.upstream-state

@@ -1 +1 @@
-1.8.8--e15f1f1620c3221075e1591cf24d4dab27edf78a
+1.8.8--2882919d66fc3bf050fe2a1474393750d281fa07

patches/api/0002-Add-methods-for-working-with-locales-translations-an.patch

@@ -1,15 +1,15 @@
-From 70399363a9c1da48afec5a9316b04633bc76422e Mon Sep 17 00:00:00 2001
+From b70a6077867e0eecbdf59519c68cb0dc9667ddd6 Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Sat, 17 Dec 2016 02:30:37 -0800
 Subject: [PATCH] Add methods for working with locales/translations, and add
  methods to send components based on type
 
 ---
- .../text/translation/TranslatableComponent.java    | 19 ++++++++++
- src/main/java/org/bukkit/Bukkit.java               | 12 +++++++
- src/main/java/org/bukkit/Server.java               | 13 +++++++
- .../java/org/bukkit/command/CommandSender.java     | 40 ++++++++++++++++++++++
- src/main/java/org/bukkit/entity/Player.java        | 28 +++++++++++++++
+ .../translation/TranslatableComponent.java    | 19 +++++++++
+ src/main/java/org/bukkit/Bukkit.java          | 12 ++++++
+ src/main/java/org/bukkit/Server.java          | 13 ++++++
+ .../org/bukkit/command/CommandSender.java     | 40 +++++++++++++++++++
+ src/main/java/org/bukkit/entity/Player.java   | 28 +++++++++++++
  5 files changed, 112 insertions(+)
  create mode 100644 src/main/java/net/avicus/magnet/api/text/translation/TranslatableComponent.java
 
@@ -182,5 +182,5 @@ index d02fe560..4282f2e2 100644
 +    // Magnet end
  }
 -- 
-2.11.0
+2.23.0
 

patches/api/0003-Add-BlockFallEvent.patch

@@ -1,16 +1,16 @@
-From 06c75ddd40114e0c22cf091debce329c7e18e7e5 Mon Sep 17 00:00:00 2001
+From d3d0f9be46066c665da860175dee4ece4082e673 Mon Sep 17 00:00:00 2001
 From: YukonAppleGeek <[email protected]>
 Date: Tue, 27 Dec 2016 02:30:37 -0800
 Subject: [PATCH] Add BlockFallEvent
 
 ---
- .../org/bukkit/event/block/BlockFallEvent.java     | 39 ++++++++++++++++++++++
+ .../bukkit/event/block/BlockFallEvent.java    | 39 +++++++++++++++++++
  1 file changed, 39 insertions(+)
  create mode 100644 src/main/java/org/bukkit/event/block/BlockFallEvent.java
 
 diff --git a/src/main/java/org/bukkit/event/block/BlockFallEvent.java b/src/main/java/org/bukkit/event/block/BlockFallEvent.java
 new file mode 100644
-index 0000000..f1f4e84
+index 00000000..f1f4e849
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/block/BlockFallEvent.java
 @@ -0,0 +1,39 @@
@@ -54,5 +54,5 @@ index 0000000..f1f4e84
 +
 +}
 -- 
-2.6.4
+2.23.0
 

patches/api/0004-Add-onGround-API.patch

@@ -1,16 +1,16 @@
-From ed206b115a9d5a549628a2b6cdc5225c83fc9fcf Mon Sep 17 00:00:00 2001
+From 549cae0649cbef637360f805395c00ddb73dcc38 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sun, 25 Dec 2016 02:30:37 -0800
 Subject: [PATCH] Add onGround API
 
 ---
- .../bukkit/event/player/PlayerOnGroundEvent.java   | 32 ++++++++++++++++++++++
+ .../event/player/PlayerOnGroundEvent.java     | 32 +++++++++++++++++++
  1 file changed, 32 insertions(+)
  create mode 100644 src/main/java/org/bukkit/event/player/PlayerOnGroundEvent.java
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerOnGroundEvent.java b/src/main/java/org/bukkit/event/player/PlayerOnGroundEvent.java
 new file mode 100644
-index 0000000..4a6c3d4
+index 00000000..4a6c3d4b
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/player/PlayerOnGroundEvent.java
 @@ -0,0 +1,32 @@
@@ -47,5 +47,5 @@ index 0000000..4a6c3d4
 +
 +}
 -- 
-2.6.4
+2.23.0
 

patches/api/0005-Add-PlayerSpawnEntityEvent.patch

@@ -1,16 +1,16 @@
-From 34a5e0a2e1ba271cdacfce70af863f16e19a9f1f Mon Sep 17 00:00:00 2001
+From 6adbb4722dc9ed8e6f53d4c88f52e37d604af92e Mon Sep 17 00:00:00 2001
 From: YukonAppleGeek <[email protected]>
 Date: Mon, 26 Dec 2016 02:30:37 -0800
 Subject: [PATCH] Add PlayerSpawnEntityEvent
 
 ---
- .../event/player/PlayerSpawnEntityEvent.java       | 78 ++++++++++++++++++++++
+ .../event/player/PlayerSpawnEntityEvent.java  | 78 +++++++++++++++++++
  1 file changed, 78 insertions(+)
  create mode 100644 src/main/java/org/bukkit/event/player/PlayerSpawnEntityEvent.java
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerSpawnEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerSpawnEntityEvent.java
 new file mode 100644
-index 0000000..1fdc6ca
+index 00000000..1fdc6cad
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/player/PlayerSpawnEntityEvent.java
 @@ -0,0 +1,78 @@
@@ -93,5 +93,5 @@ index 0000000..1fdc6ca
 +    }
 +}
 -- 
-2.6.4
+2.23.0
 

patches/api/0006-Add-EntityDespawnInVoidEvent.patch

@@ -1,16 +1,16 @@
-From 947aa696d1c43a4462ad94ec903ec8e2c1dfc672 Mon Sep 17 00:00:00 2001
+From 6bd227bdff35e74e9911eebd570000af944f66b0 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <[email protected]>
 Date: Sun, 25 Dec 2016 02:30:37 -0800
 Subject: [PATCH] Add EntityDespawnInVoidEvent
 
 ---
- .../event/entity/EntityDespawnInVoidEvent.java     | 25 ++++++++++++++++++++++
+ .../entity/EntityDespawnInVoidEvent.java      | 25 +++++++++++++++++++
  1 file changed, 25 insertions(+)
  create mode 100644 src/main/java/org/bukkit/event/entity/EntityDespawnInVoidEvent.java
 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityDespawnInVoidEvent.java b/src/main/java/org/bukkit/event/entity/EntityDespawnInVoidEvent.java
 new file mode 100644
-index 0000000..f413467
+index 00000000..f413467b
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/entity/EntityDespawnInVoidEvent.java
 @@ -0,0 +1,25 @@
@@ -40,5 +40,5 @@ index 0000000..f413467
 +    }
 +}
 -- 
-2.6.4
+2.23.0
 

patches/api/0008-EventException-knows-the-source-Event.patch

@@ -1,15 +1,15 @@
-From 831dc1dffd589df375b022bf1dbd3e5c31535732 Mon Sep 17 00:00:00 2001
+From 5b2d260cdee5649000b78918c188934396598240 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Fri, 9 Dec 2016 02:30:37 -0800
 Subject: [PATCH] EventException knows the source Event
 
 ---
- src/main/java/org/bukkit/event/EventException.java | 40 +++++++++++++++-------
- .../org/bukkit/plugin/java/JavaPluginLoader.java   |  4 +--
+ .../java/org/bukkit/event/EventException.java | 40 +++++++++++++------
+ .../bukkit/plugin/java/JavaPluginLoader.java  |  4 +-
  2 files changed, 29 insertions(+), 15 deletions(-)
 
 diff --git a/src/main/java/org/bukkit/event/EventException.java b/src/main/java/org/bukkit/event/EventException.java
-index 84638e8..aef8d49 100644
+index 84638e85..aef8d494 100644
 --- a/src/main/java/org/bukkit/event/EventException.java
 +++ b/src/main/java/org/bukkit/event/EventException.java
 @@ -2,7 +2,26 @@ package org.bukkit.event;
@@ -90,7 +90,7 @@ index 84638e8..aef8d49 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index b057b05..6481213 100644
+index b057b053..64812133 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -299,9 +299,9 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -106,5 +106,5 @@ index b057b05..6481213 100644
                  }
              }, plugin, method, eventClass); // Spigot
 -- 
-2.6.4
+2.23.0
 

patches/api/0009-Efficiently-search-for-blocks-by-material.patch

@@ -1,4 +1,4 @@
-From 7326dbd65f81c1d46b801c4afea2e299cd83e8e3 Mon Sep 17 00:00:00 2001
+From 135d68c9d7e0f546437677e2f139891b6c0b2f20 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Fri, 16 Dec 2016 02:30:37 -0800
 Subject: [PATCH] Efficiently search for blocks by material
@@ -8,7 +8,7 @@ Subject: [PATCH] Efficiently search for blocks by material
  1 file changed, 10 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java
-index b7bc563..d931109 100644
+index b7bc5632..d9311090 100644
 --- a/src/main/java/org/bukkit/Chunk.java
 +++ b/src/main/java/org/bukkit/Chunk.java
 @@ -5,6 +5,8 @@ import org.bukkit.block.BlockState;
@@ -20,21 +20,21 @@ index b7bc563..d931109 100644
  /**
   * Represents a chunk of blocks
   */
-@@ -42,6 +44,14 @@ public interface Chunk {
+@@ -41,6 +43,14 @@ public interface Chunk {
+      */
      Block getBlock(int x, int y, int z);
 
-     /**
++    /**
 +     * Get all blocks in this chunk that are made of the given {@link Material}
 +     *
 +     * @param material type of block to search for
 +     * @return all blocks found
 +     */
 +    Set<Block> getBlocks(Material material);
 +
-+    /**
+     /**
       * Capture thread-safe read-only snapshot of chunk data
       *
-      * @return ChunkSnapshot
 -- 
-2.6.4
+2.23.0
 

patches/api/0010-Override-creation-settings-of-existing-world.patch

@@ -1,16 +1,16 @@
-From 6fa1198031ddd0f5b9054d7309abbd99ee0f620c Mon Sep 17 00:00:00 2001
+From 3fcd9b53065a3ee583fdfdec09c9a2a9b2e463be Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sun, 28 Jun 2015 03:37:39 -0400
 Subject: [PATCH] Override creation settings of existing world
 
 ---
  src/main/java/org/bukkit/Bukkit.java       |  8 ++++++++
- src/main/java/org/bukkit/Server.java       | 23 +++++++++++++++++++++++
+ src/main/java/org/bukkit/Server.java       | 23 ++++++++++++++++++++++
  src/main/java/org/bukkit/WorldCreator.java | 10 ++++++++++
  3 files changed, 41 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ccb9596..1bde563 100644
+index ccb9596f..1bde563f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -471,6 +471,14 @@ public final class Bukkit {
@@ -29,13 +29,14 @@ index ccb9596..1bde563 100644
       * Creates or loads a world with the given name using the specified
       * options.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2b60412..666c4bc 100644
+index 2b604122..666c4bc8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -388,6 +388,29 @@ public interface Server extends PluginMessageRecipient {
+@@ -387,6 +387,29 @@ public interface Server extends PluginMessageRecipient {
+      */
      public List<World> getWorlds();
 
-     /**
++    /**
 +     * Check for a level.dat file belonging to a world with the given name.
 +     * If found, return a {@link WorldCreator} configured to match the settings
 +     * in the level.dat file. If the file is not found, return null. This works
@@ -58,12 +59,11 @@ index 2b60412..666c4bc 100644
 +     */
 +    World createWorld(String name);
 +
-+    /**
+     /**
       * Creates or loads a world with the given name using the specified
       * options.
-      * <p>
 diff --git a/src/main/java/org/bukkit/WorldCreator.java b/src/main/java/org/bukkit/WorldCreator.java
-index 53980fd..81c95d1 100644
+index 53980fdb..81c95d1f 100644
 --- a/src/main/java/org/bukkit/WorldCreator.java
 +++ b/src/main/java/org/bukkit/WorldCreator.java
 @@ -16,6 +16,7 @@ public class WorldCreator {
@@ -91,5 +91,5 @@ index 53980fd..81c95d1 100644
       * Creates a world with the specified options.
       * <p>
 -- 
-2.6.4
+2.23.0
 

patches/api/0011-Allow-villager-GUI-duplication.patch

@@ -1,4 +1,4 @@
-From 16e649c8733b8eab737ae5b9078d4002c5aa34ff Mon Sep 17 00:00:00 2001
+From cb10e3a2f7141a6f8fbfa8d2c3aa92590e63cecd Mon Sep 17 00:00:00 2001
 From: Austin Mayes <[email protected]>
 Date: Fri, 23 Dec 2016 03:12:17 -0600
 Subject: [PATCH] Allow villager GUI duplication
@@ -8,24 +8,24 @@ Subject: [PATCH] Allow villager GUI duplication
  1 file changed, 8 insertions(+)
 
 diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
-index 3f8646d..8710a7b 100644
+index 3f8646dd..8710a7b2 100644
 --- a/src/main/java/org/bukkit/entity/HumanEntity.java
 +++ b/src/main/java/org/bukkit/entity/HumanEntity.java
-@@ -90,6 +90,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
+@@ -89,6 +89,14 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, Permissible, Inv
+      */
      public InventoryView openEnchanting(Location location, boolean force);
 
-     /**
++    /**
 +     * Makes a copy of the given villager's current trading offers and opens
 +     * a trading window for this player, allowing them to interact with those
 +     * offers, without affecting the villager's state, or any other players who
 +     * might be trading with the villager.
 +     */
 +    public InventoryView openMerchantCopy(Villager trader);
 +
-+    /**
+     /**
       * Opens an inventory window to the specified inventory view.
       *
-      * @param inventory The view to open
 -- 
-2.6.4
+2.23.0
 

patches/api/0012-Add-BlockDispenseEntityEvent.patch

@@ -1,16 +1,16 @@
-From 59419e59ba48d54421cd1926ec519c58706b689e Mon Sep 17 00:00:00 2001
+From ae0d201de73677c19df2619d753a4bf7bfb36f39 Mon Sep 17 00:00:00 2001
 From: Austin Mayes <[email protected]>
 Date: Fri, 23 Dec 2016 04:07:15 -0600
 Subject: [PATCH] Add BlockDispenseEntityEvent
 
 ---
- .../event/block/BlockDispenseEntityEvent.java      | 49 ++++++++++++++++++++++
+ .../event/block/BlockDispenseEntityEvent.java | 49 +++++++++++++++++++
  1 file changed, 49 insertions(+)
  create mode 100644 src/main/java/org/bukkit/event/block/BlockDispenseEntityEvent.java
 
 diff --git a/src/main/java/org/bukkit/event/block/BlockDispenseEntityEvent.java b/src/main/java/org/bukkit/event/block/BlockDispenseEntityEvent.java
 new file mode 100644
-index 0000000..18f35bd
+index 00000000..18f35bd7
 --- /dev/null
 +++ b/src/main/java/org/bukkit/event/block/BlockDispenseEntityEvent.java
 @@ -0,0 +1,49 @@
@@ -65,5 +65,5 @@ index 0000000..18f35bd
 +}
 \ No newline at end of file
 -- 
-2.6.4
+2.23.0
 

patches/api/0013-Fake-name-and-skin-API.patch

@@ -1,18 +1,18 @@
-From 58a13e07ead97814a980f4e64ac8434b4d8f176c Mon Sep 17 00:00:00 2001
+From c5d5029108d9eb2156c9c9c4c0e2cf0b2a0e29ea Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Thu, 23 Jan 2014 00:17:31 -0500
 Subject: [PATCH] Fake name and skin API
 
 ---
- src/main/java/org/bukkit/Bukkit.java               |  23 +++-
- src/main/java/org/bukkit/Server.java               |  27 +++++
- src/main/java/org/bukkit/Skin.java                 |  72 ++++++++++++
- src/main/java/org/bukkit/command/Command.java      |   2 +-
- .../java/org/bukkit/command/CommandSender.java     |   6 +
- .../org/bukkit/command/defaults/ListCommand.java   |   2 +-
- .../org/bukkit/command/defaults/TellCommand.java   |   3 +-
- src/main/java/org/bukkit/entity/Player.java        | 122 +++++++++++++++++++++
- .../event/player/PlayerSkinPartsChangeEvent.java   |  32 ++++++
+ src/main/java/org/bukkit/Bukkit.java          |  23 +++-
+ src/main/java/org/bukkit/Server.java          |  27 ++++
+ src/main/java/org/bukkit/Skin.java            |  72 +++++++++++
+ src/main/java/org/bukkit/command/Command.java |   2 +-
+ .../org/bukkit/command/CommandSender.java     |   6 +
+ .../bukkit/command/defaults/ListCommand.java  |   2 +-
+ .../bukkit/command/defaults/TellCommand.java  |   3 +-
+ src/main/java/org/bukkit/entity/Player.java   | 122 ++++++++++++++++++
+ .../player/PlayerSkinPartsChangeEvent.java    |  32 +++++
  9 files changed, 285 insertions(+), 4 deletions(-)
  create mode 100644 src/main/java/org/bukkit/Skin.java
  create mode 100644 src/main/java/org/bukkit/event/player/PlayerSkinPartsChangeEvent.java
@@ -399,5 +399,5 @@ index 00000000..a199f8cf
 +    }
 +}
 -- 
-2.11.0
+2.23.0