Move afk strings to lang file

patches/server/0005-Add-language-asset-purpur.lang.patch

@@ -1,13 +1,13 @@
-From 1101e305418f6d797155da54f372008d2c11cfb4 Mon Sep 17 00:00:00 2001
+From 4af5ccf83b9d08ecf5b620d546447b473a997bd6 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 13:17:09 -0500
 Subject: [PATCH] Add language asset purpur.lang
 
 ---
  .../net/minecraft/server/ChatMessage.java     |  3 ++-
- .../net/minecraft/server/LocaleLanguage.java  | 24 ++++++++++++++++++-
+ .../net/minecraft/server/LocaleLanguage.java  | 27 +++++++++++++++++--
  src/main/resources/purpur.lang                |  1 +
- 3 files changed, 26 insertions(+), 2 deletions(-)
+ 3 files changed, 28 insertions(+), 3 deletions(-)
  create mode 100644 src/main/resources/purpur.lang
 
 diff --git a/src/main/java/net/minecraft/server/ChatMessage.java b/src/main/java/net/minecraft/server/ChatMessage.java
@@ -32,41 +32,51 @@ index 937361fc2b..37ec73a8cb 100644
  
      @VisibleForTesting
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 6012739331..9cafd1a9cd 100644
+index 6012739331..8f36f78c06 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
-@@ -25,8 +25,30 @@ public class LocaleLanguage {
+@@ -25,8 +25,31 @@ public class LocaleLanguage {
      private long e;
  
      public LocaleLanguage() {
 +        // Purpur start
-+        loadFromJar();
++        loadFromJar("/assets/minecraft/lang/en_us.json");
-+        loadFromFile();
++        loadFromFile("purpur.lang");
 +    }
 +
-+    private void loadFromFile() {
++    private void loadFromFile(String resource) {
 +        try {
-+            java.io.File file = new java.io.File("purpur.lang");
++            java.io.File file = new java.io.File(resource);
 +            if (!file.exists()) {
-+                java.nio.file.Files.copy(getClass().getResourceAsStream("/purpur.lang"), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
++                java.nio.file.Files.copy(getClass().getResourceAsStream("/" + resource), file.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING);
 +            }
-+            loadFromStream(new java.io.FileInputStream(file));
++            loadFromJar("/" + resource);
++            loadFromStream(resource, new java.io.FileInputStream(file));
 +        } catch (IOException e) {
-+            LOGGER.error("Couldn't read string from purpur.lang!", e);
++            LOGGER.error("Couldn't read string from " + resource, e);
 +        }
 +    }
 +
-+    private void loadFromJar() {
++    private void loadFromJar(String resource) {
-+        loadFromStream(getClass().getResourceAsStream("/assets/minecraft/lang/en_us.json"));
++        loadFromStream(resource, getClass().getResourceAsStream(resource));
 +    }
 +
-+    private void loadFromStream(InputStream inputstream) {
++    private void loadFromStream(String resource, InputStream inputstream) {
-+        // Purpur end
          try {
 -            InputStream inputstream = LocaleLanguage.class.getResourceAsStream("/assets/minecraft/lang/en_us.json");
++            // Purpur end
              Throwable throwable = null;
  
              try {
+@@ -60,7 +83,7 @@ public class LocaleLanguage {
+ 
+             }
+         } catch (JsonParseException | IOException ioexception) {
+-            LocaleLanguage.LOGGER.error("Couldn't read strings from /assets/minecraft/lang/en_us.json", ioexception);
++            LocaleLanguage.LOGGER.error("Couldn't read strings from " + resource, ioexception); // Purpur
+         }
+ 
+     }
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
 new file mode 100644
 index 0000000000..0967ef424b

patches/server/0043-Implement-AFK-API.patch

@@ -1,4 +1,4 @@
-From 510dfab4193957ab9509269a01eaa00f8f309d1a Mon Sep 17 00:00:00 2001
+From 4fcd9a1dc6957dde11f6c9cafb95e4a298bb9cf8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 8 Aug 2019 15:29:15 -0500
 Subject: [PATCH] Implement AFK API
@@ -10,10 +10,11 @@ Subject: [PATCH] Implement AFK API
  .../net/minecraft/server/IEntitySelector.java |  2 +
  .../minecraft/server/PlayerConnection.java    | 10 +++++
  .../net/minecraft/server/WorldServer.java     |  4 +-
- .../net/pl3x/purpur/PurpurWorldConfig.java    | 15 +++++++
+ .../net/pl3x/purpur/PurpurWorldConfig.java    | 11 +++++
  .../craftbukkit/entity/CraftPlayer.java       | 17 ++++++++
  .../java/org/spigotmc/ActivationRange.java    |  1 +
- 9 files changed, 111 insertions(+), 24 deletions(-)
+ src/main/resources/purpur.lang                |  5 ++-
+ 10 files changed, 111 insertions(+), 25 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
 index de22cad764..9d26bd1e4c 100644
@@ -36,7 +37,7 @@ index de22cad764..9d26bd1e4c 100644
          super(EntityTypes.PLAYER, world);
          this.bV = ItemStack.a;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 561588ddaa..31d34e51e9 100644
+index 561588ddaa..919921c2d2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1653,8 +1653,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -55,7 +56,7 @@ index 561588ddaa..31d34e51e9 100644
 +            return;
 +        }
 +
-+        net.pl3x.purpur.event.PlayerAFKEvent event = new net.pl3x.purpur.event.PlayerAFKEvent(getBukkitEntity(), setAfk, world.purpurConfig.idleTimeoutKick, setAfk ? world.purpurConfig.idleTimeoutBroadcastAway : world.purpurConfig.idleTimeoutBroadcastBack, !Bukkit.isPrimaryThread());
++        net.pl3x.purpur.event.PlayerAFKEvent event = new net.pl3x.purpur.event.PlayerAFKEvent(getBukkitEntity(), setAfk, world.purpurConfig.idleTimeoutKick, LocaleLanguage.getInstance().translateKey("idle.timeout.broadcast." + (setAfk ? "away" : "back")), !Bukkit.isPrimaryThread());
 +        if (!event.callEvent() || event.shouldKick()) {
 +            return;
 +        }
@@ -67,7 +68,7 @@ index 561588ddaa..31d34e51e9 100644
 +        }
 +
 +        if (event.getBroadcastMsg() != null && !event.getBroadcastMsg().isEmpty()) {
-+            ((WorldServer) world).getMinecraftServer().server.broadcastMessage(event.getBroadcastMsg().replace("{player}", getName()));
++            ((WorldServer) world).getMinecraftServer().server.broadcastMessage(String.format(event.getBroadcastMsg(), getName()));
 +        }
 +
 +        if (world.purpurConfig.idleTimeoutUpdateTabList) {
@@ -214,10 +215,10 @@ index f0a5d82a12..5d14939873 100644
                  } else if (entityplayer.isSleeping()) {
                      ++j;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 84a89d7875..555039f531 100644
+index 84a89d7875..b454d71ac0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -147,6 +147,21 @@ public class PurpurWorldConfig {
+@@ -147,6 +147,17 @@ public class PurpurWorldConfig {
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
      }
  
@@ -225,15 +226,11 @@ index 84a89d7875..555039f531 100644
 +    public boolean idleTimeoutTickNearbyEntities = true;
 +    public boolean idleTimeoutCountAsSleeping = false;
 +    public boolean idleTimeoutUpdateTabList = false;
-+    public String idleTimeoutBroadcastAway = "&e&o{player} is now AFK";
-+    public String idleTimeoutBroadcastBack = "&e&o{player} is no longer AFK";
 +    private void idleTimeoutSettings() {
 +        idleTimeoutKick = getBoolean("gameplay-mechanics.player.idle-timeout.kick-if-idle", idleTimeoutKick);
 +        idleTimeoutTickNearbyEntities = getBoolean("gameplay-mechanics.player.idle-timeout.tick-nearby-entities", idleTimeoutTickNearbyEntities);
 +        idleTimeoutCountAsSleeping = getBoolean("gameplay-mechanics.player.idle-timeout.count-as-sleeping", idleTimeoutCountAsSleeping);
 +        idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
-+        idleTimeoutBroadcastAway = org.bukkit.ChatColor.translateAlternateColorCodes('&', getString("gameplay-mechanics.player.idle-timeout.broadcast.away", idleTimeoutBroadcastAway));
-+        idleTimeoutBroadcastBack = org.bukkit.ChatColor.translateAlternateColorCodes('&', getString("gameplay-mechanics.player.idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
 +    }
 +
      public boolean batRidable = false;
@@ -277,6 +274,16 @@ index e160f03c1e..11fb146129 100644
              maxBB = player.getBoundingBox().grow( maxRange, 256, maxRange );
              ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
              ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
+diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
+index 0967ef424b..f4694dbcce 100644
+--- a/src/main/resources/purpur.lang
++++ b/src/main/resources/purpur.lang
+@@ -1 +1,4 @@
+-{}
++{
++  "idle.timeout.broadcast.away": "§e§o%s is now AFK",
++  "idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
++}
 -- 
 2.24.0
 

patches/server/0046-Tulips-change-fox-type.patch

@@ -1,4 +1,4 @@
-From 2bc39f965d2f340ad49e7cb5b668ce51d0e0810f Mon Sep 17 00:00:00 2001
+From 81d24301be807dfb97d3f87978501b4402ab1140 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 13 Jul 2019 15:56:22 -0500
 Subject: [PATCH] Tulips change fox type
@@ -90,10 +90,10 @@ index 54670f64cf..9c9b93f280 100644
      public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c);
      public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d5526c15a0..b63fcb869d 100644
+index 89e86ec7c1..bd0c2f98fa 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -348,10 +348,12 @@ public class PurpurWorldConfig {
+@@ -344,10 +344,12 @@ public class PurpurWorldConfig {
      public boolean foxRidable = false;
      public boolean foxRidableInWater = false;
      public boolean foxRequireShiftToMount = true;

patches/server/0047-Implement-a-hard-limit-for-pillager-outpost-spawns.patch

@@ -1,4 +1,4 @@
-From 85b183ef1f863ad3be4f217412044f1031f2460f Mon Sep 17 00:00:00 2001
+From 05d9cbbce4c9bb98f4f3442ef2206df1fbe82a2b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 14:24:26 -0500
 Subject: [PATCH] Implement a hard limit for pillager outpost spawns
@@ -21,10 +21,10 @@ index 70f43c5159..baca8f7054 100644
              }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b63fcb869d..4615abfbee 100644
+index bd0c2f98fa..18a30fde39 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -534,10 +534,12 @@ public class PurpurWorldConfig {
+@@ -530,10 +530,12 @@ public class PurpurWorldConfig {
      public boolean pillagerRidable = false;
      public boolean pillagerRidableInWater = false;
      public boolean pillagerRequireShiftToMount = true;

patches/server/0055-Implement-configurable-villager-brain-ticks.patch

@@ -1,4 +1,4 @@
-From a2a575b9b7b50227ae909299840c4843c6a439c4 Mon Sep 17 00:00:00 2001
+From 545911bcad12bba9e8e1f89f71f0f3088058fd5b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks
@@ -40,10 +40,10 @@ index 3eaac031fb..65cd5f53c1 100644
          this.world.getMethodProfiler().exit();
          if (!this.et() && this.bB > 0) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c9303598fa..c9d21b4f2f 100644
+index b0747e092c..4156e521bd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -742,10 +742,14 @@ public class PurpurWorldConfig {
+@@ -738,10 +738,14 @@ public class PurpurWorldConfig {
      public boolean villagerRidable = false;
      public boolean villagerRidableInWater = false;
      public boolean villagerRequireShiftToMount = true;

patches/server/0056-Add-option-for-zombies-targetting-turtle-eggs.patch

@@ -1,4 +1,4 @@
-From 2d0168c35206e6f4179260d914d19e5d4a58fbd6 Mon Sep 17 00:00:00 2001
+From e907cb731f652dac24d3b179bca16354714822af Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 17 Aug 2019 15:27:09 -0500
 Subject: [PATCH] Add option for zombies targetting turtle eggs
@@ -22,10 +22,10 @@ index 8d1f04415e..95ae6f3494 100644
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
          this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c9d21b4f2f..719c8ea602 100644
+index 4156e521bd..aee946c27e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -811,10 +811,12 @@ public class PurpurWorldConfig {
+@@ -807,10 +807,12 @@ public class PurpurWorldConfig {
      public boolean zombieRidable = false;
      public boolean zombieRidableInWater = false;
      public boolean zombieRequireShiftToMount = true;

patches/server/0083-Despawn-egg-hatches-chicken.patch

@@ -1,4 +1,4 @@
-From 5f99624b03113a48dba2f464b4d85598c3a95477 Mon Sep 17 00:00:00 2001
+From 0299b10ed27e1b676ac899cd1dfa74abe0389efe Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 23:47:42 -0600
 Subject: [PATCH] Despawn egg hatches chicken
@@ -41,10 +41,10 @@ index 2926fbb957..bbb9ca1efc 100644
          Vec3D vec3d = this.getMot();
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index db784b373e..069aa582ae 100644
+index 3b68a7f76d..9e705db0bd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -275,11 +275,15 @@ public class PurpurWorldConfig {
+@@ -271,11 +271,15 @@ public class PurpurWorldConfig {
      public boolean chickenRidableInWater = false;
      public boolean chickenRequireShiftToMount = true;
      public boolean chickenDontLayEggsWhenRidden = false;

patches/server/0089-Villagers-follow-emerald-blocks.patch

@@ -1,4 +1,4 @@
-From ecae5d53403dda0382ccdcffb4b565cc39442ee5 Mon Sep 17 00:00:00 2001
+From 495048109f6c2397aae097f2f76719ba4176b81e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:10:12 -0600
 Subject: [PATCH] Villagers follow emerald blocks
@@ -48,10 +48,10 @@ index 4e9c5e84a9..14ca5fc367 100644
          this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D));
          this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7bd7472467..e8f203d88f 100644
+index 505a52c42f..425e12116a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -780,21 +780,25 @@ public class PurpurWorldConfig {
+@@ -776,21 +776,25 @@ public class PurpurWorldConfig {
      public boolean villagerRequireShiftToMount = true;
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;

patches/server/0092-Allow-leashing-villagers.patch

@@ -1,4 +1,4 @@
-From 690c0dc37144c1de3c792a3a4c96000cbe8eb834 Mon Sep 17 00:00:00 2001
+From 35138263823bc5e492279092f7f1e2e20732de17 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers
@@ -55,10 +55,10 @@ index 14ca5fc367..427c589075 100644
 +    // Purpur - end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4372b9a036..814dafb66d 100644
+index 8eff6a6dd6..097ff8ae35 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -785,6 +785,7 @@ public class PurpurWorldConfig {
+@@ -781,6 +781,7 @@ public class PurpurWorldConfig {
      public int villagerBrainTicks = 1;
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
@@ -66,7 +66,7 @@ index 4372b9a036..814dafb66d 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -792,17 +793,20 @@ public class PurpurWorldConfig {
+@@ -788,17 +789,20 @@ public class PurpurWorldConfig {
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);

patches/server/0093-Implement-configurable-search-radius-for-villagers-t.patch

@@ -1,4 +1,4 @@
-From 13bd440b57422595e594f57968c90c07dfefd723 Mon Sep 17 00:00:00 2001
+From 31d804d302cadc92a5066468739f7c950ae50c17 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -22,10 +22,10 @@ index 315440b3fb..fe0e646ea6 100644
          int i = 0;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 814dafb66d..d7a3c6c227 100644
+index 097ff8ae35..c57982274c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -786,6 +786,8 @@ public class PurpurWorldConfig {
+@@ -782,6 +782,8 @@ public class PurpurWorldConfig {
      public boolean villagerUseBrainTicksOnlyWhenLagging = true;
      public boolean villagerFollowEmeraldBlock = false;
      public boolean villagerCanBeLeashed = false;
@@ -34,7 +34,7 @@ index 814dafb66d..d7a3c6c227 100644
      private void villagerSettings() {
          villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
          villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
-@@ -794,6 +796,8 @@ public class PurpurWorldConfig {
+@@ -790,6 +792,8 @@ public class PurpurWorldConfig {
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);

patches/server/0095-Add-wither-skeleton-takes-wither-damage-option.patch

@@ -1,4 +1,4 @@
-From d0558b753c946306a81bde3be841bfe82c939c01 Mon Sep 17 00:00:00 2001
+From 1c3d8c84e763cd48c384c32c21386dbf7e02653d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 14 Jan 2020 19:43:40 -0600
 Subject: [PATCH] Add wither skeleton takes wither damage option
@@ -21,10 +21,10 @@ index 8aa0a6699f..0fd740e717 100644
      }
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5ff002a77f..e88157cc69 100644
+index 29c2d64fb5..dff7cf1693 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -849,10 +849,12 @@ public class PurpurWorldConfig {
+@@ -845,10 +845,12 @@ public class PurpurWorldConfig {
      public boolean witherSkeletonRidable = false;
      public boolean witherSkeletonRidableInWater = false;
      public boolean witherSkeletonRequireShiftToMount = true;

patches/server/0106-Add-mspt-command.patch

@@ -1,4 +1,4 @@
-From 9397614a1e6f58c962d2801df4508c716a18d236 Mon Sep 17 00:00:00 2001
+From 4b95ede84347d283f15d371f641d8ccea4c0fbe5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:23:44 -0500
 Subject: [PATCH] Add /mspt command
@@ -6,8 +6,8 @@ Subject: [PATCH] Add /mspt command
 ---
  .../minecraft/server/CommandDispatcher.java   |  1 +
  .../net/pl3x/purpur/command/MSPTCommand.java  | 59 +++++++++++++++++++
- src/main/resources/purpur.lang                |  5 +-
+ src/main/resources/purpur.lang                |  2 +
- 3 files changed, 64 insertions(+), 1 deletion(-)
+ 3 files changed, 62 insertions(+)
  create mode 100644 src/main/java/net/pl3x/purpur/command/MSPTCommand.java
 
 diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -88,15 +88,16 @@ index 0000000000..e3b75f9c41
 +    }
 +}
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index 0967ef424b..5394225094 100644
+index f4694dbcce..151ea90928 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
-@@ -1 +1,4 @@
+@@ -1,4 +1,6 @@
--{}
+ {
-+{
 +  "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
-+  "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s"
++  "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
-+}
+   "idle.timeout.broadcast.away": "§e§o%s is now AFK",
+   "idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
+ }
 -- 
 2.24.0
 

patches/server/0107-Add-ping-command.patch

@@ -1,4 +1,4 @@
-From 656d855ec7cca2b392f3514b75fb0006643e7b25 Mon Sep 17 00:00:00 2001
+From ed8b8bda098f559305e3510916cba187f0b5a1c5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 13 Mar 2020 22:29:10 -0500
 Subject: [PATCH] Add /ping command
@@ -8,8 +8,8 @@ Subject: [PATCH] Add /ping command
  .../minecraft/server/CommandDispatcher.java   |  5 ++-
  .../server/CommandListenerWrapper.java        |  1 +
  .../net/pl3x/purpur/command/PingCommand.java  | 34 +++++++++++++++++++
- src/main/resources/purpur.lang                |  3 +-
+ src/main/resources/purpur.lang                |  1 +
- 5 files changed, 43 insertions(+), 2 deletions(-)
+ 5 files changed, 42 insertions(+), 1 deletion(-)
  create mode 100644 src/main/java/net/pl3x/purpur/command/PingCommand.java
 
 diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java
@@ -116,15 +116,16 @@ index 0000000000..3aea2a76db
 +    }
 +}
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index 5394225094..489dcbf350 100644
+index 151ea90928..63a5ad0037 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
-@@ -1,4 +1,5 @@
+@@ -1,6 +1,7 @@
  {
    "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
--  "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s"
+   "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
-+  "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
++  "commands.purpur.ping": "§a%s's ping is %sms",
-+  "commands.purpur.ping": "§a%s's ping is %sms"
+   "idle.timeout.broadcast.away": "§e§o%s is now AFK",
+   "idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
  }
 -- 
 2.24.0

patches/server/0110-Per-World-Spawn-limits.patch

@@ -1,4 +1,4 @@
-From 0ac9768e1a4f04a3ee86df2d0a320227a8e91814 Mon Sep 17 00:00:00 2001
+From 6cface30e735f89e3a17a5dc1c0e117b6d90e536 Mon Sep 17 00:00:00 2001
 From: chase <chasewhip20@gmail.com>
 Date: Sun, 15 Mar 2020 18:32:22 -0600
 Subject: [PATCH] Per World Spawn limits
@@ -9,11 +9,11 @@ Subject: [PATCH] Per World Spawn limits
  2 files changed, 18 insertions(+)
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 629fbca11c..88b704b50b 100644
+index 974e2b4b83..c2590ef879 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -288,6 +288,17 @@ public class PurpurWorldConfig {
+@@ -284,6 +284,17 @@ public class PurpurWorldConfig {
-         idleTimeoutBroadcastBack = org.bukkit.ChatColor.translateAlternateColorCodes('&', getString("gameplay-mechanics.player.idle-timeout.broadcast.back", idleTimeoutBroadcastBack));
+         idleTimeoutUpdateTabList = getBoolean("gameplay-mechanics.player.idle-timeout.update-tab-list", idleTimeoutUpdateTabList);
      }
  
 +    public int spawnLimitMonsters;

patches/server/0113-Disable-mojang-profiler.patch

@@ -1,4 +1,4 @@
-From ecc23306bffb62ac83a14bdec6a0c37e50258fd6 Mon Sep 17 00:00:00 2001
+From 0dc09f620aef249ec06f6c0f827a8e469d612246 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 26 Mar 2020 12:48:02 -0500
 Subject: [PATCH] Disable mojang profiler
@@ -160,7 +160,7 @@ index d1af8e9a92..9da9f54d18 100644
  
                  // Paper start
 diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
-index 489dcbf350..84df5c7633 100644
+index 63a5ad0037..120b10b9a7 100644
 --- a/src/main/resources/purpur.lang
 +++ b/src/main/resources/purpur.lang
 @@ -1,4 +1,5 @@
@@ -168,7 +168,7 @@ index 489dcbf350..84df5c7633 100644
 +  "commands.purpur.debug.disabled": "The debug profiler is disabled",
    "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
    "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
-   "commands.purpur.ping": "§a%s's ping is %sms"
+   "commands.purpur.ping": "§a%s's ping is %sms",
 -- 
 2.24.0