Skip to content

Commit d51ca5d

Browse files
committed
smithing templates aren't real
1 parent 2acd4d9 commit d51ca5d

6 files changed

Lines changed: 70 additions & 71 deletions

File tree

CHANGELOG-LATEST.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
### Changed
1717
- Removed leash backport in favor of Vanilla Backport's implementation.
1818
- Temporarily removed the ability to leash fences.
19+
- Armor trims no longer mention that they are Smithing Templates.
1920

2021
### Fixed
2122
- Swap Arrows can no longer force Withers into boats.
@@ -26,3 +27,4 @@
2627
- Tablet recipes now work on 1.20.
2728
- A spectator with Bracewalk no longer can break blocks. (Additional Enchantments)
2829
- Aloe Vera blocks can now be harvested with modded shears. (Atmospheric)
30+
- Beacon recipes now match the current version of RF.

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
33
loom.platform = forge
44

55
# Mod properties
6-
mod_version = 1.11-pre6
6+
mod_version = 1.11-pre7
77
maven_group = cc.cassian.raspberry
88
archives_name = raspberry_core
99

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public void register(EmiRegistry emiRegistry) {
3535
emiRegistry.addWorkstation(EmiCompat.ANVIL, EmiStack.of(Items.CHIPPED_ANVIL));
3636
emiRegistry.addWorkstation(EmiCompat.ANVIL, EmiStack.of(Items.DAMAGED_ANVIL));
3737
emiRegistry.addCategory(ANVIL);
38-
EmiEtchingRecipe.addRunes(emiRegistry);
3938
}
4039
if (ModCompat.hasBetterBeacons() && ModConfig.get().raspberry_beacon_interaction) {
4140
emiRegistry.addWorkstation(EmiCompat.BEACON_BASE, EmiStack.of(Items.BEACON));

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

Lines changed: 0 additions & 69 deletions
This file was deleted.
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package cc.cassian.raspberry.mixin.minecraft;
2+
3+
import cc.cassian.raspberry.config.ModConfig;
4+
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
5+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
6+
import net.minecraft.network.chat.CommonComponents;
7+
import net.minecraft.network.chat.Component;
8+
import net.minecraft.network.chat.contents.TranslatableContents;
9+
import net.minecraft.world.item.Item;
10+
import net.minecraft.world.item.ItemStack;
11+
import net.minecraft.world.item.SmithingTemplateItem;
12+
import net.minecraft.world.item.TooltipFlag;
13+
import net.minecraft.world.level.Level;
14+
import org.spongepowered.asm.mixin.Final;
15+
import org.spongepowered.asm.mixin.Mixin;
16+
import org.spongepowered.asm.mixin.Shadow;
17+
18+
import java.util.List;
19+
20+
@Mixin(SmithingTemplateItem.class)
21+
public abstract class SmithingTemplateMixin extends Item {
22+
@Shadow
23+
@Final
24+
private Component upgradeDescription;
25+
26+
@Shadow
27+
@Final
28+
private static Component APPLIES_TO_TITLE;
29+
30+
@Shadow
31+
@Final
32+
private static Component INGREDIENTS_TITLE;
33+
34+
@Shadow
35+
@Final
36+
private Component appliesTo;
37+
38+
@Shadow
39+
@Final
40+
private Component ingredients;
41+
42+
public SmithingTemplateMixin(Properties properties) {
43+
super(properties);
44+
}
45+
46+
@WrapMethod(method = "getDescriptionId")
47+
private String betterName(Operation<String> original) {
48+
if (ModConfig.get().noTemplates) {
49+
return ((TranslatableContents) this.upgradeDescription.getContents()).getKey();
50+
}else {
51+
return original.call();
52+
}
53+
}
54+
55+
@WrapMethod(method = "appendHoverText")
56+
private <E> void removeWarning(ItemStack stack, Level level, List<Component> tooltipComponents, TooltipFlag isAdvanced, Operation<Void> original) {
57+
if (ModConfig.get().noTemplates) {
58+
super.appendHoverText(stack, level, tooltipComponents, isAdvanced);
59+
tooltipComponents.add(APPLIES_TO_TITLE);
60+
tooltipComponents.add(CommonComponents.space().append(this.appliesTo));
61+
tooltipComponents.add(INGREDIENTS_TITLE);
62+
tooltipComponents.add(CommonComponents.space().append(this.ingredients));
63+
}
64+
65+
}
66+
}

src/main/resources/raspberry.mixins.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
"minecraft.RaiderMixin",
9191
"minecraft.ScreenMixin",
9292
"minecraft.SilenceServerMixin",
93+
"minecraft.SmithingTemplateMixin",
9394
"minecraft.SpreadingSnowyDirtBlockMixin",
9495
"minecraft.ThrowableProjectileMixin",
9596
"minecraft.WitherRoseBlockMixin",

0 commit comments

Comments
 (0)