diff --git a/README.md b/README.md
index 9ddb58167..9660ba25e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
## Purpur
[](LICENSE)
-[](https://purpurmc.org/downloads/)
+[](https://purpurmc.org/downloads/)
[](https://www.codefactor.io/repository/github/PurpurMC/Purpur)
[](https://purpurmc.org/discord)
@@ -27,7 +27,7 @@ Join us on Discord:
## Downloads
Downloads can be obtained from the [downloads page](https://purpurmc.org/downloads/) or the [downloads API](https://api.purpurmc.org).
-[](https://purpurmc.org/downloads/)
+[](https://purpurmc.org/downloads/)
Downloads API endpoints:
* List versions of Minecraft with builds available:
@@ -67,7 +67,7 @@ Maven
org.purpurmc.purpur
purpur-api
- 1.19.4-R0.1-SNAPSHOT
+ 1.20-R0.1-SNAPSHOT
provided
```
@@ -80,7 +80,7 @@ repositories {
```
```kotlin
dependencies {
- compileOnly("org.purpurmc.purpur:purpur-api:1.19.4-R0.1-SNAPSHOT")
+ compileOnly("org.purpurmc.purpur:purpur-api:1.20-R0.1-SNAPSHOT")
}
```
diff --git a/build.gradle.kts b/build.gradle.kts
index 659ea345c..724874df2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -116,7 +116,7 @@ tasks.register("printMinecraftVersion") {
}
}
-tasks.register("printPaperVersion") {
+tasks.register("printPurpurVersion") {
doLast {
println(project.version)
}
diff --git a/gradle.properties b/gradle.properties
index 9fc1b256d..701c42e51 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,8 @@
group = org.purpurmc.purpur
-version = 1.19.4-R0.1-SNAPSHOT
+version = 1.20-R0.1-SNAPSHOT
-paperCommit = bc4a6647c99ae98c52c1c81597834be8fec6aa0d
+mcVersion = 1.20
+paperCommit = ac1a62649313cc64dbc130b9399b79053d200c86
org.gradle.caching = true
org.gradle.parallel = true
diff --git a/patches/api/0003-Build-System-Changes.patch b/patches/api/0001-Build-System-Changes.patch
similarity index 85%
rename from patches/api/0003-Build-System-Changes.patch
rename to patches/api/0001-Build-System-Changes.patch
index dd4ffe1dc..5792549d2 100644
--- a/patches/api/0003-Build-System-Changes.patch
+++ b/patches/api/0001-Build-System-Changes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Build System Changes
diff --git a/build.gradle.kts b/build.gradle.kts
-index b83e2c5a0a094002d12aee55ec0cf8d12bf33f3e..b5835fa536f90b7f88a5ee4df78733cf43e1cb23 100644
+index 7d6239855a84502de4eb3328b0dcf12ac671dce4..fc107bffc4efe56816d42c7f78d04897fe253729 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
-@@ -105,6 +105,8 @@ tasks.jar {
+@@ -99,6 +99,8 @@ tasks.jar {
}
tasks.withType {
diff --git a/patches/api/0001-Pufferfish-API-Changes.patch b/patches/api/0001-Pufferfish-API-Changes.patch
deleted file mode 100644
index b87bdf111..000000000
--- a/patches/api/0001-Pufferfish-API-Changes.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Raneri
-Date: Tue, 9 Nov 2021 14:01:56 -0500
-Subject: [PATCH] Pufferfish API Changes
-
-Pufferfish
-Copyright (C) 2022 Pufferfish Studios LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 279a666e8ea2c07f41ee3f28b768e95dca5f0a10..a93b900889ddb56a2943c54a7fff6f60f42a78f1 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -42,6 +42,7 @@ dependencies {
- apiAndDocs("net.kyori:adventure-text-logger-slf4j")
- api("org.apache.logging.log4j:log4j-api:2.17.1")
- api("org.slf4j:slf4j-api:1.8.0-beta4")
-+ api("io.sentry:sentry:5.4.0") // Pufferfish
-
- implementation("org.ow2.asm:asm:9.4")
- implementation("org.ow2.asm:asm-commons:9.4")
-@@ -85,6 +86,13 @@ val generateApiVersioningFile by tasks.registering {
- }
- }
-
-+// Pufferfish Start
-+tasks.withType {
-+ val compilerArgs = options.compilerArgs
-+ compilerArgs.add("--add-modules=jdk.incubator.vector")
-+}
-+// Pufferfish End
-+
- tasks.jar {
- from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
- into("META-INF/maven/${project.group}/${project.name}")
-diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8eb08fb68a
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
-@@ -0,0 +1,161 @@
-+package gg.pufferfish.pufferfish.sentry;
-+
-+import com.google.gson.Gson;
-+import java.lang.reflect.Field;
-+import java.lang.reflect.Modifier;
-+import java.util.Map;
-+import java.util.TreeMap;
-+import org.apache.logging.log4j.ThreadContext;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+import org.bukkit.entity.Player;
-+import org.bukkit.event.Event;
-+import org.bukkit.event.player.PlayerEvent;
-+import org.bukkit.plugin.Plugin;
-+import org.bukkit.plugin.RegisteredListener;
-+import org.jetbrains.annotations.Nullable;
-+
-+public class SentryContext {
-+
-+ private static final Gson GSON = new Gson();
-+
-+ public static void setPluginContext(@Nullable Plugin plugin) {
-+ if (plugin != null) {
-+ ThreadContext.put("pufferfishsentry_pluginname", plugin.getName());
-+ ThreadContext.put("pufferfishsentry_pluginversion", plugin.getDescription().getVersion());
-+ }
-+ }
-+
-+ public static void removePluginContext() {
-+ ThreadContext.remove("pufferfishsentry_pluginname");
-+ ThreadContext.remove("pufferfishsentry_pluginversion");
-+ }
-+
-+ public static void setSenderContext(@Nullable CommandSender sender) {
-+ if (sender != null) {
-+ ThreadContext.put("pufferfishsentry_playername", sender.getName());
-+ if (sender instanceof Player player) {
-+ ThreadContext.put("pufferfishsentry_playerid", player.getUniqueId().toString());
-+ }
-+ }
-+ }
-+
-+ public static void removeSenderContext() {
-+ ThreadContext.remove("pufferfishsentry_playername");
-+ ThreadContext.remove("pufferfishsentry_playerid");
-+ }
-+
-+ public static void setEventContext(Event event, RegisteredListener registration) {
-+ setPluginContext(registration.getPlugin());
-+
-+ try {
-+ // Find the player that was involved with this event
-+ Player player = null;
-+ if (event instanceof PlayerEvent) {
-+ player = ((PlayerEvent) event).getPlayer();
-+ } else {
-+ Class eventClass = event.getClass();
-+
-+ Field playerField = null;
-+
-+ for (Field field : eventClass.getDeclaredFields()) {
-+ if (field.getType().equals(Player.class)) {
-+ playerField = field;
-+ break;
-+ }
-+ }
-+
-+ if (playerField != null) {
-+ playerField.setAccessible(true);
-+ player = (Player) playerField.get(event);
-+ }
-+ }
-+
-+ if (player != null) {
-+ setSenderContext(player);
-+ }
-+ } catch (Exception e) {} // We can't really safely log exceptions.
-+
-+ ThreadContext.put("pufferfishsentry_eventdata", GSON.toJson(serializeFields(event)));
-+ }
-+
-+ public static void removeEventContext() {
-+ removePluginContext();
-+ removeSenderContext();
-+ ThreadContext.remove("pufferfishsentry_eventdata");
-+ }
-+
-+ private static Map serializeFields(Object object) {
-+ Map fields = new TreeMap<>();
-+ fields.put("_class", object.getClass().getName());
-+ for (Field declaredField : object.getClass().getDeclaredFields()) {
-+ try {
-+ if (Modifier.isStatic(declaredField.getModifiers())) {
-+ continue;
-+ }
-+
-+ String fieldName = declaredField.getName();
-+ if (fieldName.equals("handlers")) {
-+ continue;
-+ }
-+ declaredField.setAccessible(true);
-+ Object value = declaredField.get(object);
-+ if (value != null) {
-+ fields.put(fieldName, value.toString());
-+ } else {
-+ fields.put(fieldName, "");
-+ }
-+ } catch (Exception e) {} // We can't really safely log exceptions.
-+ }
-+ return fields;
-+ }
-+
-+ public static class State {
-+
-+ private Plugin plugin;
-+ private Command command;
-+ private String commandLine;
-+ private Event event;
-+ private RegisteredListener registeredListener;
-+
-+ public Plugin getPlugin() {
-+ return plugin;
-+ }
-+
-+ public void setPlugin(Plugin plugin) {
-+ this.plugin = plugin;
-+ }
-+
-+ public Command getCommand() {
-+ return command;
-+ }
-+
-+ public void setCommand(Command command) {
-+ this.command = command;
-+ }
-+
-+ public String getCommandLine() {
-+ return commandLine;
-+ }
-+
-+ public void setCommandLine(String commandLine) {
-+ this.commandLine = commandLine;
-+ }
-+
-+ public Event getEvent() {
-+ return event;
-+ }
-+
-+ public void setEvent(Event event) {
-+ this.event = event;
-+ }
-+
-+ public RegisteredListener getRegisteredListener() {
-+ return registeredListener;
-+ }
-+
-+ public void setRegisteredListener(RegisteredListener registeredListener) {
-+ this.registeredListener = registeredListener;
-+ }
-+ }
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ab5fea0b03224bf249352ce340e94704ff713345
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-@@ -0,0 +1,40 @@
-+package gg.pufferfish.pufferfish.simd;
-+
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import jdk.incubator.vector.FloatVector;
-+import jdk.incubator.vector.IntVector;
-+import jdk.incubator.vector.VectorSpecies;
-+
-+/**
-+ * Basically, java is annoying and we have to push this out to its own class.
-+ */
-+@Deprecated
-+public class SIMDChecker {
-+
-+ @Deprecated
-+ public static boolean canEnable(Logger logger) {
-+ try {
-+ if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
-+ return false;
-+ } else {
-+ SIMDDetection.testRun = true;
-+
-+ VectorSpecies ISPEC = IntVector.SPECIES_PREFERRED;
-+ VectorSpecies FSPEC = FloatVector.SPECIES_PREFERRED;
-+
-+ logger.log(Level.INFO, "Max SIMD vector size on this system is " + ISPEC.vectorBitSize() + " bits (int)");
-+ logger.log(Level.INFO, "Max SIMD vector size on this system is " + FSPEC.vectorBitSize() + " bits (float)");
-+
-+ if (ISPEC.elementSize() < 2 || FSPEC.elementSize() < 2) {
-+ logger.log(Level.WARNING, "SIMD is not properly supported on this system!");
-+ return false;
-+ }
-+
-+ return true;
-+ }
-+ } catch (NoClassDefFoundError | Exception ignored) {} // Basically, we don't do anything. This lets us detect if it's not functional and disable it.
-+ return false;
-+ }
-+
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a84889d3e9cfc4d7ab5f867820a6484c6070711b
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
-@@ -0,0 +1,35 @@
-+package gg.pufferfish.pufferfish.simd;
-+
-+import java.util.logging.Logger;
-+
-+@Deprecated
-+public class SIMDDetection {
-+
-+ public static boolean isEnabled = false;
-+ public static boolean versionLimited = false;
-+ public static boolean testRun = false;
-+
-+ @Deprecated
-+ public static boolean canEnable(Logger logger) {
-+ try {
-+ return SIMDChecker.canEnable(logger);
-+ } catch (NoClassDefFoundError | Exception ignored) {
-+ return false;
-+ }
-+ }
-+
-+ @Deprecated
-+ public static int getJavaVersion() {
-+ // https://stackoverflow.com/a/2591122
-+ String version = System.getProperty("java.version");
-+ if(version.startsWith("1.")) {
-+ version = version.substring(2, 3);
-+ } else {
-+ int dot = version.indexOf(".");
-+ if(dot != -1) { version = version.substring(0, dot); }
-+ }
-+ version = version.split("-")[0]; // Azul is stupid
-+ return Integer.parseInt(version);
-+ }
-+
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..ae2464920c9412ac90b819a540ee58be0741465f
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/simd/VectorMapPalette.java
-@@ -0,0 +1,83 @@
-+package gg.pufferfish.pufferfish.simd;
-+
-+import java.awt.Color;
-+import jdk.incubator.vector.FloatVector;
-+import jdk.incubator.vector.IntVector;
-+import jdk.incubator.vector.VectorMask;
-+import jdk.incubator.vector.VectorSpecies;
-+import org.bukkit.map.MapPalette;
-+
-+@Deprecated
-+public class VectorMapPalette {
-+
-+ private static final VectorSpecies I_SPEC = IntVector.SPECIES_PREFERRED;
-+ private static final VectorSpecies F_SPEC = FloatVector.SPECIES_PREFERRED;
-+
-+ @Deprecated
-+ public static void matchColorVectorized(int[] in, byte[] out) {
-+ int speciesLength = I_SPEC.length();
-+ int i;
-+ for (i = 0; i < in.length - speciesLength; i += speciesLength) {
-+ float[] redsArr = new float[speciesLength];
-+ float[] bluesArr = new float[speciesLength];
-+ float[] greensArr = new float[speciesLength];
-+ int[] alphasArr = new int[speciesLength];
-+
-+ for (int j = 0; j < speciesLength; j++) {
-+ alphasArr[j] = (in[i + j] >> 24) & 0xFF;
-+ redsArr[j] = (in[i + j] >> 16) & 0xFF;
-+ greensArr[j] = (in[i + j] >> 8) & 0xFF;
-+ bluesArr[j] = (in[i + j] >> 0) & 0xFF;
-+ }
-+
-+ IntVector alphas = IntVector.fromArray(I_SPEC, alphasArr, 0);
-+ FloatVector reds = FloatVector.fromArray(F_SPEC, redsArr, 0);
-+ FloatVector greens = FloatVector.fromArray(F_SPEC, greensArr, 0);
-+ FloatVector blues = FloatVector.fromArray(F_SPEC, bluesArr, 0);
-+ IntVector resultIndex = IntVector.zero(I_SPEC);
-+ VectorMask modificationMask = VectorMask.fromLong(I_SPEC, 0xffffffff);
-+
-+ modificationMask = modificationMask.and(alphas.lt(128).not());
-+ FloatVector bestDistances = FloatVector.broadcast(F_SPEC, Float.MAX_VALUE);
-+
-+ for (int c = 4; c < MapPalette.colors.length; c++) {
-+ // We're using 32-bit floats here because it's 2x faster and nobody will know the difference.
-+ // For correctness, the original algorithm uses 64-bit floats instead. Completely unnecessary.
-+ FloatVector compReds = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getRed());
-+ FloatVector compGreens = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getGreen());
-+ FloatVector compBlues = FloatVector.broadcast(F_SPEC, MapPalette.colors[c].getBlue());
-+
-+ FloatVector rMean = reds.add(compReds).div(2.0f);
-+ FloatVector rDiff = reds.sub(compReds);
-+ FloatVector gDiff = greens.sub(compGreens);
-+ FloatVector bDiff = blues.sub(compBlues);
-+
-+ FloatVector weightR = rMean.div(256.0f).add(2);
-+ FloatVector weightG = FloatVector.broadcast(F_SPEC, 4.0f);
-+ FloatVector weightB = FloatVector.broadcast(F_SPEC, 255.0f).sub(rMean).div(256.0f).add(2.0f);
-+
-+ FloatVector distance = weightR.mul(rDiff).mul(rDiff).add(weightG.mul(gDiff).mul(gDiff)).add(weightB.mul(bDiff).mul(bDiff));
-+
-+ // Now we compare to the best distance we've found.
-+ // This mask contains a "1" if better, and a "0" otherwise.
-+ VectorMask bestDistanceMask = distance.lt(bestDistances);
-+ bestDistances = bestDistances.blend(distance, bestDistanceMask); // Update the best distances
-+
-+ // Update the result array
-+ // We also AND with the modification mask because we don't want to interfere if the alpha value isn't large enough.
-+ resultIndex = resultIndex.blend(c, bestDistanceMask.cast(I_SPEC).and(modificationMask)); // Update the results
-+ }
-+
-+ for (int j = 0; j < speciesLength; j++) {
-+ int index = resultIndex.lane(j);
-+ out[i + j] = (byte) (index < 128 ? index : -129 + (index - 127));
-+ }
-+ }
-+
-+ // For the final ones, fall back to the regular method
-+ for (; i < in.length; i++) {
-+ out[i] = MapPalette.matchColor(new Color(in[i], true));
-+ }
-+ }
-+
-+}
-diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..9584e245144b561b4f6745b2f26a4f69a6f92891 100644
---- a/src/main/java/org/bukkit/map/MapPalette.java
-+++ b/src/main/java/org/bukkit/map/MapPalette.java
-@@ -1,6 +1,7 @@
- package org.bukkit.map;
-
- import com.google.common.base.Preconditions;
-+import gg.pufferfish.pufferfish.simd.SIMDDetection; // Pufferfish
- import java.awt.Color;
- import java.awt.Graphics2D;
- import java.awt.Image;
-@@ -40,7 +41,7 @@ public final class MapPalette {
- }
-
- @NotNull
-- static final Color[] colors = {
-+ public static final Color[] colors = { // Pufferfish - public access
- c(0, 0, 0, 0), c(0, 0, 0, 0), c(0, 0, 0, 0), c(0, 0, 0, 0),
- c(89, 125, 39), c(109, 153, 48), c(127, 178, 56), c(67, 94, 29),
- c(174, 164, 115), c(213, 201, 140), c(247, 233, 163), c(130, 123, 86),
-@@ -211,9 +212,15 @@ public final class MapPalette {
- temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
-
- byte[] result = new byte[temp.getWidth() * temp.getHeight()];
-+ // Pufferfish start
-+ if (!SIMDDetection.isEnabled) {
- for (int i = 0; i < pixels.length; i++) {
- result[i] = matchColor(new Color(pixels[i], true));
- }
-+ } else {
-+ gg.pufferfish.pufferfish.simd.VectorMapPalette.matchColorVectorized(pixels, result);
-+ }
-+ // Pufferfish end
- return result;
- }
-
-diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index fc2dae69165776d08274e34a69962cc70445f411..899d67fa782fac639fe7fb096e05c551d75bd647 100644
---- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -584,7 +584,9 @@ public final class SimplePluginManager implements PluginManager {
-
- // Paper start
- private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
-+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
- server.getLogger().log(Level.SEVERE, msg, ex);
-+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
- callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
- }
- // Paper end
-@@ -654,9 +656,11 @@ public final class SimplePluginManager implements PluginManager {
- ));
- }
- } catch (Throwable ex) {
-+ gg.pufferfish.pufferfish.sentry.SentryContext.setEventContext(event, registration); // Pufferfish
- // Paper start - error reporting
- String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
- server.getLogger().log(Level.SEVERE, msg, ex);
-+ gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); // Pufferfish
- if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
- callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
- }
-diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..301e82369603f3dd6e6c1bd380da4bacacd7ef6c 100644
---- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-@@ -336,7 +336,13 @@ public final class JavaPluginLoader implements PluginLoader {
- try {
- jPlugin.setEnabled(true);
- } catch (Throwable ex) {
-+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
- server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
-+ // Paper start - Disable plugins that fail to load
-+ this.server.getPluginManager().disablePlugin(jPlugin);
-+ return;
-+ // Paper end
- }
-
- // Perhaps abort here, rather than continue going, but as it stands,
-@@ -361,7 +367,9 @@ public final class JavaPluginLoader implements PluginLoader {
- try {
- jPlugin.setEnabled(false);
- } catch (Throwable ex) {
-+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
- server.getLogger().log(Level.SEVERE, "Error occurred while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
-+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
- }
-
- if (cloader instanceof PluginClassLoader) {
-diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 13da387d3b59bc67c0d73e3fbd3a4034b1281527..7572a0bf6614b02be3cbccc7b86e52ee1b8df621 100644
---- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
- private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper
- public io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext; // Paper
-
-+ private boolean closed = false; // Pufferfish
-+
- static {
- ClassLoader.registerAsParallelCapable();
- }
-@@ -183,6 +185,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
- throw new ClassNotFoundException(name);
- }
-
-+ public boolean _airplane_hasClass(@NotNull String name) { return this.classes.containsKey(name); } // Pufferfish
- @Override
- protected Class findClass(String name) throws ClassNotFoundException {
- if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
-@@ -190,7 +193,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
- }
- Class result = classes.get(name);
-
-- if (result == null) {
-+ if (result == null && !this.closed) { // Pufferfish
- String path = name.replace('.', '/').concat(".class");
- JarEntry entry = jar.getJarEntry(path);
-
-@@ -237,6 +240,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
- this.setClass(name, result); // Paper
- }
-
-+ if (result == null) throw new ClassNotFoundException(name); // Pufferfish
- return result;
- }
-
-@@ -251,6 +255,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
- // Paper end
- super.close();
- } finally {
-+ this.closed = true; // Pufferfish
- jar.close();
- }
- }
diff --git a/patches/api/0004-Purpur-config-files.patch b/patches/api/0002-Purpur-config-files.patch
similarity index 100%
rename from patches/api/0004-Purpur-config-files.patch
rename to patches/api/0002-Purpur-config-files.patch
diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0003-Purpur-client-support.patch
similarity index 82%
rename from patches/api/0005-Purpur-client-support.patch
rename to patches/api/0003-Purpur-client-support.patch
index 755f857ac..b04a74c0e 100644
--- a/patches/api/0005-Purpur-client-support.patch
+++ b/patches/api/0003-Purpur-client-support.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 88c4885569d2b8b22fce55601d50608ac8e9388c..8d6353aa965474cf6bf333741abd7a059aa26d57 100644
+index def31cdbe5765f5d05386753868e51c424cbfe9e..d9e3157a9e4732f4a1cf87f206dceff48e853781 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3068,4 +3068,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3091,4 +3091,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end
diff --git a/patches/api/0006-Default-permissions.patch b/patches/api/0004-Default-permissions.patch
similarity index 100%
rename from patches/api/0006-Default-permissions.patch
rename to patches/api/0004-Default-permissions.patch
diff --git a/patches/api/0007-Ridables.patch b/patches/api/0005-Ridables.patch
similarity index 100%
rename from patches/api/0007-Ridables.patch
rename to patches/api/0005-Ridables.patch
diff --git a/patches/api/0008-Allow-inventory-resizing.patch b/patches/api/0006-Allow-inventory-resizing.patch
similarity index 83%
rename from patches/api/0008-Allow-inventory-resizing.patch
rename to patches/api/0006-Allow-inventory-resizing.patch
index 64ada1cd6..f4ae288d5 100644
--- a/patches/api/0008-Allow-inventory-resizing.patch
+++ b/patches/api/0006-Allow-inventory-resizing.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow inventory resizing
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index a8e631315f2da68895a258cf0ba9875bc88fc48c..d5648ec745e3530aecf18c3e1f3185a5f63f3d11 100644
+index b821fa535b23fe5af5884e536b1708460076ee40..a794beed383ec2beaa565eab372fb7e401c0379b 100644
--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -155,7 +155,7 @@ public enum InventoryType {
+@@ -152,7 +152,7 @@ public enum InventoryType {
SMITHING_NEW(4, "Upgrade Gear"),
;
diff --git a/patches/api/0009-Llama-API.patch b/patches/api/0007-Llama-API.patch
similarity index 100%
rename from patches/api/0009-Llama-API.patch
rename to patches/api/0007-Llama-API.patch
diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0008-AFK-API.patch
similarity index 94%
rename from patches/api/0010-AFK-API.patch
rename to patches/api/0008-AFK-API.patch
index d912bada6..cfecae16f 100644
--- a/patches/api/0010-AFK-API.patch
+++ b/patches/api/0008-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8d6353aa965474cf6bf333741abd7a059aa26d57..deda8a924742401c21d098406cbe7d07ab91faba 100644
+index d9e3157a9e4732f4a1cf87f206dceff48e853781..891bceaca672d23ccb179bc0c777aec9ca2dbdc6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3076,5 +3076,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3099,5 +3099,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();
diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0009-Bring-back-server-name.patch
similarity index 100%
rename from patches/api/0011-Bring-back-server-name.patch
rename to patches/api/0009-Bring-back-server-name.patch
diff --git a/patches/api/0012-ExecuteCommandEvent.patch b/patches/api/0010-ExecuteCommandEvent.patch
similarity index 100%
rename from patches/api/0012-ExecuteCommandEvent.patch
rename to patches/api/0010-ExecuteCommandEvent.patch
diff --git a/patches/api/0013-LivingEntity-safeFallDistance.patch b/patches/api/0011-LivingEntity-safeFallDistance.patch
similarity index 100%
rename from patches/api/0013-LivingEntity-safeFallDistance.patch
rename to patches/api/0011-LivingEntity-safeFallDistance.patch
diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0012-Lagging-threshold.patch
similarity index 100%
rename from patches/api/0014-Lagging-threshold.patch
rename to patches/api/0012-Lagging-threshold.patch
diff --git a/patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 100%
rename from patches/api/0015-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/api/0013-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/patches/api/0016-EMC-MonsterEggSpawnEvent.patch b/patches/api/0014-EMC-MonsterEggSpawnEvent.patch
similarity index 100%
rename from patches/api/0016-EMC-MonsterEggSpawnEvent.patch
rename to patches/api/0014-EMC-MonsterEggSpawnEvent.patch
diff --git a/patches/api/0017-Player-invulnerabilities.patch b/patches/api/0015-Player-invulnerabilities.patch
similarity index 87%
rename from patches/api/0017-Player-invulnerabilities.patch
rename to patches/api/0015-Player-invulnerabilities.patch
index d7e208f33..a552a5606 100644
--- a/patches/api/0017-Player-invulnerabilities.patch
+++ b/patches/api/0015-Player-invulnerabilities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index deda8a924742401c21d098406cbe7d07ab91faba..53c536f0b828c2dbfc426c367d3b4e1d92944338 100644
+index 891bceaca672d23ccb179bc0c777aec9ca2dbdc6..c0e82ea4376ac29c99f42a9630d279480050fd0c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3095,5 +3095,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3118,5 +3118,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();
diff --git a/patches/api/0018-Anvil-API.patch b/patches/api/0016-Anvil-API.patch
similarity index 100%
rename from patches/api/0018-Anvil-API.patch
rename to patches/api/0016-Anvil-API.patch
diff --git a/patches/api/0019-ItemStack-convenience-methods.patch b/patches/api/0017-ItemStack-convenience-methods.patch
similarity index 99%
rename from patches/api/0019-ItemStack-convenience-methods.patch
rename to patches/api/0017-ItemStack-convenience-methods.patch
index e16c33c11..0b0e94a62 100644
--- a/patches/api/0019-ItemStack-convenience-methods.patch
+++ b/patches/api/0017-ItemStack-convenience-methods.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 9b290969b0e60f20450cd15e3fc6f37276f12ae6..77a885fd17f280649b95df758f1096fa38fe8d69 100644
+index 03b47012447430a350e152920f754d993d4023db..3ad843d519e239430c5f4f5754a8da3026ed0f8e 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -11166,4 +11166,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -11047,4 +11047,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
public boolean isEnabledByFeature(@NotNull World world) {
return Bukkit.getDataPackManager().isEnabledByFeature(this, world);
}
diff --git a/patches/api/0020-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 100%
rename from patches/api/0020-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/api/0018-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
diff --git a/patches/api/0021-ChatColor-conveniences.patch b/patches/api/0019-ChatColor-conveniences.patch
similarity index 100%
rename from patches/api/0021-ChatColor-conveniences.patch
rename to patches/api/0019-ChatColor-conveniences.patch
diff --git a/patches/api/0022-LivingEntity-broadcastItemBreak.patch b/patches/api/0020-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/api/0022-LivingEntity-broadcastItemBreak.patch
rename to patches/api/0020-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/api/0023-Item-entity-immunities.patch b/patches/api/0021-Item-entity-immunities.patch
similarity index 100%
rename from patches/api/0023-Item-entity-immunities.patch
rename to patches/api/0021-Item-entity-immunities.patch
diff --git a/patches/api/0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 100%
rename from patches/api/0024-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/api/0022-Add-option-to-disable-zombie-aggressiveness-towards-.patch
diff --git a/patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/api/0023-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/api/0025-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/api/0023-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/api/0026-Rabid-Wolf-API.patch b/patches/api/0024-Rabid-Wolf-API.patch
similarity index 100%
rename from patches/api/0026-Rabid-Wolf-API.patch
rename to patches/api/0024-Rabid-Wolf-API.patch
diff --git a/patches/api/0027-PlayerBookTooLargeEvent.patch b/patches/api/0025-PlayerBookTooLargeEvent.patch
similarity index 100%
rename from patches/api/0027-PlayerBookTooLargeEvent.patch
rename to patches/api/0025-PlayerBookTooLargeEvent.patch
diff --git a/patches/api/0028-Full-netherite-armor-grants-fire-resistance.patch b/patches/api/0026-Full-netherite-armor-grants-fire-resistance.patch
similarity index 91%
rename from patches/api/0028-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/api/0026-Full-netherite-armor-grants-fire-resistance.patch
index 0ef9d9170..5082cfcd3 100644
--- a/patches/api/0028-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/api/0026-Full-netherite-armor-grants-fire-resistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance
diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
-index 01c5e8b71338fbb4b1605e45bf2a2e705188f6b5..118d53ec9d1dc9c01cedfbedaf0b8edcbda7b3a5 100644
+index c9f395064656dd0126410eb3c6e197baa450c063..13156a12e5df50cdc1e465dc0bd9d94108275629 100644
--- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
@@ -217,6 +217,12 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable
diff --git a/patches/api/0029-Add-EntityTeleportHinderedEvent.patch b/patches/api/0027-Add-EntityTeleportHinderedEvent.patch
similarity index 100%
rename from patches/api/0029-Add-EntityTeleportHinderedEvent.patch
rename to patches/api/0027-Add-EntityTeleportHinderedEvent.patch
diff --git a/patches/api/0030-Add-enchantment-target-for-bows-and-crossbows.patch b/patches/api/0028-Add-enchantment-target-for-bows-and-crossbows.patch
similarity index 87%
rename from patches/api/0030-Add-enchantment-target-for-bows-and-crossbows.patch
rename to patches/api/0028-Add-enchantment-target-for-bows-and-crossbows.patch
index 0b8df86e6..d9680f160 100644
--- a/patches/api/0030-Add-enchantment-target-for-bows-and-crossbows.patch
+++ b/patches/api/0028-Add-enchantment-target-for-bows-and-crossbows.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add enchantment target for bows and crossbows
diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
-index bea786a8be4402f9384984e48390e745f2988dd6..db6375f481e0cb8c20e6417adfc435da6974acce 100644
+index 455ff52d90565838fe7640c3f045b27082a6c2f1..5831ffe24eed01311c71989dcb1830dbc395607b 100644
--- a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
+++ b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
-@@ -228,6 +228,18 @@ public enum EnchantmentTarget {
+@@ -227,6 +227,18 @@ public enum EnchantmentTarget {
public boolean includes(@NotNull Material item) {
return BREAKABLE.includes(item) || (WEARABLE.includes(item) && !item.equals(Material.ELYTRA)) || item.equals(Material.COMPASS);
}
diff --git a/patches/api/0031-Iron-golem-poppy-calms-anger.patch b/patches/api/0029-Iron-golem-poppy-calms-anger.patch
similarity index 100%
rename from patches/api/0031-Iron-golem-poppy-calms-anger.patch
rename to patches/api/0029-Iron-golem-poppy-calms-anger.patch
diff --git a/patches/api/0032-API-for-any-mob-to-burn-daylight.patch b/patches/api/0030-API-for-any-mob-to-burn-daylight.patch
similarity index 100%
rename from patches/api/0032-API-for-any-mob-to-burn-daylight.patch
rename to patches/api/0030-API-for-any-mob-to-burn-daylight.patch
diff --git a/patches/api/0033-Add-back-player-spawned-endermite-API.patch b/patches/api/0031-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/api/0033-Add-back-player-spawned-endermite-API.patch
rename to patches/api/0031-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/api/0034-Fix-default-permission-system.patch b/patches/api/0032-Fix-default-permission-system.patch
similarity index 100%
rename from patches/api/0034-Fix-default-permission-system.patch
rename to patches/api/0032-Fix-default-permission-system.patch
diff --git a/patches/api/0035-Summoner-API.patch b/patches/api/0033-Summoner-API.patch
similarity index 100%
rename from patches/api/0035-Summoner-API.patch
rename to patches/api/0033-Summoner-API.patch
diff --git a/patches/api/0036-Clean-up-version-command-output.patch b/patches/api/0034-Clean-up-version-command-output.patch
similarity index 100%
rename from patches/api/0036-Clean-up-version-command-output.patch
rename to patches/api/0034-Clean-up-version-command-output.patch
diff --git a/patches/api/0037-Extended-OfflinePlayer-API.patch b/patches/api/0035-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/api/0037-Extended-OfflinePlayer-API.patch
rename to patches/api/0035-Extended-OfflinePlayer-API.patch
diff --git a/patches/api/0038-Added-the-ability-to-add-combustible-items.patch b/patches/api/0036-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/api/0038-Added-the-ability-to-add-combustible-items.patch
rename to patches/api/0036-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/api/0039-Potion-NamespacedKey.patch b/patches/api/0037-Potion-NamespacedKey.patch
similarity index 100%
rename from patches/api/0039-Potion-NamespacedKey.patch
rename to patches/api/0037-Potion-NamespacedKey.patch
diff --git a/patches/api/0040-Grindstone-API.patch b/patches/api/0038-Grindstone-API.patch
similarity index 100%
rename from patches/api/0040-Grindstone-API.patch
rename to patches/api/0038-Grindstone-API.patch
diff --git a/patches/api/0041-Shears-can-have-looting-enchantment.patch b/patches/api/0039-Shears-can-have-looting-enchantment.patch
similarity index 86%
rename from patches/api/0041-Shears-can-have-looting-enchantment.patch
rename to patches/api/0039-Shears-can-have-looting-enchantment.patch
index d640b05df..53f2a3f93 100644
--- a/patches/api/0041-Shears-can-have-looting-enchantment.patch
+++ b/patches/api/0039-Shears-can-have-looting-enchantment.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Shears can have looting enchantment
diff --git a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
-index db6375f481e0cb8c20e6417adfc435da6974acce..5eb81fcc18b8fdec5a0e4c699525281fa6ad4d78 100644
+index 5831ffe24eed01311c71989dcb1830dbc395607b..45f5493eebfecf56b7c0ef4659c078dfc62c0612 100644
--- a/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
+++ b/src/main/java/org/bukkit/enchantments/EnchantmentTarget.java
-@@ -239,6 +239,16 @@ public enum EnchantmentTarget {
+@@ -238,6 +238,16 @@ public enum EnchantmentTarget {
public boolean includes(@NotNull Material item) {
return item.equals(Material.BOW) || item.equals(Material.CROSSBOW);
}
diff --git a/patches/api/0042-Lobotomize-stuck-villagers.patch b/patches/api/0040-Lobotomize-stuck-villagers.patch
similarity index 88%
rename from patches/api/0042-Lobotomize-stuck-villagers.patch
rename to patches/api/0040-Lobotomize-stuck-villagers.patch
index 5c60b6171..03b9bf50d 100644
--- a/patches/api/0042-Lobotomize-stuck-villagers.patch
+++ b/patches/api/0040-Lobotomize-stuck-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index c61e7e41aeb3d4f5f4ac47da8890051d8e97340d..12b08318f78c8144cc809dbccf0feabdd31f0ee2 100644
+index 3bc24457d143449e6a338d79becf7c39b9f81054..4a5edf4e72e81b22c1abb2ade244f7f4292e993c 100644
--- a/src/main/java/org/bukkit/entity/Villager.java
+++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -328,4 +328,14 @@ public interface Villager extends AbstractVillager {
diff --git a/patches/api/0043-Add-local-difficulty-api.patch b/patches/api/0041-Add-local-difficulty-api.patch
similarity index 100%
rename from patches/api/0043-Add-local-difficulty-api.patch
rename to patches/api/0041-Add-local-difficulty-api.patch
diff --git a/patches/api/0044-Remove-Timings.patch b/patches/api/0042-Remove-Timings.patch
similarity index 100%
rename from patches/api/0044-Remove-Timings.patch
rename to patches/api/0042-Remove-Timings.patch
diff --git a/patches/api/0045-Add-Bee-API.patch b/patches/api/0043-Add-Bee-API.patch
similarity index 100%
rename from patches/api/0045-Add-Bee-API.patch
rename to patches/api/0043-Add-Bee-API.patch
diff --git a/patches/api/0046-Debug-Marker-API.patch b/patches/api/0044-Debug-Marker-API.patch
similarity index 99%
rename from patches/api/0046-Debug-Marker-API.patch
rename to patches/api/0044-Debug-Marker-API.patch
index 7eb6a219b..78d492a64 100644
--- a/patches/api/0046-Debug-Marker-API.patch
+++ b/patches/api/0044-Debug-Marker-API.patch
@@ -260,10 +260,10 @@ index d07b6f40c111c9b131f2995e9796d66f5344c5df..adf8169d5baefa7a33c33ef066180a81
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 53c536f0b828c2dbfc426c367d3b4e1d92944338..a003254281a07505cdd929fa9ee443749e48d5eb 100644
+index c0e82ea4376ac29c99f42a9630d279480050fd0c..49abe346f15f898efeff30dba66958eefc269926 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3116,5 +3116,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3139,5 +3139,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);
diff --git a/patches/api/0047-Add-death-screen-API.patch b/patches/api/0045-Add-death-screen-API.patch
similarity index 87%
rename from patches/api/0047-Add-death-screen-API.patch
rename to patches/api/0045-Add-death-screen-API.patch
index 517414ce7..769ed9cb6 100644
--- a/patches/api/0047-Add-death-screen-API.patch
+++ b/patches/api/0045-Add-death-screen-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a003254281a07505cdd929fa9ee443749e48d5eb..dc437885404ae147a06cac653e519a4674a9a951 100644
+index 49abe346f15f898efeff30dba66958eefc269926..185abf59b61f066a5961dd949d12469d9b4885f9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3186,5 +3186,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3209,5 +3209,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();
diff --git a/patches/api/0048-Add-item-packet-serialize-event.patch b/patches/api/0046-Add-item-packet-serialize-event.patch
similarity index 100%
rename from patches/api/0048-Add-item-packet-serialize-event.patch
rename to patches/api/0046-Add-item-packet-serialize-event.patch
diff --git a/patches/api/0049-Language-API.patch b/patches/api/0047-Language-API.patch
similarity index 100%
rename from patches/api/0049-Language-API.patch
rename to patches/api/0047-Language-API.patch
diff --git a/patches/api/0050-Add-log-suppression-for-LibraryLoader.patch b/patches/api/0048-Add-log-suppression-for-LibraryLoader.patch
similarity index 96%
rename from patches/api/0050-Add-log-suppression-for-LibraryLoader.patch
rename to patches/api/0048-Add-log-suppression-for-LibraryLoader.patch
index 95e4cd2ac..4948f9b89 100644
--- a/patches/api/0050-Add-log-suppression-for-LibraryLoader.patch
+++ b/patches/api/0048-Add-log-suppression-for-LibraryLoader.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add log suppression for LibraryLoader
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 301e82369603f3dd6e6c1bd380da4bacacd7ef6c..0c6ca7588fb3d6b6497ddf032fe75e5c6c9719e5 100644
+index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..f1e58639213be0c43cd2ff090b625e7d0a67e8be 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -55,6 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {
diff --git a/patches/api/0051-Fire-Immunity-API.patch b/patches/api/0049-Fire-Immunity-API.patch
similarity index 100%
rename from patches/api/0051-Fire-Immunity-API.patch
rename to patches/api/0049-Fire-Immunity-API.patch
diff --git a/patches/api/0052-Added-goat-ram-event.patch b/patches/api/0050-Added-goat-ram-event.patch
similarity index 100%
rename from patches/api/0052-Added-goat-ram-event.patch
rename to patches/api/0050-Added-goat-ram-event.patch
diff --git a/patches/api/0053-Add-PreExplodeEvents.patch b/patches/api/0051-Add-PreExplodeEvents.patch
similarity index 100%
rename from patches/api/0053-Add-PreExplodeEvents.patch
rename to patches/api/0051-Add-PreExplodeEvents.patch
diff --git a/patches/api/0002-Fix-pufferfish-issues.patch b/patches/removed/api/0002-Fix-pufferfish-issues.patch
similarity index 100%
rename from patches/api/0002-Fix-pufferfish-issues.patch
rename to patches/removed/api/0002-Fix-pufferfish-issues.patch
diff --git a/patches/server/0002-Fix-pufferfish-issues.patch b/patches/removed/server/0002-Fix-pufferfish-issues.patch
similarity index 100%
rename from patches/server/0002-Fix-pufferfish-issues.patch
rename to patches/removed/server/0002-Fix-pufferfish-issues.patch
diff --git a/patches/server/.gitkeep b/patches/server/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
deleted file mode 100644
index bcb3a9d6b..000000000
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ /dev/null
@@ -1,3581 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Raneri
-Date: Wed, 3 Feb 2021 23:02:38 -0600
-Subject: [PATCH] Pufferfish Server Changes
-
-Pufferfish
-Copyright (C) 2022 Pufferfish Studios LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see .
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 4f2fa65ade89c5703451dad4f80eeef162b277d1..3ee1160c796cc86db9bc9438055b307239e9a8f7 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -7,8 +7,12 @@ plugins {
- }
-
- dependencies {
-- implementation(project(":paper-api"))
-- implementation(project(":paper-mojangapi"))
-+ implementation(project(":pufferfish-api")) // Pufferfish // Paper
-+ // Pufferfish start
-+ implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
-+ exclude("io.papermc.paper", "paper-api")
-+ }
-+ // Pufferfish end
- // Paper start
- implementation("org.jline:jline-terminal-jansi:3.21.0")
- implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -42,6 +46,13 @@ dependencies {
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
-
-+ // Pufferfish start
-+ implementation("org.yaml:snakeyaml:1.32")
-+ implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.2") {
-+ exclude(group="org.yaml", module="snakeyaml")
-+ }
-+ // Pufferfish end
-+
- testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
- testImplementation("junit:junit:4.13.2")
- testImplementation("org.hamcrest:hamcrest-library:1.3")
-@@ -50,6 +61,14 @@ dependencies {
- }
-
- val craftbukkitPackageVersion = "1_19_R3" // Paper
-+
-+// Pufferfish Start
-+tasks.withType {
-+ val compilerArgs = options.compilerArgs
-+ compilerArgs.add("--add-modules=jdk.incubator.vector")
-+}
-+// Pufferfish End
-+
- tasks.jar {
- archiveClassifier.set("dev")
-
-@@ -62,7 +81,7 @@ tasks.jar {
- attributes(
- "Main-Class" to "org.bukkit.craftbukkit.Main",
- "Implementation-Title" to "CraftBukkit",
-- "Implementation-Version" to "git-Paper-$implementationVersion",
-+ "Implementation-Version" to "git-Pufferfish-$implementationVersion", // Pufferfish
- "Implementation-Vendor" to date, // Paper
- "Specification-Title" to "Bukkit",
- "Specification-Version" to project.version,
-diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index c07eb451a576811a39021f6f97103c77488fd001..5af15c85fab72034b97ac210ff775e0a8fa0be78 100644
---- a/src/main/java/co/aikar/timings/TimingsExport.java
-+++ b/src/main/java/co/aikar/timings/TimingsExport.java
-@@ -242,7 +242,8 @@ public class TimingsExport extends Thread {
- parent.put("config", createObject(
- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
- pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
-- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
-+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish
-+ pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)) // Pufferfish
- ));
-
- new TimingsExport(listeners, parent, history).start();
-diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index 4b002e8b75d117b726b0de274a76d3596fce015b..692c962193cf9fcc6801fc93f3220bdc673d527b 100644
---- a/src/main/java/com/destroystokyo/paper/Metrics.java
-+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
-@@ -593,7 +593,7 @@ public class Metrics {
- boolean logFailedRequests = config.getBoolean("logFailedRequests", false);
- // Only start Metrics, if it's enabled in the config
- if (config.getBoolean("enabled", true)) {
-- Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger());
-+ Metrics metrics = new Metrics("Pufferfish", serverUUID, logFailedRequests, Bukkit.getLogger()); // Pufferfish
-
- metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
- String minecraftVersion = Bukkit.getVersion();
-@@ -607,11 +607,11 @@ public class Metrics {
- final String implVersion = org.bukkit.craftbukkit.Main.class.getPackage().getImplementationVersion();
- if (implVersion != null) {
- final String buildOrHash = implVersion.substring(implVersion.lastIndexOf('-') + 1);
-- paperVersion = "git-Paper-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash);
-+ paperVersion = "git-Pufferfish-%s-%s".formatted(Bukkit.getServer().getMinecraftVersion(), buildOrHash); // Pufferfish
- } else {
- paperVersion = "unknown";
- }
-- metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> paperVersion));
-+ metrics.addCustomChart(new Metrics.SimplePie("pufferfish_version", () -> paperVersion)); // Pufferfish
-
- metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
- Map> map = new HashMap<>();
-diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
-index 41b9405d6759d865e0d14dd4f95163e9690e967d..091b1ae822e1c0517e59572e7a9bda11e998c0ee 100644
---- a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
-+++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
-@@ -26,7 +26,7 @@ public abstract class AreaMap {
-
- // we use linked for better iteration.
- // map of: coordinate to set of objects in coordinate
-- protected final Long2ObjectOpenHashMap> areaMap = new Long2ObjectOpenHashMap<>(1024, 0.7f);
-+ protected Long2ObjectOpenHashMap> areaMap = new Long2ObjectOpenHashMap<>(1024, 0.7f); // Pufferfish - not actually final
- protected final PooledLinkedHashSets pooledHashSets;
-
- protected final ChangeCallback addCallback;
-@@ -160,7 +160,8 @@ public abstract class AreaMap {
- protected abstract PooledLinkedHashSets.PooledObjectLinkedOpenHashSet getEmptySetFor(final E object);
-
- // expensive op, only for debug
-- protected void validate(final E object, final int viewDistance) {
-+ protected void validate0(final E object, final int viewDistance) { // Pufferfish - rename this thing just in case it gets used I'd rather a compile time error.
-+ if (true) throw new UnsupportedOperationException(); // Pufferfish - not going to put in the effort to fix this if it doesn't ever get used.
- int entiesGot = 0;
- int expectedEntries = (2 * viewDistance + 1);
- expectedEntries *= expectedEntries;
-diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java
-index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..1ad890a244bdf6df48a8db68cb43450e08c788a6 100644
---- a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java
-+++ b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java
-@@ -5,7 +5,7 @@ import net.minecraft.server.level.ServerPlayer;
- /**
- * @author Spottedleaf
- */
--public final class PlayerAreaMap extends AreaMap {
-+public class PlayerAreaMap extends AreaMap { // Pufferfish - not actually final
-
- public PlayerAreaMap() {
- super();
-diff --git a/src/main/java/gg/airplane/structs/FluidDirectionCache.java b/src/main/java/gg/airplane/structs/FluidDirectionCache.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..aa8467b9dda1f7707e41f50ac7b3e9d7343723ec
---- /dev/null
-+++ b/src/main/java/gg/airplane/structs/FluidDirectionCache.java
-@@ -0,0 +1,136 @@
-+package gg.airplane.structs;
-+
-+import it.unimi.dsi.fastutil.HashCommon;
-+
-+/**
-+ * This is a replacement for the cache used in FluidTypeFlowing.
-+ * The requirements for the previous cache were:
-+ * - Store 200 entries
-+ * - Look for the flag in the cache
-+ * - If it exists, move to front of cache
-+ * - If it doesn't exist, remove last entry in cache and insert in front
-+ *
-+ * This class accomplishes something similar, however has a few different
-+ * requirements put into place to make this more optimize:
-+ *
-+ * - maxDistance is the most amount of entries to be checked, instead
-+ * of having to check the entire list.
-+ * - In combination with that, entries are all tracked by age and how
-+ * frequently they're used. This enables us to remove old entries,
-+ * without constantly shifting any around.
-+ *
-+ * Usage of the previous map would have to reset the head every single usage,
-+ * shifting the entire map. Here, nothing happens except an increment when
-+ * the cache is hit, and when it needs to replace an old element only a single
-+ * element is modified.
-+ */
-+public class FluidDirectionCache {
-+
-+ private static class FluidDirectionEntry {
-+ private final T data;
-+ private final boolean flag;
-+ private int uses = 0;
-+ private int age = 0;
-+
-+ private FluidDirectionEntry(T data, boolean flag) {
-+ this.data = data;
-+ this.flag = flag;
-+ }
-+
-+ public int getValue() {
-+ return this.uses - (this.age >> 1); // age isn't as important as uses
-+ }
-+
-+ public void incrementUses() {
-+ this.uses = this.uses + 1 & Integer.MAX_VALUE;
-+ }
-+
-+ public void incrementAge() {
-+ this.age = this.age + 1 & Integer.MAX_VALUE;
-+ }
-+ }
-+
-+ private final FluidDirectionEntry[] entries;
-+ private final int mask;
-+ private final int maxDistance; // the most amount of entries to check for a value
-+
-+ public FluidDirectionCache(int size) {
-+ int arraySize = HashCommon.nextPowerOfTwo(size);
-+ this.entries = new FluidDirectionEntry[arraySize];
-+ this.mask = arraySize - 1;
-+ this.maxDistance = Math.min(arraySize, 4);
-+ }
-+
-+ public Boolean getValue(T data) {
-+ FluidDirectionEntry curr;
-+ int pos;
-+
-+ if ((curr = this.entries[pos = HashCommon.mix(data.hashCode()) & this.mask]) == null) {
-+ return null;
-+ } else if (data.equals(curr.data)) {
-+ curr.incrementUses();
-+ return curr.flag;
-+ }
-+
-+ int checked = 1; // start at 1 because we already checked the first spot above
-+
-+ while ((curr = this.entries[pos = (pos + 1) & this.mask]) != null) {
-+ if (data.equals(curr.data)) {
-+ curr.incrementUses();
-+ return curr.flag;
-+ } else if (++checked >= this.maxDistance) {
-+ break;
-+ }
-+ }
-+
-+ return null;
-+ }
-+
-+ public void putValue(T data, boolean flag) {
-+ FluidDirectionEntry curr;
-+ int pos;
-+
-+ if ((curr = this.entries[pos = HashCommon.mix(data.hashCode()) & this.mask]) == null) {
-+ this.entries[pos] = new FluidDirectionEntry<>(data, flag); // add
-+ return;
-+ } else if (data.equals(curr.data)) {
-+ curr.incrementUses();
-+ return;
-+ }
-+
-+ int checked = 1; // start at 1 because we already checked the first spot above
-+
-+ while ((curr = this.entries[pos = (pos + 1) & this.mask]) != null) {
-+ if (data.equals(curr.data)) {
-+ curr.incrementUses();
-+ return;
-+ } else if (++checked >= this.maxDistance) {
-+ this.forceAdd(data, flag);
-+ return;
-+ }
-+ }
-+
-+ this.entries[pos] = new FluidDirectionEntry<>(data, flag); // add
-+ }
-+
-+ private void forceAdd(T data, boolean flag) {
-+ int expectedPos = HashCommon.mix(data.hashCode()) & this.mask;
-+
-+ int toRemovePos = expectedPos;
-+ FluidDirectionEntry entryToRemove = this.entries[toRemovePos];
-+
-+ for (int i = expectedPos + 1; i < expectedPos + this.maxDistance; i++) {
-+ int pos = i & this.mask;
-+ FluidDirectionEntry entry = this.entries[pos];
-+ if (entry.getValue() < entryToRemove.getValue()) {
-+ toRemovePos = pos;
-+ entryToRemove = entry;
-+ }
-+
-+ entry.incrementAge(); // use this as a mechanism to age the other entries
-+ }
-+
-+ // remove the least used/oldest entry
-+ this.entries[toRemovePos] = new FluidDirectionEntry(data, flag);
-+ }
-+}
-diff --git a/src/main/java/gg/airplane/structs/ItemListWithBitset.java b/src/main/java/gg/airplane/structs/ItemListWithBitset.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..1b7a4ee47f4445d7f2ac91d3a73ae113edbdddb2
---- /dev/null
-+++ b/src/main/java/gg/airplane/structs/ItemListWithBitset.java
-@@ -0,0 +1,114 @@
-+package gg.airplane.structs;
-+
-+import net.minecraft.core.NonNullList;
-+import net.minecraft.world.item.ItemStack;
-+import org.apache.commons.lang.Validate;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+import java.util.AbstractList;
-+import java.util.Arrays;
-+import java.util.List;
-+
-+public class ItemListWithBitset extends AbstractList {
-+ public static ItemListWithBitset fromList(List list) {
-+ if (list instanceof ItemListWithBitset ours) {
-+ return ours;
-+ }
-+ return new ItemListWithBitset(list);
-+ }
-+
-+ private static ItemStack[] createArray(int size) {
-+ ItemStack[] array = new ItemStack[size];
-+ Arrays.fill(array, ItemStack.EMPTY);
-+ return array;
-+ }
-+
-+ private final ItemStack[] items;
-+
-+ private long bitSet = 0;
-+ private final long allBits;
-+
-+ private static class OurNonNullList extends NonNullList {
-+ protected OurNonNullList(List delegate) {
-+ super(delegate, ItemStack.EMPTY);
-+ }
-+ }
-+
-+ public final NonNullList nonNullList = new OurNonNullList(this);
-+
-+ private ItemListWithBitset(List list) {
-+ this(list.size());
-+
-+ for (int i = 0; i < list.size(); i++) {
-+ this.set(i, list.get(i));
-+ }
-+ }
-+
-+ public ItemListWithBitset(int size) {
-+ Validate.isTrue(size < Long.BYTES * 8, "size is too large");
-+
-+ this.items = createArray(size);
-+ this.allBits = ((1L << size) - 1);
-+ }
-+
-+ public boolean isCompletelyEmpty() {
-+ return this.bitSet == 0;
-+ }
-+
-+ public boolean hasFullStacks() {
-+ return (this.bitSet & this.allBits) == allBits;
-+ }
-+
-+ @Override
-+ public ItemStack set(int index, @NotNull ItemStack itemStack) {
-+ ItemStack existing = this.items[index];
-+
-+ this.items[index] = itemStack;
-+
-+ if (itemStack == ItemStack.EMPTY) {
-+ this.bitSet &= ~(1L << index);
-+ } else {
-+ this.bitSet |= 1L << index;
-+ }
-+
-+ return existing;
-+ }
-+
-+ @NotNull
-+ @Override
-+ public ItemStack get(int var0) {
-+ return this.items[var0];
-+ }
-+
-+ @Override
-+ public int size() {
-+ return this.items.length;
-+ }
-+
-+ @Override
-+ public void clear() {
-+ Arrays.fill(this.items, ItemStack.EMPTY);
-+ }
-+
-+ // these are unsupported for block inventories which have a static size
-+ @Override
-+ public void add(int var0, ItemStack var1) {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ @Override
-+ public ItemStack remove(int var0) {
-+ throw new UnsupportedOperationException();
-+ }
-+
-+ @Override
-+ public String toString() {
-+ return "ItemListWithBitset{" +
-+ "items=" + Arrays.toString(items) +
-+ ", bitSet=" + Long.toString(bitSet, 2) +
-+ ", allBits=" + Long.toString(allBits, 2) +
-+ ", size=" + this.items.length +
-+ '}';
-+ }
-+}
-diff --git a/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java b/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..a7f297ebb569f7c1f205e967ca485be70013a714
---- /dev/null
-+++ b/src/main/java/gg/airplane/structs/Long2FloatAgingCache.java
-@@ -0,0 +1,119 @@
-+package gg.airplane.structs;
-+
-+import it.unimi.dsi.fastutil.HashCommon;
-+
-+/**
-+ * A replacement for the cache used in Biome.
-+ */
-+public class Long2FloatAgingCache {
-+
-+ private static class AgingEntry {
-+ private long data;
-+ private float value;
-+ private int uses = 0;
-+ private int age = 0;
-+
-+ private AgingEntry(long data, float value) {
-+ this.data = data;
-+ this.value = value;
-+ }
-+
-+ public void replace(long data, float flag) {
-+ this.data = data;
-+ this.value = flag;
-+ }
-+
-+ public int getValue() {
-+ return this.uses - (this.age >> 1); // age isn't as important as uses
-+ }
-+
-+ public void incrementUses() {
-+ this.uses = this.uses + 1 & Integer.MAX_VALUE;
-+ }
-+
-+ public void incrementAge() {
-+ this.age = this.age + 1 & Integer.MAX_VALUE;
-+ }
-+ }
-+
-+ private final AgingEntry[] entries;
-+ private final int mask;
-+ private final int maxDistance; // the most amount of entries to check for a value
-+
-+ public Long2FloatAgingCache(int size) {
-+ int arraySize = HashCommon.nextPowerOfTwo(size);
-+ this.entries = new AgingEntry[arraySize];
-+ this.mask = arraySize - 1;
-+ this.maxDistance = Math.min(arraySize, 4);
-+ }
-+
-+ public float getValue(long data) {
-+ AgingEntry curr;
-+ int pos;
-+
-+ if ((curr = this.entries[pos = HashCommon.mix(HashCommon.long2int(data)) & this.mask]) == null) {
-+ return Float.NaN;
-+ } else if (data == curr.data) {
-+ curr.incrementUses();
-+ return curr.value;
-+ }
-+
-+ int checked = 1; // start at 1 because we already checked the first spot above
-+
-+ while ((curr = this.entries[pos = (pos + 1) & this.mask]) != null) {
-+ if (data == curr.data) {
-+ curr.incrementUses();
-+ return curr.value;
-+ } else if (++checked >= this.maxDistance) {
-+ break;
-+ }
-+ }
-+
-+ return Float.NaN;
-+ }
-+
-+ public void putValue(long data, float value) {
-+ AgingEntry curr;
-+ int pos;
-+
-+ if ((curr = this.entries[pos = HashCommon.mix(HashCommon.long2int(data)) & this.mask]) == null) {
-+ this.entries[pos] = new AgingEntry(data, value); // add
-+ return;
-+ } else if (data == curr.data) {
-+ curr.incrementUses();
-+ return;
-+ }
-+
-+ int checked = 1; // start at 1 because we already checked the first spot above
-+
-+ while ((curr = this.entries[pos = (pos + 1) & this.mask]) != null) {
-+ if (data == curr.data) {
-+ curr.incrementUses();
-+ return;
-+ } else if (++checked >= this.maxDistance) {
-+ this.forceAdd(data, value);
-+ return;
-+ }
-+ }
-+
-+ this.entries[pos] = new AgingEntry(data, value); // add
-+ }
-+
-+ private void forceAdd(long data, float value) {
-+ int expectedPos = HashCommon.mix(HashCommon.long2int(data)) & this.mask;
-+ AgingEntry entryToRemove = this.entries[expectedPos];
-+
-+ for (int i = expectedPos + 1; i < expectedPos + this.maxDistance; i++) {
-+ int pos = i & this.mask;
-+ AgingEntry entry = this.entries[pos];
-+ if (entry.getValue() < entryToRemove.getValue()) {
-+ entryToRemove = entry;
-+ }
-+
-+ entry.incrementAge(); // use this as a mechanism to age the other entries
-+ }
-+
-+ // remove the least used/oldest entry
-+ entryToRemove.replace(data, value);
-+ }
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishCommand.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishCommand.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..020368da69b9a492155f6de6297f74732f4ab6ea
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishCommand.java
-@@ -0,0 +1,68 @@
-+package gg.pufferfish.pufferfish;
-+
-+import java.io.IOException;
-+import java.util.Collections;
-+import java.util.List;
-+import java.util.stream.Collectors;
-+import java.util.stream.Stream;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.md_5.bungee.api.ChatColor;
-+import net.minecraft.server.MinecraftServer;
-+import org.bukkit.Bukkit;
-+import org.bukkit.Location;
-+import org.bukkit.command.Command;
-+import org.bukkit.command.CommandSender;
-+
-+public class PufferfishCommand extends Command {
-+
-+ public PufferfishCommand() {
-+ super("pufferfish");
-+ this.description = "Pufferfish related commands";
-+ this.usageMessage = "/pufferfish [reload | version]";
-+ this.setPermission("bukkit.command.pufferfish");
-+ }
-+
-+ public static void init() {
-+ MinecraftServer.getServer().server.getCommandMap().register("pufferfish", "Pufferfish", new PufferfishCommand());
-+ }
-+
-+ @Override
-+ public List tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
-+ if (args.length == 1) {
-+ return Stream.of("reload", "version")
-+ .filter(arg -> arg.startsWith(args[0].toLowerCase()))
-+ .collect(Collectors.toList());
-+ }
-+ return Collections.emptyList();
-+ }
-+
-+ @Override
-+ public boolean execute(CommandSender sender, String commandLabel, String[] args) {
-+ if (!testPermission(sender)) return true;
-+ String prefix = ChatColor.of("#12fff6") + "" + ChatColor.BOLD + "Pufferfish » " + ChatColor.of("#e8f9f9");
-+
-+ if (args.length != 1) {
-+ sender.sendMessage(prefix + "Usage: " + usageMessage);
-+ args = new String[]{"version"};
-+ }
-+
-+ if (args[0].equalsIgnoreCase("reload")) {
-+ MinecraftServer console = MinecraftServer.getServer();
-+ try {
-+ PufferfishConfig.load();
-+ } catch (IOException e) {
-+ sender.sendMessage(Component.text("Failed to reload.", NamedTextColor.RED));
-+ e.printStackTrace();
-+ return true;
-+ }
-+ console.server.reloadCount++;
-+
-+ Command.broadcastCommandMessage(sender, prefix + "Pufferfish configuration has been reloaded.");
-+ } else if (args[0].equalsIgnoreCase("version")) {
-+ Command.broadcastCommandMessage(sender, prefix + "This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")");
-+ }
-+
-+ return true;
-+ }
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0dd3374468e05f7a312ba5856b9cf8a4787dfa59
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
-@@ -0,0 +1,293 @@
-+package gg.pufferfish.pufferfish;
-+
-+import gg.pufferfish.pufferfish.simd.SIMDDetection;
-+import java.io.File;
-+import java.io.IOException;
-+import java.util.Collections;
-+import net.minecraft.core.registries.BuiltInRegistries;
-+import java.util.Locale;
-+import java.util.Map;
-+import net.minecraft.server.MinecraftServer;
-+import net.minecraft.tags.TagKey;
-+import org.apache.logging.log4j.Level;
-+import org.bukkit.configuration.ConfigurationSection;
-+import net.minecraft.world.entity.EntityType;
-+import java.lang.reflect.Method;
-+import java.lang.reflect.Modifier;
-+import java.util.List;
-+import net.minecraft.server.MinecraftServer;
-+import org.apache.logging.log4j.Level;
-+import org.bukkit.configuration.ConfigurationSection;
-+import org.bukkit.configuration.MemoryConfiguration;
-+import org.jetbrains.annotations.Nullable;
-+import org.simpleyaml.configuration.comments.CommentType;
-+import org.simpleyaml.configuration.file.YamlFile;
-+import org.simpleyaml.exceptions.InvalidConfigurationException;
-+
-+public class PufferfishConfig {
-+
-+ private static final YamlFile config = new YamlFile();
-+ private static int updates = 0;
-+
-+ private static ConfigurationSection convertToBukkit(org.simpleyaml.configuration.ConfigurationSection section) {
-+ ConfigurationSection newSection = new MemoryConfiguration();
-+ for (String key : section.getKeys(false)) {
-+ if (section.isConfigurationSection(key)) {
-+ newSection.set(key, convertToBukkit(section.getConfigurationSection(key)));
-+ } else {
-+ newSection.set(key, section.get(key));
-+ }
-+ }
-+ return newSection;
-+ }
-+
-+ public static ConfigurationSection getConfigCopy() {
-+ return convertToBukkit(config);
-+ }
-+
-+ public static int getUpdates() {
-+ return updates;
-+ }
-+
-+ public static void load() throws IOException {
-+ File configFile = new File("pufferfish.yml");
-+
-+ if (configFile.exists()) {
-+ try {
-+ config.load(configFile);
-+ } catch (InvalidConfigurationException e) {
-+ throw new IOException(e);
-+ }
-+ }
-+
-+ getString("info.version", "1.0");
-+ setComment("info",
-+ "Pufferfish Configuration",
-+ "Check out Pufferfish Host for maximum performance server hosting: https://pufferfish.host",
-+ "Join our Discord for support: https://discord.gg/reZw4vQV9H",
-+ "Download new builds at https://ci.pufferfish.host/job/Pufferfish");
-+
-+ for (Method method : PufferfishConfig.class.getDeclaredMethods()) {
-+ if (Modifier.isStatic(method.getModifiers()) && Modifier.isPrivate(method.getModifiers()) && method.getParameterCount() == 0 &&
-+ method.getReturnType() == Void.TYPE && !method.getName().startsWith("lambda")) {
-+ method.setAccessible(true);
-+ try {
-+ method.invoke(null);
-+ } catch (Throwable t) {
-+ MinecraftServer.LOGGER.warn("Failed to load configuration option from " + method.getName(), t);
-+ }
-+ }
-+ }
-+
-+ updates++;
-+
-+ config.save(configFile);
-+
-+ // Attempt to detect vectorization
-+ try {
-+ SIMDDetection.isEnabled = SIMDDetection.canEnable(PufferfishLogger.LOGGER);
-+ SIMDDetection.versionLimited = SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19;
-+ } catch (NoClassDefFoundError | Exception ignored) {
-+ ignored.printStackTrace();
-+ }
-+
-+ if (SIMDDetection.isEnabled) {
-+ PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions.");
-+ } else if (SIMDDetection.versionLimited) {
-+ PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17, Java 18, and Java 19.");
-+ } else {
-+ PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!");
-+ PufferfishLogger.LOGGER.warning("To enable additional optimizations, add \"--add-modules=jdk.incubator.vector\" to your startup flags, BEFORE the \"-jar\".");
-+ PufferfishLogger.LOGGER.warning("If you have already added this flag, then SIMD operations are not supported on your JVM or CPU.");
-+ PufferfishLogger.LOGGER.warning("Debug: Java: " + System.getProperty("java.version") + ", test run: " + SIMDDetection.testRun);
-+ }
-+ }
-+
-+ private static void setComment(String key, String... comment) {
-+ if (config.contains(key)) {
-+ config.setComment(key, String.join("\n", comment), CommentType.BLOCK);
-+ }
-+ }
-+
-+ private static void ensureDefault(String key, Object defaultValue, String... comment) {
-+ if (!config.contains(key)) {
-+ config.set(key, defaultValue);
-+ config.setComment(key, String.join("\n", comment), CommentType.BLOCK);
-+ }
-+ }
-+
-+ private static boolean getBoolean(String key, boolean defaultValue, String... comment) {
-+ return getBoolean(key, null, defaultValue, comment);
-+ }
-+
-+ private static boolean getBoolean(String key, @Nullable String oldKey, boolean defaultValue, String... comment) {
-+ ensureDefault(key, defaultValue, comment);
-+ return config.getBoolean(key, defaultValue);
-+ }
-+
-+ private static int getInt(String key, int defaultValue, String... comment) {
-+ return getInt(key, null, defaultValue, comment);
-+ }
-+
-+ private static int getInt(String key, @Nullable String oldKey, int defaultValue, String... comment) {
-+ ensureDefault(key, defaultValue, comment);
-+ return config.getInt(key, defaultValue);
-+ }
-+
-+ private static double getDouble(String key, double defaultValue, String... comment) {
-+ return getDouble(key, null, defaultValue, comment);
-+ }
-+
-+ private static double getDouble(String key, @Nullable String oldKey, double defaultValue, String... comment) {
-+ ensureDefault(key, defaultValue, comment);
-+ return config.getDouble(key, defaultValue);
-+ }
-+
-+ private static String getString(String key, String defaultValue, String... comment) {
-+ return getOldString(key, null, defaultValue, comment);
-+ }
-+
-+ private static String getOldString(String key, @Nullable String oldKey, String defaultValue, String... comment) {
-+ ensureDefault(key, defaultValue, comment);
-+ return config.getString(key, defaultValue);
-+ }
-+
-+ private static List getStringList(String key, List defaultValue, String... comment) {
-+ return getStringList(key, null, defaultValue, comment);
-+ }
-+
-+ private static List getStringList(String key, @Nullable String oldKey, List defaultValue, String... comment) {
-+ ensureDefault(key, defaultValue, comment);
-+ return config.getStringList(key);
-+ }
-+
-+ public static String sentryDsn;
-+ private static void sentry() {
-+ String sentryEnvironment = System.getenv("SENTRY_DSN");
-+ String sentryConfig = getString("sentry-dsn", "", "Sentry DSN for improved error logging, leave blank to disable", "Obtain from https://sentry.io/");
-+
-+ sentryDsn = sentryEnvironment == null ? sentryConfig : sentryEnvironment;
-+ if (sentryDsn != null && !sentryDsn.isBlank()) {
-+ gg.pufferfish.pufferfish.sentry.SentryManager.init();
-+ }
-+ }
-+
-+ public static boolean enableBooks;
-+ private static void books() {
-+ enableBooks = getBoolean("enable-books", true,
-+ "Whether or not books should be writeable.",
-+ "Servers that anticipate being a target for duping may want to consider",
-+ "disabling this option.",
-+ "This can be overridden per-player with the permission pufferfish.usebooks");
-+ }
-+
-+ public static boolean enableSuffocationOptimization;
-+ private static void suffocationOptimization() {
-+ enableSuffocationOptimization = getBoolean("enable-suffocation-optimization", true,
-+ "Optimizes the suffocation check by selectively skipping",
-+ "the check in a way that still appears vanilla. This should",
-+ "be left enabled on most servers, but is provided as a",
-+ "configuration option if the vanilla deviation is undesirable.");
-+ }
-+
-+ public static boolean enableAsyncMobSpawning;
-+ public static boolean asyncMobSpawningInitialized;
-+ private static void asyncMobSpawning() {
-+ boolean temp = getBoolean("enable-async-mob-spawning", true,
-+ "Whether or not asynchronous mob spawning should be enabled.",
-+ "On servers with many entities, this can improve performance by up to 15%. You must have",
-+ "paper's per-player-mob-spawns setting set to true for this to work.",
-+ "One quick note - this does not actually spawn mobs async (that would be very unsafe).",
-+ "This just offloads some expensive calculations that are required for mob spawning.");
-+
-+ // This prevents us from changing the value during a reload.
-+ if (!asyncMobSpawningInitialized) {
-+ asyncMobSpawningInitialized = true;
-+ enableAsyncMobSpawning = temp;
-+ }
-+ }
-+
-+ public static int maxProjectileLoadsPerTick;
-+ public static int maxProjectileLoadsPerProjectile;
-+ private static void projectileLoading() {
-+ maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick.");
-+ maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 10, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed.");
-+
-+ setComment("projectile", "Optimizes projectile settings");
-+ }
-+
-+
-+ public static boolean dearEnabled;
-+ public static int startDistance;
-+ public static int startDistanceSquared;
-+ public static int maximumActivationPrio;
-+ public static int activationDistanceMod;
-+
-+ private static void dynamicActivationOfBrains() throws IOException {
-+ dearEnabled = getBoolean("dab.enabled", "activation-range.enabled", true);
-+ startDistance = getInt("dab.start-distance", "activation-range.start-distance", 12,
-+ "This value determines how far away an entity has to be",
-+ "from the player to start being effected by DEAR.");
-+ startDistanceSquared = startDistance * startDistance;
-+ maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 20,
-+ "This value defines how often in ticks, the furthest entity",
-+ "will get their pathfinders and behaviors ticked. 20 = 1s");
-+ activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", 8,
-+ "This value defines how much distance modifies an entity's",
-+ "tick frequency. freq = (distanceToPlayer^2) / (2^value)",
-+ "If you want further away entities to tick less often, use 7.",
-+ "If you want further away entities to tick more often, try 9.");
-+
-+ for (EntityType entityType : BuiltInRegistries.ENTITY_TYPE) {
-+ entityType.dabEnabled = true; // reset all, before setting the ones to true
-+ }
-+ getStringList("dab.blacklisted-entities", "activation-range.blacklisted-entities", Collections.emptyList(), "A list of entities to ignore for activation")
-+ .forEach(name -> EntityType.byString(name).ifPresentOrElse(entityType -> {
-+ entityType.dabEnabled = false;
-+ }, () -> MinecraftServer.LOGGER.warn("Unknown entity \"" + name + "\"")));
-+
-+ setComment("dab", "Optimizes entity brains when", "they're far away from the player");
-+ }
-+
-+ public static Map projectileTimeouts;
-+ private static void projectileTimeouts() {
-+ // Set some defaults
-+ getInt("entity_timeouts.SNOWBALL", -1);
-+ getInt("entity_timeouts.LLAMA_SPIT", -1);
-+ setComment("entity_timeouts",
-+ "These values define a entity's maximum lifespan. If an",
-+ "entity is in this list and it has survived for longer than",
-+ "that number of ticks, then it will be removed. Setting a value to",
-+ "-1 disables this feature.");
-+
-+ for (EntityType entityType : BuiltInRegistries.ENTITY_TYPE) {
-+ String type = EntityType.getKey(entityType).getPath().toUpperCase(Locale.ROOT);
-+ entityType.ttl = config.getInt("entity_timeouts." + type, -1);
-+ }
-+ }
-+
-+ public static boolean throttleInactiveGoalSelectorTick;
-+ private static void inactiveGoalSelectorThrottle() {
-+ throttleInactiveGoalSelectorTick = getBoolean("inactive-goal-selector-throttle", "inactive-goal-selector-disable", true,
-+ "Throttles the AI goal selector in entity inactive ticks.",
-+ "This can improve performance by a few percent, but has minor gameplay implications.");
-+ }
-+
-+ public static boolean allowEndCrystalRespawn;
-+ private static void allowEndCrystalRespawn() {
-+ allowEndCrystalRespawn = getBoolean("allow-end-crystal-respawn", true,
-+ "Allows end crystals to respawn the ender dragon.",
-+ "On servers that expect end crystal fights in the end dimension, disabling this",
-+ "will prevent the server from performing an expensive search to attempt respawning",
-+ "the ender dragon whenever a player places an end crystal.");
-+ }
-+
-+ public static boolean disableMethodProfiler;
-+ public static boolean disableOutOfOrderChat;
-+ private static void miscSettings() {
-+ disableMethodProfiler = getBoolean("misc.disable-method-profiler", true);
-+ disableOutOfOrderChat = getBoolean("misc.disable-out-of-order-chat", false);
-+ setComment("misc", "Settings for things that don't belong elsewhere");
-+ }
-+
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishLogger.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishLogger.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..53f2df00c6809618a9ee3d2ea72e85e8052fbcf1
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishLogger.java
-@@ -0,0 +1,16 @@
-+package gg.pufferfish.pufferfish;
-+
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import org.bukkit.Bukkit;
-+
-+public class PufferfishLogger extends Logger {
-+ public static final PufferfishLogger LOGGER = new PufferfishLogger();
-+
-+ private PufferfishLogger() {
-+ super("Pufferfish", null);
-+
-+ setParent(Bukkit.getLogger());
-+ setLevel(Level.ALL);
-+ }
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..e877921370f6009a4bd204d9b17d2d58834b8822
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishVersionFetcher.java
-@@ -0,0 +1,136 @@
-+package gg.pufferfish.pufferfish;
-+
-+import static net.kyori.adventure.text.Component.text;
-+import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
-+import static net.kyori.adventure.text.format.NamedTextColor.RED;
-+
-+import com.destroystokyo.paper.VersionHistoryManager;
-+import com.destroystokyo.paper.util.VersionFetcher;
-+import com.google.gson.Gson;
-+import com.google.gson.JsonObject;
-+import java.io.IOException;
-+import java.net.URI;
-+import java.net.http.HttpClient;
-+import java.net.http.HttpRequest;
-+import java.net.http.HttpResponse;
-+import java.nio.charset.StandardCharsets;
-+import java.util.concurrent.TimeUnit;
-+import java.util.logging.Level;
-+import java.util.logging.Logger;
-+import net.kyori.adventure.text.Component;
-+import net.kyori.adventure.text.JoinConfiguration;
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextDecoration;
-+import org.bukkit.craftbukkit.CraftServer;
-+import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
-+public class PufferfishVersionFetcher implements VersionFetcher {
-+
-+ private static final Logger LOGGER = Logger.getLogger("PufferfishVersionFetcher");
-+ private static final HttpClient client = HttpClient.newHttpClient();
-+
-+ private static final URI JENKINS_URI = URI.create("https://ci.pufferfish.host/job/Pufferfish-1.19/lastSuccessfulBuild/buildNumber");
-+ private static final String GITHUB_FORMAT = "https://api.github.com/repos/pufferfish-gg/Pufferfish/compare/ver/1.19...%s";
-+
-+ private static final HttpResponse.BodyHandler JSON_OBJECT_BODY_HANDLER = responseInfo -> HttpResponse.BodySubscribers
-+ .mapping(
-+ HttpResponse.BodySubscribers.ofString(StandardCharsets.UTF_8),
-+ string -> new Gson().fromJson(string, JsonObject.class)
-+ );
-+
-+ @Override
-+ public long getCacheTime() {
-+ return TimeUnit.MINUTES.toMillis(30);
-+ }
-+
-+ @Override
-+ public @NotNull Component getVersionMessage(final @NotNull String serverVersion) {
-+ final String[] parts = CraftServer.class.getPackage().getImplementationVersion().split("-");
-+ @NotNull Component component;
-+
-+ if (parts.length != 3) {
-+ component = text("Unknown server version.", RED);
-+ } else {
-+ final String versionString = parts[2];
-+
-+ try {
-+ component = this.fetchJenkinsVersion(Integer.parseInt(versionString));
-+ } catch (NumberFormatException e) {
-+ component = this.fetchGithubVersion(versionString.substring(1, versionString.length() - 1));
-+ }
-+ }
-+
-+ final @Nullable Component history = this.getHistory();
-+ return history != null ? Component
-+ .join(JoinConfiguration.noSeparators(), component, Component.newline(), this.getHistory()) : component;
-+ }
-+
-+ private @NotNull Component fetchJenkinsVersion(final int versionNumber) {
-+ final HttpRequest request = HttpRequest.newBuilder(JENKINS_URI).build();
-+ try {
-+ final HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString());
-+ if (response.statusCode() != 200) {
-+ return text("Received invalid status code (" + response.statusCode() + ") from server.", RED);
-+ }
-+
-+ int latestVersionNumber;
-+ try {
-+ latestVersionNumber = Integer.parseInt(response.body());
-+ } catch (NumberFormatException e) {
-+ LOGGER.log(Level.WARNING, "Received invalid response from Jenkins \"" + response.body() + "\".");
-+ return text("Received invalid response from server.", RED);
-+ }
-+
-+ final int versionDiff = latestVersionNumber - versionNumber;
-+ return this.getResponseMessage(versionDiff);
-+ } catch (IOException | InterruptedException e) {
-+ LOGGER.log(Level.WARNING, "Failed to look up version from Jenkins", e);
-+ return text("Failed to retrieve version from server.", RED);
-+ }
-+ }
-+
-+ // Based off code contributed by Techcable in Paper/GH-65
-+ private @NotNull Component fetchGithubVersion(final @NotNull String hash) {
-+ final URI uri = URI.create(String.format(GITHUB_FORMAT, hash));
-+ final HttpRequest request = HttpRequest.newBuilder(uri).build();
-+ try {
-+ final HttpResponse response = client.send(request, JSON_OBJECT_BODY_HANDLER);
-+ if (response.statusCode() != 200) {
-+ return text("Received invalid status code (" + response.statusCode() + ") from server.", RED);
-+ }
-+
-+ final JsonObject obj = response.body();
-+ final int versionDiff = obj.get("behind_by").getAsInt();
-+
-+ return this.getResponseMessage(versionDiff);
-+ } catch (IOException | InterruptedException e) {
-+ LOGGER.log(Level.WARNING, "Failed to look up version from GitHub", e);
-+ return text("Failed to retrieve version from server.", RED);
-+ }
-+ }
-+
-+ private @NotNull Component getResponseMessage(final int versionDiff) {
-+ return switch (Math.max(-1, Math.min(1, versionDiff))) {
-+ case -1 -> text("You are running an unsupported version of Pufferfish.", RED);
-+ case 0 -> text("You are on the latest version!", GREEN);
-+ default -> text("You are running " + versionDiff + " version" + (versionDiff == 1 ? "" : "s") + " beyond. " +
-+ "Please update your server when possible to maintain stability, security, and receive the latest optimizations.",
-+ RED);
-+ };
-+ }
-+
-+ private @Nullable Component getHistory() {
-+ final VersionHistoryManager.VersionData data = VersionHistoryManager.INSTANCE.getVersionData();
-+ if (data == null) {
-+ return null;
-+ }
-+
-+ final String oldVersion = data.getOldVersion();
-+ if (oldVersion == null) {
-+ return null;
-+ }
-+
-+ return Component.text("Previous version: " + oldVersion, NamedTextColor.GRAY, TextDecoration.ITALIC);
-+ }
-+}
-\ No newline at end of file
-diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java b/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..731ef11c7a025ae95ed8a757b530d834733d0621
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/sentry/PufferfishSentryAppender.java
-@@ -0,0 +1,135 @@
-+package gg.pufferfish.pufferfish.sentry;
-+
-+import com.google.common.reflect.TypeToken;
-+import com.google.gson.Gson;
-+import io.sentry.Breadcrumb;
-+import io.sentry.Sentry;
-+import io.sentry.SentryEvent;
-+import io.sentry.SentryLevel;
-+import io.sentry.protocol.Message;
-+import io.sentry.protocol.User;
-+import java.util.Map;
-+import org.apache.logging.log4j.Level;
-+import org.apache.logging.log4j.LogManager;
-+import org.apache.logging.log4j.Marker;
-+import org.apache.logging.log4j.core.LogEvent;
-+import org.apache.logging.log4j.core.Logger;
-+import org.apache.logging.log4j.core.appender.AbstractAppender;
-+import org.apache.logging.log4j.core.filter.AbstractFilter;
-+
-+public class PufferfishSentryAppender extends AbstractAppender {
-+
-+ private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(PufferfishSentryAppender.class);
-+ private static final Gson GSON = new Gson();
-+
-+ public PufferfishSentryAppender() {
-+ super("PufferfishSentryAdapter", new SentryFilter(), null);
-+ }
-+
-+ @Override
-+ public void append(LogEvent logEvent) {
-+ if (logEvent.getThrown() != null && logEvent.getLevel().isMoreSpecificThan(Level.WARN)) {
-+ try {
-+ logException(logEvent);
-+ } catch (Exception e) {
-+ logger.warn("Failed to log event with sentry", e);
-+ }
-+ } else {
-+ try {
-+ logBreadcrumb(logEvent);
-+ } catch (Exception e) {
-+ logger.warn("Failed to log event with sentry", e);
-+ }
-+ }
-+ }
-+
-+ private void logException(LogEvent e) {
-+ SentryEvent event = new SentryEvent(e.getThrown());
-+
-+ Message sentryMessage = new Message();
-+ sentryMessage.setMessage(e.getMessage().getFormattedMessage());
-+
-+ event.setThrowable(e.getThrown());
-+ event.setLevel(getLevel(e.getLevel()));
-+ event.setLogger(e.getLoggerName());
-+ event.setTransaction(e.getLoggerName());
-+ event.setExtra("thread_name", e.getThreadName());
-+
-+ boolean hasContext = e.getContextData() != null;
-+
-+ if (hasContext && e.getContextData().containsKey("pufferfishsentry_playerid")) {
-+ User user = new User();
-+ user.setId(e.getContextData().getValue("pufferfishsentry_playerid"));
-+ user.setUsername(e.getContextData().getValue("pufferfishsentry_playername"));
-+ event.setUser(user);
-+ }
-+
-+ if (hasContext && e.getContextData().containsKey("pufferfishsentry_pluginname")) {
-+ event.setExtra("plugin.name", e.getContextData().getValue("pufferfishsentry_pluginname"));
-+ event.setExtra("plugin.version", e.getContextData().getValue("pufferfishsentry_pluginversion"));
-+ event.setTransaction(e.getContextData().getValue("pufferfishsentry_pluginname"));
-+ }
-+
-+ if (hasContext && e.getContextData().containsKey("pufferfishsentry_eventdata")) {
-+ Map eventFields = GSON.fromJson((String) e.getContextData().getValue("pufferfishsentry_eventdata"), new TypeToken>() {}.getType());
-+ if (eventFields != null) {
-+ event.setExtra("event", eventFields);
-+ }
-+ }
-+
-+ Sentry.captureEvent(event);
-+ }
-+
-+ private void logBreadcrumb(LogEvent e) {
-+ Breadcrumb breadcrumb = new Breadcrumb();
-+
-+ breadcrumb.setLevel(getLevel(e.getLevel()));
-+ breadcrumb.setCategory(e.getLoggerName());
-+ breadcrumb.setType(e.getLoggerName());
-+ breadcrumb.setMessage(e.getMessage().getFormattedMessage());
-+
-+ Sentry.addBreadcrumb(breadcrumb);
-+ }
-+
-+ private SentryLevel getLevel(Level level) {
-+ switch (level.getStandardLevel()) {
-+ case TRACE:
-+ case DEBUG:
-+ return SentryLevel.DEBUG;
-+ case WARN:
-+ return SentryLevel.WARNING;
-+ case ERROR:
-+ return SentryLevel.ERROR;
-+ case FATAL:
-+ return SentryLevel.FATAL;
-+ case INFO:
-+ default:
-+ return SentryLevel.INFO;
-+ }
-+ }
-+
-+ private static class SentryFilter extends AbstractFilter {
-+
-+ @Override
-+ public Result filter(Logger logger, org.apache.logging.log4j.Level level, Marker marker, String msg,
-+ Object... params) {
-+ return this.filter(logger.getName());
-+ }
-+
-+ @Override
-+ public Result filter(Logger logger, org.apache.logging.log4j.Level level, Marker marker, Object msg, Throwable t) {
-+ return this.filter(logger.getName());
-+ }
-+
-+ @Override
-+ public Result filter(LogEvent event) {
-+ return this.filter(event == null ? null : event.getLoggerName());
-+ }
-+
-+ private Result filter(String loggerName) {
-+ return loggerName != null && loggerName.startsWith("gg.castaway.pufferfish.sentry") ? Result.DENY
-+ : Result.NEUTRAL;
-+ }
-+
-+ }
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..1b29210ad0bbb4ada150f23357f0c80d331c996d
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryManager.java
-@@ -0,0 +1,40 @@
-+package gg.pufferfish.pufferfish.sentry;
-+
-+import gg.pufferfish.pufferfish.PufferfishConfig;
-+import io.sentry.Sentry;
-+import org.apache.logging.log4j.LogManager;
-+import org.apache.logging.log4j.Logger;
-+
-+public class SentryManager {
-+
-+ private static final Logger logger = LogManager.getLogger(SentryManager.class);
-+
-+ private SentryManager() {
-+
-+ }
-+
-+ private static boolean initialized = false;
-+
-+ public static synchronized void init() {
-+ if (initialized) {
-+ return;
-+ }
-+ try {
-+ initialized = true;
-+
-+ Sentry.init(options -> {
-+ options.setDsn(PufferfishConfig.sentryDsn);
-+ options.setMaxBreadcrumbs(100);
-+ });
-+
-+ PufferfishSentryAppender appender = new PufferfishSentryAppender();
-+ appender.start();
-+ ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger()).addAppender(appender);
-+ logger.info("Sentry logging started!");
-+ } catch (Exception e) {
-+ logger.warn("Failed to initialize sentry!", e);
-+ initialized = false;
-+ }
-+ }
-+
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java b/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8e5323d5d9af25c8a85c4b34a6be76cfc54384cf
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/util/AsyncExecutor.java
-@@ -0,0 +1,73 @@
-+package gg.pufferfish.pufferfish.util;
-+
-+import com.google.common.collect.Queues;
-+import gg.pufferfish.pufferfish.PufferfishLogger;
-+import java.util.Queue;
-+import java.util.concurrent.locks.Condition;
-+import java.util.concurrent.locks.Lock;
-+import java.util.concurrent.locks.ReentrantLock;
-+import java.util.logging.Level;
-+
-+public class AsyncExecutor implements Runnable {
-+
-+ private final Queue jobs = Queues.newArrayDeque();
-+ private final Lock mutex = new ReentrantLock();
-+ private final Condition cond = mutex.newCondition();
-+ private final Thread thread;
-+ private volatile boolean killswitch = false;
-+
-+ public AsyncExecutor(String threadName) {
-+ this.thread = new Thread(this, threadName);
-+ }
-+
-+ public void start() {
-+ thread.start();
-+ }
-+
-+ public void kill() {
-+ killswitch = true;
-+ cond.signalAll();
-+ }
-+
-+ public void submit(Runnable runnable) {
-+ mutex.lock();
-+ try {
-+ jobs.offer(runnable);
-+ cond.signalAll();
-+ } finally {
-+ mutex.unlock();
-+ }
-+ }
-+
-+ @Override
-+ public void run() {
-+ while (!killswitch) {
-+ try {
-+ Runnable runnable = takeRunnable();
-+ if (runnable != null) {
-+ runnable.run();
-+ }
-+ } catch (InterruptedException e) {
-+ Thread.currentThread().interrupt();
-+ } catch (Exception e) {
-+ PufferfishLogger.LOGGER.log(Level.SEVERE, e, () -> "Failed to execute async job for thread " + thread.getName());
-+ }
-+ }
-+ }
-+
-+ private Runnable takeRunnable() throws InterruptedException {
-+ mutex.lock();
-+ try {
-+ while (jobs.isEmpty() && !killswitch) {
-+ cond.await();
-+ }
-+
-+ if (jobs.isEmpty()) return null; // We've set killswitch
-+
-+ return jobs.remove();
-+ } finally {
-+ mutex.unlock();
-+ }
-+ }
-+
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/util/AsyncPlayerAreaMap.java b/src/main/java/gg/pufferfish/pufferfish/util/AsyncPlayerAreaMap.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..fdcb62d12164024a5f354d60cc863821a18d1b2a
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/util/AsyncPlayerAreaMap.java
-@@ -0,0 +1,31 @@
-+package gg.pufferfish.pufferfish.util;
-+
-+import com.destroystokyo.paper.util.misc.PlayerAreaMap;
-+import com.destroystokyo.paper.util.misc.PooledLinkedHashSets;
-+import java.util.concurrent.ConcurrentHashMap;
-+import net.minecraft.server.level.ServerPlayer;
-+
-+public final class AsyncPlayerAreaMap extends PlayerAreaMap {
-+
-+ public AsyncPlayerAreaMap() {
-+ super();
-+ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f));
-+ }
-+
-+ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets) {
-+ super(pooledHashSets);
-+ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f));
-+ }
-+
-+ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets, final ChangeCallback addCallback,
-+ final ChangeCallback removeCallback) {
-+ this(pooledHashSets, addCallback, removeCallback, null);
-+ }
-+
-+ public AsyncPlayerAreaMap(final PooledLinkedHashSets pooledHashSets, final ChangeCallback addCallback,
-+ final ChangeCallback removeCallback, final ChangeSourceCallback changeSourceCallback) {
-+ super(pooledHashSets, addCallback, removeCallback, changeSourceCallback);
-+ this.areaMap = new Long2ObjectOpenHashMapWrapper<>(new ConcurrentHashMap<>(1024, 0.7f));
-+ }
-+
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/util/IterableWrapper.java b/src/main/java/gg/pufferfish/pufferfish/util/IterableWrapper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..c1929840254a3e6d721816f4a20415bea1742580
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/util/IterableWrapper.java
-@@ -0,0 +1,20 @@
-+package gg.pufferfish.pufferfish.util;
-+
-+import java.util.Iterator;
-+import org.jetbrains.annotations.NotNull;
-+
-+public class IterableWrapper implements Iterable {
-+
-+ private final Iterator iterator;
-+
-+ public IterableWrapper(Iterator iterator) {
-+ this.iterator = iterator;
-+ }
-+
-+ @NotNull
-+ @Override
-+ public Iterator iterator() {
-+ return iterator;
-+ }
-+
-+}
-diff --git a/src/main/java/gg/pufferfish/pufferfish/util/Long2ObjectOpenHashMapWrapper.java b/src/main/java/gg/pufferfish/pufferfish/util/Long2ObjectOpenHashMapWrapper.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..facd55463d44cb7e3d2ca6892982f5497b8dded1
---- /dev/null
-+++ b/src/main/java/gg/pufferfish/pufferfish/util/Long2ObjectOpenHashMapWrapper.java
-@@ -0,0 +1,40 @@
-+package gg.pufferfish.pufferfish.util;
-+
-+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-+import java.util.Map;
-+import org.jetbrains.annotations.Nullable;
-+
-+public class Long2ObjectOpenHashMapWrapper extends Long2ObjectOpenHashMap {
-+
-+ private final Map backingMap;
-+
-+ public Long2ObjectOpenHashMapWrapper(Map map) {
-+ backingMap = map;
-+ }
-+
-+ @Override
-+ public V put(Long key, V value) {
-+ return backingMap.put(key, value);
-+ }
-+
-+ @Override
-+ public V get(Object key) {
-+ return backingMap.get(key);
-+ }
-+
-+ @Override
-+ public V remove(Object key) {
-+ return backingMap.remove(key);
-+ }
-+
-+ @Nullable
-+ @Override
-+ public V putIfAbsent(Long key, V value) {
-+ return backingMap.putIfAbsent(key, value);
-+ }
-+
-+ @Override
-+ public int size() {
-+ return backingMap.size();
-+ }
-+}
-diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 6efb8b10f17c70b05128039376d254e6beda3841..57e8c6673c7cfe447a75f15506e8000062d813fe 100644
---- a/src/main/java/io/papermc/paper/util/MCUtil.java
-+++ b/src/main/java/io/papermc/paper/util/MCUtil.java
-@@ -210,7 +210,7 @@ public final class MCUtil {
- }
-
- public static long getCoordinateKey(final Entity entity) {
-- return ((long)(MCUtil.fastFloor(entity.getZ()) >> 4) << 32) | ((MCUtil.fastFloor(entity.getX()) >> 4) & 0xFFFFFFFFL);
-+ return ((long)(entity.blockPosition.getZ() >> 4) << 32) | ((entity.blockPosition.getX() >> 4) & 0xFFFFFFFFL); // Pufferfish - eliminate double->long cast in hotpath
- }
-
- public static long getCoordinateKey(final ChunkPos pair) {
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9f15d9dbdfa74a0640b1a2b4ff695609d4758a4c..a29d92b3f2658b63545b25092bb3a1fea46ca36b 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -313,6 +313,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) {
- AtomicReference atomicreference = new AtomicReference();
-@@ -1682,7 +1684,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Spigot - Spigot > // CraftBukkit - cb > vanilla!
-+ return "Pufferfish"; // Pufferfish - Pufferfish > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla!
- }
-
- public SystemReport fillSystemReport(SystemReport details) {
-@@ -2267,6 +2269,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop passengers = parent.getPassengers();
-+
-+ for (int i = 0, size = passengers.size(); i < size; i++) {
-+ Entity entity = passengers.get(i);
-+ int range = entity.getType().clientTrackingRange() * 16;
-+ range = org.spigotmc.TrackingRange.getEntityTrackingRange(entity, range); // Paper
-+
-+ if (range > highest) { // Paper - we need the lowest range thanks to the fact that our tracker doesn't account for passenger logic // Tuinity - not anymore!
-+ highest = range;
-+ }
-+
-+ highest = getHighestRange(entity, highest);
-+ }
-+
-+ return highest;
-+ }
-+
- private int getEffectiveRange() {
- int i = this.range;
-+ // Pufferfish start - remove iterators and streams
-+ /*
- Iterator iterator = this.entity.getIndirectPassengers().iterator();
-
- while (iterator.hasNext()) {
-@@ -1650,6 +1670,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
- i = j;
- }
- }
-+ */
-+ i = getHighestRange(this.entity, i);
-+ // Pufferfish end
-
- return this.scaledRange(i);
- }
-diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index ca84eddbdb1e198b899750e5f6b3eafd25ce970f..c6f5d6756fa0e068a462d9c0ded12e0771abba37 100644
---- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -76,6 +76,9 @@ public class ServerChunkCache extends ChunkSource {
- final it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap loadedChunkMap = new it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap<>(8192, 0.5f);
-
- private final LevelChunk[] lastLoadedChunks = new LevelChunk[4 * 4];
-+
-+ public boolean firstRunSpawnCounts = true; // Pufferfish
-+ public final java.util.concurrent.atomic.AtomicBoolean _pufferfish_spawnCountsReady = new java.util.concurrent.atomic.AtomicBoolean(false); // Pufferfish - optimize countmobs
-
- private static int getChunkCacheKey(int x, int z) {
- return x & 3 | ((z & 3) << 2);
-@@ -703,6 +706,7 @@ public class ServerChunkCache extends ChunkSource {
- ProfilerFiller gameprofilerfiller = this.level.getProfiler();
-
- gameprofilerfiller.push("pollingChunks");
-+ this.level.resetIceAndSnowTick(); // Pufferfish - reset ice & snow tick random
- int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
- boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
-
-@@ -712,18 +716,25 @@ public class ServerChunkCache extends ChunkSource {
- // Paper start - per player mob spawning
- NaturalSpawner.SpawnState spawnercreature_d; // moved down
- if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
-- // re-set mob counts
-- for (ServerPlayer player : this.level.players) {
-- Arrays.fill(player.mobCounts, 0);
-+ // Pufferfish start - moved down when async processing
-+ if (!gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) {
-+ // re-set mob counts
-+ for (ServerPlayer player : this.level.players) {
-+ Arrays.fill(player.mobCounts, 0);
-+ }
-+ lastSpawnState = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
- }
-- spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
-+ // Pufferfish end
- } else {
-- spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, this.chunkMap.playerMobDistanceMap == null ? new LocalMobCapCalculator(this.chunkMap) : null, false);
-+ // Pufferfish start - this is only implemented for per-player mob spawning so this makes everything work if this setting is disabled.
-+ lastSpawnState = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, this.chunkMap.playerMobDistanceMap == null ? new LocalMobCapCalculator(this.chunkMap) : null, false);
-+ _pufferfish_spawnCountsReady.set(true);
-+ // Pufferfish end
- }
- // Paper end
- this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
-
-- this.lastSpawnState = spawnercreature_d;
-+ //this.lastSpawnState = spawnercreature_d; // Pufferfish - this is managed asynchronously
- gameprofilerfiller.popPush("filteringLoadedChunks");
- // Paper - moved down
- this.level.timings.chunkTicks.startTiming(); // Paper
-@@ -761,8 +772,8 @@ public class ServerChunkCache extends ChunkSource {
-
- if ((true || this.level.isNaturalSpawningAllowed(chunkcoordintpair)) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, false)) { // Paper - optimise anyPlayerCloseEnoughForSpawning // Paper - the chunk is known ticking
- chunk1.incrementInhabitedTime(j);
-- if (flag2 && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration
-- NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
-+ if (flag2 && (!gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning || _pufferfish_spawnCountsReady.get()) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration
-+ NaturalSpawner.spawnForChunk(this.level, chunk1, lastSpawnState, this.spawnFriendlies, this.spawnEnemies, flag1); // Pufferfish
- }
-
- if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - the chunk is known ticking
-@@ -824,6 +835,30 @@ public class ServerChunkCache extends ChunkSource {
- }
- // Paper end - controlled flush for entity tracker packets
- }
-+
-+ // Pufferfish start - optimize mob spawning
-+ if (gg.pufferfish.pufferfish.PufferfishConfig.enableAsyncMobSpawning) {
-+ for (ServerPlayer player : this.level.players) {
-+ Arrays.fill(player.mobCounts, 0);
-+ }
-+ if (firstRunSpawnCounts) {
-+ firstRunSpawnCounts = false;
-+ _pufferfish_spawnCountsReady.set(true);
-+ }
-+ if (chunkMap.playerMobDistanceMap != null && _pufferfish_spawnCountsReady.getAndSet(false)) {
-+ net.minecraft.server.MinecraftServer.getServer().mobSpawnExecutor.submit(() -> {
-+ int mapped = distanceManager.getNaturalSpawnChunkCount();
-+ io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet.Iterator objectiterator =
-+ level.entityTickList.entities.iterator(io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet.ITERATOR_FLAG_SEE_ADDITIONS);
-+ gg.pufferfish.pufferfish.util.IterableWrapper wrappedIterator =
-+ new gg.pufferfish.pufferfish.util.IterableWrapper<>(objectiterator);
-+ lastSpawnState = NaturalSpawner.createState(mapped, wrappedIterator, this::getFullChunk, null, true);
-+ objectiterator.finishedIterating();
-+ _pufferfish_spawnCountsReady.set(true);
-+ });
-+ }
-+ }
-+ // Pufferfish end
- }
-
- private void getFullChunk(long pos, Consumer chunkConsumer) {
-diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index b7fd8e70413c38923d0719aff803449e392383ac..d5cb594f0b17ec9dc1a19cdb99bba553e70171be 100644
---- a/src/main/java/net/minecraft/server/level/ServerEntity.java
-+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -185,6 +185,7 @@ public class ServerEntity {
- boolean flag6 = k < -32768L || k > 32767L || l < -32768L || l > 32767L || i1 < -32768L || i1 > 32767L;
-
- if (!flag6 && this.teleportDelay <= 400 && !this.wasRiding && this.wasOnGround == this.entity.isOnGround() && !(io.papermc.paper.configuration.GlobalConfiguration.get().collisions.sendFullPosForHardCollidingEntities && this.entity.hardCollides())) { // Paper - send full pos for hard colliding entities to prevent collision problems due to desync
-+ if (flag2 || flag3 || this.entity instanceof AbstractArrow) { // Pufferfish
- if ((!flag2 || !flag3) && !(this.entity instanceof AbstractArrow)) {
- if (flag2) {
- packet1 = new ClientboundMoveEntityPacket.Pos(this.entity.getId(), (short) ((int) k), (short) ((int) l), (short) ((int) i1), this.entity.isOnGround());
-@@ -198,6 +199,7 @@ public class ServerEntity {
- flag4 = true;
- flag5 = true;
- }
-+ } // Pufferfish
- } else {
- this.wasOnGround = this.entity.isOnGround();
- this.teleportDelay = 0;
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 45804711255f04110e9509df8d60900314aa10b7..3ee5c3c17d450dce54e051dc53c9df44d9b3dc1b 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -709,6 +709,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- org.spigotmc.ActivationRange.activateEntities(this); // Spigot
- timings.entityTick.startTiming(); // Spigot
- this.entityTickList.forEach((entity) -> {
-+ entity.activatedPriorityReset = false; // Pufferfish - DAB
- if (!entity.isRemoved()) {
- if (false && this.shouldDiscardEntity(entity)) { // CraftBukkit - We prevent spawning in general, so this butchering is not needed
- entity.discard();
-@@ -728,7 +729,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
- }
-
- gameprofilerfiller.push("tick");
-- this.guardEntityTick(this::tickNonPassenger, entity);
-+ // Pufferfish start - copied from this.guardEntityTick
-+ try {
-+ this.tickNonPassenger(entity); // Pufferfish - changed
-+ MinecraftServer.getServer().executeMidTickTasks(); // Tuinity - execute chunk tasks mid tick
-+ } catch (Throwable throwable) {
-+ if (throwable instanceof ThreadDeath) throw throwable; // Paper
-+ // Paper start - Prevent tile entity and entity crashes
-+ final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level.getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
-+ MinecraftServer.LOGGER.error(msg, throwable);
-+ getCraftServer().getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerInternalException(msg, throwable)));
-+ entity.discard();
-+ // Paper end
-+ }
-+ // Pufferfish end
- gameprofilerfiller.pop();
- }
- }
-@@ -793,9 +807,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
- }
- // Paper start - optimise random block ticking
- private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
-- private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong());
-+ // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super
- // Paper end
-
-+ private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish
-+
- public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
- ChunkPos chunkcoordintpair = chunk.getPos();
- boolean flag = this.isRaining();
-@@ -806,7 +822,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- gameprofilerfiller.push("thunder");
- final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
-
-- if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - disable thunder
-+ if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && /*this.random.nextInt(this.spigotConfig.thunderChance) == 0 &&*/ chunk.shouldDoLightning(this.random)) { // Spigot // Paper - disable thunder // Pufferfish - replace random with shouldDoLightning
- blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
- if (this.isRainingAt(blockposition)) {
- DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
-@@ -836,7 +852,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
- gameprofilerfiller.popPush("iceandsnow");
- int l;
-
-- if (!this.paperConfig().environment.disableIceAndSnow && this.random.nextInt(16) == 0) { // Paper - Disable ice and snow
-+ if (!this.paperConfig().environment.disableIceAndSnow && (this.currentIceAndSnowTick++ & 15) == 0) { // Paper - Disable ice and snow // Paper - optimise random ticking // Pufferfish - optimize further random ticking
- // Paper start - optimise chunk ticking
- this.getRandomBlockPosition(j, 0, k, 15, blockposition);
- int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index aa287d7f37f38d938d195114408cb6dbda59063d..9d2d72fe48b69be2f6ebe74309673a3a4e51eae4 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1216,6 +1216,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-
- @Override
- public void handleEditBook(ServerboundEditBookPacket packet) {
-+ if (!gg.pufferfish.pufferfish.PufferfishConfig.enableBooks && !this.player.getBukkitEntity().hasPermission("pufferfish.usebooks")) return; // Pufferfish
- // Paper start
- if (!this.cserver.isPrimaryThread()) {
- List pageList = packet.getPages();
-@@ -2363,6 +2364,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- }
-
- private boolean updateChatOrder(Instant timestamp) {
-+ if (gg.pufferfish.pufferfish.PufferfishConfig.disableOutOfOrderChat) return true;
- Instant instant1;
-
- do {
-diff --git a/src/main/java/net/minecraft/world/CompoundContainer.java b/src/main/java/net/minecraft/world/CompoundContainer.java
-index 241fec02e6869c638d3a160819b32173a081467b..6a8f9e8f5bf108674c47018def28906e2d0a729c 100644
---- a/src/main/java/net/minecraft/world/CompoundContainer.java
-+++ b/src/main/java/net/minecraft/world/CompoundContainer.java
-@@ -1,5 +1,6 @@
- package net.minecraft.world;
-
-+import net.minecraft.core.Direction; // Pufferfish
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.item.ItemStack;
-
-@@ -64,6 +65,23 @@ public class CompoundContainer implements Container {
- this.container2 = second;
- }
-
-+ // Pufferfish start
-+ @Override
-+ public boolean hasEmptySlot(Direction enumdirection) {
-+ return this.container1.hasEmptySlot(null) || this.container2.hasEmptySlot(null);
-+ }
-+
-+ @Override
-+ public boolean isCompletelyFull(Direction enumdirection) {
-+ return this.container1.isCompletelyFull(null) && this.container2.isCompletelyFull(null);
-+ }
-+
-+ @Override
-+ public boolean isCompletelyEmpty(Direction enumdirection) {
-+ return this.container1.isCompletelyEmpty(null) && this.container2.isCompletelyEmpty(null);
-+ }
-+ // Pufferfish end
-+
- @Override
- public int getContainerSize() {
- return this.container1.getContainerSize() + this.container2.getContainerSize();
-diff --git a/src/main/java/net/minecraft/world/Container.java b/src/main/java/net/minecraft/world/Container.java
-index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d418352d76c94 100644
---- a/src/main/java/net/minecraft/world/Container.java
-+++ b/src/main/java/net/minecraft/world/Container.java
-@@ -3,6 +3,8 @@ package net.minecraft.world;
- import java.util.Set;
- import java.util.function.Predicate;
- import net.minecraft.core.BlockPos;
-+
-+import net.minecraft.core.Direction; // Pufferfish
- import net.minecraft.world.entity.player.Player;
- import net.minecraft.world.item.Item;
- import net.minecraft.world.item.ItemStack;
-@@ -13,6 +15,63 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
- // CraftBukkit end
-
- public interface Container extends Clearable {
-+ // Pufferfish start - allow the inventory to override and optimize these frequent calls
-+ default boolean hasEmptySlot(@org.jetbrains.annotations.Nullable Direction enumdirection) { // there is a slot with 0 items in it
-+ if (this instanceof WorldlyContainer worldlyContainer) {
-+ for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
-+ if (this.getItem(i).isEmpty()) {
-+ return true;
-+ }
-+ }
-+ } else {
-+ int size = this.getContainerSize();
-+ for (int i = 0; i < size; i++) {
-+ if (this.getItem(i).isEmpty()) {
-+ return true;
-+ }
-+ }
-+ }
-+ return false;
-+ }
-+
-+ default boolean isCompletelyFull(@org.jetbrains.annotations.Nullable Direction enumdirection) { // every stack is maxed
-+ if (this instanceof WorldlyContainer worldlyContainer) {
-+ for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
-+ ItemStack itemStack = this.getItem(i);
-+ if (itemStack.getCount() < itemStack.getMaxStackSize()) {
-+ return false;
-+ }
-+ }
-+ } else {
-+ int size = this.getContainerSize();
-+ for (int i = 0; i < size; i++) {
-+ ItemStack itemStack = this.getItem(i);
-+ if (itemStack.getCount() < itemStack.getMaxStackSize()) {
-+ return false;
-+ }
-+ }
-+ }
-+ return true;
-+ }
-+
-+ default boolean isCompletelyEmpty(@org.jetbrains.annotations.Nullable Direction enumdirection) {
-+ if (this instanceof WorldlyContainer worldlyContainer) {
-+ for (int i : worldlyContainer.getSlotsForFace(enumdirection)) {
-+ if (!this.getItem(i).isEmpty()) {
-+ return false;
-+ }
-+ }
-+ } else {
-+ int size = this.getContainerSize();
-+ for (int i = 0; i < size; i++) {
-+ if (!this.getItem(i).isEmpty()) {
-+ return false;
-+ }
-+ }
-+ }
-+ return true;
-+ }
-+ // Pufferfish end
-
- int LARGE_MAX_STACK_SIZE = 64;
- int DEFAULT_DISTANCE_LIMIT = 8;
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 280ee1838106201f5e3ba7753caced6d030f7e55..b4ab2cfb7a5fa0d2efd1a759d754d5203aaac077 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- public double yo;
- public double zo;
- private Vec3 position;
-- private BlockPos blockPosition;
-+ public BlockPos blockPosition; // Pufferfish - private->public
- private ChunkPos chunkPosition;
- private Vec3 deltaMovement;
- private float yRot;
-@@ -417,6 +417,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- return this.originWorld;
- }
- // Paper end
-+ // Pufferfish start
-+ public boolean activatedPriorityReset = false; // DAB
-+ public int activatedPriority = gg.pufferfish.pufferfish.PufferfishConfig.maximumActivationPrio; // golf score
-+ public final BlockPos.MutableBlockPos cachedBlockPos = new BlockPos.MutableBlockPos(); // used where needed
-+ // Pufferfish end
-+
- public float getBukkitYaw() {
- return this.yRot;
- }
-@@ -491,17 +497,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- this.isLegacyTrackingEntity = isLegacyTrackingEntity;
- }
-
-+ private org.spigotmc.TrackingRange.TrackingRangeType getFurthestEntity(Entity entity, net.minecraft.server.level.ChunkMap chunkMap, org.spigotmc.TrackingRange.TrackingRangeType type, int range) {
-+ List passengers = entity.getPassengers();
-+ for (int i = 0, size = passengers.size(); i < size; i++) {
-+ Entity passenger = passengers.get(i);
-+ org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
-+ int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-+ if (passengerRange > range) {
-+ type = passengerType;
-+ range = passengerRange;
-+ }
-+
-+ type = this.getFurthestEntity(passenger, chunkMap, type, range);
-+ }
-+
-+ return type;
-+ }
-+
- public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet getPlayersInTrackRange() {
- // determine highest range of passengers
- if (this.passengers.isEmpty()) {
- return ((ServerLevel)this.level).getChunkSource().chunkMap.playerEntityTrackerTrackMaps[this.trackingRangeType.ordinal()]
- .getObjectsInRange(MCUtil.getCoordinateKey(this));
- }
-- Iterable passengers = this.getIndirectPassengers();
-+ //Iterable passengers = this.getIndirectPassengers(); // Pufferfish
- net.minecraft.server.level.ChunkMap chunkMap = ((ServerLevel)this.level).getChunkSource().chunkMap;
- org.spigotmc.TrackingRange.TrackingRangeType type = this.trackingRangeType;
- int range = chunkMap.getEntityTrackerRange(type.ordinal());
-
-+ // Pufferfish start - use getFurthestEntity to skip getIndirectPassengers
-+ /*
- for (Entity passenger : passengers) {
- org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
- int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -510,6 +535,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- range = passengerRange;
- }
- }
-+ */
-+ type = this.getFurthestEntity(this, chunkMap, type, range);
-+ // Pufferfish end
-
- return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
- }
-@@ -791,6 +819,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- // CraftBukkit end
-
- public void baseTick() {
-+ // Pufferfish start - entity TTL
-+ if (type != EntityType.PLAYER && type.ttl >= 0 && this.tickCount >= type.ttl) {
-+ remove(RemovalReason.DISCARDED);
-+ return;
-+ }
-+ // Pufferfish end - entity TTL
- this.level.getProfiler().push("entityBaseTick");
- if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
- this.feetBlockState = null;
-@@ -4164,16 +4198,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- }
-
- public boolean updateFluidHeightAndDoFluidPushing(TagKey tag, double speed) {
-- if (this.touchingUnloadedChunk()) {
-+ if (false && this.touchingUnloadedChunk()) { // Pufferfish - cost of a lookup here is the same cost as below, so skip
- return false;
- } else {
- AABB axisalignedbb = this.getBoundingBox().deflate(0.001D);
-- int i = Mth.floor(axisalignedbb.minX);
-- int j = Mth.ceil(axisalignedbb.maxX);
-- int k = Mth.floor(axisalignedbb.minY);
-- int l = Mth.ceil(axisalignedbb.maxY);
-- int i1 = Mth.floor(axisalignedbb.minZ);
-- int j1 = Mth.ceil(axisalignedbb.maxZ);
-+ // Pufferfish start - rename
-+ int minBlockX = Mth.floor(axisalignedbb.minX);
-+ int maxBlockX = Mth.ceil(axisalignedbb.maxX);
-+ int minBlockY = Mth.floor(axisalignedbb.minY);
-+ int maxBlockY = Mth.ceil(axisalignedbb.maxY);
-+ int minBlockZ = Mth.floor(axisalignedbb.minZ);
-+ int maxBlockZ = Mth.ceil(axisalignedbb.maxZ);
-+ // Pufferfish end
- double d1 = 0.0D;
- boolean flag = this.isPushedByFluid();
- boolean flag1 = false;
-@@ -4181,14 +4217,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- int k1 = 0;
- BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
-
-- for (int l1 = i; l1 < j; ++l1) {
-- for (int i2 = k; i2 < l; ++i2) {
-- for (int j2 = i1; j2 < j1; ++j2) {
-- blockposition_mutableblockposition.set(l1, i2, j2);
-- FluidState fluid = this.level.getFluidState(blockposition_mutableblockposition);
-+ // Pufferfish start - based off CollisionUtil.getCollisionsForBlocksOrWorldBorder
-+ final int minSection = io.papermc.paper.util.WorldUtil.getMinSection(this.level);
-+ final int maxSection = io.papermc.paper.util.WorldUtil.getMaxSection(this.level);
-+ final int minBlock = minSection << 4;
-+ final int maxBlock = (maxSection << 4) | 15;
-+
-+ // special cases:
-+ if (minBlockY > maxBlock || maxBlockY < minBlock) {
-+ // no point in checking
-+ return false;
-+ }
-+
-+ int minYIterate = Math.max(minBlock, minBlockY);
-+ int maxYIterate = Math.min(maxBlock, maxBlockY);
-+
-+ int minChunkX = minBlockX >> 4;
-+ int maxChunkX = maxBlockX >> 4;
-+
-+ int minChunkZ = minBlockZ >> 4;
-+ int maxChunkZ = maxBlockZ >> 4;
-+
-+ for (int currChunkZ = minChunkZ; currChunkZ <= maxChunkZ; ++currChunkZ) {
-+ int minZ = currChunkZ == minChunkZ ? minBlockZ & 15 : 0; // coordinate in chunk
-+ int maxZ = currChunkZ == maxChunkZ ? maxBlockZ & 15 : 16; // coordinate in chunk
-+
-+ for (int currChunkX = minChunkX; currChunkX <= maxChunkX; ++currChunkX) {
-+ int minX = currChunkX == minChunkX ? minBlockX & 15 : 0; // coordinate in chunk
-+ int maxX = currChunkX == maxChunkX ? maxBlockX & 15 : 16; // coordinate in chunk
-+
-+ net.minecraft.world.level.chunk.ChunkAccess chunk = this.level.getChunkIfLoadedImmediately(currChunkX, currChunkZ);
-+ if (chunk == null) {
-+ return false; // if we're touching an unloaded chunk then it's false
-+ }
-+
-+ net.minecraft.world.level.chunk.LevelChunkSection[] sections = chunk.getSections();
-+
-+ for (int currY = minYIterate; currY < maxYIterate; ++currY) {
-+ net.minecraft.world.level.chunk.LevelChunkSection section = sections[(currY >> 4) - minSection];
-+
-+ if (section == null || section.hasOnlyAir() || section.fluidStateCount == 0) { // if no fluids, nothing in this section
-+ // empty
-+ // skip to next section
-+ currY = (currY & ~(15)) + 15; // increment by 15: iterator loop increments by the extra one
-+ continue;
-+ }
-+
-+ net.minecraft.world.level.chunk.PalettedContainer blocks = section.states;
-+
-+ for (int currZ = minZ; currZ < maxZ; ++currZ) {
-+ for (int currX = minX; currX < maxX; ++currX) {
-+ FluidState fluid = blocks.get(currX & 15, currY & 15, currZ & 15).getFluidState();
-
- if (fluid.is(tag)) {
-- double d2 = (double) ((float) i2 + fluid.getHeight(this.level, blockposition_mutableblockposition));
-+ blockposition_mutableblockposition.set((currChunkX << 4) + currX, currY, (currChunkZ << 4) + currZ);
-+ double d2 = (double) ((float) currY + fluid.getHeight(this.level, blockposition_mutableblockposition));
-
- if (d2 >= axisalignedbb.minY) {
- flag1 = true;
-@@ -4210,9 +4293,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
- // CraftBukkit end
- }
- }
-+ }
-+ }
- }
- }
- }
-+ // Pufferfish end
-
- if (vec3d.length() > 0.0D) {
- if (k1 > 0) {
-diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index ceacc0d383e2ee674783d3c0a7df0a951595faca..8af0918d3a62de58a4b2af55022c812bb0e46092 100644
---- a/src/main/java/net/minecraft/world/entity/EntityType.java
-+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
-@@ -300,6 +300,8 @@ public class EntityType implements FeatureElement, EntityTypeT
- private final boolean canSpawnFarFromPlayer;
- private final int clientTrackingRange;
- private final int updateInterval;
-+ public boolean dabEnabled = false; // Pufferfish
-+ public int ttl = -1; // Pufferfish
- @Nullable
- private String descriptionId;
- @Nullable
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 95a27d28f73039693ca64601954af62028413634..f3d96caa83ef4a8083b78e3265282d4723e37d28 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -141,7 +141,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
- import org.bukkit.event.player.PlayerItemConsumeEvent;
- // CraftBukkit end
-
--import co.aikar.timings.MinecraftTimings; // Paper
-
- public abstract class LivingEntity extends Entity implements Attackable {
-
-@@ -397,7 +396,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
- boolean flag = this instanceof net.minecraft.world.entity.player.Player;
-
- if (!this.level.isClientSide) {
-- if (this.isInWall()) {
-+ if ((!gg.pufferfish.pufferfish.PufferfishConfig.enableSuffocationOptimization || (tickCount % 10 == 0 && couldPossiblyBeHurt(1.0F))) && this.isInWall()) { // Pufferfish - optimize suffocation
- this.hurt(this.damageSources().inWall(), 1.0F);
- } else if (flag && !this.level.getWorldBorder().isWithinBounds(this.getBoundingBox())) {
- double d0 = this.level.getWorldBorder().getDistanceToBorder(this) + this.level.getWorldBorder().getDamageSafeZone();
-@@ -1321,6 +1320,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
- return this.getHealth() <= 0.0F;
- }
-
-+ // Pufferfish start - optimize suffocation
-+ public boolean couldPossiblyBeHurt(float amount) {
-+ if ((float) this.invulnerableTime > (float) this.invulnerableDuration / 2.0F && amount <= this.lastHurt) {
-+ return false;
-+ }
-+ return true;
-+ }
-+ // Pufferfish end
-+
- @Override
- public boolean hurt(DamageSource source, float amount) {
- if (this.isInvulnerableTo(source)) {
-@@ -1929,6 +1937,20 @@ public abstract class LivingEntity extends Entity implements Attackable {
- return this.lastClimbablePos;
- }
-
-+
-+ // Pufferfish start
-+ private boolean cachedOnClimable = false;
-+ private BlockPos lastClimbingPosition = null;
-+
-+ public boolean onClimableCached() {
-+ if (!this.blockPosition().equals(this.lastClimbingPosition)) {
-+ this.cachedOnClimable = this.onClimbable();
-+ this.lastClimbingPosition = this.blockPosition();
-+ }
-+ return this.cachedOnClimable;
-+ }
-+ // Pufferfish end
-+
- public boolean onClimbable() {
- if (this.isSpectator()) {
- return false;
-@@ -3609,7 +3631,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
- Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
-
- // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
-- return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS; // Paper - use distanceToSqr
-+ // Pufferfish start
-+ //return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level.clip(new ClipContext(vec3d, vec3d1, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this)).getType() == HitResult.Type.MISS; // Paper - use distanceToSqr
-+ return vec3d1.distanceToSqr(vec3d) > 128D * 128D ? false : this.level.rayTraceDirect(vec3d, vec3d1, net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+ // Pufferfish end
- }
- }
-
-diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 02cb6b8c1d59855ff4a8aad3024fe12007eca0ee..636e601b004a412d02e5be86e97d489b52c28e1b 100644
---- a/src/main/java/net/minecraft/world/entity/Mob.java
-+++ b/src/main/java/net/minecraft/world/entity/Mob.java
-@@ -215,14 +215,16 @@ public abstract class Mob extends LivingEntity implements Targeting {
- return this.lookControl;
- }
-
-+ int _pufferfish_inactiveTickDisableCounter = 0; // Pufferfish - throttle inactive goal selector ticking
- // Paper start
- @Override
- public void inactiveTick() {
- super.inactiveTick();
-- if (this.goalSelector.inactiveTick()) {
-+ boolean isThrottled = gg.pufferfish.pufferfish.PufferfishConfig.throttleInactiveGoalSelectorTick && _pufferfish_inactiveTickDisableCounter++ % 20 != 0; // Pufferfish - throttle inactive goal selector ticking
-+ if (this.goalSelector.inactiveTick(this.activatedPriority, true) && !isThrottled) { // Pufferfish - pass activated priroity // Pufferfish - throttle inactive goal selector ticking
- this.goalSelector.tick();
- }
-- if (this.targetSelector.inactiveTick()) {
-+ if (this.targetSelector.inactiveTick(this.activatedPriority, true)) { // Pufferfish - pass activated priority
- this.targetSelector.tick();
- }
- }
-@@ -907,16 +909,20 @@ public abstract class Mob extends LivingEntity implements Targeting {
-
- if (i % 2 != 0 && this.tickCount > 1) {
- this.level.getProfiler().push("targetSelector");
-+ if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
- this.targetSelector.tickRunningGoals(false);
- this.level.getProfiler().pop();
- this.level.getProfiler().push("goalSelector");
-+ if (this.goalSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
- this.goalSelector.tickRunningGoals(false);
- this.level.getProfiler().pop();
- } else {
- this.level.getProfiler().push("targetSelector");
-+ if (this.targetSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
- this.targetSelector.tick();
- this.level.getProfiler().pop();
- this.level.getProfiler().push("goalSelector");
-+ if (this.goalSelector.inactiveTick(this.activatedPriority, false)) // Pufferfish - use this to alternate ticking
- this.goalSelector.tick();
- this.level.getProfiler().pop();
- }
-diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index dd1102d5291ef6f18e82400a6d8a0a376cc071e9..e283eb57c25f7de222f9d09dca851169f5f6e488 100644
---- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-@@ -23,9 +23,11 @@ public class AttributeMap {
- private final Map attributes = Maps.newHashMap();
- private final Set dirtyAttributes = Sets.newHashSet();
- private final AttributeSupplier supplier;
-+ private final java.util.function.Function createInstance; // Pufferfish
-
- public AttributeMap(AttributeSupplier defaultAttributes) {
- this.supplier = defaultAttributes;
-+ this.createInstance = attribute -> this.supplier.createInstance(this::onAttributeModified, attribute); // Pufferfish
- }
-
- private void onAttributeModified(AttributeInstance instance) {
-@@ -45,11 +47,10 @@ public class AttributeMap {
- }).collect(Collectors.toList());
- }
-
-+
- @Nullable
- public AttributeInstance getInstance(Attribute attribute) {
-- return this.attributes.computeIfAbsent(attribute, (attributex) -> {
-- return this.supplier.createInstance(this::onAttributeModified, attributex);
-- });
-+ return this.attributes.computeIfAbsent(attribute, this.createInstance); // Pufferfish - cache lambda, as for some reason java allocates it anyways
- }
-
- @Nullable
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..fe502445a77afe7e3807afae48d7bf03f370e290 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java
-@@ -47,6 +47,7 @@ public class AcquirePoi {
- return false;
- } else {
- mutableLong.setValue(time + 20L + (long)world.getRandom().nextInt(20));
-+ if (entity.getNavigation().isStuck()) mutableLong.add(200); // Pufferfish - wait an additional 10s to check again if they're stuck
- PoiManager poiManager = world.getPoiManager();
- long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> {
- return !entry.getValue().isStillValid(time);
-diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
-index 646d9a121d908a2fc3e4e302484dd5cd1bfc6804..e546ecdccde352502e26a8668eaaafe048d6e282 100644
---- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerPanicTrigger.java
-@@ -37,7 +37,11 @@ public class VillagerPanicTrigger extends Behavior {
-
- @Override
- protected void tick(ServerLevel world, Villager entity, long time) {
-- if (time % 100L == 0L) {
-+ // Pufferfish start
-+ if (entity.nextGolemPanic < 0) entity.nextGolemPanic = time + 100;
-+ if (--entity.nextGolemPanic < time) {
-+ entity.nextGolemPanic = -1;
-+ // Pufferfish end
- entity.spawnGolemIfNeeded(world, time, 3);
- }
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index b738ee2d3801fadfd09313f05ae24593e56b0ec6..1635818fc4b1788c0d397085239df6dd75b210ab 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-@@ -53,9 +53,12 @@ public class GoalSelector {
- }
-
- // Paper start
-- public boolean inactiveTick() {
-+ public boolean inactiveTick(int tickRate, boolean inactive) { // Pufferfish start
-+ if (inactive && !gg.pufferfish.pufferfish.PufferfishConfig.dearEnabled) tickRate = 4; // reset to Paper's
-+ tickRate = Math.min(tickRate, this.newGoalRate);
- this.curRate++;
-- return this.curRate % this.newGoalRate == 0;
-+ return this.curRate % tickRate == 0;
-+ // Pufferfish end
- }
- public boolean hasTasks() {
- for (WrappedGoal task : this.availableGoals) {
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
-index 26bf383caea68834c654b25653ced9017f1b1b22..615eb55e24d365d994fbfe9d45d2be387fd5d561 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
-@@ -119,6 +119,7 @@ public abstract class MoveToBlockGoal extends Goal {
- for(int m = 0; m <= l; m = m > 0 ? -m : 1 - m) {
- for(int n = m < l && m > -l ? l : 0; n <= l; n = n > 0 ? -n : 1 - n) {
- mutableBlockPos.setWithOffset(blockPos, m, k - 1, n);
-+ if (!this.mob.level.hasChunkAt(mutableBlockPos)) continue; // Pufferfish - if this block isn't loaded, continue
- if (this.mob.isWithinRestriction(mutableBlockPos) && this.isValidTarget(this.mob.level, mutableBlockPos)) {
- this.blockPos = mutableBlockPos;
- setTargetPosition(mutableBlockPos.immutable()); // Paper
-diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-index a7575b5ef56af6f53448d391abb4956e130148ca..e752c83df50fb9b670ecea2abc95426c2a009b6f 100644
---- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java
-@@ -75,9 +75,18 @@ public class TargetingConditions {
- }
-
- if (this.range > 0.0D) {
-- double d = this.testInvisible ? targetEntity.getVisibilityPercent(baseEntity) : 1.0D;
-- double e = Math.max((this.useFollowRange ? this.getFollowRange(baseEntity) : this.range) * d, 2.0D); // Paper
-+ // Pufferfish start - check range before getting visibility
-+ // d = invisibility percent, e = follow range adjusted for invisibility, f = distance
- double f = baseEntity.distanceToSqr(targetEntity.getX(), targetEntity.getY(), targetEntity.getZ());
-+ double followRangeRaw = this.useFollowRange ? this.getFollowRange(baseEntity) : this.range;
-+
-+ if (f > followRangeRaw * followRangeRaw) { // the actual follow range will always be this value or smaller, so if the distance is larger then it never will return true after getting invis
-+ return false;
-+ }
-+
-+ double d = this.testInvisible ? targetEntity.getVisibilityPercent(baseEntity) : 1.0D;
-+ double e = Math.max((followRangeRaw) * d, 2.0D); // Paper
-+ // Pufferfish end
- if (f > e * e) {
- return false;
- }
-diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index f5efdf59617d43de18a2267351fa784c0be3ae83..59338d739b6130f667d151bc27646c4a346886a2 100644
---- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-+++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-@@ -251,13 +251,22 @@ public class Bat extends AmbientCreature {
- }
- }
-
-+ // Pufferfish start - only check for spooky season once an hour
-+ private static boolean isSpookySeason = false;
-+ private static final int ONE_HOUR = 20 * 60 * 60;
-+ private static int lastSpookyCheck = -ONE_HOUR;
- private static boolean isHalloween() {
-+ if (net.minecraft.server.MinecraftServer.currentTick - lastSpookyCheck > ONE_HOUR) {
- LocalDate localdate = LocalDate.now();
- int i = localdate.get(ChronoField.DAY_OF_MONTH);
- int j = localdate.get(ChronoField.MONTH_OF_YEAR);
-
-- return j == 10 && i >= 20 || j == 11 && i <= 3;
-+ isSpookySeason = j == 10 && i >= 20 || j == 11 && i <= 3;
-+ lastSpookyCheck = net.minecraft.server.MinecraftServer.currentTick;
-+ }
-+ return isSpookySeason;
- }
-+ // Pufferfish end
-
- @Override
- protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-index 9b57d2b766f2de2d3fb4a3b5ef4df8d6756a1942..a41d8101c960163803179d3717889aee6182d0bb 100644
---- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
-@@ -223,9 +223,11 @@ public class Allay extends PathfinderMob implements InventoryCarrier {
- return 0.4F;
- }
-
-+ private int behaviorTick = 0; // Pufferfish
- @Override
- protected void customServerAiStep() {
- this.level.getProfiler().push("allayBrain");
-+ if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
- this.getBrain().tick((ServerLevel) this.level, this);
- this.level.getProfiler().pop();
- this.level.getProfiler().push("allayActivityUpdate");
-diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index a4e98b02175da96472474b8d7ad5975ce4d2fc43..38d21943fb2940f53c2d0ac2c3b94a6f0e46e700 100644
---- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -285,9 +285,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder {
- return true;
- }
-
-+ private int behaviorTick = 0; // Pufferfish
- @Override
- protected void customServerAiStep() {
- this.level.getProfiler().push("frogBrain");
-+ if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
- this.getBrain().tick((ServerLevel)this.level, this);
- this.level.getProfiler().pop();
- this.level.getProfiler().push("frogActivityUpdate");
-diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-index 9058f9f2e561cda9f475f33218bf7a78297de4bc..e591b0a09f5a8475b3ec9cd28bd5d5b69809ed73 100644
---- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
-@@ -77,9 +77,11 @@ public class Tadpole extends AbstractFish {
- return SoundEvents.TADPOLE_FLOP;
- }
-
-+ private int behaviorTick = 0; // Pufferfish
- @Override
- protected void customServerAiStep() {
- this.level.getProfiler().push("tadpoleBrain");
-+ if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
- this.getBrain().tick((ServerLevel) this.level, this);
- this.level.getProfiler().pop();
- this.level.getProfiler().push("tadpoleActivityUpdate");
-diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index cfa904d42734d0fb0c1ed8b18f4d8bc131027962..4fdc3bd591b6df4c28901e4571aa23baf034d885 100644
---- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -188,9 +188,11 @@ public class Goat extends Animal {
- return (Brain) super.getBrain(); // CraftBukkit - decompile error
- }
-
-+ private int behaviorTick = 0; // Pufferfish
- @Override
- protected void customServerAiStep() {
- this.level.getProfiler().push("goatBrain");
-+ if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
- this.getBrain().tick((ServerLevel) this.level, this);
- this.level.getProfiler().pop();
- this.level.getProfiler().push("goatActivityUpdate");
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index d47b3ac633e7936d30abfda6fc46c2c7412d76fe..453f0f7042bdf204db73be139aa36f211c5455e7 100644
---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -264,10 +264,16 @@ public class ItemEntity extends Entity implements TraceableEntity {
- if (entityitem.isMergable()) {
- // Paper Start - Fix items merging through walls
- if (this.level.paperConfig().fixes.fixItemsMergingThroughWalls) {
-+ // Pufferfish start - skip the allocations
-+ /*
- net.minecraft.world.level.ClipContext rayTrace = new net.minecraft.world.level.ClipContext(this.position(), entityitem.position(),
- net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, this);
- net.minecraft.world.phys.BlockHitResult rayTraceResult = level.clip(rayTrace);
- if (rayTraceResult.getType() == net.minecraft.world.phys.HitResult.Type.BLOCK) continue;
-+ */
-+ if (level.rayTraceDirect(this.position(), entityitem.position(), net.minecraft.world.phys.shapes.CollisionContext.of(this)) ==
-+ net.minecraft.world.phys.HitResult.Type.BLOCK) continue;
-+ // Pufferfish end
- }
- // Paper End
- this.tryToMerge(entityitem);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 418d6301f067803e2471e59ac2d52a68cbff249b..c2f5dabb41b172547864decc06aa632d89dff3e1 100644
---- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -322,11 +322,17 @@ public class EnderMan extends Monster implements NeutralMob {
- private boolean teleport(double x, double y, double z) {
- BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos(x, y, z);
-
-- while (blockposition_mutableblockposition.getY() > this.level.getMinBuildHeight() && !this.level.getBlockState(blockposition_mutableblockposition).getMaterial().blocksMotion()) {
-+ // Pufferfish start - single chunk lookup
-+ net.minecraft.world.level.chunk.LevelChunk chunk = this.level.getChunkIfLoaded(blockposition_mutableblockposition);
-+ if (chunk == null) {
-+ return false;
-+ }
-+ // Pufferfish end
-+ while (blockposition_mutableblockposition.getY() > this.level.getMinBuildHeight() && !chunk.getBlockState(blockposition_mutableblockposition).getMaterial().blocksMotion()) { // Pufferfish
- blockposition_mutableblockposition.move(Direction.DOWN);
- }
-
-- BlockState iblockdata = this.level.getBlockState(blockposition_mutableblockposition);
-+ BlockState iblockdata = chunk.getBlockState(blockposition_mutableblockposition); // Pufferfish
- boolean flag = iblockdata.getMaterial().blocksMotion();
- boolean flag1 = iblockdata.getFluidState().is(FluidTags.WATER);
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 5d3b3cb3a882eb5d716f678095a65b28d0967476..daa2224b021c966751eb39f269ffbfe6e7f3d426 100644
---- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -126,9 +126,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
- return (Brain) super.getBrain(); // Paper - decompile fix
- }
-
-+ private int behaviorTick; // Pufferfish
- @Override
- protected void customServerAiStep() {
- this.level.getProfiler().push("hoglinBrain");
-+ if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
- this.getBrain().tick((ServerLevel)this.level, this);
- this.level.getProfiler().pop();
- HoglinAi.updateActivity(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index afa7ecfa8453da510ec5ccecb1ceeb1d9893d259..b401fb4f276ca81b4bb18426ee56abed8a9f7a7b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-@@ -308,9 +308,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
- return !this.cannotHunt;
- }
-
-+ private int behaviorTick; // Pufferfish
- @Override
- protected void customServerAiStep() {
- this.level.getProfiler().push("piglinBrain");
-+ if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
- this.getBrain().tick((ServerLevel) this.level, this);
- this.level.getProfiler().pop();
- PiglinAi.updateActivity(this);
-diff --git a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-index b2b63d9df3c07696f47281e9be74f1799f50b93e..907d77dd74066c723238155b42028a811365b1f8 100644
---- a/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/warden/Warden.java
-@@ -270,11 +270,13 @@ public class Warden extends Monster implements VibrationListener.VibrationListen
-
- }
-
-+ private int behaviorTick = 0; // Pufferfish
- @Override
- protected void customServerAiStep() {
- ServerLevel worldserver = (ServerLevel) this.level;
-
- worldserver.getProfiler().push("wardenBrain");
-+ if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
- this.getBrain().tick(worldserver, this);
- this.level.getProfiler().pop();
- super.customServerAiStep();
-diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 6023b9eb3001e1a98ab8b970d853c4e7c7603f4d..5402a084ef5fe0b3cfea897a90cffade1eff5b66 100644
---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
-+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -140,6 +140,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
- return holder.is(PoiTypes.MEETING);
- });
-
-+ public long nextGolemPanic = -1; // Pufferfish
-+
- public Villager(EntityType entityType, Level world) {
- this(entityType, world, VillagerType.PLAINS);
- }
-@@ -243,11 +245,17 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
- }
- // Spigot End
-
-+ private int behaviorTick = 0; // Pufferfish
- @Override
- protected void customServerAiStep() { mobTick(false); }
- protected void mobTick(boolean inactive) {
- this.level.getProfiler().push("villagerBrain");
-- if (!inactive) this.getBrain().tick((ServerLevel) this.level, this); // Paper
-+ // Pufferfish start
-+ if (!inactive) {
-+ if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
-+ this.getBrain().tick((ServerLevel) this.level, this); // Paper
-+ }
-+ // Pufferfish end
- this.level.getProfiler().pop();
- if (this.assignProfessionWhenSpawned) {
- this.assignProfessionWhenSpawned = false;
-diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
-index 27c028ab6b1edb6e413af3bbaa27bf30f2d85540..302ca7391109c10e81a7745504b3c530bc3be6ad 100644
---- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
-@@ -682,6 +682,8 @@ public class Inventory implements Container, Nameable {
- }
-
- public boolean contains(ItemStack stack) {
-+ // Pufferfish start - don't allocate iterators
-+ /*
- Iterator iterator = this.compartments.iterator();
-
- while (iterator.hasNext()) {
-@@ -696,6 +698,18 @@ public class Inventory implements Container, Nameable {
- }
- }
- }
-+ */
-+ for (int i = 0; i < this.compartments.size(); i++) {
-+ List list = this.compartments.get(i);
-+ for (int j = 0; j < list.size(); j++) {
-+ ItemStack itemstack1 = list.get(j);
-+
-+ if (!itemstack1.isEmpty() && itemstack1.sameItem(stack)) {
-+ return true;
-+ }
-+ }
-+ }
-+ // Pufferfish end
-
- return false;
- }
-diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index a211ca048dddc75afce1f83ee1700bad66e457fc..85260fd93ca8d5ffd0ba7a98f1d47093d58f0f87 100644
---- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-+++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-@@ -44,6 +44,36 @@ public abstract class Projectile extends Entity implements TraceableEntity {
- super(type, world);
- }
-
-+ // Pufferfish start
-+ private static int loadedThisTick = 0;
-+ private static int loadedTick;
-+
-+ private int loadedLifetime = 0;
-+ @Override
-+ public void setPos(double x, double y, double z) {
-+ int currentTick = net.minecraft.server.MinecraftServer.currentTick;
-+ if (loadedTick != currentTick) {
-+ loadedTick = currentTick;
-+ loadedThisTick = 0;
-+ }
-+ int previousX = Mth.floor(this.getX()) >> 4, previousZ = Mth.floor(this.getZ()) >> 4;
-+ int newX = Mth.floor(x) >> 4, newZ = Mth.floor(z) >> 4;
-+ if (previousX != newX || previousZ != newZ) {
-+ boolean isLoaded = ((net.minecraft.server.level.ServerChunkCache) this.level.getChunkSource()).getChunkAtIfLoadedMainThread(newX, newZ) != null;
-+ if (!isLoaded) {
-+ if (Projectile.loadedThisTick > gg.pufferfish.pufferfish.PufferfishConfig.maxProjectileLoadsPerTick) {
-+ if (++this.loadedLifetime > gg.pufferfish.pufferfish.PufferfishConfig.maxProjectileLoadsPerProjectile) {
-+ this.discard();
-+ }
-+ return;
-+ }
-+ Projectile.loadedThisTick++;
-+ }
-+ }
-+ super.setPos(x, y, z);
-+ }
-+ // Pufferfish start
-+
- public void setOwner(@Nullable Entity entity) {
- if (entity != null) {
- this.ownerUUID = entity.getUUID();
-diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-index 08f027cdcaeeca7b545483cb8c5eb8d13e4933b9..992ff554643b149d9c6101562a9754a84263ed7e 100644
---- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
-@@ -27,7 +27,10 @@ import org.bukkit.inventory.InventoryHolder;
-
- public abstract class AbstractMinecartContainer extends AbstractMinecart implements ContainerEntity {
-
-+ // Pufferfish start
- private NonNullList itemStacks;
-+ private gg.airplane.structs.ItemListWithBitset itemStacksOptimized;
-+ // Pufferfish end
- @Nullable
- public ResourceLocation lootTable;
- public long lootTableSeed;
-@@ -89,12 +92,18 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
-
- protected AbstractMinecartContainer(EntityType type, Level world) {
- super(type, world);
-- this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
-+ // Pufferfish start
-+ this.itemStacksOptimized = new gg.airplane.structs.ItemListWithBitset(this.getContainerSize()); // CraftBukkit - SPIGOT-3513
-+ this.itemStacks = this.itemStacksOptimized.nonNullList;
-+ // Pufferfish end
- }
-
- protected AbstractMinecartContainer(EntityType type, double x, double y, double z, Level world) {
- super(type, world, x, y, z);
-- this.itemStacks = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); // CraftBukkit - SPIGOT-3513
-+ // Pufferfish start
-+ this.itemStacksOptimized = new gg.airplane.structs.ItemListWithBitset(this.getContainerSize()); // CraftBukkit - SPIGOT-3513
-+ this.itemStacks = this.itemStacksOptimized.nonNullList;
-+ // Pufferfish end
- }
-
- @Override
-@@ -156,6 +165,10 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
- protected void readAdditionalSaveData(CompoundTag nbt) {
- super.readAdditionalSaveData(nbt);
- this.lootableData.loadNbt(nbt); // Paper
-+ // Pufferfish start
-+ this.itemStacksOptimized = new gg.airplane.structs.ItemListWithBitset(this.getContainerSize());
-+ this.itemStacks = this.itemStacksOptimized.nonNullList;
-+ // Pufferfish end
- this.readChestVehicleSaveData(nbt);
- }
-
-diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
-index 171ce56ec3b8761f75144b1fca2f100fcbba6800..4202d8df909a6315cce0def93ad5241a519de43e 100644
---- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java
-+++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
-@@ -55,7 +55,7 @@ public class EndCrystalItem extends Item {
- world.gameEvent((Entity) context.getPlayer(), GameEvent.ENTITY_PLACE, blockposition1);
- EndDragonFight enderdragonbattle = ((ServerLevel) world).dragonFight();
-
-- if (enderdragonbattle != null) {
-+ if (enderdragonbattle != null && gg.pufferfish.pufferfish.PufferfishConfig.allowEndCrystalRespawn) { // Pufferfish
- enderdragonbattle.tryRespawn();
- }
- }
-diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
-index f4f3f3a19d3cadaef1ae1a47daa68251a983dcf2..8da06f8bea0239c5206d5d4f4ff48bdeb0a89f9d 100644
---- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
-+++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
-@@ -27,8 +27,13 @@ public class ShapelessRecipe implements CraftingRecipe {
- final CraftingBookCategory category;
- final ItemStack result;
- final NonNullList ingredients;
-+ private final boolean isBukkit; // Pufferfish
-
-+ // Pufferfish start
- public ShapelessRecipe(ResourceLocation id, String group, CraftingBookCategory category, ItemStack output, NonNullList input) {
-+ this(id, group, category, output, input, false);
-+ }
-+ public ShapelessRecipe(ResourceLocation id, String group, CraftingBookCategory category, ItemStack output, NonNullList input, boolean isBukkit) { this.isBukkit = isBukkit; // Pufferfish end
- this.id = id;
- this.group = group;
- this.category = category;
-@@ -82,6 +87,28 @@ public class ShapelessRecipe implements CraftingRecipe {
- }
-
- public boolean matches(CraftingContainer inventory, Level world) {
-+ // Pufferfish start
-+ if (!this.isBukkit) {
-+ java.util.List ingredients = com.google.common.collect.Lists.newArrayList(this.ingredients.toArray(new Ingredient[0]));
-+
-+ inventory: for (int index = 0; index < inventory.getContainerSize(); index++) {
-+ ItemStack itemStack = inventory.getItem(index);
-+
-+ if (!itemStack.isEmpty()) {
-+ for (int i = 0; i < ingredients.size(); i++) {
-+ if (ingredients.get(i).test(itemStack)) {
-+ ingredients.remove(i);
-+ continue inventory;
-+ }
-+ }
-+ return false;
-+ }
-+ }
-+
-+ return ingredients.isEmpty();
-+ }
-+ // Pufferfish end
-+
- StackedContents autorecipestackmanager = new StackedContents();
- int i = 0;
-
-diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java
-index 2ee9e8e3c1a28c1823de8e1fe421cc1f3e72f384..cf4a8084158b10bf047d418dda375f8c1fd3216e 100644
---- a/src/main/java/net/minecraft/world/level/BlockGetter.java
-+++ b/src/main/java/net/minecraft/world/level/BlockGetter.java
-@@ -73,6 +73,16 @@ public interface BlockGetter extends LevelHeightAccessor {
- });
- }
-
-+ // Pufferfish start - broken down variant of below rayTraceBlock, used by World#rayTraceDirect
-+ default net.minecraft.world.phys.BlockHitResult.Type rayTraceBlockDirect(Vec3 vec3d, Vec3 vec3d1, BlockPos blockposition, BlockState iblockdata, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) {
-+ if (iblockdata.isAir()) return null; // Tuinity - optimise air cases
-+ VoxelShape voxelshape = ClipContext.Block.COLLIDER.get(iblockdata, this, blockposition, voxelshapecoll);
-+ net.minecraft.world.phys.BlockHitResult movingobjectpositionblock = this.clipWithInteractionOverride(vec3d, vec3d1, blockposition, voxelshape, iblockdata);
-+
-+ return movingobjectpositionblock == null ? null : movingobjectpositionblock.getType();
-+ }
-+ // Pufferfish end
-+
- // CraftBukkit start - moved block handling into separate method for use by Block#rayTrace
- default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
- // Paper start - Prevent raytrace from loading chunks
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 973ecd50f9cb6b86c353586e84d15dcb118ccb60..6aec1983a0236d6aa0507a2b3ad1c08b3330f0fc 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -274,6 +274,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-
- public abstract ResourceKey getTypeKey();
-
-+ protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(java.util.concurrent.ThreadLocalRandom.current().nextLong()); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter
-+
-+ // Pufferfish start - ensure these get inlined
-+ private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection;
-+ @Override public final int getMaxBuildHeight() { return this.maxBuildHeight; }
-+ @Override public final int getMinSection() { return this.minSection; }
-+ @Override public final int getMaxSection() { return this.maxSection; }
-+ @Override public final int getMinBuildHeight() { return this.minBuildHeight; }
-+ @Override public final int getHeight() { return this.height; }
-+ // Pufferfish end
-+
- protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, RegistryAccess iregistrycustom, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
- this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
- this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
-@@ -296,6 +307,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- });
- final DimensionType dimensionmanager = (DimensionType) holder.value();
-
-+ // Pufferfish start
-+ this.minBuildHeight = dimensionmanager.minY();
-+ this.minSection = SectionPos.blockToSectionCoord(this.minBuildHeight);
-+ this.height = dimensionmanager.height();
-+ this.maxBuildHeight = this.minBuildHeight + this.height;
-+ this.maxSection = SectionPos.blockToSectionCoord(this.maxBuildHeight - 1) + 1;
-+ // Pufferfish end
- this.dimension = resourcekey;
- this.isClientSide = flag;
- if (dimensionmanager.coordinateScale() != 1.0D) {
-@@ -413,6 +431,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- return null;
- }
-
-+ // Pufferfish start - broken down method of raytracing for EntityLiving#hasLineOfSight, replaces IBlockAccess#rayTrace(RayTrace)
-+ public net.minecraft.world.phys.BlockHitResult.Type rayTraceDirect(net.minecraft.world.phys.Vec3 vec3d, net.minecraft.world.phys.Vec3 vec3d1, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) {
-+ // most of this code comes from IBlockAccess#a(RayTrace, BiFunction, Function), but removes the needless functions
-+ if (vec3d.equals(vec3d1)) {
-+ return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+ }
-+
-+ double endX = Mth.lerp(-1.0E-7D, vec3d1.x, vec3d.x);
-+ double endY = Mth.lerp(-1.0E-7D, vec3d1.y, vec3d.y);
-+ double endZ = Mth.lerp(-1.0E-7D, vec3d1.z, vec3d.z);
-+
-+ double startX = Mth.lerp(-1.0E-7D, vec3d.x, vec3d1.x);
-+ double startY = Mth.lerp(-1.0E-7D, vec3d.y, vec3d1.y);
-+ double startZ = Mth.lerp(-1.0E-7D, vec3d.z, vec3d1.z);
-+
-+ int currentX = Mth.floor(startX);
-+ int currentY = Mth.floor(startY);
-+ int currentZ = Mth.floor(startZ);
-+
-+ BlockPos.MutableBlockPos currentBlock = new BlockPos.MutableBlockPos(currentX, currentY, currentZ);
-+
-+ LevelChunk chunk = this.getChunkIfLoaded(currentBlock);
-+ if (chunk == null) {
-+ return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+ }
-+
-+ net.minecraft.world.phys.BlockHitResult.Type initialCheck = this.rayTraceBlockDirect(vec3d, vec3d1, currentBlock, chunk.getBlockState(currentBlock), voxelshapecoll);
-+
-+ if (initialCheck != null) {
-+ return initialCheck;
-+ }
-+
-+ double diffX = endX - startX;
-+ double diffY = endY - startY;
-+ double diffZ = endZ - startZ;
-+
-+ int xDirection = Mth.sign(diffX);
-+ int yDirection = Mth.sign(diffY);
-+ int zDirection = Mth.sign(diffZ);
-+
-+ double normalizedX = xDirection == 0 ? Double.MAX_VALUE : (double) xDirection / diffX;
-+ double normalizedY = yDirection == 0 ? Double.MAX_VALUE : (double) yDirection / diffY;
-+ double normalizedZ = zDirection == 0 ? Double.MAX_VALUE : (double) zDirection / diffZ;
-+
-+ double normalizedXDirection = normalizedX * (xDirection > 0 ? 1.0D - Mth.frac(startX) : Mth.frac(startX));
-+ double normalizedYDirection = normalizedY * (yDirection > 0 ? 1.0D - Mth.frac(startY) : Mth.frac(startY));
-+ double normalizedZDirection = normalizedZ * (zDirection > 0 ? 1.0D - Mth.frac(startZ) : Mth.frac(startZ));
-+
-+ net.minecraft.world.phys.BlockHitResult.Type result;
-+
-+ do {
-+ if (normalizedXDirection > 1.0D && normalizedYDirection > 1.0D && normalizedZDirection > 1.0D) {
-+ return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+ }
-+
-+ if (normalizedXDirection < normalizedYDirection) {
-+ if (normalizedXDirection < normalizedZDirection) {
-+ currentX += xDirection;
-+ normalizedXDirection += normalizedX;
-+ } else {
-+ currentZ += zDirection;
-+ normalizedZDirection += normalizedZ;
-+ }
-+ } else if (normalizedYDirection < normalizedZDirection) {
-+ currentY += yDirection;
-+ normalizedYDirection += normalizedY;
-+ } else {
-+ currentZ += zDirection;
-+ normalizedZDirection += normalizedZ;
-+ }
-+
-+ currentBlock.set(currentX, currentY, currentZ);
-+ if (chunk.getPos().x != currentBlock.getX() >> 4 || chunk.getPos().z != currentBlock.getZ() >> 4) {
-+ chunk = this.getChunkIfLoaded(currentBlock);
-+ if (chunk == null) {
-+ return net.minecraft.world.phys.BlockHitResult.Type.MISS;
-+ }
-+ }
-+ result = this.rayTraceBlockDirect(vec3d, vec3d1, currentBlock, chunk.getBlockState(currentBlock), voxelshapecoll);
-+ } while (result == null);
-+
-+ return result;
-+ }
-+ // Pufferfish end
-+
- public boolean isInWorldBounds(BlockPos pos) {
- return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
- }
-@@ -925,13 +1028,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- try {
- tickConsumer.accept(entity);
- MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
-- } catch (Throwable throwable) {
-+ } catch (Throwable throwable) { // Pufferfish - diff on change ServerLevel.tick
- if (throwable instanceof ThreadDeath) throw throwable; // Paper
- // Paper start - Prevent tile entity and entity crashes
- final String msg = String.format("Entity threw exception at %s:%s,%s,%s", entity.level.getWorld().getName(), entity.getX(), entity.getY(), entity.getZ());
- MinecraftServer.LOGGER.error(msg, throwable);
- getCraftServer().getPluginManager().callEvent(new ServerExceptionEvent(new ServerInternalException(msg, throwable)));
-- entity.discard();
-+ entity.discard(); // Pufferfish - diff on change ServerLevel.tick
- // Paper end
- }
- }
-@@ -1454,6 +1557,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
- }
-
- public ProfilerFiller getProfiler() {
-+ if (gg.pufferfish.pufferfish.PufferfishConfig.disableMethodProfiler) return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Pufferfish
- return (ProfilerFiller) this.profiler.get();
- }
-
-diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 15d266fc97eb73338f4f6fb2cfe25d6861e79810..6180679d922ea61d05d452971ec2d506a724d3c3 100644
---- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -417,12 +417,12 @@ public final class NaturalSpawner {
- }
- }
-
-- private static BlockPos getRandomPosWithin(Level world, LevelChunk chunk) {
-+ private static BlockPos getRandomPosWithin(ServerLevel world, LevelChunk chunk) { // Pufferfish - accept serverlevel
- ChunkPos chunkcoordintpair = chunk.getPos();
-- int i = chunkcoordintpair.getMinBlockX() + world.random.nextInt(16);
-- int j = chunkcoordintpair.getMinBlockZ() + world.random.nextInt(16);
-+ int i = chunkcoordintpair.getMinBlockX() + world.getThreadUnsafeRandom().nextInt(16); // Pufferfish - use thread unsafe random
-+ int j = chunkcoordintpair.getMinBlockZ() + world.getThreadUnsafeRandom().nextInt(16); // Pufferfish
- int k = chunk.getHeight(Heightmap.Types.WORLD_SURFACE, i, j) + 1;
-- int l = Mth.randomBetweenInclusive(world.random, world.getMinBuildHeight(), k);
-+ int l = Mth.randomBetweenInclusive(world.getThreadUnsafeRandom(), world.getMinBuildHeight(), k); // Pufferfish
-
- return new BlockPos(i, l, j);
- }
-diff --git a/src/main/java/net/minecraft/world/level/biome/Biome.java b/src/main/java/net/minecraft/world/level/biome/Biome.java
-index 65012a12e1430956ef55ced56773e6354ac26444..ed439b7e94646141c93a7dd3704d1cdeb5c27e16 100644
---- a/src/main/java/net/minecraft/world/level/biome/Biome.java
-+++ b/src/main/java/net/minecraft/world/level/biome/Biome.java
-@@ -66,14 +66,20 @@ public final class Biome {
- private final BiomeGenerationSettings generationSettings;
- private final MobSpawnSettings mobSettings;
- private final BiomeSpecialEffects specialEffects;
-- private final ThreadLocal temperatureCache = ThreadLocal.withInitial(() -> {
-+ // Pufferfish start - use our cache
-+ private final ThreadLocal temperatureCache = ThreadLocal.withInitial(() -> {
- return Util.make(() -> {
-+ /*
- Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) {
- protected void rehash(int i) {
- }
- };
- long2FloatLinkedOpenHashMap.defaultReturnValue(Float.NaN);
- return long2FloatLinkedOpenHashMap;
-+
-+ */
-+ return new gg.airplane.structs.Long2FloatAgingCache(TEMPERATURE_CACHE_SIZE);
-+ // Pufferfish end
- });
- });
-
-@@ -118,17 +124,15 @@ public final class Biome {
- @Deprecated
- public float getTemperature(BlockPos blockPos) {
- long l = blockPos.asLong();
-- Long2FloatLinkedOpenHashMap long2FloatLinkedOpenHashMap = this.temperatureCache.get();
-- float f = long2FloatLinkedOpenHashMap.get(l);
-+ // Pufferfish start
-+ gg.airplane.structs.Long2FloatAgingCache cache = this.temperatureCache.get();
-+ float f = cache.getValue(l);
- if (!Float.isNaN(f)) {
- return f;
- } else {
- float g = this.getHeightAdjustedTemperature(blockPos);
-- if (long2FloatLinkedOpenHashMap.size() == 1024) {
-- long2FloatLinkedOpenHashMap.removeFirstFloat();
-- }
--
-- long2FloatLinkedOpenHashMap.put(l, g);
-+ cache.putValue(l, g);
-+ // Pufferfish end
- return g;
- }
- }
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-index a71414397bd45ee7bcacfeef0041d80dfa25f114..d66806565770cb03a21794f99e5c4b0f3040b26a 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-@@ -31,7 +31,10 @@ import org.bukkit.entity.HumanEntity;
- public class ChestBlockEntity extends RandomizableContainerBlockEntity implements LidBlockEntity {
-
- private static final int EVENT_SET_OPEN_COUNT = 1;
-+ // Pufferfish start
- private NonNullList items;
-+ private gg.airplane.structs.ItemListWithBitset optimizedItems;
-+ // Pufferfish end
- public final ContainerOpenersCounter openersCounter;
- private final ChestLidController chestLidController;
-
-@@ -65,9 +68,13 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
- }
- // CraftBukkit end
-
-+ private final boolean isNative = getClass().equals(ChestBlockEntity.class); // Pufferfish
- protected ChestBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) {
- super(type, pos, state);
-- this.items = NonNullList.withSize(27, ItemStack.EMPTY);
-+ // Pufferfish start
-+ this.optimizedItems = new gg.airplane.structs.ItemListWithBitset(27);
-+ this.items = this.optimizedItems.nonNullList;
-+ // Pufferfish end
- this.openersCounter = new ContainerOpenersCounter() {
- @Override
- protected void onOpen(Level world, BlockPos pos, BlockState state) {
-@@ -98,6 +105,23 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
- this.chestLidController = new ChestLidController();
- }
-
-+ // Pufferfish start
-+ @Override
-+ public boolean hasEmptySlot(Direction enumdirection) {
-+ return isNative ? !this.optimizedItems.hasFullStacks() : super.hasEmptySlot(enumdirection);
-+ }
-+
-+ @Override
-+ public boolean isCompletelyFull(Direction enumdirection) {
-+ return isNative ? this.optimizedItems.hasFullStacks() && super.isCompletelyFull(enumdirection) : super.isCompletelyFull(enumdirection);
-+ }
-+
-+ @Override
-+ public boolean isCompletelyEmpty(Direction enumdirection) {
-+ return isNative && this.optimizedItems.isCompletelyEmpty() || super.isCompletelyEmpty(enumdirection);
-+ }
-+ // Pufferfish end
-+
- public ChestBlockEntity(BlockPos pos, BlockState state) {
- this(BlockEntityType.CHEST, pos, state);
- }
-@@ -115,7 +139,10 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
- @Override
- public void load(CompoundTag nbt) {
- super.load(nbt);
-- this.items = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
-+ // Pufferfish start
-+ this.optimizedItems = new gg.airplane.structs.ItemListWithBitset(this.getContainerSize());
-+ this.items = this.optimizedItems.nonNullList;
-+ // Pufferfish end
- if (!this.tryLoadLootTable(nbt)) {
- ContainerHelper.loadAllItems(nbt, this.items);
- }
-@@ -187,7 +214,10 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
-
- @Override
- protected void setItems(NonNullList list) {
-- this.items = list;
-+ // Pufferfish start
-+ this.optimizedItems = gg.airplane.structs.ItemListWithBitset.fromList(list);
-+ this.items = this.optimizedItems.nonNullList;
-+ // Pufferfish end
- }
-
- @Override
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index aac5572c1d40a10cd1d17f89c9eb836718837577..9b506bd2ec6e7fd1893dc7801592f011680028d7 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-@@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-
- public static final int MOVE_ITEM_SPEED = 8;
- public static final int HOPPER_CONTAINER_SIZE = 5;
-+ // Pufferfish start
- private NonNullList items;
-+ private gg.airplane.structs.ItemListWithBitset optimizedItems; // Pufferfish
-+ // Pufferfish end
- private int cooldownTime;
- private long tickedGameTime;
-
-@@ -83,14 +86,37 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-
- public HopperBlockEntity(BlockPos pos, BlockState state) {
- super(BlockEntityType.HOPPER, pos, state);
-- this.items = NonNullList.withSize(5, ItemStack.EMPTY);
-+ // Pufferfish start
-+ this.optimizedItems = new gg.airplane.structs.ItemListWithBitset(5);
-+ this.items = this.optimizedItems.nonNullList;
-+ // Pufferfish end
- this.cooldownTime = -1;
- }
-
-+ // Pufferfish start
-+ @Override
-+ public boolean hasEmptySlot(Direction enumdirection) {
-+ return !this.optimizedItems.hasFullStacks();
-+ }
-+
-+ @Override
-+ public boolean isCompletelyFull(Direction enumdirection) {
-+ return this.optimizedItems.hasFullStacks() && super.isCompletelyFull(enumdirection);
-+ }
-+
-+ @Override
-+ public boolean isCompletelyEmpty(Direction enumdirection) {
-+ return this.optimizedItems.isCompletelyEmpty() || super.isCompletelyEmpty(enumdirection);
-+ }
-+ // Pufferfish end
-+
- @Override
- public void load(CompoundTag nbt) {
- super.load(nbt);
-- this.items = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY);
-+ // Pufferfish start
-+ this.optimizedItems = new gg.airplane.structs.ItemListWithBitset(this.getContainerSize());
-+ this.items = this.optimizedItems.nonNullList;
-+ // Pufferfish end
- if (!this.tryLoadLootTable(nbt)) {
- ContainerHelper.loadAllItems(nbt, this.items);
- }
-@@ -162,7 +188,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
- flag = HopperBlockEntity.ejectItems(world, pos, state, (Container) blockEntity, blockEntity); // CraftBukkit
- }
-
-- if (!blockEntity.inventoryFull()) {
-+ if (!blockEntity.optimizedItems.hasFullStacks() || !blockEntity.inventoryFull()) { // Pufferfish - use bitset first
- flag |= booleansupplier.getAsBoolean();
- }
-
-@@ -451,11 +477,18 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
- }
-
- private static boolean isFullContainer(Container inventory, Direction direction) {
-- return allMatch(inventory, direction, STACK_SIZE_TEST); // Paper - no streams
-+ // Pufferfish start - use bitsets
-+ //return allMatch(inventory, direction, STACK_SIZE_TEST); // Paper - no streams
-+ return inventory.isCompletelyFull(direction);
-+ // Pufferfish end
- }
-
- private static boolean isEmptyContainer(Container inv, Direction facing) {
-- return allMatch(inv, facing, IS_EMPTY_TEST);
-+ // Paper start
-+ // Pufferfish start - use bitsets
-+ //return allMatch(inv, facing, IS_EMPTY_TEST);
-+ return inv.isCompletelyEmpty(facing);
-+ // Pufferfish end
- }
-
- public static boolean suckInItems(Level world, Hopper hopper) {
-@@ -636,7 +669,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-
- if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) {
- boolean flag = false;
-- boolean flag1 = to.isEmpty();
-+ boolean flag1 = to.isCompletelyEmpty(side); // Pufferfish
-
- if (itemstack1.isEmpty()) {
- // Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
-@@ -813,7 +846,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
-
- @Override
- protected void setItems(NonNullList list) {
-- this.items = list;
-+ // Pufferfish start
-+ this.optimizedItems = gg.airplane.structs.ItemListWithBitset.fromList(list);
-+ this.items = this.optimizedItems.nonNullList;
-+ // Pufferfish end
- }
-
- public static void entityInside(Level world, BlockPos pos, BlockState state, Entity entity, HopperBlockEntity blockEntity) {
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-index 79b01e32f89defb6b78f4764600d33d4945af592..6d62cc8fb347ccafd51df05896e616995990f005 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java
-@@ -97,12 +97,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc
- public boolean isEmpty() {
- this.unpackLootTable((Player)null);
- // Paper start
-- for (final ItemStack itemStack : this.getItems()) {
-- if (!itemStack.isEmpty()) {
-- return false;
-- }
-- }
-- return true;
-+ return this.isCompletelyEmpty(null); // Pufferfish - use super
- // Paper end
- }
-
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index d190bad5d287766ed4165ed827d9901a9d878687..13594b96cc8f451723c3598ef302ccee8e01bcac 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -88,6 +88,18 @@ public class LevelChunk extends ChunkAccess {
- private final LevelChunkTicks blockTicks;
- private final LevelChunkTicks fluidTicks;
-
-+ // Pufferfish start - instead of using a random every time the chunk is ticked, define when lightning strikes preemptively
-+ private int lightningTick;
-+ // shouldDoLightning compiles down to 29 bytes, which with the default of 35 byte inlining should guarantee an inline
-+ public final boolean shouldDoLightning(net.minecraft.util.RandomSource random) {
-+ if (this.lightningTick-- <= 0) {
-+ this.lightningTick = random.nextInt(this.level.spigotConfig.thunderChance) << 1;
-+ return true;
-+ }
-+ return false;
-+ }
-+ // Pufferfish end
-+
- public LevelChunk(Level world, ChunkPos pos) {
- this(world, pos, UpgradeData.EMPTY, new LevelChunkTicks<>(), new LevelChunkTicks<>(), 0L, (LevelChunkSection[]) null, (LevelChunk.PostLoadProcessor) null, (BlendingData) null);
- }
-@@ -116,6 +128,8 @@ public class LevelChunk extends ChunkAccess {
- this.postLoad = entityLoader;
- this.blockTicks = blockTickScheduler;
- this.fluidTicks = fluidTickScheduler;
-+
-+ this.lightningTick = this.level.getThreadUnsafeRandom().nextInt(100000) << 1; // Pufferfish - initialize lightning tick
- }
-
- // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index 854865f28bcae0fb0c17717c914687f78e951e21..c6297917e94f5a8b4b1447b2c29c44b806ccaff6 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -27,6 +27,7 @@ public class LevelChunkSection {
- public final PalettedContainer states;
- // CraftBukkit start - read/write
- private PalettedContainer> biomes;
-+ public short fluidStateCount; // Pufferfish
- public final com.destroystokyo.paper.util.maplist.IBlockDataList tickingList = new com.destroystokyo.paper.util.maplist.IBlockDataList(); // Paper
-
- public LevelChunkSection(int i, PalettedContainer datapaletteblock, PalettedContainer> palettedcontainerro) {
-@@ -198,6 +199,7 @@ public class LevelChunkSection {
-
- if (!fluid.isEmpty()) {
- --this.tickingFluidCount;
-+ --this.fluidStateCount; // Pufferfish
- }
-
- if (!state.isAir()) {
-@@ -212,6 +214,7 @@ public class LevelChunkSection {
-
- if (!fluid1.isEmpty()) {
- ++this.tickingFluidCount;
-+ ++this.fluidStateCount; // Pufferfish
- }
-
- this.updateKnownBlockInfo(x | (z << 4) | (y << 8), iblockdata1, state); // Paper
-@@ -261,6 +264,7 @@ public class LevelChunkSection {
- if (fluid.isRandomlyTicking()) {
- this.tickingFluidCount = (short) (this.tickingFluidCount + 1);
- }
-+ this.fluidStateCount++; // Pufferfish
- }
-
- });
-diff --git a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-index 4cdfc433df67afcd455422e9baf56f167dd712ae..57fcf3910f45ce371ac2e237b277b1034caaac4e 100644
---- a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-+++ b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
-@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
- import net.minecraft.world.entity.Entity;
-
- public class EntityTickList {
-- private final io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet entities = new io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet<>(true); // Paper - rewrite this, always keep this updated - why would we EVER tick an entity that's not ticking?
-+ public final io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet entities = new io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet<>(true); // Paper - rewrite this, always keep this updated - why would we EVER tick an entity that's not ticking? // Pufferfish - private->public
-
- private void ensureActiveIsNotIterated() {
- // Paper - replace with better logic, do not delay removals
-diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-index bf4de7b8fd630c596e096a411a8c84c64c13ebf7..6063665b8848a2cd9f0b262eed36a9dd48db6035 100644
---- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-+++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java
-@@ -43,6 +43,8 @@ public abstract class FlowingFluid extends Fluid {
- public static final BooleanProperty FALLING = BlockStateProperties.FALLING;
- public static final IntegerProperty LEVEL = BlockStateProperties.LEVEL_FLOWING;
- private static final int CACHE_SIZE = 200;
-+ // Pufferfish start - use our own cache
-+ /*
- private static final ThreadLocal> OCCLUSION_CACHE = ThreadLocal.withInitial(() -> {
- Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap = new Object2ByteLinkedOpenHashMap(200) {
- protected void rehash(int i) {}
-@@ -51,6 +53,14 @@ public abstract class FlowingFluid extends Fluid {
- object2bytelinkedopenhashmap.defaultReturnValue((byte) 127);
- return object2bytelinkedopenhashmap;
- });
-+ */
-+
-+ private static final ThreadLocal> localFluidDirectionCache = ThreadLocal.withInitial(() -> {
-+ // Pufferfish todo - mess with this number for performance
-+ // with 2048 it seems very infrequent on a small world that it has to remove old entries
-+ return new gg.airplane.structs.FluidDirectionCache<>(2048);
-+ });
-+ // Pufferfish end
- private final Map shapes = Maps.newIdentityHashMap();
-
- public FlowingFluid() {}
-@@ -239,6 +249,8 @@ public abstract class FlowingFluid extends Fluid {
- }
-
- private boolean canPassThroughWall(Direction face, BlockGetter world, BlockPos pos, BlockState state, BlockPos fromPos, BlockState fromState) {
-+ // Pufferfish start - modify to use our cache
-+ /*
- Object2ByteLinkedOpenHashMap object2bytelinkedopenhashmap;
-
- if (!state.getBlock().hasDynamicShape() && !fromState.getBlock().hasDynamicShape()) {
-@@ -246,9 +258,16 @@ public abstract class FlowingFluid extends Fluid {
- } else {
- object2bytelinkedopenhashmap = null;
- }
-+ */
-+ gg.airplane.structs.FluidDirectionCache cache = null;
-+
-+ if (!state.getBlock().hasDynamicShape() && !fromState.getBlock().hasDynamicShape()) {
-+ cache = localFluidDirectionCache.get();
-+ }
-
- Block.BlockStatePairKey block_a;
-
-+ /*
- if (object2bytelinkedopenhashmap != null) {
- block_a = new Block.BlockStatePairKey(state, fromState, face);
- byte b0 = object2bytelinkedopenhashmap.getAndMoveToFirst(block_a);
-@@ -259,11 +278,22 @@ public abstract class FlowingFluid extends Fluid {
- } else {
- block_a = null;
- }
-+ */
-+ if (cache != null) {
-+ block_a = new Block.BlockStatePairKey(state, fromState, face);
-+ Boolean flag = cache.getValue(block_a);
-+ if (flag != null) {
-+ return flag;
-+ }
-+ } else {
-+ block_a = null;
-+ }
-
- VoxelShape voxelshape = state.getCollisionShape(world, pos);
- VoxelShape voxelshape1 = fromState.getCollisionShape(world, fromPos);
- boolean flag = !Shapes.mergedFaceOccludes(voxelshape, voxelshape1, face);
-
-+ /*
- if (object2bytelinkedopenhashmap != null) {
- if (object2bytelinkedopenhashmap.size() == 200) {
- object2bytelinkedopenhashmap.removeLastByte();
-@@ -271,6 +301,11 @@ public abstract class FlowingFluid extends Fluid {
-
- object2bytelinkedopenhashmap.putAndMoveToFirst(block_a, (byte) (flag ? 1 : 0));
- }
-+ */
-+ if (cache != null) {
-+ cache.putValue(block_a, flag);
-+ }
-+ // Pufferfish end
-
- return flag;
- }
-diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java b/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
-index 35f9b11a3a61976c952a2c1c64bb2a932538f54f..9e9ac64764cf0a84e25e75d8d6f516cde6047284 100644
---- a/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
-+++ b/src/main/java/net/minecraft/world/level/storage/loot/LootContext.java
-@@ -41,8 +41,10 @@ public class LootContext {
- this.level = world;
- this.lootTables = tableGetter;
- this.conditions = conditionGetter;
-- this.params = ImmutableMap.copyOf(parameters);
-- this.dynamicDrops = ImmutableMap.copyOf(drops);
-+ // Pufferfish start - use unmodifiable maps instead of immutable ones to skip the copy
-+ this.params = java.util.Collections.unmodifiableMap(parameters);
-+ this.dynamicDrops = java.util.Collections.unmodifiableMap(drops);
-+ // Pufferfish end
- }
-
- public boolean hasParam(LootContextParam parameter) {
-diff --git a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
-index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7496a5f25 100644
---- a/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
-+++ b/src/main/java/net/minecraft/world/phys/shapes/EntityCollisionContext.java
-@@ -19,47 +19,66 @@ public class EntityCollisionContext implements CollisionContext {
- return defaultValue;
- }
- };
-- private final boolean descending;
-- private final double entityBottom;
-- private final ItemStack heldItem;
-- private final Predicate canStandOnFluid;
-+ // Pufferfish start - remove these and pray no plugin uses them
-+ // private final boolean descending;
-+ // private final double entityBottom;
-+ // private final ItemStack heldItem;
-+ // private final Predicate canStandOnFluid;
-+ // Pufferfish end
- @Nullable
- private final Entity entity;
-
- protected EntityCollisionContext(boolean descending, double minY, ItemStack heldItem, Predicate walkOnFluidPredicate, @Nullable Entity entity) {
-- this.descending = descending;
-- this.entityBottom = minY;
-- this.heldItem = heldItem;
-- this.canStandOnFluid = walkOnFluidPredicate;
-+ // Pufferfish start - remove these
-+ // this.descending = descending;
-+ // this.entityBottom = minY;
-+ // this.heldItem = heldItem;
-+ // this.canStandOnFluid = walkOnFluidPredicate;
-+ // Pufferfish end
- this.entity = entity;
- }
-
- /** @deprecated */
- @Deprecated
- protected EntityCollisionContext(Entity entity) {
-- this(entity.isDescending(), entity.getY(), entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandItem() : ItemStack.EMPTY, entity instanceof LivingEntity ? ((LivingEntity)entity)::canStandOnFluid : (fluidState) -> {
-- return false;
-- }, entity);
-+ // Pufferfish start - remove this
-+ // this(entity.isDescending(), entity.getY(), entity instanceof LivingEntity ? ((LivingEntity)entity).getMainHandItem() : ItemStack.EMPTY, entity instanceof LivingEntity ? ((LivingEntity)entity)::canStandOnFluid : (fluidState) -> {
-+ // return false;
-+ // }, entity);
-+ // Pufferfish end
-+ this.entity = entity;
- }
-
- @Override
- public boolean isHoldingItem(Item item) {
-- return this.heldItem.is(item);
-+ // Pufferfish start
-+ Entity entity = this.entity;
-+ if (entity instanceof LivingEntity livingEntity) {
-+ return livingEntity.getMainHandItem().is(item);
-+ }
-+ return ItemStack.EMPTY.is(item);
-+ // Pufferfish end
- }
-
- @Override
- public boolean canStandOnFluid(FluidState stateAbove, FluidState state) {
-- return this.canStandOnFluid.test(state) && !stateAbove.getType().isSame(state.getType());
-+ // Pufferfish start
-+ Entity entity = this.entity;
-+ if (entity instanceof LivingEntity livingEntity) {
-+ return livingEntity.canStandOnFluid(state) && !stateAbove.getType().isSame(state.getType());
-+ }
-+ return false;
-+ // Pufferfish end
- }
-
- @Override
- public boolean isDescending() {
-- return this.descending;
-+ return this.entity != null && this.entity.isDescending(); // Pufferfish
- }
-
- @Override
- public boolean isAbove(VoxelShape shape, BlockPos pos, boolean defaultValue) {
-- return this.entityBottom > (double)pos.getY() + shape.max(Direction.Axis.Y) - (double)1.0E-5F;
-+ return (this.entity == null ? -Double.MAX_VALUE : entity.getY()) > (double)pos.getY() + shape.max(Direction.Axis.Y) - (double)1.0E-5F; // Pufferfish
- }
-
- @Nullable
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9f2536d9a73bdb15b5b3004d4da79ca32cee205b..6ff93df3e870ebc6e52f8b8a719908bfa16a839b 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
- import javax.annotation.Nonnull; // Paper
-
- public final class CraftServer implements Server {
-- private final String serverName = "Paper"; // Paper
-+ private final String serverName = "Pufferfish"; // Paper // Pufferfish
- private final String serverVersion;
- private final String bukkitVersion = Versioning.getBukkitVersion();
- private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1062,6 +1062,11 @@ public final class CraftServer implements Server {
- plugin.getPluginMeta().getDisplayName(),
- "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
- ));
-+ getLogger().log(Level.SEVERE, String.format("%s Stacktrace", worker.getThread().getName()));
-+ StackTraceElement[] stackTrace = worker.getThread().getStackTrace();
-+ for (StackTraceElement element : stackTrace) {
-+ getLogger().log(Level.SEVERE, " " + element.toString());
-+ }
- }
- }
- // Paper end
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
-index f7ea77dd82d978ad307f99c743efacfb34478b3d..009ab06182359862b8f543030ec4fe4e2572c93c 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftShapelessRecipe.java
-@@ -44,6 +44,6 @@ public class CraftShapelessRecipe extends ShapelessRecipe implements CraftRecipe
- data.set(i, toNMS(ingred.get(i), true));
- }
-
-- MinecraftServer.getServer().getRecipeManager().addRecipe(new net.minecraft.world.item.crafting.ShapelessRecipe(CraftNamespacedKey.toMinecraft(this.getKey()), this.getGroup(), CraftRecipe.getCategory(this.getCategory()), CraftItemStack.asNMSCopy(this.getResult()), data));
-+ MinecraftServer.getServer().getRecipeManager().addRecipe(new net.minecraft.world.item.crafting.ShapelessRecipe(CraftNamespacedKey.toMinecraft(this.getKey()), this.getGroup(), CraftRecipe.getCategory(this.getCategory()), CraftItemStack.asNMSCopy(this.getResult()), data, true));
- }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1179e9fbff93ec8ff82aa3aae477f6bf4ce9b885..1ecf065c5323f65401412cb98d4a0b622f356759 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -472,7 +472,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
-
- @Override
- public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
-- return new com.destroystokyo.paper.PaperVersionFetcher();
-+ return new gg.pufferfish.pufferfish.PufferfishVersionFetcher(); // Pufferfish
- }
-
- @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 774556a62eb240da42e84db4502e2ed43495be17..80553face9c70c2a3d897681e7761df85b22d464 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-@@ -11,7 +11,7 @@ public final class Versioning {
- public static String getBukkitVersion() {
- String result = "Unknown-Version";
-
-- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties");
-+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.pufferfish.pufferfish/pufferfish-api/pom.properties"); // Pufferfish
- Properties properties = new Properties();
-
- if (stream != null) {
-diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 52780192d6417f8085566e4cdf3a895a83638520..07050c78a2eb6ce0c699101b38961b111d631a41 100644
---- a/src/main/java/org/spigotmc/ActivationRange.java
-+++ b/src/main/java/org/spigotmc/ActivationRange.java
-@@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings;
- import net.minecraft.world.entity.schedule.Activity;
- import net.minecraft.world.level.Level;
- import net.minecraft.world.phys.AABB;
-+// Pufferfish start
-+import net.minecraft.world.phys.Vec3;
-+import java.util.List;
-+// Pufferfish end
-
- public class ActivationRange
- {
-@@ -217,6 +221,25 @@ public class ActivationRange
- for (int i = 0; i < entities.size(); i++) {
- Entity entity = entities.get(i);
- ActivationRange.activateEntity(entity);
-+
-+ // Pufferfish start
-+ if (gg.pufferfish.pufferfish.PufferfishConfig.dearEnabled && entity.getType().dabEnabled) {
-+ if (!entity.activatedPriorityReset) {
-+ entity.activatedPriorityReset = true;
-+ entity.activatedPriority = gg.pufferfish.pufferfish.PufferfishConfig.maximumActivationPrio;
-+ }
-+ Vec3 playerVec = player.position();
-+ Vec3 entityVec = entity.position();
-+ double diffX = playerVec.x - entityVec.x, diffY = playerVec.y - entityVec.y, diffZ = playerVec.z - entityVec.z;
-+ int squaredDistance = (int) (diffX * diffX + diffY * diffY + diffZ * diffZ);
-+ entity.activatedPriority = squaredDistance > gg.pufferfish.pufferfish.PufferfishConfig.startDistanceSquared ?
-+ Math.max(1, Math.min(squaredDistance >> gg.pufferfish.pufferfish.PufferfishConfig.activationDistanceMod, entity.activatedPriority)) :
-+ 1;
-+ } else {
-+ entity.activatedPriority = 1;
-+ }
-+ // Pufferfish end
-+
- }
- // Paper end
- }
-@@ -233,12 +256,12 @@ public class ActivationRange
- if ( MinecraftServer.currentTick > entity.activatedTick )
- {
- if ( entity.defaultActivationState )
-- {
-+ { // Pufferfish - diff on change
- entity.activatedTick = MinecraftServer.currentTick;
- return;
- }
- if ( entity.activationType.boundingBox.intersects( entity.getBoundingBox() ) )
-- {
-+ { // Pufferfish - diff on change
- entity.activatedTick = MinecraftServer.currentTick;
- }
- }
-@@ -292,7 +315,7 @@ public class ActivationRange
- if ( entity instanceof LivingEntity )
- {
- LivingEntity living = (LivingEntity) entity;
-- if ( living.onClimbable() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 ) // Paper
-+ if ( living.onClimableCached() || living.jumping || living.hurtTime > 0 || living.activeEffects.size() > 0 ) // Paper // Pufferfish - use cached
- {
- return 1; // Paper
- }
diff --git a/patches/server/0003-Rebrand.patch b/patches/todo/server/0003-Rebrand.patch
similarity index 100%
rename from patches/server/0003-Rebrand.patch
rename to patches/todo/server/0003-Rebrand.patch
diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/todo/server/0004-Purpur-config-files.patch
similarity index 100%
rename from patches/server/0004-Purpur-config-files.patch
rename to patches/todo/server/0004-Purpur-config-files.patch
diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/todo/server/0005-Purpur-client-support.patch
similarity index 100%
rename from patches/server/0005-Purpur-client-support.patch
rename to patches/todo/server/0005-Purpur-client-support.patch
diff --git a/patches/server/0006-Fix-decompile-errors.patch b/patches/todo/server/0006-Fix-decompile-errors.patch
similarity index 100%
rename from patches/server/0006-Fix-decompile-errors.patch
rename to patches/todo/server/0006-Fix-decompile-errors.patch
diff --git a/patches/server/0007-Component-related-conveniences.patch b/patches/todo/server/0007-Component-related-conveniences.patch
similarity index 100%
rename from patches/server/0007-Component-related-conveniences.patch
rename to patches/todo/server/0007-Component-related-conveniences.patch
diff --git a/patches/server/0008-Ridables.patch b/patches/todo/server/0008-Ridables.patch
similarity index 100%
rename from patches/server/0008-Ridables.patch
rename to patches/todo/server/0008-Ridables.patch
diff --git a/patches/server/0009-Configurable-entity-base-attributes.patch b/patches/todo/server/0009-Configurable-entity-base-attributes.patch
similarity index 100%
rename from patches/server/0009-Configurable-entity-base-attributes.patch
rename to patches/todo/server/0009-Configurable-entity-base-attributes.patch
diff --git a/patches/server/0010-Barrels-and-enderchests-6-rows.patch b/patches/todo/server/0010-Barrels-and-enderchests-6-rows.patch
similarity index 100%
rename from patches/server/0010-Barrels-and-enderchests-6-rows.patch
rename to patches/todo/server/0010-Barrels-and-enderchests-6-rows.patch
diff --git a/patches/server/0011-Llama-API.patch b/patches/todo/server/0011-Llama-API.patch
similarity index 100%
rename from patches/server/0011-Llama-API.patch
rename to patches/todo/server/0011-Llama-API.patch
diff --git a/patches/server/0012-AFK-API.patch b/patches/todo/server/0012-AFK-API.patch
similarity index 100%
rename from patches/server/0012-AFK-API.patch
rename to patches/todo/server/0012-AFK-API.patch
diff --git a/patches/server/0013-Bring-back-server-name.patch b/patches/todo/server/0013-Bring-back-server-name.patch
similarity index 100%
rename from patches/server/0013-Bring-back-server-name.patch
rename to patches/todo/server/0013-Bring-back-server-name.patch
diff --git a/patches/server/0014-Configurable-server-mod-name.patch b/patches/todo/server/0014-Configurable-server-mod-name.patch
similarity index 100%
rename from patches/server/0014-Configurable-server-mod-name.patch
rename to patches/todo/server/0014-Configurable-server-mod-name.patch
diff --git a/patches/server/0015-LivingEntity-safeFallDistance.patch b/patches/todo/server/0015-LivingEntity-safeFallDistance.patch
similarity index 100%
rename from patches/server/0015-LivingEntity-safeFallDistance.patch
rename to patches/todo/server/0015-LivingEntity-safeFallDistance.patch
diff --git a/patches/server/0016-Lagging-threshold.patch b/patches/todo/server/0016-Lagging-threshold.patch
similarity index 100%
rename from patches/server/0016-Lagging-threshold.patch
rename to patches/todo/server/0016-Lagging-threshold.patch
diff --git a/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/todo/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
similarity index 100%
rename from patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
rename to patches/todo/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch
diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/todo/server/0018-Player-invulnerabilities.patch
similarity index 100%
rename from patches/server/0018-Player-invulnerabilities.patch
rename to patches/todo/server/0018-Player-invulnerabilities.patch
diff --git a/patches/server/0019-Anvil-API.patch b/patches/todo/server/0019-Anvil-API.patch
similarity index 100%
rename from patches/server/0019-Anvil-API.patch
rename to patches/todo/server/0019-Anvil-API.patch
diff --git a/patches/server/0020-Alternative-Keepalive-Handling.patch b/patches/todo/server/0020-Alternative-Keepalive-Handling.patch
similarity index 100%
rename from patches/server/0020-Alternative-Keepalive-Handling.patch
rename to patches/todo/server/0020-Alternative-Keepalive-Handling.patch
diff --git a/patches/server/0021-Silk-touch-spawners.patch b/patches/todo/server/0021-Silk-touch-spawners.patch
similarity index 100%
rename from patches/server/0021-Silk-touch-spawners.patch
rename to patches/todo/server/0021-Silk-touch-spawners.patch
diff --git a/patches/server/0022-Add-turtle-egg-block-options.patch b/patches/todo/server/0022-Add-turtle-egg-block-options.patch
similarity index 100%
rename from patches/server/0022-Add-turtle-egg-block-options.patch
rename to patches/todo/server/0022-Add-turtle-egg-block-options.patch
diff --git a/patches/server/0023-Logger-settings-suppressing-pointless-logs.patch b/patches/todo/server/0023-Logger-settings-suppressing-pointless-logs.patch
similarity index 100%
rename from patches/server/0023-Logger-settings-suppressing-pointless-logs.patch
rename to patches/todo/server/0023-Logger-settings-suppressing-pointless-logs.patch
diff --git a/patches/server/0024-Disable-outdated-build-check.patch b/patches/todo/server/0024-Disable-outdated-build-check.patch
similarity index 100%
rename from patches/server/0024-Disable-outdated-build-check.patch
rename to patches/todo/server/0024-Disable-outdated-build-check.patch
diff --git a/patches/server/0025-Giants-AI-settings.patch b/patches/todo/server/0025-Giants-AI-settings.patch
similarity index 100%
rename from patches/server/0025-Giants-AI-settings.patch
rename to patches/todo/server/0025-Giants-AI-settings.patch
diff --git a/patches/server/0026-Zombie-horse-naturally-spawn.patch b/patches/todo/server/0026-Zombie-horse-naturally-spawn.patch
similarity index 100%
rename from patches/server/0026-Zombie-horse-naturally-spawn.patch
rename to patches/todo/server/0026-Zombie-horse-naturally-spawn.patch
diff --git a/patches/server/0027-Charged-creeper-naturally-spawn.patch b/patches/todo/server/0027-Charged-creeper-naturally-spawn.patch
similarity index 100%
rename from patches/server/0027-Charged-creeper-naturally-spawn.patch
rename to patches/todo/server/0027-Charged-creeper-naturally-spawn.patch
diff --git a/patches/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/todo/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch
similarity index 100%
rename from patches/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch
rename to patches/todo/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch
diff --git a/patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/todo/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
similarity index 100%
rename from patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
rename to patches/todo/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch
diff --git a/patches/server/0030-Tulips-change-fox-type.patch b/patches/todo/server/0030-Tulips-change-fox-type.patch
similarity index 100%
rename from patches/server/0030-Tulips-change-fox-type.patch
rename to patches/todo/server/0030-Tulips-change-fox-type.patch
diff --git a/patches/server/0031-Breedable-Polar-Bears.patch b/patches/todo/server/0031-Breedable-Polar-Bears.patch
similarity index 100%
rename from patches/server/0031-Breedable-Polar-Bears.patch
rename to patches/todo/server/0031-Breedable-Polar-Bears.patch
diff --git a/patches/server/0032-Chickens-can-retaliate.patch b/patches/todo/server/0032-Chickens-can-retaliate.patch
similarity index 100%
rename from patches/server/0032-Chickens-can-retaliate.patch
rename to patches/todo/server/0032-Chickens-can-retaliate.patch
diff --git a/patches/server/0033-Add-option-to-set-armorstand-step-height.patch b/patches/todo/server/0033-Add-option-to-set-armorstand-step-height.patch
similarity index 100%
rename from patches/server/0033-Add-option-to-set-armorstand-step-height.patch
rename to patches/todo/server/0033-Add-option-to-set-armorstand-step-height.patch
diff --git a/patches/server/0034-Cat-spawning-options.patch b/patches/todo/server/0034-Cat-spawning-options.patch
similarity index 100%
rename from patches/server/0034-Cat-spawning-options.patch
rename to patches/todo/server/0034-Cat-spawning-options.patch
diff --git a/patches/server/0035-Cows-eat-mushrooms.patch b/patches/todo/server/0035-Cows-eat-mushrooms.patch
similarity index 100%
rename from patches/server/0035-Cows-eat-mushrooms.patch
rename to patches/todo/server/0035-Cows-eat-mushrooms.patch
diff --git a/patches/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/todo/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch
similarity index 100%
rename from patches/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch
rename to patches/todo/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch
diff --git a/patches/server/0037-Pigs-give-saddle-back.patch b/patches/todo/server/0037-Pigs-give-saddle-back.patch
similarity index 100%
rename from patches/server/0037-Pigs-give-saddle-back.patch
rename to patches/todo/server/0037-Pigs-give-saddle-back.patch
diff --git a/patches/server/0038-Snowman-drop-and-put-back-pumpkin.patch b/patches/todo/server/0038-Snowman-drop-and-put-back-pumpkin.patch
similarity index 100%
rename from patches/server/0038-Snowman-drop-and-put-back-pumpkin.patch
rename to patches/todo/server/0038-Snowman-drop-and-put-back-pumpkin.patch
diff --git a/patches/server/0039-Ender-dragon-always-drop-full-exp.patch b/patches/todo/server/0039-Ender-dragon-always-drop-full-exp.patch
similarity index 100%
rename from patches/server/0039-Ender-dragon-always-drop-full-exp.patch
rename to patches/todo/server/0039-Ender-dragon-always-drop-full-exp.patch
diff --git a/patches/server/0040-Signs-editable-on-right-click.patch b/patches/todo/server/0040-Signs-editable-on-right-click.patch
similarity index 100%
rename from patches/server/0040-Signs-editable-on-right-click.patch
rename to patches/todo/server/0040-Signs-editable-on-right-click.patch
diff --git a/patches/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/todo/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch
similarity index 100%
rename from patches/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch
rename to patches/todo/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch
diff --git a/patches/server/0042-Minecart-settings-and-WASD-controls.patch b/patches/todo/server/0042-Minecart-settings-and-WASD-controls.patch
similarity index 100%
rename from patches/server/0042-Minecart-settings-and-WASD-controls.patch
rename to patches/todo/server/0042-Minecart-settings-and-WASD-controls.patch
diff --git a/patches/server/0043-Disable-loot-drops-on-death-by-cramming.patch b/patches/todo/server/0043-Disable-loot-drops-on-death-by-cramming.patch
similarity index 100%
rename from patches/server/0043-Disable-loot-drops-on-death-by-cramming.patch
rename to patches/todo/server/0043-Disable-loot-drops-on-death-by-cramming.patch
diff --git a/patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch b/patches/todo/server/0044-Option-to-toggle-milk-curing-bad-omen.patch
similarity index 100%
rename from patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch
rename to patches/todo/server/0044-Option-to-toggle-milk-curing-bad-omen.patch
diff --git a/patches/server/0045-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/todo/server/0045-End-gateway-should-check-if-entity-can-use-portal.patch
similarity index 100%
rename from patches/server/0045-End-gateway-should-check-if-entity-can-use-portal.patch
rename to patches/todo/server/0045-End-gateway-should-check-if-entity-can-use-portal.patch
diff --git a/patches/server/0046-Skip-events-if-there-s-no-listeners.patch b/patches/todo/server/0046-Skip-events-if-there-s-no-listeners.patch
similarity index 100%
rename from patches/server/0046-Skip-events-if-there-s-no-listeners.patch
rename to patches/todo/server/0046-Skip-events-if-there-s-no-listeners.patch
diff --git a/patches/server/0047-Add-permission-for-F3-N-debug.patch b/patches/todo/server/0047-Add-permission-for-F3-N-debug.patch
similarity index 100%
rename from patches/server/0047-Add-permission-for-F3-N-debug.patch
rename to patches/todo/server/0047-Add-permission-for-F3-N-debug.patch
diff --git a/patches/server/0048-Configurable-TPS-Catchup.patch b/patches/todo/server/0048-Configurable-TPS-Catchup.patch
similarity index 100%
rename from patches/server/0048-Configurable-TPS-Catchup.patch
rename to patches/todo/server/0048-Configurable-TPS-Catchup.patch
diff --git a/patches/server/0049-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/todo/server/0049-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
similarity index 100%
rename from patches/server/0049-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
rename to patches/todo/server/0049-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
diff --git a/patches/server/0050-Add-enderman-and-creeper-griefing-controls.patch b/patches/todo/server/0050-Add-enderman-and-creeper-griefing-controls.patch
similarity index 100%
rename from patches/server/0050-Add-enderman-and-creeper-griefing-controls.patch
rename to patches/todo/server/0050-Add-enderman-and-creeper-griefing-controls.patch
diff --git a/patches/server/0051-Villagers-follow-emerald-blocks.patch b/patches/todo/server/0051-Villagers-follow-emerald-blocks.patch
similarity index 100%
rename from patches/server/0051-Villagers-follow-emerald-blocks.patch
rename to patches/todo/server/0051-Villagers-follow-emerald-blocks.patch
diff --git a/patches/server/0052-Allow-leashing-villagers.patch b/patches/todo/server/0052-Allow-leashing-villagers.patch
similarity index 100%
rename from patches/server/0052-Allow-leashing-villagers.patch
rename to patches/todo/server/0052-Allow-leashing-villagers.patch
diff --git a/patches/server/0053-Implement-infinite-liquids.patch b/patches/todo/server/0053-Implement-infinite-liquids.patch
similarity index 100%
rename from patches/server/0053-Implement-infinite-liquids.patch
rename to patches/todo/server/0053-Implement-infinite-liquids.patch
diff --git a/patches/server/0054-Make-lava-flow-speed-configurable.patch b/patches/todo/server/0054-Make-lava-flow-speed-configurable.patch
similarity index 100%
rename from patches/server/0054-Make-lava-flow-speed-configurable.patch
rename to patches/todo/server/0054-Make-lava-flow-speed-configurable.patch
diff --git a/patches/server/0055-Add-player-death-exp-control-options.patch b/patches/todo/server/0055-Add-player-death-exp-control-options.patch
similarity index 100%
rename from patches/server/0055-Add-player-death-exp-control-options.patch
rename to patches/todo/server/0055-Add-player-death-exp-control-options.patch
diff --git a/patches/server/0056-Configurable-void-damage-height-and-damage.patch b/patches/todo/server/0056-Configurable-void-damage-height-and-damage.patch
similarity index 100%
rename from patches/server/0056-Configurable-void-damage-height-and-damage.patch
rename to patches/todo/server/0056-Configurable-void-damage-height-and-damage.patch
diff --git a/patches/server/0057-Add-canSaveToDisk-to-Entity.patch b/patches/todo/server/0057-Add-canSaveToDisk-to-Entity.patch
similarity index 100%
rename from patches/server/0057-Add-canSaveToDisk-to-Entity.patch
rename to patches/todo/server/0057-Add-canSaveToDisk-to-Entity.patch
diff --git a/patches/server/0058-Dispenser-curse-of-binding-protection.patch b/patches/todo/server/0058-Dispenser-curse-of-binding-protection.patch
similarity index 100%
rename from patches/server/0058-Dispenser-curse-of-binding-protection.patch
rename to patches/todo/server/0058-Dispenser-curse-of-binding-protection.patch
diff --git a/patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch b/patches/todo/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
similarity index 100%
rename from patches/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
rename to patches/todo/server/0059-Add-option-for-boats-to-eject-players-on-land.patch
diff --git a/patches/server/0060-Mending-mends-most-damages-equipment-first.patch b/patches/todo/server/0060-Mending-mends-most-damages-equipment-first.patch
similarity index 100%
rename from patches/server/0060-Mending-mends-most-damages-equipment-first.patch
rename to patches/todo/server/0060-Mending-mends-most-damages-equipment-first.patch
diff --git a/patches/server/0061-Add-5-second-tps-average-in-tps.patch b/patches/todo/server/0061-Add-5-second-tps-average-in-tps.patch
similarity index 100%
rename from patches/server/0061-Add-5-second-tps-average-in-tps.patch
rename to patches/todo/server/0061-Add-5-second-tps-average-in-tps.patch
diff --git a/patches/server/0062-Implement-elytra-settings.patch b/patches/todo/server/0062-Implement-elytra-settings.patch
similarity index 100%
rename from patches/server/0062-Implement-elytra-settings.patch
rename to patches/todo/server/0062-Implement-elytra-settings.patch
diff --git a/patches/server/0063-Item-entity-immunities.patch b/patches/todo/server/0063-Item-entity-immunities.patch
similarity index 100%
rename from patches/server/0063-Item-entity-immunities.patch
rename to patches/todo/server/0063-Item-entity-immunities.patch
diff --git a/patches/server/0064-Add-ping-command.patch b/patches/todo/server/0064-Add-ping-command.patch
similarity index 100%
rename from patches/server/0064-Add-ping-command.patch
rename to patches/todo/server/0064-Add-ping-command.patch
diff --git a/patches/server/0065-Add-demo-command.patch b/patches/todo/server/0065-Add-demo-command.patch
similarity index 100%
rename from patches/server/0065-Add-demo-command.patch
rename to patches/todo/server/0065-Add-demo-command.patch
diff --git a/patches/server/0066-Add-credits-command.patch b/patches/todo/server/0066-Add-credits-command.patch
similarity index 100%
rename from patches/server/0066-Add-credits-command.patch
rename to patches/todo/server/0066-Add-credits-command.patch
diff --git a/patches/server/0067-Configurable-jockey-options.patch b/patches/todo/server/0067-Configurable-jockey-options.patch
similarity index 100%
rename from patches/server/0067-Configurable-jockey-options.patch
rename to patches/todo/server/0067-Configurable-jockey-options.patch
diff --git a/patches/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/todo/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
similarity index 100%
rename from patches/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
rename to patches/todo/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
diff --git a/patches/server/0069-Add-phantom-spawning-options.patch b/patches/todo/server/0069-Add-phantom-spawning-options.patch
similarity index 100%
rename from patches/server/0069-Add-phantom-spawning-options.patch
rename to patches/todo/server/0069-Add-phantom-spawning-options.patch
diff --git a/patches/server/0070-Implement-bed-explosion-options.patch b/patches/todo/server/0070-Implement-bed-explosion-options.patch
similarity index 100%
rename from patches/server/0070-Implement-bed-explosion-options.patch
rename to patches/todo/server/0070-Implement-bed-explosion-options.patch
diff --git a/patches/server/0071-Implement-respawn-anchor-explosion-options.patch b/patches/todo/server/0071-Implement-respawn-anchor-explosion-options.patch
similarity index 100%
rename from patches/server/0071-Implement-respawn-anchor-explosion-options.patch
rename to patches/todo/server/0071-Implement-respawn-anchor-explosion-options.patch
diff --git a/patches/server/0072-Add-allow-water-in-end-world-option.patch b/patches/todo/server/0072-Add-allow-water-in-end-world-option.patch
similarity index 100%
rename from patches/server/0072-Add-allow-water-in-end-world-option.patch
rename to patches/todo/server/0072-Add-allow-water-in-end-world-option.patch
diff --git a/patches/server/0073-Allow-color-codes-in-books.patch b/patches/todo/server/0073-Allow-color-codes-in-books.patch
similarity index 100%
rename from patches/server/0073-Allow-color-codes-in-books.patch
rename to patches/todo/server/0073-Allow-color-codes-in-books.patch
diff --git a/patches/server/0074-Entity-lifespan.patch b/patches/todo/server/0074-Entity-lifespan.patch
similarity index 100%
rename from patches/server/0074-Entity-lifespan.patch
rename to patches/todo/server/0074-Entity-lifespan.patch
diff --git a/patches/server/0075-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/todo/server/0075-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
similarity index 100%
rename from patches/server/0075-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
rename to patches/todo/server/0075-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
diff --git a/patches/server/0076-Squid-EAR-immunity.patch b/patches/todo/server/0076-Squid-EAR-immunity.patch
similarity index 100%
rename from patches/server/0076-Squid-EAR-immunity.patch
rename to patches/todo/server/0076-Squid-EAR-immunity.patch
diff --git a/patches/server/0077-Phantoms-burn-in-light.patch b/patches/todo/server/0077-Phantoms-burn-in-light.patch
similarity index 100%
rename from patches/server/0077-Phantoms-burn-in-light.patch
rename to patches/todo/server/0077-Phantoms-burn-in-light.patch
diff --git a/patches/server/0078-Configurable-villager-breeding.patch b/patches/todo/server/0078-Configurable-villager-breeding.patch
similarity index 100%
rename from patches/server/0078-Configurable-villager-breeding.patch
rename to patches/todo/server/0078-Configurable-villager-breeding.patch
diff --git a/patches/server/0079-Redstone-deactivates-spawners.patch b/patches/todo/server/0079-Redstone-deactivates-spawners.patch
similarity index 100%
rename from patches/server/0079-Redstone-deactivates-spawners.patch
rename to patches/todo/server/0079-Redstone-deactivates-spawners.patch
diff --git a/patches/server/0080-Totems-work-in-inventory.patch b/patches/todo/server/0080-Totems-work-in-inventory.patch
similarity index 100%
rename from patches/server/0080-Totems-work-in-inventory.patch
rename to patches/todo/server/0080-Totems-work-in-inventory.patch
diff --git a/patches/server/0081-Add-vindicator-johnny-spawn-chance.patch b/patches/todo/server/0081-Add-vindicator-johnny-spawn-chance.patch
similarity index 100%
rename from patches/server/0081-Add-vindicator-johnny-spawn-chance.patch
rename to patches/todo/server/0081-Add-vindicator-johnny-spawn-chance.patch
diff --git a/patches/server/0082-Add-option-to-disable-certain-block-updates.patch b/patches/todo/server/0082-Add-option-to-disable-certain-block-updates.patch
similarity index 100%
rename from patches/server/0082-Add-option-to-disable-certain-block-updates.patch
rename to patches/todo/server/0082-Add-option-to-disable-certain-block-updates.patch
diff --git a/patches/server/0083-Dispensers-place-anvils-option.patch b/patches/todo/server/0083-Dispensers-place-anvils-option.patch
similarity index 100%
rename from patches/server/0083-Dispensers-place-anvils-option.patch
rename to patches/todo/server/0083-Dispensers-place-anvils-option.patch
diff --git a/patches/server/0084-Allow-anvil-colors.patch b/patches/todo/server/0084-Allow-anvil-colors.patch
similarity index 100%
rename from patches/server/0084-Allow-anvil-colors.patch
rename to patches/todo/server/0084-Allow-anvil-colors.patch
diff --git a/patches/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/todo/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch
similarity index 100%
rename from patches/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch
rename to patches/todo/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch
diff --git a/patches/server/0086-Short-enderman-height.patch b/patches/todo/server/0086-Short-enderman-height.patch
similarity index 100%
rename from patches/server/0086-Short-enderman-height.patch
rename to patches/todo/server/0086-Short-enderman-height.patch
diff --git a/patches/server/0087-Stop-squids-floating-on-top-of-water.patch b/patches/todo/server/0087-Stop-squids-floating-on-top-of-water.patch
similarity index 100%
rename from patches/server/0087-Stop-squids-floating-on-top-of-water.patch
rename to patches/todo/server/0087-Stop-squids-floating-on-top-of-water.patch
diff --git a/patches/server/0088-Crying-obsidian-valid-for-portal-frames.patch b/patches/todo/server/0088-Crying-obsidian-valid-for-portal-frames.patch
similarity index 100%
rename from patches/server/0088-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/todo/server/0088-Crying-obsidian-valid-for-portal-frames.patch
diff --git a/patches/server/0089-Entities-can-use-portals-configuration.patch b/patches/todo/server/0089-Entities-can-use-portals-configuration.patch
similarity index 100%
rename from patches/server/0089-Entities-can-use-portals-configuration.patch
rename to patches/todo/server/0089-Entities-can-use-portals-configuration.patch
diff --git a/patches/server/0090-LivingEntity-broadcastItemBreak.patch b/patches/todo/server/0090-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/server/0090-LivingEntity-broadcastItemBreak.patch
rename to patches/todo/server/0090-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/server/0091-Customizable-wither-health-and-healing.patch b/patches/todo/server/0091-Customizable-wither-health-and-healing.patch
similarity index 100%
rename from patches/server/0091-Customizable-wither-health-and-healing.patch
rename to patches/todo/server/0091-Customizable-wither-health-and-healing.patch
diff --git a/patches/server/0092-Allow-toggling-special-MobSpawners-per-world.patch b/patches/todo/server/0092-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 100%
rename from patches/server/0092-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/todo/server/0092-Allow-toggling-special-MobSpawners-per-world.patch
diff --git a/patches/server/0093-Raid-cooldown-setting.patch b/patches/todo/server/0093-Raid-cooldown-setting.patch
similarity index 100%
rename from patches/server/0093-Raid-cooldown-setting.patch
rename to patches/todo/server/0093-Raid-cooldown-setting.patch
diff --git a/patches/server/0094-Despawn-rate-config-options-per-projectile-type.patch b/patches/todo/server/0094-Despawn-rate-config-options-per-projectile-type.patch
similarity index 100%
rename from patches/server/0094-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/todo/server/0094-Despawn-rate-config-options-per-projectile-type.patch
diff --git a/patches/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/todo/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 100%
rename from patches/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/todo/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch
diff --git a/patches/server/0096-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/todo/server/0096-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server/0096-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/todo/server/0096-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server/0097-Flying-squids-Oh-my.patch b/patches/todo/server/0097-Flying-squids-Oh-my.patch
similarity index 100%
rename from patches/server/0097-Flying-squids-Oh-my.patch
rename to patches/todo/server/0097-Flying-squids-Oh-my.patch
diff --git a/patches/server/0098-Infinity-bow-settings.patch b/patches/todo/server/0098-Infinity-bow-settings.patch
similarity index 100%
rename from patches/server/0098-Infinity-bow-settings.patch
rename to patches/todo/server/0098-Infinity-bow-settings.patch
diff --git a/patches/server/0099-Configurable-daylight-cycle.patch b/patches/todo/server/0099-Configurable-daylight-cycle.patch
similarity index 100%
rename from patches/server/0099-Configurable-daylight-cycle.patch
rename to patches/todo/server/0099-Configurable-daylight-cycle.patch
diff --git a/patches/server/0100-Allow-infinite-and-mending-enchantments-together.patch b/patches/todo/server/0100-Allow-infinite-and-mending-enchantments-together.patch
similarity index 100%
rename from patches/server/0100-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/todo/server/0100-Allow-infinite-and-mending-enchantments-together.patch
diff --git a/patches/server/0101-Furnace-uses-lava-from-underneath.patch b/patches/todo/server/0101-Furnace-uses-lava-from-underneath.patch
similarity index 100%
rename from patches/server/0101-Furnace-uses-lava-from-underneath.patch
rename to patches/todo/server/0101-Furnace-uses-lava-from-underneath.patch
diff --git a/patches/server/0102-Arrows-should-not-reset-despawn-counter.patch b/patches/todo/server/0102-Arrows-should-not-reset-despawn-counter.patch
similarity index 100%
rename from patches/server/0102-Arrows-should-not-reset-despawn-counter.patch
rename to patches/todo/server/0102-Arrows-should-not-reset-despawn-counter.patch
diff --git a/patches/server/0103-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/todo/server/0103-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 100%
rename from patches/server/0103-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/todo/server/0103-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
diff --git a/patches/server/0104-Add-adjustable-breeding-cooldown-to-config.patch b/patches/todo/server/0104-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 100%
rename from patches/server/0104-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/todo/server/0104-Add-adjustable-breeding-cooldown-to-config.patch
diff --git a/patches/server/0105-Make-entity-breeding-times-configurable.patch b/patches/todo/server/0105-Make-entity-breeding-times-configurable.patch
similarity index 100%
rename from patches/server/0105-Make-entity-breeding-times-configurable.patch
rename to patches/todo/server/0105-Make-entity-breeding-times-configurable.patch
diff --git a/patches/server/0106-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/todo/server/0106-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 100%
rename from patches/server/0106-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/todo/server/0106-Apply-display-names-from-item-forms-of-entities-to-e.patch
diff --git a/patches/server/0107-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/todo/server/0107-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 100%
rename from patches/server/0107-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/todo/server/0107-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
diff --git a/patches/server/0108-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/todo/server/0108-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 100%
rename from patches/server/0108-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/todo/server/0108-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
diff --git a/patches/server/0109-Add-configurable-snowball-damage.patch b/patches/todo/server/0109-Add-configurable-snowball-damage.patch
similarity index 100%
rename from patches/server/0109-Add-configurable-snowball-damage.patch
rename to patches/todo/server/0109-Add-configurable-snowball-damage.patch
diff --git a/patches/server/0110-Changeable-Mob-Left-Handed-Chance.patch b/patches/todo/server/0110-Changeable-Mob-Left-Handed-Chance.patch
similarity index 100%
rename from patches/server/0110-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/todo/server/0110-Changeable-Mob-Left-Handed-Chance.patch
diff --git a/patches/server/0111-Add-boat-fall-damage-config.patch b/patches/todo/server/0111-Add-boat-fall-damage-config.patch
similarity index 100%
rename from patches/server/0111-Add-boat-fall-damage-config.patch
rename to patches/todo/server/0111-Add-boat-fall-damage-config.patch
diff --git a/patches/server/0112-Snow-Golem-rate-of-fire-config.patch b/patches/todo/server/0112-Snow-Golem-rate-of-fire-config.patch
similarity index 100%
rename from patches/server/0112-Snow-Golem-rate-of-fire-config.patch
rename to patches/todo/server/0112-Snow-Golem-rate-of-fire-config.patch
diff --git a/patches/server/0113-EMC-Configurable-disable-give-dropping.patch b/patches/todo/server/0113-EMC-Configurable-disable-give-dropping.patch
similarity index 100%
rename from patches/server/0113-EMC-Configurable-disable-give-dropping.patch
rename to patches/todo/server/0113-EMC-Configurable-disable-give-dropping.patch
diff --git a/patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/todo/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 100%
rename from patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/todo/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
diff --git a/patches/server/0115-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/todo/server/0115-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 100%
rename from patches/server/0115-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/todo/server/0115-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
diff --git a/patches/server/0116-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/todo/server/0116-Configurable-chance-for-wolves-to-spawn-rabid.patch
similarity index 100%
rename from patches/server/0116-Configurable-chance-for-wolves-to-spawn-rabid.patch
rename to patches/todo/server/0116-Configurable-chance-for-wolves-to-spawn-rabid.patch
diff --git a/patches/server/0117-Configurable-default-collar-color.patch b/patches/todo/server/0117-Configurable-default-collar-color.patch
similarity index 100%
rename from patches/server/0117-Configurable-default-collar-color.patch
rename to patches/todo/server/0117-Configurable-default-collar-color.patch
diff --git a/patches/server/0118-Phantom-flames-on-swoop.patch b/patches/todo/server/0118-Phantom-flames-on-swoop.patch
similarity index 100%
rename from patches/server/0118-Phantom-flames-on-swoop.patch
rename to patches/todo/server/0118-Phantom-flames-on-swoop.patch
diff --git a/patches/server/0119-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/todo/server/0119-Option-for-chests-to-open-even-with-a-solid-block-on.patch
similarity index 100%
rename from patches/server/0119-Option-for-chests-to-open-even-with-a-solid-block-on.patch
rename to patches/todo/server/0119-Option-for-chests-to-open-even-with-a-solid-block-on.patch
diff --git a/patches/server/0120-Implement-TPSBar.patch b/patches/todo/server/0120-Implement-TPSBar.patch
similarity index 100%
rename from patches/server/0120-Implement-TPSBar.patch
rename to patches/todo/server/0120-Implement-TPSBar.patch
diff --git a/patches/server/0121-Striders-give-saddle-back.patch b/patches/todo/server/0121-Striders-give-saddle-back.patch
similarity index 100%
rename from patches/server/0121-Striders-give-saddle-back.patch
rename to patches/todo/server/0121-Striders-give-saddle-back.patch
diff --git a/patches/server/0122-PlayerBookTooLargeEvent.patch b/patches/todo/server/0122-PlayerBookTooLargeEvent.patch
similarity index 100%
rename from patches/server/0122-PlayerBookTooLargeEvent.patch
rename to patches/todo/server/0122-PlayerBookTooLargeEvent.patch
diff --git a/patches/server/0123-Full-netherite-armor-grants-fire-resistance.patch b/patches/todo/server/0123-Full-netherite-armor-grants-fire-resistance.patch
similarity index 100%
rename from patches/server/0123-Full-netherite-armor-grants-fire-resistance.patch
rename to patches/todo/server/0123-Full-netherite-armor-grants-fire-resistance.patch
diff --git a/patches/server/0124-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/todo/server/0124-Fix-rotating-UP-DOWN-CW-and-CCW.patch
similarity index 100%
rename from patches/server/0124-Fix-rotating-UP-DOWN-CW-and-CCW.patch
rename to patches/todo/server/0124-Fix-rotating-UP-DOWN-CW-and-CCW.patch
diff --git a/patches/server/0125-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/todo/server/0125-Add-mobGriefing-bypass-to-everything-affected.patch
similarity index 100%
rename from patches/server/0125-Add-mobGriefing-bypass-to-everything-affected.patch
rename to patches/todo/server/0125-Add-mobGriefing-bypass-to-everything-affected.patch
diff --git a/patches/server/0126-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/todo/server/0126-Config-to-allow-Note-Block-sounds-when-blocked.patch
similarity index 100%
rename from patches/server/0126-Config-to-allow-Note-Block-sounds-when-blocked.patch
rename to patches/todo/server/0126-Config-to-allow-Note-Block-sounds-when-blocked.patch
diff --git a/patches/server/0127-Add-EntityTeleportHinderedEvent.patch b/patches/todo/server/0127-Add-EntityTeleportHinderedEvent.patch
similarity index 100%
rename from patches/server/0127-Add-EntityTeleportHinderedEvent.patch
rename to patches/todo/server/0127-Add-EntityTeleportHinderedEvent.patch
diff --git a/patches/server/0128-Farmland-trampling-changes.patch b/patches/todo/server/0128-Farmland-trampling-changes.patch
similarity index 100%
rename from patches/server/0128-Farmland-trampling-changes.patch
rename to patches/todo/server/0128-Farmland-trampling-changes.patch
diff --git a/patches/server/0129-Movement-options-for-armor-stands.patch b/patches/todo/server/0129-Movement-options-for-armor-stands.patch
similarity index 100%
rename from patches/server/0129-Movement-options-for-armor-stands.patch
rename to patches/todo/server/0129-Movement-options-for-armor-stands.patch
diff --git a/patches/server/0130-Fix-stuck-in-portals.patch b/patches/todo/server/0130-Fix-stuck-in-portals.patch
similarity index 100%
rename from patches/server/0130-Fix-stuck-in-portals.patch
rename to patches/todo/server/0130-Fix-stuck-in-portals.patch
diff --git a/patches/server/0131-Toggle-for-water-sensitive-mob-damage.patch b/patches/todo/server/0131-Toggle-for-water-sensitive-mob-damage.patch
similarity index 100%
rename from patches/server/0131-Toggle-for-water-sensitive-mob-damage.patch
rename to patches/todo/server/0131-Toggle-for-water-sensitive-mob-damage.patch
diff --git a/patches/server/0132-Config-to-always-tame-in-Creative.patch b/patches/todo/server/0132-Config-to-always-tame-in-Creative.patch
similarity index 100%
rename from patches/server/0132-Config-to-always-tame-in-Creative.patch
rename to patches/todo/server/0132-Config-to-always-tame-in-Creative.patch
diff --git a/patches/server/0133-End-crystal-explosion-options.patch b/patches/todo/server/0133-End-crystal-explosion-options.patch
similarity index 100%
rename from patches/server/0133-End-crystal-explosion-options.patch
rename to patches/todo/server/0133-End-crystal-explosion-options.patch
diff --git a/patches/server/0134-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/todo/server/0134-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
similarity index 100%
rename from patches/server/0134-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
rename to patches/todo/server/0134-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
diff --git a/patches/server/0135-Dont-run-with-scissors.patch b/patches/todo/server/0135-Dont-run-with-scissors.patch
similarity index 100%
rename from patches/server/0135-Dont-run-with-scissors.patch
rename to patches/todo/server/0135-Dont-run-with-scissors.patch
diff --git a/patches/server/0136-One-Punch-Man.patch b/patches/todo/server/0136-One-Punch-Man.patch
similarity index 100%
rename from patches/server/0136-One-Punch-Man.patch
rename to patches/todo/server/0136-One-Punch-Man.patch
diff --git a/patches/server/0137-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/todo/server/0137-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
similarity index 100%
rename from patches/server/0137-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
rename to patches/todo/server/0137-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch
diff --git a/patches/server/0138-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/todo/server/0138-Config-to-ignore-nearby-mobs-when-sleeping.patch
similarity index 100%
rename from patches/server/0138-Config-to-ignore-nearby-mobs-when-sleeping.patch
rename to patches/todo/server/0138-Config-to-ignore-nearby-mobs-when-sleeping.patch
diff --git a/patches/server/0139-Add-back-player-spawned-endermite-API.patch b/patches/todo/server/0139-Add-back-player-spawned-endermite-API.patch
similarity index 100%
rename from patches/server/0139-Add-back-player-spawned-endermite-API.patch
rename to patches/todo/server/0139-Add-back-player-spawned-endermite-API.patch
diff --git a/patches/server/0140-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/todo/server/0140-Config-Enderman-aggressiveness-towards-Endermites.patch
similarity index 100%
rename from patches/server/0140-Config-Enderman-aggressiveness-towards-Endermites.patch
rename to patches/todo/server/0140-Config-Enderman-aggressiveness-towards-Endermites.patch
diff --git a/patches/server/0141-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/todo/server/0141-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
similarity index 100%
rename from patches/server/0141-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
rename to patches/todo/server/0141-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch
diff --git a/patches/server/0142-Tick-fluids-config.patch b/patches/todo/server/0142-Tick-fluids-config.patch
similarity index 100%
rename from patches/server/0142-Tick-fluids-config.patch
rename to patches/todo/server/0142-Tick-fluids-config.patch
diff --git a/patches/server/0143-Config-to-disable-Llama-caravans.patch b/patches/todo/server/0143-Config-to-disable-Llama-caravans.patch
similarity index 100%
rename from patches/server/0143-Config-to-disable-Llama-caravans.patch
rename to patches/todo/server/0143-Config-to-disable-Llama-caravans.patch
diff --git a/patches/server/0144-Config-to-make-Creepers-explode-on-death.patch b/patches/todo/server/0144-Config-to-make-Creepers-explode-on-death.patch
similarity index 100%
rename from patches/server/0144-Config-to-make-Creepers-explode-on-death.patch
rename to patches/todo/server/0144-Config-to-make-Creepers-explode-on-death.patch
diff --git a/patches/server/0145-Configurable-ravager-griefable-blocks-list.patch b/patches/todo/server/0145-Configurable-ravager-griefable-blocks-list.patch
similarity index 100%
rename from patches/server/0145-Configurable-ravager-griefable-blocks-list.patch
rename to patches/todo/server/0145-Configurable-ravager-griefable-blocks-list.patch
diff --git a/patches/server/0146-Sneak-to-bulk-process-composter.patch b/patches/todo/server/0146-Sneak-to-bulk-process-composter.patch
similarity index 100%
rename from patches/server/0146-Sneak-to-bulk-process-composter.patch
rename to patches/todo/server/0146-Sneak-to-bulk-process-composter.patch
diff --git a/patches/server/0147-Config-for-skipping-night.patch b/patches/todo/server/0147-Config-for-skipping-night.patch
similarity index 100%
rename from patches/server/0147-Config-for-skipping-night.patch
rename to patches/todo/server/0147-Config-for-skipping-night.patch
diff --git a/patches/server/0148-Add-config-for-villager-trading.patch b/patches/todo/server/0148-Add-config-for-villager-trading.patch
similarity index 100%
rename from patches/server/0148-Add-config-for-villager-trading.patch
rename to patches/todo/server/0148-Add-config-for-villager-trading.patch
diff --git a/patches/server/0149-Allow-infinity-on-crossbows.patch b/patches/todo/server/0149-Allow-infinity-on-crossbows.patch
similarity index 100%
rename from patches/server/0149-Allow-infinity-on-crossbows.patch
rename to patches/todo/server/0149-Allow-infinity-on-crossbows.patch
diff --git a/patches/server/0150-Drowning-Settings.patch b/patches/todo/server/0150-Drowning-Settings.patch
similarity index 100%
rename from patches/server/0150-Drowning-Settings.patch
rename to patches/todo/server/0150-Drowning-Settings.patch
diff --git a/patches/server/0151-Break-individual-slabs-when-sneaking.patch b/patches/todo/server/0151-Break-individual-slabs-when-sneaking.patch
similarity index 100%
rename from patches/server/0151-Break-individual-slabs-when-sneaking.patch
rename to patches/todo/server/0151-Break-individual-slabs-when-sneaking.patch
diff --git a/patches/server/0152-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/todo/server/0152-Config-to-disable-hostile-mob-spawn-on-ice.patch
similarity index 100%
rename from patches/server/0152-Config-to-disable-hostile-mob-spawn-on-ice.patch
rename to patches/todo/server/0152-Config-to-disable-hostile-mob-spawn-on-ice.patch
diff --git a/patches/server/0153-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/todo/server/0153-Config-to-show-Armor-Stand-arms-on-spawn.patch
similarity index 100%
rename from patches/server/0153-Config-to-show-Armor-Stand-arms-on-spawn.patch
rename to patches/todo/server/0153-Config-to-show-Armor-Stand-arms-on-spawn.patch
diff --git a/patches/server/0154-Option-to-make-doors-require-redstone.patch b/patches/todo/server/0154-Option-to-make-doors-require-redstone.patch
similarity index 100%
rename from patches/server/0154-Option-to-make-doors-require-redstone.patch
rename to patches/todo/server/0154-Option-to-make-doors-require-redstone.patch
diff --git a/patches/server/0155-Config-to-allow-for-unsafe-enchants.patch b/patches/todo/server/0155-Config-to-allow-for-unsafe-enchants.patch
similarity index 100%
rename from patches/server/0155-Config-to-allow-for-unsafe-enchants.patch
rename to patches/todo/server/0155-Config-to-allow-for-unsafe-enchants.patch
diff --git a/patches/server/0156-Configurable-sponge-absorption.patch b/patches/todo/server/0156-Configurable-sponge-absorption.patch
similarity index 100%
rename from patches/server/0156-Configurable-sponge-absorption.patch
rename to patches/todo/server/0156-Configurable-sponge-absorption.patch
diff --git a/patches/server/0157-Projectile-offset-config.patch b/patches/todo/server/0157-Projectile-offset-config.patch
similarity index 100%
rename from patches/server/0157-Projectile-offset-config.patch
rename to patches/todo/server/0157-Projectile-offset-config.patch
diff --git a/patches/server/0158-Config-for-powered-rail-activation-distance.patch b/patches/todo/server/0158-Config-for-powered-rail-activation-distance.patch
similarity index 100%
rename from patches/server/0158-Config-for-powered-rail-activation-distance.patch
rename to patches/todo/server/0158-Config-for-powered-rail-activation-distance.patch
diff --git a/patches/server/0159-Piglin-portal-spawn-modifier.patch b/patches/todo/server/0159-Piglin-portal-spawn-modifier.patch
similarity index 100%
rename from patches/server/0159-Piglin-portal-spawn-modifier.patch
rename to patches/todo/server/0159-Piglin-portal-spawn-modifier.patch
diff --git a/patches/server/0160-Config-to-change-max-number-of-bees.patch b/patches/todo/server/0160-Config-to-change-max-number-of-bees.patch
similarity index 100%
rename from patches/server/0160-Config-to-change-max-number-of-bees.patch
rename to patches/todo/server/0160-Config-to-change-max-number-of-bees.patch
diff --git a/patches/server/0161-Config-for-wither-explosion-radius.patch b/patches/todo/server/0161-Config-for-wither-explosion-radius.patch
similarity index 100%
rename from patches/server/0161-Config-for-wither-explosion-radius.patch
rename to patches/todo/server/0161-Config-for-wither-explosion-radius.patch
diff --git a/patches/server/0162-Gamemode-extra-permissions.patch b/patches/todo/server/0162-Gamemode-extra-permissions.patch
similarity index 100%
rename from patches/server/0162-Gamemode-extra-permissions.patch
rename to patches/todo/server/0162-Gamemode-extra-permissions.patch
diff --git a/patches/server/0163-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/todo/server/0163-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
similarity index 100%
rename from patches/server/0163-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
rename to patches/todo/server/0163-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch
diff --git a/patches/server/0164-Configurable-piston-push-limit.patch b/patches/todo/server/0164-Configurable-piston-push-limit.patch
similarity index 100%
rename from patches/server/0164-Configurable-piston-push-limit.patch
rename to patches/todo/server/0164-Configurable-piston-push-limit.patch
diff --git a/patches/server/0165-Configurable-broadcast-settings.patch b/patches/todo/server/0165-Configurable-broadcast-settings.patch
similarity index 100%
rename from patches/server/0165-Configurable-broadcast-settings.patch
rename to patches/todo/server/0165-Configurable-broadcast-settings.patch
diff --git a/patches/server/0166-Configurable-mob-blindness.patch b/patches/todo/server/0166-Configurable-mob-blindness.patch
similarity index 100%
rename from patches/server/0166-Configurable-mob-blindness.patch
rename to patches/todo/server/0166-Configurable-mob-blindness.patch
diff --git a/patches/server/0167-Hide-hidden-players-from-entity-selector.patch b/patches/todo/server/0167-Hide-hidden-players-from-entity-selector.patch
similarity index 100%
rename from patches/server/0167-Hide-hidden-players-from-entity-selector.patch
rename to patches/todo/server/0167-Hide-hidden-players-from-entity-selector.patch
diff --git a/patches/server/0168-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/todo/server/0168-Config-for-health-to-impact-Creeper-explosion-radius.patch
similarity index 100%
rename from patches/server/0168-Config-for-health-to-impact-Creeper-explosion-radius.patch
rename to patches/todo/server/0168-Config-for-health-to-impact-Creeper-explosion-radius.patch
diff --git a/patches/server/0169-Iron-golem-calm-anger-options.patch b/patches/todo/server/0169-Iron-golem-calm-anger-options.patch
similarity index 100%
rename from patches/server/0169-Iron-golem-calm-anger-options.patch
rename to patches/todo/server/0169-Iron-golem-calm-anger-options.patch
diff --git a/patches/server/0170-Breedable-parrots.patch b/patches/todo/server/0170-Breedable-parrots.patch
similarity index 100%
rename from patches/server/0170-Breedable-parrots.patch
rename to patches/todo/server/0170-Breedable-parrots.patch
diff --git a/patches/server/0171-Configurable-powered-rail-boost-modifier.patch b/patches/todo/server/0171-Configurable-powered-rail-boost-modifier.patch
similarity index 100%
rename from patches/server/0171-Configurable-powered-rail-boost-modifier.patch
rename to patches/todo/server/0171-Configurable-powered-rail-boost-modifier.patch
diff --git a/patches/server/0172-Add-config-change-multiplier-critical-damage-value.patch b/patches/todo/server/0172-Add-config-change-multiplier-critical-damage-value.patch
similarity index 100%
rename from patches/server/0172-Add-config-change-multiplier-critical-damage-value.patch
rename to patches/todo/server/0172-Add-config-change-multiplier-critical-damage-value.patch
diff --git a/patches/server/0173-Option-to-disable-dragon-egg-teleporting.patch b/patches/todo/server/0173-Option-to-disable-dragon-egg-teleporting.patch
similarity index 100%
rename from patches/server/0173-Option-to-disable-dragon-egg-teleporting.patch
rename to patches/todo/server/0173-Option-to-disable-dragon-egg-teleporting.patch
diff --git a/patches/server/0174-Config-for-unverified-username-message.patch b/patches/todo/server/0174-Config-for-unverified-username-message.patch
similarity index 100%
rename from patches/server/0174-Config-for-unverified-username-message.patch
rename to patches/todo/server/0174-Config-for-unverified-username-message.patch
diff --git a/patches/server/0175-Make-anvil-cumulative-cost-configurable.patch b/patches/todo/server/0175-Make-anvil-cumulative-cost-configurable.patch
similarity index 100%
rename from patches/server/0175-Make-anvil-cumulative-cost-configurable.patch
rename to patches/todo/server/0175-Make-anvil-cumulative-cost-configurable.patch
diff --git a/patches/server/0176-ShulkerBox-allow-oversized-stacks.patch b/patches/todo/server/0176-ShulkerBox-allow-oversized-stacks.patch
similarity index 100%
rename from patches/server/0176-ShulkerBox-allow-oversized-stacks.patch
rename to patches/todo/server/0176-ShulkerBox-allow-oversized-stacks.patch
diff --git a/patches/server/0177-Bee-can-work-when-raining-or-at-night.patch b/patches/todo/server/0177-Bee-can-work-when-raining-or-at-night.patch
similarity index 100%
rename from patches/server/0177-Bee-can-work-when-raining-or-at-night.patch
rename to patches/todo/server/0177-Bee-can-work-when-raining-or-at-night.patch
diff --git a/patches/server/0178-API-for-any-mob-to-burn-daylight.patch b/patches/todo/server/0178-API-for-any-mob-to-burn-daylight.patch
similarity index 100%
rename from patches/server/0178-API-for-any-mob-to-burn-daylight.patch
rename to patches/todo/server/0178-API-for-any-mob-to-burn-daylight.patch
diff --git a/patches/server/0179-Config-MobEffect-by-world.patch b/patches/todo/server/0179-Config-MobEffect-by-world.patch
similarity index 100%
rename from patches/server/0179-Config-MobEffect-by-world.patch
rename to patches/todo/server/0179-Config-MobEffect-by-world.patch
diff --git a/patches/server/0180-Beacon-Activation-Range-Configurable.patch b/patches/todo/server/0180-Beacon-Activation-Range-Configurable.patch
similarity index 100%
rename from patches/server/0180-Beacon-Activation-Range-Configurable.patch
rename to patches/todo/server/0180-Beacon-Activation-Range-Configurable.patch
diff --git a/patches/server/0181-Add-toggle-for-sand-duping-fix.patch b/patches/todo/server/0181-Add-toggle-for-sand-duping-fix.patch
similarity index 100%
rename from patches/server/0181-Add-toggle-for-sand-duping-fix.patch
rename to patches/todo/server/0181-Add-toggle-for-sand-duping-fix.patch
diff --git a/patches/server/0182-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/todo/server/0182-Add-toggle-for-end-portal-safe-teleporting.patch
similarity index 100%
rename from patches/server/0182-Add-toggle-for-end-portal-safe-teleporting.patch
rename to patches/todo/server/0182-Add-toggle-for-end-portal-safe-teleporting.patch
diff --git a/patches/server/0183-Make-lightning-rod-range-configurable.patch b/patches/todo/server/0183-Make-lightning-rod-range-configurable.patch
similarity index 100%
rename from patches/server/0183-Make-lightning-rod-range-configurable.patch
rename to patches/todo/server/0183-Make-lightning-rod-range-configurable.patch
diff --git a/patches/server/0184-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/todo/server/0184-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
similarity index 100%
rename from patches/server/0184-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
rename to patches/todo/server/0184-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch
diff --git a/patches/server/0185-Allow-player-join-full-server-by-permission.patch b/patches/todo/server/0185-Allow-player-join-full-server-by-permission.patch
similarity index 100%
rename from patches/server/0185-Allow-player-join-full-server-by-permission.patch
rename to patches/todo/server/0185-Allow-player-join-full-server-by-permission.patch
diff --git a/patches/server/0186-Add-portal-waiting-option-permission-bypass.patch b/patches/todo/server/0186-Add-portal-waiting-option-permission-bypass.patch
similarity index 100%
rename from patches/server/0186-Add-portal-waiting-option-permission-bypass.patch
rename to patches/todo/server/0186-Add-portal-waiting-option-permission-bypass.patch
diff --git a/patches/server/0187-Shulker-spawn-from-bullet-options.patch b/patches/todo/server/0187-Shulker-spawn-from-bullet-options.patch
similarity index 100%
rename from patches/server/0187-Shulker-spawn-from-bullet-options.patch
rename to patches/todo/server/0187-Shulker-spawn-from-bullet-options.patch
diff --git a/patches/server/0188-Eating-glow-berries-adds-glow-effect.patch b/patches/todo/server/0188-Eating-glow-berries-adds-glow-effect.patch
similarity index 100%
rename from patches/server/0188-Eating-glow-berries-adds-glow-effect.patch
rename to patches/todo/server/0188-Eating-glow-berries-adds-glow-effect.patch
diff --git a/patches/server/0189-Option-to-make-drowned-break-doors.patch b/patches/todo/server/0189-Option-to-make-drowned-break-doors.patch
similarity index 100%
rename from patches/server/0189-Option-to-make-drowned-break-doors.patch
rename to patches/todo/server/0189-Option-to-make-drowned-break-doors.patch
diff --git a/patches/server/0190-Configurable-hunger-starvation-damage.patch b/patches/todo/server/0190-Configurable-hunger-starvation-damage.patch
similarity index 100%
rename from patches/server/0190-Configurable-hunger-starvation-damage.patch
rename to patches/todo/server/0190-Configurable-hunger-starvation-damage.patch
diff --git a/patches/server/0191-Enhance-SysoutCatcher.patch b/patches/todo/server/0191-Enhance-SysoutCatcher.patch
similarity index 100%
rename from patches/server/0191-Enhance-SysoutCatcher.patch
rename to patches/todo/server/0191-Enhance-SysoutCatcher.patch
diff --git a/patches/server/0192-Add-uptime-command.patch b/patches/todo/server/0192-Add-uptime-command.patch
similarity index 100%
rename from patches/server/0192-Add-uptime-command.patch
rename to patches/todo/server/0192-Add-uptime-command.patch
diff --git a/patches/server/0193-Tool-actionable-options.patch b/patches/todo/server/0193-Tool-actionable-options.patch
similarity index 100%
rename from patches/server/0193-Tool-actionable-options.patch
rename to patches/todo/server/0193-Tool-actionable-options.patch
diff --git a/patches/server/0194-Store-placer-on-Block-when-placed.patch b/patches/todo/server/0194-Store-placer-on-Block-when-placed.patch
similarity index 100%
rename from patches/server/0194-Store-placer-on-Block-when-placed.patch
rename to patches/todo/server/0194-Store-placer-on-Block-when-placed.patch
diff --git a/patches/server/0195-Summoner-API.patch b/patches/todo/server/0195-Summoner-API.patch
similarity index 100%
rename from patches/server/0195-Summoner-API.patch
rename to patches/todo/server/0195-Summoner-API.patch
diff --git a/patches/server/0196-Customizable-sleeping-actionbar-messages.patch b/patches/todo/server/0196-Customizable-sleeping-actionbar-messages.patch
similarity index 100%
rename from patches/server/0196-Customizable-sleeping-actionbar-messages.patch
rename to patches/todo/server/0196-Customizable-sleeping-actionbar-messages.patch
diff --git a/patches/server/0197-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/todo/server/0197-option-to-disable-shulker-box-items-from-dropping-co.patch
similarity index 100%
rename from patches/server/0197-option-to-disable-shulker-box-items-from-dropping-co.patch
rename to patches/todo/server/0197-option-to-disable-shulker-box-items-from-dropping-co.patch
diff --git a/patches/server/0198-Silk-touchable-budding-amethyst.patch b/patches/todo/server/0198-Silk-touchable-budding-amethyst.patch
similarity index 100%
rename from patches/server/0198-Silk-touchable-budding-amethyst.patch
rename to patches/todo/server/0198-Silk-touchable-budding-amethyst.patch
diff --git a/patches/server/0199-Big-dripleaf-tilt-delay.patch b/patches/todo/server/0199-Big-dripleaf-tilt-delay.patch
similarity index 100%
rename from patches/server/0199-Big-dripleaf-tilt-delay.patch
rename to patches/todo/server/0199-Big-dripleaf-tilt-delay.patch
diff --git a/patches/server/0200-Player-ridable-in-water-option.patch b/patches/todo/server/0200-Player-ridable-in-water-option.patch
similarity index 100%
rename from patches/server/0200-Player-ridable-in-water-option.patch
rename to patches/todo/server/0200-Player-ridable-in-water-option.patch
diff --git a/patches/server/0201-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/todo/server/0201-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
similarity index 100%
rename from patches/server/0201-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
rename to patches/todo/server/0201-Config-to-disable-Enderman-teleport-on-projectile-hi.patch
diff --git a/patches/server/0202-Add-compass-command.patch b/patches/todo/server/0202-Add-compass-command.patch
similarity index 100%
rename from patches/server/0202-Add-compass-command.patch
rename to patches/todo/server/0202-Add-compass-command.patch
diff --git a/patches/server/0203-Toggle-for-kinetic-damage.patch b/patches/todo/server/0203-Toggle-for-kinetic-damage.patch
similarity index 100%
rename from patches/server/0203-Toggle-for-kinetic-damage.patch
rename to patches/todo/server/0203-Toggle-for-kinetic-damage.patch
diff --git a/patches/server/0204-Add-Option-for-disable-observer-clocks.patch b/patches/todo/server/0204-Add-Option-for-disable-observer-clocks.patch
similarity index 100%
rename from patches/server/0204-Add-Option-for-disable-observer-clocks.patch
rename to patches/todo/server/0204-Add-Option-for-disable-observer-clocks.patch
diff --git a/patches/server/0205-Customizeable-Zombie-Villager-curing-times.patch b/patches/todo/server/0205-Customizeable-Zombie-Villager-curing-times.patch
similarity index 100%
rename from patches/server/0205-Customizeable-Zombie-Villager-curing-times.patch
rename to patches/todo/server/0205-Customizeable-Zombie-Villager-curing-times.patch
diff --git a/patches/server/0206-Option-for-sponges-to-work-on-lava.patch b/patches/todo/server/0206-Option-for-sponges-to-work-on-lava.patch
similarity index 100%
rename from patches/server/0206-Option-for-sponges-to-work-on-lava.patch
rename to patches/todo/server/0206-Option-for-sponges-to-work-on-lava.patch
diff --git a/patches/server/0207-Toggle-for-Wither-s-spawn-sound.patch b/patches/todo/server/0207-Toggle-for-Wither-s-spawn-sound.patch
similarity index 100%
rename from patches/server/0207-Toggle-for-Wither-s-spawn-sound.patch
rename to patches/todo/server/0207-Toggle-for-Wither-s-spawn-sound.patch
diff --git a/patches/server/0208-Cactus-breaks-from-solid-neighbors-config.patch b/patches/todo/server/0208-Cactus-breaks-from-solid-neighbors-config.patch
similarity index 100%
rename from patches/server/0208-Cactus-breaks-from-solid-neighbors-config.patch
rename to patches/todo/server/0208-Cactus-breaks-from-solid-neighbors-config.patch
diff --git a/patches/server/0209-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/todo/server/0209-Config-to-remove-curse-of-binding-with-weakness.patch
similarity index 100%
rename from patches/server/0209-Config-to-remove-curse-of-binding-with-weakness.patch
rename to patches/todo/server/0209-Config-to-remove-curse-of-binding-with-weakness.patch
diff --git a/patches/server/0210-Conduit-behavior-configuration.patch b/patches/todo/server/0210-Conduit-behavior-configuration.patch
similarity index 100%
rename from patches/server/0210-Conduit-behavior-configuration.patch
rename to patches/todo/server/0210-Conduit-behavior-configuration.patch
diff --git a/patches/server/0211-Cauldron-fill-chances.patch b/patches/todo/server/0211-Cauldron-fill-chances.patch
similarity index 100%
rename from patches/server/0211-Cauldron-fill-chances.patch
rename to patches/todo/server/0211-Cauldron-fill-chances.patch
diff --git a/patches/server/0212-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/todo/server/0212-Config-to-allow-mobs-to-pathfind-over-rails.patch
similarity index 100%
rename from patches/server/0212-Config-to-allow-mobs-to-pathfind-over-rails.patch
rename to patches/todo/server/0212-Config-to-allow-mobs-to-pathfind-over-rails.patch
diff --git a/patches/server/0213-Shulker-change-color-with-dye.patch b/patches/todo/server/0213-Shulker-change-color-with-dye.patch
similarity index 100%
rename from patches/server/0213-Shulker-change-color-with-dye.patch
rename to patches/todo/server/0213-Shulker-change-color-with-dye.patch
diff --git a/patches/server/0214-Extended-OfflinePlayer-API.patch b/patches/todo/server/0214-Extended-OfflinePlayer-API.patch
similarity index 100%
rename from patches/server/0214-Extended-OfflinePlayer-API.patch
rename to patches/todo/server/0214-Extended-OfflinePlayer-API.patch
diff --git a/patches/server/0215-Added-the-ability-to-add-combustible-items.patch b/patches/todo/server/0215-Added-the-ability-to-add-combustible-items.patch
similarity index 100%
rename from patches/server/0215-Added-the-ability-to-add-combustible-items.patch
rename to patches/todo/server/0215-Added-the-ability-to-add-combustible-items.patch
diff --git a/patches/server/0216-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/todo/server/0216-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
similarity index 100%
rename from patches/server/0216-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
rename to patches/todo/server/0216-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
diff --git a/patches/server/0217-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/todo/server/0217-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
similarity index 100%
rename from patches/server/0217-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
rename to patches/todo/server/0217-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch
diff --git a/patches/server/0218-Shift-right-click-to-use-exp-for-mending.patch b/patches/todo/server/0218-Shift-right-click-to-use-exp-for-mending.patch
similarity index 100%
rename from patches/server/0218-Shift-right-click-to-use-exp-for-mending.patch
rename to patches/todo/server/0218-Shift-right-click-to-use-exp-for-mending.patch
diff --git a/patches/server/0219-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/todo/server/0219-Dolphins-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0219-Dolphins-naturally-aggressive-to-players-chance.patch
rename to patches/todo/server/0219-Dolphins-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0220-Cows-naturally-aggressive-to-players-chance.patch b/patches/todo/server/0220-Cows-naturally-aggressive-to-players-chance.patch
similarity index 100%
rename from patches/server/0220-Cows-naturally-aggressive-to-players-chance.patch
rename to patches/todo/server/0220-Cows-naturally-aggressive-to-players-chance.patch
diff --git a/patches/server/0221-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/todo/server/0221-Option-for-beds-to-explode-on-villager-sleep.patch
similarity index 100%
rename from patches/server/0221-Option-for-beds-to-explode-on-villager-sleep.patch
rename to patches/todo/server/0221-Option-for-beds-to-explode-on-villager-sleep.patch
diff --git a/patches/server/0222-Halloween-options-and-optimizations.patch b/patches/todo/server/0222-Halloween-options-and-optimizations.patch
similarity index 100%
rename from patches/server/0222-Halloween-options-and-optimizations.patch
rename to patches/todo/server/0222-Halloween-options-and-optimizations.patch
diff --git a/patches/server/0223-Config-for-grindstones.patch b/patches/todo/server/0223-Config-for-grindstones.patch
similarity index 100%
rename from patches/server/0223-Config-for-grindstones.patch
rename to patches/todo/server/0223-Config-for-grindstones.patch
diff --git a/patches/server/0224-UPnP-Port-Forwarding.patch b/patches/todo/server/0224-UPnP-Port-Forwarding.patch
similarity index 100%
rename from patches/server/0224-UPnP-Port-Forwarding.patch
rename to patches/todo/server/0224-UPnP-Port-Forwarding.patch
diff --git a/patches/server/0225-Campfire-option-for-lit-when-placed.patch b/patches/todo/server/0225-Campfire-option-for-lit-when-placed.patch
similarity index 100%
rename from patches/server/0225-Campfire-option-for-lit-when-placed.patch
rename to patches/todo/server/0225-Campfire-option-for-lit-when-placed.patch
diff --git a/patches/server/0226-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/todo/server/0226-options-to-extinguish-fire-blocks-with-snowballs.patch
similarity index 100%
rename from patches/server/0226-options-to-extinguish-fire-blocks-with-snowballs.patch
rename to patches/todo/server/0226-options-to-extinguish-fire-blocks-with-snowballs.patch
diff --git a/patches/server/0227-Add-option-to-disable-zombie-villagers-cure.patch b/patches/todo/server/0227-Add-option-to-disable-zombie-villagers-cure.patch
similarity index 100%
rename from patches/server/0227-Add-option-to-disable-zombie-villagers-cure.patch
rename to patches/todo/server/0227-Add-option-to-disable-zombie-villagers-cure.patch
diff --git a/patches/server/0228-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/todo/server/0228-Persistent-BlockEntity-Lore-and-DisplayName.patch
similarity index 100%
rename from patches/server/0228-Persistent-BlockEntity-Lore-and-DisplayName.patch
rename to patches/todo/server/0228-Persistent-BlockEntity-Lore-and-DisplayName.patch
diff --git a/patches/server/0229-Signs-allow-color-codes.patch b/patches/todo/server/0229-Signs-allow-color-codes.patch
similarity index 100%
rename from patches/server/0229-Signs-allow-color-codes.patch
rename to patches/todo/server/0229-Signs-allow-color-codes.patch
diff --git a/patches/server/0230-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch b/patches/todo/server/0230-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
similarity index 100%
rename from patches/server/0230-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
rename to patches/todo/server/0230-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch
diff --git a/patches/server/0231-Mobs-always-drop-experience.patch b/patches/todo/server/0231-Mobs-always-drop-experience.patch
similarity index 100%
rename from patches/server/0231-Mobs-always-drop-experience.patch
rename to patches/todo/server/0231-Mobs-always-drop-experience.patch
diff --git a/patches/server/0232-Potion-NamespacedKey.patch b/patches/todo/server/0232-Potion-NamespacedKey.patch
similarity index 100%
rename from patches/server/0232-Potion-NamespacedKey.patch
rename to patches/todo/server/0232-Potion-NamespacedKey.patch
diff --git a/patches/server/0233-Grindstone-API.patch b/patches/todo/server/0233-Grindstone-API.patch
similarity index 100%
rename from patches/server/0233-Grindstone-API.patch
rename to patches/todo/server/0233-Grindstone-API.patch
diff --git a/patches/server/0234-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/todo/server/0234-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
similarity index 100%
rename from patches/server/0234-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
rename to patches/todo/server/0234-Ability-for-hoe-to-replant-crops-and-nether-warts.patch
diff --git a/patches/server/0235-Shearing-jeb-produces-random-color-wool.patch b/patches/todo/server/0235-Shearing-jeb-produces-random-color-wool.patch
similarity index 100%
rename from patches/server/0235-Shearing-jeb-produces-random-color-wool.patch
rename to patches/todo/server/0235-Shearing-jeb-produces-random-color-wool.patch
diff --git a/patches/server/0236-Turtle-eggs-random-tick-crack-chance.patch b/patches/todo/server/0236-Turtle-eggs-random-tick-crack-chance.patch
similarity index 100%
rename from patches/server/0236-Turtle-eggs-random-tick-crack-chance.patch
rename to patches/todo/server/0236-Turtle-eggs-random-tick-crack-chance.patch
diff --git a/patches/server/0237-Mob-head-visibility-percent.patch b/patches/todo/server/0237-Mob-head-visibility-percent.patch
similarity index 100%
rename from patches/server/0237-Mob-head-visibility-percent.patch
rename to patches/todo/server/0237-Mob-head-visibility-percent.patch
diff --git a/patches/server/0238-Configurable-valid-characters-for-usernames.patch b/patches/todo/server/0238-Configurable-valid-characters-for-usernames.patch
similarity index 100%
rename from patches/server/0238-Configurable-valid-characters-for-usernames.patch
rename to patches/todo/server/0238-Configurable-valid-characters-for-usernames.patch
diff --git a/patches/server/0239-Shears-can-have-looting-enchantment.patch b/patches/todo/server/0239-Shears-can-have-looting-enchantment.patch
similarity index 100%
rename from patches/server/0239-Shears-can-have-looting-enchantment.patch
rename to patches/todo/server/0239-Shears-can-have-looting-enchantment.patch
diff --git a/patches/server/0240-Stop-bees-from-dying-after-stinging.patch b/patches/todo/server/0240-Stop-bees-from-dying-after-stinging.patch
similarity index 100%
rename from patches/server/0240-Stop-bees-from-dying-after-stinging.patch
rename to patches/todo/server/0240-Stop-bees-from-dying-after-stinging.patch
diff --git a/patches/server/0241-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/todo/server/0241-Give-bee-counts-in-beehives-to-Purpur-clients.patch
similarity index 100%
rename from patches/server/0241-Give-bee-counts-in-beehives-to-Purpur-clients.patch
rename to patches/todo/server/0241-Give-bee-counts-in-beehives-to-Purpur-clients.patch
diff --git a/patches/server/0242-Configurable-farmland-trample-height.patch b/patches/todo/server/0242-Configurable-farmland-trample-height.patch
similarity index 100%
rename from patches/server/0242-Configurable-farmland-trample-height.patch
rename to patches/todo/server/0242-Configurable-farmland-trample-height.patch
diff --git a/patches/server/0243-Configurable-player-pickup-exp-delay.patch b/patches/todo/server/0243-Configurable-player-pickup-exp-delay.patch
similarity index 100%
rename from patches/server/0243-Configurable-player-pickup-exp-delay.patch
rename to patches/todo/server/0243-Configurable-player-pickup-exp-delay.patch
diff --git a/patches/server/0244-Allow-void-trading.patch b/patches/todo/server/0244-Allow-void-trading.patch
similarity index 100%
rename from patches/server/0244-Allow-void-trading.patch
rename to patches/todo/server/0244-Allow-void-trading.patch
diff --git a/patches/server/0245-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/todo/server/0245-Dont-eat-blocks-in-non-ticking-chunks.patch
similarity index 100%
rename from patches/server/0245-Dont-eat-blocks-in-non-ticking-chunks.patch
rename to patches/todo/server/0245-Dont-eat-blocks-in-non-ticking-chunks.patch
diff --git a/patches/server/0246-Configurable-phantom-size.patch b/patches/todo/server/0246-Configurable-phantom-size.patch
similarity index 100%
rename from patches/server/0246-Configurable-phantom-size.patch
rename to patches/todo/server/0246-Configurable-phantom-size.patch
diff --git a/patches/server/0247-Configurable-food-attributes.patch b/patches/todo/server/0247-Configurable-food-attributes.patch
similarity index 100%
rename from patches/server/0247-Configurable-food-attributes.patch
rename to patches/todo/server/0247-Configurable-food-attributes.patch
diff --git a/patches/server/0248-Max-joins-per-second.patch b/patches/todo/server/0248-Max-joins-per-second.patch
similarity index 100%
rename from patches/server/0248-Max-joins-per-second.patch
rename to patches/todo/server/0248-Max-joins-per-second.patch
diff --git a/patches/server/0249-Configurable-minimum-demand-for-trades.patch b/patches/todo/server/0249-Configurable-minimum-demand-for-trades.patch
similarity index 100%
rename from patches/server/0249-Configurable-minimum-demand-for-trades.patch
rename to patches/todo/server/0249-Configurable-minimum-demand-for-trades.patch
diff --git a/patches/server/0250-Lobotomize-stuck-villagers.patch b/patches/todo/server/0250-Lobotomize-stuck-villagers.patch
similarity index 100%
rename from patches/server/0250-Lobotomize-stuck-villagers.patch
rename to patches/todo/server/0250-Lobotomize-stuck-villagers.patch
diff --git a/patches/server/0251-Option-for-villager-display-trade-item.patch b/patches/todo/server/0251-Option-for-villager-display-trade-item.patch
similarity index 100%
rename from patches/server/0251-Option-for-villager-display-trade-item.patch
rename to patches/todo/server/0251-Option-for-villager-display-trade-item.patch
diff --git a/patches/server/0252-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/todo/server/0252-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
similarity index 100%
rename from patches/server/0252-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
rename to patches/todo/server/0252-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch
diff --git a/patches/server/0253-Config-for-mob-last-hurt-by-player-time.patch b/patches/todo/server/0253-Config-for-mob-last-hurt-by-player-time.patch
similarity index 100%
rename from patches/server/0253-Config-for-mob-last-hurt-by-player-time.patch
rename to patches/todo/server/0253-Config-for-mob-last-hurt-by-player-time.patch
diff --git a/patches/server/0254-Anvil-repair-damage-options.patch b/patches/todo/server/0254-Anvil-repair-damage-options.patch
similarity index 100%
rename from patches/server/0254-Anvil-repair-damage-options.patch
rename to patches/todo/server/0254-Anvil-repair-damage-options.patch
diff --git a/patches/server/0255-Fix-legacy-colors-in-console.patch b/patches/todo/server/0255-Fix-legacy-colors-in-console.patch
similarity index 100%
rename from patches/server/0255-Fix-legacy-colors-in-console.patch
rename to patches/todo/server/0255-Fix-legacy-colors-in-console.patch
diff --git a/patches/server/0256-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/todo/server/0256-Option-to-disable-turtle-egg-trampling-with-feather-.patch
similarity index 100%
rename from patches/server/0256-Option-to-disable-turtle-egg-trampling-with-feather-.patch
rename to patches/todo/server/0256-Option-to-disable-turtle-egg-trampling-with-feather-.patch
diff --git a/patches/server/0257-Add-toggle-for-enchant-level-clamping.patch b/patches/todo/server/0257-Add-toggle-for-enchant-level-clamping.patch
similarity index 100%
rename from patches/server/0257-Add-toggle-for-enchant-level-clamping.patch
rename to patches/todo/server/0257-Add-toggle-for-enchant-level-clamping.patch
diff --git a/patches/server/0258-Skip-junit-tests-for-purpur-commands.patch b/patches/todo/server/0258-Skip-junit-tests-for-purpur-commands.patch
similarity index 100%
rename from patches/server/0258-Skip-junit-tests-for-purpur-commands.patch
rename to patches/todo/server/0258-Skip-junit-tests-for-purpur-commands.patch
diff --git a/patches/server/0259-Implement-configurable-search-radius-for-villagers-t.patch b/patches/todo/server/0259-Implement-configurable-search-radius-for-villagers-t.patch
similarity index 100%
rename from patches/server/0259-Implement-configurable-search-radius-for-villagers-t.patch
rename to patches/todo/server/0259-Implement-configurable-search-radius-for-villagers-t.patch
diff --git a/patches/server/0260-Stonecutter-damage.patch b/patches/todo/server/0260-Stonecutter-damage.patch
similarity index 100%
rename from patches/server/0260-Stonecutter-damage.patch
rename to patches/todo/server/0260-Stonecutter-damage.patch
diff --git a/patches/server/0261-Configurable-damage-settings-for-magma-blocks.patch b/patches/todo/server/0261-Configurable-damage-settings-for-magma-blocks.patch
similarity index 100%
rename from patches/server/0261-Configurable-damage-settings-for-magma-blocks.patch
rename to patches/todo/server/0261-Configurable-damage-settings-for-magma-blocks.patch
diff --git a/patches/server/0262-Add-config-for-snow-on-blue-ice.patch b/patches/todo/server/0262-Add-config-for-snow-on-blue-ice.patch
similarity index 100%
rename from patches/server/0262-Add-config-for-snow-on-blue-ice.patch
rename to patches/todo/server/0262-Add-config-for-snow-on-blue-ice.patch
diff --git a/patches/server/0263-Skeletons-eat-wither-roses.patch b/patches/todo/server/0263-Skeletons-eat-wither-roses.patch
similarity index 100%
rename from patches/server/0263-Skeletons-eat-wither-roses.patch
rename to patches/todo/server/0263-Skeletons-eat-wither-roses.patch
diff --git a/patches/server/0264-Enchantment-Table-Persists-Lapis.patch b/patches/todo/server/0264-Enchantment-Table-Persists-Lapis.patch
similarity index 100%
rename from patches/server/0264-Enchantment-Table-Persists-Lapis.patch
rename to patches/todo/server/0264-Enchantment-Table-Persists-Lapis.patch
diff --git a/patches/server/0265-Spark-Profiler.patch b/patches/todo/server/0265-Spark-Profiler.patch
similarity index 100%
rename from patches/server/0265-Spark-Profiler.patch
rename to patches/todo/server/0265-Spark-Profiler.patch
diff --git a/patches/server/0266-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/todo/server/0266-Option-to-disable-kick-for-out-of-order-chat.patch
similarity index 100%
rename from patches/server/0266-Option-to-disable-kick-for-out-of-order-chat.patch
rename to patches/todo/server/0266-Option-to-disable-kick-for-out-of-order-chat.patch
diff --git a/patches/server/0267-Config-for-sculk-shrieker-can_summon-state.patch b/patches/todo/server/0267-Config-for-sculk-shrieker-can_summon-state.patch
similarity index 100%
rename from patches/server/0267-Config-for-sculk-shrieker-can_summon-state.patch
rename to patches/todo/server/0267-Config-for-sculk-shrieker-can_summon-state.patch
diff --git a/patches/server/0268-Config-to-not-let-coral-die.patch b/patches/todo/server/0268-Config-to-not-let-coral-die.patch
similarity index 100%
rename from patches/server/0268-Config-to-not-let-coral-die.patch
rename to patches/todo/server/0268-Config-to-not-let-coral-die.patch
diff --git a/patches/server/0269-Add-local-difficulty-api.patch b/patches/todo/server/0269-Add-local-difficulty-api.patch
similarity index 100%
rename from patches/server/0269-Add-local-difficulty-api.patch
rename to patches/todo/server/0269-Add-local-difficulty-api.patch
diff --git a/patches/server/0270-Add-toggle-for-RNG-manipulation.patch b/patches/todo/server/0270-Add-toggle-for-RNG-manipulation.patch
similarity index 100%
rename from patches/server/0270-Add-toggle-for-RNG-manipulation.patch
rename to patches/todo/server/0270-Add-toggle-for-RNG-manipulation.patch
diff --git a/patches/server/0271-Send-client-custom-name-of-BE.patch b/patches/todo/server/0271-Send-client-custom-name-of-BE.patch
similarity index 100%
rename from patches/server/0271-Send-client-custom-name-of-BE.patch
rename to patches/todo/server/0271-Send-client-custom-name-of-BE.patch
diff --git a/patches/server/0272-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch b/patches/todo/server/0272-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch
similarity index 100%
rename from patches/server/0272-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch
rename to patches/todo/server/0272-PaperPR-7822-Fix-exact-choice-recipe-book-clicks.patch
diff --git a/patches/server/0273-Allow-custom-ChatDecorators.patch b/patches/todo/server/0273-Allow-custom-ChatDecorators.patch
similarity index 100%
rename from patches/server/0273-Allow-custom-ChatDecorators.patch
rename to patches/todo/server/0273-Allow-custom-ChatDecorators.patch
diff --git a/patches/server/0274-Cache-server-motd.patch b/patches/todo/server/0274-Cache-server-motd.patch
similarity index 100%
rename from patches/server/0274-Cache-server-motd.patch
rename to patches/todo/server/0274-Cache-server-motd.patch
diff --git a/patches/server/0275-Remove-Timings.patch b/patches/todo/server/0275-Remove-Timings.patch
similarity index 100%
rename from patches/server/0275-Remove-Timings.patch
rename to patches/todo/server/0275-Remove-Timings.patch
diff --git a/patches/server/0276-Remove-Mojang-Profiler.patch b/patches/todo/server/0276-Remove-Mojang-Profiler.patch
similarity index 100%
rename from patches/server/0276-Remove-Mojang-Profiler.patch
rename to patches/todo/server/0276-Remove-Mojang-Profiler.patch
diff --git a/patches/server/0277-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/todo/server/0277-Add-more-logger-output-for-invalid-movement-kicks.patch
similarity index 100%
rename from patches/server/0277-Add-more-logger-output-for-invalid-movement-kicks.patch
rename to patches/todo/server/0277-Add-more-logger-output-for-invalid-movement-kicks.patch
diff --git a/patches/server/0278-Add-Bee-API.patch b/patches/todo/server/0278-Add-Bee-API.patch
similarity index 100%
rename from patches/server/0278-Add-Bee-API.patch
rename to patches/todo/server/0278-Add-Bee-API.patch
diff --git a/patches/server/0279-Debug-Marker-API.patch b/patches/todo/server/0279-Debug-Marker-API.patch
similarity index 100%
rename from patches/server/0279-Debug-Marker-API.patch
rename to patches/todo/server/0279-Debug-Marker-API.patch
diff --git a/patches/server/0280-mob-spawning-option-to-ignore-creative-players.patch b/patches/todo/server/0280-mob-spawning-option-to-ignore-creative-players.patch
similarity index 100%
rename from patches/server/0280-mob-spawning-option-to-ignore-creative-players.patch
rename to patches/todo/server/0280-mob-spawning-option-to-ignore-creative-players.patch
diff --git a/patches/server/0281-Add-skeleton-bow-accuracy-option.patch b/patches/todo/server/0281-Add-skeleton-bow-accuracy-option.patch
similarity index 100%
rename from patches/server/0281-Add-skeleton-bow-accuracy-option.patch
rename to patches/todo/server/0281-Add-skeleton-bow-accuracy-option.patch
diff --git a/patches/server/0282-Allay-respect-item-NBT.patch b/patches/todo/server/0282-Allay-respect-item-NBT.patch
similarity index 100%
rename from patches/server/0282-Allay-respect-item-NBT.patch
rename to patches/todo/server/0282-Allay-respect-item-NBT.patch
diff --git a/patches/server/0283-Add-death-screen-API.patch b/patches/todo/server/0283-Add-death-screen-API.patch
similarity index 100%
rename from patches/server/0283-Add-death-screen-API.patch
rename to patches/todo/server/0283-Add-death-screen-API.patch
diff --git a/patches/server/0284-Make-pufferfish-config-relocatable.patch b/patches/todo/server/0284-Make-pufferfish-config-relocatable.patch
similarity index 100%
rename from patches/server/0284-Make-pufferfish-config-relocatable.patch
rename to patches/todo/server/0284-Make-pufferfish-config-relocatable.patch
diff --git a/patches/server/0285-Implement-ram-and-rambar-commands.patch b/patches/todo/server/0285-Implement-ram-and-rambar-commands.patch
similarity index 100%
rename from patches/server/0285-Implement-ram-and-rambar-commands.patch
rename to patches/todo/server/0285-Implement-ram-and-rambar-commands.patch
diff --git a/patches/server/0286-Add-item-packet-serialize-event.patch b/patches/todo/server/0286-Add-item-packet-serialize-event.patch
similarity index 100%
rename from patches/server/0286-Add-item-packet-serialize-event.patch
rename to patches/todo/server/0286-Add-item-packet-serialize-event.patch
diff --git a/patches/server/0287-Fix-MC-123848.patch b/patches/todo/server/0287-Fix-MC-123848.patch
similarity index 100%
rename from patches/server/0287-Fix-MC-123848.patch
rename to patches/todo/server/0287-Fix-MC-123848.patch
diff --git a/patches/server/0288-Implement-squid-colors-for-rainglow-fabric-mod.patch b/patches/todo/server/0288-Implement-squid-colors-for-rainglow-fabric-mod.patch
similarity index 100%
rename from patches/server/0288-Implement-squid-colors-for-rainglow-fabric-mod.patch
rename to patches/todo/server/0288-Implement-squid-colors-for-rainglow-fabric-mod.patch
diff --git a/patches/server/0289-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/todo/server/0289-Add-an-option-to-fix-MC-3304-projectile-looting.patch
similarity index 100%
rename from patches/server/0289-Add-an-option-to-fix-MC-3304-projectile-looting.patch
rename to patches/todo/server/0289-Add-an-option-to-fix-MC-3304-projectile-looting.patch
diff --git a/patches/server/0290-Configurable-block-blast-resistance.patch b/patches/todo/server/0290-Configurable-block-blast-resistance.patch
similarity index 100%
rename from patches/server/0290-Configurable-block-blast-resistance.patch
rename to patches/todo/server/0290-Configurable-block-blast-resistance.patch
diff --git a/patches/server/0291-Configurable-block-fall-damage-modifiers.patch b/patches/todo/server/0291-Configurable-block-fall-damage-modifiers.patch
similarity index 100%
rename from patches/server/0291-Configurable-block-fall-damage-modifiers.patch
rename to patches/todo/server/0291-Configurable-block-fall-damage-modifiers.patch
diff --git a/patches/server/0292-Language-API.patch b/patches/todo/server/0292-Language-API.patch
similarity index 100%
rename from patches/server/0292-Language-API.patch
rename to patches/todo/server/0292-Language-API.patch
diff --git a/patches/server/0293-Milk-Keeps-Beneficial-Effects.patch b/patches/todo/server/0293-Milk-Keeps-Beneficial-Effects.patch
similarity index 100%
rename from patches/server/0293-Milk-Keeps-Beneficial-Effects.patch
rename to patches/todo/server/0293-Milk-Keeps-Beneficial-Effects.patch
diff --git a/patches/server/0294-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/todo/server/0294-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
similarity index 100%
rename from patches/server/0294-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
rename to patches/todo/server/0294-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch
diff --git a/patches/server/0295-Add-log-suppression-for-LibraryLoader.patch b/patches/todo/server/0295-Add-log-suppression-for-LibraryLoader.patch
similarity index 100%
rename from patches/server/0295-Add-log-suppression-for-LibraryLoader.patch
rename to patches/todo/server/0295-Add-log-suppression-for-LibraryLoader.patch
diff --git a/patches/server/0296-Allow-Transparent-Blocks-In-Enchanting-Box.patch b/patches/todo/server/0296-Allow-Transparent-Blocks-In-Enchanting-Box.patch
similarity index 100%
rename from patches/server/0296-Allow-Transparent-Blocks-In-Enchanting-Box.patch
rename to patches/todo/server/0296-Allow-Transparent-Blocks-In-Enchanting-Box.patch
diff --git a/patches/server/0297-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/todo/server/0297-Add-option-to-allow-creeper-to-encircle-target-when-.patch
similarity index 100%
rename from patches/server/0297-Add-option-to-allow-creeper-to-encircle-target-when-.patch
rename to patches/todo/server/0297-Add-option-to-allow-creeper-to-encircle-target-when-.patch
diff --git a/patches/server/0298-Fire-Immunity-API.patch b/patches/todo/server/0298-Fire-Immunity-API.patch
similarity index 100%
rename from patches/server/0298-Fire-Immunity-API.patch
rename to patches/todo/server/0298-Fire-Immunity-API.patch
diff --git a/patches/server/0299-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/todo/server/0299-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
similarity index 100%
rename from patches/server/0299-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
rename to patches/todo/server/0299-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch
diff --git a/patches/server/0300-Added-got-ram-event.patch b/patches/todo/server/0300-Added-got-ram-event.patch
similarity index 100%
rename from patches/server/0300-Added-got-ram-event.patch
rename to patches/todo/server/0300-Added-got-ram-event.patch
diff --git a/patches/server/0301-Log-skipped-entity-s-position.patch b/patches/todo/server/0301-Log-skipped-entity-s-position.patch
similarity index 100%
rename from patches/server/0301-Log-skipped-entity-s-position.patch
rename to patches/todo/server/0301-Log-skipped-entity-s-position.patch
diff --git a/patches/server/0302-End-Crystal-Cramming.patch b/patches/todo/server/0302-End-Crystal-Cramming.patch
similarity index 100%
rename from patches/server/0302-End-Crystal-Cramming.patch
rename to patches/todo/server/0302-End-Crystal-Cramming.patch
diff --git a/patches/server/0303-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/todo/server/0303-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
similarity index 100%
rename from patches/server/0303-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
rename to patches/todo/server/0303-Option-to-allow-beacon-effects-when-covered-by-tinte.patch
diff --git a/patches/server/0304-Add-attribute-clamping-and-armor-limit-config.patch b/patches/todo/server/0304-Add-attribute-clamping-and-armor-limit-config.patch
similarity index 100%
rename from patches/server/0304-Add-attribute-clamping-and-armor-limit-config.patch
rename to patches/todo/server/0304-Add-attribute-clamping-and-armor-limit-config.patch
diff --git a/patches/server/0305-Config-to-remove-explosion-radius-clamp.patch b/patches/todo/server/0305-Config-to-remove-explosion-radius-clamp.patch
similarity index 100%
rename from patches/server/0305-Config-to-remove-explosion-radius-clamp.patch
rename to patches/todo/server/0305-Config-to-remove-explosion-radius-clamp.patch
diff --git a/patches/server/0306-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/todo/server/0306-bonemealable-sugarcane-cactus-and-netherwart.patch
similarity index 100%
rename from patches/server/0306-bonemealable-sugarcane-cactus-and-netherwart.patch
rename to patches/todo/server/0306-bonemealable-sugarcane-cactus-and-netherwart.patch
diff --git a/patches/server/0307-Add-PreExplodeEvents.patch b/patches/todo/server/0307-Add-PreExplodeEvents.patch
similarity index 100%
rename from patches/server/0307-Add-PreExplodeEvents.patch
rename to patches/todo/server/0307-Add-PreExplodeEvents.patch
diff --git a/patches/server/0308-Improve-output-of-plugins-command.patch b/patches/todo/server/0308-Improve-output-of-plugins-command.patch
similarity index 100%
rename from patches/server/0308-Improve-output-of-plugins-command.patch
rename to patches/todo/server/0308-Improve-output-of-plugins-command.patch
diff --git a/patches/server/0309-Make-GUI-Great-Again.patch b/patches/todo/server/0309-Make-GUI-Great-Again.patch
similarity index 100%
rename from patches/server/0309-Make-GUI-Great-Again.patch
rename to patches/todo/server/0309-Make-GUI-Great-Again.patch