Fixes and recipe tweaks :3

enjarai · Nov 15, 2024 · fd40185 · fd40185
1 parent 3ae0f30
commit fd40185
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/main/java/dev/enjarai/trickster/item/component/FragmentComponent.java b/src/main/java/dev/enjarai/trickster/item/component/FragmentComponent.java
@@ -52,11 +52,7 @@ public FragmentComponent withClosed(Optional<String> name) {
     }
 
     public static Optional<SpellPart> getSpellPart(ItemStack stack) {
-        return getReferencedStack(stack)
-                .filter(stack2 -> stack2.contains(ModComponents.FRAGMENT))
-                .map(stack2 -> stack2.get(ModComponents.FRAGMENT))
-                .filter(component -> !component.closed())
-                .map(FragmentComponent::value)
+        return getFragment(stack)
                 .flatMap(value -> {
                     if (value instanceof SpellPart spell)
                         return Optional.of(spell);
@@ -65,6 +61,14 @@ public static Optional<SpellPart> getSpellPart(ItemStack stack) {
                 });
     }
 
+    public static Optional<Fragment> getFragment(ItemStack stack) {
+        return getReferencedStack(stack)
+                .filter(stack2 -> stack2.contains(ModComponents.FRAGMENT))
+                .map(stack2 -> stack2.get(ModComponents.FRAGMENT))
+                .filter(component -> !component.closed())
+                .map(FragmentComponent::value);
+    }
+
     public static boolean setValue(ItemStack stack, Fragment value, Optional<String> name, boolean closed) {
         return modifyReferencedStack(stack, stack2 -> {
             if (stack2.contains(ModComponents.FRAGMENT) && stack2.get(ModComponents.FRAGMENT).immutable()) {

diff --git a/src/main/java/dev/enjarai/trickster/spell/trick/basic/ReadSpellTrick.java b/src/main/java/dev/enjarai/trickster/spell/trick/basic/ReadSpellTrick.java
@@ -5,6 +5,7 @@
 import dev.enjarai.trickster.spell.Fragment;
 import dev.enjarai.trickster.spell.Pattern;
 import dev.enjarai.trickster.spell.SpellContext;
+import dev.enjarai.trickster.spell.execution.source.PlayerSpellSource;
 import dev.enjarai.trickster.spell.fragment.VoidFragment;
 import dev.enjarai.trickster.spell.trick.Trick;
 import dev.enjarai.trickster.spell.blunder.BlunderException;
@@ -18,9 +19,8 @@ public ReadSpellTrick() {
 
     @Override
     public Fragment activate(SpellContext ctx, List<Fragment> fragments) throws BlunderException {
-        return ctx.source().getOtherHandStack(stack -> stack.contains(ModComponents.FRAGMENT))
-                .map(stack -> stack.get(ModComponents.FRAGMENT))
-                .map(FragmentComponent::value)
+        return ctx.source().getOtherHandStack(PlayerSpellSource::isSpellStack)
+                .flatMap(FragmentComponent::getFragment)
                 .orElse(VoidFragment.INSTANCE);
     }
 }
diff --git a/src/main/resources/data/trickster/recipe/spell_construct.json b/src/main/resources/data/trickster/recipe/spell_construct.json
@@ -9,7 +9,7 @@
             "item": "minecraft:blaze_powder"
         },
         "S": {
-            "item": "trickster:spell_core"
+            "item": "minecraft:gold_ingot"
         },
         "T": {
             "item": "minecraft:tuff"