Re-enable fast grass

Author: lowercasebtw

build.gradle.kts

@@ -140,6 +140,7 @@ dependencies {
 
         // Fabric API - Needs to be specified, otherwise an older version might be defaulted and cause issues.
         modImplementation(fabricApi.module("fabric-resource-loader-v0", deps.fabricApiVersion))
+        modImplementation(fabricApi.module("fabric-model-loading-api-v1", deps.fabricApiVersion))
         modImplementation(fabricApi.module("fabric-networking-api-v1", deps.fabricApiVersion))
         modImplementation(fabricApi.module("fabric-command-api-v2", deps.fabricApiVersion))
 

src/main/java/org/visuals/legacy/animatium/AnimatiumConstants.java

@@ -26,7 +26,10 @@
 package org.visuals.legacy.animatium;
 
 import lombok.experimental.UtilityClass;
+import net.fabricmc.fabric.api.client.model.loading.v1.ExtraModelKey;
+import net.minecraft.client.renderer.block.model.BlockStateModel;
 import net.minecraft.resources.Identifier;
+import org.jetbrains.annotations.NotNull;
 import org.visuals.legacy.animatium.packet.HelloPayloadPacket;
 
 @UtilityClass
@@ -37,7 +40,7 @@ public class AnimatiumConstants {
 	public final boolean IS_DEVELOPMENT = Boolean.parseBoolean("@DEVELOPMENT@");
 
 	public final Identifier FAST_GRASS_MODEL_LOCATION = Animatium.location("block/fast_grass_block");
-	// TODO/FIX: public final ExtraModelKey<BlockStateModel> FAST_GRASS_MODEL_KEY = ExtraModelKey.create(FAST_GRASS_MODEL_LOCATION::toString);
+	public final ExtraModelKey<@NotNull BlockStateModel> FAST_GRASS_MODEL_KEY = ExtraModelKey.create(FAST_GRASS_MODEL_LOCATION::toString);
 
 	public HelloPayloadPacket getHelloPayload() {
 		return new HelloPayloadPacket(VERSION, IS_DEVELOPMENT ? DEVELOPMENT_VERSION : null);

src/main/java/org/visuals/legacy/animatium/AnimatiumFabricClient.java

@@ -28,6 +28,8 @@
 import dev.kikugie.fletching_table.annotation.fabric.Entrypoint;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
+import net.fabricmc.fabric.api.client.model.loading.v1.SimpleUnbakedExtraModel;
 import net.fabricmc.fabric.api.client.networking.v1.*;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.resource.v1.ResourceLoader;
@@ -48,7 +50,7 @@ public void onInitializeClient() {
 		ResourceLoader.registerBuiltinPack(Animatium.location("classic_water"), modContainer, PackActivationType.NORMAL);
 		ClientCommandRegistrationCallback.EVENT.register((dispatcher, context) -> dispatcher.register(AnimatiumCommand.create()));
 		registerPayloads();
-		// TODO: ModelLoadingPlugin.register(context -> context.addModel(AnimatiumConstants.FAST_GRASS_MODEL_KEY, SimpleUnbakedExtraModel.blockStateModel(AnimatiumConstants.FAST_GRASS_MODEL_LOCATION)));
+		ModelLoadingPlugin.register(context -> context.addModel(AnimatiumConstants.FAST_GRASS_MODEL_KEY, SimpleUnbakedExtraModel.blockStateModel(AnimatiumConstants.FAST_GRASS_MODEL_LOCATION)));
 	}
 
 	private void registerPayloads() {

src/main/java/org/visuals/legacy/animatium/mixins/v1/rendering/blocks/MixinBlockRenderDispatcher_FastGrassSide.java

@@ -25,22 +25,35 @@
 
 package org.visuals.legacy.animatium.mixins.v1.rendering.blocks;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.client.renderer.block.BlockModelShaper;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
+import net.minecraft.client.renderer.block.model.BlockStateModel;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.GrassBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.visuals.legacy.animatium.Animatium;
+import org.visuals.legacy.animatium.AnimatiumConstants;
+import org.visuals.legacy.animatium.config.AnimatiumConfig;
+import org.visuals.legacy.animatium.util.Utils;
 
 @Mixin(BlockRenderDispatcher.class)
 public abstract class MixinBlockRenderDispatcher_FastGrassSide {
-	/*@Shadow
+	@Shadow
 	@Final
-	private BlockModelShaper blockModelShaper;*/
+	private BlockModelShaper blockModelShaper;
 
-	// TODO/FIX: 1.21.11
-    /*@WrapOperation(method = "getBlockModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/BlockModelShaper;getBlockModel(Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/block/model/BlockStateModel;"))
-    private BlockStateModel animatium$fastGrass(BlockModelShaper instance, BlockState state, Operation<BlockStateModel> original) {
-        if (Animatium.isEnabled() && AnimatiumConfig.instance().other.fastGrass && (state.is(Blocks.GRASS_BLOCK) && !state.getValue(GrassBlock.SNOWY)) && Utils.isFastGraphics()) {
-            return this.blockModelShaper.getModelManager().getModel(AnimatiumConstants.FAST_GRASS_MODEL_KEY);
-        } else {
-            return original.call(instance, state);
-        }
-    }*/
+	@WrapOperation(method = "getBlockModel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/BlockModelShaper;getBlockModel(Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/block/model/BlockStateModel;"))
+	private BlockStateModel animatium$fastGrass(BlockModelShaper instance, BlockState state, Operation<BlockStateModel> original) {
+		if (Animatium.isEnabled() && AnimatiumConfig.instance().other.fastGrass && (state.is(Blocks.GRASS_BLOCK) && !state.getValue(GrassBlock.SNOWY)) && Utils.isFastGraphics()) {
+			return this.blockModelShaper.getModelManager().getModel(AnimatiumConstants.FAST_GRASS_MODEL_KEY);
+		} else {
+			return original.call(instance, state);
+		}
+	}
 }