This fixes it for good now

Sinytra · Sep 20, 2023 · cccc033 · cccc033
1 parent 0767707
commit cccc033
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 3 deletions.
diff --git a/...attachment-v1/src/client/resources/fabric-rendering-data-attachment-v1.client.mixins.json b/...attachment-v1/src/client/resources/fabric-rendering-data-attachment-v1.client.mixins.json
@@ -7,5 +7,6 @@
   ],
   "injectors": {
     "defaultRequire": 1
-  }
+  },
+  "minVersion": "0.8.5"
 }
diff --git a/...-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/BlockDustParticleMixin.java b/...-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/BlockDustParticleMixin.java
@@ -19,7 +19,9 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Group;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.Slice;
 
@@ -38,6 +40,9 @@ abstract class BlockDustParticleMixin extends SpriteBillboardParticle {
 	@Final
 	private BlockPos blockPos;
 
+	@Unique
+	private boolean fabric_disableTintCheck;	
+
 	private BlockDustParticleMixin() {
 		super(null, 0, 0, 0);
 	}
@@ -48,10 +53,15 @@ 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/client/color/block/BlockColors;getColor(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockRenderView;Lnet/minecraft/util/math/BlockPos;I)I")
+					to = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z")
 			),
 			allow = 1
 	)
+	@Group(
+			name = "unintable_particles",
+			min = 1,
+			max = 1
+	)
 	private BlockState removeUntintableParticles(BlockState state) {
 		if (!ParticleRenderEvents.ALLOW_BLOCK_DUST_TINT.invoker().allowBlockDustTint(state, world, blockPos)) {
 			// As of 1.20.1, vanilla hardcodes grass block particles to not get tinted.
@@ -60,4 +70,44 @@ private BlockState removeUntintableParticles(BlockState state) {
 
 		return state;
 	}
+
+	@ModifyVariable(
+			method = "<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)V",
+			at = @At("LOAD"),
+			argsOnly = true,
+			slice = @Slice(
+					from = @At(value = "FIELD", target = "Lnet/minecraft/client/particle/BlockDustParticle;blue:F", ordinal = 0),
+					to = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/extensions/common/IClientBlockExtensions;of(Lnet/minecraft/block/BlockState;)Lnet/minecraftforge/client/extensions/common/IClientBlockExtensions;")
+			),
+			allow = 1
+	)
+	@Group(
+			name = "unintable_particles",
+			min = 1,
+			max = 1
+	)
+	private BlockState removeUntintableParticlesNewForge(BlockState state) {
+		if (!ParticleRenderEvents.ALLOW_BLOCK_DUST_TINT.invoker().allowBlockDustTint(state, world, blockPos)) {
+			// As of 1.20.1, vanilla hardcodes grass block particles to not get tinted.
+			fabric_disableTintCheck = true;
+			return Blocks.GRASS_BLOCK.getDefaultState();
+		}
+		fabric_disableTintCheck = false;
+		return state;
+	}
+
+	@ModifyVariable(
+			method = "<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)V",
+			at = @At("LOAD"),
+			argsOnly = true,
+			slice = @Slice(
+					from = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/extensions/common/IClientBlockExtensions;of(Lnet/minecraft/block/BlockState;)Lnet/minecraftforge/client/extensions/common/IClientBlockExtensions;"),
+					to = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/extensions/common/IClientBlockExtensions;areBreakingParticlesTinted(Lnet/minecraft/block/BlockState;Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/util/math/BlockPos;)Z")
+			),
+			allow = 1,
+			require = 0
+	)
+	private BlockState removeUntintableParticlesNewForgeSecondary(BlockState state) {
+		return fabric_disableTintCheck ? Blocks.GRASS_BLOCK.getDefaultState() : state;
+	}
 }
diff --git 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.12
+forgified_version=1.9.13
 forge_fabric_loader_version=2.2.1+0.14.21+1.20.1