Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cab3010a Update a whole lot of deprecated annotations
PaperMC/Paper@6aad8807 compile fixes and equipOnInteract
PaperMC/Paper@c1f5409d Some progress
PaperMC/Paper@91a38cdb Finish more item data component API
PaperMC/Paper@d8afce2e Split thrown potion
PaperMC/Paper@46d21c11 cleanup events
PaperMC/Paper@46e7c750 fix legacy serialization with equipOnInteract and add preconditions
This commit is contained in:
granny
2025-03-23 12:40:33 -07:00
parent a76ef64526
commit f5091f2fab
11 changed files with 15 additions and 15 deletions

View File

@@ -106,7 +106,7 @@
@Override
public List<Recipe> getRecipesFor(ItemStack result) {
Preconditions.checkArgument(result != null, "ItemStack cannot be null");
@@ -2947,6 +_,18 @@
@@ -2942,6 +_,18 @@
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
@@ -125,7 +125,7 @@
@Override
public void restart() {
CraftServer.this.restart();
@@ -2979,6 +_,7 @@
@@ -2974,6 +_,7 @@
@Override
public double[] getTPS() {
return new double[] {
@@ -133,7 +133,7 @@
net.minecraft.server.MinecraftServer.getServer().tps1.getAverage(),
net.minecraft.server.MinecraftServer.getServer().tps5.getAverage(),
net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
@@ -3186,4 +_,18 @@
@@ -3181,4 +_,18 @@
public void allowPausing(final Plugin plugin, final boolean value) {
this.console.addPluginAllowingSleep(plugin.getName(), value);
}