diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-09-17 21:38:27 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-09-17 21:41:20 +0800 |
| commit | 93c67936af006bbaad287a9e902a8b67a0d7fc7d (patch) | |
| tree | 8b8ed668795871e92b58317a81403ad1d3b5cad3 /default-plugin/src | |
| parent | 3febdc4e1d6927f19d0de6fc8430765336d34d7e (diff) | |
| parent | 9856139ad309ab833defb92ccfedaf48b9bde64e (diff) | |
| download | RoughlyEnoughItems-93c67936af006bbaad287a9e902a8b67a0d7fc7d.tar.gz RoughlyEnoughItems-93c67936af006bbaad287a9e902a8b67a0d7fc7d.tar.bz2 RoughlyEnoughItems-93c67936af006bbaad287a9e902a8b67a0d7fc7d.zip | |
Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
Diffstat (limited to 'default-plugin/src')
| -rw-r--r-- | default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java index 992f31d7e..8808a472d 100644 --- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java +++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java @@ -163,7 +163,7 @@ public class DefaultSmithingDisplay extends BasicDisplay { .orElse(null); if (trimMaterial == null) return EntryIngredient.empty(); ArmorTrim armorTrim = new ArmorTrim(trimMaterial, trimPattern); - Optional<ArmorTrim> trim = ArmorTrim.getTrim(registryAccess, baseItem); + Optional<ArmorTrim> trim = ArmorTrim.getTrim(registryAccess, baseItem, true); if (trim.isPresent() && trim.get().hasPatternAndMaterial(trimPattern, trimMaterial)) return EntryIngredient.empty(); ItemStack newItem = baseItem.copy(); newItem.setCount(1); |