[ci skip] I believe API patches are fine

gradle.properties

@@ -2,7 +2,7 @@ group=wtf.etil.mirai
 version=1.19-R0.1-SNAPSHOT
 mcVersion=1.19
 packageVersion=1_19_R1
-pufferfishRef=671d68b85d4e9367f6847e4475e106135169c0e3
+pufferfishRef=2073617ddbb07b42c1b71d983d29fd46a90a9a12
 
 org.gradle.caching=true
 org.gradle.caching.debug=false

patches/api/0002-Add-GameProfileLookupEvent.patch

@@ -1,78 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: tr7zw <tr7zw@live.de>
-Date: Sat, 1 Aug 2020 15:52:50 -0500
-Subject: [PATCH] Add GameProfileLookupEvent
-
-Original code by YatopiaMC, licensed under MIT
-You can find the original code on https://github.com/YatopiaMC/Yatopia
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 9d7bd0f965c7dc3a60246310688aa5f93a4594a4..3a1c5a4aa8d512d50565b22a383e44b73b276ee5 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -51,6 +51,7 @@ dependencies {
-     compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.2")
-     compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.2")
-     compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper
-+    compileOnly("com.mojang:authlib:3.2.38") // Yatopia
- 
-     val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
-     compileOnly(annotations)
-diff --git a/src/main/java/org/yatopiamc/yatopia/api/events/GameProfileLookupEvent.java b/src/main/java/org/yatopiamc/yatopia/api/events/GameProfileLookupEvent.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..d7db9c87dc82c883004a906e024d2f6de3e40961
---- /dev/null
-+++ b/src/main/java/org/yatopiamc/yatopia/api/events/GameProfileLookupEvent.java
-@@ -0,0 +1,51 @@
-+package org.yatopiamc.yatopia.api.events;
-+
-+import com.mojang.authlib.GameProfile;
-+import java.util.UUID;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.HandlerList;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+public class GameProfileLookupEvent extends Event {
-+    private static final HandlerList handlers = new HandlerList();
-+    private GameProfile gameProfile = null;
-+    private final UUID uuid;
-+    private final String name;
-+
-+    public GameProfileLookupEvent(boolean async, @NotNull UUID uuid, @NotNull String name) {
-+        super(async);
-+        this.uuid = uuid;
-+        this.name = name;
-+    }
-+
-+    @Nullable
-+    public GameProfile getGameProfile() {
-+        return gameProfile;
-+    }
-+
-+    public void setGameProfile(@Nullable GameProfile gameProfile) {
-+        this.gameProfile = gameProfile;
-+    }
-+
-+    @NotNull
-+    public UUID getUuid() {
-+        return uuid;
-+    }
-+
-+    @NotNull
-+    public String getName() {
-+        return name;
-+    }
-+
-+    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlers;
-+    }
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlers;
-+    }
-+}
-\ No newline at end of file

patches/api/0003-Disable-reload-command.patch

@@ -15,7 +15,7 @@ index 0c7ba0718de2b93d013968ca0fec34ffd423990f..535800197c43f43c30854d2b19310780
      public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) { // Paper
          if (!testPermission(sender)) return true;
 +        // Yatopia start - disable reload command
-+        if (Boolean.parseBoolean(System.getProperty("Mirai.DisableReloadCommand", "true"))) {
++        if (Boolean.parseBoolean(System.getProperty("mirai.DisableReloadCommand", "true"))) {
 +            sender.sendMessage(ChatColor.RED + "Operation denied.");
 +            sender.sendMessage(ChatColor.YELLOW + "Reload command SHOULD NEVER EVER EVER be used in whatever circumstances.");
 +            sender.sendMessage(ChatColor.YELLOW + "Mirai has intentionally disabled it in order to stop you using it, instead of restarting your server.");

patches/api/0007-Default-Purpur-permissions.patch

@@ -1,119 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 5 Jun 2020 23:32:38 -0500
-Subject: [PATCH] Default Purpur permissions
-
-Original code by PurpurMC, licensed under MIT
-You can find the original code on https://github.com/PurpurMC/Purpur
-
-diff --git a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
-index 7763d6101ac61900db1e2310966b99584539fd0e..d5a42707d365ffd72532bbb1a59a1ca7145f9918 100644
---- a/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
-+++ b/src/main/java/org/bukkit/util/permissions/CommandPermissions.java
-@@ -18,6 +18,7 @@ public final class CommandPermissions {
-         DefaultPermissions.registerPermission(PREFIX + "plugins", "Allows the user to view the list of plugins running on this server", PermissionDefault.TRUE, commands);
-         DefaultPermissions.registerPermission(PREFIX + "reload", "Allows the user to reload the server settings", PermissionDefault.OP, commands);
-         DefaultPermissions.registerPermission(PREFIX + "version", "Allows the user to view the version of the server", PermissionDefault.TRUE, commands);
-+        DefaultPermissions.registerPermission(PREFIX + "purpur", "Allows the user to use the purpur command", PermissionDefault.OP, commands); // Purpur
- 
-         commands.recalculatePermissibles();
-         return commands;
-diff --git a/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java b/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
-index e1a4ddf2c07cdd242fa8054a0152522fe4039e85..8e481e3815f5645ee92f0d229e5ff25c8fc9a6c2 100644
---- a/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
-+++ b/src/main/java/org/bukkit/util/permissions/DefaultPermissions.java
-@@ -89,6 +89,8 @@ public final class DefaultPermissions {
-         CommandPermissions.registerPermissions(parent);
-         BroadcastPermissions.registerPermissions(parent);
- 
-+        PurpurPermissions.registerPermissions(); // Purpur
-+
-         parent.recalculatePermissibles();
-     }
- }
-diff --git a/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..efef6b099202717d2b53316028dc6dfb0e5f01ec
---- /dev/null
-+++ b/src/main/java/org/bukkit/util/permissions/PurpurPermissions.java
-@@ -0,0 +1,79 @@
-+package org.bukkit.util.permissions;
-+
-+import org.bukkit.entity.Entity;
-+import org.bukkit.entity.EntityType;
-+import org.bukkit.entity.Mob;
-+import org.bukkit.permissions.Permission;
-+import org.bukkit.permissions.PermissionDefault;
-+import org.jetbrains.annotations.NotNull;
-+
-+import java.util.HashSet;
-+import java.util.Set;
-+
-+public final class PurpurPermissions {
-+    private static final String ROOT = "purpur";
-+    private static final String PREFIX = ROOT + ".";
-+    private static final Set<String> mobs = new HashSet<>();
-+
-+    static {
-+        for (EntityType mob : EntityType.values()) {
-+            Class<? extends Entity> clazz = mob.getEntityClass();
-+            if (clazz != null && Mob.class.isAssignableFrom(clazz)) {
-+                mobs.add(mob.getName());
-+            }
-+        }
-+    }
-+
-+    @NotNull
-+    public static Permission registerPermissions() {
-+        Permission purpur = DefaultPermissions.registerPermission(ROOT, "Gives the user the ability to use all Purpur utilities and commands", PermissionDefault.FALSE);
-+
-+        DefaultPermissions.registerPermission(PREFIX + "enderchest.rows.six", "Gives the user six rows of enderchest space", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "enderchest.rows.five", "Gives the user five rows of enderchest space", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "enderchest.rows.four", "Gives the user four rows of enderchest space", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "enderchest.rows.three", "Gives the user three rows of enderchest space", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "enderchest.rows.two", "Gives the user two rows of enderchest space", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "enderchest.rows.one", "Gives the user one row of enderchest space", PermissionDefault.FALSE, purpur);
-+
-+        DefaultPermissions.registerPermission(PREFIX + "debug.f3n", "Allows the user to use F3+N keybind to swap gamemodes", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "joinfullserver", "Allows the user to join a full server", PermissionDefault.OP, purpur);
-+
-+        DefaultPermissions.registerPermission(PREFIX + "drop.spawner", "Allows the user to drop spawner cage when broken with diamond pickaxe with silk touch", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "place.spawner", "Allows the user to place spawner cage in the world", PermissionDefault.FALSE, purpur);
-+
-+        DefaultPermissions.registerPermission(PREFIX + "anvil.color", "Allows the user to use color codes on anvils", PermissionDefault.FALSE, purpur);
-+
-+        Permission book = DefaultPermissions.registerPermission(PREFIX + "book", "Allows the user to use color codes on books", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "book.color.edit", "Allows the user to use color codes on books when editing", PermissionDefault.FALSE, book);
-+        DefaultPermissions.registerPermission(PREFIX + "book.color.sign", "Allows the user to use color codes on books when signing", PermissionDefault.FALSE, book);
-+        book.recalculatePermissibles();
-+
-+        Permission sign = DefaultPermissions.registerPermission(PREFIX + "sign", "Allows the user to use all sign abilities", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission(PREFIX + "sign.edit", "Allows the user to click signs to open sign editor", PermissionDefault.FALSE, sign);
-+        DefaultPermissions.registerPermission(PREFIX + "sign.color", "Allows the user to use color codes on signs", PermissionDefault.FALSE, sign);
-+        DefaultPermissions.registerPermission(PREFIX + "sign.style", "Allows the user to use style codes on signs", PermissionDefault.FALSE, sign);
-+        DefaultPermissions.registerPermission(PREFIX + "sign.magic", "Allows the user to use magic/obfuscate code on signs", PermissionDefault.FALSE, sign);
-+        sign.recalculatePermissibles();
-+
-+        Permission ride = DefaultPermissions.registerPermission("allow.ride", "Allows the user to ride all mobs", PermissionDefault.FALSE, purpur);
-+        for (String mob : mobs) {
-+            DefaultPermissions.registerPermission("allow.ride." + mob, "Allows the user to ride " + mob, PermissionDefault.FALSE, ride);
-+        }
-+        ride.recalculatePermissibles();
-+
-+        Permission special = DefaultPermissions.registerPermission("allow.special", "Allows the user to use all mobs special abilities", PermissionDefault.FALSE, purpur);
-+        for (String mob : mobs) {
-+            DefaultPermissions.registerPermission("allow.special." + mob, "Allows the user to use " + mob + " special ability", PermissionDefault.FALSE, special);
-+        }
-+        special.recalculatePermissibles();
-+
-+        Permission powered = DefaultPermissions.registerPermission("allow.powered", "Allows the user to toggle all mobs powered state", PermissionDefault.FALSE, purpur);
-+        DefaultPermissions.registerPermission("allow.powered.creeper", "Allows the user to toggle creeper powered state", PermissionDefault.FALSE, powered);
-+        powered.recalculatePermissibles();
-+
-+        DefaultPermissions.registerPermission(PREFIX + "portal.instant", "Allows the user to bypass portal wait time", PermissionDefault.FALSE, purpur);
-+
-+        purpur.recalculatePermissibles();
-+        return purpur;
-+    }
-+}
-\ No newline at end of file