diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 962f32955..2f8a20b54 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -32,7 +32,7 @@ object Versions { } object Fabric { - const val fabricAPI = "0.139.4+${Mod.minecraft}" + const val fabricAPI = "0.140.0+${Mod.minecraft}" const val cloud = "2.0.0-beta.13" } // @@ -42,14 +42,14 @@ object Versions { // } object Mod { - const val mixin = "0.16.4+mixin.0.8.7" + const val mixin = "0.16.5+mixin.0.8.7" const val mixinExtras = "0.5.0" const val minecraft = "1.21.11" - const val yarn = "$minecraft+build.1" - const val fabricLoader = "0.18.2" + const val yarn = "$minecraft+build.3" + const val fabricLoader = "0.18.3" - const val architecturyLoom = "1.13.467" + const val architecturyLoom = "1.13.463" const val architecturyPlugin = "3.4.162" } diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java index 262fbf8fe..7dbc696b5 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java @@ -14,11 +14,11 @@ import net.minecraft.sound.MusicSound; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import net.minecraft.village.VillagerType; +import net.minecraft.world.attribute.AmbientParticle; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome.Precipitation; import net.minecraft.world.biome.Biome.TemperatureModifier; import net.minecraft.world.biome.BiomeEffects.GrassColorModifier; -import net.minecraft.world.biome.BiomeParticleConfig; import net.minecraft.world.biome.SpawnSettings; import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList; import net.minecraft.world.dimension.DimensionType; @@ -87,7 +87,7 @@ public abstract class ModPlatform extends AbstractPlatform { .registerLoader(TemperatureModifier.class, (type, o, loader, depthTracker) -> TemperatureModifier.valueOf(((String) o).toUpperCase())) .registerLoader(SpawnGroup.class, (type, o, loader, depthTracker) -> SpawnGroup.valueOf((String) o)) - .registerLoader(BiomeParticleConfig.class, BiomeParticleConfigTemplate::new) + .registerLoader(AmbientParticle.class, BiomeParticleConfigTemplate::new) .registerLoader(SoundEvent.class, SoundEventTemplate::new) .registerLoader(BiomeMoodSound.class, BiomeMoodSoundTemplate::new) .registerLoader(BiomeAdditionsSound.class, BiomeAdditionsSoundTemplate::new) diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java index ba2c4c1fb..83774831b 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/BiomeParticleConfigTemplate.java @@ -8,12 +8,11 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.command.argument.ParticleEffectArgumentType; import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryWrapper; -import net.minecraft.world.biome.BiomeParticleConfig; - +import net.minecraft.world.attribute.AmbientParticle; import java.util.stream.Stream; -public class BiomeParticleConfigTemplate implements ObjectTemplate { +public class BiomeParticleConfigTemplate implements ObjectTemplate { @Value("particle") @Default private String particle = null; @@ -23,13 +22,13 @@ public class BiomeParticleConfigTemplate implements ObjectTemplate>> cir) { if(flora != null) { cir.setReturnValue(flora);