armor trims aren't real

Author: cassiancc

CHANGELOG-LATEST.md

@@ -16,6 +16,7 @@
 ### Changed
 - Removed leash backport in favor of Vanilla Backport's implementation.
 - Temporarily removed the ability to leash fences.
+- Armor trims no longer mention that they are Smithing Templates.
 
 ### Fixed
 - Swap Arrows can no longer force Withers into boats.
@@ -26,3 +27,4 @@
 - Tablet recipes now work on 1.20.
 - A spectator with Bracewalk no longer can break blocks. (Additional Enchantments)
 - Aloe Vera blocks can now be harvested with modded shears. (Atmospheric)
+- Beacon recipes now match the current version of RF.

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 loom.platform = forge
 
 # Mod properties
-mod_version = 1.11-pre6
+mod_version = 1.11-pre7
 maven_group = cc.cassian.raspberry
 archives_name = raspberry_core
 

src/main/java/cc/cassian/raspberry/compat/emi/EmiCompat.java

@@ -35,7 +35,6 @@ public void register(EmiRegistry emiRegistry) {
             emiRegistry.addWorkstation(EmiCompat.ANVIL, EmiStack.of(Items.CHIPPED_ANVIL));
             emiRegistry.addWorkstation(EmiCompat.ANVIL, EmiStack.of(Items.DAMAGED_ANVIL));
             emiRegistry.addCategory(ANVIL);
-            EmiEtchingRecipe.addRunes(emiRegistry);
         }
         if (ModCompat.hasBetterBeacons() && ModConfig.get().raspberry_beacon_interaction) {
             emiRegistry.addWorkstation(EmiCompat.BEACON_BASE, EmiStack.of(Items.BEACON));

src/main/java/cc/cassian/raspberry/compat/emi/EmiEtchingRecipe.java

@@ -0,0 +1,66 @@
+package cc.cassian.raspberry.mixin.minecraft;
+
+import cc.cassian.raspberry.config.ModConfig;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import net.minecraft.network.chat.CommonComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.contents.TranslatableContents;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.SmithingTemplateItem;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.List;
+
+@Mixin(SmithingTemplateItem.class)
+public abstract class SmithingTemplateMixin extends Item {
+	@Shadow
+	@Final
+	private Component upgradeDescription;
+
+	@Shadow
+	@Final
+	private static Component APPLIES_TO_TITLE;
+
+	@Shadow
+	@Final
+	private static Component INGREDIENTS_TITLE;
+
+	@Shadow
+	@Final
+	private Component appliesTo;
+
+	@Shadow
+	@Final
+	private Component ingredients;
+
+	public SmithingTemplateMixin(Properties properties) {
+		super(properties);
+	}
+
+	@WrapMethod(method = "getDescriptionId")
+	private String betterName(Operation<String> original) {
+		if (ModConfig.get().noTemplates) {
+			return ((TranslatableContents) this.upgradeDescription.getContents()).getKey();
+		}else {
+			return original.call();
+		}
+	}
+
+	@WrapMethod(method = "appendHoverText")
+	private <E> void removeWarning(ItemStack stack, Level level, List<Component> tooltipComponents, TooltipFlag isAdvanced, Operation<Void> original) {
+		if (ModConfig.get().noTemplates) {
+			super.appendHoverText(stack, level, tooltipComponents, isAdvanced);
+			tooltipComponents.add(APPLIES_TO_TITLE);
+			tooltipComponents.add(CommonComponents.space().append(this.appliesTo));
+			tooltipComponents.add(INGREDIENTS_TITLE);
+			tooltipComponents.add(CommonComponents.space().append(this.ingredients));
+		}
+
+	}
+}

src/main/java/cc/cassian/raspberry/mixin/minecraft/SmithingTemplateMixin.java

@@ -90,6 +90,7 @@
     "minecraft.RaiderMixin",
     "minecraft.ScreenMixin",
     "minecraft.SilenceServerMixin",
+    "minecraft.SmithingTemplateMixin",
     "minecraft.SpreadingSnowyDirtBlockMixin",
     "minecraft.ThrowableProjectileMixin",
     "minecraft.WitherRoseBlockMixin",