From d7dfabcc838222be634b84f7c2be2acfdb170bac Mon Sep 17 00:00:00 2001 From: AViewFromTheTop <87103914+AViewFromTheTop@users.noreply.github.com> Date: Mon, 3 Feb 2025 21:26:10 -0500 Subject: [PATCH 1/2] Update clovers_stem.png --- .../wilderwild/textures/block/clovers_stem.png | Bin 79 -> 103 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/wilderwild/textures/block/clovers_stem.png b/src/main/resources/assets/wilderwild/textures/block/clovers_stem.png index a8ea694047d85cf8a0f2c1f1ea0a8547418d5786..a1e3545657f64378984e7003056ebcfc6511e4e9 100644 GIT binary patch delta 83 zcmeZIpCIYS#K6EXVPb|EkYXzd@(TviK#;eLeIk&O@pN$vsbEZ&U~9;{ddqZ4rhvc$ gbzkPgCm0qpFz^;KSu)(X#|KjH>FVdQ&MBb@07C2)t^fc4 delta 59 zcmYfIpCD<*!oa|=^_Tf8ASLGM;uunKD_Mdk;aEKrmzm(wh9Uzl1{NEZUpr)7KLAxQ Nc)I$ztaD0e0ssS~5q Date: Mon, 3 Feb 2025 21:38:40 -0500 Subject: [PATCH 2/2] refactor wind --- .../frozenblock/wilderwild/block/SeedingFlowerBlock.java | 2 -- .../wilderwild/block/entity/GeyserBlockEntity.java | 2 +- .../client/renderer/entity/JellyfishRenderer.java | 2 +- .../wilderwild/datagen/loot/WWBlockLootHelper.java | 3 +-- .../entity/ai/penguin/PenguinMarkAsEscaping.java | 3 +-- .../wilderwild/entity/ai/penguin/PenguinPostEscape.java | 2 -- .../mixin/client/wind/BaseAshSmokeParticleMixin.java | 2 +- .../mixin/client/wind/CampfireSmokeParticleMixin.java | 2 +- .../wilderwild/mixin/client/wind/CherryParticleMixin.java | 2 +- .../wilderwild/mixin/client/wind/DripParticleMixin.java | 2 +- .../mixin/client/wind/DustParticleBaseMixin.java | 2 +- .../mixin/client/wind/ExplodeParticleMixin.java | 2 +- .../mixin/client/wind/FallingDustParticleMixin.java | 2 +- .../wilderwild/mixin/client/wind/ParticleMixin.java | 2 +- .../mixin/client/wind/SnowflakeParticleMixin.java | 2 +- .../wind/fallingleaves/FallingLeafParticleMixin.java | 2 +- .../client/wind/particlerain/DustMoteParticleMixin.java | 2 +- .../client/wind/particlerain/RainDropParticleMixin.java | 2 +- .../client/wind/particlerain/SnowFlakeParticleMixin.java | 2 +- .../client/wind/particlerain/WeatherParticleMixin.java | 2 +- .../mixin/trailiertales/missing/ItemStackMixin.java | 2 +- .../wilderwild/mod_compat/FrozenLibIntegration.java | 2 +- .../wilderwild/mod_compat/NaturesSpiritIntegration.java | 2 +- .../wilderwild/particle/FloatingSculkBubbleParticle.java | 2 +- .../wilderwild/particle/LeafClusterSeedParticle.java | 2 +- .../frozenblock/wilderwild/particle/PollenParticle.java | 2 +- .../net/frozenblock/wilderwild/particle/SeedParticle.java | 3 +-- .../net/frozenblock/wilderwild/particle/WindParticle.java | 2 +- .../frozenblock/wilderwild/wind/WWClientWindManager.java | 6 +++--- .../worldgen/feature/configured/WWCaveConfigured.java | 2 +- .../worldgen/feature/configured/WWMiscConfigured.java | 2 +- .../wilderwild/worldgen/impl/root/WillowRootPlacer.java | 8 ++++---- 32 files changed, 35 insertions(+), 42 deletions(-) diff --git a/src/main/java/net/frozenblock/wilderwild/block/SeedingFlowerBlock.java b/src/main/java/net/frozenblock/wilderwild/block/SeedingFlowerBlock.java index e55cb4f05a..2d9234485c 100644 --- a/src/main/java/net/frozenblock/wilderwild/block/SeedingFlowerBlock.java +++ b/src/main/java/net/frozenblock/wilderwild/block/SeedingFlowerBlock.java @@ -51,10 +51,8 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Optional; public class SeedingFlowerBlock extends FlowerBlock { public static final float SEED_SPAWN_CHANCE = 0.04F; diff --git a/src/main/java/net/frozenblock/wilderwild/block/entity/GeyserBlockEntity.java b/src/main/java/net/frozenblock/wilderwild/block/entity/GeyserBlockEntity.java index 559fa6971d..be4f4a6d13 100644 --- a/src/main/java/net/frozenblock/wilderwild/block/entity/GeyserBlockEntity.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/client/renderer/entity/JellyfishRenderer.java b/src/main/java/net/frozenblock/wilderwild/client/renderer/entity/JellyfishRenderer.java index 15a1047779..9ca7c50e18 100644 --- a/src/main/java/net/frozenblock/wilderwild/client/renderer/entity/JellyfishRenderer.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/datagen/loot/WWBlockLootHelper.java b/src/main/java/net/frozenblock/wilderwild/datagen/loot/WWBlockLootHelper.java index b4a2e60e78..5b69762cf2 100644 --- a/src/main/java/net/frozenblock/wilderwild/datagen/loot/WWBlockLootHelper.java +++ b/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,7 +32,6 @@ 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; @@ -39,7 +39,6 @@ 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 { diff --git a/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinMarkAsEscaping.java b/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinMarkAsEscaping.java index 6aca01dcc1..08fbecefda 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinMarkAsEscaping.java +++ b/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 extends Behavior { public PenguinMarkAsEscaping() { diff --git a/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinPostEscape.java b/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinPostEscape.java index bb6136c5e0..6dcefdaf9d 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinPostEscape.java +++ b/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 extends Behavior { diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/BaseAshSmokeParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/BaseAshSmokeParticleMixin.java index 345aa84042..b87725f8e9 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/BaseAshSmokeParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/CampfireSmokeParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/CampfireSmokeParticleMixin.java index a675c9dcaa..d4b927aec8 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/CampfireSmokeParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/CherryParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/CherryParticleMixin.java index 70746aac8f..4cf397ae33 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/CherryParticleMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/CherryParticleMixin.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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/DripParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/DripParticleMixin.java index e5c306dc2d..15d022516a 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/DripParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/DustParticleBaseMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/DustParticleBaseMixin.java index 09d0810920..8da0de5112 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/DustParticleBaseMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/ExplodeParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/ExplodeParticleMixin.java index 713a38fd13..64bc798cb3 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/ExplodeParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/FallingDustParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/FallingDustParticleMixin.java index 1e1de0b785..e306bee4db 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/FallingDustParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/ParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/ParticleMixin.java index be70842b74..937709b2fe 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/ParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/SnowflakeParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/SnowflakeParticleMixin.java index 9babbf1436..fe174712e5 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/SnowflakeParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/fallingleaves/FallingLeafParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/fallingleaves/FallingLeafParticleMixin.java index e9110a69d6..8875e115ef 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/fallingleaves/FallingLeafParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/DustMoteParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/DustMoteParticleMixin.java index c507caf3f0..a21c6bde79 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/DustMoteParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/RainDropParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/RainDropParticleMixin.java index 521d3817ec..0e306c015f 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/RainDropParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/SnowFlakeParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/SnowFlakeParticleMixin.java index 7d2c628106..e22b39d8ad 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/SnowFlakeParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/WeatherParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/WeatherParticleMixin.java index f74289e6a9..0ee9a21d07 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/particlerain/WeatherParticleMixin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/trailiertales/missing/ItemStackMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/trailiertales/missing/ItemStackMixin.java index 2835bc4cfe..a4c240af6a 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/trailiertales/missing/ItemStackMixin.java +++ b/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 { diff --git a/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java b/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java index db97f91295..232945a87c 100644 --- a/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java +++ b/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java @@ -39,10 +39,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; diff --git a/src/main/java/net/frozenblock/wilderwild/mod_compat/NaturesSpiritIntegration.java b/src/main/java/net/frozenblock/wilderwild/mod_compat/NaturesSpiritIntegration.java index ab6d3fb660..27ac10b82a 100644 --- a/src/main/java/net/frozenblock/wilderwild/mod_compat/NaturesSpiritIntegration.java +++ b/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() { diff --git a/src/main/java/net/frozenblock/wilderwild/particle/FloatingSculkBubbleParticle.java b/src/main/java/net/frozenblock/wilderwild/particle/FloatingSculkBubbleParticle.java index c71cfd1df0..20c3274707 100644 --- a/src/main/java/net/frozenblock/wilderwild/particle/FloatingSculkBubbleParticle.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/particle/LeafClusterSeedParticle.java b/src/main/java/net/frozenblock/wilderwild/particle/LeafClusterSeedParticle.java index 01a9fd5dfd..c70d692eb5 100644 --- a/src/main/java/net/frozenblock/wilderwild/particle/LeafClusterSeedParticle.java +++ b/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 { diff --git a/src/main/java/net/frozenblock/wilderwild/particle/PollenParticle.java b/src/main/java/net/frozenblock/wilderwild/particle/PollenParticle.java index 3e0a33e26d..aee32af5ad 100644 --- a/src/main/java/net/frozenblock/wilderwild/particle/PollenParticle.java +++ b/src/main/java/net/frozenblock/wilderwild/particle/PollenParticle.java @@ -21,7 +21,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.config.WWBlockConfig; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/src/main/java/net/frozenblock/wilderwild/particle/SeedParticle.java b/src/main/java/net/frozenblock/wilderwild/particle/SeedParticle.java index 9527c065cc..af73f99d8b 100644 --- a/src/main/java/net/frozenblock/wilderwild/particle/SeedParticle.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/particle/WindParticle.java b/src/main/java/net/frozenblock/wilderwild/particle/WindParticle.java index 2ff36a63c8..2791217669 100644 --- a/src/main/java/net/frozenblock/wilderwild/particle/WindParticle.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/wind/WWClientWindManager.java b/src/main/java/net/frozenblock/wilderwild/wind/WWClientWindManager.java index 308283dfd5..9103fa69e2 100644 --- a/src/main/java/net/frozenblock/wilderwild/wind/WWClientWindManager.java +++ b/src/main/java/net/frozenblock/wilderwild/wind/WWClientWindManager.java @@ -20,9 +20,9 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.frozenblock.lib.wind.api.ClientWindManager; -import static net.frozenblock.lib.wind.api.ClientWindManager.*; -import net.frozenblock.lib.wind.api.ClientWindManagerExtension; +import net.frozenblock.lib.wind.client.api.ClientWindManagerExtension; +import net.frozenblock.lib.wind.client.impl.ClientWindManager; +import static net.frozenblock.lib.wind.client.impl.ClientWindManager.*; import net.frozenblock.lib.worldgen.heightmap.api.FrozenHeightmaps; import net.frozenblock.wilderwild.config.WWAmbienceAndMiscConfig; import net.frozenblock.wilderwild.particle.options.WindParticleOptions; diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWCaveConfigured.java b/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWCaveConfigured.java index b915e55ae0..d2b1df2604 100644 --- a/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWCaveConfigured.java +++ b/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWCaveConfigured.java @@ -18,8 +18,8 @@ package net.frozenblock.wilderwild.worldgen.feature.configured; -import java.util.List; import com.google.common.collect.ImmutableList; +import java.util.List; import net.frozenblock.lib.worldgen.feature.api.FrozenLibConfiguredFeature; import net.frozenblock.lib.worldgen.feature.api.FrozenLibFeatures; import net.frozenblock.lib.worldgen.feature.api.features.config.AirOrWaterInAreaPathFeatureConfig; diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWMiscConfigured.java b/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWMiscConfigured.java index c6f980ddd7..13d88ecdd2 100644 --- a/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWMiscConfigured.java +++ b/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWMiscConfigured.java @@ -18,8 +18,8 @@ package net.frozenblock.wilderwild.worldgen.feature.configured; -import java.util.List; import com.google.common.collect.ImmutableList; +import java.util.List; import net.frozenblock.lib.worldgen.feature.api.FrozenLibConfiguredFeature; import net.frozenblock.lib.worldgen.feature.api.FrozenLibFeatures; import net.frozenblock.lib.worldgen.feature.api.features.config.ComboFeatureConfig; diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/impl/root/WillowRootPlacer.java b/src/main/java/net/frozenblock/wilderwild/worldgen/impl/root/WillowRootPlacer.java index db6e59b8d1..2df4ae0011 100644 --- a/src/main/java/net/frozenblock/wilderwild/worldgen/impl/root/WillowRootPlacer.java +++ b/src/main/java/net/frozenblock/wilderwild/worldgen/impl/root/WillowRootPlacer.java @@ -21,6 +21,10 @@ import com.google.common.collect.Lists; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.function.BiConsumer; import net.frozenblock.wilderwild.registry.WWFeatures; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -34,10 +38,6 @@ import net.minecraft.world.level.levelgen.feature.rootplacers.RootPlacerType; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.function.BiConsumer; public class WillowRootPlacer extends RootPlacer { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(