diff --git a/fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json b/fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json index 4fdfe605a..bbd819000 100644 --- a/fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json +++ b/fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json @@ -8,5 +8,6 @@ ], "injectors": { "defaultRequire": 1 - } + }, + "minVersion": "0.8.5" } diff --git a/fabric-particles-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/BlockDustParticleMixin.java b/fabric-particles-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/BlockDustParticleMixin.java index 07cec8658..7620719c6 100644 --- a/fabric-particles-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/BlockDustParticleMixin.java +++ b/fabric-particles-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/BlockDustParticleMixin.java @@ -48,11 +48,9 @@ private BlockDustParticleMixin() { argsOnly = true, slice = @Slice( from = @At(value = "FIELD", target = "Lnet/minecraft/client/particle/BlockDustParticle;blue:F", ordinal = 0), - to = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z") + to = @At(value = "INVOKE", target = "Lnet/minecraft/client/color/block/BlockColors;getColor(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/util/math/BlockPos;I)I") ), - allow = 1, - // Prevent crash on never Forge versions, allowing FML to show the mod error screen - require = 0 + allow = 1 ) private BlockState removeUntintableParticles(BlockState state) { if (!ParticleRenderEvents.ALLOW_BLOCK_DUST_TINT.invoker().allowBlockDustTint(state, world, blockPos)) { diff --git a/gradle.properties b/gradle.properties index 486756a1d..79479b671 100644 --- a/gradle.properties +++ b/gradle.properties @@ -68,5 +68,5 @@ fabric-client-tags-api-v1-version=1.1.1 loom.platform=forge forge_version=1.20.1-47.1.3 pack_format=15 -forgified_version=1.9.11 +forgified_version=1.9.12 forge_fabric_loader_version=2.2.1+0.14.21+1.20.1 diff --git a/gradle/ffapi-setup.gradle b/gradle/ffapi-setup.gradle index f81fa1c80..c171dcec9 100644 --- a/gradle/ffapi-setup.gradle +++ b/gradle/ffapi-setup.gradle @@ -441,9 +441,7 @@ abstract class GenerateForgeModMetadata extends DefaultTask { { modId "forge" mandatory true - // TODO Remove in 1.20.2 - // Cap forge on 47.1.3 to avoid issues that occur in later version - versionRange "[${forgeVersionString.get()}]" + versionRange "[${forgeVersionString.get()},)" ordering "NONE" side "BOTH" },