Skip to content

Commit

Permalink
Add API to get Worlds by adventure Keys
Browse files Browse the repository at this point in the history
  • Loading branch information
kokiriglade committed Jul 30, 2024
1 parent 227544c commit a9a3309
Show file tree
Hide file tree
Showing 73 changed files with 412 additions and 332 deletions.
204 changes: 120 additions & 84 deletions patches/api/0006-Adventure.patch

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions patches/api/0011-Timings-v2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2864,10 +2864,10 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index fe6c43405e3f11272c1ff015f1dcd47129a68d41..8d729fb196d83e01e4652fb1f77f5cab7b57cc31 100644
index d7d3297da99122b7cbda2cf34843bf79e77eb9a1..bc9a9cf1e39a875692a9c406aae0460c8e4cda2a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -870,7 +870,6 @@ public final class Bukkit {
@@ -883,7 +883,6 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
Expand All @@ -2876,10 +2876,10 @@ index fe6c43405e3f11272c1ff015f1dcd47129a68d41..8d729fb196d83e01e4652fb1f77f5cab

/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index fa6ad07214d5e38866bf6bee9139c6c938e9f51a..57c9b560c77a56588870598acb543469040ceec1 100644
index 87f17569fc0d90dd023cc0d4e62c0304dd20f295..52524f40fad5447b4734068dabc63e0aeddcfafb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1960,6 +1960,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1971,6 +1971,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
throw new UnsupportedOperationException("Not supported yet.");
}

Expand Down
8 changes: 4 additions & 4 deletions patches/api/0014-Add-getTPS-method.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method


diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d978c72cdbc10792f852a4ba372518073893d02b..5780003631beae773231afe3afc6b834bfe1f84d 100644
index c04ebd2a99a8cb4d36ae4665923763d751d57471..429d0108bbd1e4b411a91b76fc54018aeccdcdfb 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2108,6 +2108,17 @@ public final class Bukkit {
@@ -2121,6 +2121,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}

Expand All @@ -27,10 +27,10 @@ index d978c72cdbc10792f852a4ba372518073893d02b..5780003631beae773231afe3afc6b834
* Get the advancement specified by this key.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8949b8e29ae7f412481291630a5cb7b5b8809842..ba28d9f3213ca4b5f15178dc637bff37a8896edc 100644
index c04fa6f077138c012c364f772d437e9174f4fbf5..1e9ed748a778d0032b3302b7d9e1070930119780 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1797,6 +1797,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1808,6 +1808,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@Nullable
Entity getEntity(@NotNull UUID uuid);

Expand Down
8 changes: 4 additions & 4 deletions patches/api/0019-Expose-server-CommandMap.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap


diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a005d5f8879262c763d8c4fbd09b9a99810d5e8c..26f3ac9c15ff554becfe8ea53a48f67b2de60ed6 100644
index 636c4d2bd53ddbf1bc3d03a5da1227b70eccfdbc..93a020fd2c0ef81b5a0ae35456d82be2185be24d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2337,6 +2337,19 @@ public final class Bukkit {
@@ -2350,6 +2350,19 @@ public final class Bukkit {
return server.getUnsafe();
}

Expand All @@ -29,10 +29,10 @@ index a005d5f8879262c763d8c4fbd09b9a99810d5e8c..26f3ac9c15ff554becfe8ea53a48f67b
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8a07f21eeb04fb54032ce377a1478f60303e1824..d78481bf17818415524f14417caf86d5684b2235 100644
index c64800b48c2bc2a9553c3733dd8c0f51347499b2..c61c1751964a5065324b807c5c9636fe6dd7d78b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1817,6 +1817,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1828,6 +1828,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
public double[] getTPS();
// Paper end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to


diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index bd3fa2bcee24ab7e8f740722f55ed6294fdb294a..d9f84c4a5bc5609e7d9fd0970696a46a32f3f5ff 100644
index 8390ce16542dae2853b8a704565ccf186e4fd16c..3f81dff0819899c3c022cfcb7fc2450db839247d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2372,6 +2372,13 @@ public final class Bukkit {
@@ -2385,6 +2385,13 @@ public final class Bukkit {
public static org.bukkit.command.CommandMap getCommandMap() {
return server.getCommandMap();
}
Expand All @@ -24,10 +24,10 @@ index bd3fa2bcee24ab7e8f740722f55ed6294fdb294a..d9f84c4a5bc5609e7d9fd0970696a46a

@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 067eb3a5f5676f3b1b3f49a65df9c4054c48a1e7..990d0d02d1bd95886126efe08e8107322e3199d5 100644
index 0a3b30b1b69983f0347544ac73d722e40512d429..280aa98299530dae32dea6dbfb1b9e45b694cf97 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2078,4 +2078,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2089,4 +2089,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
Spigot spigot();
// Spigot end
Expand Down
8 changes: 4 additions & 4 deletions patches/api/0042-Allow-Reloading-of-Command-Aliases.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml

diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d9f84c4a5bc5609e7d9fd0970696a46a32f3f5ff..47c7b0baae47ca263907b0dd70d75f37793517fc 100644
index 3f81dff0819899c3c022cfcb7fc2450db839247d..1765e6a578127eb35305db37956ccc78ecdf5b21 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2379,6 +2379,15 @@ public final class Bukkit {
@@ -2392,6 +2392,15 @@ public final class Bukkit {
public static void reloadPermissions() {
server.reloadPermissions();
}
Expand All @@ -26,10 +26,10 @@ index d9f84c4a5bc5609e7d9fd0970696a46a32f3f5ff..47c7b0baae47ca263907b0dd70d75f37

@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 990d0d02d1bd95886126efe08e8107322e3199d5..ced9203c81477c802983df2f03b4e4efc517519b 100644
index 280aa98299530dae32dea6dbfb1b9e45b694cf97..43ae6b076b771a150bbcb5a979cd78cddb7ba1f1 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2080,4 +2080,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2091,4 +2091,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Spigot end

void reloadPermissions(); // Paper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being


diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 47c7b0baae47ca263907b0dd70d75f37793517fc..72983c3ea04382570c4b52e879dab56702bae55a 100644
index 1765e6a578127eb35305db37956ccc78ecdf5b21..25dba51075abf04d46661169521793a50e1bc690 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2388,6 +2388,16 @@ public final class Bukkit {
@@ -2401,6 +2401,16 @@ public final class Bukkit {
public static boolean reloadCommandAliases() {
return server.reloadCommandAliases();
}
Expand All @@ -27,10 +27,10 @@ index 47c7b0baae47ca263907b0dd70d75f37793517fc..72983c3ea04382570c4b52e879dab567

@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ced9203c81477c802983df2f03b4e4efc517519b..0ba391e6a1e585f29930b4111421e99f6eb11b4a 100644
index 43ae6b076b771a150bbcb5a979cd78cddb7ba1f1..6debce05497f6d02aedfe5112e7e84e7bb76f629 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2082,4 +2082,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2093,4 +2093,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
void reloadPermissions(); // Paper

boolean reloadCommandAliases(); // Paper
Expand Down
8 changes: 4 additions & 4 deletions patches/api/0053-Fix-upstream-javadocs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee828759093
* @param target the target to remove from this list
*/
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 72983c3ea04382570c4b52e879dab56702bae55a..dec72e92fb9e489d1d04cdf60c2f1d34571f9410 100644
index 25dba51075abf04d46661169521793a50e1bc690..252f873f1f277c341ea0f906efd827b408fe10c5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1538,6 +1538,8 @@ public final class Bukkit {
@@ -1551,6 +1551,8 @@ public final class Bukkit {

/**
* Gets every player that has ever played on this server.
Expand Down Expand Up @@ -127,7 +127,7 @@ index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc6
* @param statePredicate The predicate which should get used to test if a block should be set or not.
* @return true if the tree was created successfully, otherwise false
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0ba391e6a1e585f29930b4111421e99f6eb11b4a..2f68b766267b53e98dee3054e0a69be8b9cdf70f 100644
index 6debce05497f6d02aedfe5112e7e84e7bb76f629..0015433462614bc2d868e0494e472a56f97ded9c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -581,13 +581,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
Expand All @@ -145,7 +145,7 @@ index 0ba391e6a1e585f29930b4111421e99f6eb11b4a..2f68b766267b53e98dee3054e0a69be8
*/
public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory);

@@ -1298,6 +1295,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1309,6 +1306,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi

/**
* Gets every player that has ever played on this server.
Expand Down
8 changes: 4 additions & 4 deletions patches/api/0057-Basic-PlayerProfile-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,10 @@ index 0000000000000000000000000000000000000000..8f913a078dd692a9feafb98a6e6c9583
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index dec72e92fb9e489d1d04cdf60c2f1d34571f9410..dcf6b2d04f9e1bc7466feda22069423d638fb4b3 100644
index 252f873f1f277c341ea0f906efd827b408fe10c5..61edb9ce66d0e5a7a16eb29b67f1e91d44f35b57 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2400,6 +2400,89 @@ public final class Bukkit {
@@ -2413,6 +2413,89 @@ public final class Bukkit {
public static boolean suggestPlayerNamesWhenNullTabCompletions() {
return server.suggestPlayerNamesWhenNullTabCompletions();
}
Expand Down Expand Up @@ -421,10 +421,10 @@ index dec72e92fb9e489d1d04cdf60c2f1d34571f9410..dcf6b2d04f9e1bc7466feda22069423d

@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 2f68b766267b53e98dee3054e0a69be8b9cdf70f..7a1b80e8d02f23c5d246c3032e5ced909f10bd41 100644
index 0015433462614bc2d868e0494e472a56f97ded9c..8f73b470dd5fa722c7f5e826e47f488eea546cf5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2090,5 +2090,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2101,5 +2101,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return true if player names should be suggested
*/
boolean suggestPlayerNamesWhenNullTabCompletions();
Expand Down
16 changes: 8 additions & 8 deletions patches/api/0089-Player.setPlayerProfile-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API
This can be useful for changing name or skins after a player has logged in.

diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index dcf6b2d04f9e1bc7466feda22069423d638fb4b3..da18fbc38976c601da7781b488449da7d724160f 100644
index 61edb9ce66d0e5a7a16eb29b67f1e91d44f35b57..d6cb704efcf29e480e06ec0599995831fca65653 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1380,8 +1380,10 @@ public final class Bukkit {
@@ -1393,8 +1393,10 @@ public final class Bukkit {
* @return the new PlayerProfile
* @throws IllegalArgumentException if both the unique id is
* <code>null</code> and the name is <code>null</code> or blank
Expand All @@ -20,7 +20,7 @@ index dcf6b2d04f9e1bc7466feda22069423d638fb4b3..da18fbc38976c601da7781b488449da7
public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) {
return server.createPlayerProfile(uniqueId, name);
}
@@ -1392,8 +1394,10 @@ public final class Bukkit {
@@ -1405,8 +1407,10 @@ public final class Bukkit {
* @param uniqueId the unique id
* @return the new PlayerProfile
* @throws IllegalArgumentException if the unique id is <code>null</code>
Expand All @@ -31,7 +31,7 @@ index dcf6b2d04f9e1bc7466feda22069423d638fb4b3..da18fbc38976c601da7781b488449da7
public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) {
return server.createPlayerProfile(uniqueId);
}
@@ -1405,8 +1409,10 @@ public final class Bukkit {
@@ -1418,8 +1422,10 @@ public final class Bukkit {
* @return the new PlayerProfile
* @throws IllegalArgumentException if the name is <code>null</code> or
* blank
Expand All @@ -56,10 +56,10 @@ index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46
/**
* Checks if this player has had their profile banned.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 7a1b80e8d02f23c5d246c3032e5ced909f10bd41..01c052d90bbdad3fc374eb9c8e0a5133b8b624e8 100644
index 8f73b470dd5fa722c7f5e826e47f488eea546cf5..655f2be6bfd9829185430e423d63be69a7a213bb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1167,8 +1167,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1178,8 +1178,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return the new PlayerProfile
* @throws IllegalArgumentException if both the unique id is
* <code>null</code> and the name is <code>null</code> or blank
Expand All @@ -70,7 +70,7 @@ index 7a1b80e8d02f23c5d246c3032e5ced909f10bd41..01c052d90bbdad3fc374eb9c8e0a5133
PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name);

/**
@@ -1177,8 +1179,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1188,8 +1190,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param uniqueId the unique id
* @return the new PlayerProfile
* @throws IllegalArgumentException if the unique id is <code>null</code>
Expand All @@ -81,7 +81,7 @@ index 7a1b80e8d02f23c5d246c3032e5ced909f10bd41..01c052d90bbdad3fc374eb9c8e0a5133
PlayerProfile createPlayerProfile(@NotNull UUID uniqueId);

/**
@@ -1188,8 +1192,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1199,8 +1203,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return the new PlayerProfile
* @throws IllegalArgumentException if the name is <code>null</code> or
* blank
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable


diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 28b86658aea14b33470508944d8626b23c65bba2..577b4b89b50441572f0edd9325047c38e25e782e 100644
index 7710c7b19970ded6860ce3bde7db4c2712fd6d8e..d7f2ca8fabe74687281fe6617e878b86f6a245af 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2421,6 +2421,28 @@ public final class Bukkit {
@@ -2434,6 +2434,28 @@ public final class Bukkit {
return server.suggestPlayerNamesWhenNullTabCompletions();
}

Expand Down Expand Up @@ -38,10 +38,10 @@ index 28b86658aea14b33470508944d8626b23c65bba2..577b4b89b50441572f0edd9325047c38
* Creates a PlayerProfile for the specified uuid, with name as null.
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 5c6c9f714097dfaead0093d752f1b373b70a75eb..08f6f85388e4c3e3aae40f709109f8706a400675 100644
index b3c2fb47b61d2724e8c66a16beab653463758209..ce0eac037368b190e4d7e44807f1352fc719611d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2109,6 +2109,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2120,6 +2120,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean suggestPlayerNamesWhenNullTabCompletions();

Expand Down
Loading

0 comments on commit a9a3309

Please sign in to comment.