Merge branch '1.21.2' into 1.21.4

src/main/java/net/frozenblock/wilderwild/block/PollenBlock.java

@@ -31,7 +31,6 @@
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.MultifaceBlock;
 import net.minecraft.world.level.block.MultifaceSpreadeableBlock;
 import net.minecraft.world.level.block.MultifaceSpreader;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/net/frozenblock/wilderwild/block/entity/GeyserBlockEntity.java

@@ -23,10 +23,10 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.loader.api.FabricLoader;
-import net.frozenblock.lib.wind.api.ClientWindManager;
 import net.frozenblock.lib.wind.api.WindDisturbance;
 import net.frozenblock.lib.wind.api.WindDisturbanceLogic;
 import net.frozenblock.lib.wind.api.WindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.block.GeyserBlock;
 import net.frozenblock.wilderwild.block.state.properties.GeyserStage;
 import net.frozenblock.wilderwild.block.state.properties.GeyserType;
@@ -52,7 +52,6 @@
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntitySelector;
-import net.minecraft.world.entity.ai.targeting.TargetingConditions;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;

src/main/java/net/frozenblock/wilderwild/client/WWModelLayers.java

@@ -28,8 +28,8 @@
 import net.frozenblock.wilderwild.client.model.JellyfishModel;
 import net.frozenblock.wilderwild.client.model.OstrichInbredModel;
 import net.frozenblock.wilderwild.client.model.OstrichModel;
-import net.frozenblock.wilderwild.client.model.StoneChestModel;
 import net.frozenblock.wilderwild.client.model.PenguinModel;
+import net.frozenblock.wilderwild.client.model.StoneChestModel;
 import net.frozenblock.wilderwild.client.model.TumbleweedModel;
 import net.frozenblock.wilderwild.client.renderer.blockentity.DisplayLanternRenderer;
 import net.frozenblock.wilderwild.client.renderer.blockentity.HangingTendrilRenderer;

src/main/java/net/frozenblock/wilderwild/client/model/JellyfishModel.java

@@ -21,8 +21,8 @@
 import java.util.Arrays;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.wilderwild.client.renderer.entity.state.JellyfishRenderState;
 import net.frozenblock.lib.entity.api.rendering.FrozenLibRenderTypes;
+import net.frozenblock.wilderwild.client.renderer.entity.state.JellyfishRenderState;
 import net.frozenblock.wilderwild.config.WWEntityConfig;
 import net.minecraft.client.model.EntityModel;
 import net.minecraft.client.model.geom.ModelPart;

src/main/java/net/frozenblock/wilderwild/client/model/PenguinModel.java

@@ -18,6 +18,7 @@
 
 package net.frozenblock.wilderwild.client.model;
 
+import java.util.Set;
 import net.frozenblock.wilderwild.client.animation.definitions.PenguinAnimation;
 import net.frozenblock.wilderwild.client.renderer.entity.state.PenguinRenderState;
 import net.minecraft.client.model.BabyModelTransform;
@@ -33,7 +34,6 @@
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.NotNull;
 import org.joml.Math;
-import java.util.Set;
 
 public class PenguinModel<T extends PenguinRenderState> extends EntityModel<PenguinRenderState> {
 	public static final MeshTransformer BABY_TRANSFORMER = new BabyModelTransform(true, 0F, 0F, 1F, 2.5F, 36F, Set.of());

src/main/java/net/frozenblock/wilderwild/client/renderer/entity/JellyfishRenderer.java

@@ -21,7 +21,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.WWConstants;
 import net.frozenblock.wilderwild.client.WWModelLayers;
 import net.frozenblock.wilderwild.client.model.JellyfishModel;

src/main/java/net/frozenblock/wilderwild/client/renderer/entity/state/PenguinRenderState.java

@@ -21,7 +21,6 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.entity.state.LivingEntityRenderState;
-import net.minecraft.client.renderer.entity.state.SaddleableRenderState;
 import net.minecraft.world.entity.AnimationState;
 
 @Environment(EnvType.CLIENT)

src/main/java/net/frozenblock/wilderwild/datagen/loot/WWBlockLootHelper.java

@@ -18,6 +18,7 @@
 
 package net.frozenblock.wilderwild.datagen.loot;
 
+import java.util.stream.IntStream;
 import net.frozenblock.wilderwild.registry.WWBlockStateProperties;
 import net.minecraft.advancements.critereon.StatePropertiesPredicate;
 import net.minecraft.core.HolderLookup;
@@ -31,15 +32,13 @@
 import net.minecraft.world.level.storage.loot.LootPool;
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.entries.LootItem;
-import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
 import net.minecraft.world.level.storage.loot.functions.CopyBlockState;
 import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction;
 import net.minecraft.world.level.storage.loot.predicates.BonusLevelTableCondition;
 import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
 import org.jetbrains.annotations.NotNull;
-import java.util.stream.IntStream;
 
 public class WWBlockLootHelper {
 

src/main/java/net/frozenblock/wilderwild/datagen/tag/WWBlockTagProvider.java

@@ -23,7 +23,6 @@
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
 import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags;
 import net.frozenblock.lib.tag.api.FrozenBlockTags;
-import net.frozenblock.wilderwild.WWConstants;
 import net.frozenblock.wilderwild.registry.WWBlocks;
 import net.frozenblock.wilderwild.tag.WWBlockTags;
 import net.minecraft.core.HolderLookup;

src/main/java/net/frozenblock/wilderwild/entity/Penguin.java

@@ -48,7 +48,6 @@
 import net.minecraft.world.entity.EntitySpawnReason;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.Pose;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;

src/main/java/net/frozenblock/wilderwild/entity/Scorched.java

@@ -32,8 +32,8 @@
 import net.minecraft.world.Difficulty;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.entity.EntitySpawnReason;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySpawnReason;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.ai.goal.AvoidEntityGoal;
 import net.minecraft.world.entity.ai.goal.LeapAtTargetGoal;

src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinAi.java

@@ -69,7 +69,6 @@
 import net.minecraft.world.entity.ai.sensing.SensorType;
 import net.minecraft.world.entity.schedule.Activity;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.Ingredient;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinMarkAsEscaping.java

@@ -18,6 +18,7 @@
 
 package net.frozenblock.wilderwild.entity.ai.penguin;
 
+import java.util.Map;
 import net.frozenblock.wilderwild.entity.Penguin;
 import net.frozenblock.wilderwild.registry.WWMemoryModuleTypes;
 import net.minecraft.server.level.ServerLevel;
@@ -26,8 +27,6 @@
 import net.minecraft.world.entity.ai.memory.MemoryStatus;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Map;
-
 public class PenguinMarkAsEscaping<E extends Penguin> extends Behavior<E> {
 
 	public PenguinMarkAsEscaping() {

src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinPostEscape.java

@@ -24,8 +24,6 @@
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.ai.Brain;
 import net.minecraft.world.entity.ai.behavior.Behavior;
-import net.minecraft.world.entity.ai.memory.MemoryModuleType;
-import net.minecraft.world.entity.ai.memory.MemoryStatus;
 import org.jetbrains.annotations.NotNull;
 
 public class PenguinPostEscape<E extends Penguin> extends Behavior<E> {

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/BaseAshSmokeParticleMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.BaseAshSmokeParticle;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/CampfireSmokeParticleMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.CampfireSmokeParticle;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/DripParticleMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.particle.impl.WilderDripSuspendedParticleInterface;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/DustParticleBaseMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.DustParticleBase;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/ExplodeParticleMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.ExplodeParticle;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/FallingDustParticleMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.FallingDustParticle;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/FallingLeavesParticleMixin.java

@@ -25,7 +25,7 @@
 import com.llamalad7.mixinextras.sugar.ref.LocalRef;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.wind.WWClientWindManager;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/ParticleMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.particle.impl.WilderDripSuspendedParticleInterface;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/SnowflakeParticleMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.SnowflakeParticle;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/fallingleaves/FallingLeafParticleMixin.java

@@ -24,7 +24,7 @@
 import com.llamalad7.mixinextras.sugar.ref.LocalDoubleRef;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.wind.WWClientWindManager;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/DustMoteParticleMixin.java

@@ -22,7 +22,7 @@
 import com.llamalad7.mixinextras.sugar.ref.LocalDoubleRef;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.wind.WWClientWindManager;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/RainDropParticleMixin.java

@@ -23,7 +23,7 @@
 import java.util.function.Consumer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.wind.WWClientWindManager;
 import net.minecraft.client.Camera;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/SnowFlakeParticleMixin.java

@@ -23,7 +23,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.wind.WWClientWindManager;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/WeatherParticleMixin.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.particle.TextureSheetParticle;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/net/frozenblock/wilderwild/mixin/trailiertales/missing/ItemStackMixin.java

@@ -19,6 +19,7 @@
 package net.frozenblock.wilderwild.mixin.trailiertales.missing;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import java.util.List;
 import net.frozenblock.wilderwild.WWFeatureFlags;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
@@ -28,7 +29,6 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import java.util.List;
 
 @Mixin(ItemStack.class)
 public abstract class ItemStackMixin {

src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java

@@ -38,10 +38,10 @@
 import net.frozenblock.lib.sound.api.damage.PlayerDamageTypeSounds;
 import net.frozenblock.lib.sound.api.predicate.SoundPredicate;
 import net.frozenblock.lib.spotting_icons.api.SpottingIconPredicate;
-import net.frozenblock.lib.wind.api.ClientWindManager;
 import net.frozenblock.lib.wind.api.WindDisturbance;
 import net.frozenblock.lib.wind.api.WindDisturbanceLogic;
 import net.frozenblock.lib.wind.api.WindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.lib.worldgen.structure.api.BlockStateRespectingProcessorRule;
 import net.frozenblock.lib.worldgen.structure.api.BlockStateRespectingRuleProcessor;
 import net.frozenblock.lib.worldgen.structure.api.RandomPoolAliasApi;

src/main/java/net/frozenblock/wilderwild/mod_compat/NaturesSpiritIntegration.java

@@ -20,7 +20,7 @@
 
 import net.frozenblock.lib.block.sound.api.BlockSoundTypeOverwrites;
 import net.frozenblock.lib.integration.api.ModIntegration;
-import static net.frozenblock.wilderwild.registry.WWSoundTypes.*;
+import static net.frozenblock.wilderwild.registry.WWSoundTypes.COCONUT;
 
 public class NaturesSpiritIntegration extends ModIntegration {
 	public NaturesSpiritIntegration() {

src/main/java/net/frozenblock/wilderwild/particle/FloatingSculkBubbleParticle.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.particle.options.FloatingSculkBubbleParticleOptions;
 import net.frozenblock.wilderwild.registry.WWSounds;

src/main/java/net/frozenblock/wilderwild/particle/LeafClusterSeedParticle.java

@@ -18,6 +18,7 @@
 
 package net.frozenblock.wilderwild.particle;
 
+import java.util.Optional;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.frozenblock.wilderwild.block.impl.FallingLeafUtil;
@@ -32,7 +33,6 @@
 import net.minecraft.core.particles.SimpleParticleType;
 import net.minecraft.util.ParticleUtils;
 import org.jetbrains.annotations.NotNull;
-import java.util.Optional;
 
 @Environment(EnvType.CLIENT)
 public class LeafClusterSeedParticle extends NoRenderParticle {

src/main/java/net/frozenblock/wilderwild/particle/PollenParticle.java

@@ -18,10 +18,12 @@
 
 package net.frozenblock.wilderwild.particle;
 
+import java.util.Optional;
+import java.util.function.Supplier;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.frozenblock.lib.math.api.AdvancedMath;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.config.WWBlockConfig;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -36,8 +38,6 @@
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
-import java.util.Optional;
-import java.util.function.Supplier;
 
 @Environment(EnvType.CLIENT)
 public class PollenParticle extends TextureSheetParticle {

src/main/java/net/frozenblock/wilderwild/particle/SeedParticle.java

@@ -20,8 +20,7 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.math.api.AdvancedMath;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.particle.options.SeedParticleOptions;
 import net.minecraft.client.multiplayer.ClientLevel;

src/main/java/net/frozenblock/wilderwild/particle/WindParticle.java

@@ -23,7 +23,7 @@
 import java.util.function.Consumer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.frozenblock.lib.wind.api.ClientWindManager;
+import net.frozenblock.lib.wind.client.impl.ClientWindManager;
 import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig;
 import net.frozenblock.wilderwild.particle.options.WindParticleOptions;
 import net.minecraft.client.Camera;