9
0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 00:39:22 +00:00

Variable entity wake-up duration

This commit is contained in:
Martijn Muijsers
2023-03-22 00:27:03 +01:00
parent df71461201
commit add3ee8f82
114 changed files with 150 additions and 56 deletions

View File

@@ -0,0 +1,93 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martijn Muijsers <martijnmuijsers@live.nl>
Date: Wed, 22 Mar 2023 00:18:15 +0100
Subject: [PATCH] Variable entity wake-up duration
License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-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 be563b466b9b9312254596ea3b8e116b28cf250c..378d6f8eb10404e687080e0c306aae26e204967a 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -255,4 +255,22 @@ public class GaleWorldConfiguration extends ConfigurationPart {
}
+ public GameplayMechanics gameplayMechanics;
+ public class GameplayMechanics extends ConfigurationPart {
+
+ // Gale start - variable entity wake-up duration
+ /**
+ * This value is <code>sigma</code>,
+ * where the normal wake-up time will be multiplied by <code>normal(mu = 1, sigma)</code>
+ * Any value < 0 behaves like 0.
+ * <ul>
+ * <li><i>Default</i>: 0.2</li>
+ * <li><i>Vanilla</i>: 0.0</li>
+ * </ul>
+ */
+ public double entityWakeUpDurationRatioStandardDeviation = 0.2;
+ // Gale end - variable entity wake-up duration
+
+ }
+
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 2bff2b6cff78f1ad4cbc6abbc1a37464f543ccb7..8a6bc6d4dc5825e0d125ce3853bd3d7714ac113f 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;
import net.minecraft.world.entity.schedule.Activity;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
+import org.galemc.gale.configuration.GaleWorldConfiguration;
public class ActivationRange
{
@@ -70,28 +71,41 @@ public class ActivationRange
if (entity.activationType == ActivationType.VILLAGER) {
if (inactiveFor > config.wakeUpInactiveVillagersEvery && world.wakeupInactiveRemainingVillagers > 0) {
world.wakeupInactiveRemainingVillagers--;
- return config.wakeUpInactiveVillagersFor;
+ return getWakeUpDurationWithVariance(entity, config.wakeUpInactiveVillagersFor); // Gale - variable entity wake-up duration
}
} else if (entity.activationType == ActivationType.ANIMAL) {
if (inactiveFor > config.wakeUpInactiveAnimalsEvery && world.wakeupInactiveRemainingAnimals > 0) {
world.wakeupInactiveRemainingAnimals--;
- return config.wakeUpInactiveAnimalsFor;
+ return getWakeUpDurationWithVariance(entity, config.wakeUpInactiveAnimalsFor); // Gale - variable entity wake-up duration
}
} else if (entity.activationType == ActivationType.FLYING_MONSTER) {
if (inactiveFor > config.wakeUpInactiveFlyingEvery && world.wakeupInactiveRemainingFlying > 0) {
world.wakeupInactiveRemainingFlying--;
- return config.wakeUpInactiveFlyingFor;
+ return getWakeUpDurationWithVariance(entity, config.wakeUpInactiveFlyingFor); // Gale - variable entity wake-up duration
}
} else if (entity.activationType == ActivationType.MONSTER || entity.activationType == ActivationType.RAIDER) {
if (inactiveFor > config.wakeUpInactiveMonstersEvery && world.wakeupInactiveRemainingMonsters > 0) {
world.wakeupInactiveRemainingMonsters--;
- return config.wakeUpInactiveMonstersFor;
+ return getWakeUpDurationWithVariance(entity, config.wakeUpInactiveMonstersFor); // Gale - variable entity wake-up duration
}
}
return -1;
}
// Paper end
+ // Gale start - variable entity wake-up duration
+ private static final java.util.Random wakeUpDurationRandom = new java.util.Random();
+
+ private static int getWakeUpDurationWithVariance(Entity entity, int wakeUpDuration) {
+ GaleWorldConfiguration config = entity.level.galeConfig();
+ double deviation = config.gameplayMechanics.entityWakeUpDurationRatioStandardDeviation;
+ if (deviation <= 0) {
+ return wakeUpDuration;
+ }
+ return (int) Math.min(Integer.MAX_VALUE, Math.max(1, Math.round(wakeUpDuration * wakeUpDurationRandom.nextGaussian(1, deviation))));
+ }
+ // Gale end - variable entity wake-up duration
+
static AABB maxBB = new AABB( 0, 0, 0, 0, 0, 0 );
/**

View File

@@ -59,23 +59,20 @@ index ce2c3c146ef64400e00084bd2245d2b87a67fbc2..2496b14c3a284d5a2f80a42e6cc23830
} }
// Paper end - fix sand duping // 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index be563b466b9b9312254596ea3b8e116b28cf250c..ffc6da34591bc071b425b5538dd2da95ff078dc8 100644 index 378d6f8eb10404e687080e0c306aae26e204967a..98eb5d1d32a93a7800d0d97401018e3ae7f8366f 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -255,4 +255,16 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -270,6 +270,13 @@ public class GaleWorldConfiguration extends ConfigurationPart {
*/
} public double entityWakeUpDurationRatioStandardDeviation = 0.2;
// Gale end - variable entity wake-up duration
+ public GameplayMechanics gameplayMechanics; +
+ public class GameplayMechanics extends ConfigurationPart {
+
+ public Fixes fixes; + public Fixes fixes;
+ public class Fixes extends ConfigurationPart { + public class Fixes extends ConfigurationPart {
+ +
+ public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable + public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
+ +
+ } + }
+
+ } }
+
}

View File

@@ -49,10 +49,10 @@ index 35cfa366baf6747105faa93f1220bb9cc31a5bd5..2fcdb8173db167a440a5a94d1ec8f6c2
} }
} }
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index ffc6da34591bc071b425b5538dd2da95ff078dc8..2d4d2f1b33b9b6ec937fc1da20573f685eb0cb29 100644 index 98eb5d1d32a93a7800d0d97401018e3ae7f8366f..eab771bf7cdefb3cec1c138bb35c21055313bcc3 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -262,7 +262,12 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -275,7 +275,12 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class Fixes extends ConfigurationPart { public class Fixes extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable

View File

@@ -58,10 +58,10 @@ index 30aec9dff249ae629b22318e52902361a9fa4099..c58fab79c9425a56cd9ffdfa81e4ea97
// Paper start - fix MC-252817 (green map markers do not disappear) // Paper start - fix MC-252817 (green map markers do not disappear)
this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> { this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 2d4d2f1b33b9b6ec937fc1da20573f685eb0cb29..ab5b2db71038decf68f3b0072367e986d5b25f82 100644 index eab771bf7cdefb3cec1c138bb35c21055313bcc3..7940eac6d2df583d2b61cb872671ac20a952cce7 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -268,6 +268,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -281,6 +281,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc238526 = false; public boolean mc238526 = false;
// Gale end - Purpur - fix MC-238526 // Gale end - Purpur - fix MC-238526

View File

@@ -64,10 +64,10 @@ index 68a5ee85e64802e4509ba0d184fc0ceb3cbe2d11..8ee1a0626e5a6c0ad19a25b8f476a2e1
entitycow.setPersistenceRequired(); entitycow.setPersistenceRequired();
} }
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index ab5b2db71038decf68f3b0072367e986d5b25f82..6d0a0535f6e0b1dbcb8d1dfd99fe0adb50ef8ad6 100644 index 7940eac6d2df583d2b61cb872671ac20a952cce7..41f0e3a2da3ec4a2d516dbe6b5332b701cd0f3a1 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -262,7 +262,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -275,7 +275,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class Fixes extends ConfigurationPart { public class Fixes extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable

View File

@@ -65,10 +65,10 @@ index 6558b0d4bea99948fdc2b51751f3cfdc239d4b67..bedb5b8ee24817a494455f17e1f32b42
} }
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 6d0a0535f6e0b1dbcb8d1dfd99fe0adb50ef8ad6..7fb76d13d15c5133099dde75410631c31ee53ce2 100644 index 41f0e3a2da3ec4a2d516dbe6b5332b701cd0f3a1..249cbffd6933f696b595189d73fb00735ca7abe5 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -263,7 +263,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -276,7 +276,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom
@@ -77,7 +77,7 @@ index 6d0a0535f6e0b1dbcb8d1dfd99fe0adb50ef8ad6..7fb76d13d15c5133099dde75410631c3
// Gale start - Purpur - fix MC-238526 // Gale start - Purpur - fix MC-238526
@Setting("mc-238526") @Setting("mc-238526")
public boolean mc238526 = false; public boolean mc238526 = false;
@@ -274,6 +274,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -287,6 +287,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc123848 = false; public boolean mc123848 = false;
// Gale end - Purpur - fix MC-123848 // Gale end - Purpur - fix MC-123848

View File

@@ -35,10 +35,10 @@ index 39ea15c7577af186d93d4ad9a48034d746a86fc8..865eb39f4a1d2207c857acccc0695be9
} }
} }
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 7fb76d13d15c5133099dde75410631c31ee53ce2..9254430412c59860d56cae6e46f8f64a3d1e2c87 100644 index 249cbffd6933f696b595189d73fb00735ca7abe5..ab223d1b3174d18ffc1bbba7f9f13d66b6c29429 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -279,6 +279,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -292,6 +292,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc121706 = false; public boolean mc121706 = false;
// Gale end - Purpur - fix MC-121706 // Gale end - Purpur - fix MC-121706

View File

@@ -35,10 +35,10 @@ index 2b02800666b358159c8ecb63208a14855f90657b..9e7b5b876ec7aa90bf46afa6992fc59e
if (!this.abilities.invulnerable) { if (!this.abilities.invulnerable) {
if (!this.level.isClientSide) { 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 9254430412c59860d56cae6e46f8f64a3d1e2c87..d190b3ab4ed9f0c183932d235f9f7752a6177f31 100644 index ab223d1b3174d18ffc1bbba7f9f13d66b6c29429..07fea98c1d8c4cc23bfac368a2e236c775d3691a 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -284,6 +284,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -297,6 +297,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean mc110386 = true; public boolean mc110386 = true;
// Gale end - Mirai - fix MC-110386 // Gale end - Mirai - fix MC-110386

View File

@@ -49,10 +49,10 @@ index c73024cc62490c336ffe26313580e88d25ca7078..c86dea3e38d72929a4970334e3cc4e93
blockEntity.teleportCooldown = 100; 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index d190b3ab4ed9f0c183932d235f9f7752a6177f31..f623518450d1d750b81b84da936282c2df949b7d 100644 index 07fea98c1d8c4cc23bfac368a2e236c775d3691a..9e6f389748706a41f3115db19041b55f70614d0c 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -263,6 +263,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -276,6 +276,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable
public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom

View File

@@ -59,13 +59,15 @@ index 80aa539f7c6a6ee44338de084cdcdf5fb4ef996a..cb8fc8a88c14d2374a0bbe35aa1c2056
return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(blockposition)) ? true : this.level.getBlockState(blockposition.below()).is(Blocks.GRASS_BLOCK); return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(blockposition)) ? true : this.level.getBlockState(blockposition.below()).is(Blocks.GRASS_BLOCK);
} }
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index f623518450d1d750b81b84da936282c2df949b7d..6bc83bfe35c52d314fde725c672de6971d8a86c5 100644 index 9e6f389748706a41f3115db19041b55f70614d0c..f50b467b991d7a00030ec589e96026d0a7413e21 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -258,6 +258,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -270,7 +270,9 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public GameplayMechanics gameplayMechanics; */
public class GameplayMechanics extends ConfigurationPart { public double entityWakeUpDurationRatioStandardDeviation = 0.2;
// Gale end - variable entity wake-up duration
-
+
+ public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks + public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks
+ +
public Fixes fixes; public Fixes fixes;

View File

@@ -55,11 +55,11 @@ index 5d6d26cfe8f0ab68a3145214b3fc126ca7a71a66..e190f414ab5af7326d92af3fddf3f7a2
@Override @Override
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 6bc83bfe35c52d314fde725c672de6971d8a86c5..711154b099acfe51705503ea5784727d4cac6ab1 100644 index f50b467b991d7a00030ec589e96026d0a7413e21..ffa0c986b59f33292ea769a30784d429ce59ae6c 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -259,6 +259,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -272,6 +272,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class GameplayMechanics extends ConfigurationPart { // Gale end - variable entity wake-up duration
public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks
+ public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable + public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable

View File

@@ -110,7 +110,7 @@ index fb3777e158065a6ce306a2a6e66bec053da2aeb4..8b17dd156aa321686570da1e62010727
DyeColor enumcolor1 = ((Sheep) secondParent).getColor(); DyeColor enumcolor1 = ((Sheep) secondParent).getColor();
CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1); 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 711154b099acfe51705503ea5784727d4cac6ab1..122361057f2b25072ca763df68d614c176c57b5d 100644 index ffa0c986b59f33292ea769a30784d429ce59ae6c..bb6cd08bae9bfea0baced2c4ab839ef693465157 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/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 { @@ -47,6 +47,21 @@ public class GaleWorldConfiguration extends ConfigurationPart {

View File

@@ -53,7 +53,7 @@ index 8155a806ccb200b8883ce6734c5b7e34338060ee..08638e5982083835cd90243e6edf4508
return stack.is(otherStack.getItem()) && ItemStack.tagMatches(stack, otherStack); return stack.is(otherStack.getItem()) && ItemStack.tagMatches(stack, otherStack);
} }
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 122361057f2b25072ca763df68d614c176c57b5d..72ab895b4b64d224b847ec330512f1aed0b39f6b 100644 index bb6cd08bae9bfea0baced2c4ab839ef693465157..418c57f1e8f14c0c92c7d46cb26e1064ee6a296c 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -62,6 +62,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -62,6 +62,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {

View File

@@ -31,10 +31,10 @@ index 46fc1afdba3dc550bacbec4f5da5081d8eb0051f..70b9efbbee8ad78538379459d4e3b10c
this.firstTick = false; 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 72ab895b4b64d224b847ec330512f1aed0b39f6b..61d1cf5008da9969a08fcd3257f19c4d5c46ff16 100644 index 418c57f1e8f14c0c92c7d46cb26e1064ee6a296c..5246237d49be75f3113791126e6ae9c94cc06972 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -277,6 +277,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -290,6 +290,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable

View File

@@ -27,7 +27,7 @@ index 834b497053f4fa20cf94c00e1ee2db4838bdf233..b79e302cf4e0eae858e2322b5b260282
if (this.entity instanceof LivingEntity) { if (this.entity instanceof LivingEntity) {
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 61d1cf5008da9969a08fcd3257f19c4d5c46ff16..b18bc70c5ada1124e63cdbe8d75adf058a34bd4f 100644 index 5246237d49be75f3113791126e6ae9c94cc06972..6ec49abd285e1e2c06842b4c25ca3bb262996452 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -64,6 +64,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -64,6 +64,8 @@ public class GaleWorldConfiguration extends ConfigurationPart {

View File

@@ -65,17 +65,19 @@ index 15611b8970b6cfb733a9f733d64d75c9934b65f7..25a8d3a1302c36f46eb3e0f9a5a532a3
private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand); ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index b18bc70c5ada1124e63cdbe8d75adf058a34bd4f..a3fb445c105a0335bd3360122d39aea93ea2de59 100644 index 6ec49abd285e1e2c06842b4c25ca3bb262996452..b63b05f2af042c60977b97184a3e0f7ae17683f5 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -275,12 +275,26 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -275,7 +275,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
} }
public GameplayMechanics gameplayMechanics; public GameplayMechanics gameplayMechanics;
- public class GameplayMechanics extends ConfigurationPart { - public class GameplayMechanics extends ConfigurationPart {
+ public class GameplayMechanics extends ConfigurationPart.Post { + public class GameplayMechanics extends ConfigurationPart.Post {
public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks // Gale start - variable entity wake-up duration
/**
@@ -294,6 +294,20 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable
public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance
@@ -96,7 +98,7 @@ index b18bc70c5ada1124e63cdbe8d75adf058a34bd4f..a3fb445c105a0335bd3360122d39aea9
public Fixes fixes; public Fixes fixes;
public class Fixes extends ConfigurationPart { public class Fixes extends ConfigurationPart {
@@ -315,6 +329,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -328,6 +342,11 @@ public class GaleWorldConfiguration extends ConfigurationPart {
} }

View File

@@ -31,10 +31,10 @@ index 70b9efbbee8ad78538379459d4e3b10c688acad6..7945c979d229d0cae099ffee8568f4a9
entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values
entity.setDeltaMovement(velocity); // 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index a3fb445c105a0335bd3360122d39aea93ea2de59..f2e8569007b9d52885696de76b1bd1e1035f8121 100644 index b63b05f2af042c60977b97184a3e0f7ae17683f5..52eec168fa5788150da9ddd23d0cb0546e08d6df 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -329,6 +329,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -342,6 +342,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {
} }

View File

@@ -34,7 +34,7 @@ index e8ae4449696d73c8c9b8b27d4d2e20db933a72cc..ffef23b9455613e8d9e4cc4e21e52b76
if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) { 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index f2e8569007b9d52885696de76b1bd1e1035f8121..75e0128d1f4f5b112f9908373b2e32941c68888e 100644 index 52eec168fa5788150da9ddd23d0cb0546e08d6df..0c045b6846d5f0f99d4a71d6dff0334304dd3496 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -272,6 +272,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -272,6 +272,23 @@ public class GaleWorldConfiguration extends ConfigurationPart {

View File

@@ -7,7 +7,7 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
Gale - https://galemc.org Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 08f0497a51da53646c347a010e412760245290da..3d68dabe6348b01a322c271f06b8db820d3e062e 100644 index 7945c979d229d0cae099ffee8568f4a9906ea819..24a6a1fb433ed8a5220cd68488d0244e8215bc5a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4378,6 +4378,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -4378,6 +4378,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -79,7 +79,7 @@ index 17dbade3fa91ccc3db8792b5c2c9374ad3d61337..a076e8b852a87b67602a21f07048da15
if (iblockdata.is(BlockTags.CLIMBABLE)) { if (iblockdata.is(BlockTags.CLIMBABLE)) {
this.lastClimbablePos = Optional.of(blockposition); 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index 75e0128d1f4f5b112f9908373b2e32941c68888e..f611c38cb628569fbf3257e006f410d6f0a25d39 100644 index 0c045b6846d5f0f99d4a71d6dff0334304dd3496..913803c3c4934b1ebcbe5f9f81f30b4a21e1acdf 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -287,6 +287,18 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -287,6 +287,18 @@ public class GaleWorldConfiguration extends ConfigurationPart {

View File

@@ -38,10 +38,10 @@ index 2dcab455bdc6b0742cd2322062678aa7cd173c79..37b6064586452c46c1417510c4130fba
@Override @Override
diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index f611c38cb628569fbf3257e006f410d6f0a25d39..adf0489fac2798325123d42fd35a8b9b6865aa0b 100644 index 913803c3c4934b1ebcbe5f9f81f30b4a21e1acdf..67cb63fc4f8cb59d5c3951955e65207528260311 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -331,6 +331,22 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -344,6 +344,22 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom 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 public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal

View File

@@ -36,11 +36,11 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..f9e0cf073abf3e0ffcedd4418a66c310
} else { } else {
this.wantedX = vec3.x; 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 diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
index adf0489fac2798325123d42fd35a8b9b6865aa0b..cc25c05262929b946cf696a1df0f24a50508db5e 100644 index 67cb63fc4f8cb59d5c3951955e65207528260311..ec2038b4bd980d12109f5dbe9423613dc7e48cd1 100644
--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
+++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java
@@ -307,6 +307,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -320,6 +320,7 @@ public class GaleWorldConfiguration extends ConfigurationPart {
public class GameplayMechanics extends ConfigurationPart.Post { // Gale end - variable entity wake-up duration
public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks
+ public boolean entitiesCanRandomStrollIntoNonTickingChunks = true; // Gale - MultiPaper - prevent entities random strolling into non-ticking chunks + public boolean entitiesCanRandomStrollIntoNonTickingChunks = true; // Gale - MultiPaper - prevent entities random strolling into non-ticking chunks

View File

@@ -16,7 +16,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3d68dabe6348b01a322c271f06b8db820d3e062e..45b5aa21f1429c462355b244f413e592011b2acd 100644 index 24a6a1fb433ed8a5220cd68488d0244e8215bc5a..7ae7d4121344b9edae6105be8709e471dd857286 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1989,8 +1989,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1989,8 +1989,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 45b5aa21f1429c462355b244f413e592011b2acd..b6404bfac381352b6ceb23a1b95ed5f3ccabe606 100644 index 7ae7d4121344b9edae6105be8709e471dd857286..697fad59a6ab4fb41aac65979b42d8ed4b4c8c21 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1189,9 +1189,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1189,9 +1189,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {

Some files were not shown because too many files have changed in this diff Show More