From c4a8d12e1815bf1dc4c324da95832bb1128b5896 Mon Sep 17 00:00:00 2001 From: miyucomics Date: Mon, 14 Jul 2025 17:18:07 -0400 Subject: [PATCH] Made public some methods for casting environment item stacks --- .../hexcasting/api/casting/eval/CastingEnvironment.java | 6 +++--- .../hexcasting/api/casting/eval/env/CircleCastEnv.java | 4 ++-- .../hexcasting/api/casting/eval/env/PlayerBasedCastEnv.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java index ebd47a1e65..fca2f5c71b 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/CastingEnvironment.java @@ -376,7 +376,7 @@ public InteractionHand getOtherHand() { /** * Get all the item stacks this env can use. */ - protected abstract List getUsableStacks(StackDiscoveryMode mode); + public abstract List getUsableStacks(StackDiscoveryMode mode); protected List getUsableStacksForPlayer(StackDiscoveryMode mode, @Nullable InteractionHand castingHand , ServerPlayer caster) { @@ -444,7 +444,7 @@ protected List getUsableStacksForPlayer(StackDiscoveryMode mode, @Nul /** * Get the primary/secondary item stacks this env can use (i.e. main hand and offhand for the player). */ - protected abstract List getPrimaryStacks(); + public abstract List getPrimaryStacks(); protected List getPrimaryStacksForPlayer(InteractionHand castingHand, ServerPlayer caster) { var primaryItem = caster.getItemInHand(castingHand); @@ -597,7 +597,7 @@ public boolean replaceItemForPlayer(Predicate stackOk, ItemStack repl /** * The order/mode stacks should be discovered in */ - protected enum StackDiscoveryMode { + public enum StackDiscoveryMode { /** * When finding items to pick (hotbar) */ diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/CircleCastEnv.java b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/CircleCastEnv.java index 1fb6698bf7..87dc0e75c6 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/CircleCastEnv.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/CircleCastEnv.java @@ -169,7 +169,7 @@ public InteractionHand getCastingHand() { @Override // TODO: Could do something like get items in inventories adjacent to the circle? - protected List getUsableStacks(StackDiscoveryMode mode) { + public List getUsableStacks(StackDiscoveryMode mode) { if (this.getCaster() != null) return getUsableStacksForPlayer(mode, null, this.getCaster()); return new ArrayList<>(); @@ -177,7 +177,7 @@ protected List getUsableStacks(StackDiscoveryMode mode) { @Override // TODO: Adjacent inv! - protected List getPrimaryStacks() { + public List getPrimaryStacks() { if (this.getCaster() != null) return getPrimaryStacksForPlayer(InteractionHand.OFF_HAND, this.getCaster()); return List.of(); diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/PlayerBasedCastEnv.java b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/PlayerBasedCastEnv.java index 83e58a818b..13add783eb 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/PlayerBasedCastEnv.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/casting/eval/env/PlayerBasedCastEnv.java @@ -84,12 +84,12 @@ public void postExecution(CastResult result) { } @Override - protected List getUsableStacks(StackDiscoveryMode mode) { + public List getUsableStacks(StackDiscoveryMode mode) { return getUsableStacksForPlayer(mode, castingHand, caster); } @Override - protected List getPrimaryStacks() { + public List getPrimaryStacks() { return getPrimaryStacksForPlayer(this.castingHand, this.caster); }