diff --git a/src/main/java/dev/enjarai/trickster/mixin/ItemFrameEntityMixin.java b/src/main/java/dev/enjarai/trickster/mixin/ItemFrameEntityMixin.java index 865db710..883b841f 100644 --- a/src/main/java/dev/enjarai/trickster/mixin/ItemFrameEntityMixin.java +++ b/src/main/java/dev/enjarai/trickster/mixin/ItemFrameEntityMixin.java @@ -19,10 +19,11 @@ public ItemFrameEntityMixin(EntityType entit @Shadow public abstract ItemStack getHeldItemStack(); - @Shadow //TODO: this may fail - protected abstract void removeFromFrame(ItemStack stack); + @Shadow + public abstract void setHeldItemStack(ItemStack stack); - @Shadow public abstract void setHeldItemStack(ItemStack stack); + @Shadow + protected abstract void removeFromFrame(ItemStack stack); @Override public int trickster$slot_holder$size() { diff --git a/src/main/resources/assets/trickster/lang/en_us.yml b/src/main/resources/assets/trickster/lang/en_us.yml index 92944f5f..d074bf11 100644 --- a/src/main/resources/assets/trickster/lang/en_us.yml +++ b/src/main/resources/assets/trickster/lang/en_us.yml @@ -172,7 +172,7 @@ trickster: other_hand_slot: Catch Delusion get_item_in_slot: Fence's Ingress get_inventory_slot: Intrusive Ingress - drop_stack_from_slot: Benevolent Ploy + drop_stack_from_slot: Ploy of Offering type_fragment: Argumentative Distortion delay_execution: Ploy of Suspension diff --git a/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/inventory.md b/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/inventory.md index aef0d99c..a582519d 100644 --- a/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/inventory.md +++ b/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/delusions_ingresses/inventory.md @@ -48,11 +48,11 @@ Returns a slot reference of the caster's other hand. <|glyph@trickster:templates|trick-id=trickster:get_inventory_slot,title=Intrusive Ingress|> -number, [vector] -> slot +number, [vector | entity] -> slot --- -Returns the item slot at the given index in either the inventory of the caster, or the block at the given position. +Constructs a slot from an index and an inventory source, using the caster by default. ;;;;; diff --git a/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/ploys/inventory.md b/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/ploys/inventory.md index 01bf60a7..d8549d10 100644 --- a/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/ploys/inventory.md +++ b/src/main/resources/assets/trickster/lavender/entries/tome_of_tomfoolery/ploys/inventory.md @@ -10,7 +10,7 @@ Listed here are ploys that interact with inventory slots or other inventory feat ;;;;; -<|glyph@trickster:templates|trick-id=trickster:drop_stack_from_slot,title=Benevolent Ploy|> +<|glyph@trickster:templates|trick-id=trickster:drop_stack_from_slot,title=Ploy of Offering|> slot, vector, [number] -> entity