Merge pull request #210 from CringeStar/1.21.8

1.21.8 Port

Author: StellarWind22

README.md

@@ -8,7 +8,7 @@ library is distributed via [jitpack.io](https://jitpack.io/#CrimsonDawn45/Fabric
 
 #### put this in gradle.properties
 ```properties
-fabric_shield_lib_version=1.8.1-1.21.6
+fabric_shield_lib_version=1.8.3-1.21.8
 ```
 
 #### build.gradle under repositories just above dependencies
@@ -31,7 +31,7 @@ dependencies {
 
 #### **build.gradle** under dependencies
 ```gradle
-modImplementation "com.github.CrimsonDawn45:Fabric-Shield-Lib:v${project.fabric_shield_lib_version}"
+modImplementation "com.github.StellarWind22:Fabric-Shield-Lib:v${project.fabric_shield_lib_version}"
 ```
 
 - - - -

build.gradle

@@ -2,7 +2,7 @@ import groovy.json.JsonSlurper
 import groovy.json.JsonOutput
 
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.6
-yarn_mappings=1.21.6+build.1
+minecraft_version=1.21.8
+yarn_mappings=1.21.8+build.1
 loader_version=0.16.14
 
 # Mod Properties
-mod_version=1.8.1-1.21.6
+mod_version=1.8.3-1.21.8
 maven_group=com.github.crimsondawn45
 archives_base_name=FabricShieldLib
 
 # Dependencies
-fabric_version=0.127.0+1.21.6
+fabric_version=0.130.0+1.21.8
 mod_menu_version=15.0.0-beta.3
-midnightlib_version=1.7.4+1.21.6-fabric
+midnightlib_version=1.7.5+1.21.6-fabric

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/github/crimsondawn45/fabricshieldlib/initializers/FabricShieldLib.java

@@ -1,19 +1,10 @@
 package com.github.crimsondawn45.fabricshieldlib.initializers;
 
 import com.github.crimsondawn45.fabricshieldlib.lib.config.FabricShieldLibConfig;
-import com.github.crimsondawn45.fabricshieldlib.lib.object.FabricShieldDecoratorRecipe;
 import com.github.crimsondawn45.fabricshieldlib.tests.FabricShieldLibTests;
-
 import eu.midnightdust.lib.config.MidnightConfig;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.recipe.RecipeType;
-import net.minecraft.recipe.ShieldDecorationRecipe;
-import net.minecraft.recipe.SpecialCraftingRecipe;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.util.Identifier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,27 +22,6 @@ public class FabricShieldLib implements ModInitializer {
 	 */
 	public static final Logger logger = LoggerFactory.getLogger(MOD_ID);
 
-	/**
-	 * Recipe type and serializer for banner decoration recipe.
-	 */
-
-	public static final SpecialCraftingRecipe.SpecialRecipeSerializer<ShieldDecorationRecipe> FABRIC_SHIELD_DECORATION_SERIALIZER;
-	public static final RecipeType<FabricShieldDecoratorRecipe> FABRIC_SHIELD_DECORATION;
-
-	static {
-		// Registering Banner Recipe (Lib only)
-		FABRIC_SHIELD_DECORATION = Registry.register(Registries.RECIPE_TYPE,
-			Identifier.of(MOD_ID, "fabric_shield_decoration"), new RecipeType<FabricShieldDecoratorRecipe>() {
-				@Override
-				public String toString() {
-					return "fabric_shield_decoration";
-				}
-			});
-		FABRIC_SHIELD_DECORATION_SERIALIZER = Registry.register(Registries.RECIPE_SERIALIZER,
-			Identifier.of(MOD_ID, "fabric_shield_decoration"),
-			new SpecialCraftingRecipe.SpecialRecipeSerializer<>(FabricShieldDecoratorRecipe::new));
-	}
-
 	@Override
 	public void onInitialize() {
 		// Register Config

src/main/java/com/github/crimsondawn45/fabricshieldlib/initializers/FabricShieldLibClient.java

@@ -4,7 +4,6 @@
 import com.github.crimsondawn45.fabricshieldlib.lib.object.FabricShieldModelRenderer;
 import com.github.crimsondawn45.fabricshieldlib.lib.object.FabricShieldTags;
 import com.github.crimsondawn45.fabricshieldlib.tests.FabricShieldLibClientTests;
-
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.fabricmc.loader.api.FabricLoader;

src/main/java/com/github/crimsondawn45/fabricshieldlib/lib/object/FabricShieldDecoratorRecipe.java

@@ -2,7 +2,6 @@
 
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.model.ModelPart;
@@ -47,11 +46,11 @@ public ComponentMap getData(ItemStack itemStack) {
 	}
 
 	public void render(
-		@Nullable ComponentMap componentMap, ItemDisplayContext displayContext, MatrixStack matrixStack,
-		VertexConsumerProvider vertexConsumerProvider, int i, int j, boolean bl
+			@Nullable ComponentMap componentMap, ItemDisplayContext displayContext, MatrixStack matrixStack,
+			VertexConsumerProvider vertexConsumerProvider, int i, int j, boolean bl
 	) {
 		BannerPatternsComponent bannerPatternsComponent = componentMap == null ? BannerPatternsComponent.DEFAULT:
-			(BannerPatternsComponent) componentMap.getOrDefault(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
+				(BannerPatternsComponent) componentMap.getOrDefault(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
 
 		DyeColor dyeColor = componentMap == null ? null : (DyeColor) componentMap.get(DataComponentTypes.BASE_COLOR);
 
@@ -63,16 +62,16 @@ public void render(
 		try {
 			@SuppressWarnings("deprecation")
 			SpriteIdentifier spriteIdentifier = bl2
-				? new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, this.baseModel)
-				: new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, this.baseModelNoPat);
+					? new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, this.baseModel)
+					: new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, this.baseModelNoPat);
 			VertexConsumer vertexConsumer = spriteIdentifier.getSprite()
-				.getTextureSpecificVertexConsumer(ItemRenderer.getItemGlintConsumer(vertexConsumerProvider,
-					model.getLayer(spriteIdentifier.getAtlasId()), displayContext == ItemDisplayContext.GUI, bl));
+					.getTextureSpecificVertexConsumer(ItemRenderer.getItemGlintConsumer(vertexConsumerProvider,
+							model.getLayer(spriteIdentifier.getAtlasId()), displayContext == ItemDisplayContext.GUI, bl));
 			model.getHandle().render(matrixStack, vertexConsumer, i, j);
 			if (bl2) {
 				BannerBlockEntityRenderer.renderCanvas(matrixStack, vertexConsumerProvider, i, j, model.getPlate(),
-					spriteIdentifier, false, (DyeColor) Objects.requireNonNullElse(dyeColor, DyeColor.WHITE),
-					bannerPatternsComponent, bl, false);
+						spriteIdentifier, false, (DyeColor) Objects.requireNonNullElse(dyeColor, DyeColor.WHITE),
+						bannerPatternsComponent, bl, false);
 			} else {
 				model.getPlate().render(matrixStack, vertexConsumer, i, j);
 			}
@@ -90,11 +89,11 @@ public void collectVertices(Set<Vector3f> vertices) {
 
 	public record Unbaked(Identifier baseModel, Identifier baseModelNoPat) implements SpecialModelRenderer.Unbaked {
 		public static final MapCodec<FabricShieldModelRenderer.Unbaked> CODEC = RecordCodecBuilder.mapCodec(
-			instance -> instance.group(
-					Identifier.CODEC.fieldOf("texture_banner").forGetter(FabricShieldModelRenderer.Unbaked::baseModel),
-					Identifier.CODEC.fieldOf("texture_default").forGetter(FabricShieldModelRenderer.Unbaked::baseModelNoPat)
-				)
-				.apply(instance, FabricShieldModelRenderer.Unbaked::new)
+				instance -> instance.group(
+								Identifier.CODEC.fieldOf("texture_banner").forGetter(FabricShieldModelRenderer.Unbaked::baseModel),
+								Identifier.CODEC.fieldOf("texture_default").forGetter(FabricShieldModelRenderer.Unbaked::baseModelNoPat)
+						)
+						.apply(instance, FabricShieldModelRenderer.Unbaked::new)
 		);
 
 		@Override
@@ -107,9 +106,9 @@ public SpecialModelRenderer<?> bake(LoadedEntityModels entityModels) {
 			ModelPart modelPart = entityModels.getModelPart(EntityModelLayers.SHIELD);
 			ShieldEntityModel model = new ShieldEntityModel(modelPart);
 			return new FabricShieldModelRenderer(
-				this.baseModel,
-				this.baseModelNoPat,
-				model
+					this.baseModel,
+					this.baseModelNoPat,
+					model
 			);
 		}
 	}

src/main/java/com/github/crimsondawn45/fabricshieldlib/lib/object/FabricShieldModelRenderer.java

@@ -1,7 +1,7 @@
 package com.github.crimsondawn45.fabricshieldlib.lib.object;
 
 import com.github.crimsondawn45.fabricshieldlib.initializers.FabricShieldLib;
-
+import com.github.crimsondawn45.fabricshieldlib.mixin.RecipeMixin;
 import net.minecraft.item.Item;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.TagKey;
@@ -16,12 +16,10 @@ public class FabricShieldTags {
 	 * <p>
 	 * Add your modded shield to this tag if it supports banners.
 	 * <p>
-	 * {@link FabricShieldDecoratorRecipe} covers all shields with this tag,
-	 * with the exception of the vanilla shield (handled by
-	 * {@link net.minecraft.recipe.ShieldDecorationRecipe}
+	 * {@link RecipeMixin} covers includes all shields in this tag into {@link net.minecraft.recipe.ShieldDecorationRecipe}
 	 */
 	public static final TagKey<Item> SUPPORTS_BANNER =
-		TagKey.of(RegistryKeys.ITEM, Identifier.of(FabricShieldLib.MOD_ID, "supports_banner"));
+			TagKey.of(RegistryKeys.ITEM, Identifier.of(FabricShieldLib.MOD_ID, "supports_banner"));
 
 	/**
 	 * Explicitly disable advanced tooltip for a given set of shields.
@@ -35,5 +33,5 @@ public class FabricShieldTags {
 	 * Replaces `FabricShield::displayTooltip`
 	 */
 	public static final TagKey<Item> NO_TOOLTIP =
-		TagKey.of(RegistryKeys.ITEM, Identifier.of(FabricShieldLib.MOD_ID, "no_tooltip"));
+			TagKey.of(RegistryKeys.ITEM, Identifier.of(FabricShieldLib.MOD_ID, "no_tooltip"));
 }

src/main/java/com/github/crimsondawn45/fabricshieldlib/lib/object/FabricShieldTags.java

@@ -0,0 +1,34 @@
+package com.github.crimsondawn45.fabricshieldlib.mixin;
+
+import com.github.crimsondawn45.fabricshieldlib.lib.object.FabricShieldUtils;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.recipe.ShieldDecorationRecipe;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ShieldDecorationRecipe.class)
+public class RecipeMixin {
+
+    @WrapOperation(
+            method = "matches(Lnet/minecraft/recipe/input/CraftingRecipeInput;Lnet/minecraft/world/World;)Z",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z")
+    )
+    private boolean wrapMatches(ItemStack itemstack, Item instance, Operation<Boolean> original) {
+        return original.call(itemstack, instance) || FabricShieldUtils.supportsBanner(itemstack);
+    }
+
+
+    @WrapOperation(
+            method = "craft(Lnet/minecraft/recipe/input/CraftingRecipeInput;Lnet/minecraft/registry/RegistryWrapper$WrapperLookup;)Lnet/minecraft/item/ItemStack;",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isOf(Lnet/minecraft/item/Item;)Z")
+    )
+    private boolean wrapCraft(ItemStack itemstack, Item instance, Operation<Boolean> original) {
+        return original.call(itemstack, instance) || FabricShieldUtils.supportsBanner(itemstack);
+    }
+
+
+
+}