diff --git a/patches/server/0001-Mirai-Branding-Changes.patch b/patches/server/0001-Mirai-Branding-Changes.patch index 24ce936..d81d04d 100644 --- a/patches/server/0001-Mirai-Branding-Changes.patch +++ b/patches/server/0001-Mirai-Branding-Changes.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Sun, 27 Mar 2022 23:23:55 +0200 Subject: [PATCH] Mirai Branding Changes diff --git a/patches/server/0002-Mirai-Configuration.patch b/patches/server/0002-Mirai-Configuration.patch index 93fa980..d0c3607 100644 --- a/patches/server/0002-Mirai-Configuration.patch +++ b/patches/server/0002-Mirai-Configuration.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Arthur Blanchot +From: Arthur Blanchot <81570777+etil2jz@users.noreply.github.com> Date: Wed, 20 Jul 2022 22:07:01 +0200 Subject: [PATCH] Mirai Configuration @@ -108,7 +108,7 @@ index 0000000000000000000000000000000000000000..d73428f5554384e5bbf1c8607073b50d \ No newline at end of file diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..860f244e229b18701f4719b5ece7a00f377868a7 +index 0000000000000000000000000000000000000000..adf6004cd1637a2662e2d448221b063688a26016 --- /dev/null +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java @@ -0,0 +1,134 @@ @@ -164,7 +164,7 @@ index 0000000000000000000000000000000000000000..860f244e229b18701f4719b5ece7a00f + } + } + -+ getString("info.version", "2.0"); ++ getString("info.version", "2.1"); + setComment("info", + "Mirai Configuration", + "Join our Discord at https://discord.gg/DdH6Yfu9gM", diff --git a/patches/server/0050-carpetfixes-BiomeAccess-prediction.patch b/patches/server/0050-carpetfixes-BiomeAccess-prediction.patch index 969ee5d..5ebb567 100644 --- a/patches/server/0050-carpetfixes-BiomeAccess-prediction.patch +++ b/patches/server/0050-carpetfixes-BiomeAccess-prediction.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Fri, 22 Apr 2022 22:44:56 +0200 Subject: [PATCH] carpetfixes: BiomeAccess prediction diff --git a/patches/server/0051-Configurable-enchantment-table-book-animation-tick.patch b/patches/server/0051-Configurable-enchantment-table-book-animation-tick.patch index a2ce645..1debd1c 100644 --- a/patches/server/0051-Configurable-enchantment-table-book-animation-tick.patch +++ b/patches/server/0051-Configurable-enchantment-table-book-animation-tick.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Arthur Blanchot +From: Arthur Blanchot <81570777+etil2jz@users.noreply.github.com> Date: Fri, 24 Jun 2022 20:10:19 +0200 Subject: [PATCH] Configurable enchantment table book animation tick @@ -17,7 +17,7 @@ index 2341a5a249d455628165fc6ba508fc6d70c3dbfb..5a144c724eb6045909febf1fe3236717 blockEntity.oRot = blockEntity.rot; Player player = world.getNearestPlayer((double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, (double)pos.getZ() + 0.5D, 3.0D, false); diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java -index 12fc0a1524d99d8509a826b09d59ce5b9b82c6bd..9bc1e365e0c96907f6fb2b5cd67a12c87d0cf7ed 100644 +index 54fc6d04f10ed8d5aa637c381854e0fa098b48b4..13aab54df6d4e1a59063732852a02b8e67603591 100644 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java @@ -202,4 +202,11 @@ public class MiraiConfig { diff --git a/patches/server/0052-Skip-cloning-loot-parameters.patch b/patches/server/0052-Skip-cloning-loot-parameters.patch index 62df5e4..56b8bdf 100644 --- a/patches/server/0052-Skip-cloning-loot-parameters.patch +++ b/patches/server/0052-Skip-cloning-loot-parameters.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Fri, 4 Mar 2022 19:57:07 +0100 Subject: [PATCH] Skip cloning loot parameters diff --git a/patches/server/0078-PaperPR-Stop-large-look-changes-from-crashing-the-se.patch b/patches/server/0078-PaperPR-Stop-large-look-changes-from-crashing-the-se.patch index f9b1f68..d9adb6c 100644 --- a/patches/server/0078-PaperPR-Stop-large-look-changes-from-crashing-the-se.patch +++ b/patches/server/0078-PaperPR-Stop-large-look-changes-from-crashing-the-se.patch @@ -1,12 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MWHunter -Date: Tue, 8 Feb 2022 22:03:15 -0600 +From: Jaren Knodel +Date: Wed, 24 Aug 2022 09:54:11 -0400 Subject: [PATCH] PaperPR Stop large look changes from crashing the server -Taken from https://github.com/PaperMC/Paper/pull/7459 +Taken from https://github.com/PaperMC/Paper/pull/8326 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 58fd02c12894e57312dca70fd4871b8a0590bb76..3174fb7fb678a8a669e28ae10c830ede3855a3ad 100644 +index 58fd02c12894e57312dca70fd4871b8a0590bb76..4c3d4155ee3f95331221d2fde97003e9456430c9 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3009,37 +3009,12 @@ public abstract class LivingEntity extends Entity { @@ -44,7 +44,7 @@ index 58fd02c12894e57312dca70fd4871b8a0590bb76..3174fb7fb678a8a669e28ae10c830ede - while (this.yHeadRot - this.yHeadRotO >= 180.0F) { - this.yHeadRotO += 360.0F; - } -+ // Paper start - Stop large pitch and yaw changes from crashing the server ++ // Paper start - stop large pitch and yaw changes from crashing the server + this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F; + this.yBodyRotO += Math.round((this.yBodyRot - this.yBodyRotO) / 360.0F) * 360.0F; + this.xRotO += Math.round((this.getXRot() - this.xRotO) / 360.0F) * 360.0F; @@ -53,3 +53,22 @@ index 58fd02c12894e57312dca70fd4871b8a0590bb76..3174fb7fb678a8a669e28ae10c830ede this.level.getProfiler().pop(); this.animStep += f2; +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 39ba6ca32b827daee300e1240bd76fd8f680ea02..85fb907fb149961611310c355d0911d81f1b735c 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +@@ -275,13 +275,7 @@ public abstract class Projectile extends Entity { + } + + protected static float lerpRotation(float prevRot, float newRot) { +- while (newRot - prevRot < -180.0F) { +- prevRot -= 360.0F; +- } +- +- while (newRot - prevRot >= 180.0F) { +- prevRot += 360.0F; +- } ++ prevRot += Math.round((newRot - prevRot) / 360.0F) * 360.0F; // Paper - stop large look changes from crashing the server + + return Mth.lerp(0.2F, prevRot, newRot); + } diff --git a/patches/server/0079-PaperPR-Add-more-collision-code-skipping-logic.patch b/patches/server/0079-PaperPR-Add-more-collision-code-skipping-logic.patch index 47f163b..37c268d 100644 --- a/patches/server/0079-PaperPR-Add-more-collision-code-skipping-logic.patch +++ b/patches/server/0079-PaperPR-Add-more-collision-code-skipping-logic.patch @@ -1,12 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Sat, 19 Mar 2022 16:27:30 +0100 Subject: [PATCH] PaperPR Add more collision code skipping logic Taken from https://github.com/PaperMC/Paper/pull/7581 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3174fb7fb678a8a669e28ae10c830ede3855a3ad..a2c348697b0a9a6646647e7946f6720c5897fb3d 100644 +index 4c3d4155ee3f95331221d2fde97003e9456430c9..de10d051561bd7897a5a0e9ad52537f53ab7ad07 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3442,6 +3442,10 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0083-Fix-tick-function-tag-running-before-load.patch b/patches/server/0083-Fix-tick-function-tag-running-before-load.patch index a60ce91..7679487 100644 --- a/patches/server/0083-Fix-tick-function-tag-running-before-load.patch +++ b/patches/server/0083-Fix-tick-function-tag-running-before-load.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Fri, 8 Apr 2022 21:20:50 +0200 Subject: [PATCH] Fix tick function tag running before load diff --git a/patches/server/0084-lithium-suffocation.patch b/patches/server/0084-lithium-suffocation.patch index e3efa09..ab06848 100644 --- a/patches/server/0084-lithium-suffocation.patch +++ b/patches/server/0084-lithium-suffocation.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Fri, 8 Apr 2022 22:21:48 +0200 Subject: [PATCH] lithium: suffocation diff --git a/patches/server/0085-Optimize-default-values-for-configs.patch b/patches/server/0085-Optimize-default-values-for-configs.patch index 67224e5..8006688 100644 --- a/patches/server/0085-Optimize-default-values-for-configs.patch +++ b/patches/server/0085-Optimize-default-values-for-configs.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Sun, 8 May 2022 13:13:02 +0200 Subject: [PATCH] Optimize default values for configs diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java -index 38cb29c646ff496ffaa6553f98a565b71155c464..eb6437e73dfe8edabd21965a0f8f80f54ee34e71 100644 +index 38cb29c646ff496ffaa6553f98a565b71155c464..581def3ae8f30246019d323c6e379e9a66a6243d 100644 --- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java @@ -216,7 +216,7 @@ public class PufferfishConfig { @@ -26,34 +26,19 @@ index 38cb29c646ff496ffaa6553f98a565b71155c464..eb6437e73dfe8edabd21965a0f8f80f5 "Whether or not async pathfinding should be enabled."); if (!enableAsyncPathfindingInitialized) { enableAsyncPathfindingInitialized = true; -@@ -238,8 +238,10 @@ public class PufferfishConfig { +@@ -238,8 +238,8 @@ public class PufferfishConfig { 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."); -+ // Mirai start - optimize default values for configs -+ maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 6, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); -+ maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 6, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed."); -+ // Mirai end ++ maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 8, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); // Mirai - optimize default values for configs ++ maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 8, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed."); // Mirai - optimize default values for configs setComment("projectile", "Optimizes projectile settings"); } -@@ -257,10 +259,10 @@ public class PufferfishConfig { - "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", 40, // Mirai - optimize default values for configs - "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, // Mirai - optimize default values for configs - "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/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java -index bc72131afa1ae9986ee311a9b371e97c8feb38f8..c54341d03a1ef78d075236968a000e00bbf4f706 100644 +index bc72131afa1ae9986ee311a9b371e97c8feb38f8..0130e2c3c047055fbea9c3d893a9b4593fa10ed2 100644 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java @@ -56,7 +56,7 @@ public class GlobalConfiguration extends ConfigurationPart { @@ -65,15 +50,6 @@ index bc72131afa1ae9986ee311a9b371e97c8feb38f8..c54341d03a1ef78d075236968a000e00 public boolean serverNamePrivacy = false; public List hiddenConfigEntries = List.of( "database", -@@ -206,7 +206,7 @@ public class GlobalConfiguration extends ConfigurationPart { - public BookSize bookSize; - - public class BookSize extends ConfigurationPart { -- public int pageMax = 2560; // TODO this appears to be a duplicate setting with one above -+ public int pageMax = 512; // TODO this appears to be a duplicate setting with one above // Mirai - optimize default values for configs - public double totalMultiplier = 0.98D; // TODO this should probably be merged into the above inner class - } - public boolean resolveSelectorsInBooks = false; @@ -266,9 +266,9 @@ public class GlobalConfiguration extends ConfigurationPart { public boolean fixEntityPositionDesync = true; public boolean loadPermissionsYmlBeforePlugins = true; @@ -87,36 +63,59 @@ index bc72131afa1ae9986ee311a9b371e97c8feb38f8..c54341d03a1ef78d075236968a000e00 public boolean useDimensionTypeForCustomSpawners = false; public boolean strictAdvancementDimensionCheck = false; diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1e7a9943b 100644 +index e2c612dd55fcb2769fb06f7878b8d0873f2be139..1f01b4a2c05451dd2b2c3ae8eb70318e167ba1d6 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -114,8 +114,10 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -114,15 +114,15 @@ public class WorldConfiguration extends ConfigurationPart { public ArmorStands armorStands; public class ArmorStands extends ConfigurationPart { - public boolean doCollisionEntityLookups = true; - public boolean tick = true; -+ // Mirai start - optimize default values for configs -+ public boolean doCollisionEntityLookups = false; -+ public boolean tick = false; -+ // Mirai end ++ public boolean doCollisionEntityLookups = false; // Mirai - optimize default values for configs ++ public boolean tick = false; // Mirai - optimize default values for configs } public Spawning spawning; -@@ -198,8 +200,10 @@ public class WorldConfiguration extends ConfigurationPart { + + public class Spawning extends ConfigurationPart { +- public ArrowDespawnRate nonPlayerArrowDespawnRate = ArrowDespawnRate.def(WorldConfiguration.this.spigotConfig); +- public ArrowDespawnRate creativeArrowDespawnRate = ArrowDespawnRate.def(WorldConfiguration.this.spigotConfig); ++ public int nonPlayerArrowDespawnRate = 20; // Mirai - optimize default values for configs ++ public int creativeArrowDespawnRate = 20; // Mirai - optimize default values for configs + public boolean filterNbtDataFromSpawnEggsAndRelated = true; + public boolean disableMobSpawnerSpawnEggTransformation = false; + public boolean perPlayerMobSpawns = true; +@@ -198,8 +198,8 @@ public class WorldConfiguration extends ConfigurationPart { public Behavior behavior; public class Behavior extends ConfigurationPart { - public boolean disableChestCatDetection = false; - public boolean spawnerNerfedMobsShouldJump = false; -+ // Mirai start - optimize default values for configs -+ public boolean disableChestCatDetection = true; -+ public boolean spawnerNerfedMobsShouldJump = true; -+ // Mirai end ++ public boolean disableChestCatDetection = true; // Mirai - optimize default values for configs ++ public boolean spawnerNerfedMobsShouldJump = true; // Mirai - optimize default values for configs public int experienceMergeMaxValue = -1; public boolean shouldRemoveDragon = false; public boolean zombiesTargetTurtleEggs = true; -@@ -310,7 +314,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -242,7 +242,7 @@ public class WorldConfiguration extends ConfigurationPart { + public boolean enderDragonsDeathAlwaysPlacesDragonEgg = false; + public boolean phantomsDoNotSpawnOnCreativePlayers = true; + public boolean phantomsOnlyAttackInsomniacs = true; +- public boolean parrotsAreUnaffectedByPlayerMovement = false; ++ public boolean parrotsAreUnaffectedByPlayerMovement = true; // Mirai - optimize default values for configs + public double zombieVillagerInfectionChance = -1.0; + public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot; + +@@ -252,7 +252,7 @@ public class WorldConfiguration extends ConfigurationPart { + } + + public boolean disablePlayerCrits = false; +- public boolean nerfPigmenFromNetherPortals = false; ++ public boolean nerfPigmenFromNetherPortals = true; // Mirai - optimize default values for configs + public PillagerPatrols pillagerPatrols; + + public class PillagerPatrols extends ConfigurationPart { +@@ -310,7 +310,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Environment extends ConfigurationPart { public boolean disableThunder = false; public boolean disableIceAndSnow = false; @@ -125,7 +124,16 @@ index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1 public boolean disableExplosionKnockback = false; public boolean generateFlatBedrock = false; public FrostedIce frostedIce; -@@ -381,7 +385,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -355,7 +355,7 @@ public class WorldConfiguration extends ConfigurationPart { + + public class Maps extends ConfigurationPart { + public int itemFrameCursorLimit = 128; +- public int itemFrameCursorUpdateInterval = 10; ++ public int itemFrameCursorUpdateInterval = 20; // Mirai - optimize default values for configs + } + + public Fixes fixes; +@@ -381,7 +381,7 @@ public class WorldConfiguration extends ConfigurationPart { public class Hopper extends ConfigurationPart { public boolean cooldownWhenFull = true; public boolean disableMoveEvent = false; @@ -134,7 +142,7 @@ index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1 } public Collisions collisions; -@@ -389,9 +393,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -389,9 +389,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Collisions extends ConfigurationPart { public boolean onlyPlayersCollide = false; public boolean allowVehicleCollisions = true; @@ -146,7 +154,7 @@ index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1 public boolean allowPlayerCrammingDamage = false; } -@@ -399,18 +403,33 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -399,18 +399,32 @@ public class WorldConfiguration extends ConfigurationPart { public class Chunks extends ConfigurationPart { public AutosavePeriod autoSaveInterval = AutosavePeriod.def(); @@ -155,12 +163,10 @@ index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1 public int fixedChunkInhabitedTime = -1; - public boolean preventMovingIntoUnloadedChunks = false; - public Duration delayChunkUnloadsBy = Duration.of("10s"); -+ // Mirai start - optimize default values for configs -+ public boolean preventMovingIntoUnloadedChunks = true; -+ public Duration delayChunkUnloadsBy = Duration.of("5s"); -+ // Mirai end ++ public boolean preventMovingIntoUnloadedChunks = true; // Mirai - optimize default values for configs ++ public Duration delayChunkUnloadsBy = Duration.of("5s"); // Mirai - optimize default values for configs public Reference2IntMap> entityPerChunkSaveLimit = Util.make(new Reference2IntOpenHashMap<>(Registry.ENTITY_TYPE.size()), map -> { -- map.defaultReturnValue(-1); + map.defaultReturnValue(-1); - map.put(EntityType.EXPERIENCE_ORB, -1); - map.put(EntityType.SNOWBALL, -1); - map.put(EntityType.ENDER_PEARL, -1); @@ -190,7 +196,7 @@ index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1 }); } -@@ -424,11 +443,22 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -424,11 +438,22 @@ public class WorldConfiguration extends ConfigurationPart { public TickRates tickRates; public class TickRates extends ConfigurationPart { @@ -218,7 +224,7 @@ index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1 } @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) -@@ -436,7 +466,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -436,7 +461,7 @@ public class WorldConfiguration extends ConfigurationPart { public class FeatureSeeds extends ConfigurationPart.Post { @Setting(FeatureSeedsGeneration.GENERATE_KEY) @@ -227,7 +233,7 @@ index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1 @Setting(FeatureSeedsGeneration.FEATURES_KEY) public Reference2LongMap>> features = new Reference2LongOpenHashMap<>(); -@@ -450,9 +480,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -450,9 +475,9 @@ public class WorldConfiguration extends ConfigurationPart { public class Misc extends ConfigurationPart { public int lightQueueSize = 20; @@ -239,21 +245,21 @@ index e2c612dd55fcb2769fb06f7878b8d0873f2be139..102468a21cd8386f6505b8e3982349c1 public boolean disableEndCredits = false; public float maxLeashDistance = 10f; public boolean disableSprintInterruptionOnAttack = false; -diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 5d162f59fc5ef9adf7fa762b137bbcfca745d9c5..c7c8a77e3af96720434e361b04186d5799da2936 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 ); // Mirai - optimize default values for configs - } +diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +index 49f093b21aa1268d40aa54ebfce06976bd79ae81..5d925f090401929de4d241fec08158e98f1aed19 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +@@ -336,7 +336,7 @@ public abstract class AbstractArrow extends Projectile { + + protected void tickDespawn() { + ++this.life; +- if (this.life >= (pickup == Pickup.CREATIVE_ONLY ? level.paperConfig().entities.spawning.creativeArrowDespawnRate.value() : (pickup == Pickup.DISALLOWED ? level.paperConfig().entities.spawning.nonPlayerArrowDespawnRate.value() : ((this instanceof ThrownTrident) ? level.spigotConfig.tridentDespawnRate : level.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init? ++ if (this.life >= (pickup == Pickup.CREATIVE_ONLY ? level.paperConfig().entities.spawning.creativeArrowDespawnRate : (pickup == Pickup.DISALLOWED ? level.paperConfig().entities.spawning.nonPlayerArrowDespawnRate : ((this instanceof ThrownTrident) ? level.spigotConfig.tridentDespawnRate : level.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init? // Mirai - optimize default values for configs + this.discard(); + } - public static double movedWronglyThreshold; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index ce61f9e8a835bc5e2d3815e337ed9785f9d06f04..217c8f8364ba8d1e509dea9ec0de4b6832db8a51 100644 +index ce61f9e8a835bc5e2d3815e337ed9785f9d06f04..0dc4aa6286bff96be8abfb33599502b1305adeb8 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -150,14 +150,14 @@ public class SpigotWorldConfig @@ -282,55 +288,46 @@ index ce61f9e8a835bc5e2d3815e337ed9785f9d06f04..217c8f8364ba8d1e509dea9ec0de4b68 this.log( "Mob Spawn Range: " + this.mobSpawnRange ); } -@@ -207,31 +207,33 @@ public class SpigotWorldConfig +@@ -207,14 +207,14 @@ public class SpigotWorldConfig this.log( "Item Despawn Rate: " + this.itemDespawnRate ); } - public int animalActivationRange = 32; - public int monsterActivationRange = 32; -+ // Mirai start - optimize default values for configs -+ public int animalActivationRange = 16; -+ public int monsterActivationRange = 24; ++ public int animalActivationRange = 16; // Mirai - optimize default values for configs ++ public int monsterActivationRange = 24; // Mirai - optimize default values for configs public int raiderActivationRange = 48; - public int miscActivationRange = 16; -+ public int miscActivationRange = 8; ++ public int miscActivationRange = 8; // Mirai - optimize default values for configs // Paper start - public int flyingMonsterActivationRange = 32; +- 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 flyingMonsterActivationRange = 48; // Mirai - optimize default values for configs ++ public int waterActivationRange = 8; // Mirai - optimize default values for configs ++ public int villagerActivationRange = 16; // Mirai - optimize default values for configs + public int wakeUpInactiveAnimals = 4; 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 = 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 wakeUpInactiveAnimalsFor = 5*20; +@@ -231,7 +231,7 @@ public class SpigotWorldConfig public int villagersWorkImmunityFor = 20; public boolean villagersActiveForPanic = true; // Paper end - public boolean tickInactiveVillagers = true; -+ public boolean tickInactiveVillagers = false; -+ // Mirai end ++ public boolean tickInactiveVillagers = false; // Mirai - optimize default values for configs public boolean ignoreSpectatorActivation = false; private void activationRange() { -@@ -307,7 +309,7 @@ public class SpigotWorldConfig +@@ -297,7 +297,7 @@ public class SpigotWorldConfig + { + this.set( "ticks-per.hopper-check", 1 ); + } +- this.hopperCheck = this.getInt( "ticks-per.hopper-check", 1 ); ++ this.hopperCheck = this.getInt( "ticks-per.hopper-check", 8 ); // Mirai - optimize default values for configs + this.hopperAmount = this.getInt( "hopper-amount", 1 ); + this.hopperCanLoadChunks = this.getBoolean( "hopper-can-load-chunks", false ); + this.log( "Hopper Transfer: " + this.hopperTransfer + " Hopper Check: " + this.hopperCheck + " Hopper Amount: " + this.hopperAmount + " Hopper Can Load Chunks: " + this.hopperCanLoadChunks ); +@@ -307,7 +307,7 @@ public class SpigotWorldConfig public int tridentDespawnRate; private void arrowDespawnRate() { @@ -339,11 +336,37 @@ index ce61f9e8a835bc5e2d3815e337ed9785f9d06f04..217c8f8364ba8d1e509dea9ec0de4b68 this.tridentDespawnRate = this.getInt( "trident-despawn-rate", this.arrowDespawnRate ); this.log( "Arrow Despawn Rate: " + this.arrowDespawnRate + " Trident Respawn Rate:" + this.tridentDespawnRate ); } +@@ -322,14 +322,14 @@ public class SpigotWorldConfig + public boolean nerfSpawnerMobs; + private void nerfSpawnerMobs() + { +- this.nerfSpawnerMobs = this.getBoolean( "nerf-spawner-mobs", false ); ++ this.nerfSpawnerMobs = this.getBoolean( "nerf-spawner-mobs", true ); // Mirai - optimize default values for configs + this.log( "Nerfing mobs spawned from spawners: " + this.nerfSpawnerMobs ); + } + + public boolean enableZombiePigmenPortalSpawns; + private void enableZombiePigmenPortalSpawns() + { +- this.enableZombiePigmenPortalSpawns = this.getBoolean( "enable-zombie-pigmen-portal-spawns", true ); ++ this.enableZombiePigmenPortalSpawns = this.getBoolean( "enable-zombie-pigmen-portal-spawns", false ); // Mirai - optimize default values for configs + this.log( "Allow Zombie Pigmen to spawn from portal blocks: " + this.enableZombiePigmenPortalSpawns ); + } + +@@ -432,7 +432,7 @@ public class SpigotWorldConfig + public int hangingTickFrequency; + private void hangingTickFrequency() + { +- this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 100 ); ++ this.hangingTickFrequency = this.getInt( "hanging-tick-frequency", 200 ); // Mirai - optimize default values for configs + } + + /* JettPack - remove tick limiter diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml -index eef7c125b2689f29cae5464659eacdf33f5695b2..c62cce3e87e1206a376b5cf7dedeb88228eabe5b 100644 +index eef7c125b2689f29cae5464659eacdf33f5695b2..c6b04acb5371a0ac454c5e377bccad5b0972aed8 100644 --- a/src/main/resources/configurations/bukkit.yml +++ b/src/main/resources/configurations/bukkit.yml -@@ -18,7 +18,7 @@ settings: +@@ -18,28 +18,28 @@ settings: update-folder: update plugin-profiling: false connection-throttle: 4000 @@ -352,22 +375,25 @@ index eef7c125b2689f29cae5464659eacdf33f5695b2..c62cce3e87e1206a376b5cf7dedeb882 deprecated-verbose: default shutdown-message: Server closed minimum-api: none -@@ -26,20 +26,20 @@ settings: + use-map-color-cache: true spawn-limits: - monsters: 70 - animals: 10 +- monsters: 70 +- animals: 10 - water-animals: 5 - water-ambient: 20 - water-underground-creature: 5 - axolotls: 5 - ambient: 15 ++ monsters: 20 ++ animals: 5 + water-animals: 2 + water-ambient: 2 + water-underground-creature: 3 + axolotls: 3 + ambient: 1 chunk-gc: - period-in-ticks: 600 +- period-in-ticks: 600 ++ period-in-ticks: 400 ticks-per: animal-spawns: 400 - monster-spawns: 1 @@ -384,3 +410,13 @@ index eef7c125b2689f29cae5464659eacdf33f5695b2..c62cce3e87e1206a376b5cf7dedeb882 + ambient-spawns: 400 autosave: 6000 aliases: now-in-commands.yml +diff --git a/src/main/resources/configurations/commands.yml b/src/main/resources/configurations/commands.yml +index 18f54571200e2eca09a39b88f170fe7b99d8618f..1b57d51d92c5c69286800d10baeaa936fa208cae 100644 +--- a/src/main/resources/configurations/commands.yml ++++ b/src/main/resources/configurations/commands.yml +@@ -12,5 +12,3 @@ + command-block-overrides: [] + ignore-vanilla-permissions: false + aliases: +- icanhasbukkit: +- - "version $1-" diff --git a/patches/server/0086-Configurable-map-update-interval.patch b/patches/server/0086-Configurable-map-update-interval.patch deleted file mode 100644 index 74e249a..0000000 --- a/patches/server/0086-Configurable-map-update-interval.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz -Date: Thu, 21 Apr 2022 19:43:31 +0200 -Subject: [PATCH] Configurable map update interval - - -diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java -index 67b88da702b780f79c0496cb17f1e6f1f8dd6c2b..712707da510977bfa1ce4b991fd8a8f599e4d3a1 100644 ---- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java -+++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java -@@ -624,7 +624,7 @@ public class MapItemSavedData extends SavedData { - @Nullable - Packet nextUpdatePacket(int mapId) { - MapItemSavedData.MapPatch worldmap_b; -- if (!this.dirtyData && this.tick % 5 != 0) { this.tick++; return null; } // Paper - this won't end up sending, so don't render it! -+ if (!this.dirtyData && this.tick % wtf.etil.mirai.MiraiConfig.mapUpdateInterval != 0) { this.tick++; return null; } // Paper - this won't end up sending, so don't render it! // Mirai - configurable map update interval - boolean vanillaMaps = shouldUseVanillaMap(); // Paper - org.bukkit.craftbukkit.map.RenderData render = !vanillaMaps ? MapItemSavedData.this.mapView.render((org.bukkit.craftbukkit.entity.CraftPlayer) this.player.getBukkitEntity()) : MapItemSavedData.this.vanillaRender; // CraftBukkit // Paper - -@@ -637,7 +637,7 @@ public class MapItemSavedData extends SavedData { - - Collection collection; - -- if ((true || this.dirtyDecorations) && this.tick++ % 5 == 0) { // CraftBukkit - custom maps don't update this yet -+ if ((true || this.dirtyDecorations) && this.tick++ % wtf.etil.mirai.MiraiConfig.mapUpdateInterval == 0) { // CraftBukkit - custom maps don't update this yet // Mirai - configurable map update interval - this.dirtyDecorations = false; - // CraftBukkit start - java.util.Collection icons = new java.util.ArrayList(); -diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java -index 7658c7743646fb1d3e07a9f91245407a2dd191dd..23761b89a2fac069e9709db9741afa1ba24ae1d1 100644 ---- a/src/main/java/wtf/etil/mirai/MiraiConfig.java -+++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java -@@ -228,4 +228,11 @@ public class MiraiConfig { - "to check when entity delta movement is null."); - } - -+ public static int mapUpdateInterval; -+ private static void mapUpdate() { -+ mapUpdateInterval = getInt("map-update-interval", 5, -+ "This value defines how often a map refresh, in tick.", -+ "A second is 20 ticks."); -+ } -+ - } -\ No newline at end of file diff --git a/patches/server/0087-Fix-hunger-saturation-depleting-on-peaceful.patch b/patches/server/0086-Fix-hunger-saturation-depleting-on-peaceful.patch similarity index 95% rename from patches/server/0087-Fix-hunger-saturation-depleting-on-peaceful.patch rename to patches/server/0086-Fix-hunger-saturation-depleting-on-peaceful.patch index 2eb6e56..b120c53 100644 --- a/patches/server/0087-Fix-hunger-saturation-depleting-on-peaceful.patch +++ b/patches/server/0086-Fix-hunger-saturation-depleting-on-peaceful.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Fri, 22 Apr 2022 18:50:49 +0200 Subject: [PATCH] Fix hunger saturation depleting on peaceful diff --git a/patches/server/0088-Fix-mobs-attacking-themselves.patch b/patches/server/0087-Fix-mobs-attacking-themselves.patch similarity index 95% rename from patches/server/0088-Fix-mobs-attacking-themselves.patch rename to patches/server/0087-Fix-mobs-attacking-themselves.patch index 505d02d..b4c0959 100644 --- a/patches/server/0088-Fix-mobs-attacking-themselves.patch +++ b/patches/server/0087-Fix-mobs-attacking-themselves.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Fri, 29 Apr 2022 12:08:22 +0200 Subject: [PATCH] Fix mobs attacking themselves diff --git a/patches/server/0089-Fix-brewing-stands-resetting-their-brewTime-when-bei.patch b/patches/server/0088-Fix-brewing-stands-resetting-their-brewTime-when-bei.patch similarity index 96% rename from patches/server/0089-Fix-brewing-stands-resetting-their-brewTime-when-bei.patch rename to patches/server/0088-Fix-brewing-stands-resetting-their-brewTime-when-bei.patch index 9dec3d0..309b6c6 100644 --- a/patches/server/0089-Fix-brewing-stands-resetting-their-brewTime-when-bei.patch +++ b/patches/server/0088-Fix-brewing-stands-resetting-their-brewTime-when-bei.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: etil2jz +From: etil2jz <81570777+etil2jz@users.noreply.github.com> Date: Sun, 8 May 2022 16:34:27 +0200 Subject: [PATCH] Fix brewing stands resetting their brewTime when being unloaded diff --git a/patches/server/0090-lithium-world.tick_scheduler.patch b/patches/server/0089-lithium-world.tick_scheduler.patch similarity index 99% rename from patches/server/0090-lithium-world.tick_scheduler.patch rename to patches/server/0089-lithium-world.tick_scheduler.patch index 13ccede..8eb3cf6 100644 --- a/patches/server/0090-lithium-world.tick_scheduler.patch +++ b/patches/server/0089-lithium-world.tick_scheduler.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Arthur Blanchot +From: Arthur Blanchot <81570777+etil2jz@users.noreply.github.com> Date: Fri, 24 Jun 2022 21:17:05 +0200 Subject: [PATCH] lithium: world.tick_scheduler diff --git a/patches/server/0091-Save-Json-list-asynchronously.patch b/patches/server/0090-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0091-Save-Json-list-asynchronously.patch rename to patches/server/0090-Save-Json-list-asynchronously.patch diff --git a/patches/server/0092-Swaps-the-predicate-order-of-collision.patch b/patches/server/0091-Swaps-the-predicate-order-of-collision.patch similarity index 100% rename from patches/server/0092-Swaps-the-predicate-order-of-collision.patch rename to patches/server/0091-Swaps-the-predicate-order-of-collision.patch diff --git a/patches/server/0093-Fix-head-rotation-packet-spam.patch b/patches/server/0092-Fix-head-rotation-packet-spam.patch similarity index 100% rename from patches/server/0093-Fix-head-rotation-packet-spam.patch rename to patches/server/0092-Fix-head-rotation-packet-spam.patch diff --git a/patches/server/0094-Cache-block-break-animation-packet.patch b/patches/server/0093-Cache-block-break-animation-packet.patch similarity index 100% rename from patches/server/0094-Cache-block-break-animation-packet.patch rename to patches/server/0093-Cache-block-break-animation-packet.patch diff --git a/patches/server/0095-Use-more-fastutil-data-structures.patch b/patches/server/0094-Use-more-fastutil-data-structures.patch similarity index 100% rename from patches/server/0095-Use-more-fastutil-data-structures.patch rename to patches/server/0094-Use-more-fastutil-data-structures.patch diff --git a/patches/server/0096-Optimize-Math.round-and-Math.hypot-functions.patch b/patches/server/0095-Optimize-Math.round-and-Math.hypot-functions.patch similarity index 98% rename from patches/server/0096-Optimize-Math.round-and-Math.hypot-functions.patch rename to patches/server/0095-Optimize-Math.round-and-Math.hypot-functions.patch index 4b038b4..2cb169c 100644 --- a/patches/server/0096-Optimize-Math.round-and-Math.hypot-functions.patch +++ b/patches/server/0095-Optimize-Math.round-and-Math.hypot-functions.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Arthur Blanchot +From: Arthur Blanchot <81570777+etil2jz@users.noreply.github.com> Date: Wed, 29 Jun 2022 02:17:00 +0200 Subject: [PATCH] Optimize `Math.round` and `Math.hypot` functions @@ -202,7 +202,7 @@ index ec587cf6592a1dc0d90d6f54af1bdfab97aec7c6..41fe8bbdf9235ce79bffe6b2fe1339f7 } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index a2c348697b0a9a6646647e7946f6720c5897fb3d..0bc9eeef8dba308cf75c05def4de30de4475c030 100644 +index de10d051561bd7897a5a0e9ad52537f53ab7ad07..cd3755118bd15f7fa46c19b887e042c3d84297b4 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1496,7 +1496,7 @@ public abstract class LivingEntity extends Entity { @@ -272,7 +272,7 @@ index a2c348697b0a9a6646647e7946f6720c5897fb3d..0bc9eeef8dba308cf75c05def4de30de @@ -3010,10 +3010,10 @@ public abstract class LivingEntity extends Entity { this.level.getProfiler().push("rangeChecks"); - // Paper start - Stop large pitch and yaw changes from crashing the server + // Paper start - stop large pitch and yaw changes from crashing the server - this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F; - this.yBodyRotO += Math.round((this.yBodyRot - this.yBodyRotO) / 360.0F) * 360.0F; - this.xRotO += Math.round((this.getXRot() - this.xRotO) / 360.0F) * 360.0F; @@ -515,11 +515,11 @@ index 0ecac76577eb440a0c3104ef4603acec826c474d..26ff7f68dacad945095d794c1def4752 // Yatopia start - Last tick time API diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java -index 23761b89a2fac069e9709db9741afa1ba24ae1d1..f6f88a802c6f1892418fd6bcb8b4bc0b90fb6afb 100644 +index 39b0c038ae053ef78c62691c73edecad94938fc7..110757bfec231278e7b5d0f22ede20f04cdbb913 100644 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java -@@ -235,4 +235,13 @@ public class MiraiConfig { - "A second is 20 ticks."); +@@ -228,4 +228,13 @@ public class MiraiConfig { + "to check when entity delta movement is null."); } + public static boolean optimizedRound; diff --git a/patches/server/0097-Faster-Sheep.getOffspringColor.patch b/patches/server/0096-Faster-Sheep.getOffspringColor.patch similarity index 98% rename from patches/server/0097-Faster-Sheep.getOffspringColor.patch rename to patches/server/0096-Faster-Sheep.getOffspringColor.patch index 1dd8bbe..549bab1 100644 --- a/patches/server/0097-Faster-Sheep.getOffspringColor.patch +++ b/patches/server/0096-Faster-Sheep.getOffspringColor.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Arthur Blanchot +From: Arthur Blanchot <81570777+etil2jz@users.noreply.github.com> Date: Wed, 29 Jun 2022 02:49:45 +0200 Subject: [PATCH] Faster Sheep.getOffspringColor diff --git a/patches/server/0098-Implement-Velocity-VarInt-optimizations.patch b/patches/server/0097-Implement-Velocity-VarInt-optimizations.patch similarity index 97% rename from patches/server/0098-Implement-Velocity-VarInt-optimizations.patch rename to patches/server/0097-Implement-Velocity-VarInt-optimizations.patch index e0e5411..d3e699b 100644 --- a/patches/server/0098-Implement-Velocity-VarInt-optimizations.patch +++ b/patches/server/0097-Implement-Velocity-VarInt-optimizations.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Arthur Blanchot +From: Arthur Blanchot <81570777+etil2jz@users.noreply.github.com> Date: Sat, 16 Jul 2022 18:12:38 +0200 Subject: [PATCH] Implement Velocity VarInt optimizations diff --git a/patches/server/0099-reduce-work-done-by-game-event-system.patch b/patches/server/0098-reduce-work-done-by-game-event-system.patch similarity index 100% rename from patches/server/0099-reduce-work-done-by-game-event-system.patch rename to patches/server/0098-reduce-work-done-by-game-event-system.patch diff --git a/patches/server/0100-reduce-sensor-work.patch b/patches/server/0099-reduce-sensor-work.patch similarity index 96% rename from patches/server/0100-reduce-sensor-work.patch rename to patches/server/0099-reduce-sensor-work.patch index f46b8a1..6edd32b 100644 --- a/patches/server/0100-reduce-sensor-work.patch +++ b/patches/server/0099-reduce-sensor-work.patch @@ -10,7 +10,7 @@ this patch is focused around the sensors used for ai delete the line of sight cache less often and use a faster nearby comparison diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 0bc9eeef8dba308cf75c05def4de30de4475c030..b621253d69d4379faaf11ef39e9e000ed615e85f 100644 +index cd3755118bd15f7fa46c19b887e042c3d84297b4..2b69db2f0c5e94eae2e021e2958f1b04f92b19ab 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -998,12 +998,14 @@ public abstract class LivingEntity extends Entity { diff --git a/patches/server/0101-Configurable-chat-message-signatures.patch b/patches/server/0100-Configurable-chat-message-signatures.patch similarity index 96% rename from patches/server/0101-Configurable-chat-message-signatures.patch rename to patches/server/0100-Configurable-chat-message-signatures.patch index 5785346..fbf9b4e 100644 --- a/patches/server/0101-Configurable-chat-message-signatures.patch +++ b/patches/server/0100-Configurable-chat-message-signatures.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Arthur Blanchot +From: Arthur Blanchot <81570777+etil2jz@users.noreply.github.com> Date: Tue, 2 Aug 2022 14:48:12 +0200 Subject: [PATCH] Configurable chat message signatures @@ -92,10 +92,10 @@ index 18c4f2eeb6bb427c1314608fc6a81e4642d92888..b029ae19db2bfde9b08950f41ba8a09e } diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java -index f6f88a802c6f1892418fd6bcb8b4bc0b90fb6afb..13884ca2bd4e459498700e2fed1f0b4406538f53 100644 +index 110757bfec231278e7b5d0f22ede20f04cdbb913..57df9a7d26855ca205190584f61fc8026d98225c 100644 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java -@@ -244,4 +244,12 @@ public class MiraiConfig { +@@ -237,4 +237,12 @@ public class MiraiConfig { "Whether or not Math.hypot should be replaced by a faster version."); } diff --git a/patches/server/0102-PaperPR-Fix-exact-choice-recipe-book-clicks.patch b/patches/server/0101-PaperPR-Fix-exact-choice-recipe-book-clicks.patch similarity index 100% rename from patches/server/0102-PaperPR-Fix-exact-choice-recipe-book-clicks.patch rename to patches/server/0101-PaperPR-Fix-exact-choice-recipe-book-clicks.patch diff --git a/patches/server/0103-Fix-MC-238526.patch b/patches/server/0102-Fix-MC-238526.patch similarity index 94% rename from patches/server/0103-Fix-MC-238526.patch rename to patches/server/0102-Fix-MC-238526.patch index 234fcb5..e2b6356 100644 --- a/patches/server/0103-Fix-MC-238526.patch +++ b/patches/server/0102-Fix-MC-238526.patch @@ -1,5 +1,5 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Arthur Blanchot +From: Arthur Blanchot <81570777+etil2jz@users.noreply.github.com> Date: Mon, 8 Aug 2022 11:21:49 +0200 Subject: [PATCH] Fix MC-238526 diff --git a/patches/server/0104-Lobotomize-stuck-villagers.patch b/patches/server/0103-Lobotomize-stuck-villagers.patch similarity index 97% rename from patches/server/0104-Lobotomize-stuck-villagers.patch rename to patches/server/0103-Lobotomize-stuck-villagers.patch index ef58ed0..7f3d458 100644 --- a/patches/server/0104-Lobotomize-stuck-villagers.patch +++ b/patches/server/0103-Lobotomize-stuck-villagers.patch @@ -112,10 +112,10 @@ index f0b910df1ee471b4d72d97c6197ab14f2854976e..6ce32a52d621a0c2629568ea07e445f5 + // Purpur end } diff --git a/src/main/java/wtf/etil/mirai/MiraiConfig.java b/src/main/java/wtf/etil/mirai/MiraiConfig.java -index 13884ca2bd4e459498700e2fed1f0b4406538f53..b53da92ee9e96d76eada5ce7ed538378b88510c5 100644 +index 57df9a7d26855ca205190584f61fc8026d98225c..156f5c1f28e36ca69b0ef5c15550d004b0ef69a4 100644 --- a/src/main/java/wtf/etil/mirai/MiraiConfig.java +++ b/src/main/java/wtf/etil/mirai/MiraiConfig.java -@@ -252,4 +252,11 @@ public class MiraiConfig { +@@ -245,4 +245,11 @@ public class MiraiConfig { "'secure chat', such as offline-mode servers."); } diff --git a/patches/server/0105-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0104-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0105-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0104-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0106-Fix-legacy-colors-in-console.patch b/patches/server/0105-Fix-legacy-colors-in-console.patch similarity index 100% rename from patches/server/0106-Fix-legacy-colors-in-console.patch rename to patches/server/0105-Fix-legacy-colors-in-console.patch diff --git a/patches/server/0107-PaperPR-Set-position-before-player-sending-on-dimens.patch b/patches/server/0106-PaperPR-Set-position-before-player-sending-on-dimens.patch similarity index 100% rename from patches/server/0107-PaperPR-Set-position-before-player-sending-on-dimens.patch rename to patches/server/0106-PaperPR-Set-position-before-player-sending-on-dimens.patch diff --git a/patches/server/0108-Set-BlockData-without-light-updates.patch b/patches/server/0107-Set-BlockData-without-light-updates.patch similarity index 100% rename from patches/server/0108-Set-BlockData-without-light-updates.patch rename to patches/server/0107-Set-BlockData-without-light-updates.patch diff --git a/patches/server/0109-Set-multiple-Team-settings-at-once.patch b/patches/server/0108-Set-multiple-Team-settings-at-once.patch similarity index 100% rename from patches/server/0109-Set-multiple-Team-settings-at-once.patch rename to patches/server/0108-Set-multiple-Team-settings-at-once.patch diff --git a/patches/server/0110-Smooth-Teleports.patch b/patches/server/0109-Smooth-Teleports.patch similarity index 100% rename from patches/server/0110-Smooth-Teleports.patch rename to patches/server/0109-Smooth-Teleports.patch diff --git a/patches/server/0111-Unfreeze-MappedRegistry.patch b/patches/server/0110-Unfreeze-MappedRegistry.patch similarity index 100% rename from patches/server/0111-Unfreeze-MappedRegistry.patch rename to patches/server/0110-Unfreeze-MappedRegistry.patch