diff --git a/gradle.properties b/gradle.properties index 1c28889..4d24d38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=xyz.arthurb.mirai version=1.17.1-R0.1-SNAPSHOT mcVersion=1.17.1 -airplaneRef=a434719ed9ed7b624c0e7730f03cc7c349334014 +airplaneRef=1afb99c41f545538730acee90ff351d6b0617f49 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0003-Sugarcane-Fix-Javadoc-generation.patch b/patches/api/0003-Sugarcane-Fix-Javadoc-generation.patch index efbeecf..972a908 100644 --- a/patches/api/0003-Sugarcane-Fix-Javadoc-generation.patch +++ b/patches/api/0003-Sugarcane-Fix-Javadoc-generation.patch @@ -5,10 +5,10 @@ Subject: [PATCH] (Sugarcane) Fix Javadoc generation diff --git a/build.gradle.kts b/build.gradle.kts -index 689d470ebe2c7e25e4c87f6127978d1d283e55b5..3c9bdac53115cb6222706b8d72f36a337938e4a0 100644 +index 02f80c9a34a23c2285a1e05b41f53b4bafc28c5a..e9b99787cf31bc6e40e5f55dc79ed158b07f0fb6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -85,6 +85,8 @@ tasks.jar { +@@ -91,6 +91,8 @@ tasks.jar { tasks.withType().configureEach { (options as CoreJavadocOptions).addStringOption("sourcepath", apiAndDocs.resolvedConfiguration.files.joinToString(separator = File.pathSeparator, transform = File::getPath)) diff --git a/patches/server/0001-Mirai-Branding-Changes.patch b/patches/server/0001-Mirai-Branding-Changes.patch index 5f34377..9b37107 100644 --- a/patches/server/0001-Mirai-Branding-Changes.patch +++ b/patches/server/0001-Mirai-Branding-Changes.patch @@ -1,35 +1,33 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Etil <81570777+etil2jz@users.noreply.github.com> -Date: Fri, 17 Sep 2021 21:07:18 +0200 +Date: Mon, 27 Sep 2021 11:58:34 +0200 Subject: [PATCH] Mirai Branding Changes diff --git a/build.gradle.kts b/build.gradle.kts -index c1e70d5f127804deabcf626b725390863e896d38..79983b971264e8de36bfc547439f8889e2e2a5fe 100644 +index e4fdc5d362b8dbef2c8b209678200f147e871db0..2cc2b916a2667d0e04bb7efd13bdb35c112fdc08 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -32,8 +32,8 @@ repositories { +@@ -32,7 +32,7 @@ repositories { } dependencies { - implementation(project(":Airplane-API")) // Airplane // Paper -- implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane -+ implementation(project(":Mirai-API")) // Mirai // Paper -+ implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Mirai ++ implementation(project(":Mirai-API")) // Mirai // Airplane // Paper + implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") - implementation("net.minecrell:terminalconsoleappender:1.2.0") @@ -93,7 +93,7 @@ tasks.jar { "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", "Implementation-Version" to "git-Paper-$implementationVersion", -- "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane // Tuinity -+ "Implementation-Version" to "git-Mirai-$implementationVersion", // Mirai +- "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane ++ "Implementation-Version" to "git-Mirai-$implementationVersion", // Mirai // Airplane "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f6d335b377dbf6f744e5f6ced56cf437e6e6bab3..9c01b0b995b5be4812c77fc86ab6094e992f470a 100644 +index f6d335b377dbf6f744e5f6ced56cf437e6e6bab3..018845c1a96fa4d0411ad12d2260a7d0d6bb5165 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Spigot - Spigot > // CraftBukkit - cb > vanilla! -+ return "Mirai"; // Mirai // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! ++ return "Mirai"; // Mirai // Airplane // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } public SystemReport fillSystemReport(SystemReport details) { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc..55ec38f83f97494585aab451e59a8f67841b077b 100644 +index 28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc..0c0029fbbf593dea77e98ff309266203d3a221d1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper @@ -50,10 +48,23 @@ index 28fa8e5c0d1e78d57d9cfb5ea2998740b8d700dc..55ec38f83f97494585aab451e59a8f67 public final class CraftServer implements Server { - private final String serverName = "Airplane"; // Paper // Airplane -+ private final String serverName = "Mirai"; // Paper // Mirai ++ private final String serverName = "Mirai"; // Paper // Airplane // Mirai private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); +diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +index efbe385b3a78f4bd0dee6b63d78999513433b79b..2ad9bac4c1ae2adb50bb6291591ff4b741b3007e 100644 +--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java ++++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +@@ -394,7 +394,7 @@ public final class CraftMagicNumbers implements UnsafeValues { + + @Override + public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { +- return new gg.airplane.AirplaneVersionFetcher(); // Airplane ++ return new com.destroystokyo.paper.PaperVersionFetcher(); // Airplane // Mirai - revert VersionFetcher to Paper + } + + @Override diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 1788d79ea489e446d3d9f541693d4ba3dfc26015..4253c9e1f416bc5fd55ea1e1b4aa54023da9f829 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/patches/server/0003-Akarin-Swaps-the-predicate-order-of-collision.patch b/patches/server/0003-Akarin-Swaps-the-predicate-order-of-collision.patch index be53cf7..ef51d27 100644 --- a/patches/server/0003-Akarin-Swaps-the-predicate-order-of-collision.patch +++ b/patches/server/0003-Akarin-Swaps-the-predicate-order-of-collision.patch @@ -5,10 +5,10 @@ Subject: [PATCH] (Akarin) Swaps the predicate order of collision diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a88ad1035573dd0b35d0140859261229a1df8cf0..8b0882036058e8a07dbecded182112d0e9170f3e 100644 +index 7e65ed2a6a4dfa4f22bef5a01a079b8b7cb9e212..7ca7d9ee1772be76a1d0ff2d92c2cb07d7242482 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1854,8 +1854,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -1857,8 +1857,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n public void playerTouch(Player player) {} public void push(Entity entity) { @@ -18,7 +18,7 @@ index a88ad1035573dd0b35d0140859261229a1df8cf0..8b0882036058e8a07dbecded182112d0 if (this.level.paperConfig.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper double d0 = entity.getX() - this.getX(); double d1 = entity.getZ() - this.getZ(); -@@ -1884,7 +1883,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -1887,7 +1886,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n } } diff --git a/patches/server/0018-Patina-Remove-unnecessary-LogManager.getLogger.patch b/patches/server/0017-Patina-Remove-unnecessary-LogManager.getLogger.patch similarity index 90% rename from patches/server/0018-Patina-Remove-unnecessary-LogManager.getLogger.patch rename to patches/server/0017-Patina-Remove-unnecessary-LogManager.getLogger.patch index 9b2c79f..4a8c466 100644 --- a/patches/server/0018-Patina-Remove-unnecessary-LogManager.getLogger.patch +++ b/patches/server/0017-Patina-Remove-unnecessary-LogManager.getLogger.patch @@ -5,7 +5,7 @@ Subject: [PATCH] (Patina) Remove unnecessary `LogManager.getLogger()` diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a1f639651c6308c8329f93d1bbfb5dc4706de95d..3c272e6c7552cb5bc875cdaefc91aaac3751ec3a 100644 +index 7ca7d9ee1772be76a1d0ff2d92c2cb07d7242482..c07a945d0215297a47f5928e4476615c1f0b8011 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -164,7 +164,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -17,7 +17,7 @@ index a1f639651c6308c8329f93d1bbfb5dc4706de95d..3c272e6c7552cb5bc875cdaefc91aaac } else { super.setSeed(seed); locked = true; -@@ -2317,7 +2317,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -2320,7 +2320,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n try { spawnReason = org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.valueOf(spawnReasonName); } catch (Exception ignored) { diff --git a/patches/server/0019-Patina-Make-a-field-final.patch b/patches/server/0018-Patina-Make-a-field-final.patch similarity index 100% rename from patches/server/0019-Patina-Make-a-field-final.patch rename to patches/server/0018-Patina-Make-a-field-final.patch diff --git a/patches/server/0020-Patina-Don-t-create-new-random-instance.patch b/patches/server/0019-Patina-Don-t-create-new-random-instance.patch similarity index 94% rename from patches/server/0020-Patina-Don-t-create-new-random-instance.patch rename to patches/server/0019-Patina-Don-t-create-new-random-instance.patch index f3cbeb0..3355741 100644 --- a/patches/server/0020-Patina-Don-t-create-new-random-instance.patch +++ b/patches/server/0019-Patina-Don-t-create-new-random-instance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] (Patina) Don't create new random instance diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0cbbf7ee0ae6a5d4533287c56ed1e711f4ff9c56..d30d7a025cb88da120b3c6b7cb57a4f4d0afe043 100644 +index f0250f97d194f1ad98f8f119c80e1b24ee26a2ac..b660c853128e79334f3da8f7334125d240cf0fc6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -647,7 +647,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1ccbdd2554073a41ca2f37deca3f1ec3e6a0665f..f477de27ec01a8c28311583f08e164b3d04cf8e1 100644 +index 2b8e31ae00e786dfbfbf5bb5228b846752cd2543..6c7cb224229fa3aa64d6cf3b25a2213e31165931 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1565,7 +1565,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0045-Purpur-Fix-SPIGOT-6278.patch b/patches/server/0044-Purpur-Fix-SPIGOT-6278.patch similarity index 100% rename from patches/server/0045-Purpur-Fix-SPIGOT-6278.patch rename to patches/server/0044-Purpur-Fix-SPIGOT-6278.patch diff --git a/patches/server/0046-EMC-Always-convert-Lore-Name-of-an-item-to-ensure-co.patch b/patches/server/0045-EMC-Always-convert-Lore-Name-of-an-item-to-ensure-co.patch similarity index 100% rename from patches/server/0046-EMC-Always-convert-Lore-Name-of-an-item-to-ensure-co.patch rename to patches/server/0045-EMC-Always-convert-Lore-Name-of-an-item-to-ensure-co.patch diff --git a/patches/server/0047-EMC-Bound-villager-trade-maxUses-by-16.patch b/patches/server/0046-EMC-Bound-villager-trade-maxUses-by-16.patch similarity index 100% rename from patches/server/0047-EMC-Bound-villager-trade-maxUses-by-16.patch rename to patches/server/0046-EMC-Bound-villager-trade-maxUses-by-16.patch diff --git a/patches/server/0048-EMC-Tweak-explosions.patch b/patches/server/0047-EMC-Tweak-explosions.patch similarity index 100% rename from patches/server/0048-EMC-Tweak-explosions.patch rename to patches/server/0047-EMC-Tweak-explosions.patch diff --git a/patches/server/0049-Purpur-Fix-vanilla-command-permission-handler.patch b/patches/server/0048-Purpur-Fix-vanilla-command-permission-handler.patch similarity index 100% rename from patches/server/0049-Purpur-Fix-vanilla-command-permission-handler.patch rename to patches/server/0048-Purpur-Fix-vanilla-command-permission-handler.patch diff --git a/patches/server/0051-Improve-EntityTransformEvent-cancellation-handling.patch b/patches/server/0049-Improve-EntityTransformEvent-cancellation-handling.patch similarity index 100% rename from patches/server/0051-Improve-EntityTransformEvent-cancellation-handling.patch rename to patches/server/0049-Improve-EntityTransformEvent-cancellation-handling.patch diff --git a/patches/server/0050-Fix-mobs-spawning-outside-hard-despawn-range.patch b/patches/server/0050-Fix-mobs-spawning-outside-hard-despawn-range.patch deleted file mode 100644 index 5389dc8..0000000 --- a/patches/server/0050-Fix-mobs-spawning-outside-hard-despawn-range.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Etil <81570777+etil2jz@users.noreply.github.com> -Date: Sun, 26 Sep 2021 12:31:29 +0200 -Subject: [PATCH] Fix mobs spawning outside hard despawn range - - -diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index d2a282d9c84952627a0ae1a4b1ff388e39c472c3..51cdbe357c16f9a41745146f8465fd57f498395d 100644 ---- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java -+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -@@ -398,7 +398,10 @@ public final class NaturalSpawner { - } - - private static boolean isValidPositionForMob(ServerLevel world, Mob entity, double squaredDistance) { -- return squaredDistance > (double) (entity.getType().getCategory().getDespawnDistance() * entity.getType().getCategory().getDespawnDistance()) && entity.removeWhenFarAway(squaredDistance) ? false : entity.checkSpawnRules((LevelAccessor) world, MobSpawnType.NATURAL) && entity.checkSpawnObstruction((LevelReader) world); -+ // Mirai start - fix mobs spawning outside hard despawn range -+ int despawnDistance = entity.isPersistenceRequired() || entity.requiresCustomPersistence() ? entity.getType().getCategory().getDespawnDistance() * entity.getType().getCategory().getDespawnDistance() : world.paperConfig.hardDespawnDistance; -+ return squaredDistance > (double) despawnDistance && entity.removeWhenFarAway(squaredDistance) ? false : entity.checkSpawnRules((LevelAccessor) world, MobSpawnType.NATURAL) && entity.checkSpawnObstruction((LevelReader) world); -+ // Mirai end - fix mobs spawning outside hard despawn range - } - - private static Optional getRandomSpawnMobAt(ServerLevel world, StructureFeatureManager structureAccessor, ChunkGenerator chunkGenerator, MobCategory spawnGroup, Random random, BlockPos pos) { diff --git a/patches/server/0052-Yatopia-Use-faster-random-implementation.patch b/patches/server/0050-Yatopia-Use-faster-random-implementation.patch similarity index 97% rename from patches/server/0052-Yatopia-Use-faster-random-implementation.patch rename to patches/server/0050-Yatopia-Use-faster-random-implementation.patch index 4856c42..95b25c9 100644 --- a/patches/server/0052-Yatopia-Use-faster-random-implementation.patch +++ b/patches/server/0050-Yatopia-Use-faster-random-implementation.patch @@ -18,7 +18,7 @@ index 20cfe7b9b7127ddeb97aa91d759fc17b4a548eaf..8d4f8de8aa9a9f8194e37b9261ee0819 private long lastFill = -1; private long nextRefill = -1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 76fff7a82c67fe62b090dd5ec5906bc54862eb6d..26f2f8cbd0235b22615dbacdea5183b44bfa8d39 100644 +index c2e170e1fd84796298888e237bc8eb4f98ab1ceb..1e3185f84c3017a4f756bdf14e397604b74edf4e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -412,7 +412,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -Date: Sun, 26 Sep 2021 16:16:40 +0200 -Subject: [PATCH] Change defaults in YAML config files - - -diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index a94be051d8c7aec6fe6bc00e14994c3b493cd28d..f5cbe72c3c43664026eeaf43fe3c109972dafe18 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java -+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -203,7 +203,7 @@ public class PaperConfig { - - public static String timingsServerName; - private static void timings() { -- boolean timings = getBoolean("timings.enabled", true); -+ boolean timings = getBoolean("timings.enabled", false); - // Airplane start - boolean reallyEnableTimings = getBoolean("timings.really-enabled", false); - if (timings && !reallyEnableTimings) { -@@ -214,11 +214,11 @@ public class PaperConfig { - timings = reallyEnableTimings; - // Airplane end - boolean verboseTimings = getBoolean("timings.verbose", true); -- TimingsManager.url = getString("timings.url", "https://timings.aikar.co/"); -+ TimingsManager.url = getString("timings.url", "https://timings.pl3x.net/"); - if (!TimingsManager.url.endsWith("/")) { - TimingsManager.url += "/"; - } -- TimingsManager.privacy = getBoolean("timings.server-name-privacy", false); -+ TimingsManager.privacy = getBoolean("timings.server-name-privacy", true); - TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses", "settings.velocity-support.secret", "web-services.token")); // Airplane - if (!TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) { - TimingsManager.hiddenConfigs.add("settings.velocity-support.secret"); -@@ -256,9 +256,9 @@ public class PaperConfig { - loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true); - } - -- public static int regionFileCacheSize = 256; -+ public static int regionFileCacheSize = 512; - private static void regionFileCacheSize() { -- regionFileCacheSize = Math.max(getInt("settings.region-file-cache-size", 256), 4); -+ regionFileCacheSize = Math.max(getInt("settings.region-file-cache-size", 512), 4); - } - - public static boolean enablePlayerCollisions = true; -@@ -334,9 +334,9 @@ public class PaperConfig { - } - } - -- public static boolean useAlternativeLuckFormula = false; -+ public static boolean useAlternativeLuckFormula = true; - private static void useAlternativeLuckFormula() { -- useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false); -+ useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", true); - if (useAlternativeLuckFormula) { - Bukkit.getLogger().log(Level.INFO, "Using Aikar's Alternative Luck Formula to apply Luck attribute to all loot pool calculations. See https://luckformula.emc.gs"); - } -@@ -385,7 +385,7 @@ public class PaperConfig { - } - } - -- public static int maxBookPageSize = 2560; -+ public static int maxBookPageSize = 400; - public static double maxBookTotalSizeMultiplier = 0.98D; - private static void maxBookSize() { - maxBookPageSize = Math.min(8192, getInt("settings.book-size.page-max", maxBookPageSize)); -@@ -469,7 +469,7 @@ public class PaperConfig { - allowBlockPermanentBreakingExploits = getBoolean("settings.unsupported-settings.allow-permanent-block-break-exploits", allowBlockPermanentBreakingExploits); - } - -- public static boolean consoleHasAllPermissions = false; -+ public static boolean consoleHasAllPermissions = true; - private static void consoleHasAllPermissions() { - consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions); - } -diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 9a3f75288b1d743a7ec4bfd663c1c2988678d3e6..7add090b1e21f6782fc2c381a34c5fe825e15cf0 100644 ---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -59,9 +59,9 @@ public class PaperWorldConfig { - piglinsGuardChests = getBoolean("piglins-guard-chests", piglinsGuardChests); - } - -- public boolean useEigencraftRedstone = false; -+ public boolean useEigencraftRedstone = true; - private void useEigencraftRedstone() { -- useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", false); -+ useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", true); - if (useEigencraftRedstone) { - log("Using Eigencraft redstone algorithm by theosib."); - } else { -@@ -102,7 +102,7 @@ public class PaperWorldConfig { - wanderingTraderSpawnChanceMax = getInt("wandering-trader.spawn-chance-max", wanderingTraderSpawnChanceMax); - } - -- public boolean fixClimbingBypassingCrammingRule = false; -+ public boolean fixClimbingBypassingCrammingRule = true; - private void fixClimbingBypassingCrammingRule() { - fixClimbingBypassingCrammingRule = getBoolean("fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule); - } -@@ -112,7 +112,7 @@ public class PaperWorldConfig { - fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit); - } - -- public boolean disableMobSpawnerSpawnEggTransformation = false; -+ public boolean disableMobSpawnerSpawnEggTransformation = true; - private void disableMobSpawnerSpawnEggTransformation() { - disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation); - } -@@ -138,12 +138,24 @@ public class PaperWorldConfig { - - public Map, Integer> entityPerChunkSaveLimits = new HashMap<>(); - private void entityPerChunkSaveLimits() { -- getInt("entity-per-chunk-save-limit.experience_orb", -1); -- getInt("entity-per-chunk-save-limit.snowball", -1); -- getInt("entity-per-chunk-save-limit.ender_pearl", -1); -- getInt("entity-per-chunk-save-limit.arrow", -1); -- getInt("entity-per-chunk-save-limit.fireball", -1); -- getInt("entity-per-chunk-save-limit.small_fireball", -1); -+ getInt("entity-per-chunk-save-limit.experience_orb", 16); -+ getInt("entity-per-chunk-save-limit.arrow", 16); -+ getInt("entity-per-chunk-save-limit.dragon_fireball", 3); -+ getInt("entity-per-chunk-save-limit.egg", 8); -+ getInt("entity-per-chunk-save-limit.ender_pearl", 8); -+ getInt("entity-per-chunk-save-limit.eye_of_ender", 8); -+ getInt("entity-per-chunk-save-limit.fireball", 8); -+ getInt("entity-per-chunk-save-limit.small_fireball", 8); -+ getInt("entity-per-chunk-save-limit.firework_rocket", 8); -+ getInt("entity-per-chunk-save-limit.potion", 8); -+ getInt("entity-per-chunk-save-limit.llama_spit", 3); -+ getInt("entity-per-chunk-save-limit.shulker_bullet", 8); -+ getInt("entity-per-chunk-save-limit.snowball", 8); -+ getInt("entity-per-chunk-save-limit.spectral_arrow", 16); -+ getInt("entity-per-chunk-save-limit.experience_bottle", 3); -+ getInt("entity-per-chunk-save-limit.trident", 16); -+ getInt("entity-per-chunk-save-limit.wither_skull", 4); -+ getInt("entity-per-chunk-save-limit.area_effect_cloud", 8); - - addEntityPerChunkSaveLimitsFromSection(config.getConfigurationSection("world-settings.default.entity-per-chunk-save-limit"), entityPerChunkSaveLimits); - addEntityPerChunkSaveLimitsFromSection(config.getConfigurationSection("world-settings." + worldName + ".entity-per-chunk-save-limit"), entityPerChunkSaveLimits); -@@ -174,9 +186,9 @@ public class PaperWorldConfig { - log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16)); - } - -- public int autoSavePeriod = -1; -+ public int autoSavePeriod = 6000; - private void autoSavePeriod() { -- autoSavePeriod = getInt("auto-save-interval", -1); -+ autoSavePeriod = getInt("auto-save-interval", 6000); - if (autoSavePeriod > 0) { - log("Auto Save Interval: " +autoSavePeriod + " (" + (autoSavePeriod / 20) + "s)"); - } else if (autoSavePeriod < 0) { -@@ -263,13 +275,13 @@ public class PaperWorldConfig { - - public boolean nerfedMobsShouldJump; - private void nerfedMobsShouldJump() { -- nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", false); -+ nerfedMobsShouldJump = getBoolean("spawner-nerfed-mobs-should-jump", true); - } - - public int softDespawnDistance; - public int hardDespawnDistance; - private void despawnDistances() { -- softDespawnDistance = getInt("despawn-ranges.soft", 32); // 32^2 = 1024, Minecraft Default -+ softDespawnDistance = getInt("despawn-ranges.soft", 28); // 32^2 = 1024, Minecraft Default - hardDespawnDistance = getInt("despawn-ranges.hard", 128); // 128^2 = 16384, Minecraft Default - - if (softDespawnDistance > hardDespawnDistance) { -@@ -327,7 +339,7 @@ public class PaperWorldConfig { - - public boolean optimizeExplosions; - private void optimizeExplosions() { -- optimizeExplosions = getBoolean("optimize-explosions", false); -+ optimizeExplosions = getBoolean("optimize-explosions", true); - log("Optimize explosions: " + optimizeExplosions); - } - -@@ -348,17 +360,17 @@ public class PaperWorldConfig { - - public int mobSpawnerTickRate; - private void mobSpawnerTickRate() { -- mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 1); -+ mobSpawnerTickRate = getInt("mob-spawner-tick-rate", 2); - } - - public int containerUpdateTickRate; - private void containerUpdateTickRate() { -- containerUpdateTickRate = getInt("container-update-tick-rate", 1); -+ containerUpdateTickRate = getInt("container-update-tick-rate", 3); - } - - public boolean disableChestCatDetection; - private void disableChestCatDetection() { -- disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", false); -+ disableChestCatDetection = getBoolean("game-mechanics.disable-chest-cat-detection", true); - } - - public boolean disablePlayerCrits; -@@ -390,14 +402,14 @@ public class PaperWorldConfig { - nonPlayerEntitiesOnScoreboards = getBoolean("allow-non-player-entities-on-scoreboards", false); - } - -- public int nonPlayerArrowDespawnRate = -1; -- public int creativeArrowDespawnRate = -1; -+ public int nonPlayerArrowDespawnRate = 20; -+ public int creativeArrowDespawnRate = 20; - private void nonPlayerArrowDespawnRate() { -- nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", -1); -+ nonPlayerArrowDespawnRate = getInt("non-player-arrow-despawn-rate", 20); - if (nonPlayerArrowDespawnRate == -1) { - nonPlayerArrowDespawnRate = spigotConfig.arrowDespawnRate; - } -- creativeArrowDespawnRate = getInt("creative-arrow-despawn-rate", -1); -+ creativeArrowDespawnRate = getInt("creative-arrow-despawn-rate", 20); - if (creativeArrowDespawnRate == -1) { - creativeArrowDespawnRate = spigotConfig.arrowDespawnRate; - } -@@ -423,7 +435,7 @@ public class PaperWorldConfig { - fixedInhabitedTime = getInt("fixed-chunk-inhabited-time", -1); - } - -- public int grassUpdateRate = 1; -+ public int grassUpdateRate = 4; - private void grassUpdateRate() { - grassUpdateRate = Math.max(0, getInt("grass-spread-tick-rate", grassUpdateRate)); - log("Grass Spread Tick Rate: " + grassUpdateRate); -@@ -500,7 +512,7 @@ public class PaperWorldConfig { - } - - public boolean seedBasedFeatureSearch = true; -- public boolean seedBasedFeatureSearchLoadsChunks = true; -+ public boolean seedBasedFeatureSearchLoadsChunks = false; - private void seedBasedFeatureSearch() { - seedBasedFeatureSearch = getBoolean("seed-based-feature-search", seedBasedFeatureSearch); - seedBasedFeatureSearchLoadsChunks = getBoolean("seed-based-feature-search-loads-chunks", seedBasedFeatureSearchLoadsChunks); -@@ -509,7 +521,7 @@ public class PaperWorldConfig { - - public int maxCollisionsPerEntity; - private void maxEntityCollision() { -- maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) ); -+ maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 2) ); - log( "Max Entity Collisions: " + maxCollisionsPerEntity ); - } - -@@ -565,17 +577,17 @@ public class PaperWorldConfig { - scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true); - } - -- public boolean ironGolemsCanSpawnInAir = false; -+ public boolean ironGolemsCanSpawnInAir = true; - private void ironGolemsCanSpawnInAir() { - ironGolemsCanSpawnInAir = getBoolean("iron-golems-can-spawn-in-air", ironGolemsCanSpawnInAir); - } - -- public boolean armorStandEntityLookups = true; -+ public boolean armorStandEntityLookups = false; - private void armorStandEntityLookups() { -- armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", true); -+ armorStandEntityLookups = getBoolean("armor-stands-do-collision-entity-lookups", false); - } - -- public boolean armorStandTick = true; -+ public boolean armorStandTick = false; - private void armorStandTick() { - this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick); - log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default"); -@@ -587,9 +599,9 @@ public class PaperWorldConfig { - log("Water over lava flow speed: " + waterOverLavaFlowSpeed); - } - -- public boolean preventMovingIntoUnloadedChunks = false; -+ public boolean preventMovingIntoUnloadedChunks = true; - private void preventMovingIntoUnloadedChunks() { -- preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false); -+ preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", true); - } - - public enum DuplicateUUIDMode { -@@ -738,7 +750,7 @@ public class PaperWorldConfig { - - public long delayChunkUnloadsBy; - private void delayChunkUnloadsBy() { -- delayChunkUnloadsBy = PaperConfig.getSeconds(getString("delay-chunk-unloads-by", "10s")); -+ delayChunkUnloadsBy = PaperConfig.getSeconds(getString("delay-chunk-unloads-by", "5s")); - if (delayChunkUnloadsBy > 0) { - log("Delaying chunk unloads by " + delayChunkUnloadsBy + " seconds"); - delayChunkUnloadsBy *= 20; -@@ -841,14 +853,14 @@ public class PaperWorldConfig { - enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg); - } - -- public boolean updatePathfindingOnBlockUpdate = true; -+ public boolean updatePathfindingOnBlockUpdate = false; - private void setUpdatePathfindingOnBlockUpdate() { - updatePathfindingOnBlockUpdate = getBoolean("update-pathfinding-on-block-update", this.updatePathfindingOnBlockUpdate); - } - -- public boolean fixWitherTargetingBug = false; -+ public boolean fixWitherTargetingBug = true; - private void witherSettings() { -- fixWitherTargetingBug = getBoolean("fix-wither-targeting-bug", false); -+ fixWitherTargetingBug = getBoolean("fix-wither-targeting-bug", true); - log("Withers properly target players: " + fixWitherTargetingBug); - } - -@@ -890,8 +902,13 @@ public class PaperWorldConfig { - private Table sensorTickRates; - private Table behaviorTickRates; - private void tickRates() { -- config.addDefault("world-settings.default.tick-rates.sensor.villager.secondarypoisensor", 40); -- config.addDefault("world-settings.default.tick-rates.behavior.villager.validatenearbypoi", -1); // Example -+ config.addDefault("world-settings.default.tick-rates.sensor.villager.secondarypoisensor", 80); -+ config.addDefault("world-settings.default.tick-rates.sensor.villager.nearestbedsensor", 80); -+ config.addDefault("world-settings.default.tick-rates.sensor.villager.villagerbabiessensor", 40); -+ config.addDefault("world-settings.default.tick-rates.sensor.villager.playersensor", 40); -+ config.addDefault("world-settings.default.tick-rates.sensor.villager.nearestlivingentitysensor", 40); -+ config.addDefault("world-settings.default.tick-rates.behavior.villager.validatenearbypoi", 60); -+ config.addDefault("world-settings.default.tick-rates.behavior.villager.acquirepoi", 120); - log("Tick rates:"); - sensorTickRates = loadTickRates("sensor"); - behaviorTickRates = loadTickRates("behavior"); -@@ -930,7 +947,7 @@ public class PaperWorldConfig { - public it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap featureSeeds = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>(); - private void featureSeeds() { - featureSeeds.defaultReturnValue(-1); -- final boolean randomise = getBoolean("feature-seeds.generate-random-seeds-for-all", false); -+ final boolean randomise = getBoolean("feature-seeds.generate-random-seeds-for-all", true); - final ConfigurationSection defaultSection = config.getConfigurationSection("world-settings.default.feature-seeds"); - final ConfigurationSection section = config.getConfigurationSection("world-settings." + worldName + ".feature-seeds"); - final net.minecraft.core.Registry> registry -diff --git a/src/main/java/gg/airplane/AirplaneConfig.java b/src/main/java/gg/airplane/AirplaneConfig.java -index 2b654e6adfe331a5fa68c1aea7d6d6cea1f3567d..49a881603d8589e0682264146c233161ea06532c 100644 ---- a/src/main/java/gg/airplane/AirplaneConfig.java -+++ b/src/main/java/gg/airplane/AirplaneConfig.java -@@ -179,7 +179,7 @@ public class AirplaneConfig { - - 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."); -+ maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 8, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed."); - - setComment("projectile", "Optimizes projectile settings"); - } -@@ -197,10 +197,10 @@ public class AirplaneConfig { - "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, -+ maximumActivationPrio = getInt("dab.max-tick-freq", "activation-range.max-tick-freq", 30, - "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, -+ activationDistanceMod = getInt("dab.activation-dist-mod", "activation-range.activation-dist-mod", 7, - "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.", -diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index dc29b787ac4bd446f20532536cb587453e6070f8..d21085ab32ef8c40d30aec81714d65e5e238030b 100644 ---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java -+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -903,25 +903,25 @@ public final class CraftServer implements Server { - } - - if (this.getTicksPerMonsterSpawns() < 0) { -- world.ticksPerMonsterSpawns = 1; -+ world.ticksPerMonsterSpawns = 10; - } else { - world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns(); - } - - if (this.getTicksPerWaterSpawns() < 0) { -- world.ticksPerWaterSpawns = 1; -+ world.ticksPerWaterSpawns = 400; - } else { - world.ticksPerWaterSpawns = this.getTicksPerWaterSpawns(); - } - - if (this.getTicksPerWaterAmbientSpawns() < 0) { -- world.ticksPerWaterAmbientSpawns = 1; -+ world.ticksPerWaterAmbientSpawns = 400; - } else { - world.ticksPerWaterAmbientSpawns = this.getTicksPerWaterAmbientSpawns(); - } - - if (this.getTicksPerAmbientSpawns() < 0) { -- world.ticksPerAmbientSpawns = 1; -+ world.ticksPerAmbientSpawns = 400; - } else { - world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns(); - } -diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 6f67770af753c26a7584f3d6cb85a2a3a00abca2..31523e311fe1fa771792e79a64d4e075a93868ca 100644 ---- a/src/main/java/org/spigotmc/SpigotConfig.java -+++ b/src/main/java/org/spigotmc/SpigotConfig.java -@@ -335,7 +335,7 @@ public class SpigotConfig - public static boolean saveUserCacheOnStopOnly; - private static void saveUserCacheOnStopOnly() - { -- SpigotConfig.saveUserCacheOnStopOnly = SpigotConfig.getBoolean( "settings.save-user-cache-on-stop-only", false ); -+ SpigotConfig.saveUserCacheOnStopOnly = SpigotConfig.getBoolean( "settings.save-user-cache-on-stop-only", true ); - } - - public static double movedWronglyThreshold; -diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index c931a46650ba4857805bbfa126c75a9b86b1d707..57541cc5ae56fc6c7f4a1ca4dd986569f9e0a590 100644 ---- a/src/main/java/org/spigotmc/SpigotWorldConfig.java -+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -132,14 +132,14 @@ public class SpigotWorldConfig - public double itemMerge; - private void itemMerge() - { -- this.itemMerge = this.getDouble("merge-radius.item", 2.5 ); -+ this.itemMerge = this.getDouble("merge-radius.item", 4.0 ); - this.log( "Item Merge Radius: " + this.itemMerge ); - } - - public double expMerge; - private void expMerge() - { -- this.expMerge = this.getDouble("merge-radius.exp", 3.0 ); -+ this.expMerge = this.getDouble("merge-radius.exp", 6.0 ); - this.log( "Experience Merge Radius: " + this.expMerge ); - } - -@@ -165,7 +165,7 @@ public class SpigotWorldConfig - public byte mobSpawnRange; - private void mobSpawnRange() - { -- this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 8 ); // Paper - Vanilla -+ this.mobSpawnRange = (byte) getInt( "mob-spawn-range", 2 ); // Paper - Vanilla - this.log( "Mob Spawn Range: " + this.mobSpawnRange ); - } - -@@ -176,31 +176,31 @@ public class SpigotWorldConfig - this.log( "Item Despawn Rate: " + this.itemDespawnRate ); - } - -- public int animalActivationRange = 32; -- public int monsterActivationRange = 32; -+ public int animalActivationRange = 16; -+ public int monsterActivationRange = 24; - public int raiderActivationRange = 48; -- public int miscActivationRange = 16; -+ public int miscActivationRange = 8; - // Paper start - public int flyingMonsterActivationRange = 32; -- public int waterActivationRange = 16; -- public int villagerActivationRange = 32; -- public int wakeUpInactiveAnimals = 4; -+ public int waterActivationRange = 8; -+ public int villagerActivationRange = 16; -+ public int wakeUpInactiveAnimals = 2; - public int wakeUpInactiveAnimalsEvery = 60*20; -- public int wakeUpInactiveAnimalsFor = 5*20; -- public int wakeUpInactiveMonsters = 8; -+ public int wakeUpInactiveAnimalsFor = 2*20; -+ public int wakeUpInactiveMonsters = 4; - public int wakeUpInactiveMonstersEvery = 20*20; -- public int wakeUpInactiveMonstersFor = 5*20; -- public int wakeUpInactiveVillagers = 4; -+ public int wakeUpInactiveMonstersFor = 3*20; -+ public int wakeUpInactiveVillagers = 1; - public int wakeUpInactiveVillagersEvery = 30*20; -- public int wakeUpInactiveVillagersFor = 5*20; -- public int wakeUpInactiveFlying = 8; -+ public int wakeUpInactiveVillagersFor = 1*20; -+ public int wakeUpInactiveFlying = 1; - public int wakeUpInactiveFlyingEvery = 10*20; -- public int wakeUpInactiveFlyingFor = 5*20; -+ public int wakeUpInactiveFlyingFor = 3*20; - public int villagersWorkImmunityAfter = 5*20; - public int villagersWorkImmunityFor = 20; - public boolean villagersActiveForPanic = true; - // Paper end -- public boolean tickInactiveVillagers = true; -+ public boolean tickInactiveVillagers = false; - private void activationRange() - { - boolean hasAnimalsConfig = config.getInt("entity-activation-range.animals", this.animalActivationRange) != this.animalActivationRange; // Paper -@@ -272,7 +272,7 @@ public class SpigotWorldConfig - public int tridentDespawnRate; - private void arrowDespawnRate() - { -- this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 1200 ); -+ this.arrowDespawnRate = this.getInt( "arrow-despawn-rate", 300 ); - this.tridentDespawnRate = this.getInt( "trident-despawn-rate", this.arrowDespawnRate ); - this.log( "Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate ); - } -@@ -401,8 +401,8 @@ public class SpigotWorldConfig - public int entityMaxTickTime; - private void maxTickTimes() - { -- this.tileMaxTickTime = this.getInt("max-tick-time.tile", 50); -- this.entityMaxTickTime = this.getInt("max-tick-time.entity", 50); -+ this.tileMaxTickTime = this.getInt("max-tick-time.tile", 1000); -+ this.entityMaxTickTime = this.getInt("max-tick-time.entity", 1000); - this.log("Tile Max Tick Time: " + this.tileMaxTickTime + "ms Entity max Tick Time: " + this.entityMaxTickTime + "ms"); - } - diff --git a/patches/server/0017-Patina-Remove-VersionFetcher.patch b/patches/server/0061-Patina-Remove-VersionFetcher.patch similarity index 91% rename from patches/server/0017-Patina-Remove-VersionFetcher.patch rename to patches/server/0061-Patina-Remove-VersionFetcher.patch index 753ce68..fb16d03 100644 --- a/patches/server/0017-Patina-Remove-VersionFetcher.patch +++ b/patches/server/0061-Patina-Remove-VersionFetcher.patch @@ -1,12 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Etil <81570777+etil2jz@users.noreply.github.com> -Date: Sun, 19 Sep 2021 11:17:16 +0200 +Date: Mon, 27 Sep 2021 12:04:35 +0200 Subject: [PATCH] (Patina) Remove VersionFetcher diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java deleted file mode 100644 -index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..0000000000000000000000000000000000000000 +index 580bae0d414d371a07a6bfeefc41fdd989dc0083..0000000000000000000000000000000000000000 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ /dev/null @@ -1,142 +0,0 @@ @@ -41,8 +41,8 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..00000000000000000000000000000000 - @Nonnull - @Override - public Component getVersionMessage(@Nonnull String serverVersion) { -- String[] parts = serverVersion.substring("git-Airplane-".length()).split("[-\\s]"); // Tuinity -- final Component updateMessage = getUpdateStatusMessage("TECHNOVE/Airplane", GITHUB_BRANCH_NAME, parts[0]); // Tuinity +- String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]"); +- final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]); - final Component history = getHistory(); - - return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; @@ -66,13 +66,13 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..00000000000000000000000000000000 - - private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) { - int distance; -- //try { -- // int jenkinsBuild = Integer.parseInt(versionInfo); -- // distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion()); -- //} catch (NumberFormatException ignored) { +- try { +- int jenkinsBuild = Integer.parseInt(versionInfo); +- distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion()); +- } catch (NumberFormatException ignored) { - versionInfo = versionInfo.replace("\"", ""); - distance = fetchDistanceFromGitHub(repo, branch, versionInfo); -- //} +- } - - switch (distance) { - case -1: @@ -153,7 +153,7 @@ index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..00000000000000000000000000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 72cfffd80ad76abe7cb16bc9133730338c07b6f6..fe059446a2860d52865c6db15ddd162ad69b0e38 100644 +index 2ad9bac4c1ae2adb50bb6291591ff4b741b3007e..dbbbe1ede16399ba32dc7f912f43c137c9fb2779 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -392,10 +392,12 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -164,7 +164,7 @@ index 72cfffd80ad76abe7cb16bc9133730338c07b6f6..fe059446a2860d52865c6db15ddd162a + /* // Patina + @Override public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { - return new com.destroystokyo.paper.PaperVersionFetcher(); + return new com.destroystokyo.paper.PaperVersionFetcher(); // Airplane // Mirai - revert VersionFetcher to Paper } + */