diff --git a/src/main/java/net/frozenblock/wilderwild/entity/Butterfly.java b/src/main/java/net/frozenblock/wilderwild/entity/Butterfly.java index 2d0b981f1..3a3c245b2 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/Butterfly.java +++ b/src/main/java/net/frozenblock/wilderwild/entity/Butterfly.java @@ -340,12 +340,12 @@ protected SoundEvent getAmbientSound() { @Override protected SoundEvent getHurtSound(@NotNull DamageSource source) { - return WWSounds.ENTITY_FIREFLY_HURT; + return WWSounds.ENTITY_BUTTERFLY_HURT; } @Override protected SoundEvent getDeathSound() { - return WWSounds.ENTITY_FIREFLY_HURT; + return WWSounds.ENTITY_BUTTERFLY_DEATH; } @Override diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/datafix/DataFixersMixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/datafix/DataFixersMixin.java index 37eb16fa2..2aa08d09d 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/datafix/DataFixersMixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/datafix/DataFixersMixin.java @@ -87,6 +87,7 @@ public class DataFixersMixin { builder.addFixer(new AddNewChoices(schema, WWConstants.string("chest_bubbler"), References.ENTITY)); builder.addFixer(new AddNewChoices(schema, WWConstants.string("sculk_spreader"), References.ENTITY)); builder.addFixer(new AddNewChoices(schema, WWConstants.string("scorched"), References.ENTITY)); + builder.addFixer(new AddNewChoices(schema, WWConstants.string("moobloom"), References.ENTITY)); builder.addFixer(new AddNewChoices(schema, WWConstants.string("falling_leaves"), References.ENTITY)); return schema; } diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/datafix/V3328Mixin.java b/src/main/java/net/frozenblock/wilderwild/mixin/datafix/V3328Mixin.java index c41ed08eb..01d11dd5f 100644 --- a/src/main/java/net/frozenblock/wilderwild/mixin/datafix/V3328Mixin.java +++ b/src/main/java/net/frozenblock/wilderwild/mixin/datafix/V3328Mixin.java @@ -95,6 +95,11 @@ public class V3328Mixin { WWConstants.string("scorched"), () -> V100.equipment(schema) ); + schema.register( + map, + WWConstants.string("moobloom"), + () -> V100.equipment(schema) + ); schema.register( map, WWConstants.string("falling_leaves"), diff --git a/src/main/java/net/frozenblock/wilderwild/registry/WWSounds.java b/src/main/java/net/frozenblock/wilderwild/registry/WWSounds.java index c0dadffbc..ac346a8fb 100644 --- a/src/main/java/net/frozenblock/wilderwild/registry/WWSounds.java +++ b/src/main/java/net/frozenblock/wilderwild/registry/WWSounds.java @@ -253,6 +253,8 @@ public final class WWSounds { //ENTITY public static final SoundEvent ENTITY_FIREFLY_HIDE = register("entity.firefly.hide"); public static final SoundEvent ENTITY_FIREFLY_HURT = register("entity.firefly.hurt"); + public static final SoundEvent ENTITY_BUTTERFLY_HURT = register("entity.butterfly.hurt"); + public static final SoundEvent ENTITY_BUTTERFLY_DEATH = register("entity.butterfly.death"); public static final SoundEvent ENTITY_ENDERMAN_ANGER_LOOP = register("entity.enderman.anger_loop"); public static final SoundEvent ENTITY_JELLYFISH_STING = register("entity.jellyfish.sting"); public static final SoundEvent ENTITY_JELLYFISH_AMBIENT_WATER = register("entity.jellyfish.ambient_water"); diff --git a/src/main/java/net/frozenblock/wilderwild/worldgen/biome/Tundra.java b/src/main/java/net/frozenblock/wilderwild/worldgen/biome/Tundra.java index adb84dc44..e76ba6f18 100644 --- a/src/main/java/net/frozenblock/wilderwild/worldgen/biome/Tundra.java +++ b/src/main/java/net/frozenblock/wilderwild/worldgen/biome/Tundra.java @@ -23,6 +23,10 @@ import java.util.function.Consumer; import net.frozenblock.lib.worldgen.biome.api.FrozenBiome; import net.frozenblock.lib.worldgen.biome.api.FrozenGrassColorModifiers; +import net.frozenblock.lib.worldgen.biome.api.parameters.Continentalness; +import net.frozenblock.lib.worldgen.biome.api.parameters.Erosion; +import net.frozenblock.lib.worldgen.biome.api.parameters.OverworldBiomeBuilderParameters; +import net.frozenblock.lib.worldgen.biome.api.parameters.Weirdness; import net.frozenblock.wilderwild.WWConstants; import net.frozenblock.wilderwild.config.WWWorldgenConfig; import net.frozenblock.wilderwild.worldgen.WWSharedWorldgen; @@ -42,6 +46,7 @@ import net.minecraft.world.level.biome.AmbientParticleSettings; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeGenerationSettings; +import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.biome.Climate; import net.minecraft.world.level.biome.MobSpawnSettings; import net.minecraft.world.level.levelgen.GenerationStep; @@ -54,10 +59,8 @@ public final class Tundra extends FrozenBiome { public static final Climate.Parameter TEMPERATURE = Climate.Parameter.span(-0.45F, -0.255F); public static final Climate.Parameter HUMIDITY = Climate.Parameter.span(-1F, -0.2F); - public static final Climate.Parameter WEIRDNESS_A = Climate.Parameter.span(-0.4F, -0.05F); - public static final Climate.Parameter WEIRDNESS_B = Climate.Parameter.span(0.05F, 0.4F); - public static final Climate.Parameter EROSION_A = Climate.Parameter.span(-0.223F, 0.450F); - public static final Climate.Parameter CONTINENTALNESS = Climate.Parameter.span(0.030F, 0.550F); + public static final Climate.Parameter EROSION_A = Climate.Parameter.span(-2.233F, 0.450F); + public static final Climate.Parameter CONTINENTALNESS = Climate.Parameter.span(-0.110F, 0.030F); public static final Climate.Parameter TEMPERATURE_B = Climate.Parameter.span(-1.000F, -0.450F); public static final Climate.Parameter HUMIDITY_C = Climate.Parameter.span(0.300F, 0.700F); @@ -211,45 +214,46 @@ public void addSpawns(MobSpawnSettings.Builder spawns) { @Override public void injectToOverworld(Consumer>> parameters) { if (WWWorldgenConfig.get().biomeGeneration.generateTundra) { - this.addSurfaceBiome( - parameters, - TEMPERATURE, - HUMIDITY, - CONTINENTALNESS, - EROSION_A, - WEIRDNESS_A, - 0F - ); - this.addSurfaceBiome( - parameters, - TEMPERATURE, - HUMIDITY, - CONTINENTALNESS, - EROSION_A, - WEIRDNESS_B, - 0F - ); - this.addSurfaceBiome( - parameters, - TEMPERATURE_B, - HUMIDITY_C, - CONTINENTALNESS_B, - EROSION_B, - WEIRDNESS_C, - 0F - ); - this.addSurfaceBiome( - parameters, - TEMPERATURE_C, - HUMIDITY_D, - CONTINENTALNESS_C, - EROSION_C, - WEIRDNESS_D, - 0F - ); + for (Climate.ParameterPoint point : OverworldBiomeBuilderParameters.points(Biomes.PLAINS)) { + this.addSurfaceBiome( + parameters, + TEMPERATURE, + HUMIDITY, + CONTINENTALNESS, + EROSION_A, + point.weirdness(), + 0F + ); + this.addSurfaceBiome( + parameters, + TEMPERATURE, + HUMIDITY, + CONTINENTALNESS, + EROSION_A, + point.weirdness(), + 0F + ); + this.addSurfaceBiome( + parameters, + TEMPERATURE_B, + HUMIDITY_C, + CONTINENTALNESS_B, + EROSION_B, + WEIRDNESS_C, + 0F + ); + this.addSurfaceBiome( + parameters, + TEMPERATURE_C, + HUMIDITY_D, + CONTINENTALNESS_C, + EROSION_C, + WEIRDNESS_D, + 0F + ); + } } } - } diff --git a/src/main/resources/assets/wilderwild/sounds.json b/src/main/resources/assets/wilderwild/sounds.json index f1a5ab9ab..b4db43f12 100644 --- a/src/main/resources/assets/wilderwild/sounds.json +++ b/src/main/resources/assets/wilderwild/sounds.json @@ -2359,6 +2359,22 @@ ], "subtitle": "subtitles.entity.firefly.hurt" }, + "entity.butterfly.hurt": { + "sounds": [ + "wilderwild:mob/firefly/hurt_1", + "wilderwild:mob/firefly/hurt_2", + "wilderwild:mob/firefly/hurt_3" + ], + "subtitle": "subtitles.entity.butterfly.hurt" + }, + "entity.butterfly.death": { + "sounds": [ + "wilderwild:mob/firefly/hurt_1", + "wilderwild:mob/firefly/hurt_2", + "wilderwild:mob/firefly/hurt_3" + ], + "subtitle": "subtitles.entity.butterfly.death" + }, "entity.enderman.anger_loop": { "sounds": [ "wilderwild:mob/enderman/stare_loop" diff --git a/src/main/resources/credits.txt b/src/main/resources/credits.txt index 550387af9..20bc2a667 100644 --- a/src/main/resources/credits.txt +++ b/src/main/resources/credits.txt @@ -23,7 +23,7 @@ Soro: - Beta Beaches. - Water Pools generating near Rivers. - Scorched Sand concept. - - Baobab Nuts. + - Baobab Nut concept. - Help with Maple tree variants in worldgen. - Huge help implementing and tweaking the Tundra biome.