Merge branch '1.21.4' into 1.21.5

CHANGELOG.md

@@ -133,6 +133,7 @@ hi
 - Fireflies now move faster.
 - Fireflies now spawn and move in swarms.
   - When the leader of a swarm is killed or captured in a bottle, the nearest Firefly will become the new swarm leader.
+  - Firefly Swarms can be toggled in the config.
 - Removed unnecessary spawning mechanics that were unique only to the Firefly.
 - Moved multiple aspects of the Firefly to be managed by its brain.
 - Fireflies now only spawn at night.

src/main/java/net/frozenblock/wilderwild/config/WWEntityConfig.java

@@ -52,6 +52,8 @@ public void onSave() throws Exception {
 			public void onSync(WWEntityConfig syncInstance) {
 				var config = this.config();
 				WARDEN_SWIMS = config.warden.wardenSwims;
+				FIREFLY_SWARMS = config.firefly.fireflySwarm;
+				FIREFLY_SWARMS_BUSH = config.firefly.fireflySwarmsBush;
 				if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
 					Client.SPAWN_FIREFLY_PARTICLES = config.firefly.spawnFireflyParticles;
 					Client.TUMBLEWEED_ROTATES_TO_LOOK_DIRECTION = config.tumbleweed.tumbleweedRotatesToLookDirection;
@@ -69,6 +71,8 @@ public void onSync(WWEntityConfig syncInstance) {
 	);
 
 	public static volatile boolean WARDEN_SWIMS = true;
+	public static volatile boolean FIREFLY_SWARMS = true;
+	public static volatile boolean FIREFLY_SWARMS_BUSH = true;
 
 	public static final class Client {
 		public static volatile boolean SPAWN_FIREFLY_PARTICLES = false;
@@ -169,9 +173,13 @@ public static class FireflyConfig {
 
 		@EntrySyncData("spawnFireflies")
 		public boolean spawnFireflies = true;
-
 		@EntrySyncData("fireflySpawnCap")
 		public int fireflySpawnCap = 56;
+
+		@EntrySyncData("fireflySwarm")
+		public boolean fireflySwarm = true;
+		@EntrySyncData("fireflySwarmsBush")
+		public boolean fireflySwarmsBush = true;
 	}
 
 	public static class ButterflyConfig {

src/main/java/net/frozenblock/wilderwild/config/gui/WWEntityConfigGui.java

@@ -200,10 +200,32 @@ public static void setupEntries(@NotNull ConfigCategory category, @NotNull Confi
 			configInstance
 		);
 
+		var fireflySwarm = FrozenClothConfig.syncedEntry(
+			entryBuilder.startBooleanToggle(text("firefly_swarm"), modifiedFirefly.fireflySwarm)
+				.setDefaultValue(defaultConfig.firefly.fireflySwarm)
+				.setSaveConsumer(newValue -> firefly.fireflySwarm = newValue)
+				.setTooltip(tooltip("firefly_swarm"))
+				.build(),
+			firefly.getClass(),
+			"fireflySwarm",
+			configInstance
+		);
+
+		var fireflySwarmsBush = FrozenClothConfig.syncedEntry(
+			entryBuilder.startBooleanToggle(text("firefly_swarms_bush"), modifiedFirefly.fireflySwarmsBush)
+				.setDefaultValue(defaultConfig.firefly.fireflySwarmsBush)
+				.setSaveConsumer(newValue -> firefly.fireflySwarmsBush = newValue)
+				.setTooltip(tooltip("firefly_swarms_bush"))
+				.build(),
+			firefly.getClass(),
+			"fireflySwarmsBush",
+			configInstance
+		);
+
 		var fireflyCategory = FrozenClothConfig.createSubCategory(entryBuilder, category, text("firefly"),
 			false,
 			tooltip("firefly"),
-			spawnFireflyParticles, spawnFireflies, fireflySpawnCap
+			spawnFireflyParticles, spawnFireflies, fireflySpawnCap, fireflySwarm, fireflySwarmsBush
 		);
 
 		var spawnButterflies = FrozenClothConfig.syncedEntry(

src/main/java/net/frozenblock/wilderwild/entity/ai/firefly/FireflyAi.java

@@ -25,6 +25,7 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
+import net.frozenblock.wilderwild.config.WWEntityConfig;
 import net.frozenblock.wilderwild.entity.Firefly;
 import net.frozenblock.wilderwild.entity.ai.ValidateOrSetHome;
 import net.frozenblock.wilderwild.registry.WWMemoryModuleTypes;
@@ -119,7 +120,7 @@ private static void addIdleActivities(@NotNull Firefly firefly, @NotNull Brain<F
 				Pair.of(1, new FireflyHide(firefly, 1.75F, 10, 8)),
 				Pair.of(2, new FireflyMoveToBush(firefly, 1.25F, 10, 8, 5)),
 				Pair.of(3, StayCloseToTarget.create(FireflyAi::getHomeTarget, entity -> true, 7, 16, 1.25F)),
-				Pair.of(4, StayCloseToTarget.create(FireflyAi::getSwarmLeaderTarget, entity -> true, 2, 3, 1.75F)),
+				Pair.of(4, StayCloseToTarget.create(FireflyAi::getSwarmLeaderTarget, entity -> WWEntityConfig.FIREFLY_SWARMS, 2, 3, 1.75F)),
 				Pair.of(5, new RunOne<>(
 					ImmutableList.of(
 						Pair.of(RandomStroll.fly(1.25F), 2),

src/main/java/net/frozenblock/wilderwild/entity/ai/firefly/FireflyMoveToBush.java

@@ -19,6 +19,7 @@
 package net.frozenblock.wilderwild.entity.ai.firefly;
 
 import net.frozenblock.lib.entity.api.behavior.MoveToBlockBehavior;
+import net.frozenblock.wilderwild.config.WWEntityConfig;
 import net.frozenblock.wilderwild.entity.Firefly;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
@@ -37,7 +38,10 @@ public FireflyMoveToBush(@NotNull Firefly firefly, double speedModifier, int sea
 
 	@Override
 	public boolean checkExtraStartConditions(@NotNull ServerLevel level, @NotNull Firefly firefly) {
-		return !firefly.hasHome() && super.checkExtraStartConditions(level, firefly) && !this.blockPos.closerThan(firefly.blockPosition(), this.returnDistance);
+		return WWEntityConfig.FIREFLY_SWARMS_BUSH
+			&& !firefly.hasHome()
+			&& super.checkExtraStartConditions(level, firefly)
+			&& !this.blockPos.closerThan(firefly.blockPosition(), this.returnDistance);
 	}
 
 	@Override

src/main/resources/assets/wilderwild/lang/en_us.json

@@ -635,6 +635,10 @@
   "tooltip.wilderwild.spawn_fireflies": "Whether Fireflies can spawn.",
   "option.wilderwild.firefly_spawn_cap": "Firefly Spawn Cap",
   "tooltip.wilderwild.firefly_spawn_cap": "Controls the Firefly's spawn cap.",
+  "option.wilderwild.firefly_swarm": "Firefly Swarms",
+  "tooltip.wilderwild.firefly_swarm": "Whether Fireflies will move in swarms.",
+  "option.wilderwild.firefly_swarms_bush": "Firefly Bush Swarms",
+  "tooltip.wilderwild.firefly_swarms_bush": "Whether Fireflies will stay near Firefly Bushes.",
   "option.wilderwild.butterfly": "Butterfly",
   "tooltip.wilderwild.butterfly": "Contains options for the Butterfly.",
   "option.wilderwild.spawn_butterflies": "Spawn Butterflies",