diff --git a/src/main/java/net/frozenblock/wilderwild/block/PollenBlock.java b/src/main/java/net/frozenblock/wilderwild/block/PollenBlock.java index 6dd74b88f5..3fe72c3412 100644 --- a/src/main/java/net/frozenblock/wilderwild/block/PollenBlock.java +++ b/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; 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 20de11dfb6..f9e061b2b2 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; @@ -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; diff --git a/src/main/java/net/frozenblock/wilderwild/client/WWModelLayers.java b/src/main/java/net/frozenblock/wilderwild/client/WWModelLayers.java index 0d8be4db0c..9e106c685f 100644 --- a/src/main/java/net/frozenblock/wilderwild/client/WWModelLayers.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/client/model/JellyfishModel.java b/src/main/java/net/frozenblock/wilderwild/client/model/JellyfishModel.java index 93ffe020ef..7bbe90eb0c 100644 --- a/src/main/java/net/frozenblock/wilderwild/client/model/JellyfishModel.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/client/model/PenguinModel.java b/src/main/java/net/frozenblock/wilderwild/client/model/PenguinModel.java index 355d7af4e7..eac4d841f0 100644 --- a/src/main/java/net/frozenblock/wilderwild/client/model/PenguinModel.java +++ b/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 extends EntityModel { public static final MeshTransformer BABY_TRANSFORMER = new BabyModelTransform(true, 0F, 0F, 1F, 2.5F, 36F, Set.of()); 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 217343841b..e28def32ce 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/client/renderer/entity/state/PenguinRenderState.java b/src/main/java/net/frozenblock/wilderwild/client/renderer/entity/state/PenguinRenderState.java index 3fa7ccf9f7..e8bb54a1a4 100644 --- a/src/main/java/net/frozenblock/wilderwild/client/renderer/entity/state/PenguinRenderState.java +++ b/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) 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/datagen/tag/WWBlockTagProvider.java b/src/main/java/net/frozenblock/wilderwild/datagen/tag/WWBlockTagProvider.java index 89c80a737d..8eaeea25a4 100644 --- a/src/main/java/net/frozenblock/wilderwild/datagen/tag/WWBlockTagProvider.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/entity/Penguin.java b/src/main/java/net/frozenblock/wilderwild/entity/Penguin.java index 520597dab6..f40fed7422 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/Penguin.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/entity/Scorched.java b/src/main/java/net/frozenblock/wilderwild/entity/Scorched.java index 4549b96706..02f4e24617 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/Scorched.java +++ b/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; diff --git a/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinAi.java b/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinAi.java index 337671d7bb..707780b198 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/ai/penguin/PenguinAi.java +++ b/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; 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/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/FallingLeavesParticleMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/FallingLeavesParticleMixin.java index 03ce0262c7..813822638c 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/client/wind/FallingLeavesParticleMixin.java +++ b/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; 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 4450d9a3c2..86bd9c3b79 100644 --- a/src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java +++ b/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; 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 f5459b77cb..c75fdd515c 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 ed9369db1b..58d0c26058 100644 --- a/src/main/java/net/frozenblock/wilderwild/particle/PollenParticle.java +++ b/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 { 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/registry/WWItems.java b/src/main/java/net/frozenblock/wilderwild/registry/WWItems.java index 5e76b95cc8..fd1440f11c 100644 --- a/src/main/java/net/frozenblock/wilderwild/registry/WWItems.java +++ b/src/main/java/net/frozenblock/wilderwild/registry/WWItems.java @@ -29,7 +29,6 @@ import net.frozenblock.wilderwild.item.MilkweedPod; import net.frozenblock.wilderwild.item.MobBottleItem; import net.frozenblock.wilderwild.tag.WWInstrumentTags; -import net.minecraft.core.component.DataComponents; import net.minecraft.core.dispenser.BoatDispenseItemBehavior; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; 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 51a7191898..d511f83839 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 fe21fd78f4..e012724c5f 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,11 +18,11 @@ package net.frozenblock.wilderwild.worldgen.feature.configured; -import java.util.List; -import net.frozenblock.lib.worldgen.feature.api.features.config.ComboFeatureConfig; 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; import net.frozenblock.lib.worldgen.feature.api.features.config.FadingDiskCarpetFeatureConfig; import net.frozenblock.lib.worldgen.feature.api.features.config.FadingDiskFeatureConfig; import net.frozenblock.lib.worldgen.feature.api.features.config.FadingDiskWithBiomeFeatureConfig; diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWTreeConfigured.java b/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWTreeConfigured.java index cfecb10a79..1c5af240c8 100644 --- a/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWTreeConfigured.java +++ b/src/main/java/net/frozenblock/wilderwild/worldgen/feature/configured/WWTreeConfigured.java @@ -18,19 +18,19 @@ package net.frozenblock.wilderwild.worldgen.feature.configured; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.OptionalInt; -import com.google.common.collect.ImmutableList; import net.frozenblock.lib.worldgen.feature.api.FrozenLibConfiguredFeature; import net.frozenblock.wilderwild.WWConstants; import net.frozenblock.wilderwild.block.BaobabNutBlock; import net.frozenblock.wilderwild.registry.WWBlocks; import net.frozenblock.wilderwild.registry.WWFeatures; import net.frozenblock.wilderwild.tag.WWBlockTags; -import static net.frozenblock.wilderwild.worldgen.feature.WWFeatureUtils.register; import net.frozenblock.wilderwild.worldgen.feature.WWFeatureUtils; +import static net.frozenblock.wilderwild.worldgen.feature.WWFeatureUtils.register; import net.frozenblock.wilderwild.worldgen.impl.foliage.MapleFoliagePlacer; import net.frozenblock.wilderwild.worldgen.impl.foliage.NoOpFoliagePlacer; import net.frozenblock.wilderwild.worldgen.impl.foliage.PalmFoliagePlacer; @@ -97,11 +97,11 @@ import net.minecraft.world.level.levelgen.feature.treedecorators.AlterGroundDecorator; import net.minecraft.world.level.levelgen.feature.treedecorators.AttachedToLeavesDecorator; import net.minecraft.world.level.levelgen.feature.treedecorators.BeehiveDecorator; +import net.minecraft.world.level.levelgen.feature.treedecorators.CocoaDecorator; import net.minecraft.world.level.levelgen.feature.treedecorators.CreakingHeartDecorator; import net.minecraft.world.level.levelgen.feature.treedecorators.LeaveVineDecorator; import net.minecraft.world.level.levelgen.feature.treedecorators.PaleMossDecorator; import net.minecraft.world.level.levelgen.feature.treedecorators.TreeDecorator; -import net.minecraft.world.level.levelgen.feature.treedecorators.CocoaDecorator; import net.minecraft.world.level.levelgen.feature.treedecorators.TrunkVineDecorator; import net.minecraft.world.level.levelgen.feature.trunkplacers.CherryTrunkPlacer; import net.minecraft.world.level.levelgen.feature.trunkplacers.DarkOakTrunkPlacer; 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( 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 a8ea694047..a1e3545657 100644 Binary files a/src/main/resources/assets/wilderwild/textures/block/clovers_stem.png and b/src/main/resources/assets/wilderwild/textures/block/clovers_stem.png differ