Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 16:59:23 +00:00
Code Issues Releases Activity

Move configuration comments to wiki

Browse Source
This commit is contained in:
Martijn Muijsers
2023-08-29 21:58:33 +02:00
parent 975abae3ff
commit 62130f9fd9
46 changed files with 224 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0022-Reduce-projectile-chunk-loading.patch
View File

@@ -81,10 +81,10 @@ index 1b7cf6d06bdf36f146656727511a461f2520762e..d598a99072bd8eb4a4ed151b9202237d
if (entity != null) {
this.ownerUUID = entity.getUUID();
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index b82bb95b524c95cdefb81abef906eded0717e9a1..a83675d8d2f94a8e73cc2c7fa11d0aaf6f78be2c 100644
index b82bb95b524c95cdefb81abef906eded0717e9a1..eabe9e6a7f99a7ad1f2a9f210f8a7489a89dc4cc 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -33,7 +33,55 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -33,7 +33,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public SmallOptimizations smallOptimizations;
public class SmallOptimizations extends ConfigurationPart {
@@ -93,47 +93,13 @@ index b82bb95b524c95cdefb81abef906eded0717e9a1..a83675d8d2f94a8e73cc2c7fa11d0aaf
+ public MaxProjectileChunkLoads maxProjectileChunkLoads;
+ public class MaxProjectileChunkLoads extends ConfigurationPart {
+
+ /**
+ * The maximum number of chunks that can be synchronously loaded by all projectiles in one world in a tick.
+ * Any value < 0 means no maximum.
+ * <ul>
+ * <li><i>Default</i>: 10</li>
+ * <li><i>Vanilla</i>: -1</li>
+ * </ul>
+ */
+ public int perTick = 10;
+
+ public PerProjectile perProjectile;
+ public class PerProjectile extends ConfigurationPart {
+
+ /**
+ * The maximum number of chunks that can be synchronously loaded by a projectile throughout its lifetime.
+ * Any value < 0 means no maximum.
+ * <ul>
+ * <li><i>Default</i>: 10</li>
+ * <li><i>Vanilla</i>: -1</li>
+ * </ul>
+ */
+ public int max = 10;
+
+ /**
+ * Whether to set the planar velocity of projectiles that cross the {@link #max} threshold
+ * to zero, so that they stop attempting to cross chunk boundaries.
+ * This has no effect if {@link #removeFromWorldAfterReachLimit} is true.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * </ul>
+ */
+ public boolean resetMovementAfterReachLimit = false;
+
+ /**
+ * Whether to remove projectiles that cross the {@link #max} threshold from the world entirely.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * </ul>
+ */
+ public boolean removeFromWorldAfterReachLimit = false;
+
+ }
+
+ }

19
patches/server/0027-Reduce-acquire-POI-for-stuck-entities.patch
View File

@@ -71,30 +71,17 @@ index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..aed7e9affaae1e0d1e3324a41e581843
long2ObjectMap.long2ObjectEntrySet().removeIf((entry) -> {
return !entry.getValue().isStillValid(time);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index a83675d8d2f94a8e73cc2c7fa11d0aaf6f78be2c..b993c2276d14c0a384898e9705a1af6fa6d585cf 100644
index eabe9e6a7f99a7ad1f2a9f210f8a7489a89dc4cc..8a0416775d00148bf3478b51d92b00d9d485c667 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -83,6 +83,26 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -49,6 +49,13 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
// Gale end - Airplane - reduce projectile chunk loading
+ public ReducedIntervals reducedIntervals;
+ public class ReducedIntervals extends ConfigurationPart {
+
+ // Gale start - Airplane - reduce acquire POI for stuck entities
+ /**
+ * Extra interval (on top of the regular interval)
+ * for entities that are stuck (e.g. in a vehicle) to attempt to acquire a POI.
+ * If they become unstuck during this time, they will immediately be free to acquire a POI again.
+ * Given in ticks.
+ * Any value < 0 behaves like 0.
+ * <ul>
+ * <li><i>Default</i>: 200 (10 seconds)</li>
+ * <li><i>Vanilla</i>: 0</li>
+ * </ul>
+ */
+ public int acquirePoiForStuckEntity = 200;
+ // Gale end - Airplane - reduce acquire POI for stuck entities
+ public int acquirePoiForStuckEntity = 60; // Gale - Airplane - reduce acquire POI for stuck entities
+
+ }
+

18
patches/server/0047-Make-book-writing-configurable.patch
View File

@@ -68,29 +68,17 @@ index 2e23147f807c6620b54d3047fe24a3847900712c..9ae9eff03fa9b240ed736eaa97fee0da
}
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0..be4e05851e94f943b6382ba5bb9f0750c95bdad4 100644
index 5ade5d2ff3a68cf9e0240fc86e4b63432cb899c0..346fdf6f8a76539fa9ca46015ee122417e4a8102 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -35,6 +35,25 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -35,6 +35,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
}
+ public GameplayMechanics gameplayMechanics;
+ public class GameplayMechanics extends ConfigurationPart {
+
+ // Gale start - Pufferfish - make book writing configurable
+ /**
+ * Whether books should be writeable.
+ * Servers that anticipate being a target for duping may want to consider disabling this option.
+ * <br>
+ * If set to false, players with the permission {@code gale.writebooks} can still use books.
+ * <ul>
+ * <li><i>Default</i>: true</li>
+ * <li><i>Vanilla</i>: true</li>
+ * </ul>
+ */
+ public boolean enableBookWriting = true;
+ // Gale end - Pufferfish - make book writing configurable
+ public boolean enableBookWriting = true; // Gale - Pufferfish - make book writing configurable
+
+ }
+

26
patches/server/0049-Reduce-in-wall-checks.patch
View File

@@ -60,28 +60,14 @@ index 6ad84442f7722f709c7430a1b22a59957852c28b..559e85f266614f08e5b383e41f9898b2
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index b993c2276d14c0a384898e9705a1af6fa6d585cf..d34ee90eaf160a72d4898feed13d94b0b61eded3 100644
index 8a0416775d00148bf3478b51d92b00d9d485c667..08a02055b535c024cc806db17bb45fd333a56929 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -101,6 +101,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public int acquirePoiForStuckEntity = 200;
// Gale end - Airplane - reduce acquire POI for stuck entities
@@ -53,6 +53,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class ReducedIntervals extends ConfigurationPart {
+ // Gale start - Pufferfish - reduce in wall checks
+ /**
+ * Interval at which to check whether an entity is stuck in a wall, to deal suffocation damage.
+ * Since after dealing damage, there is an interval (this may change in the future, but approximately
+ * 1 second) at which entities cannot take repeated damage, delaying the suffocation check by less is
+ * almost unnoticeable.
+ * Any value <= 0 behaves like 1.
+ * <ul>
+ * <li><i>Default</i>: 10 (twice per second)</li>
+ * <li><i>Vanilla</i>: 1</li>
+ * </ul>
+ */
+ public int checkStuckInWall = 10;
+ // Gale end - Pufferfish - reduce in wall checks
+
}
public int acquirePoiForStuckEntity = 60; // Gale - Airplane - reduce acquire POI for stuck entities
+ public int checkStuckInWall = 10; // Gale - Pufferfish - reduce in wall checks
}

17
patches/server/0050-Make-chat-order-verification-configurable.patch
View File

@@ -29,25 +29,14 @@ index 376f277863a8e7a2f31ec6b013425e11bc719571..cacf0de71e3a84a18213628764c2a7b4
do {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index be4e05851e94f943b6382ba5bb9f0750c95bdad4..5021cc0b7a0f99ec53d565862add241428311dc3 100644
index 346fdf6f8a76539fa9ca46015ee122417e4a8102..7c781eabbb6df5df9f9f2cbdeef4e116ca30b645 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -57,6 +57,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -45,6 +45,8 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public Misc misc;
public class Misc extends ConfigurationPart {
+ // Gale start - Pufferfish - make chat order verification configurable
+ /**
+ * Whether to verify the order of chat messages.
+ * If this option is set to true, and a player sends an out-of-order chat packet, they will be kicked.
+ * If this option is set to false, no verification will occur, and players will not be kicked.
+ * <ul>
+ * <li><i>Default</i>: true</li>
+ * <li><i>Vanilla</i>: true</li>
+ * </ul>
+ */
+ public boolean verifyChatOrder = true;
+ // Gale end - Pufferfish - make chat order verification configurable
+ public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
+
public IncludeInTimingsReport includeInTimingsReport;
public class IncludeInTimingsReport extends ConfigurationPart {

4
patches/server/0052-Make-ender-dragon-respawn-attempt-after-placing-end-.patch
View File

@@ -44,10 +44,10 @@ index 428eed6ad35b59bdf293ca727fa3e81520a8bf0b..0ebfa82de86cc08aa9f865e7807552bb
context.getItemInHand().shrink(1);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index d34ee90eaf160a72d4898feed13d94b0b61eded3..b3054f2fa77d3e2a4d568269d368f1cce7c00723 100644
index 08a02055b535c024cc806db17bb45fd333a56929..7e7e01f6514f6bbb9c89dc3c878fb6da25eb6b1f 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -120,4 +120,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -59,4 +59,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}

18
patches/server/0053-Make-saving-fireworks-configurable.patch
View File

@@ -37,26 +37,14 @@ index 288910fb168ddc5d3a61971778b8038a56772fa8..a9354adc79b71a206ef7d76f0c59b264
+
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index b3054f2fa77d3e2a4d568269d368f1cce7c00723..6f7fe7377532e87b8c5bf0d55cb4cb3f5619eb3e 100644
index 7e7e01f6514f6bbb9c89dc3c878fb6da25eb6b1f..00a327bd0e4e0f2def0bb29d5ecff4f0ec4ba1eb 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -33,6 +33,20 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -33,6 +33,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public SmallOptimizations smallOptimizations;
public class SmallOptimizations extends ConfigurationPart {
+ // Gale start - EMC - make saving fireworks configurable
+ /**
+ * Whether fireworks are saved when saving a chunk.
+ * <br>
+ * Fireworks can bug out and not detonate, and an automated launcher can very easily fill a chunk.
+ * If this option is true, chunk unloads will remove any fireworks, preventing this scenario.
+ * <ul>
+ * <li><i>Default</i>: true</li>
+ * <li><i>Vanilla</i>: true</li>
+ * </ul>
+ */
+ public boolean saveFireworks = true;
+ // Gale end - EMC - make saving fireworks configurable
+ public boolean saveFireworks = true; // Gale - EMC - make saving fireworks configurable
+
// Gale start - Airplane - reduce projectile chunk loading
public MaxProjectileChunkLoads maxProjectileChunkLoads;

83
patches/server/0055-Reduce-hopper-item-checks.patch
View File

@@ -188,12 +188,12 @@ index 9aa26d2581df4ef75fffe203d80bc669f3ba6790..d1ba406f481a72513743b549cf450b44
public double getLevelX() {
return (double) this.worldPosition.getX() + 0.5D;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 6f7fe7377532e87b8c5bf0d55cb4cb3f5619eb3e..dffac4422559d1b5095950d90dc03b0d7bf27d26 100644
index 00a327bd0e4e0f2def0bb29d5ecff4f0ec4ba1eb..c869a559b67ecdfb8f9617e1f54fb9c28bb3c766 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -130,6 +130,112 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public int checkStuckInWall = 10;
// Gale end - Pufferfish - reduce in wall checks
@@ -57,6 +57,37 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public int acquirePoiForStuckEntity = 60; // Gale - Airplane - reduce acquire POI for stuck entities
public int checkStuckInWall = 10; // Gale - Pufferfish - reduce in wall checks
+ public CheckNearbyItem checkNearbyItem;
+ public class CheckNearbyItem extends ConfigurationPart {
@@ -202,96 +202,21 @@ index 6f7fe7377532e87b8c5bf0d55cb4cb3f5619eb3e..dffac4422559d1b5095950d90dc03b0d
+ public Hopper hopper;
+ public class Hopper extends ConfigurationPart {
+
+ /**
+ * Frequency with which hoppers check for items to pickup.
+ * Given in ticks.
+ * Any value <= 0 behaves like 1.
+ * <ul>
+ * <li><i>Default</i>: 20 (1 second)</li>
+ * <li><i>Vanilla</i>: 1</li>
+ * </ul>
+ */
+ public int interval = 20;
+
+ public Minecart minecart;
+ public class Minecart extends ConfigurationPart {
+
+ /**
+ * Frequency with which hopper minecarts check for items to pickup.
+ * Given in ticks.
+ * Any value <= 0 behaves like 1.
+ * <ul>
+ * <li><i>Default</i>: 20 (1 second)</li>
+ * <li><i>Vanilla</i>: 1</li>
+ * </ul>
+ */
+ public int interval = 20;
+
+ public TemporaryImmunity temporaryImmunity;
+ public class TemporaryImmunity extends ConfigurationPart {
+
+ /**
+ * Duration for which hopper minecarts have immunity from being affected by {@link Minecart#interval}
+ * after being made immune.
+ * Given in ticks.
+ * Any value <= 0 means hopper minecarts never have immunity.
+ * <ul>
+ * <li><i>Default</i>: 200 (10 seconds)</li>
+ * </ul>
+ */
+ public int duration = 100;
+
+ /**
+ * Items with an age higher than this value will not cause nearby hopper minecarts to become immune.
+ * Given in ticks.
+ * Any value < 0 means no age limit: all items can give nearby hopper minecarts
+ * temporary immunity to pick up items.
+ * <ul>
+ * <li><i>Default</i>: 1200 (1 minute)</li>
+ * </ul>
+ */
+ public int nearbyItemMaxAge = 1200;
+
+ /**
+ * How often to check for hopper minecarts near items, to give the minecarts temporary immunity
+ * to pick up items.
+ * Given in ticks.
+ * Any value <= 0 behaves like 1.
+ * <ul>
+ * <li><i>Default</i>: 20</li>
+ * </ul>
+ */
+ public int checkForMinecartNearItemInterval = 20;
+
+ /**
+ * Whether to check for hopper minecarts near items that are inactive, to give the minecarts
+ * temporary immunity to pick up items.
+ * <ul>
+ * <li><i>Default</i>: true</li>
+ * </ul>
+ */
+ public boolean checkForMinecartNearItemWhileInactive = true;
+
+ /**
+ * The maximum distance a dropped item can be to give hopper minecarts temporary immunity
+ * to pick up items.
+ * Any value < 0 means hopper minecarts never have immunity.
+ * <ul>
+ * <li><i>Default</i>: 24.0</li>
+ * </ul>
+ */
+ public double maxItemHorizontalDistance = 24.0;
+
+ /**
+ * The maximum distance a dropped item can be to give hopper minecarts temporary immunity
+ * to pick up items.
+ * Any value < 0 means hopper minecarts never have immunity.
+ * <ul>
+ * <li><i>Default</i>: 4.0</li>
+ * </ul>
+ */
+ public double maxItemVerticalDistance = 4.0;
+
+ }
+
+ }

28
patches/server/0056-Reduce-villager-item-re-pickup.patch
View File

@@ -48,28 +48,14 @@ index 92bd58010e8c89e361e28aec59447349edbbc028..2239c7260638bb25df5b45dbc129bcfe
org.bukkit.event.entity.EntityDropItemEvent event = new org.bukkit.event.entity.EntityDropItemEvent(entity.getBukkitEntity(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
entityitem.level().getCraftServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index dffac4422559d1b5095950d90dc03b0d7bf27d26..2f9687ad6c50cdcebc7908583b1093d1a0fa9737 100644
index c869a559b67ecdfb8f9617e1f54fb9c28bb3c766..28afbf8da166377b295302e6ea7c602da70100b1 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -236,6 +236,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -56,6 +56,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
public int acquirePoiForStuckEntity = 60; // Gale - Airplane - reduce acquire POI for stuck entities
public int checkStuckInWall = 10; // Gale - Pufferfish - reduce in wall checks
+ public int villagerItemRepickup = 100; // Gale - EMC - reduce villager item re-pickup
+ // Gale start - EMC - reduce villager item re-pickup
+ /**
+ * The minimum delay of picking up items that were dropped by villagers.
+ * This prevents villagers picking up farmed items before hoppers do in certain farm designs, that would
+ * otherwise be broken by the {@link CheckNearbyItem.Hopper#interval} mechanic, and also reduces lag from
+ * villagers continuously throwing many items at each other when their inventories are full.
+ * Any value < 0 uses the default pickup delay of items.
+ * <ul>
+ * <li><i>Default</i>: 100 (5 seconds)</li>
+ * <li><i>Vanilla</i>: -1</li>
+ * </ul>
+ */
+ public int villagerItemRepickup = 100;
+ // Gale end - EMC - reduce villager item re-pickup
+
}
}
public CheckNearbyItem checkNearbyItem;
public class CheckNearbyItem extends ConfigurationPart {

22
patches/server/0057-Variable-entity-wake-up-duration.patch
View File

@@ -7,30 +7,14 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 2f9687ad6c50cdcebc7908583b1093d1a0fa9737..b3822132cbb34dde90754aa2ee5439433ea4df4b 100644
index 28afbf8da166377b295302e6ea7c602da70100b1..f8a561d91686d6df89a7374ca223972e435978c9 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -258,6 +258,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -96,6 +96,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public GameplayMechanics gameplayMechanics;
public class GameplayMechanics extends ConfigurationPart {
+ // Gale start - variable entity wake-up duration
+ /**
+ * This value is <code>σ</code> (the standard deviation) of the inactivity duration ratio,
+ * so that the regular time interval before will be multiplied by a factor <code>normal(μ = 1, σ)</code>.
+ * <br>
+ * A value of around 0.2 makes entities wake up from inactivity at more randomized times
+ * and therefore appear more natural in groups.
+ * <br>
+ * Any value < 0 behaves like 0.
+ * <ul>
+ * <li><i>Default</i>: 0.2</li>
+ * <li><i>Vanilla</i>: 0</li>
+ * </ul>
+ */
+ public double entityWakeUpDurationRatioStandardDeviation = 0.2;
+ // Gale end - variable entity wake-up duration
+
+ public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
}

8
patches/server/0059-Do-not-log-invalid-statistics.patch
View File

@@ -44,18 +44,18 @@ index 9501e5f25f5c4d3069e554d4dc82b0e094156682..e81afb79d66321f70eb40c43d3bd7b92
}
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 5021cc0b7a0f99ec53d565862add241428311dc3..6b528eab517aed9c00c75b4bf6e1a7b21194c343 100644
index 7c781eabbb6df5df9f9f2cbdeef4e116ca30b645..168e1ae2e3cd1c4f5a2c10670d79aa2a41b95635 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -71,6 +71,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
// Gale end - Pufferfish - make chat order verification configurable
@@ -48,6 +48,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
public IncludeInTimingsReport includeInTimingsReport;
+
public class IncludeInTimingsReport extends ConfigurationPart {
// Gale start - include server.properties in timings
@@ -106,4 +107,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -83,4 +84,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
}

4
patches/server/0060-Do-not-log-empty-message-warnings.patch
View File

@@ -28,10 +28,10 @@ index 315128d7bcd73ed108f2ae6d7c05b6bec1d8773d..6df1e15af01b694964d1f76330b720ff
final String conversationInput = s;
this.server.processQueue.add(new Runnable() {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 6b528eab517aed9c00c75b4bf6e1a7b21194c343..425206669bc13d971097ea052bffcfd6896f90d3 100644
index 168e1ae2e3cd1c4f5a2c10670d79aa2a41b95635..2a42c6616e4702bb0a6dfbf4540e8c9c29c11373 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -112,6 +112,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -89,6 +89,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics

4
patches/server/0061-Do-not-log-ignored-advancements.patch
View File

@@ -58,10 +58,10 @@ index acc49f66bf34e2507d0ee6fec0a56b11bfc68f46..8834a32bfb27653062d242144dcd75ce
// CraftBukkit end
} else {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 425206669bc13d971097ea052bffcfd6896f90d3..16c9ebc736bae1626bdb4e99ac8ff1cb7afd3419 100644
index 2a42c6616e4702bb0a6dfbf4540e8c9c29c11373..9c8c283aa88165d862c649b22fd86e61ec8e84d7 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -111,6 +111,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -88,6 +88,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public class LogToConsole extends ConfigurationPart {
public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics

4
patches/server/0062-Do-not-log-setBlock-in-far-chunks.patch
View File

@@ -57,10 +57,10 @@ index 877498729c66de9aa6a27c9148f7494d7895615c..d2bbbb0e73dafd2294838137bfbd16ac
Util.logAndPauseIfInIde("Detected setBlock in a far chunk [" + i + ", " + j + "], pos: " + pos + ", status: " + this.generatingStatus + (this.currentlyGenerating == null ? "" : ", currently generating: " + (String) this.currentlyGenerating.get()));
hasSetFarWarned = true;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 16c9ebc736bae1626bdb4e99ac8ff1cb7afd3419..cb9648bace4522404cc9327f6aef588bc58172e0 100644
index 9c8c283aa88165d862c649b22fd86e61ec8e84d7..281d01126f623d0541b1676bf79bf1dd3020d250 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -112,6 +112,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -89,6 +89,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements

4
patches/server/0063-Do-not-log-unrecognized-recipes.patch
View File

@@ -58,10 +58,10 @@ index ea29e07a105f3ba6a878bdccf36e7eaf66280280..7b782f705b9f349e914a7192778d5e25
handler.accept((Recipe) optional.get());
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index cb9648bace4522404cc9327f6aef588bc58172e0..27a467029cf3e014a17a7e8ed3ab984fe9927750 100644
index 281d01126f623d0541b1676bf79bf1dd3020d250..c6908d6cf03a514690508ae216d3a6347ded0b61 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -113,6 +113,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -90,6 +90,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks

4
patches/server/0064-Do-not-log-legacy-Material-initialization.patch
View File

@@ -58,10 +58,10 @@ index 2677e21d8239bf0361a3bc5c9a50c328e54d70f6..36b39517ef0aa817c5a10d6d7f4904a8
new Exception().printStackTrace();
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 27a467029cf3e014a17a7e8ed3ab984fe9927750..133c10907358ae6064d2c1a18c967a00ad358127 100644
index c6908d6cf03a514690508ae216d3a6347ded0b61..5af30bdac9e9315b53d31309956486ca3f0622b5 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -114,6 +114,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -91,6 +91,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes

8
patches/server/0065-Do-not-log-plugin-library-loads.patch
View File

@@ -37,7 +37,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 133c10907358ae6064d2c1a18c967a00ad358127..7820833f15d07ffc2fac5cdd4f7602e920e132ec 100644
index 5af30bdac9e9315b53d31309956486ca3f0622b5..6a619e8a3084e509d861ec9f57608e4190f9dfe4 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -4,6 +4,7 @@ package org.galemc.gale.configuration;
@@ -48,7 +48,7 @@ index 133c10907358ae6064d2c1a18c967a00ad358127..7820833f15d07ffc2fac5cdd4f7602e9
import org.spongepowered.configurate.objectmapping.meta.Setting;
@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
@@ -121,6 +122,24 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -98,6 +99,24 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
}
@@ -58,13 +58,13 @@ index 133c10907358ae6064d2c1a18c967a00ad358127..7820833f15d07ffc2fac5cdd4f7602e9
+
+ public boolean downloads = true;
+ public boolean startLoadLibrariesForPlugin = true;
+ public boolean librariesLoaded = true;
+ public boolean libraryLoaded = true;
+
+ @Override
+ public void postProcess() {
+ JavaPluginLoader.logDownloads = this.downloads;
+ JavaPluginLoader.logStartLoadLibrariesForPlugin = this.startLoadLibrariesForPlugin;
+ JavaPluginLoader.logLibrariesLoaded = this.librariesLoaded;
+ JavaPluginLoader.logLibraryLoaded = this.libraryLoaded;
+ }
+
+ }

4
patches/server/0066-Do-not-log-expired-message-warnings.patch
View File

@@ -28,10 +28,10 @@ index c0a80824a0307ea673805015119cc834b268f0dc..d7c6e90ccf3a8ce58e5533c5158ce626
return playerChatMessage;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 7820833f15d07ffc2fac5cdd4f7602e920e132ec..dd4fb27eec651c4006b4ec4b7fe4d8d61e87e4b0 100644
index 6a619e8a3084e509d861ec9f57608e4190f9dfe4..493eca395097691f797cfa47cb6a701f74d0ab14 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -120,6 +120,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -97,6 +97,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public Chat chat;
public class Chat extends ConfigurationPart {
public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings

4
patches/server/0067-Do-not-log-out-of-order-message-warnings.patch
View File

@@ -20,10 +20,10 @@ index 6df1e15af01b694964d1f76330b720ff528253af..3bb1b56fc189c0fc3aca2a65155e5ea5
this.disconnect(Component.translatable("multiplayer.disconnect.out_of_order_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.OUT_OF_ORDER_CHAT); // Paper - kick event ca
}); // Paper - push to main
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index dd4fb27eec651c4006b4ec4b7fe4d8d61e87e4b0..b1ae641c0cbbe597085f9b19a95cba98520374e1 100644
index 493eca395097691f797cfa47cb6a701f74d0ab14..fc61b3ffc5939590a05ffce81f3b2cf8917d5a32 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -121,6 +121,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -98,6 +98,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public class Chat extends ConfigurationPart {
public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings

4
patches/server/0068-Do-not-log-Not-Secure-marker.patch
View File

@@ -49,10 +49,10 @@ index c9fc92c2d2e9c46b3d9009105ccd36181b744a42..69de848ce633f9ce40828f025391f7c1
boolean flag1 = false;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index b1ae641c0cbbe597085f9b19a95cba98520374e1..b2d19c4763c8d14ff5fd53a83dbd30877c04590b 100644
index fc61b3ffc5939590a05ffce81f3b2cf8917d5a32..dbb32baff8ce99adb285a5602ff67165161aff08 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -122,6 +122,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -99,6 +99,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean emptyMessageWarning = false; // Gale - do not log empty message warnings
public boolean expiredMessageWarning = false; // Gale - do not log expired message warnings
public boolean outOfOrderMessageWarning = false; // Gale - do not log out-of-order message warnings

4
patches/server/0069-Do-not-log-disconnections-with-null-id.patch
View File

@@ -44,10 +44,10 @@ index 2ff578e4a953ffcf5176815ba8e3f06f73499989..0d034a1b810e3840055a10ca1960eecb
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index b2d19c4763c8d14ff5fd53a83dbd30877c04590b..130fa4869753aa63cec8e841235d88a7734e68ec 100644
index dbb32baff8ce99adb285a5602ff67165161aff08..9ba116ef1f9dff39087dcfea1633de6fb53785ee 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -116,6 +116,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -93,6 +93,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean setBlockInFarChunk = true; // Gale - Purpur - do not log setBlock in far chunks
public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization

6
patches/server/0072-Softly-log-invalid-pool-element-errors.patch
View File

@@ -39,7 +39,7 @@ index d2b4654a9095a678bbc9e004af969cf54da0fcab..d797bac97ec1adec7a25a26c8e052e70
});
this.rotation = Rotation.valueOf(nbt.getString("rotation"));
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 130fa4869753aa63cec8e841235d88a7734e68ec..3523b5ac7ccc53e57b32c207d2ba00042d4b1951 100644
index 9ba116ef1f9dff39087dcfea1633de6fb53785ee..66f40d92fe9cfec68af2c9b7f35f203066129d62 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -4,9 +4,13 @@ package org.galemc.gale.configuration;
@@ -56,7 +56,7 @@ index 130fa4869753aa63cec8e841235d88a7734e68ec..3523b5ac7ccc53e57b32c207d2ba0004
@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
public class GaleGlobalConfiguration extends ConfigurationPart {
static final int CURRENT_VERSION = 1;
@@ -109,7 +113,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -86,7 +90,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
}
public LogToConsole logToConsole;
@@ -65,7 +65,7 @@ index 130fa4869753aa63cec8e841235d88a7734e68ec..3523b5ac7ccc53e57b32c207d2ba0004
public boolean invalidStatistics = true; // Gale - EMC - do not log invalid statistics
public boolean ignoredAdvancements = true; // Gale - Purpur - do not log ignored advancements
@@ -144,6 +148,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -121,6 +125,21 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
}
// Gale end - Purpur - do not log plugin library loads

14
patches/server/0074-Make-sand-duping-fix-configurable.patch
View File

@@ -59,20 +59,20 @@ index 18eaccb39a4c81338a8cbebe3de03934913ac2a4..a1466d29b896c06f67a6f110270377fd
}
// Paper end - fix sand duping
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index b3822132cbb34dde90754aa2ee5439433ea4df4b..636892ac5af6b4c1989c12cf15b75d965f60512a 100644
index f8a561d91686d6df89a7374ca223972e435978c9..bd47caa947f10cb90cef5f060a9106143782d940 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -274,6 +274,13 @@ public class GaleWorldConfiguration extends ConfigurationPart {
*/
public double entityWakeUpDurationRatioStandardDeviation = 0.2;
// Gale end - variable entity wake-up duration
+
@@ -96,6 +96,13 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public GameplayMechanics gameplayMechanics;
public class GameplayMechanics extends ConfigurationPart {
+ public Fixes fixes;
+ public class Fixes extends ConfigurationPart {
+
+ public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
+
+ }
+
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable

4
patches/server/0075-Make-tripwire-duping-fix-configurable.patch
View File

@@ -20,10 +20,10 @@ index cb2ff8d94308c637a498d2737f86f6af4c9c1b83..eb1ecbbb5c0f887ee1c7de85a6137f2f
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 636892ac5af6b4c1989c12cf15b75d965f60512a..18a4ab9f8549fac95d703d9fff4b74e4ae6a9b4f 100644
index bd47caa947f10cb90cef5f060a9106143782d940..49b820a62483f9612b1a0beb7e5dc416f6e60585 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -279,6 +279,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -100,6 +100,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class Fixes extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable

6
patches/server/0076-Fix-MC-238526.patch
View File

@@ -49,10 +49,10 @@ index cd2ce5bcb8c30e4657cd0e340d80544c7e805905..db3574e4ec9bad32bbbcd9d7ab9607da
}
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 18a4ab9f8549fac95d703d9fff4b74e4ae6a9b4f..1c3624965d9fc1acb406014e3001a0a4920afd2c 100644
index 49b820a62483f9612b1a0beb7e5dc416f6e60585..c6f87ddbb9a14e76a6fd8faebfb0390de9f7a81a 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -281,6 +281,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -102,6 +102,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
@@ -63,4 +63,4 @@ index 18a4ab9f8549fac95d703d9fff4b74e4ae6a9b4f..1c3624965d9fc1acb406014e3001a0a4
+
}
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration

4
patches/server/0077-Fix-cow-rotation-when-shearing-mooshroom.patch
View File

@@ -64,10 +64,10 @@ index a04374f91f2fbb31219d86b6ae63bcf8fdf7318c..e3b92e8b2274ee6d07d1e9c74f669aea
entitycow.setPersistenceRequired();
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 1c3624965d9fc1acb406014e3001a0a4920afd2c..578f393ab5c4088ed1f60d39b908968f3507b651 100644
index c6f87ddbb9a14e76a6fd8faebfb0390de9f7a81a..39504daeead241c03c9fd657456a309e44643302 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -280,6 +280,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -101,6 +101,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable

6
patches/server/0078-Fix-MC-121706.patch
View File

@@ -65,10 +65,10 @@ index 87fb10096fc9dade33c663234b1cecc34d3d77bb..cb2c6dcdd2be476d0434e7f771bbb251
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 578f393ab5c4088ed1f60d39b908968f3507b651..98355899e6307bc9471e2af247e8f3286a86e6dc 100644
index 39504daeead241c03c9fd657456a309e44643302..38f4a4ee657e481fa55d0f6543c31355b64a7f8d 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -287,6 +287,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -108,6 +108,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc238526 = false;
// Gale end - Purpur - fix MC-238526
@@ -79,4 +79,4 @@ index 578f393ab5c4088ed1f60d39b908968f3507b651..98355899e6307bc9471e2af247e8f328
+
}
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration

6
patches/server/0079-Fix-MC-110386.patch
View File

@@ -35,10 +35,10 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d
}
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 98355899e6307bc9471e2af247e8f3286a86e6dc..1a5d249268fc09a5117193d0f351676e9a083e16 100644
index 38f4a4ee657e481fa55d0f6543c31355b64a7f8d..a64f7cce19ee8c6f28882a860b1af5b9ef0179fe 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -292,6 +292,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -113,6 +113,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc121706 = false;
// Gale end - Purpur - fix MC-121706
@@ -49,4 +49,4 @@ index 98355899e6307bc9471e2af247e8f3286a86e6dc..1a5d249268fc09a5117193d0f351676e
+
}
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration

6
patches/server/0080-Fix-MC-31819.patch
View File

@@ -35,10 +35,10 @@ index 58152160d609d0e9d105153aeb166a56a7955603..6a906b1f37e52472527e9f19e965be9f
if (!this.abilities.invulnerable) {
if (!this.level().isClientSide) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 1a5d249268fc09a5117193d0f351676e9a083e16..b6df6cb577536b8ab1fcceeae4b8627adef21e20 100644
index a64f7cce19ee8c6f28882a860b1af5b9ef0179fe..773cb09de02eac19ddb5eea62fd2284a183366cd 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -297,6 +297,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -118,6 +118,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc110386 = true;
// Gale end - Mirai - fix MC-110386
@@ -49,4 +49,4 @@ index 1a5d249268fc09a5117193d0f351676e9a083e16..b6df6cb577536b8ab1fcceeae4b8627a
+
}
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration

4
patches/server/0082-End-gateway-should-check-if-entity-can-use-portal.patch
View File

@@ -49,10 +49,10 @@ index 1ec80f9c901dff1c9f29befa5a8e3c3f6f37aaf7..5f8e169a6e80e8f05df251fa76e60f51
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index b6df6cb577536b8ab1fcceeae4b8627adef21e20..1b5367474c69b2073a643287a29e0beda4a9f08a 100644
index 773cb09de02eac19ddb5eea62fd2284a183366cd..a091dc6407580c9818424ae9428e0a15489f5c24 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -281,6 +281,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -102,6 +102,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom

21
patches/server/0083-Make-arrow-movement-resetting-despawn-counter-config.patch
View File

@@ -42,7 +42,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
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 7226be19248a1ffb8ff2c89b55882529d33a6c0c..cff4d09af11d1741bf3301b457555d71e77e801c 100644
index fa885337085348308604e50049ecc5bb52023884..6d113b2445ff56cbf2b22f4dfedea4bda746b583 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java
@@ -312,7 +312,7 @@ public abstract class AbstractArrow extends Projectile {
@@ -55,17 +55,14 @@ index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..cff4d09af11d1741bf3301b457555d71
@Override
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 1b5367474c69b2073a643287a29e0beda4a9f08a..c57275584b56d9d32d4b5f303423ffeb1de19854 100644
index a091dc6407580c9818424ae9428e0a15489f5c24..de850d184d57452529c5b6e2bfe2adf48360be3b 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -274,7 +274,9 @@ public class GaleWorldConfiguration extends ConfigurationPart {
*/
public double entityWakeUpDurationRatioStandardDeviation = 0.2;
// Gale end - variable entity wake-up duration
-
+
+ public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
+
public Fixes fixes;
public class Fixes extends ConfigurationPart {
@@ -126,6 +126,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
+ public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable

4
patches/server/0084-Make-logging-login-locations-configurable.patch
View File

@@ -31,10 +31,10 @@ index 69de848ce633f9ce40828f025391f7c189d07b43..6fefed8e329aa85b6edd0e5981db2336
public void updateEntireScoreboard(ServerScoreboard scoreboard, ServerPlayer player) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 3523b5ac7ccc53e57b32c207d2ba00042d4b1951..8f51ae95c357e3873a33bcc89e5e134a66e4577b 100644
index 66f40d92fe9cfec68af2c9b7f35f203066129d62..77c236afd2aa49abb1725efda0a6eb34552e4a16 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -121,6 +121,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -98,6 +98,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean unrecognizedRecipes = false; // Gale - Purpur - do not log unrecognized recipes
public boolean legacyMaterialInitialization = false; // Gale - Purpur - do not log legacy Material initialization
public boolean nullIdDisconnections = true; // Gale - Pufferfish - do not log disconnections with null id

26
patches/server/0111-Optimize-sheep-offspring-color.patch
View File

@@ -110,28 +110,14 @@ index c0e89262c596fbdd0bb3c3f76baccb17a1bb5fcd..d8f99e1221609d481ee79ee31f645731
DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index c57275584b56d9d32d4b5f303423ffeb1de19854..7be0e4c7a54e858db93a6ac45517533d4b040a8c 100644
index de850d184d57452529c5b6e2bfe2adf48360be3b..0f8edacfeafb77f722af246a8d9413f82a045cb3 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -47,6 +47,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean saveFireworks = true;
// Gale end - EMC - make saving fireworks configurable
@@ -34,6 +34,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class SmallOptimizations extends ConfigurationPart {
public boolean saveFireworks = true; // Gale - EMC - make saving fireworks configurable
+ public boolean useOptimizedSheepOffspringColor = true; // Gale - carpet-fixes - optimize sheep offspring color
+ // Gale start - carpet-fixes - optimize sheep offspring color
+ /**
+ * Whether to use a (much) faster way to choose a color when a new baby sheep is born.
+ * The color chosen is exactly the same as vanilla.
+ * However, in vanilla, it is possible to change the new color by
+ * changing the crafting recipe for combining dyes using a data pack.
+ * If this is set to true, any such crafting recipe changes will be ignored.
+ * <ul>
+ * <li><i>Default</i>: true</li>
+ * <li><i>Vanilla</i>: false</li>
+ * </ul>
+ */
+ public boolean useOptimizedSheepOffspringColor = true;
+ // Gale end - carpet-fixes - optimize sheep offspring color
+
// Gale start - Airplane - reduce projectile chunk loading
public MaxProjectileChunkLoads maxProjectileChunkLoads;
public class MaxProjectileChunkLoads extends ConfigurationPart {

10
patches/server/0112-Hide-flames-on-entities-with-fire-resistance.patch
View File

@@ -31,14 +31,14 @@ index 850499786e72dd5e9e8b173f9203c64cb8d5f4a5..7fe7112145dbd46d851db3fc9ed183f5
this.firstTick = false;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 7be0e4c7a54e858db93a6ac45517533d4b040a8c..392e0c346ee9f11d21bcc78c5c59f2baab5f391d 100644
index 0f8edacfeafb77f722af246a8d9413f82a045cb3..492a279f080432b2340007be159d9bcba02f174b 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -291,6 +291,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
// Gale end - variable entity wake-up duration
@@ -129,6 +129,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
+ public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
public Fixes fixes;
public class Fixes extends ConfigurationPart {
}

8
patches/server/0118-Send-multiple-keep-alive-packets.patch
View File

@@ -109,18 +109,16 @@ index 76bea01e27d4e77296237998f0783565b1c3d1c8..819909fcb754b511fb9932926f73675a
if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
int i = (int) (Util.getMillis() - this.keepAliveTime);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 8f51ae95c357e3873a33bcc89e5e134a66e4577b..88a5ac2436b0aaaeb3e9e23ebd88105e8850769f 100644
index 77c236afd2aa49abb1725efda0a6eb34552e4a16..5aeac04cf6d79bd381424954180df8d61b1f37f2 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -110,6 +110,13 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -87,6 +87,11 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
}
+ public Keepalive keepalive;
+ public class Keepalive extends ConfigurationPart {
+
+ public boolean sendMultiple = true; // Gale end - Purpur - send multiple keep-alive packets
+
+ public boolean sendMultiple = true; // Gale - Purpur - send multiple keep-alive packets
+ }
+
}

25
patches/server/0119-Make-slow-login-timeout-configurable.patch
View File

@@ -23,27 +23,14 @@ index 00166d86baad60beed5896871c9b9118fefc20b6..ded7811cd10bc436957ed9f1576f3231
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 88a5ac2436b0aaaeb3e9e23ebd88105e8850769f..25f07bb3a2c212dca6e25100014c7edbe280f011 100644
index 5aeac04cf6d79bd381424954180df8d61b1f37f2..67c94cd227449b6371a4635a1884d47ec5221997 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -75,6 +75,20 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean verifyChatOrder = true;
// Gale end - Pufferfish - make chat order verification configurable
@@ -51,6 +51,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart {
public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
+ public int premiumAccountSlowLoginTimeout = -1; // Gale - make slow login timeout configurable
+ // Gale start - make slow login timeout configurable
+ /**
+ * The maximum time that a premium account login can take.
+ * If this time is exceeded, the connection is closed.
+ * Given in ticks.
+ * Any value < 1 uses the default timeout, which is currently 600 ticks (30 seconds).
+ * <ul>
+ * <li><i>Default</i>: -1</li>
+ * <li><i>Vanilla</i>: -1</li>
+ * </ul>
+ */
+ public int premiumAccountSlowLoginTimeout = -1;
+ // Gale end - make slow login timeout configurable
+
public IncludeInTimingsReport includeInTimingsReport;
public class IncludeInTimingsReport extends ConfigurationPart {

28
patches/server/0120-Make-max-interaction-distance-configurable.patch
View File

@@ -86,43 +86,27 @@ index d025232b43af3cb8dc28dff2e3e05c72e490901d..06d75d94af6aff29d542d0c5e150d8f7
public void spawnDustParticles(Level world, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 392e0c346ee9f11d21bcc78c5c59f2baab5f391d..243a76badb7e09ce4dcf7d5dd8ed57d55768b341 100644
index 492a279f080432b2340007be159d9bcba02f174b..4ac4350a6a03ed2542d50033822ed1f55248a1ce 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -271,7 +271,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -95,7 +95,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
public GameplayMechanics gameplayMechanics;
- public class GameplayMechanics extends ConfigurationPart {
+ public class GameplayMechanics extends ConfigurationPart.Post {
// Gale start - variable entity wake-up duration
/**
@@ -293,6 +293,20 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
public Fixes fixes;
public class Fixes extends ConfigurationPart {
@@ -132,6 +132,16 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
+ // Gale start - make max interaction distance configurable
+ /**
+ * The maximum distance for blocks with which a player can interact with left- or right-clicking.
+ * Any value < 0 uses the default max distance, which is currently 6.0.
+ * <ul>
+ * <li><i>Default</i>: -1.0</li>
+ * <li><i>Vanilla</i>: -1.0</li>
+ * </ul>
+ */
+ public double playerMaxInteractionDistance = -1.0;
+
+ public transient double playerMaxInteractionDistanceSquared;
+ // Gale end - make max interaction distance configurable
+
public Fixes fixes;
public class Fixes extends ConfigurationPart {
@@ -325,6 +339,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
+ @Override
+ public void postProcess() {
+ this.playerMaxInteractionDistanceSquared = this.playerMaxInteractionDistance * this.playerMaxInteractionDistance; // Gale - make max interaction distance configurable

26
patches/server/0121-Load-portal-destination-chunk-before-entity-teleport.patch
View File

@@ -31,30 +31,18 @@ index 7fe7112145dbd46d851db3fc9ed183f5fdef24fe..286356ccb4f6938a857a58d4478f00aa
entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values
entity.setDeltaMovement(velocity); // Paper - use EntityPortalExitEvent values
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 243a76badb7e09ce4dcf7d5dd8ed57d55768b341..6f019ba3e732988ce60cbaa0e5494791c78ec21a 100644
index 4ac4350a6a03ed2542d50033822ed1f55248a1ce..a6949c198f9530eda5c38019cc978876538391f4 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -339,6 +339,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -127,6 +127,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable
}
+ public Technical technical;
+ public class Technical extends ConfigurationPart {
+
+ // Gale start - MultiPaper - load portal destination chunk before entity teleport
+ /**
+ * Whether to fully load chunks before teleporting an entity, when an entity enters a portal.
+ * This forces the entire server to wait for the chunk to be loaded.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * <li><i>Vanilla</i>: false</li>
+ * </ul>
+ */
+ public boolean loadPortalDestinationChunkBeforeEntityTeleport = false;
+ // Gale end - MultiPaper - load portal destination chunk before entity teleport
+
+ public boolean loadPortalDestinationChunkBeforeEntityTeleport = false; // Gale - MultiPaper - load portal destination chunk before entity teleport
+ }
+
@Override
public void postProcess() {
this.playerMaxInteractionDistanceSquared = this.playerMaxInteractionDistance * this.playerMaxInteractionDistance; // Gale - make max interaction distance configurable
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance

18
patches/server/0122-Don-t-load-chunks-to-spawn-phantoms.patch
View File

@@ -34,28 +34,16 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..518b40a27a8d4d015caa7e67d3558396
if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 6f019ba3e732988ce60cbaa0e5494791c78ec21a..e20a48ef23e3eb186f6564102c9146de206282c3 100644
index a6949c198f9530eda5c38019cc978876538391f4..566d33b127879c4c84557fce4ea4eb1c8c1130d5 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -268,6 +268,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -92,6 +92,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
+ public LoadChunks loadChunks;
+ public class LoadChunks extends ConfigurationPart {
+
+ // Gale start - MultiPaper - don't load chunks to spawn phantoms
+ /**
+ * Whether to load chunks to spawn phantoms. If false,
+ * attempts to spawn a phantom in unloaded chunks will do nothing.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * <li><i>Vanilla</i>: true</li>
+ * </ul>
+ */
+ public boolean toSpawnPhantoms = false;
+ // Gale end - MultiPaper - don't load chunks to spawn phantoms
+
+ public boolean toSpawnPhantoms = false; // Gale - MultiPaper - don't load chunks to spawn phantoms
+ }
+
}

23
patches/server/0123-Don-t-load-chunks-to-activate-climbing-entities.patch
View File

@@ -79,25 +79,14 @@ index 2f252bbe2946ea3228933b4b8c91a4e46fe99705..a35891723fad4fe984566c41cdd72800
if (iblockdata.is(BlockTags.CLIMBABLE)) {
this.lastClimbablePos = Optional.of(blockposition);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index e20a48ef23e3eb186f6564102c9146de206282c3..589ba88b01f23ba9d0b2396e03b0885e88302ab5 100644
index 566d33b127879c4c84557fce4ea4eb1c8c1130d5..3bcfcbb9bf085192c55aae58ddb231fb18dcabcd 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -283,6 +283,18 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean toSpawnPhantoms = false;
// Gale end - MultiPaper - don't load chunks to spawn phantoms
+ // Gale start - don't load chunks to activate climbing entities
+ /**
+ * Whether to load chunks to check whether entities are on a climbable block. If false,
+ * entities in unloaded chunks will be assumed to not be on a climbable block.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * <li><i>Vanilla</i>: true</li>
+ * </ul>
+ */
+ public boolean toActivateClimbingEntities = false;
+ // Gale end - don't load chunks to activate climbing entities
+
@@ -95,6 +95,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public LoadChunks loadChunks;
public class LoadChunks extends ConfigurationPart {
public boolean toSpawnPhantoms = false; // Gale - MultiPaper - don't load chunks to spawn phantoms
+ public boolean toActivateClimbingEntities = false; // Gale - don't load chunks to activate climbing entities
}
}

27
patches/server/0124-Broadcast-crit-animations-as-the-entity-being-critte.patch
View File

@@ -38,29 +38,14 @@ index 52f6a56f9290fa0fb6537842c9fefe4521cc5859..df640e94bf51cfa62ccd28e32c0adc1c
@Override
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 589ba88b01f23ba9d0b2396e03b0885e88302ab5..faf9ece6dfea15efaae6d7d6501e3a0ae47aed59 100644
index 3bcfcbb9bf085192c55aae58ddb231fb18dcabcd..6c9eacf9b4ec0a2eead062bd69a037c5c2d8722f 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -344,6 +344,22 @@ public class GaleWorldConfiguration extends ConfigurationPart {
@@ -108,6 +108,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable
+ public boolean broadcastCritAnimationsAsTheEntityBeingCritted = false; // Gale - MultiPaper - broadcast crit animations as the entity being critted
public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal
+ // Gale start - MultiPaper - broadcast crit animations as the entity being critted
+ /**
+ * Whether to broadcast crit animations as the entity being critted.
+ * This does not affect where the crit animation is shown: it is always shown on the entity being critted.
+ * However, normally (if this setting is set to false), the crit animation is broadcasted as the
+ * player doing the crit, meaning anyone that cannot see the player cannot see the crit.
+ * If this setting is set to true, the crit animation is broadcasted as the entity being hit, meaning
+ * anyone that cannot see the entity cannot see the crit, which makes more sense.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * <li><i>Vanilla</i>: false</li>
+ * </ul>
+ */
+ public boolean broadcastCritAnimationsAsTheEntityBeingCritted = false;
+ // Gale end - MultiPaper - broadcast crit animations as the entity being critted
+
// Gale start - Purpur - fix MC-238526
@Setting("mc-238526")
public boolean mc238526 = false;

24
patches/server/0125-Ignore-null-legacy-structure-data.patch
View File

@@ -46,26 +46,14 @@ index cc7222cc7e53e8ae693e4e94ad53391db7a663c4..9d1d7033fdd2ae65b8fd323e9199b9d5
continue;
}
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 25f07bb3a2c212dca6e25100014c7edbe280f011..a40d4237804300fbb939ad2212827d9bf46a3bf0 100644
index 67c94cd227449b6371a4635a1884d47ec5221997..1cc02389bf53cf4c77145117a68b83505c4a5d6b 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -89,6 +89,19 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public int premiumAccountSlowLoginTimeout = -1;
// Gale end - make slow login timeout configurable
@@ -52,6 +52,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean verifyChatOrder = true; // Gale - Pufferfish - make chat order verification configurable
public int premiumAccountSlowLoginTimeout = -1; // Gale - make slow login timeout configurable
+ public boolean ignoreNullLegacyStructureData = false; // Gale - MultiPaper - ignore null legacy structure data
+ // Gale start - MultiPaper - ignore null legacy structure data
+ /**
+ * Whether to ignore any legacy structure data, for which the NBT tag parser returns null for some reason.
+ * If true, no warning will be given when this happens.
+ * If false, an exception will be thrown in the console when this happens.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * <li><i>Vanilla</i>: false</li>
+ * </ul>
+ */
+ public boolean ignoreNullLegacyStructureData = false;
+ // Gale end - MultiPaper - ignore null legacy structure data
+
public IncludeInTimingsReport includeInTimingsReport;
public class IncludeInTimingsReport extends ConfigurationPart {

12
patches/server/0127-Prevent-entities-random-strolling-into-non-ticking-c.patch
View File

@@ -36,14 +36,14 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..39035605197bad2eb2fd0c4942c5d43b
} else {
this.wantedX = vec3.x;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index faf9ece6dfea15efaae6d7d6501e3a0ae47aed59..0c8a2a18da5b86bd5b20d83b3a705651362cf870 100644
index 6c9eacf9b4ec0a2eead062bd69a037c5c2d8722f..4a4a8360c4286e06d88049512bf44237d2622f01 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -319,6 +319,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public double entityWakeUpDurationRatioStandardDeviation = 0.2;
// Gale end - variable entity wake-up duration
@@ -140,6 +140,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
+ public boolean entitiesCanRandomStrollIntoNonTickingChunks = true; // Gale - MultiPaper - prevent entities random strolling into non-ticking chunks
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
+ public boolean entitiesCanRandomStrollIntoNonTickingChunks = true; // Gale - MultiPaper - prevent entities random strolling into non-ticking chunks
public double entityWakeUpDurationRatioStandardDeviation = 0.2; // Gale - variable entity wake-up duration
public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance
public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable

6
patches/server/0135-Show-last-tick-time-in-tps-command.patch
View File

@@ -23,11 +23,11 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index a40d4237804300fbb939ad2212827d9bf46a3bf0..d0fd9e755375c25d3db153ec52eabab3ce8d4066 100644
index 1cc02389bf53cf4c77145117a68b83505c4a5d6b..7e9a36bf9a619c68a8e3e123fa47c0c845cb52e4 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -144,6 +144,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -94,6 +94,14 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public boolean sendMultiple = true; // Gale - Purpur - send multiple keep-alive packets
}
+ // Gale start - YAPFA - last tick time - in TPS command

55
patches/server/0136-Increase-time-statistics-in-intervals.patch
View File

@@ -45,7 +45,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index af8b5282df19c92c5f1394dc9d889012ce509f32..f070bd0eca4a55445f436c9520a89aabb5f55d12 100644
index af8b5282df19c92c5f1394dc9d889012ce509f32..d8f32cad7a97e1dcbef938c4788c64934d8b45bc 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -117,6 +117,7 @@ import net.minecraft.world.phys.AABB;
@@ -56,66 +56,61 @@ index af8b5282df19c92c5f1394dc9d889012ce509f32..f070bd0eca4a55445f436c9520a89aab
import org.slf4j.Logger;
import org.bukkit.craftbukkit.entity.CraftHumanEntity;
import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -286,19 +287,24 @@ public abstract class Player extends LivingEntity {
@@ -151,6 +152,7 @@ public abstract class Player extends LivingEntity {
protected static final EntityDataAccessor<Byte> DATA_PLAYER_MAIN_HAND = SynchedEntityData.defineId(Player.class, EntityDataSerializers.BYTE);
protected static final EntityDataAccessor<CompoundTag> DATA_SHOULDER_LEFT = SynchedEntityData.defineId(Player.class, EntityDataSerializers.COMPOUND_TAG);
protected static final EntityDataAccessor<CompoundTag> DATA_SHOULDER_RIGHT = SynchedEntityData.defineId(Player.class, EntityDataSerializers.COMPOUND_TAG);
+ public static int increaseTimeStatisticsInterval; // Gale - Hydrinity - increase time statistics in intervals - store as static field for fast access
private long timeEntitySatOnShoulder;
private final Inventory inventory = new Inventory(this);
protected PlayerEnderChestContainer enderChestInventory = new PlayerEnderChestContainer(this); // CraftBukkit - add "this" to constructor
@@ -286,19 +288,23 @@ public abstract class Player extends LivingEntity {
this.moveCloak();
if (!this.level().isClientSide) {
this.foodData.tick(this);
- this.awardStat(Stats.PLAY_TIME);
- this.awardStat(Stats.TOTAL_WORLD_TIME);
+ // Gale start - Hydrinity - increase time statistics in intervals
+ int interval = Math.max(1, GaleGlobalConfiguration.get().smallOptimizations.reducedIntervals.increaseTimeStatistics);
+ if (interval == 1 || this.tickCount % interval == 0) {
+ this.awardStat(Stats.PLAY_TIME, interval);
+ this.awardStat(Stats.TOTAL_WORLD_TIME, interval);
+ if (increaseTimeStatisticsInterval == 1 || this.tickCount % increaseTimeStatisticsInterval == 0) {
+ this.awardStat(Stats.PLAY_TIME, increaseTimeStatisticsInterval);
+ this.awardStat(Stats.TOTAL_WORLD_TIME, increaseTimeStatisticsInterval);
+ // Gale end - Hydrinity - increase time statistics in intervals
if (this.isAlive()) {
- this.awardStat(Stats.TIME_SINCE_DEATH);
+ this.awardStat(Stats.TIME_SINCE_DEATH, interval); // Gale - Hydrinity - increase time statistics in intervals
+ this.awardStat(Stats.TIME_SINCE_DEATH, increaseTimeStatisticsInterval); // Gale - Hydrinity - increase time statistics in intervals
}
if (this.isDiscrete()) {
- this.awardStat(Stats.CROUCH_TIME);
+ this.awardStat(Stats.CROUCH_TIME, interval); // Gale - Hydrinity - increase time statistics in intervals
+ this.awardStat(Stats.CROUCH_TIME, increaseTimeStatisticsInterval); // Gale - Hydrinity - increase time statistics in intervals
}
if (!this.isSleeping()) {
- this.awardStat(Stats.TIME_SINCE_REST);
+ this.awardStat(Stats.TIME_SINCE_REST, interval); // Gale - Hydrinity - increase time statistics in intervals
+ this.awardStat(Stats.TIME_SINCE_REST, increaseTimeStatisticsInterval); // Gale - Hydrinity - increase time statistics in intervals
}
+ } // Gale - Hydrinity - increase time statistics in intervals
}
int i = 29999999;
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index d0fd9e755375c25d3db153ec52eabab3ce8d4066..4114088e56a7974b2da84ff90ab66f72ed538b61 100644
index 7e9a36bf9a619c68a8e3e123fa47c0c845cb52e4..84331e863c6ae0cd634b41ddf859571a300ae5f3 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -28,7 +28,29 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -28,7 +28,17 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
public SmallOptimizations smallOptimizations;
public class SmallOptimizations extends ConfigurationPart {
- public int dummyValue = 0;
+ public ReducedIntervals reducedIntervals;
+ public class ReducedIntervals extends ConfigurationPart {
+ public class ReducedIntervals extends ConfigurationPart.Post {
+
+ // Gale start - Hydrinity - increase time statistics in intervals
+ /**
+ * The interval at which to increase the time-related statistics such as total playtime, time since
+ * the last death, etc.
+ * For example:
+ * <ul>
+ * <li>If this value is set to 20, the total playtime in ticks will be increased by 20 every second.</li>
+ * <li>If this value is set to 100, the total playtime in ticks will be increased by 100 every 5 seconds.</li>
+ * </ul>
+ * Given in ticks.
+ * Any value <= 0 behaves like 1.
+ * <ul>
+ * <li><i>Default</i>: 100 (5 seconds)</li>
+ * <li><i>Vanilla</i>: 1</li>
+ * </ul>
+ */
+ public int increaseTimeStatistics = 100;
+ // Gale end - Hydrinity - increase time statistics in intervals
+ public int increaseTimeStatistics = 20; // Gale - Hydrinity - increase time statistics in intervals
+
+ @Override
+ public void postProcess() {
+ net.minecraft.world.entity.player.Player.increaseTimeStatisticsInterval = Math.max(1, increaseTimeStatistics); // Gale - Hydrinity - increase time statistics in intervals - store as static field for fast access
+ }
+
+ }

80
patches/server/0143-Add-xor-shift-random.patch
View File

@@ -27,31 +27,27 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
index 5408cbc21fc7577a6100b5a1ca0463e899d2df8b..8bb5d662d62b0c16dc769d69ca45959e6c3164de 100644
index 5408cbc21fc7577a6100b5a1ca0463e899d2df8b..406119370596e1463c7b197988d7700a2f48c711 100644
--- a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
+++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java
@@ -2,7 +2,7 @@ package com.destroystokyo.paper.loottable;
import io.papermc.paper.configuration.WorldConfiguration;
import io.papermc.paper.configuration.type.DurationOrDisabled;
-import java.time.temporal.ChronoUnit;
+
import java.util.concurrent.TimeUnit;
import org.bukkit.entity.Player;
import org.bukkit.loot.LootTable;
@@ -16,7 +16,7 @@ import java.util.UUID;
public class PaperLootableInventoryData {
- private static final Random RANDOM = new Random();
+ private static final Random RANDOM = org.galemc.gale.configuration.GaleGlobalConfiguration.get().smallOptimizations.useXorShiftRandom.lootableRefill ? new org.galemc.gale.random.XorShiftRandom() : new Random(); // Gale - xor-shift random
+ public static Random RANDOM; // Gale - xor-shift random - set in GaleGlobalConfiguration
private long lastFill = -1;
private long nextRefill = -1;
diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
index ded7811cd10bc436957ed9f1576f3231f1af7b7b..da6e9efd48567149123649e1a1014ebf14a4da2b 100644
--- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
@@ -51,7 +51,7 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,
private static final AtomicInteger UNIQUE_THREAD_ID = new AtomicInteger(0);
static final Logger LOGGER = LogUtils.getLogger();
private static final int MAX_TICKS_BEFORE_LOGIN = 600;
- private static final RandomSource RANDOM = new org.bukkit.craftbukkit.util.RandomSourceWrapper(new java.util.Random()); // Paper - This is called across threads, make safe
+ private static final RandomSource RANDOM = new org.bukkit.craftbukkit.util.RandomSourceWrapper(org.galemc.gale.configuration.GaleGlobalConfiguration.get().smallOptimizations.useXorShiftRandom.encryptionRequestVerifyToken ? new org.galemc.gale.random.XorShiftRandom() : new java.util.Random()); // Paper - This is called across threads, make safe // Gale - xor-shift random - not thread-safe but it is not really a concern here
private final byte[] challenge;
final MinecraftServer server;
public final Connection connection;
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
index 0c5ac12b1f395bba8b7fc50baf8e825ba6488f6c..0671e775ab296d6d591a31a8a0c38f62a7f45652 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java
@@ -66,7 +62,7 @@ index 0c5ac12b1f395bba8b7fc50baf8e825ba6488f6c..0671e775ab296d6d591a31a8a0c38f62
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index f857f490ffba2f25f7c06c5fb1a1905f0b51fbe2..18408d64905571283551c358f472c37f8b2593ef 100644
index f857f490ffba2f25f7c06c5fb1a1905f0b51fbe2..a5a9c70c0d39ee36397790b2c7232ca13fff5a3a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -229,7 +229,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -74,7 +70,7 @@ index f857f490ffba2f25f7c06c5fb1a1905f0b51fbe2..18408d64905571283551c358f472c37f
// Paper end
- private static final Random rand = new Random();
+ private static final Random rand = org.galemc.gale.configuration.GaleGlobalConfiguration.get().smallOptimizations.useXorShiftRandom.generateTreeWithBukkitAPI ? new org.galemc.gale.random.XorShiftRandom() : new Random(); // Gale - xor-shift random
+ public static Random rand; // Gale - xor-shift random - set in GaleGlobalConfiguration
public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) {
this.world = world;
@@ -92,10 +88,18 @@ index 68c5af9b67a2834ee6e2f80ceefa19c3a982b8ed..bf9deb9a5f7eae6517fcd6d4476a7961
public CraftFirework(CraftServer server, FireworkRocketEntity entity) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
index 4114088e56a7974b2da84ff90ab66f72ed538b61..dbddba95d9235b6dd262b5740d63ba41ba08861b 100644
index 84331e863c6ae0cd634b41ddf859571a300ae5f3..ac8a36585e7f77e5789bc6f17489cf12f21ddfcc 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java
@@ -52,13 +52,40 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
@@ -9,6 +9,7 @@ import org.bukkit.plugin.java.JavaPluginLoader;
import org.spongepowered.configurate.objectmapping.meta.Setting;
import java.util.Locale;
+import java.util.Random;
import java.util.function.Consumer;
@SuppressWarnings({"CanBeFinal", "FieldCanBeLocal", "FieldMayBeFinal", "NotNullFieldNotInitialized", "InnerClassMayBeStatic"})
@@ -40,13 +41,26 @@ public class GaleGlobalConfiguration extends ConfigurationPart {
}
@@ -105,36 +109,22 @@ index 4114088e56a7974b2da84ff90ab66f72ed538b61..dbddba95d9235b6dd262b5740d63ba41
- public boolean warnIfDisabled = true;
- public boolean logVectorSizesToConsole = false;
+ // Gale start - xor-shift random
+ /**
+ * Whether to use {@link org.galemc.gale.random.XorShiftRandom} instead of the default implementation
+ * for several occurrences of random generation.
+ * <ul>
+ * <li><i>Default</i>: false</li>
+ * <li><i>Vanilla</i>: false</li>
+ * </ul>
+ */
+ public UseXorShiftRandom useXorShiftRandom;
+ public class UseXorShiftRandom extends ConfigurationPart {
+ public class UseXorShiftRandom extends ConfigurationPart.Post {
+
+ public boolean lootableRefill = false;
+ public boolean encryptionRequestVerifyToken = false;
+ public boolean autoReplenishLootableRefill = true;
+ public boolean elytraFireworkSpeed = true;
+ public boolean entityWakeUpDuration = true;
+
+ /**
+ * <ul>
+ * <li><i>Default</i>: true</li>
+ * <li><i>Vanilla</i>: false</li>
+ * </ul>
+ */
+ @Setting("generate-tree-with-bukkit-api")
+ public boolean generateTreeWithBukkitAPI = true;
+
+ /**
+ * <ul>
+ * <li><i>Default</i>: true</li>
+ * <li><i>Vanilla</i>: false</li>
+ * </ul>
+ */
+ public boolean elytraFireworkSpeed = true;
+ @Override
+ public void postProcess() {
+ com.destroystokyo.paper.loottable.PaperLootableInventoryData.RANDOM = autoReplenishLootableRefill ? new org.galemc.gale.random.XorShiftRandom() : new Random();
+ org.spigotmc.ActivationRange.wakeUpDurationRandom = entityWakeUpDuration ? new org.galemc.gale.random.XorShiftRandom() : new java.util.Random();
+ org.bukkit.craftbukkit.CraftWorld.rand = generateTreeWithBukkitAPI ? new org.galemc.gale.random.XorShiftRandom() : new Random();
+ }
+
}
- // Gale end - Pufferfish - SIMD support
@@ -553,7 +543,7 @@ index 0000000000000000000000000000000000000000..60dc2c1deb0749168d03c5d94136e613
+ }
+}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 50cd68e40c67b83af4e8008ce93782a060658dd4..392c57d0365cc4371f58637ebac11e2b7492bf97 100644
index 50cd68e40c67b83af4e8008ce93782a060658dd4..aa68ff1abced10ad03957c9c0ac24beaf112adcf 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -38,6 +38,7 @@ import co.aikar.timings.MinecraftTimings;
@@ -569,7 +559,7 @@ index 50cd68e40c67b83af4e8008ce93782a060658dd4..392c57d0365cc4371f58637ebac11e2b
// Gale start - variable entity wake-up duration
- private static final java.util.Random wakeUpDurationRandom = new java.util.Random();
+ private static final java.util.Random wakeUpDurationRandom = GaleGlobalConfiguration.get().smallOptimizations.useXorShiftRandom.entityWakeUpDuration ? new org.galemc.gale.random.XorShiftRandom() : new java.util.Random(); // Gale - xor-shift random
+ public static java.util.Random wakeUpDurationRandom; // Gale - xor-shift random - set in GaleGlobalConfiguration
private static int getWakeUpDurationWithVariance(Entity entity, int wakeUpDuration) {
GaleWorldConfiguration config = entity.level().galeConfig();