From 61e292af10d218e0a6ea966dbe7d5cb4b0f6dc74 Mon Sep 17 00:00:00 2001 From: "yrsegal@gmail.com" Date: Wed, 9 Nov 2022 19:50:37 -0500 Subject: [PATCH 1/4] finish mana -> media --- .../8f7cd5c924d3264b7777ef1696459761f9a70902 | 4 +- .../e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 | 8 +- .../hexcasting/models/item/battery.json | 60 +-- .../advancements/aaa_wasteful_cast.json | 4 +- .../hexcasting/advancements/aab_big_cast.json | 4 +- .../hexcasting/api/addldata/ADHexHolder.java | 4 +- .../advancements/HexAdvancementTriggers.java | 4 +- .../api/advancements/OvercastTrigger.java | 26 +- .../api/advancements/SpendManaTrigger.java | 63 --- .../api/advancements/SpendMediaTrigger.java | 63 +++ .../circle/BlockEntityAbstractImpetus.java | 58 +-- .../hexcasting/api/item/HexHolderItem.java | 4 +- .../hexcasting/api/item/ManaHolderItem.java | 59 --- .../hexcasting/api/item/MediaHolderItem.java | 18 +- .../petrak/hexcasting/api/mod/HexConfig.java | 2 +- .../hexcasting/api/mod/HexStatistics.java | 8 +- .../at/petrak/hexcasting/api/spell/Action.kt | 6 +- ...ConstManaAction.kt => ConstMediaAction.kt} | 8 +- .../hexcasting/api/spell/SpellAction.kt | 6 +- .../api/spell/casting/CastingHarness.kt | 66 ++-- .../api/spell/casting/OperatorSideEffect.kt | 8 +- .../hexcasting/api/utils/MediaHelper.kt | 40 +- .../client/RegisterClientStuff.java | 4 +- .../casting/operators/OpBlockAxisRaycast.kt | 6 +- .../casting/operators/OpBlockRaycast.kt | 6 +- .../casting/operators/OpEntityHeight.kt | 4 +- .../common/casting/operators/OpEntityLook.kt | 4 +- .../common/casting/operators/OpEntityPos.kt | 4 +- .../casting/operators/OpEntityRaycast.kt | 6 +- .../casting/operators/OpEntityVelocity.kt | 4 +- .../common/casting/operators/OpRead.kt | 4 +- .../common/casting/operators/OpReadable.kt | 4 +- .../casting/operators/OpTheCoolerRead.kt | 4 +- .../casting/operators/OpTheCoolerReadable.kt | 4 +- .../casting/operators/OpTheCoolerWritable.kt | 4 +- .../common/casting/operators/OpWritable.kt | 4 +- .../operators/akashic/OpAkashicRead.kt | 6 +- .../operators/circles/OpCircleBounds.kt | 4 +- .../casting/operators/circles/OpImpetusDir.kt | 4 +- .../casting/operators/circles/OpImpetusPos.kt | 4 +- .../casting/operators/lists/OpAppend.kt | 4 +- .../casting/operators/lists/OpConcat.kt | 4 +- .../common/casting/operators/lists/OpCons.kt | 4 +- .../casting/operators/lists/OpEmptyList.kt | 4 +- .../common/casting/operators/lists/OpIndex.kt | 4 +- .../casting/operators/lists/OpIndexOf.kt | 4 +- .../casting/operators/lists/OpListSize.kt | 4 +- .../operators/lists/OpModifyInPlace.kt | 2 +- .../casting/operators/lists/OpRemove.kt | 4 +- .../casting/operators/lists/OpReverski.kt | 4 +- .../casting/operators/lists/OpSingleton.kt | 4 +- .../common/casting/operators/lists/OpSlice.kt | 4 +- .../common/casting/operators/lists/OpSplat.kt | 4 +- .../casting/operators/lists/OpUnCons.kt | 4 +- .../common/casting/operators/math/OpAbsLen.kt | 4 +- .../common/casting/operators/math/OpAdd.kt | 4 +- .../common/casting/operators/math/OpCeil.kt | 4 +- .../casting/operators/math/OpCoerceToAxial.kt | 4 +- .../casting/operators/math/OpConstructVec.kt | 4 +- .../operators/math/OpDeconstructVec.kt | 4 +- .../casting/operators/math/OpDivCross.kt | 4 +- .../common/casting/operators/math/OpFloor.kt | 4 +- .../common/casting/operators/math/OpLog.kt | 4 +- .../common/casting/operators/math/OpModulo.kt | 4 +- .../common/casting/operators/math/OpMulDot.kt | 4 +- .../casting/operators/math/OpPowProj.kt | 4 +- .../common/casting/operators/math/OpRandom.kt | 4 +- .../common/casting/operators/math/OpSub.kt | 4 +- .../casting/operators/math/bit/OpAnd.kt | 2 +- .../casting/operators/math/bit/OpNot.kt | 4 +- .../common/casting/operators/math/bit/OpOr.kt | 2 +- .../casting/operators/math/bit/OpToSet.kt | 4 +- .../casting/operators/math/bit/OpXor.kt | 2 +- .../casting/operators/math/logic/OpBoolAnd.kt | 4 +- .../casting/operators/math/logic/OpBoolIf.kt | 4 +- .../casting/operators/math/logic/OpBoolNot.kt | 4 +- .../casting/operators/math/logic/OpBoolOr.kt | 4 +- .../casting/operators/math/logic/OpBoolXor.kt | 4 +- .../operators/math/logic/OpCoerceToBool.kt | 4 +- .../casting/operators/math/logic/OpCompare.kt | 4 +- .../operators/math/logic/OpEquality.kt | 4 +- .../casting/operators/math/trig/OpArcCos.kt | 4 +- .../casting/operators/math/trig/OpArcSin.kt | 4 +- .../casting/operators/math/trig/OpArcTan.kt | 4 +- .../casting/operators/math/trig/OpArcTan2.kt | 4 +- .../casting/operators/math/trig/OpCos.kt | 4 +- .../casting/operators/math/trig/OpSin.kt | 4 +- .../casting/operators/math/trig/OpTan.kt | 4 +- .../operators/selectors/OpGetCaster.kt | 4 +- .../operators/selectors/OpGetEntitiesBy.kt | 4 +- .../operators/selectors/OpGetEntityAt.kt | 4 +- .../casting/operators/spells/OpMakeBattery.kt | 8 +- .../operators/spells/OpMakePackagedSpell.kt | 8 +- .../casting/operators/spells/OpRecharge.kt | 22 +- .../spells/sentinel/OpGetSentinelPos.kt | 6 +- .../spells/sentinel/OpGetSentinelWayfind.kt | 6 +- .../casting/operators/stack/OpDuplicate.kt | 4 +- .../casting/operators/stack/OpDuplicateN.kt | 4 +- .../common/casting/operators/stack/OpMask.kt | 4 +- .../common/casting/operators/stack/OpOver.kt | 4 +- .../casting/operators/stack/OpRotate.kt | 4 +- .../common/casting/operators/stack/OpSwap.kt | 4 +- .../common/items/magic/ItemArtifact.java | 2 +- .../items/magic/ItemCreativeUnlocker.java | 10 +- .../common/items/magic/ItemCypher.java | 2 +- .../common/items/magic/ItemMediaBattery.java | 10 +- .../common/items/magic/ItemMediaHolder.java | 46 +-- .../common/items/magic/ItemPackagedHex.java | 8 +- .../common/items/magic/ItemTrinket.java | 2 +- .../hexcasting/datagen/HexAdvancements.java | 6 +- .../hexcasting/interop/pehkui/OpGetScale.kt | 6 +- .../hexcasting/xplat/IXplatAbstractions.java | 2 +- .../assets/hexcasting/lang/en_us.json | 26 +- .../en_us/entries/items/phials.json | 4 +- .../patterns/great_spells/make_battery.json | 2 +- .../03e4de26f1265135874f8cdcaebc09d9c08eb42b | 41 +- .../67cce32b1c3cbbcb1f646605f4914e3f196986c2 | 78 ++-- .../75bcd4dba6ca7d365462b0ec45e291d1056349c4 | 44 +-- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 365 +++++++++--------- .../recipes/crushing/amethyst_block.json | 34 +- .../recipes/crushing/amethyst_cluster.json | 40 +- .../create/crushing/amethyst_shard.json | 32 +- .../farmersdelight/cutting/akashic_door.json | 30 +- .../farmersdelight/cutting/akashic_log.json | 38 +- .../cutting/akashic_trapdoor.json | 30 +- .../farmersdelight/cutting/akashic_wood.json | 38 +- .../recipes/pride_colorizer_pansexual.json | 9 +- .../hexcasting/fabric/FabricHexConfig.java | 26 +- .../fabric/cc/adimpl/CCHexHolder.java | 8 +- .../fabric/cc/adimpl/CCMediaHolder.java | 4 +- .../fabric/interop/gravity/OpGetGravity.kt | 6 +- .../interop/trinkets/TrinketsApiInterop.java | 2 +- .../fabric/storage/FabricImpetusStorage.kt | 10 +- .../fabric/xplat/FabricXplatImpl.java | 2 +- .../03e4de26f1265135874f8cdcaebc09d9c08eb42b | 3 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 11 +- .../recipes/crushing/amethyst_block.json | 16 +- .../recipes/crushing/amethyst_cluster.json | 20 +- .../create/crushing/amethyst_shard.json | 16 +- .../farmersdelight/cutting/akashic_door.json | 18 +- .../farmersdelight/cutting/akashic_log.json | 18 +- .../cutting/akashic_trapdoor.json | 18 +- .../farmersdelight/cutting/akashic_wood.json | 18 +- .../recipes/pride_colorizer_pansexual.json | 9 +- .../tags/items/grants_root_advancement.json | 1 - .../hexcasting/forge/ForgeHexConfig.java | 2 +- .../forge/cap/ForgeCapabilityHandler.java | 20 +- .../forge/cap/ForgeImpetusCapability.java | 4 +- .../hexcasting/forge/cap/HexCapabilities.java | 4 +- .../forge/datagen/xplat/HexItemModels.java | 4 +- .../interop/curios/CuriosApiInterop.java | 2 +- .../forge/xplat/ForgeXplatImpl.java | 8 +- 152 files changed, 999 insertions(+), 1029 deletions(-) delete mode 100644 Common/src/main/java/at/petrak/hexcasting/api/advancements/SpendManaTrigger.java create mode 100644 Common/src/main/java/at/petrak/hexcasting/api/advancements/SpendMediaTrigger.java delete mode 100644 Common/src/main/java/at/petrak/hexcasting/api/item/ManaHolderItem.java rename Common/src/main/java/at/petrak/hexcasting/api/spell/{ConstManaAction.kt => ConstMediaAction.kt} (86%) diff --git a/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 b/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 index 8a23b294..c6144611 100644 --- a/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 +++ b/Common/src/generated/resources/.cache/8f7cd5c924d3264b7777ef1696459761f9a70902 @@ -1,11 +1,11 @@ -// 1.19.2 2022-11-05T14:56:40.628663 Item Models: hexcasting +// 1.19.2 2022-11-09T19:44:43.409223 Item Models: hexcasting f2156b3a7041cf99891b528393db64c6b9ca1a4f assets/hexcasting/models/item/abacus.json 783d8454d6b74f926be0d3e02d87c6505e9d76d0 assets/hexcasting/models/item/acacia_staff.json 19730853397b109cfedd0c3bbda83d5de6cd15b9 assets/hexcasting/models/item/akashic_record.json 8c735feff09d46d00ed681311f46f61a50cfdc9b assets/hexcasting/models/item/amethyst_dust.json d1b0892de9d751e7bebc763e6407d5285363c851 assets/hexcasting/models/item/artifact.json 7eb3eb776e70eb616c12ada500b9d1d6a3249a6a assets/hexcasting/models/item/artifact_filled.json -f261669448bb990f55545c8e6288a1e75329c2ef assets/hexcasting/models/item/battery.json +82e3be7bbdad92d2b4c728be54d9d2f2809a0ac2 assets/hexcasting/models/item/battery.json 3dcc41ab5cbf7004f9c959d89be961aff0ce6032 assets/hexcasting/models/item/birch_staff.json f05937151873b1de302a011851edc62d0554e4db assets/hexcasting/models/item/bosnia_staff.json ec7c3a51882a432185fdbb6a449e66165b6a4c4c assets/hexcasting/models/item/charged_amethyst.json diff --git a/Common/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 b/Common/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 index f26800c0..010e48c1 100644 --- a/Common/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 +++ b/Common/src/generated/resources/.cache/e5c5eb35b4ba40351ecb7d9f04c3527f2f5779b0 @@ -1,6 +1,6 @@ -// 1.19.2 2022-11-04T11:49:15.7703822 Advancements -17c1f596c096c05f510c3c03cef9281c9c6b8d47 data/hexcasting/advancements/aaa_wasteful_cast.json -4da7c22a5a04dfe9652f4f4b5d59a537edf285f8 data/hexcasting/advancements/aab_big_cast.json +// 1.19.2 2022-11-09T19:44:43.405259 Advancements +b21f0b7f0cda29a7e84693df8139f2fecfeea960 data/hexcasting/advancements/aaa_wasteful_cast.json +9d8b41dd8ddfccdf2cd19433d8d7d3cf934e64db data/hexcasting/advancements/aab_big_cast.json ef61c93d776c6f212820af20909a4c1d92822baf data/hexcasting/advancements/enlightenment.json 8f97205fa79270eab688aa3019d6fe7dd8c8b0d3 data/hexcasting/advancements/lore.json 2f5ad49936d58c7097ac7f8fbbf3f66f9f90fd2c data/hexcasting/advancements/lore/experiment1.json @@ -12,5 +12,5 @@ ef06ae5bd79e2c52291fbfb3c69bc2f74a604477 data/hexcasting/advancements/lore/terab 861374b7c144ccdbbd031a3f5042af6718ba42bf data/hexcasting/advancements/lore/terabithia4.json e26db8dfa825b7ac572d59a548b610db7c7bf736 data/hexcasting/advancements/lore/terabithia5.json 2acbfb4efe2a72a1986c8dbe62ad8d93e9613e99 data/hexcasting/advancements/opened_eyes.json -f85abe882fbcf05bb3dfbaf36c4ad5bcd8a888a4 data/hexcasting/advancements/root.json +d19039a73324eb7532d035d08442f3b68bb13bcb data/hexcasting/advancements/root.json b1b82068d65d6872c258d905d4f78499e8227ccf data/hexcasting/advancements/y_u_no_cast_angy.json diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/battery.json b/Common/src/generated/resources/assets/hexcasting/models/item/battery.json index 35a00720..b446fb0e 100644 --- a/Common/src/generated/resources/assets/hexcasting/models/item/battery.json +++ b/Common/src/generated/resources/assets/hexcasting/models/item/battery.json @@ -3,106 +3,106 @@ { "model": "hexcasting:item/phial_small_0", "predicate": { - "hexcasting:mana": 0.0, - "hexcasting:max_mana": 0.0 + "hexcasting:max_media": 0.0, + "hexcasting:media": 0.0 } }, { "model": "hexcasting:item/phial_small_1", "predicate": { - "hexcasting:mana": 0.25, - "hexcasting:max_mana": 0.0 + "hexcasting:max_media": 0.0, + "hexcasting:media": 0.25 } }, { "model": "hexcasting:item/phial_small_2", "predicate": { - "hexcasting:mana": 0.5, - "hexcasting:max_mana": 0.0 + "hexcasting:max_media": 0.0, + "hexcasting:media": 0.5 } }, { "model": "hexcasting:item/phial_small_3", "predicate": { - "hexcasting:mana": 0.75, - "hexcasting:max_mana": 0.0 + "hexcasting:max_media": 0.0, + "hexcasting:media": 0.75 } }, { "model": "hexcasting:item/phial_small_4", "predicate": { - "hexcasting:mana": 1.0, - "hexcasting:max_mana": 0.0 + "hexcasting:max_media": 0.0, + "hexcasting:media": 1.0 } }, { "model": "hexcasting:item/phial_medium_0", "predicate": { - "hexcasting:mana": 0.0, - "hexcasting:max_mana": 1.0 + "hexcasting:max_media": 1.0, + "hexcasting:media": 0.0 } }, { "model": "hexcasting:item/phial_medium_1", "predicate": { - "hexcasting:mana": 0.25, - "hexcasting:max_mana": 1.0 + "hexcasting:max_media": 1.0, + "hexcasting:media": 0.25 } }, { "model": "hexcasting:item/phial_medium_2", "predicate": { - "hexcasting:mana": 0.5, - "hexcasting:max_mana": 1.0 + "hexcasting:max_media": 1.0, + "hexcasting:media": 0.5 } }, { "model": "hexcasting:item/phial_medium_3", "predicate": { - "hexcasting:mana": 0.75, - "hexcasting:max_mana": 1.0 + "hexcasting:max_media": 1.0, + "hexcasting:media": 0.75 } }, { "model": "hexcasting:item/phial_medium_4", "predicate": { - "hexcasting:mana": 1.0, - "hexcasting:max_mana": 1.0 + "hexcasting:max_media": 1.0, + "hexcasting:media": 1.0 } }, { "model": "hexcasting:item/phial_large_0", "predicate": { - "hexcasting:mana": 0.0, - "hexcasting:max_mana": 2.0 + "hexcasting:max_media": 2.0, + "hexcasting:media": 0.0 } }, { "model": "hexcasting:item/phial_large_1", "predicate": { - "hexcasting:mana": 0.25, - "hexcasting:max_mana": 2.0 + "hexcasting:max_media": 2.0, + "hexcasting:media": 0.25 } }, { "model": "hexcasting:item/phial_large_2", "predicate": { - "hexcasting:mana": 0.5, - "hexcasting:max_mana": 2.0 + "hexcasting:max_media": 2.0, + "hexcasting:media": 0.5 } }, { "model": "hexcasting:item/phial_large_3", "predicate": { - "hexcasting:mana": 0.75, - "hexcasting:max_mana": 2.0 + "hexcasting:max_media": 2.0, + "hexcasting:media": 0.75 } }, { "model": "hexcasting:item/phial_large_4", "predicate": { - "hexcasting:mana": 1.0, - "hexcasting:max_mana": 2.0 + "hexcasting:max_media": 2.0, + "hexcasting:media": 1.0 } } ] diff --git a/Common/src/generated/resources/data/hexcasting/advancements/aaa_wasteful_cast.json b/Common/src/generated/resources/data/hexcasting/advancements/aaa_wasteful_cast.json index f216a384..3f334657 100644 --- a/Common/src/generated/resources/data/hexcasting/advancements/aaa_wasteful_cast.json +++ b/Common/src/generated/resources/data/hexcasting/advancements/aaa_wasteful_cast.json @@ -3,11 +3,11 @@ "criteria": { "waste_amt": { "conditions": { - "mana_wasted": { + "media_wasted": { "min": 89000 } }, - "trigger": "hexcasting:spend_mana" + "trigger": "hexcasting:spend_media" } }, "display": { diff --git a/Common/src/generated/resources/data/hexcasting/advancements/aab_big_cast.json b/Common/src/generated/resources/data/hexcasting/advancements/aab_big_cast.json index 9d39207b..8955dfac 100644 --- a/Common/src/generated/resources/data/hexcasting/advancements/aab_big_cast.json +++ b/Common/src/generated/resources/data/hexcasting/advancements/aab_big_cast.json @@ -3,11 +3,11 @@ "criteria": { "cast_amt": { "conditions": { - "mana_spent": { + "media_spent": { "min": 6400000 } }, - "trigger": "hexcasting:spend_mana" + "trigger": "hexcasting:spend_media" } }, "display": { diff --git a/Common/src/main/java/at/petrak/hexcasting/api/addldata/ADHexHolder.java b/Common/src/main/java/at/petrak/hexcasting/api/addldata/ADHexHolder.java index f40d45e3..d0da5b78 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/addldata/ADHexHolder.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/addldata/ADHexHolder.java @@ -8,14 +8,14 @@ import java.util.List; public interface ADHexHolder { - boolean canDrawManaFromInventory(); + boolean canDrawMediaFromInventory(); boolean hasHex(); @Nullable List getHex(ServerLevel level); - void writeHex(List patterns, int mana); + void writeHex(List patterns, int media); void clearHex(); } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/advancements/HexAdvancementTriggers.java b/Common/src/main/java/at/petrak/hexcasting/api/advancements/HexAdvancementTriggers.java index 1aab5696..16af02ab 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/advancements/HexAdvancementTriggers.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/advancements/HexAdvancementTriggers.java @@ -4,12 +4,12 @@ import at.petrak.hexcasting.mixin.accessor.CriteriaTriggersAccessor; public class HexAdvancementTriggers { public static final OvercastTrigger OVERCAST_TRIGGER = new OvercastTrigger(); - public static final SpendManaTrigger SPEND_MANA_TRIGGER = new SpendManaTrigger(); + public static final SpendMediaTrigger SPEND_MEDIA_TRIGGER = new SpendMediaTrigger(); public static final FailToCastGreatSpellTrigger FAIL_GREAT_SPELL_TRIGGER = new FailToCastGreatSpellTrigger(); public static void registerTriggers() { CriteriaTriggersAccessor.hex$register(OVERCAST_TRIGGER); - CriteriaTriggersAccessor.hex$register(SPEND_MANA_TRIGGER); + CriteriaTriggersAccessor.hex$register(SPEND_MEDIA_TRIGGER); CriteriaTriggersAccessor.hex$register(FAIL_GREAT_SPELL_TRIGGER); } } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/advancements/OvercastTrigger.java b/Common/src/main/java/at/petrak/hexcasting/api/advancements/OvercastTrigger.java index ce02ecb8..7b5b8d74 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/advancements/OvercastTrigger.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/advancements/OvercastTrigger.java @@ -12,7 +12,7 @@ import net.minecraft.server.level.ServerPlayer; public class OvercastTrigger extends SimpleCriterionTrigger { private static final ResourceLocation ID = new ResourceLocation("hexcasting", "overcast"); - private static final String TAG_MANA_GENERATED = "mana_generated"; + private static final String TAG_MEDIA_GENERATED = "media_generated"; private static final String TAG_HEALTH_USED = "health_used"; // HEY KIDS DID YOYU KNOW THERE'S NOT A CRITERIA FOR HOW MUCH ***HEALTH*** AN ENTITY HAS private static final String TAG_HEALTH_LEFT = "mojang_i_am_begging_and_crying_please_add_an_entity_health_criterion"; @@ -26,29 +26,29 @@ public class OvercastTrigger extends SimpleCriterionTrigger { - var manaToHealth = HexConfig.common().mediaToHealthRate(); - var healthUsed = manaGenerated / manaToHealth; - return inst.test(manaGenerated, healthUsed / player.getMaxHealth(), player.getHealth()); + var mediaToHealth = HexConfig.common().mediaToHealthRate(); + var healthUsed = mediaGenerated / mediaToHealth; + return inst.test(mediaGenerated, healthUsed / player.getMaxHealth(), player.getHealth()); }); } public static class Instance extends AbstractCriterionTriggerInstance { - protected final MinMaxBounds.Ints manaGenerated; + protected final MinMaxBounds.Ints mediaGenerated; protected final MinMaxBounds.Doubles healthUsed; // DID YOU KNOW THERES ONE TO CHECK THE WORLD TIME, BUT NOT THE HEALTH!? protected final MinMaxBounds.Doubles healthLeft; - public Instance(EntityPredicate.Composite predicate, MinMaxBounds.Ints manaGenerated, + public Instance(EntityPredicate.Composite predicate, MinMaxBounds.Ints mediaGenerated, MinMaxBounds.Doubles healthUsed, MinMaxBounds.Doubles healthLeft) { super(OvercastTrigger.ID, predicate); - this.manaGenerated = manaGenerated; + this.mediaGenerated = mediaGenerated; this.healthUsed = healthUsed; // DID YOU KNOW THERE'S ONE TO CHECK THE FUCKING C A T T Y P E BUT NOT THE HEALTH this.healthLeft = healthLeft; @@ -62,8 +62,8 @@ public class OvercastTrigger extends SimpleCriterionTrigger { - private static final ResourceLocation ID = new ResourceLocation("hexcasting", "spend_mana"); - - private static final String TAG_MANA_SPENT = "mana_spent"; - private static final String TAG_MANA_WASTED = "mana_wasted"; - - @Override - public ResourceLocation getId() { - return ID; - } - - @Override - protected Instance createInstance(JsonObject json, EntityPredicate.Composite predicate, - DeserializationContext pContext) { - return new Instance(predicate, - MinMaxBounds.Ints.fromJson(json.get(TAG_MANA_SPENT)), - MinMaxBounds.Ints.fromJson(json.get(TAG_MANA_WASTED))); - } - - public void trigger(ServerPlayer player, int manaSpent, int manaWasted) { - super.trigger(player, inst -> inst.test(manaSpent, manaWasted)); - } - - public static class Instance extends AbstractCriterionTriggerInstance { - protected final MinMaxBounds.Ints manaSpent; - protected final MinMaxBounds.Ints manaWasted; - - public Instance(EntityPredicate.Composite predicate, MinMaxBounds.Ints manaSpent, - MinMaxBounds.Ints manaWasted) { - super(SpendManaTrigger.ID, predicate); - this.manaSpent = manaSpent; - this.manaWasted = manaWasted; - } - - @Override - public ResourceLocation getCriterion() { - return ID; - } - - @Override - public JsonObject serializeToJson(SerializationContext ctx) { - JsonObject json = super.serializeToJson(ctx); - if (!this.manaSpent.isAny()) { - json.add(TAG_MANA_SPENT, this.manaSpent.serializeToJson()); - } - if (!this.manaWasted.isAny()) { - json.add(TAG_MANA_WASTED, this.manaWasted.serializeToJson()); - } - return json; - } - - private boolean test(int manaSpentIn, int manaWastedIn) { - return this.manaSpent.matches(manaSpentIn) && this.manaWasted.matches(manaWastedIn); - } - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/api/advancements/SpendMediaTrigger.java b/Common/src/main/java/at/petrak/hexcasting/api/advancements/SpendMediaTrigger.java new file mode 100644 index 00000000..3679711d --- /dev/null +++ b/Common/src/main/java/at/petrak/hexcasting/api/advancements/SpendMediaTrigger.java @@ -0,0 +1,63 @@ +package at.petrak.hexcasting.api.advancements; + +import com.google.gson.JsonObject; +import net.minecraft.advancements.critereon.*; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerPlayer; + +public class SpendMediaTrigger extends SimpleCriterionTrigger { + private static final ResourceLocation ID = new ResourceLocation("hexcasting", "spend_media"); + + private static final String TAG_MEDIA_SPENT = "media_spent"; + private static final String TAG_MEDIA_WASTED = "media_wasted"; + + @Override + public ResourceLocation getId() { + return ID; + } + + @Override + protected Instance createInstance(JsonObject json, EntityPredicate.Composite predicate, + DeserializationContext pContext) { + return new Instance(predicate, + MinMaxBounds.Ints.fromJson(json.get(TAG_MEDIA_SPENT)), + MinMaxBounds.Ints.fromJson(json.get(TAG_MEDIA_WASTED))); + } + + public void trigger(ServerPlayer player, int mediaSpent, int mediaWasted) { + super.trigger(player, inst -> inst.test(mediaSpent, mediaWasted)); + } + + public static class Instance extends AbstractCriterionTriggerInstance { + protected final MinMaxBounds.Ints mediaSpent; + protected final MinMaxBounds.Ints mediaWasted; + + public Instance(EntityPredicate.Composite predicate, MinMaxBounds.Ints mediaSpent, + MinMaxBounds.Ints mediaWasted) { + super(SpendMediaTrigger.ID, predicate); + this.mediaSpent = mediaSpent; + this.mediaWasted = mediaWasted; + } + + @Override + public ResourceLocation getCriterion() { + return ID; + } + + @Override + public JsonObject serializeToJson(SerializationContext ctx) { + JsonObject json = super.serializeToJson(ctx); + if (!this.mediaSpent.isAny()) { + json.add(TAG_MEDIA_SPENT, this.mediaSpent.serializeToJson()); + } + if (!this.mediaWasted.isAny()) { + json.add(TAG_MEDIA_WASTED, this.mediaWasted.serializeToJson()); + } + return json; + } + + private boolean test(int mediaSpentIn, int mediaWastedIn) { + return this.mediaSpent.matches(mediaSpentIn) && this.mediaWasted.matches(mediaWastedIn); + } + } +} diff --git a/Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java b/Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java index 8285c214..41421acc 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java @@ -52,7 +52,7 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen TAG_NEXT_BLOCK = "next_block", TAG_TRACKED_BLOCKS = "tracked_blocks", TAG_FOUND_ALL = "found_all", - TAG_MANA = "mana", + TAG_MEDIA = "media", TAG_LAST_MISHAP = "last_mishap"; private static final DecimalFormat DUST_AMOUNT = new DecimalFormat("###,###.##"); @@ -72,7 +72,7 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen private static final int MAX_CAPACITY = 2_000_000_000; - private int mana = 0; + private int media = 0; public BlockEntityAbstractImpetus(BlockEntityType pType, BlockPos pWorldPosition, BlockState pBlockState) { super(pType, pWorldPosition, pBlockState); @@ -80,12 +80,12 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen abstract public boolean activatorAlwaysInRange(); - public int getMana() { - return this.mana; + public int getMedia() { + return this.media; } - public void setMana(int mana) { - this.mana = mana; + public void setMedia(int media) { + this.media = media; } @Nullable @@ -119,11 +119,11 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen Player observer, Level world, Direction hitFace) { if (world.getBlockEntity(pos) instanceof BlockEntityAbstractImpetus beai) { - if (beai.getMana() < 0) { + if (beai.getMedia() < 0) { lines.add(new Pair<>(new ItemStack(HexItems.AMETHYST_DUST), ItemCreativeUnlocker.infiniteMedia(world))); } else { - var dustCount = (float) beai.getMana() / (float) MediaConstants.DUST_UNIT; - var dustCmp = Component.translatable("hexcasting.tooltip.lens.impetus.mana", + var dustCount = (float) beai.getMedia() / (float) MediaConstants.DUST_UNIT; + var dustCmp = Component.translatable("hexcasting.tooltip.lens.impetus.media", String.format("%.2f", dustCount)); lines.add(new Pair<>(new ItemStack(HexItems.AMETHYST_DUST), dustCmp)); } @@ -150,7 +150,7 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen tag.put(TAG_TRACKED_BLOCKS, trackeds); } - tag.putInt(TAG_MANA, this.mana); + tag.putInt(TAG_MEDIA, this.media); if (this.lastMishap != null) { tag.putString(TAG_LAST_MISHAP, Component.Serializer.toJson(this.lastMishap)); } @@ -183,7 +183,7 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen this.knownBlocks = new HashSet<>(); } - this.mana = tag.getInt(TAG_MANA); + this.media = tag.getInt(TAG_MEDIA); if (tag.contains(TAG_LAST_MISHAP, Tag.TAG_STRING)) { this.lastMishap = Component.Serializer.fromJson(tag.getString(TAG_LAST_MISHAP)); } else { @@ -526,7 +526,7 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen @Override public void setItem(int index, ItemStack stack) { - insertMana(stack); + insertMedia(stack); } @Override @@ -541,43 +541,43 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen @Override public boolean canPlaceItem(int index, ItemStack stack) { - if (remainingManaCapacity() == 0) + if (remainingMediaCapacity() == 0) return false; if (stack.is(HexItems.CREATIVE_UNLOCKER)) return true; - var manamount = extractManaFromItem(stack, true); - return manamount > 0; + var mediamount = extractMediaFromItem(stack, true); + return mediamount > 0; } - public int extractManaFromItem(ItemStack stack, boolean simulate) { - if (this.mana < 0) + public int extractMediaFromItem(ItemStack stack, boolean simulate) { + if (this.media < 0) return 0; - return MediaHelper.extractMedia(stack, remainingManaCapacity(), true, simulate); + return MediaHelper.extractMedia(stack, remainingMediaCapacity(), true, simulate); } - public void insertMana(ItemStack stack) { - if (getMana() >= 0 && !stack.isEmpty() && stack.getItem() == HexItems.CREATIVE_UNLOCKER) { - setInfiniteMana(); + public void insertMedia(ItemStack stack) { + if (getMedia() >= 0 && !stack.isEmpty() && stack.getItem() == HexItems.CREATIVE_UNLOCKER) { + setInfiniteMedia(); stack.shrink(1); } else { - var manamount = extractManaFromItem(stack, false); - if (manamount > 0) { - this.mana = Math.min(manamount + mana, MAX_CAPACITY); + var mediamount = extractMediaFromItem(stack, false); + if (mediamount > 0) { + this.media = Math.min(mediamount + media, MAX_CAPACITY); this.sync(); } } } - public void setInfiniteMana() { - this.mana = -1; + public void setInfiniteMedia() { + this.media = -1; this.sync(); } - public int remainingManaCapacity() { - if (this.mana < 0) + public int remainingMediaCapacity() { + if (this.media < 0) return 0; - return Math.max(0, MAX_CAPACITY - this.mana); + return Math.max(0, MAX_CAPACITY - this.media); } } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/item/HexHolderItem.java b/Common/src/main/java/at/petrak/hexcasting/api/item/HexHolderItem.java index 8b3959d0..bf276235 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/item/HexHolderItem.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/item/HexHolderItem.java @@ -17,14 +17,14 @@ import java.util.List; @ApiStatus.OverrideOnly public interface HexHolderItem extends MediaHolderItem { - boolean canDrawManaFromInventory(ItemStack stack); + boolean canDrawMediaFromInventory(ItemStack stack); boolean hasHex(ItemStack stack); @Nullable List getHex(ItemStack stack, ServerLevel level); - void writeHex(ItemStack stack, List program, int mana); + void writeHex(ItemStack stack, List program, int media); void clearHex(ItemStack stack); } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/item/ManaHolderItem.java b/Common/src/main/java/at/petrak/hexcasting/api/item/ManaHolderItem.java deleted file mode 100644 index 67ec155c..00000000 --- a/Common/src/main/java/at/petrak/hexcasting/api/item/ManaHolderItem.java +++ /dev/null @@ -1,59 +0,0 @@ -package at.petrak.hexcasting.api.item; - -import net.minecraft.world.item.ItemStack; -import org.jetbrains.annotations.ApiStatus; - -/** - * This interface should not be accessed direc - */ -@ApiStatus.OverrideOnly -public interface ManaHolderItem { - int getMana(ItemStack stack); - - int getMaxMana(ItemStack stack); - - void setMana(ItemStack stack, int mana); - - boolean manaProvider(ItemStack stack); - - boolean canRecharge(ItemStack stack); - - default float getManaFullness(ItemStack stack) { - int max = getMaxMana(stack); - if (max == 0) { - return 0; - } - return (float) getMana(stack) / (float) max; - } - - default int withdrawMana(ItemStack stack, int cost, boolean simulate) { - var manaHere = getMana(stack); - if (cost < 0) { - cost = manaHere; - } - if (!simulate) { - var manaLeft = manaHere - cost; - setMana(stack, manaLeft); - } - return Math.min(cost, manaHere); - } - - default int insertMana(ItemStack stack, int amount, boolean simulate) { - var manaHere = getMana(stack); - int emptySpace = getMaxMana(stack) - manaHere; - if (emptySpace <= 0) { - return 0; - } - if (amount < 0) { - amount = emptySpace; - } - - int inserting = Math.min(amount, emptySpace); - - if (!simulate) { - var newMana = manaHere + inserting; - setMana(stack, newMana); - } - return inserting; - } -} diff --git a/Common/src/main/java/at/petrak/hexcasting/api/item/MediaHolderItem.java b/Common/src/main/java/at/petrak/hexcasting/api/item/MediaHolderItem.java index b7f216e2..43456722 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/item/MediaHolderItem.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/item/MediaHolderItem.java @@ -30,20 +30,20 @@ public interface MediaHolderItem { } default int withdrawMedia(ItemStack stack, int cost, boolean simulate) { - var manaHere = getMedia(stack); + var mediaHere = getMedia(stack); if (cost < 0) { - cost = manaHere; + cost = mediaHere; } if (!simulate) { - var manaLeft = manaHere - cost; - setMedia(stack, manaLeft); + var mediaLeft = mediaHere - cost; + setMedia(stack, mediaLeft); } - return Math.min(cost, manaHere); + return Math.min(cost, mediaHere); } default int insertMedia(ItemStack stack, int amount, boolean simulate) { - var manaHere = getMedia(stack); - int emptySpace = getMaxMedia(stack) - manaHere; + var mediaHere = getMedia(stack); + int emptySpace = getMaxMedia(stack) - mediaHere; if (emptySpace <= 0) { return 0; } @@ -54,8 +54,8 @@ public interface MediaHolderItem { int inserting = Math.min(amount, emptySpace); if (!simulate) { - var newMana = manaHere + inserting; - setMedia(stack, newMana); + var newMedia = mediaHere + inserting; + setMedia(stack, newMedia); } return inserting; } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/mod/HexConfig.java b/Common/src/main/java/at/petrak/hexcasting/api/mod/HexConfig.java index 008409ce..7e60b536 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/mod/HexConfig.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/mod/HexConfig.java @@ -23,7 +23,7 @@ public class HexConfig { int DEFAULT_DUST_MEDIA_AMOUNT = MediaConstants.DUST_UNIT; int DEFAULT_SHARD_MEDIA_AMOUNT = MediaConstants.SHARD_UNIT; int DEFAULT_CHARGED_MEDIA_AMOUNT = MediaConstants.CRYSTAL_UNIT; - double DEFAULT_MANA_TO_HEALTH_RATE = 2 * MediaConstants.CRYSTAL_UNIT / 20.0; + double DEFAULT_MEDIA_TO_HEALTH_RATE = 2 * MediaConstants.CRYSTAL_UNIT / 20.0; } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/mod/HexStatistics.java b/Common/src/main/java/at/petrak/hexcasting/api/mod/HexStatistics.java index 1a6cc7b4..5262980d 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/mod/HexStatistics.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/mod/HexStatistics.java @@ -9,10 +9,10 @@ import net.minecraft.stats.Stats; import static at.petrak.hexcasting.api.HexAPI.modLoc; public class HexStatistics { - public static final ResourceLocation MANA_USED = makeCustomStat("mana_used", - manamount -> StatFormatter.DEFAULT.format(manamount / MediaConstants.DUST_UNIT)); - public static final ResourceLocation MANA_OVERCASTED = makeCustomStat("mana_overcasted", - manamount -> StatFormatter.DEFAULT.format(manamount / MediaConstants.DUST_UNIT)); + public static final ResourceLocation MEDIA_USED = makeCustomStat("media_used", + mediamount -> StatFormatter.DEFAULT.format(mediamount / MediaConstants.DUST_UNIT)); + public static final ResourceLocation MEDIA_OVERCAST = makeCustomStat("media_overcast", + mediamount -> StatFormatter.DEFAULT.format(mediamount / MediaConstants.DUST_UNIT)); public static final ResourceLocation PATTERNS_DRAWN = makeCustomStat("patterns_drawn", StatFormatter.DEFAULT); public static final ResourceLocation SPELLS_CAST = makeCustomStat("spells_cast", StatFormatter.DEFAULT); diff --git a/Common/src/main/java/at/petrak/hexcasting/api/spell/Action.kt b/Common/src/main/java/at/petrak/hexcasting/api/spell/Action.kt index 1120dc5d..53863883 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/spell/Action.kt +++ b/Common/src/main/java/at/petrak/hexcasting/api/spell/Action.kt @@ -14,7 +14,7 @@ import java.text.DecimalFormat /** * Manipulates the stack in some way, usually by popping some number of values off the stack * and pushing one new value. - * For a more "traditional" pop arguments, push return experience, see [ConstManaAction]. + * For a more "traditional" pop arguments, push return experience, see [ConstMediaAction]. * * Implementors MUST NOT mutate the context. */ @@ -67,7 +67,7 @@ interface Action { origin.add(look.normalize().scale(MAX_DISTANCE)) @JvmStatic - fun makeConstantOp(x: Iota): Action = object : ConstManaAction { + fun makeConstantOp(x: Iota): Action = object : ConstMediaAction { override val argc: Int get() = 0 @@ -78,7 +78,7 @@ interface Action { private val DOUBLE_FORMATTER = DecimalFormat("####.####") @JvmStatic - fun makeConstantOp(x: Double, key: ResourceLocation): Action = object : ConstManaAction { + fun makeConstantOp(x: Double, key: ResourceLocation): Action = object : ConstMediaAction { override val argc: Int get() = 0 diff --git a/Common/src/main/java/at/petrak/hexcasting/api/spell/ConstManaAction.kt b/Common/src/main/java/at/petrak/hexcasting/api/spell/ConstMediaAction.kt similarity index 86% rename from Common/src/main/java/at/petrak/hexcasting/api/spell/ConstManaAction.kt rename to Common/src/main/java/at/petrak/hexcasting/api/spell/ConstMediaAction.kt index 3f131e08..588f4b55 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/spell/ConstManaAction.kt +++ b/Common/src/main/java/at/petrak/hexcasting/api/spell/ConstMediaAction.kt @@ -7,11 +7,11 @@ import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapNotEnoughArgs /** - * A SimpleOperator that always costs the same amount of mana. + * A SimpleOperator that always costs the same amount of media. */ -interface ConstManaAction : Action { +interface ConstMediaAction : Action { val argc: Int - val manaCost: Int + val mediaCost: Int get() = 0 fun execute(args: List, ctx: CastingContext): List @@ -29,7 +29,7 @@ interface ConstManaAction : Action { val newData = this.execute(args, ctx) stack.addAll(newData) - val sideEffects = mutableListOf(OperatorSideEffect.ConsumeMana(this.manaCost)) + val sideEffects = mutableListOf(OperatorSideEffect.ConsumeMedia(this.mediaCost)) return OperationResult(continuation, stack, ravenmind, sideEffects) } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/spell/SpellAction.kt b/Common/src/main/java/at/petrak/hexcasting/api/spell/SpellAction.kt index 342e7135..dfb49c18 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/spell/SpellAction.kt +++ b/Common/src/main/java/at/petrak/hexcasting/api/spell/SpellAction.kt @@ -29,12 +29,12 @@ interface SpellAction : Action { val args = stack.takeLast(this.argc) for (_i in 0 until this.argc) stack.removeLast() val executeResult = this.execute(args, ctx) ?: return OperationResult(continuation, stack, ravenmind, listOf()) - val (spell, mana, particles) = executeResult + val (spell, media, particles) = executeResult val sideEffects = mutableListOf() - if (mana > 0) - sideEffects.add(OperatorSideEffect.ConsumeMana(mana)) + if (media > 0) + sideEffects.add(OperatorSideEffect.ConsumeMedia(media)) // Don't have an effect if the caster isn't enlightened, even if processing other side effects if (!isGreat || ctx.isCasterEnlightened) diff --git a/Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingHarness.kt b/Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingHarness.kt index 1b31f693..fc62f6b2 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingHarness.kt +++ b/Common/src/main/java/at/petrak/hexcasting/api/spell/casting/CastingHarness.kt @@ -446,14 +446,14 @@ class CastingHarness private constructor( /** * Might cast from hitpoints. - * Returns the mana cost still remaining after we deplete everything. It will be <= 0 if we could pay for it. + * Returns the media cost still remaining after we deplete everything. It will be <= 0 if we could pay for it. * * Also awards stats and achievements and such */ - fun withdrawMana(manaCost: Int, allowOvercast: Boolean): Int { - // prevent poor impls from gaining you mana - if (manaCost <= 0) return 0 - var costLeft = manaCost + fun withdrawMedia(mediaCost: Int, allowOvercast: Boolean): Int { + // prevent poor impls from gaining you media + if (mediaCost <= 0) return 0 + var costLeft = mediaCost val fake = this.ctx.caster.isCreative @@ -463,34 +463,34 @@ class CastingHarness private constructor( val tile = this.ctx.world.getBlockEntity(this.ctx.spellCircle.impetusPos) if (tile is BlockEntityAbstractImpetus) { - val manaAvailable = tile.mana - if (manaAvailable < 0) + val mediaAvailable = tile.media + if (mediaAvailable < 0) return 0 - val manaToTake = min(costLeft, manaAvailable) - costLeft -= manaToTake - tile.mana = manaAvailable - manaToTake + val mediaToTake = min(costLeft, mediaAvailable) + costLeft -= mediaToTake + tile.media = mediaAvailable - mediaToTake } } else { val casterStack = this.ctx.caster.getItemInHand(this.ctx.castingHand) - val casterManaHolder = IXplatAbstractions.INSTANCE.findManaHolder(casterStack) + val casterMediaHolder = IXplatAbstractions.INSTANCE.findMediaHolder(casterStack) val casterHexHolder = IXplatAbstractions.INSTANCE.findHexHolder(casterStack) val hexHolderDrawsFromInventory = if (casterHexHolder != null) { - if (casterManaHolder != null) { - val manaAvailable = casterManaHolder.withdrawMedia(-1, true) - val manaToTake = min(costLeft, manaAvailable) - if (!fake) casterManaHolder.withdrawMedia(manaToTake, false) - costLeft -= manaToTake + if (casterMediaHolder != null) { + val mediaAvailable = casterMediaHolder.withdrawMedia(-1, true) + val mediaToTake = min(costLeft, mediaAvailable) + if (!fake) casterMediaHolder.withdrawMedia(mediaToTake, false) + costLeft -= mediaToTake } - casterHexHolder.canDrawManaFromInventory() + casterHexHolder.canDrawMediaFromInventory() } else { false } if (casterStack.`is`(HexItemTags.STAVES) || hexHolderDrawsFromInventory) { - val manaSources = DiscoveryHandlers.collectMediaHolders(this) + val mediaSources = DiscoveryHandlers.collectMediaHolders(this) .sortedWith(Comparator(::compareMediaItem).reversed()) - for (source in manaSources) { + for (source in mediaSources) { costLeft -= extractMedia(source, costLeft, simulate = fake) if (costLeft <= 0) break @@ -498,32 +498,32 @@ class CastingHarness private constructor( if (allowOvercast && costLeft > 0) { // Cast from HP! - val manaToHealth = HexConfig.common().mediaToHealthRate() - val healthtoRemove = costLeft.toDouble() / manaToHealth - val manaAbleToCastFromHP = this.ctx.caster.health * manaToHealth + val mediaToHealth = HexConfig.common().mediaToHealthRate() + val healthtoRemove = costLeft.toDouble() / mediaToHealth + val mediaAbleToCastFromHP = this.ctx.caster.health * mediaToHealth - val manaToActuallyPayFor = min(manaAbleToCastFromHP.toInt(), costLeft) + val mediaToActuallyPayFor = min(mediaAbleToCastFromHP.toInt(), costLeft) costLeft -= if (!fake) { Mishap.trulyHurt(this.ctx.caster, HexDamageSources.OVERCAST, healthtoRemove.toFloat()) - val actuallyTaken = (manaAbleToCastFromHP - (this.ctx.caster.health * manaToHealth)).toInt() + val actuallyTaken = (mediaAbleToCastFromHP - (this.ctx.caster.health * mediaToHealth)).toInt() HexAdvancementTriggers.OVERCAST_TRIGGER.trigger(this.ctx.caster, actuallyTaken) - this.ctx.caster.awardStat(HexStatistics.MANA_OVERCASTED, manaCost - costLeft) + this.ctx.caster.awardStat(HexStatistics.MEDIA_OVERCAST, mediaCost - costLeft) actuallyTaken } else { - manaToActuallyPayFor + mediaToActuallyPayFor } } } } if (!fake) { - // this might be more than the mana cost! for example if we waste a lot of mana from an item - this.ctx.caster.awardStat(HexStatistics.MANA_USED, manaCost - costLeft) - HexAdvancementTriggers.SPEND_MANA_TRIGGER.trigger( + // this might be more than the media cost! for example if we waste a lot of media from an item + this.ctx.caster.awardStat(HexStatistics.MEDIA_USED, mediaCost - costLeft) + HexAdvancementTriggers.SPEND_MEDIA_TRIGGER.trigger( this.ctx.caster, - manaCost - costLeft, + mediaCost - costLeft, if (costLeft < 0) -costLeft else 0 ) } @@ -566,17 +566,17 @@ class CastingHarness private constructor( DiscoveryHandlers.addMediaHolderDiscoverer { it.ctx.caster.inventory.items .filter(::isMediaItem) - .mapNotNull(IXplatAbstractions.INSTANCE::findManaHolder) + .mapNotNull(IXplatAbstractions.INSTANCE::findMediaHolder) } DiscoveryHandlers.addMediaHolderDiscoverer { it.ctx.caster.inventory.armor .filter(::isMediaItem) - .mapNotNull(IXplatAbstractions.INSTANCE::findManaHolder) + .mapNotNull(IXplatAbstractions.INSTANCE::findMediaHolder) } DiscoveryHandlers.addMediaHolderDiscoverer { it.ctx.caster.inventory.offhand .filter(::isMediaItem) - .mapNotNull(IXplatAbstractions.INSTANCE::findManaHolder) + .mapNotNull(IXplatAbstractions.INSTANCE::findMediaHolder) } } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/spell/casting/OperatorSideEffect.kt b/Common/src/main/java/at/petrak/hexcasting/api/spell/casting/OperatorSideEffect.kt index 354f9445..551930c3 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/spell/casting/OperatorSideEffect.kt +++ b/Common/src/main/java/at/petrak/hexcasting/api/spell/casting/OperatorSideEffect.kt @@ -48,14 +48,14 @@ sealed class OperatorSideEffect { } } - data class ConsumeMana(val amount: Int) : OperatorSideEffect() { + data class ConsumeMedia(val amount: Int) : OperatorSideEffect() { override fun performEffect(harness: CastingHarness): Boolean { val overcastOk = harness.ctx.canOvercast - val leftoverMana = harness.withdrawMana(this.amount, overcastOk) - if (leftoverMana > 0 && !overcastOk) { + val leftoverMedia = harness.withdrawMedia(this.amount, overcastOk) + if (leftoverMedia > 0 && !overcastOk) { harness.ctx.caster.sendSystemMessage("hexcasting.message.cant_overcast".asTranslatedComponent) } - return leftoverMana > 0 + return leftoverMedia > 0 } } diff --git a/Common/src/main/java/at/petrak/hexcasting/api/utils/MediaHelper.kt b/Common/src/main/java/at/petrak/hexcasting/api/utils/MediaHelper.kt index 9c998fd9..3ede2c14 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/utils/MediaHelper.kt +++ b/Common/src/main/java/at/petrak/hexcasting/api/utils/MediaHelper.kt @@ -9,19 +9,19 @@ import net.minecraft.world.item.ItemStack import kotlin.math.roundToInt fun isMediaItem(stack: ItemStack): Boolean { - val manaHolder = IXplatAbstractions.INSTANCE.findManaHolder(stack) ?: return false - if (!manaHolder.canProvide()) + val mediaHolder = IXplatAbstractions.INSTANCE.findMediaHolder(stack) ?: return false + if (!mediaHolder.canProvide()) return false - return manaHolder.withdrawMedia(-1, true) > 0 + return mediaHolder.withdrawMedia(-1, true) > 0 } /** - * Extract [cost] mana from [stack]. If [cost] is less than zero, extract all mana instead. + * Extract [cost] media from [stack]. If [cost] is less than zero, extract all media instead. * This may mutate [stack] (and may consume it) unless [simulate] is set. * - * If [drainForBatteries] is false, this will only consider forms of mana that can be used to make new batteries. + * If [drainForBatteries] is false, this will only consider forms of media that can be used to make new batteries. * - * Return the amount of mana extracted. This may be over [cost] if mana is wasted. + * Return the amount of media extracted. This may be over [cost] if media is wasted. */ @JvmOverloads fun extractMedia( @@ -30,18 +30,18 @@ fun extractMedia( drainForBatteries: Boolean = false, simulate: Boolean = false ): Int { - val manaHolder = IXplatAbstractions.INSTANCE.findManaHolder(stack) ?: return 0 + val mediaHolder = IXplatAbstractions.INSTANCE.findMediaHolder(stack) ?: return 0 - return extractMedia(manaHolder, cost, drainForBatteries, simulate) + return extractMedia(mediaHolder, cost, drainForBatteries, simulate) } /** - * Extract [cost] mana from [holder]. If [cost] is less than zero, extract all mana instead. + * Extract [cost] media from [holder]. If [cost] is less than zero, extract all media instead. * This may mutate the stack underlying [holder] (and may consume it) unless [simulate] is set. * - * If [drainForBatteries] is false, this will only consider forms of mana that can be used to make new batteries. + * If [drainForBatteries] is false, this will only consider forms of media that can be used to make new batteries. * - * Return the amount of mana extracted. This may be over [cost] if mana is wasted. + * Return the amount of media extracted. This may be over [cost] if media is wasted. */ fun extractMedia( holder: ADMediaHolder, @@ -58,19 +58,19 @@ fun extractMedia( /** * Sorted from least important to most important */ -fun compareMediaItem(aMana: ADMediaHolder, bMana: ADMediaHolder): Int { - val priority = aMana.consumptionPriority - bMana.consumptionPriority +fun compareMediaItem(aMedia: ADMediaHolder, bMedia: ADMediaHolder): Int { + val priority = aMedia.consumptionPriority - bMedia.consumptionPriority if (priority != 0) return priority - return aMana.withdrawMedia(-1, true) - bMana.withdrawMedia(-1, true) + return aMedia.withdrawMedia(-1, true) - bMedia.withdrawMedia(-1, true) } -fun mediaBarColor(mana: Int, maxMana: Int): Int { - val amt = if (maxMana == 0) { +fun mediaBarColor(media: Int, maxMedia: Int): Int { + val amt = if (maxMedia == 0) { 0f } else { - mana.toFloat() / maxMana.toFloat() + media.toFloat() / maxMedia.toFloat() } val r = Mth.lerp(amt, 84f, 254f) @@ -79,11 +79,11 @@ fun mediaBarColor(mana: Int, maxMana: Int): Int { return Mth.color(r / 255f, g / 255f, b / 255f) } -fun mediaBarWidth(mana: Int, maxMana: Int): Int { - val amt = if (maxMana == 0) { +fun mediaBarWidth(media: Int, maxMedia: Int): Int { + val amt = if (maxMedia == 0) { 0f } else { - mana.toFloat() / maxMana.toFloat() + media.toFloat() / maxMedia.toFloat() } return (13f * amt).roundToInt() } diff --git a/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java b/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java index 50ac1940..116a9cb7 100644 --- a/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java +++ b/Common/src/main/java/at/petrak/hexcasting/client/RegisterClientStuff.java @@ -65,12 +65,12 @@ public class RegisterClientStuff { registerPackagedSpellOverrides(HexItems.ARTIFACT); var x = IClientXplatAbstractions.INSTANCE; - x.registerItemProperty(HexItems.BATTERY, ItemMediaBattery.MANA_PREDICATE, + x.registerItemProperty(HexItems.BATTERY, ItemMediaBattery.MEDIA_PREDICATE, (stack, level, holder, holderID) -> { var item = (MediaHolderItem) stack.getItem(); return item.getMediaFullness(stack); }); - x.registerItemProperty(HexItems.BATTERY, ItemMediaBattery.MAX_MANA_PREDICATE, + x.registerItemProperty(HexItems.BATTERY, ItemMediaBattery.MAX_MEDIA_PREDICATE, (stack, level, holder, holderID) -> { var item = (ItemMediaBattery) stack.getItem(); var max = item.getMaxMedia(stack); diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt index be46c23a..edd1c530 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockAxisRaycast.kt @@ -2,7 +2,7 @@ package at.petrak.hexcasting.common.casting.operators import at.petrak.hexcasting.api.misc.MediaConstants import at.petrak.hexcasting.api.spell.Action -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getVec3 @@ -12,9 +12,9 @@ import net.minecraft.world.level.ClipContext import net.minecraft.world.phys.HitResult import net.minecraft.world.phys.Vec3 -object OpBlockAxisRaycast : ConstManaAction { +object OpBlockAxisRaycast : ConstMediaAction { override val argc = 2 - override val manaCost = MediaConstants.DUST_UNIT / 100 + override val mediaCost = MediaConstants.DUST_UNIT / 100 override fun execute(args: List, ctx: CastingContext): List { val origin = args.getVec3(0, argc) val look = args.getVec3(1, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockRaycast.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockRaycast.kt index 5d93cd54..a7c9e49c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockRaycast.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpBlockRaycast.kt @@ -2,7 +2,7 @@ package at.petrak.hexcasting.common.casting.operators import at.petrak.hexcasting.api.misc.MediaConstants import at.petrak.hexcasting.api.spell.Action -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getVec3 @@ -12,9 +12,9 @@ import net.minecraft.world.level.ClipContext import net.minecraft.world.phys.HitResult import net.minecraft.world.phys.Vec3 -object OpBlockRaycast : ConstManaAction { +object OpBlockRaycast : ConstMediaAction { override val argc = 2 - override val manaCost = MediaConstants.DUST_UNIT / 100 + override val mediaCost = MediaConstants.DUST_UNIT / 100 override fun execute(args: List, ctx: CastingContext): List { val origin = args.getVec3(0, argc) val look = args.getVec3(1, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityHeight.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityHeight.kt index 4d3110e7..d291f3b8 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityHeight.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityHeight.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity import at.petrak.hexcasting.api.spell.iota.Iota -object OpEntityHeight : ConstManaAction { +object OpEntityHeight : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityLook.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityLook.kt index 960560c3..ac0f7cfd 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityLook.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityLook.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity import at.petrak.hexcasting.api.spell.iota.Iota -object OpEntityLook : ConstManaAction { +object OpEntityLook : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityPos.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityPos.kt index 647d0f87..e1ac345d 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityPos.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityPos.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity import at.petrak.hexcasting.api.spell.iota.Iota -class OpEntityPos(val feet: Boolean) : ConstManaAction { +class OpEntityPos(val feet: Boolean) : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityRaycast.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityRaycast.kt index f0c2e107..08169d01 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityRaycast.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityRaycast.kt @@ -2,7 +2,7 @@ package at.petrak.hexcasting.common.casting.operators import at.petrak.hexcasting.api.misc.MediaConstants import at.petrak.hexcasting.api.spell.Action -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getVec3 @@ -11,9 +11,9 @@ import at.petrak.hexcasting.api.spell.iota.NullIota import net.minecraft.world.entity.projectile.ProjectileUtil import net.minecraft.world.phys.AABB -object OpEntityRaycast : ConstManaAction { +object OpEntityRaycast : ConstMediaAction { override val argc = 2 - override val manaCost = MediaConstants.DUST_UNIT / 100 + override val mediaCost = MediaConstants.DUST_UNIT / 100 override fun execute(args: List, ctx: CastingContext): List { val origin = args.getVec3(0, argc) val look = args.getVec3(1, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityVelocity.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityVelocity.kt index ae368498..83bacc74 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityVelocity.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpEntityVelocity.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity @@ -8,7 +8,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.common.misc.PlayerPositionRecorder import net.minecraft.server.level.ServerPlayer -object OpEntityVelocity : ConstManaAction { +object OpEntityVelocity : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpRead.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpRead.kt index 2e39519e..47c51bb0 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpRead.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpRead.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.mishaps.MishapBadOffhandItem import at.petrak.hexcasting.xplat.IXplatAbstractions -object OpRead : ConstManaAction { +object OpRead : ConstMediaAction { override val argc = 0 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpReadable.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpReadable.kt index 9d93a91a..0fb2f3bf 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpReadable.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpReadable.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.xplat.IXplatAbstractions -object OpReadable : ConstManaAction { +object OpReadable : ConstMediaAction { override val argc = 0 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerRead.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerRead.kt index 027fd7ae..df30127e 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerRead.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerRead.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapBadEntity import at.petrak.hexcasting.xplat.IXplatAbstractions -object OpTheCoolerRead : ConstManaAction { +object OpTheCoolerRead : ConstMediaAction { override val argc = 1 override fun execute( diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerReadable.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerReadable.kt index 02af9804..6fafabff 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerReadable.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerReadable.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.xplat.IXplatAbstractions -object OpTheCoolerReadable : ConstManaAction { +object OpTheCoolerReadable : ConstMediaAction { override val argc = 1 override fun execute( diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerWritable.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerWritable.kt index 6a807541..e7be2454 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerWritable.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpTheCoolerWritable.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity @@ -8,7 +8,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.iota.NullIota import at.petrak.hexcasting.xplat.IXplatAbstractions -object OpTheCoolerWritable : ConstManaAction { +object OpTheCoolerWritable : ConstMediaAction { override val argc = 1 override fun execute( diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpWritable.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpWritable.kt index b6a57750..ac52c914 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpWritable.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/OpWritable.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapOthersName import at.petrak.hexcasting.xplat.IXplatAbstractions -object OpWritable : ConstManaAction { +object OpWritable : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/akashic/OpAkashicRead.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/akashic/OpAkashicRead.kt index 4a2453ed..2b19d0a1 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/akashic/OpAkashicRead.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/akashic/OpAkashicRead.kt @@ -1,7 +1,7 @@ package at.petrak.hexcasting.common.casting.operators.akashic import at.petrak.hexcasting.api.misc.MediaConstants -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getBlockPos import at.petrak.hexcasting.api.spell.getPattern @@ -10,9 +10,9 @@ import at.petrak.hexcasting.api.spell.iota.NullIota import at.petrak.hexcasting.api.spell.mishaps.MishapNoAkashicRecord import at.petrak.hexcasting.common.blocks.akashic.BlockAkashicRecord -object OpAkashicRead : ConstManaAction { +object OpAkashicRead : ConstMediaAction { override val argc = 2 - override val manaCost = MediaConstants.DUST_UNIT + override val mediaCost = MediaConstants.DUST_UNIT override fun execute(args: List, ctx: CastingContext): List { val pos = args.getBlockPos(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpCircleBounds.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpCircleBounds.kt index 53070b0f..e888cdab 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpCircleBounds.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpCircleBounds.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.circles -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapNoSpellCircle import net.minecraft.world.phys.Vec3 -class OpCircleBounds(val max: Boolean) : ConstManaAction { +class OpCircleBounds(val max: Boolean) : ConstMediaAction { override val argc = 0 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusDir.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusDir.kt index da70370c..73e0aacd 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusDir.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusDir.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.circles import at.petrak.hexcasting.api.block.circle.BlockAbstractImpetus -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapNoSpellCircle -object OpImpetusDir : ConstManaAction { +object OpImpetusDir : ConstMediaAction { override val argc = 0 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusPos.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusPos.kt index 3f03a6a8..fd8b1cc3 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusPos.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/circles/OpImpetusPos.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.circles -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapNoSpellCircle -object OpImpetusPos : ConstManaAction { +object OpImpetusPos : ConstMediaAction { override val argc = 0 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpAppend.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpAppend.kt index 69b42a26..fc84dfd7 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpAppend.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpAppend.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota -object OpAppend : ConstManaAction { +object OpAppend : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { val list = args.getList(0, argc).toMutableList() diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpConcat.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpConcat.kt index 69e55a46..55fbb17b 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpConcat.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpConcat.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota -object OpConcat : ConstManaAction { +object OpConcat : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { val lhs = args.getList(0, argc).toMutableList() diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpCons.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpCons.kt index 147b1b51..665090a7 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpCons.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpCons.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.SpellList import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota -object OpCons : ConstManaAction { +object OpCons : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { val bottom = args.getList(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpEmptyList.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpEmptyList.kt index 66ec5882..977ae98f 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpEmptyList.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpEmptyList.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext -object OpEmptyList : ConstManaAction { +object OpEmptyList : ConstMediaAction { override val argc = 0 override fun execute(args: List, ctx: CastingContext): List { return emptyList().asActionResult // sorry for taking all the easy impls, hudeler diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndex.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndex.kt index 916157db..a98b4c2a 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndex.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndex.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble import at.petrak.hexcasting.api.spell.getList @@ -8,7 +8,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.iota.NullIota import kotlin.math.roundToInt -object OpIndex : ConstManaAction { +object OpIndex : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { val list = args.getList(0, argc).toMutableList() diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndexOf.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndexOf.kt index d0516cd5..c3ddd19e 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndexOf.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpIndexOf.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota -object OpIndexOf : ConstManaAction { +object OpIndexOf : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpListSize.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpListSize.kt index 3d43911b..decb0f53 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpListSize.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpListSize.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota // it's still called beancounter's distillation in my heart -object OpListSize : ConstManaAction { +object OpListSize : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { return args.getList(0, argc).toList().size.asActionResult // mmm one-liner diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt index 3f2943ef..d008c15e 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt @@ -4,7 +4,7 @@ import at.petrak.hexcasting.api.spell.* import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpModifyInPlace : ConstManaAction { +object OpModifyInPlace : ConstMediaAction { override val argc = 3 override fun execute(args: List, ctx: CastingContext): List { val list = args.getList(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpRemove.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpRemove.kt index 2241ca2d..3b40e798 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpRemove.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpRemove.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getInt import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota -object OpRemove : ConstManaAction { +object OpRemove : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpReverski.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpReverski.kt index 2e3a6d31..5dad2ec9 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpReverski.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpReverski.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota -object OpReverski : ConstManaAction { +object OpReverski : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { return args.getList(0, argc).toList().asReversed().asActionResult // okay kotlin kinda pogged for this diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSingleton.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSingleton.kt index 7cc63852..77f5094b 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSingleton.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSingleton.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpSingleton : ConstManaAction { +object OpSingleton : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { return listOf(args[0]).asActionResult // god i love one-liners diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSlice.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSlice.kt index 9d460d57..5715b8ce 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSlice.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSlice.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList @@ -9,7 +9,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.max import kotlin.math.min -object OpSlice : ConstManaAction { +object OpSlice : ConstMediaAction { override val argc = 3 override fun execute(args: List, ctx: CastingContext): List { val list = args.getList(0, argc).toList() diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSplat.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSplat.kt index 3d357414..7d97f34b 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSplat.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpSplat.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota -object OpSplat : ConstManaAction { +object OpSplat : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpUnCons.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpUnCons.kt index fea26a17..21bba315 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpUnCons.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpUnCons.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.lists -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.iota.ListIota import at.petrak.hexcasting.api.spell.iota.NullIota -object OpUnCons : ConstManaAction { +object OpUnCons : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { val list = args.getList(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAbsLen.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAbsLen.kt index 58f745ba..f5218021 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAbsLen.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAbsLen.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getNumOrVec import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.absoluteValue -object OpAbsLen : ConstManaAction { +object OpAbsLen : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAdd.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAdd.kt index b9f75439..e1bce073 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAdd.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpAdd.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getNumOrVec import at.petrak.hexcasting.api.spell.iota.Iota -object OpAdd : ConstManaAction { +object OpAdd : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCeil.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCeil.kt index cc607fdb..e777be9d 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCeil.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCeil.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.aplKinnie import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getNumOrVec import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.ceil -object OpCeil : ConstManaAction { +object OpCeil : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCoerceToAxial.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCoerceToAxial.kt index e949461e..711a4aa1 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCoerceToAxial.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpCoerceToAxial.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getVec3 @@ -8,7 +8,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota import net.minecraft.core.Direction import net.minecraft.world.phys.Vec3 -object OpCoerceToAxial : ConstManaAction { +object OpCoerceToAxial : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpConstructVec.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpConstructVec.kt index d3f26ff4..879ee478 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpConstructVec.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpConstructVec.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble import at.petrak.hexcasting.api.spell.iota.Iota import net.minecraft.world.phys.Vec3 -object OpConstructVec : ConstManaAction { +object OpConstructVec : ConstMediaAction { override val argc = 3 override fun execute(args: List, ctx: CastingContext): List { val x = args.getDouble(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDeconstructVec.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDeconstructVec.kt index 3dd7fad9..3ef8b204 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDeconstructVec.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDeconstructVec.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getVec3 import at.petrak.hexcasting.api.spell.iota.DoubleIota import at.petrak.hexcasting.api.spell.iota.Iota -object OpDeconstructVec : ConstManaAction { +object OpDeconstructVec : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { val v = args.getVec3(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDivCross.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDivCross.kt index df04d4e2..5db51fbd 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDivCross.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpDivCross.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getNumOrVec @@ -8,7 +8,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapDivideByZero import net.minecraft.world.phys.Vec3 -object OpDivCross : ConstManaAction { +object OpDivCross : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpFloor.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpFloor.kt index ded5e8d3..0aff276c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpFloor.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpFloor.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.aplKinnie import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getNumOrVec import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.floor -object OpFloor : ConstManaAction { +object OpFloor : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpLog.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpLog.kt index a06f4fab..6a3d3a45 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpLog.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpLog.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble @@ -8,7 +8,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapDivideByZero import kotlin.math.log -object OpLog : ConstManaAction { +object OpLog : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpModulo.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpModulo.kt index a854df82..6b418916 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpModulo.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpModulo.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapDivideByZero -object OpModulo : ConstManaAction { +object OpModulo : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpMulDot.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpMulDot.kt index 4b3ccfa2..54124ee4 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpMulDot.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpMulDot.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getNumOrVec import at.petrak.hexcasting.api.spell.iota.Iota -object OpMulDot : ConstManaAction { +object OpMulDot : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpPowProj.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpPowProj.kt index d741839e..2b96ec61 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpPowProj.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpPowProj.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getNumOrVec @@ -9,7 +9,7 @@ import at.petrak.hexcasting.api.spell.mishaps.MishapDivideByZero import net.minecraft.world.phys.Vec3 import kotlin.math.pow -object OpPowProj : ConstManaAction { +object OpPowProj : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpRandom.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpRandom.kt index 53b214c0..8e8a01e6 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpRandom.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpRandom.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpRandom : ConstManaAction { +object OpRandom : ConstMediaAction { override val argc: Int get() = 0 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpSub.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpSub.kt index fe5135be..de354c76 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpSub.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/OpSub.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getNumOrVec import at.petrak.hexcasting.api.spell.iota.Iota import net.minecraft.world.phys.Vec3 -object OpSub : ConstManaAction { +object OpSub : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpAnd.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpAnd.kt index 172f0809..b4ad818a 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpAnd.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpAnd.kt @@ -4,7 +4,7 @@ import at.petrak.hexcasting.api.spell.* import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpAnd : ConstManaAction { +object OpAnd : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpNot.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpNot.kt index 2c3ec445..a2a08b59 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpNot.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpNot.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math.bit -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getLong import at.petrak.hexcasting.api.spell.iota.Iota -object OpNot : ConstManaAction { +object OpNot : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpOr.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpOr.kt index 6987f515..19e2c699 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpOr.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpOr.kt @@ -4,7 +4,7 @@ import at.petrak.hexcasting.api.spell.* import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpOr : ConstManaAction { +object OpOr : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpToSet.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpToSet.kt index 582cd54f..e0a0f01c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpToSet.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpToSet.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math.bit -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getList import at.petrak.hexcasting.api.spell.iota.Iota -object OpToSet : ConstManaAction { +object OpToSet : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpXor.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpXor.kt index 4719f41c..ef33dafb 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpXor.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/bit/OpXor.kt @@ -4,7 +4,7 @@ import at.petrak.hexcasting.api.spell.* import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpXor : ConstManaAction { +object OpXor : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolAnd.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolAnd.kt index 541e9dba..f2a11bd8 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolAnd.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolAnd.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math.logic -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getBool import at.petrak.hexcasting.api.spell.iota.Iota -object OpBoolAnd : ConstManaAction { +object OpBoolAnd : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolIf.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolIf.kt index 3700ac93..c0afc2ce 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolIf.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolIf.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.math.logic -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getBool import at.petrak.hexcasting.api.spell.iota.Iota -object OpBoolIf : ConstManaAction { +object OpBoolIf : ConstMediaAction { override val argc = 3 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolNot.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolNot.kt index 15fd5a24..867b212a 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolNot.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolNot.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math.logic -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getBool import at.petrak.hexcasting.api.spell.iota.Iota -object OpBoolNot : ConstManaAction { +object OpBoolNot : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolOr.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolOr.kt index 349a1ce5..911ab20b 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolOr.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolOr.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math.logic -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getBool import at.petrak.hexcasting.api.spell.iota.Iota -object OpBoolOr : ConstManaAction { +object OpBoolOr : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolXor.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolXor.kt index 02afb86c..7b20841f 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolXor.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpBoolXor.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.math.logic -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getBool import at.petrak.hexcasting.api.spell.iota.Iota -object OpBoolXor : ConstManaAction { +object OpBoolXor : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCoerceToBool.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCoerceToBool.kt index ee3ca505..9e40d796 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCoerceToBool.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCoerceToBool.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.math.logic -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpCoerceToBool : ConstManaAction { +object OpCoerceToBool : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCompare.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCompare.kt index 889af9fd..dca4baee 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCompare.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpCompare.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.math.logic -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble @@ -8,7 +8,7 @@ import at.petrak.hexcasting.api.spell.iota.DoubleIota import at.petrak.hexcasting.api.spell.iota.Iota import java.util.function.BiPredicate -class OpCompare(val acceptsEqual: Boolean, val cmp: BiPredicate) : ConstManaAction { +class OpCompare(val acceptsEqual: Boolean, val cmp: BiPredicate) : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpEquality.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpEquality.kt index 7896d076..4d9964fd 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpEquality.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/logic/OpEquality.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.math.logic -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -class OpEquality(val invert: Boolean) : ConstManaAction { +class OpEquality(val invert: Boolean) : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcCos.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcCos.kt index bf045037..94fddd24 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcCos.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcCos.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math.trig -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDoubleBetween import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.acos -object OpArcCos : ConstManaAction { +object OpArcCos : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcSin.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcSin.kt index 3263ad92..14219960 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcSin.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcSin.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math.trig -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDoubleBetween import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.asin -object OpArcSin : ConstManaAction { +object OpArcSin : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan.kt index 064854b8..baec0ddb 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math.trig -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.atan -object OpArcTan : ConstManaAction { +object OpArcTan : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan2.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan2.kt index 41fa0730..f41518a0 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan2.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpArcTan2.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math.trig -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.atan2 -object OpArcTan2 : ConstManaAction { +object OpArcTan2 : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpCos.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpCos.kt index 1ba1af19..bff354b7 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpCos.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpCos.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math.trig -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.cos -object OpCos : ConstManaAction { +object OpCos : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpSin.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpSin.kt index 55226061..ee7e3900 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpSin.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpSin.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.math.trig -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble import at.petrak.hexcasting.api.spell.iota.Iota import kotlin.math.sin -object OpSin : ConstManaAction { +object OpSin : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpTan.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpTan.kt index e0065724..dd837e47 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpTan.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/math/trig/OpTan.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.math.trig -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getDouble @@ -10,7 +10,7 @@ import at.petrak.hexcasting.api.spell.mishaps.MishapDivideByZero import kotlin.math.cos import kotlin.math.tan -object OpTan : ConstManaAction { +object OpTan : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetCaster.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetCaster.kt index eb7c8095..33d167a4 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetCaster.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetCaster.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.selectors -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpGetCaster : ConstManaAction { +object OpGetCaster : ConstMediaAction { override val argc = 0 override fun execute(args: List, ctx: CastingContext): List { diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntitiesBy.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntitiesBy.kt index f8c5c16c..27a04439 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntitiesBy.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntitiesBy.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.selectors -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getPositiveDouble @@ -18,7 +18,7 @@ import net.minecraft.world.phys.AABB import net.minecraft.world.phys.Vec3 import java.util.function.Predicate -class OpGetEntitiesBy(val checker: Predicate, val negate: Boolean) : ConstManaAction { +class OpGetEntitiesBy(val checker: Predicate, val negate: Boolean) : ConstMediaAction { override val argc = 2 override fun execute(args: List, ctx: CastingContext): List { val pos = args.getVec3(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntityAt.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntityAt.kt index 89b50c7b..ed44271c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntityAt.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/selectors/OpGetEntityAt.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.selectors -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getVec3 @@ -10,7 +10,7 @@ import net.minecraft.world.phys.AABB import net.minecraft.world.phys.Vec3 import java.util.function.Predicate -class OpGetEntityAt(val checker: Predicate) : ConstManaAction { +class OpGetEntityAt(val checker: Predicate) : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { val pos = args.getVec3(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakeBattery.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakeBattery.kt index 1f7550f8..0d2e4f6d 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakeBattery.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakeBattery.kt @@ -56,7 +56,7 @@ object OpMakeBattery : SpellAction { ) { throw MishapBadItem.of( entity, - "mana_for_battery" + "media_for_battery" ) } @@ -68,11 +68,11 @@ object OpMakeBattery : SpellAction { override fun cast(ctx: CastingContext) { if (itemEntity.isAlive) { val entityStack = itemEntity.item.copy() - val manaAmt = extractMedia(entityStack, drainForBatteries = true) - if (manaAmt > 0) { + val mediamount = extractMedia(entityStack, drainForBatteries = true) + if (mediamount > 0) { ctx.caster.setItemInHand( hand, - ItemMediaHolder.withMedia(ItemStack(HexItems.BATTERY), manaAmt, manaAmt) + ItemMediaHolder.withMedia(ItemStack(HexItems.BATTERY), mediamount, mediamount) ) } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakePackagedSpell.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakePackagedSpell.kt index 91d00220..d1a75565 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakePackagedSpell.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpMakePackagedSpell.kt @@ -42,7 +42,7 @@ class OpMakePackagedSpell(val itemType: T, val cost: Int) : ) { throw MishapBadItem.of( entity, - "mana_for_battery" + "media_for_battery" ) } @@ -61,9 +61,9 @@ class OpMakePackagedSpell(val itemType: T, val cost: Int) : && itemEntity.isAlive ) { val entityStack = itemEntity.item.copy() - val manaAmt = extractMedia(entityStack, drainForBatteries = true) - if (manaAmt > 0) { - hexHolder.writeHex(patterns, manaAmt) + val mediamount = extractMedia(entityStack, drainForBatteries = true) + if (mediamount > 0) { + hexHolder.writeHex(patterns, mediamount) } itemEntity.item = entityStack diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpRecharge.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpRecharge.kt index b9060d2b..17bc66eb 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpRecharge.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpRecharge.kt @@ -24,13 +24,13 @@ object OpRecharge : SpellAction { val entity = args.getItemEntity(0, argc) val (handStack, hand) = ctx.getHeldItemToOperateOn { - val mana = IXplatAbstractions.INSTANCE.findManaHolder(it) - mana != null && mana.canRecharge() && mana.insertMedia(-1, true) != 0 + val media = IXplatAbstractions.INSTANCE.findMediaHolder(it) + media != null && media.canRecharge() && media.insertMedia(-1, true) != 0 } - val mana = IXplatAbstractions.INSTANCE.findManaHolder(handStack) + val media = IXplatAbstractions.INSTANCE.findMediaHolder(handStack) - if (mana == null || !mana.canRecharge()) + if (media == null || !media.canRecharge()) throw MishapBadOffhandItem.of( handStack, hand, @@ -42,11 +42,11 @@ object OpRecharge : SpellAction { if (!isMediaItem(entity.item)) { throw MishapBadItem.of( entity, - "mana" + "media" ) } - if (mana.insertMedia(-1, true) == 0) + if (media.insertMedia(-1, true) == 0) return null return Triple( @@ -58,16 +58,16 @@ object OpRecharge : SpellAction { private data class Spell(val itemEntity: ItemEntity, val stack: ItemStack) : RenderedSpell { override fun cast(ctx: CastingContext) { - val mana = IXplatAbstractions.INSTANCE.findManaHolder(stack) + val media = IXplatAbstractions.INSTANCE.findMediaHolder(stack) - if (mana != null && itemEntity.isAlive) { + if (media != null && itemEntity.isAlive) { val entityStack = itemEntity.item.copy() - val emptySpace = mana.insertMedia(-1, true) + val emptySpace = media.insertMedia(-1, true) - val manaAmt = extractMedia(entityStack, emptySpace) + val mediaAmt = extractMedia(entityStack, emptySpace) - mana.insertMedia(manaAmt, false) + media.insertMedia(mediaAmt, false) itemEntity.item = entityStack if (entityStack.isEmpty) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/sentinel/OpGetSentinelPos.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/sentinel/OpGetSentinelPos.kt index 5a06a56a..089d8d5d 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/sentinel/OpGetSentinelPos.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/sentinel/OpGetSentinelPos.kt @@ -1,7 +1,7 @@ package at.petrak.hexcasting.common.casting.operators.spells.sentinel import at.petrak.hexcasting.api.misc.MediaConstants -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota @@ -9,9 +9,9 @@ import at.petrak.hexcasting.api.spell.iota.NullIota import at.petrak.hexcasting.api.spell.mishaps.MishapLocationInWrongDimension import at.petrak.hexcasting.xplat.IXplatAbstractions -object OpGetSentinelPos : ConstManaAction { +object OpGetSentinelPos : ConstMediaAction { override val argc = 0 - override val manaCost = MediaConstants.DUST_UNIT / 10 + override val mediaCost = MediaConstants.DUST_UNIT / 10 override fun execute(args: List, ctx: CastingContext): List { val sentinel = IXplatAbstractions.INSTANCE.getSentinel(ctx.caster) if (sentinel.dimension != ctx.world.dimension()) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/sentinel/OpGetSentinelWayfind.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/sentinel/OpGetSentinelWayfind.kt index 8bbc83db..30b0a161 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/sentinel/OpGetSentinelWayfind.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/sentinel/OpGetSentinelWayfind.kt @@ -1,7 +1,7 @@ package at.petrak.hexcasting.common.casting.operators.spells.sentinel import at.petrak.hexcasting.api.misc.MediaConstants -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getVec3 @@ -12,9 +12,9 @@ import at.petrak.hexcasting.xplat.IXplatAbstractions // TODO I don't think anyone has ever used this operation in the history of the world. // TODO standardize "a negligible amount" of media to be 1/8 a dust -object OpGetSentinelWayfind : ConstManaAction { +object OpGetSentinelWayfind : ConstMediaAction { override val argc = 1 - override val manaCost = MediaConstants.DUST_UNIT / 10 + override val mediaCost = MediaConstants.DUST_UNIT / 10 override fun execute(args: List, ctx: CastingContext): List { val from = args.getVec3(0, argc) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpDuplicate.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpDuplicate.kt index c48ec062..abb7308c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpDuplicate.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpDuplicate.kt @@ -1,10 +1,10 @@ package at.petrak.hexcasting.common.casting.operators.stack -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpDuplicate : ConstManaAction { +object OpDuplicate : ConstMediaAction { override val argc: Int get() = 1 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpDuplicateN.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpDuplicateN.kt index 2df43d5f..c85c666f 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpDuplicateN.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpDuplicateN.kt @@ -1,12 +1,12 @@ package at.petrak.hexcasting.common.casting.operators.stack -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getPositiveInt import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.iota.ListIota -object OpDuplicateN : ConstManaAction { +object OpDuplicateN : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpMask.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpMask.kt index 8ce3490d..797d860d 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpMask.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpMask.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.common.casting.operators.stack -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.utils.asTranslatedComponent @@ -9,7 +9,7 @@ import it.unimi.dsi.fastutil.booleans.BooleanList import net.minecraft.network.chat.Component import net.minecraft.resources.ResourceLocation -class OpMask(val mask: BooleanList, val key: ResourceLocation) : ConstManaAction { +class OpMask(val mask: BooleanList, val key: ResourceLocation) : ConstMediaAction { override val argc: Int get() = mask.size diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpOver.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpOver.kt index d01ebe9e..63039b2a 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpOver.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpOver.kt @@ -1,13 +1,13 @@ package at.petrak.hexcasting.common.casting.operators.stack -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota // Had never heard of this operation before i heard it from uxn, but turns out it's from forth // see also http://www.forth.org/Ting/Forth-for-the-Complete-Idiot/Forth-79-Handy-Reference.pdf // "fisherman's" is called "roll," apparently -object OpOver : ConstManaAction { +object OpOver : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpRotate.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpRotate.kt index 1fbcafa5..614d662c 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpRotate.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpRotate.kt @@ -1,11 +1,11 @@ package at.petrak.hexcasting.common.casting.operators.stack -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota // more Forth -object OpRotate : ConstManaAction { +object OpRotate : ConstMediaAction { override val argc: Int get() = 3 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpSwap.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpSwap.kt index a375cedc..0d76b3fc 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpSwap.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpSwap.kt @@ -1,10 +1,10 @@ package at.petrak.hexcasting.common.casting.operators.stack -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.iota.Iota -object OpSwap : ConstManaAction { +object OpSwap : ConstMediaAction { override val argc: Int get() = 2 diff --git a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemArtifact.java b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemArtifact.java index 02cd3a2f..4fd0f654 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemArtifact.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemArtifact.java @@ -8,7 +8,7 @@ public class ItemArtifact extends ItemPackagedHex { } @Override - public boolean canDrawManaFromInventory(ItemStack stack) { + public boolean canDrawMediaFromInventory(ItemStack stack) { return true; } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCreativeUnlocker.java b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCreativeUnlocker.java index ef31ec94..70467649 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCreativeUnlocker.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCreativeUnlocker.java @@ -174,8 +174,8 @@ public class ItemCreativeUnlocker extends Item implements MediaHolderItem { @Override public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, boolean selected) { if (isDebug(stack, DISPLAY_MEDIA) && !level.isClientSide) { - debugDisplay(stack, TAG_EXTRACTIONS, "withdrawn", "all_mana", entity); - debugDisplay(stack, TAG_INSERTIONS, "inserted", "infinite_mana", entity); + debugDisplay(stack, TAG_EXTRACTIONS, "withdrawn", "all_media", entity); + debugDisplay(stack, TAG_INSERTIONS, "inserted", "infinite_media", entity); } } @@ -185,12 +185,12 @@ public class ItemCreativeUnlocker extends Item implements MediaHolderItem { NBTHelper.remove(stack, tag); for (int i : arr) { if (i < 0) { - entity.sendSystemMessage(Component.translatable("hexcasting.debug.mana_" + langKey, + entity.sendSystemMessage(Component.translatable("hexcasting.debug.media_" + langKey, stack.getDisplayName(), Component.translatable("hexcasting.debug." + allKey).withStyle(ChatFormatting.GRAY)) .withStyle(ChatFormatting.LIGHT_PURPLE)); } else { - entity.sendSystemMessage(Component.translatable("hexcasting.debug.mana_" + langKey + ".with_dust", + entity.sendSystemMessage(Component.translatable("hexcasting.debug.media_" + langKey + ".with_dust", stack.getDisplayName(), Component.literal("" + i).withStyle(ChatFormatting.WHITE), Component.literal(String.format("%.2f", i * 1.0 / MediaConstants.DUST_UNIT)).withStyle( @@ -205,7 +205,7 @@ public class ItemCreativeUnlocker extends Item implements MediaHolderItem { public InteractionResult useOn(UseOnContext context) { BlockEntity be = context.getLevel().getBlockEntity(context.getClickedPos()); if (be instanceof BlockEntityAbstractImpetus impetus) { - impetus.setInfiniteMana(); + impetus.setInfiniteMedia(); context.getLevel().playSound(null, context.getClickedPos(), HexSounds.SPELL_CIRCLE_FIND_BLOCK, SoundSource.PLAYERS, 1f, 1f); return InteractionResult.sidedSuccess(context.getLevel().isClientSide()); } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCypher.java b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCypher.java index 004e6075..c2c786cb 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCypher.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemCypher.java @@ -8,7 +8,7 @@ public class ItemCypher extends ItemPackagedHex { } @Override - public boolean canDrawManaFromInventory(ItemStack stack) { + public boolean canDrawMediaFromInventory(ItemStack stack) { return false; } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaBattery.java b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaBattery.java index 2cf2cf43..93588ba9 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaBattery.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaBattery.java @@ -10,8 +10,8 @@ import org.jetbrains.annotations.NotNull; import static at.petrak.hexcasting.api.HexAPI.modLoc; public class ItemMediaBattery extends ItemMediaHolder { - public static final ResourceLocation MANA_PREDICATE = modLoc("mana"); - public static final ResourceLocation MAX_MANA_PREDICATE = modLoc("max_mana"); + public static final ResourceLocation MEDIA_PREDICATE = modLoc("media"); + public static final ResourceLocation MAX_MEDIA_PREDICATE = modLoc("max_media"); public ItemMediaBattery(Properties pProperties) { super(pProperties); @@ -31,16 +31,16 @@ public class ItemMediaBattery extends ItemMediaHolder { public void fillItemCategory(@NotNull CreativeModeTab tab, @NotNull NonNullList items) { // who was drunk at the wheel when they named this if (allowedIn(tab)) { - var manamounts = new int[]{ + var mediamounts = new int[]{ MediaConstants.CRYSTAL_UNIT, 20 * MediaConstants.CRYSTAL_UNIT, 64 * MediaConstants.CRYSTAL_UNIT, 640 * MediaConstants.CRYSTAL_UNIT, 6400 * MediaConstants.CRYSTAL_UNIT, }; - for (int manamount : manamounts) { + for (int mediamount : mediamounts) { var stack = new ItemStack(this); - items.add(ItemMediaHolder.withMedia(stack, manamount, manamount)); + items.add(ItemMediaHolder.withMedia(stack, mediamount, mediamount)); } } } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaHolder.java b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaHolder.java index 1b5918ad..9713d7f7 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaHolder.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemMediaHolder.java @@ -18,8 +18,8 @@ import java.text.DecimalFormat; import java.util.List; public abstract class ItemMediaHolder extends Item implements MediaHolderItem { - public static final String TAG_MANA = "hexcasting:mana"; - public static final String TAG_MAX_MANA = "hexcasting:start_mana"; + public static final String TAG_MEDIA = "hexcasting:media"; + public static final String TAG_MAX_MEDIA = "hexcasting:start_media"; public static final TextColor HEX_COLOR = TextColor.fromRgb(0xb38ef3); @@ -35,11 +35,11 @@ public abstract class ItemMediaHolder extends Item implements MediaHolderItem { super(pProperties); } - public static ItemStack withMedia(ItemStack stack, int mana, int maxMana) { + public static ItemStack withMedia(ItemStack stack, int media, int maxMedia) { Item item = stack.getItem(); if (item instanceof ItemMediaHolder) { - NBTHelper.putInt(stack, TAG_MANA, mana); - NBTHelper.putInt(stack, TAG_MAX_MANA, maxMana); + NBTHelper.putInt(stack, TAG_MEDIA, media); + NBTHelper.putInt(stack, TAG_MAX_MEDIA, maxMedia); } return stack; @@ -47,17 +47,17 @@ public abstract class ItemMediaHolder extends Item implements MediaHolderItem { @Override public int getMedia(ItemStack stack) { - return NBTHelper.getInt(stack, TAG_MANA); + return NBTHelper.getInt(stack, TAG_MEDIA); } @Override public int getMaxMedia(ItemStack stack) { - return NBTHelper.getInt(stack, TAG_MAX_MANA); + return NBTHelper.getInt(stack, TAG_MAX_MEDIA); } @Override public void setMedia(ItemStack stack, int media) { - NBTHelper.putInt(stack, TAG_MANA, Mth.clamp(media, 0, getMaxMedia(stack))); + NBTHelper.putInt(stack, TAG_MEDIA, Mth.clamp(media, 0, getMaxMedia(stack))); } @Override @@ -67,16 +67,16 @@ public abstract class ItemMediaHolder extends Item implements MediaHolderItem { @Override public int getBarColor(ItemStack pStack) { - var mana = getMedia(pStack); - var maxMana = getMaxMedia(pStack); - return MediaHelper.mediaBarColor(mana, maxMana); + var media = getMedia(pStack); + var maxMedia = getMaxMedia(pStack); + return MediaHelper.mediaBarColor(media, maxMedia); } @Override public int getBarWidth(ItemStack pStack) { - var mana = getMedia(pStack); - var maxMana = getMaxMedia(pStack); - return MediaHelper.mediaBarWidth(mana, maxMana); + var media = getMedia(pStack); + var maxMedia = getMaxMedia(pStack); + return MediaHelper.mediaBarWidth(media, maxMedia); } @Override @@ -87,24 +87,24 @@ public abstract class ItemMediaHolder extends Item implements MediaHolderItem { @Override public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { - var maxMana = getMaxMedia(pStack); - if (maxMana > 0) { - var mana = getMedia(pStack); + var maxMedia = getMaxMedia(pStack); + if (maxMedia > 0) { + var media = getMedia(pStack); var fullness = getMediaFullness(pStack); - var color = TextColor.fromRgb(MediaHelper.mediaBarColor(mana, maxMana)); + var color = TextColor.fromRgb(MediaHelper.mediaBarColor(media, maxMedia)); - var manaAmount = Component.literal(DUST_AMOUNT.format(mana / (float) MediaConstants.DUST_UNIT)); + var mediamount = Component.literal(DUST_AMOUNT.format(media / (float) MediaConstants.DUST_UNIT)); var percentFull = Component.literal(PERCENTAGE.format(100f * fullness) + "%"); - var maxCapacity = Component.translatable("hexcasting.tooltip.mana", DUST_AMOUNT.format(maxMana / (float) MediaConstants.DUST_UNIT)); + var maxCapacity = Component.translatable("hexcasting.tooltip.media", DUST_AMOUNT.format(maxMedia / (float) MediaConstants.DUST_UNIT)); - manaAmount.withStyle(style -> style.withColor(HEX_COLOR)); + mediamount.withStyle(style -> style.withColor(HEX_COLOR)); maxCapacity.withStyle(style -> style.withColor(HEX_COLOR)); percentFull.withStyle(style -> style.withColor(color)); pTooltipComponents.add( - Component.translatable("hexcasting.tooltip.mana_amount.advanced", - manaAmount, maxCapacity, percentFull)); + Component.translatable("hexcasting.tooltip.media_amount.advanced", + mediamount, maxCapacity, percentFull)); } super.appendHoverText(pStack, pLevel, pTooltipComponents, pIsAdvanced); diff --git a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemPackagedHex.java b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemPackagedHex.java index 79806fd4..5331a4fc 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemPackagedHex.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemPackagedHex.java @@ -74,7 +74,7 @@ public abstract class ItemPackagedHex extends ItemMediaHolder implements HexHold } @Override - public void writeHex(ItemStack stack, List program, int mana) { + public void writeHex(ItemStack stack, List program, int media) { ListTag patsTag = new ListTag(); for (Iota pat : program) { patsTag.add(HexIotaTypes.serialize(pat)); @@ -82,14 +82,14 @@ public abstract class ItemPackagedHex extends ItemMediaHolder implements HexHold NBTHelper.putList(stack, TAG_PROGRAM, patsTag); - withMedia(stack, mana, mana); + withMedia(stack, media, media); } @Override public void clearHex(ItemStack stack) { NBTHelper.remove(stack, ItemPackagedHex.TAG_PROGRAM); - NBTHelper.remove(stack, TAG_MANA); - NBTHelper.remove(stack, TAG_MAX_MANA); + NBTHelper.remove(stack, TAG_MEDIA); + NBTHelper.remove(stack, TAG_MAX_MEDIA); } @Override diff --git a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemTrinket.java b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemTrinket.java index c6291e52..4eb24e6a 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemTrinket.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/items/magic/ItemTrinket.java @@ -8,7 +8,7 @@ public class ItemTrinket extends ItemPackagedHex { } @Override - public boolean canDrawManaFromInventory(ItemStack stack) { + public boolean canDrawMediaFromInventory(ItemStack stack) { return false; } diff --git a/Common/src/main/java/at/petrak/hexcasting/datagen/HexAdvancements.java b/Common/src/main/java/at/petrak/hexcasting/datagen/HexAdvancements.java index c076d726..2b1651d3 100644 --- a/Common/src/main/java/at/petrak/hexcasting/datagen/HexAdvancements.java +++ b/Common/src/main/java/at/petrak/hexcasting/datagen/HexAdvancements.java @@ -3,7 +3,7 @@ package at.petrak.hexcasting.datagen; import at.petrak.hexcasting.api.HexAPI; import at.petrak.hexcasting.api.advancements.FailToCastGreatSpellTrigger; import at.petrak.hexcasting.api.advancements.OvercastTrigger; -import at.petrak.hexcasting.api.advancements.SpendManaTrigger; +import at.petrak.hexcasting.api.advancements.SpendMediaTrigger; import at.petrak.hexcasting.api.misc.MediaConstants; import at.petrak.hexcasting.common.items.ItemLoreFragment; import at.petrak.hexcasting.common.lib.HexBlocks; @@ -50,14 +50,14 @@ public class HexAdvancements extends PaucalAdvancementProvider { Advancement.Builder.advancement() .display(simpleDisplay(Items.GLISTERING_MELON_SLICE, "wasteful_cast", FrameType.TASK)) .parent(root) - .addCriterion("waste_amt", new SpendManaTrigger.Instance(EntityPredicate.Composite.ANY, + .addCriterion("waste_amt", new SpendMediaTrigger.Instance(EntityPredicate.Composite.ANY, MinMaxBounds.Ints.ANY, MinMaxBounds.Ints.atLeast(89 * MediaConstants.DUST_UNIT / 10))) .save(consumer, prefix("aaa_wasteful_cast")); Advancement.Builder.advancement() .display(simpleDisplay(HexItems.CHARGED_AMETHYST, "big_cast", FrameType.TASK)) .parent(root) - .addCriterion("cast_amt", new SpendManaTrigger.Instance(EntityPredicate.Composite.ANY, + .addCriterion("cast_amt", new SpendMediaTrigger.Instance(EntityPredicate.Composite.ANY, MinMaxBounds.Ints.atLeast(64 * MediaConstants.CRYSTAL_UNIT), MinMaxBounds.Ints.ANY)) .save(consumer, prefix("aab_big_cast")); diff --git a/Common/src/main/java/at/petrak/hexcasting/interop/pehkui/OpGetScale.kt b/Common/src/main/java/at/petrak/hexcasting/interop/pehkui/OpGetScale.kt index bcc430e3..da1102b1 100644 --- a/Common/src/main/java/at/petrak/hexcasting/interop/pehkui/OpGetScale.kt +++ b/Common/src/main/java/at/petrak/hexcasting/interop/pehkui/OpGetScale.kt @@ -1,17 +1,17 @@ package at.petrak.hexcasting.interop.pehkui -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.xplat.IXplatAbstractions -object OpGetScale : ConstManaAction { +object OpGetScale : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { val target = args.getEntity(0, argc) return IXplatAbstractions.INSTANCE.pehkuiApi.getScale(target).toDouble().asActionResult } -} \ No newline at end of file +} diff --git a/Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java b/Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java index 20e14cac..93854d8a 100644 --- a/Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java +++ b/Common/src/main/java/at/petrak/hexcasting/xplat/IXplatAbstractions.java @@ -97,7 +97,7 @@ public interface IXplatAbstractions { void clearCastingData(ServerPlayer player); @Nullable - ADMediaHolder findManaHolder(ItemStack stack); + ADMediaHolder findMediaHolder(ItemStack stack); @Nullable ADIotaHolder findDataHolder(ItemStack stack); diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.json b/Common/src/main/resources/assets/hexcasting/lang/en_us.json index 163e9a2d..8c2c87e8 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.json +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.json @@ -142,9 +142,9 @@ "hexcasting.spelldata.entity.whoknows": "An unknown entity", "hexcasting.spelldata.akashic.nopos": "The owning record does not know of any iota here (this is a bug)", - "hexcasting.tooltip.mana": "%s dust", - "hexcasting.tooltip.mana_amount": "Contains: %s (%s)", - "hexcasting.tooltip.mana_amount.advanced": "Contains: %s/%s (%s)", + "hexcasting.tooltip.media": "%s dust", + "hexcasting.tooltip.media_amount": "Contains: %s (%s)", + "hexcasting.tooltip.media_amount.advanced": "Contains: %s/%s (%s)", "gui.hexcasting.spellcasting": "Hex Grid", "tag.hexcasting.staves": "Hex Staves", @@ -185,8 +185,8 @@ "advancement.hexcasting:lore/experiment2": "Wooleye Interview Logs", "advancement.hexcasting:lore/inventory": "Restoration Log 72", - "stat.hexcasting.mana_used": "Media Consumed (in dust)", - "stat.hexcasting.mana_overcasted": "Media Overcast (in dust)", + "stat.hexcasting.media_used": "Media Consumed (in dust)", + "stat.hexcasting.media_overcasted": "Media Overcast (in dust)", "stat.hexcasting.patterns_drawn": "Patterns Drawn", "stat.hexcasting.spells_cast": "Spells Cast", @@ -200,12 +200,12 @@ "command.hexcasting.brainsweep.fail.badtype": "%s is not a villager", "command.hexcasting.brainsweep.fail.already": "%s is already empty", "hexcasting.pattern.unknown": "Unknown pattern resource location %s", - "hexcasting.debug.mana_withdrawn": "%s - Media withdrawn: %s", - "hexcasting.debug.mana_withdrawn.with_dust": "%s - Media withdrawn: %s (%s in dust)", - "hexcasting.debug.mana_inserted": "%s - Media inserted: %s", - "hexcasting.debug.mana_inserted.with_dust": "%s - Media inserted: %s (%s in dust)", - "hexcasting.debug.all_mana": "Entire contents", - "hexcasting.debug.infinite_mana": "Infinite", + "hexcasting.debug.media_withdrawn": "%s - Media withdrawn: %s", + "hexcasting.debug.media_withdrawn.with_dust": "%s - Media withdrawn: %s (%s in dust)", + "hexcasting.debug.media_inserted": "%s - Media inserted: %s", + "hexcasting.debug.media_inserted.with_dust": "%s - Media inserted: %s (%s in dust)", + "hexcasting.debug.all_media": "Entire contents", + "hexcasting.debug.infinite_media": "Infinite", "hexcasting.message.cant_overcast": "That Hex needed more media than I had... I should double-check my math.", "hexcasting.message.cant_great_spell": "The spell failed, somehow... am I not skilled enough?", @@ -489,8 +489,8 @@ "hexcasting.mishap.bad_item.iota.read": "a place to read iotas from", "hexcasting.mishap.bad_item.iota.write": "a place to write iotas to", "hexcasting.mishap.bad_item.iota.readonly": "a place that will accept %s", - "hexcasting.mishap.bad_item.mana": "a media-containing item", - "hexcasting.mishap.bad_item.mana_for_battery": "a raw media item", + "hexcasting.mishap.bad_item.media": "a media-containing item", + "hexcasting.mishap.bad_item.media_for_battery": "a raw media item", "hexcasting.mishap.bad_item.only_one": "exactly one item", "hexcasting.mishap.bad_item.eraseable": "an eraseable item", "hexcasting.mishap.bad_item.bottle": "a glass bottle", diff --git a/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/items/phials.json b/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/items/phials.json index 953b7c53..f0100e84 100644 --- a/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/items/phials.json +++ b/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/items/phials.json @@ -1,7 +1,7 @@ { "name": "hexcasting.entry.phials", "category": "hexcasting:items", - "icon": "hexcasting:battery{mana:10000,max_mana:10000}", + "icon": "hexcasting:battery{media:10000,max_media:10000}", "sortnum": 7, "advancement": "hexcasting:root", "read_by_default": true, @@ -21,7 +21,7 @@ { "type": "patchouli:spotlight", "text": "hexcasting.page.phials.desc", - "item": "hexcasting:battery{mana:10000,max_mana:10000}", + "item": "hexcasting:battery{media:10000,max_media:10000}", "link_recipe": true } ] diff --git a/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/great_spells/make_battery.json b/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/great_spells/make_battery.json index f65c1310..1d0af228 100644 --- a/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/great_spells/make_battery.json +++ b/Common/src/main/resources/data/hexcasting/patchouli_books/thehexbook/en_us/entries/patterns/great_spells/make_battery.json @@ -1,7 +1,7 @@ { "name": "hexcasting.spell.hexcasting:craft/battery", "category": "hexcasting:patterns/great_spells", - "icon": "hexcasting:battery{mana:10000,max_mana:10000}", + "icon": "hexcasting:battery{media:10000,max_media:10000}", "sortnum": 6, "advancement": "hexcasting:root", "read_by_default": true, diff --git a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b index 7a4eaee8..2b458b7d 100644 --- a/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b +++ b/Fabric/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b @@ -1,20 +1,21 @@ -// 1.19.2 2022-11-04T12:20:15.6832366 Tags for minecraft:item -684c3206f38cc9cc494d5875c5e56aad004486af data\minecraft\tags\items\logs_that_burn.json -38d781b60c5c37dc025d4c7e9ec5aa680f2a5835 data\c\tags\items\gems.json -4461ef6db41a675fd077dd833cfd0ea537e755be data\c\tags\items\amethyst_dusts.json -5928bad07d3872bb60f29ef4f3c885c8e1967c20 data\hexcasting\tags\items\phial_base.json -e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data\hexcasting\tags\items\edified_planks.json -684c3206f38cc9cc494d5875c5e56aad004486af data\minecraft\tags\items\logs.json -684c3206f38cc9cc494d5875c5e56aad004486af data\hexcasting\tags\items\edified_logs.json -5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data\minecraft\tags\items\slabs.json -fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data\minecraft\tags\items\doors.json -5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data\minecraft\tags\items\wooden_trapdoors.json -37cff4ce449b8069b59b2327d78e073fc026d348 data\minecraft\tags\items\wooden_pressure_plates.json -20183cd61968ff6548df2dde1100b6378d68d64b data\minecraft\tags\items\buttons.json -5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data\minecraft\tags\items\wooden_slabs.json -fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data\minecraft\tags\items\wooden_doors.json -5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data\minecraft\tags\items\trapdoors.json -e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data\minecraft\tags\items\planks.json -5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data\minecraft\tags\items\leaves.json -20183cd61968ff6548df2dde1100b6378d68d64b data\minecraft\tags\items\wooden_buttons.json -72ae9c5305aa948e78f95069eb34ecd532915fbf data\hexcasting\tags\items\staves.json +// 1.19.2 2022-11-09T19:48:37.741505 Tags for minecraft:item +5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/items/wooden_slabs.json +fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/wooden_doors.json +e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/minecraft/tags/items/planks.json +38d781b60c5c37dc025d4c7e9ec5aa680f2a5835 data/c/tags/items/gems.json +4461ef6db41a675fd077dd833cfd0ea537e755be data/c/tags/items/amethyst_dusts.json +5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/items/trapdoors.json +37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/items/wooden_pressure_plates.json +684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/items/logs.json +24145229528668829a1bcecf18a6377ebd07ccf8 data/hexcasting/tags/items/grants_root_advancement.json +684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/items/logs_that_burn.json +20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/items/wooden_buttons.json +e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/items/edified_planks.json +5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/items/wooden_trapdoors.json +5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/items/slabs.json +684c3206f38cc9cc494d5875c5e56aad004486af data/hexcasting/tags/items/edified_logs.json +20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/items/buttons.json +5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/items/leaves.json +72ae9c5305aa948e78f95069eb34ecd532915fbf data/hexcasting/tags/items/staves.json +5928bad07d3872bb60f29ef4f3c885c8e1967c20 data/hexcasting/tags/items/phial_base.json +fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/items/doors.json diff --git a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 index b59a92c9..896cf579 100644 --- a/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 +++ b/Fabric/src/generated/resources/.cache/67cce32b1c3cbbcb1f646605f4914e3f196986c2 @@ -1,39 +1,39 @@ -// 1.19.2 2022-11-04T12:20:15.4322403 LootTables -543b9a1b5f81ae468f08ed055b9f086d5d2c3278 data\hexcasting\loot_tables\blocks\edified_slab.json -a39e834a389257f05d72d2fa2ea43c22a6066bb5 data\hexcasting\loot_tables\blocks\amethyst_edified_leaves.json -5da5b504c400c052ee8b03cf88e78dc567456ef8 data\hexcasting\loot_tables\blocks\amethyst_sconce.json -5ab3568a18745879cf60b2febd2c650b3f8cdb52 data\hexcasting\loot_tables\blocks\edified_pressure_plate.json -8c81bd237a36b4f3dfb3ef174f455f1edd606b74 data\hexcasting\loot_tables\blocks\edified_planks.json -c8dd063aa3fe320f9f4518736d4ae97ba2c93a79 data\hexcasting\loot_tables\blocks\impetus_storedplayer.json -47f8f9442a6f072f04709551eb0b997233731310 data\hexcasting\loot_tables\blocks\edified_button.json -01a50f557196c705c275722015cf893e0abe6425 data\hexcasting\loot_tables\inject\scroll_loot_many.json -d21fdf6326f7a9958df22224e5e34489d63e013d data\hexcasting\loot_tables\blocks\edified_door.json -b7f7af68760b51d0c438f5c6039f1cd7157fa452 data\hexcasting\loot_tables\blocks\ancient_scroll_paper.json -4bd736b9d96bb5a0f0b18cb423566bf0ec63f530 data\hexcasting\loot_tables\blocks\scroll_paper.json -5432a6fece51aa2120ff28eb3044d43f45ac2c8c data\hexcasting\loot_tables\blocks\citrine_edified_leaves.json -2a9a51aed541bb1ede76c34271e1262fc7bcd300 data\hexcasting\loot_tables\blocks\edified_stairs.json -201bbf7adff979ff8cb087e1798da5a2a31eed09 data\hexcasting\loot_tables\blocks\akashic_connector.json -cfb39e2151725fe4f9a7269d9b5de8031ea54a44 data\hexcasting\loot_tables\blocks\directrix_redstone.json -2a38344306b3ee7245c271f4af339544bc4abab8 data\hexcasting\loot_tables\blocks\edified_wood.json -2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data\hexcasting\loot_tables\blocks\edified_tile.json -e17ca4b3e84c4fb6dadfee273e6040cf15724014 data\hexcasting\loot_tables\inject\amethyst_cluster.json -dec1d3592e82f99d9e059d9c771530f103b2bda5 data\hexcasting\loot_tables\blocks\empty_directrix.json -f99e241d651abe7f9234301508bc805deba179ad data\hexcasting\loot_tables\blocks\empty_impetus.json -745b510161cfff804b115f566ad6b50e0cb492d1 data\hexcasting\loot_tables\blocks\slate.json -3b1e2f738c4906371a4cdecf24253ad94ae66320 data\hexcasting\loot_tables\blocks\akashic_bookshelf.json -e329c8ad61d61ad9be91d6ab4c36d57c05990e0c data\hexcasting\loot_tables\blocks\amethyst_dust_block.json -457b355c6a5e1b2ee4ddda37a39084ceef3546d7 data\hexcasting\loot_tables\blocks\stripped_edified_log.json -d51eabb3875bdf6d31db635e15db10cb25e8bcc5 data\hexcasting\loot_tables\blocks\edified_panel.json -9ee4259b51cccd4582fb2e52ab9f64e92af857bb data\hexcasting\loot_tables\blocks\edified_log.json -a7a08d76b8a1b1596a0d67d422d7a0d93f3a1d2f data\hexcasting\loot_tables\inject\scroll_loot_few.json -6e4bc6364e7e1cc97f1ad1127608a0b95e4d156f data\hexcasting\loot_tables\blocks\stripped_edified_wood.json -16498092b43c43a4a7617ba91bcfcc13b87d9a7e data\hexcasting\loot_tables\blocks\akashic_record.json -d640fa26a044349d1f989a8afc6af9e8f3a520ba data\hexcasting\loot_tables\blocks\ancient_scroll_paper_lantern.json -14b3c20c41228c7e6cc6341abe738fdb4b776ec4 data\hexcasting\loot_tables\blocks\aventurine_edified_leaves.json -ac9d01324ffe7c1ea963aa7def5c177db820067f data\hexcasting\loot_tables\blocks\amethyst_tiles.json -fd874549344d85ec2bb6edcb7fe7af62cafebba2 data\hexcasting\loot_tables\inject\scroll_loot_some.json -5596975fb09fab7f74ec06af9f2b854cf198a775 data\hexcasting\loot_tables\blocks\slate_block.json -d97f573d03712b4d677e3a0a22ab6a000b1db060 data\hexcasting\loot_tables\blocks\impetus_rightclick.json -c089d3d230ae5354f2a9953f65bba77b6e26d976 data\hexcasting\loot_tables\blocks\edified_trapdoor.json -a3ca7f9427bd57a6033f241754d49425251cc091 data\hexcasting\loot_tables\blocks\scroll_paper_lantern.json -90f8f97b941408ed89d01b69e1fccf5f2a35e2bc data\hexcasting\loot_tables\blocks\impetus_look.json +// 1.19.2 2022-11-09T19:48:37.716082 LootTables +a39e834a389257f05d72d2fa2ea43c22a6066bb5 data/hexcasting/loot_tables/blocks/amethyst_edified_leaves.json +01a50f557196c705c275722015cf893e0abe6425 data/hexcasting/loot_tables/inject/scroll_loot_many.json +d97f573d03712b4d677e3a0a22ab6a000b1db060 data/hexcasting/loot_tables/blocks/impetus_rightclick.json +14b3c20c41228c7e6cc6341abe738fdb4b776ec4 data/hexcasting/loot_tables/blocks/aventurine_edified_leaves.json +47f8f9442a6f072f04709551eb0b997233731310 data/hexcasting/loot_tables/blocks/edified_button.json +5ab3568a18745879cf60b2febd2c650b3f8cdb52 data/hexcasting/loot_tables/blocks/edified_pressure_plate.json +8c81bd237a36b4f3dfb3ef174f455f1edd606b74 data/hexcasting/loot_tables/blocks/edified_planks.json +6e4bc6364e7e1cc97f1ad1127608a0b95e4d156f data/hexcasting/loot_tables/blocks/stripped_edified_wood.json +e329c8ad61d61ad9be91d6ab4c36d57c05990e0c data/hexcasting/loot_tables/blocks/amethyst_dust_block.json +d640fa26a044349d1f989a8afc6af9e8f3a520ba data/hexcasting/loot_tables/blocks/ancient_scroll_paper_lantern.json +457b355c6a5e1b2ee4ddda37a39084ceef3546d7 data/hexcasting/loot_tables/blocks/stripped_edified_log.json +a3ca7f9427bd57a6033f241754d49425251cc091 data/hexcasting/loot_tables/blocks/scroll_paper_lantern.json +16498092b43c43a4a7617ba91bcfcc13b87d9a7e data/hexcasting/loot_tables/blocks/akashic_record.json +c089d3d230ae5354f2a9953f65bba77b6e26d976 data/hexcasting/loot_tables/blocks/edified_trapdoor.json +f99e241d651abe7f9234301508bc805deba179ad data/hexcasting/loot_tables/blocks/empty_impetus.json +2c42fc5d8c74c98ad15b8bd50f56541fccbef750 data/hexcasting/loot_tables/blocks/edified_tile.json +3b1e2f738c4906371a4cdecf24253ad94ae66320 data/hexcasting/loot_tables/blocks/akashic_bookshelf.json +a7a08d76b8a1b1596a0d67d422d7a0d93f3a1d2f data/hexcasting/loot_tables/inject/scroll_loot_few.json +9ee4259b51cccd4582fb2e52ab9f64e92af857bb data/hexcasting/loot_tables/blocks/edified_log.json +e17ca4b3e84c4fb6dadfee273e6040cf15724014 data/hexcasting/loot_tables/inject/amethyst_cluster.json +ac9d01324ffe7c1ea963aa7def5c177db820067f data/hexcasting/loot_tables/blocks/amethyst_tiles.json +4bd736b9d96bb5a0f0b18cb423566bf0ec63f530 data/hexcasting/loot_tables/blocks/scroll_paper.json +fd874549344d85ec2bb6edcb7fe7af62cafebba2 data/hexcasting/loot_tables/inject/scroll_loot_some.json +2a38344306b3ee7245c271f4af339544bc4abab8 data/hexcasting/loot_tables/blocks/edified_wood.json +d51eabb3875bdf6d31db635e15db10cb25e8bcc5 data/hexcasting/loot_tables/blocks/edified_panel.json +5432a6fece51aa2120ff28eb3044d43f45ac2c8c data/hexcasting/loot_tables/blocks/citrine_edified_leaves.json +201bbf7adff979ff8cb087e1798da5a2a31eed09 data/hexcasting/loot_tables/blocks/akashic_connector.json +b7f7af68760b51d0c438f5c6039f1cd7157fa452 data/hexcasting/loot_tables/blocks/ancient_scroll_paper.json +745b510161cfff804b115f566ad6b50e0cb492d1 data/hexcasting/loot_tables/blocks/slate.json +dec1d3592e82f99d9e059d9c771530f103b2bda5 data/hexcasting/loot_tables/blocks/empty_directrix.json +543b9a1b5f81ae468f08ed055b9f086d5d2c3278 data/hexcasting/loot_tables/blocks/edified_slab.json +2a9a51aed541bb1ede76c34271e1262fc7bcd300 data/hexcasting/loot_tables/blocks/edified_stairs.json +5da5b504c400c052ee8b03cf88e78dc567456ef8 data/hexcasting/loot_tables/blocks/amethyst_sconce.json +5596975fb09fab7f74ec06af9f2b854cf198a775 data/hexcasting/loot_tables/blocks/slate_block.json +c8dd063aa3fe320f9f4518736d4ae97ba2c93a79 data/hexcasting/loot_tables/blocks/impetus_storedplayer.json +d21fdf6326f7a9958df22224e5e34489d63e013d data/hexcasting/loot_tables/blocks/edified_door.json +cfb39e2151725fe4f9a7269d9b5de8031ea54a44 data/hexcasting/loot_tables/blocks/directrix_redstone.json +90f8f97b941408ed89d01b69e1fccf5f2a35e2bc data/hexcasting/loot_tables/blocks/impetus_look.json diff --git a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 index 0dde25e5..15fc23ff 100644 --- a/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 +++ b/Fabric/src/generated/resources/.cache/75bcd4dba6ca7d365462b0ec45e291d1056349c4 @@ -1,22 +1,22 @@ -// 1.19.2 2022-11-04T12:20:15.680238 Tags for minecraft:block -36b54a86d2ed41c8a503f7a61817a7a9d7a94536 data\minecraft\tags\blocks\crystal_sound_blocks.json -684c3206f38cc9cc494d5875c5e56aad004486af data\hexcasting\tags\blocks\edified_logs.json -684c3206f38cc9cc494d5875c5e56aad004486af data\minecraft\tags\blocks\logs_that_burn.json -e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data\minecraft\tags\blocks\planks.json -20183cd61968ff6548df2dde1100b6378d68d64b data\minecraft\tags\blocks\wooden_buttons.json -f38c2a2a896388b3b87f53887609b417930abdf7 data\minecraft\tags\blocks\mineable\axe.json -5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data\minecraft\tags\blocks\mineable\hoe.json -5853312830fdd8ee85e2c5b1be3dd4a6357a4971 data\minecraft\tags\blocks\mineable\pickaxe.json -5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data\minecraft\tags\blocks\leaves.json -e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data\hexcasting\tags\blocks\edified_planks.json -5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data\minecraft\tags\blocks\trapdoors.json -684c3206f38cc9cc494d5875c5e56aad004486af data\minecraft\tags\blocks\logs.json -5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data\minecraft\tags\blocks\wooden_trapdoors.json -37cff4ce449b8069b59b2327d78e073fc026d348 data\minecraft\tags\blocks\wooden_pressure_plates.json -357eddf3cee6f16725bed0701d57b2ca3097d74d data\minecraft\tags\blocks\mineable\shovel.json -fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data\minecraft\tags\blocks\doors.json -fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data\minecraft\tags\blocks\wooden_doors.json -5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data\minecraft\tags\blocks\wooden_slabs.json -37cff4ce449b8069b59b2327d78e073fc026d348 data\minecraft\tags\blocks\pressure_plates.json -20183cd61968ff6548df2dde1100b6378d68d64b data\minecraft\tags\blocks\buttons.json -5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data\minecraft\tags\blocks\slabs.json +// 1.19.2 2022-11-09T19:48:37.743198 Tags for minecraft:block +36b54a86d2ed41c8a503f7a61817a7a9d7a94536 data/minecraft/tags/blocks/crystal_sound_blocks.json +e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/hexcasting/tags/blocks/edified_planks.json +5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/blocks/wooden_slabs.json +20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/buttons.json +5bbfd513fd2eb2090b0c2d1ec33504deb79d53b9 data/minecraft/tags/blocks/slabs.json +684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs_that_burn.json +f38c2a2a896388b3b87f53887609b417930abdf7 data/minecraft/tags/blocks/mineable/axe.json +5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/mineable/hoe.json +5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/trapdoors.json +fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/blocks/wooden_doors.json +5f3b600b4fd98744bd08c993ce7bcb9c2f195cd2 data/minecraft/tags/blocks/leaves.json +37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/pressure_plates.json +37cff4ce449b8069b59b2327d78e073fc026d348 data/minecraft/tags/blocks/wooden_pressure_plates.json +20183cd61968ff6548df2dde1100b6378d68d64b data/minecraft/tags/blocks/wooden_buttons.json +fdb48f194d7937ab6b423fa4b90a4d438bf6dd90 data/minecraft/tags/blocks/doors.json +5216ba5c57db29b8dee9aebc63a2e3b17c97dc17 data/minecraft/tags/blocks/wooden_trapdoors.json +357eddf3cee6f16725bed0701d57b2ca3097d74d data/minecraft/tags/blocks/mineable/shovel.json +684c3206f38cc9cc494d5875c5e56aad004486af data/minecraft/tags/blocks/logs.json +5853312830fdd8ee85e2c5b1be3dd4a6357a4971 data/minecraft/tags/blocks/mineable/pickaxe.json +684c3206f38cc9cc494d5875c5e56aad004486af data/hexcasting/tags/blocks/edified_logs.json +e5df19a1dc6eadf14cd9b0f0fe45a74330b745e9 data/minecraft/tags/blocks/planks.json diff --git a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 613b2ced..db2f9441 100644 --- a/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/Fabric/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,179 +1,186 @@ -// 1.19.2 2022-11-04T12:20:15.6632398 Recipes -9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data\hexcasting\recipes\dye_colorizer_light_blue.json -38e7b64a4a15f1ce496f8c156d7262426f98fbcc data\hexcasting\recipes\acacia_staff.json -f0849d723141b9f02798d474da6594f78755dd51 data\hexcasting\recipes\amethyst_tiles.json -6aa3e7825025d055a70a58acd4fd48eef0480721 data\hexcasting\recipes\edified_wood.json -63d9172717dd1cbb587fc9d92fd69f47b1bb3307 data\hexcasting\recipes\brainsweep\budding_amethyst.json -dc2a9bf96ca9d04ea6bdeb32249322530b5e1cbf data\hexcasting\advancements\recipes\hexcasting.creative_tab\warped_staff.json -735a7d770f23a02dc4ae93644e7f4c44a32e313a data\hexcasting\recipes\oak_staff.json -e687ceab424098d586f0b67a34fe65bee1f4dfca data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_blue.json -dc0fb37084974cf396264d046fa6708338eb0879 data\hexcasting\recipes\pride_colorizer_transgender.json -c93cecd3f883e57f3cce7ad3d6aad44000ed541c data\hexcasting\recipes\ancient_scroll_paper.json -e6ba57745f6841c2dcb537ada2475e880ea25186 data\hexcasting\recipes\dye_colorizer_green.json -86d3a071eaec779167ca51dafaedde0e705cfb70 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_asexual.json -993a613fabd0ee1005bde11ebe92f8046351ba9e data\hexcasting\advancements\recipes\hexcasting.creative_tab\trinket.json -5ffea2f9ccbb855ab3f5aca9cb572f57f26619ae data\hexcasting\recipes\amethyst_dust_unpacking.json -7c7888ba95d1e2e8620a916df546a2b06b592d37 data\hexcasting\recipes\edified_planks.json -aa6c75e8834d47b0a144dac7b6448cbaecb7df44 data\hexcasting\recipes\pride_colorizer_aromantic.json -6e692bdb7e797c1d0fffb5fcc90c5a3b28e4aaff data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_aromantic.json -0d08dab8c9700c7b5b32ad35e7b665a2e3c2cdc7 data\hexcasting\advancements\recipes\hexcasting.creative_tab\artifact.json -ef5a19ab2710fd0ce836d767588fe6a54a528a48 data\hexcasting\recipes\dye_colorizer_white.json -6e6c73a93e0e06ff399d95e40baf4e06f3a25a0a data\hexcasting\advancements\recipes\hexcasting.creative_tab\slate_block_from_slates.json -5ba498c4c19f74cbb456385bccda96d4a8d1d1cc data\hexcasting\advancements\recipes\hexcasting.creative_tab\slate_block.json -3662834d6e0bac03aba28f0f9d9f07f511492118 data\hexcasting\recipes\lens.json -3608f0ec056f2c5d29a9a89305218497fd2c4383 data\hexcasting\recipes\stonecutting\amethyst_tiles.json -b6d6716724729f0530a524f92d7e4646455de344 data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_red.json -f0852056a692d776bf537c821f3d166c2be88bd8 data\hexcasting\recipes\spruce_staff.json -04d5ceb50171bf1575b4c0145c4acbbc414a6390 data\hexcasting\advancements\recipes\hexcasting.creative_tab\cypher.json -6e8ba1635146314810ce9181c83024c0c0a931f7 data\hexcasting\advancements\recipes\hexcasting.creative_tab\akashic_bookshelf.json -c8ff04819448a3efb2c031e06045be761db6a2f1 data\hexcasting\advancements\recipes\hexcasting.creative_tab\scroll_medium.json -b54339a9e990419e4820491001c4cbdb7aa9fddb data\hexcasting\recipes\artifact.json -2fa8ff79780daaa523fe9f04a8fa15c186f055c2 data\hexcasting\recipes\dye_colorizer_purple.json -fa49dab810cff4f827d2662a93fc3439a8e99cba data\hexcasting\recipes\pride_colorizer_genderqueer.json -1315f615ebc6593829bd86318d8eb45c2de68876 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_button.json -182c2b5dd406c80ed957e1b43d554cce1b212d28 data\hexcasting\advancements\recipes\hexcasting.creative_tab\jungle_staff.json -c9c2b33afc4b5de1f10df08d901312ee1ded1c5e data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_pansexual.json -d73e5d8fec4d3f7d15888bd292f4ad9c1b37cac5 data\hexcasting\advancements\recipes\hexcasting.creative_tab\ageing_scroll_paper_lantern.json -9d4594ac55f0221fff91bc0a48f54e890edd3596 data\hexcasting\recipes\dark_oak_staff.json -d684142c75bee35e6035d1829e271704d4ccdff3 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_lesbian.json -b2dc08cc62b9a36d6b034aead99e0b328b5efecb data\hexcasting\recipes\scroll_small.json -3514bb0e92046ca12dfd10afb3c47084434f84c2 data\hexcasting\recipes\brainsweep\akashic_record.json -b7250840982952fc23c8b32b77517744329d8d2d data\hexcasting\recipes\spellbook.json -6641b22c79fa29fab15d414afecabd3aa7402b38 data\hexcasting\advancements\recipes\hexcasting.creative_tab\scroll_paper_lantern.json -22ff2d626da7f5fdc1411b4df75a6fc6a0e52df7 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_slab.json -414d605b72164240bc308444c48ed03571cc0d61 data\hexcasting\advancements\recipes\hexcasting.creative_tab\empty_directrix.json -bc100b94798f0b456877b42a5fc9aee7c4f25218 data\hexcasting\recipes\dye_colorizer_magenta.json -4440b41499c9c32e297dc184c39da010ff82ac5e data\hexcasting\advancements\recipes\hexcasting.creative_tab\uuid_colorizer.json -768d70365c56ef1fbad089d3e3fd68548f964227 data\hexcasting\recipes\dye_colorizer_black.json -0efcdb6cd338f382c823e8599e298322a0080dae data\hexcasting\recipes\edified_panel.json -b2496e7ff3b631a148de37896eeb7dbcd2cbf04a data\hexcasting\recipes\scroll_medium.json -3ae790bef91b6ae57ed7e3e792740ea059875293 data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_cyan.json -4f301e8e812f409be41cfddfa74b1fb7c8034edf data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_purple.json -c7d28ccf9df6fc46aa142c2e7b176cc0cb5ea62b data\hexcasting\recipes\empty_impetus.json -bb0f91c534c888d1cff8793b49986dce236c7b2d data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_white.json -a22233090497e1c44082b6eb16ad079d9acc8f7c data\hexcasting\advancements\recipes\brainsweep\brainsweep\impetus_storedplayer.json -d603560d9bbe0bd3e9c0ca5cd502fe874337599e data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_light_gray.json -dfb42a8b723b37df5c8888bdef86a1be35f2de72 data\hexcasting\recipes\pride_colorizer_bisexual.json -ebfa29e0a62a629afbe18681e09cc7be95a3529e data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_yellow.json -108421ab59fc52c69913676abda5e0a045fe1b04 data\hexcasting\recipes\pride_colorizer_gay.json -0c72527448454438308ba5a4e99452b193fad421 data\hexcasting\recipes\dye_colorizer_gray.json -aa4a00864f1b22835612fe60a4715250f3ab2126 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_panel.json -e0e49c8a9977fe2b0619179b11a4379b5b19ace9 data\hexcasting\advancements\recipes\hexcasting.creative_tab\sub_sandwich.json -336465276c06fc59be003ccad3d6fc121fa438f5 data\hexcasting\recipes\edified_staff.json -013a4b5603757f8610709428dad8de79bd9bd590 data\hexcasting\recipes\dye_colorizer_pink.json -c3f9cca50935f7abf141825d78b441033fc0dab8 data\hexcasting\advancements\recipes\hexcasting.creative_tab\scroll.json -25df58c8b78028142c47deb060768d4fbfe2c38e data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_nonbinary.json -cd22886924e7aaeb62e8f7da0747cc950af9dc32 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_plural.json -db105c67babb1ffc1bcad53ed1c98d7eb2fee4b1 data\hexcasting\recipes\pride_colorizer_plural.json -1b210391768fede639b29ae6fc5adf2b8b4e64c6 data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_brown.json -6978ff90efdd067940caccdd29437d2aefd0fe1f data\hexcasting\recipes\scroll_paper.json -220f4dc7c8f857092bcb85b5ccf8936237ededa4 data\hexcasting\advancements\recipes\hexcasting.creative_tab\amethyst_sconce.json -0ed898da60aa78cd526ff4ae0524359891dbd976 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_tile.json -fc0476880c79cf4458dd5b24f77fc980b02534d2 data\hexcasting\recipes\edified_button.json -48b6d3429e3536a85f3a0e9585a7d252ae0d57a3 data\hexcasting\advancements\recipes\hexcasting.creative_tab\jeweler_hammer.json -dfc171097bdd8a8f280e6787ea999286deda643e data\hexcasting\advancements\recipes\hexcasting.creative_tab\focus.json -f0a77ba758e649d0c16a8e2d9964d18f95a544f4 data\hexcasting\advancements\recipes\hexcasting.creative_tab\slate.json -65246cf025a3300dacf9235db546178e83c863e9 data\hexcasting\recipes\pride_colorizer_lesbian.json -8d6f58c45be52e22559fdbc2806ee48ab40d133c data\hexcasting\advancements\recipes\brainsweep\brainsweep\akashic_record.json -b185eee3dc066959c2699284eeed8c5c5de80d33 data\hexcasting\recipes\trinket.json -202e70722198141d5dd961bb087a25873e4928af data\hexcasting\recipes\edified_stairs.json -af7e33f54e29c497cafc6b4ddf1f494a14ecd83f data\hexcasting\recipes\pride_colorizer_pansexual.json -605f921a98b5dabbd80bc762070916e7d6756df6 data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_orange.json -e91b58b8a52d0d69e13102fbf743aab8be177924 data\hexcasting\recipes\pride_colorizer_genderfluid.json -79ebc61817f6ef529c385fe3ed3ff9edb0761f96 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_genderfluid.json -62bfad9dc29406a9807ea33f866cbdfca32e7d0a data\hexcasting\advancements\recipes\hexcasting.creative_tab\amethyst_dust_unpacking.json -2b16fb3f6b4e4e31c5c507e6c0535bd12c7c63a1 data\hexcasting\recipes\dye_colorizer_brown.json -3de6a907c45a97e163caf043292bb693af58e453 data\hexcasting\advancements\recipes\hexcasting.creative_tab\crimson_staff.json -bc91b7e096d8a0033916101f21fa43c06b343e86 data\hexcasting\recipes\dye_colorizer_red.json -90088535c8e4d0beb0725878314c49ac8deb373b data\hexcasting\recipes\amethyst_dust_packing.json -07902912a9ca6f8da48ed579ec318bb760d4f8df data\hexcasting\recipes\pride_colorizer_nonbinary.json -a16ce751797baf92c3dd3f125b564e789aeec260 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_planks.json -ae2c6392cc0ec104c4e3019e1824a1e7f811f1de data\hexcasting\advancements\recipes\hexcasting.creative_tab\abacus.json -323ccf5637e08024ae3984d1dd3585e6af0fd14c data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_demigirl.json -b62b3b67e6a105e1eb47d04c2ededd8d408df7b7 data\hexcasting\advancements\recipes\hexcasting.creative_tab\ancient_scroll_paper.json -045e4eeefde52c09fd5bc24b8fcbe2a4e81f8bdb data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_intersex.json -0101f5c24d8beedcc884ce87b052ad4f6884ddc4 data\hexcasting\recipes\akashic_bookshelf.json -260f89eb21b360ea8b7fdbd23f9977d03ab57149 data\hexcasting\recipes\ancient_scroll_paper_lantern.json -4ba0fcb9b3142029c36cc48b250b89b0cac3f6de data\hexcasting\recipes\akashic_connector.json -12e1ba1ec29bf0eadf1210d2307fab35e9685085 data\hexcasting\recipes\empty_directrix.json -e3416c3e103fe206cbaa352eb5011f81ccfc6aca data\hexcasting\recipes\slate.json -4cc110d5ce9831c0072cc2c4fd8f1a6196f42331 data\hexcasting\advancements\recipes\hexcasting.creative_tab\ancient_scroll_paper_lantern.json -8715e71c2fb59ee458ce217040c9a8dd0db04789 data\hexcasting\advancements\recipes\hexcasting.creative_tab\lens.json -b640608755649a8bde55a434016b14522fa6d2e0 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_wood.json -36c3ea4547b49c7553e7024192d5ddf6f2163422 data\hexcasting\recipes\scroll_paper_lantern.json -d75bc1009064769735d46e7f4f32c65d10a470e3 data\hexcasting\recipes\pride_colorizer_asexual.json -563d6b480a6ebf1c200c2ca7cd62ed305cbf9710 data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_lime.json -773860888fb2d695b775f3afb93b16f43795bcc6 data\hexcasting\recipes\brainsweep\impetus_rightclick.json -0cb3e2e6e0be9f53811f24ad43bf711d07560210 data\hexcasting\advancements\recipes\hexcasting.creative_tab\acacia_staff.json -be7ceaf2b55525f06178fb09070dfeeef8da1c65 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_transgender.json -ad390fe854110e60aec4c805f7bb5fed45b4e5d1 data\hexcasting\advancements\recipes\hexcasting.creative_tab\amethyst_tiles.json -122ca20f3a77c1267e4b8c755e9cd66e56734547 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_genderqueer.json -f91ab1d68c575970ef48ad499ec92057a8ee7b2e data\hexcasting\recipes\cypher.json -0859373b9e60e80f3c8b0962a3bc94903af43d36 data\hexcasting\recipes\stripped_edified_wood.json -8c49c1c022cee20fb2a44046425b48cd0e6659af data\hexcasting\advancements\recipes\hexcasting.creative_tab\birch_staff.json -2a1021614882392be78d22cb557e43cbbd9092ca data\hexcasting\advancements\recipes\brainsweep\brainsweep\impetus_rightclick.json -cc89232d202eec019f584e8c5cc044deee76036b data\hexcasting\recipes\amethyst_sconce.json -4ffed306e5f640054a6f269ae0e548388f087996 data\hexcasting\recipes\warped_staff.json -c86adafd19871ba67f0b7b693247c0a5bdec1020 data\hexcasting\recipes\brainsweep\impetus_storedplayer.json -0ee8d29cb06065a55017a8fc50576193107f958d data\hexcasting\recipes\dynamic\seal_focus.json -9c8503715195c4cb2e2d9a1abe4f94df7bb9f4b5 data\hexcasting\advancements\recipes\hexcasting.creative_tab\stonecutting\amethyst_tiles.json -2aa2e5c268ae440238eaf4cea20011b0c8f81a49 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_demiboy.json -bb42a28d7b19f8f8057630f0d2e99b371e93126a data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_light_blue.json -92d5ec5ddf2b35cc59f5bfe389f80443e7ee1ff8 data\hexcasting\recipes\uuid_colorizer.json -a58f37bc66e65c1ac00ba7dbc4d9a7b902f42aad data\hexcasting\advancements\recipes\hexcasting.creative_tab\oak_staff.json -a184ee70962538e4f8641c707d6dca8796ca36e7 data\hexcasting\recipes\edified_slab.json -04569ccadfd99f203b0485d0c3e877209290f2b3 data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_pink.json -13d03da2cfee5c29e5432806189e18eeefb76e11 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_gay.json -326925a948aeb17aabafbc25ed2562a257796d29 data\hexcasting\recipes\dye_colorizer_yellow.json -1ba5dada44ad7c008756f0e8e7adfe30e2520239 data\hexcasting\recipes\dye_colorizer_lime.json -f8e027860b2505a7217d1264c5d0b6f7feea0679 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_door.json -527f52ec902b9f456099bebe066b15533fe8cffd data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_pressure_plate.json -7ae2bd282afbf2f460a6bb705fe301a2a11d7835 data\hexcasting\advancements\recipes\hexcasting.creative_tab\akashic_connector.json -494a76b3cebcd7b0b37c3f2e655d37b3c7fb762b data\hexcasting\advancements\recipes\hexcasting.creative_tab\spruce_staff.json -6479526ac6b8732814ea3feb97e877896c17f7b7 data\hexcasting\recipes\edified_trapdoor.json -63da3af421dfb38283d750eb3b9761f42e95fb91 data\hexcasting\advancements\recipes\hexcasting.creative_tab\stripped_edified_wood.json -646baa3a1299b4ee296ba0763a858db30e995adb data\hexcasting\recipes\focus.json -6f5ee50706640e9be82810e22388fc7b2bce13b1 data\hexcasting\recipes\birch_staff.json -f45428f892d2064fafa29ea644eea21354e2e322 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_staff.json -28fa66705fcd6dbfa46ec76602497441cde579ef data\hexcasting\advancements\recipes\hexcasting.creative_tab\empty_impetus.json -13ca24f9f87a6b34f7717e5c326291079e6db96f data\hexcasting\recipes\sub_sandwich.json -bd3e10b3d468e48e72ad060b9eb0b9f8f4057bf1 data\hexcasting\recipes\ageing_scroll_paper_lantern.json -f75c21d35b926a2303d60115a297c387790bbbd9 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_trapdoor.json -f58700261f72cf87acacf1df0f163890c8b7ae00 data\hexcasting\advancements\recipes\brainsweep\brainsweep\directrix_redstone.json -b7fc41f8cfd83a0d138290251d63bb6cc04e0f9a data\hexcasting\recipes\edified_pressure_plate.json -fccc3e05b011e1fd1a41a0bfca11876d0fb16df2 data\hexcasting\advancements\recipes\hexcasting.creative_tab\scroll_small.json -4bff4a59e32c6d1d99bc3a8abd16cd88c51a8e73 data\hexcasting\recipes\dye_colorizer_orange.json -858dada9c41974f5aa80c66423bf371c9e176a53 data\hexcasting\recipes\pride_colorizer_demigirl.json -3b83dd1c1aa1bcc58e6512bca75c3a6a3b7482b3 data\hexcasting\recipes\edified_tile.json -ae676c825f58eefb2bfbbd866db13dbb59deff0e data\hexcasting\recipes\brainsweep\impetus_look.json -ab26481b45a7f463e2225b9a04d24a1b4d84daef data\hexcasting\recipes\abacus.json -a3c7f19df257ee07f0894708b48438fdf3b14a47 data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_black.json -898319b3a4ee7a8d7bd7a4af0313593561ed657e data\hexcasting\advancements\recipes\hexcasting.creative_tab\scroll_paper.json -e52dbfc2d86bb3e87ff554fc8d5f0d43b7ff334a data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_gray.json -9bd09d681a608e465feb6d6a63d0b021920c7a1d data\hexcasting\recipes\brainsweep\directrix_redstone.json -8a9e7aa8d07556649768729348dff5305b84e1b9 data\hexcasting\recipes\edified_door.json -d7f93550b7c25b963eaf34d4d2ab9d9871830983 data\hexcasting\recipes\dye_colorizer_cyan.json -3c552071e6b3cfd4932b8f1e8d8b91aae8ead99d data\hexcasting\advancements\recipes\hexcasting.creative_tab\dark_oak_staff.json -85ea4913eb07d67a976891e48a32d20879f31eaa data\hexcasting\recipes\dye_colorizer_light_gray.json -64f509c0496204d39c38a4a64a1fbe0f84b9e5ae data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_magenta.json -d323e21de69d0606d1fac03fa8820e5857e4e1f1 data\hexcasting\recipes\dynamic\seal_spellbook.json -a776209b64fea520f6a2fff9f1623e7086939dd9 data\hexcasting\recipes\jungle_staff.json -1b510d32bad1a51ad6795fb8e7702d34c8c8cfbe data\hexcasting\advancements\recipes\hexcasting.creative_tab\dye_colorizer_green.json -0b8a01eab5d4ce90974c6c53b6d397f8e9398385 data\hexcasting\recipes\slate_block.json -f9e4d9171ffc6a125d9899f1867398acf8037b27 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_agender.json -437f92b83317beda07c55c122224e6740573a05e data\hexcasting\recipes\scroll.json -e35c89ccc099c511c9ab321a7490d35f2e8c9353 data\hexcasting\advancements\recipes\hexcasting.creative_tab\amethyst_dust_packing.json -36c97b8de7a0b67256e8966eca289a865cb85df5 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_bisexual.json -50f5bf4d8a499f87fa2211489624c11cc90a95a6 data\hexcasting\advancements\recipes\hexcasting.creative_tab\edified_stairs.json -ce0cd4d73792c30dcec2eea306bff44b28cb237f data\hexcasting\recipes\pride_colorizer_agender.json -4692127dbfe21eab57a6e33b214a3661cf3e6d0f data\hexcasting\recipes\pride_colorizer_demiboy.json -1f04d75a1c713d3c5ac44e62889ce834f12d6234 data\hexcasting\recipes\jeweler_hammer.json -b7d75dcd88e5091ff44eec236531a56e82c7bd91 data\hexcasting\advancements\recipes\hexcasting.creative_tab\pride_colorizer_aroace.json -5627128775e24fb6281a0576a931cfa88a909bc0 data\hexcasting\recipes\slate_block_from_slates.json -17aa26ce6bc9941d1477dee99e514fd66be7f664 data\hexcasting\recipes\pride_colorizer_aroace.json -783c691f24bc4259ba5da014133763dce26ee4bd data\hexcasting\recipes\crimson_staff.json -6c54952ecbb6899f3291fe72486e7205e6ab76cc data\hexcasting\recipes\pride_colorizer_intersex.json -83ec93ac94401b356fbee3d6464f52f151edeac4 data\hexcasting\advancements\recipes\hexcasting.creative_tab\spellbook.json -7caa7a8d9f8b0859f9507376bb715bdbe4b3fb56 data\hexcasting\recipes\dye_colorizer_blue.json -b9202eb55254abe6cbffc6ce73ba9dcf36a84ffe data\hexcasting\advancements\recipes\brainsweep\brainsweep\budding_amethyst.json -da3c95902e93fe82e489ceccc84a56159329e091 data\hexcasting\advancements\recipes\brainsweep\brainsweep\impetus_look.json +// 1.19.2 2022-11-09T19:48:37.724413 Recipes +e35c89ccc099c511c9ab321a7490d35f2e8c9353 data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_dust_packing.json +1754e1304908edf58a70fe8548f9d0ede22a1dd3 data/hexcasting/recipes/pride_colorizer_pansexual.json +1315f615ebc6593829bd86318d8eb45c2de68876 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_button.json +28fa66705fcd6dbfa46ec76602497441cde579ef data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_impetus.json +4ba0fcb9b3142029c36cc48b250b89b0cac3f6de data/hexcasting/recipes/akashic_connector.json +b54339a9e990419e4820491001c4cbdb7aa9fddb data/hexcasting/recipes/artifact.json +d603560d9bbe0bd3e9c0ca5cd502fe874337599e data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_light_gray.json +aa6c75e8834d47b0a144dac7b6448cbaecb7df44 data/hexcasting/recipes/pride_colorizer_aromantic.json +b9202eb55254abe6cbffc6ce73ba9dcf36a84ffe data/hexcasting/advancements/recipes/brainsweep/brainsweep/budding_amethyst.json +527f52ec902b9f456099bebe066b15533fe8cffd data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_pressure_plate.json +4cc110d5ce9831c0072cc2c4fd8f1a6196f42331 data/hexcasting/advancements/recipes/hexcasting.creative_tab/ancient_scroll_paper_lantern.json +79ebc61817f6ef529c385fe3ed3ff9edb0761f96 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_genderfluid.json +783c691f24bc4259ba5da014133763dce26ee4bd data/hexcasting/recipes/crimson_staff.json +f8e027860b2505a7217d1264c5d0b6f7feea0679 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_door.json +c86adafd19871ba67f0b7b693247c0a5bdec1020 data/hexcasting/recipes/brainsweep/impetus_storedplayer.json +36c97b8de7a0b67256e8966eca289a865cb85df5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_bisexual.json +3de6a907c45a97e163caf043292bb693af58e453 data/hexcasting/advancements/recipes/hexcasting.creative_tab/crimson_staff.json +fccc3e05b011e1fd1a41a0bfca11876d0fb16df2 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_small.json +b62b3b67e6a105e1eb47d04c2ededd8d408df7b7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/ancient_scroll_paper.json +04569ccadfd99f203b0485d0c3e877209290f2b3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_pink.json +48b6d3429e3536a85f3a0e9585a7d252ae0d57a3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/jeweler_hammer.json +6aa3e7825025d055a70a58acd4fd48eef0480721 data/hexcasting/recipes/edified_wood.json +b7250840982952fc23c8b32b77517744329d8d2d data/hexcasting/recipes/spellbook.json +83ec93ac94401b356fbee3d6464f52f151edeac4 data/hexcasting/advancements/recipes/hexcasting.creative_tab/spellbook.json +414d605b72164240bc308444c48ed03571cc0d61 data/hexcasting/advancements/recipes/hexcasting.creative_tab/empty_directrix.json +326925a948aeb17aabafbc25ed2562a257796d29 data/hexcasting/recipes/dye_colorizer_yellow.json +563d6b480a6ebf1c200c2ca7cd62ed305cbf9710 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_lime.json +b640608755649a8bde55a434016b14522fa6d2e0 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_wood.json +9bd09d681a608e465feb6d6a63d0b021920c7a1d data/hexcasting/recipes/brainsweep/directrix_redstone.json +cc89232d202eec019f584e8c5cc044deee76036b data/hexcasting/recipes/amethyst_sconce.json +8c49c1c022cee20fb2a44046425b48cd0e6659af data/hexcasting/advancements/recipes/hexcasting.creative_tab/birch_staff.json +bc91b7e096d8a0033916101f21fa43c06b343e86 data/hexcasting/recipes/dye_colorizer_red.json +323ccf5637e08024ae3984d1dd3585e6af0fd14c data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_demigirl.json +1f04d75a1c713d3c5ac44e62889ce834f12d6234 data/hexcasting/recipes/jeweler_hammer.json +2a1021614882392be78d22cb557e43cbbd9092ca data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_rightclick.json +04d5ceb50171bf1575b4c0145c4acbbc414a6390 data/hexcasting/advancements/recipes/hexcasting.creative_tab/cypher.json +3514bb0e92046ca12dfd10afb3c47084434f84c2 data/hexcasting/recipes/brainsweep/akashic_record.json +dc0fb37084974cf396264d046fa6708338eb0879 data/hexcasting/recipes/pride_colorizer_transgender.json +858dada9c41974f5aa80c66423bf371c9e176a53 data/hexcasting/recipes/pride_colorizer_demigirl.json +6c54952ecbb6899f3291fe72486e7205e6ab76cc data/hexcasting/recipes/pride_colorizer_intersex.json +9c8503715195c4cb2e2d9a1abe4f94df7bb9f4b5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/stonecutting/amethyst_tiles.json +0ed898da60aa78cd526ff4ae0524359891dbd976 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_tile.json +d684142c75bee35e6035d1829e271704d4ccdff3 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_lesbian.json +c8ff04819448a3efb2c031e06045be761db6a2f1 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_medium.json +3c552071e6b3cfd4932b8f1e8d8b91aae8ead99d data/hexcasting/advancements/recipes/hexcasting.creative_tab/dark_oak_staff.json +dfc171097bdd8a8f280e6787ea999286deda643e data/hexcasting/advancements/recipes/hexcasting.creative_tab/focus.json +1ba5dada44ad7c008756f0e8e7adfe30e2520239 data/hexcasting/recipes/dye_colorizer_lime.json +a22233090497e1c44082b6eb16ad079d9acc8f7c data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_storedplayer.json +6641b22c79fa29fab15d414afecabd3aa7402b38 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_paper_lantern.json +86d3a071eaec779167ca51dafaedde0e705cfb70 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_asexual.json +07902912a9ca6f8da48ed579ec318bb760d4f8df data/hexcasting/recipes/pride_colorizer_nonbinary.json +92d5ec5ddf2b35cc59f5bfe389f80443e7ee1ff8 data/hexcasting/recipes/uuid_colorizer.json +fc0476880c79cf4458dd5b24f77fc980b02534d2 data/hexcasting/recipes/edified_button.json +6e6c73a93e0e06ff399d95e40baf4e06f3a25a0a data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate_block_from_slates.json +64f509c0496204d39c38a4a64a1fbe0f84b9e5ae data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_magenta.json +4f301e8e812f409be41cfddfa74b1fb7c8034edf data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_purple.json +f0852056a692d776bf537c821f3d166c2be88bd8 data/hexcasting/recipes/spruce_staff.json +5ffea2f9ccbb855ab3f5aca9cb572f57f26619ae data/hexcasting/recipes/amethyst_dust_unpacking.json +dc2a9bf96ca9d04ea6bdeb32249322530b5e1cbf data/hexcasting/advancements/recipes/hexcasting.creative_tab/warped_staff.json +a16ce751797baf92c3dd3f125b564e789aeec260 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_planks.json +9d4594ac55f0221fff91bc0a48f54e890edd3596 data/hexcasting/recipes/dark_oak_staff.json +260f89eb21b360ea8b7fdbd23f9977d03ab57149 data/hexcasting/recipes/ancient_scroll_paper_lantern.json +8a9e7aa8d07556649768729348dff5305b84e1b9 data/hexcasting/recipes/edified_door.json +ae676c825f58eefb2bfbbd866db13dbb59deff0e data/hexcasting/recipes/brainsweep/impetus_look.json +3b83dd1c1aa1bcc58e6512bca75c3a6a3b7482b3 data/hexcasting/recipes/edified_tile.json +5902d75cd2474604f2bb1067187ba574eb1e15fc data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json +d73e5d8fec4d3f7d15888bd292f4ad9c1b37cac5 data/hexcasting/advancements/recipes/hexcasting.creative_tab/ageing_scroll_paper_lantern.json +6f5ee50706640e9be82810e22388fc7b2bce13b1 data/hexcasting/recipes/birch_staff.json +0101f5c24d8beedcc884ce87b052ad4f6884ddc4 data/hexcasting/recipes/akashic_bookshelf.json +3ae790bef91b6ae57ed7e3e792740ea059875293 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_cyan.json +63da3af421dfb38283d750eb3b9761f42e95fb91 data/hexcasting/advancements/recipes/hexcasting.creative_tab/stripped_edified_wood.json +0cb3e2e6e0be9f53811f24ad43bf711d07560210 data/hexcasting/advancements/recipes/hexcasting.creative_tab/acacia_staff.json +25df58c8b78028142c47deb060768d4fbfe2c38e data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_nonbinary.json +0859373b9e60e80f3c8b0962a3bc94903af43d36 data/hexcasting/recipes/stripped_edified_wood.json +013a4b5603757f8610709428dad8de79bd9bd590 data/hexcasting/recipes/dye_colorizer_pink.json +b7d75dcd88e5091ff44eec236531a56e82c7bd91 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_aroace.json +202e70722198141d5dd961bb087a25873e4928af data/hexcasting/recipes/edified_stairs.json +f9e4d9171ffc6a125d9899f1867398acf8037b27 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_agender.json +fa49dab810cff4f827d2662a93fc3439a8e99cba data/hexcasting/recipes/pride_colorizer_genderqueer.json +ad390fe854110e60aec4c805f7bb5fed45b4e5d1 data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_tiles.json +b2496e7ff3b631a148de37896eeb7dbcd2cbf04a data/hexcasting/recipes/scroll_medium.json +e687ceab424098d586f0b67a34fe65bee1f4dfca data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_blue.json +36c3ea4547b49c7553e7024192d5ddf6f2163422 data/hexcasting/recipes/scroll_paper_lantern.json +b6d6716724729f0530a524f92d7e4646455de344 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_red.json +c9c2b33afc4b5de1f10df08d901312ee1ded1c5e data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_pansexual.json +220f4dc7c8f857092bcb85b5ccf8936237ededa4 data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_sconce.json +1c5681b6bf354ce068c51852b51a5aba9ac2d8f9 data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json +b2dc08cc62b9a36d6b034aead99e0b328b5efecb data/hexcasting/recipes/scroll_small.json +4440b41499c9c32e297dc184c39da010ff82ac5e data/hexcasting/advancements/recipes/hexcasting.creative_tab/uuid_colorizer.json +898319b3a4ee7a8d7bd7a4af0313593561ed657e data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll_paper.json +ebfa29e0a62a629afbe18681e09cc7be95a3529e data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_yellow.json +f58700261f72cf87acacf1df0f163890c8b7ae00 data/hexcasting/advancements/recipes/brainsweep/brainsweep/directrix_redstone.json +bc100b94798f0b456877b42a5fc9aee7c4f25218 data/hexcasting/recipes/dye_colorizer_magenta.json +b494dc17959c76857f25368eb845e58e4f8bca92 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json +1b210391768fede639b29ae6fc5adf2b8b4e64c6 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_brown.json +d75bc1009064769735d46e7f4f32c65d10a470e3 data/hexcasting/recipes/pride_colorizer_asexual.json +a776209b64fea520f6a2fff9f1623e7086939dd9 data/hexcasting/recipes/jungle_staff.json +6978ff90efdd067940caccdd29437d2aefd0fe1f data/hexcasting/recipes/scroll_paper.json +e91b58b8a52d0d69e13102fbf743aab8be177924 data/hexcasting/recipes/pride_colorizer_genderfluid.json +993a613fabd0ee1005bde11ebe92f8046351ba9e data/hexcasting/advancements/recipes/hexcasting.creative_tab/trinket.json +50f5bf4d8a499f87fa2211489624c11cc90a95a6 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_stairs.json +f91ab1d68c575970ef48ad499ec92057a8ee7b2e data/hexcasting/recipes/cypher.json +bb0f91c534c888d1cff8793b49986dce236c7b2d data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_white.json +cd22886924e7aaeb62e8f7da0747cc950af9dc32 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_plural.json +735a7d770f23a02dc4ae93644e7f4c44a32e313a data/hexcasting/recipes/oak_staff.json +a58f37bc66e65c1ac00ba7dbc4d9a7b902f42aad data/hexcasting/advancements/recipes/hexcasting.creative_tab/oak_staff.json +0c72527448454438308ba5a4e99452b193fad421 data/hexcasting/recipes/dye_colorizer_gray.json +17aa26ce6bc9941d1477dee99e514fd66be7f664 data/hexcasting/recipes/pride_colorizer_aroace.json +e0e49c8a9977fe2b0619179b11a4379b5b19ace9 data/hexcasting/advancements/recipes/hexcasting.creative_tab/sub_sandwich.json +437f92b83317beda07c55c122224e6740573a05e data/hexcasting/recipes/scroll.json +2aa2e5c268ae440238eaf4cea20011b0c8f81a49 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_demiboy.json +5627128775e24fb6281a0576a931cfa88a909bc0 data/hexcasting/recipes/slate_block_from_slates.json +3608f0ec056f2c5d29a9a89305218497fd2c4383 data/hexcasting/recipes/stonecutting/amethyst_tiles.json +ef5a19ab2710fd0ce836d767588fe6a54a528a48 data/hexcasting/recipes/dye_colorizer_white.json +e52dbfc2d86bb3e87ff554fc8d5f0d43b7ff334a data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_gray.json +2fa8ff79780daaa523fe9f04a8fa15c186f055c2 data/hexcasting/recipes/dye_colorizer_purple.json +65246cf025a3300dacf9235db546178e83c863e9 data/hexcasting/recipes/pride_colorizer_lesbian.json +8d6f58c45be52e22559fdbc2806ee48ab40d133c data/hexcasting/advancements/recipes/brainsweep/brainsweep/akashic_record.json +4ffed306e5f640054a6f269ae0e548388f087996 data/hexcasting/recipes/warped_staff.json +be7ceaf2b55525f06178fb09070dfeeef8da1c65 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_transgender.json +f0849d723141b9f02798d474da6594f78755dd51 data/hexcasting/recipes/amethyst_tiles.json +2b16fb3f6b4e4e31c5c507e6c0535bd12c7c63a1 data/hexcasting/recipes/dye_colorizer_brown.json +6e692bdb7e797c1d0fffb5fcc90c5a3b28e4aaff data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_aromantic.json +6479526ac6b8732814ea3feb97e877896c17f7b7 data/hexcasting/recipes/edified_trapdoor.json +85ea4913eb07d67a976891e48a32d20879f31eaa data/hexcasting/recipes/dye_colorizer_light_gray.json +a184ee70962538e4f8641c707d6dca8796ca36e7 data/hexcasting/recipes/edified_slab.json +605f921a98b5dabbd80bc762070916e7d6756df6 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_orange.json +12e1ba1ec29bf0eadf1210d2307fab35e9685085 data/hexcasting/recipes/empty_directrix.json +336465276c06fc59be003ccad3d6fc121fa438f5 data/hexcasting/recipes/edified_staff.json +db105c67babb1ffc1bcad53ed1c98d7eb2fee4b1 data/hexcasting/recipes/pride_colorizer_plural.json +aa4a00864f1b22835612fe60a4715250f3ab2126 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_panel.json +90088535c8e4d0beb0725878314c49ac8deb373b data/hexcasting/recipes/amethyst_dust_packing.json +3662834d6e0bac03aba28f0f9d9f07f511492118 data/hexcasting/recipes/lens.json +5ba498c4c19f74cbb456385bccda96d4a8d1d1cc data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate_block.json +0d08dab8c9700c7b5b32ad35e7b665a2e3c2cdc7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/artifact.json +13ca24f9f87a6b34f7717e5c326291079e6db96f data/hexcasting/recipes/sub_sandwich.json +045e4eeefde52c09fd5bc24b8fcbe2a4e81f8bdb data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_intersex.json +f45428f892d2064fafa29ea644eea21354e2e322 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_staff.json +f75c21d35b926a2303d60115a297c387790bbbd9 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_trapdoor.json +12d9ec588869179a8e8a1f4bce718175d57e4a71 data/create/recipes/crushing/amethyst_block.json +108421ab59fc52c69913676abda5e0a045fe1b04 data/hexcasting/recipes/pride_colorizer_gay.json +dfb42a8b723b37df5c8888bdef86a1be35f2de72 data/hexcasting/recipes/pride_colorizer_bisexual.json +13d03da2cfee5c29e5432806189e18eeefb76e11 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_gay.json +122ca20f3a77c1267e4b8c755e9cd66e56734547 data/hexcasting/advancements/recipes/hexcasting.creative_tab/pride_colorizer_genderqueer.json +d7f93550b7c25b963eaf34d4d2ab9d9871830983 data/hexcasting/recipes/dye_colorizer_cyan.json +c93cecd3f883e57f3cce7ad3d6aad44000ed541c data/hexcasting/recipes/ancient_scroll_paper.json +9f75d3e93ecbbbf3ed9a92b2943397e09dcae1a9 data/hexcasting/recipes/dye_colorizer_light_blue.json +62bfad9dc29406a9807ea33f866cbdfca32e7d0a data/hexcasting/advancements/recipes/hexcasting.creative_tab/amethyst_dust_unpacking.json +709232dd093e48895014957f2e4ff5a1a76da583 data/create/recipes/crushing/amethyst_cluster.json +0ee8d29cb06065a55017a8fc50576193107f958d data/hexcasting/recipes/dynamic/seal_focus.json +0b8a01eab5d4ce90974c6c53b6d397f8e9398385 data/hexcasting/recipes/slate_block.json +e3416c3e103fe206cbaa352eb5011f81ccfc6aca data/hexcasting/recipes/slate.json +ab26481b45a7f463e2225b9a04d24a1b4d84daef data/hexcasting/recipes/abacus.json +646baa3a1299b4ee296ba0763a858db30e995adb data/hexcasting/recipes/focus.json +4692127dbfe21eab57a6e33b214a3661cf3e6d0f data/hexcasting/recipes/pride_colorizer_demiboy.json +1b510d32bad1a51ad6795fb8e7702d34c8c8cfbe data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_green.json +b185eee3dc066959c2699284eeed8c5c5de80d33 data/hexcasting/recipes/trinket.json +a331f4ce9b8d3565cbb154af4d63279f1e2c7a41 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json +a3c7f19df257ee07f0894708b48438fdf3b14a47 data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_black.json +bb42a28d7b19f8f8057630f0d2e99b371e93126a data/hexcasting/advancements/recipes/hexcasting.creative_tab/dye_colorizer_light_blue.json +d323e21de69d0606d1fac03fa8820e5857e4e1f1 data/hexcasting/recipes/dynamic/seal_spellbook.json +38e7b64a4a15f1ce496f8c156d7262426f98fbcc data/hexcasting/recipes/acacia_staff.json +8715e71c2fb59ee458ce217040c9a8dd0db04789 data/hexcasting/advancements/recipes/hexcasting.creative_tab/lens.json +0efcdb6cd338f382c823e8599e298322a0080dae data/hexcasting/recipes/edified_panel.json +22ff2d626da7f5fdc1411b4df75a6fc6a0e52df7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/edified_slab.json +6e8ba1635146314810ce9181c83024c0c0a931f7 data/hexcasting/advancements/recipes/hexcasting.creative_tab/akashic_bookshelf.json +773860888fb2d695b775f3afb93b16f43795bcc6 data/hexcasting/recipes/brainsweep/impetus_rightclick.json +494a76b3cebcd7b0b37c3f2e655d37b3c7fb762b data/hexcasting/advancements/recipes/hexcasting.creative_tab/spruce_staff.json +768d70365c56ef1fbad089d3e3fd68548f964227 data/hexcasting/recipes/dye_colorizer_black.json +e6ba57745f6841c2dcb537ada2475e880ea25186 data/hexcasting/recipes/dye_colorizer_green.json +4bff4a59e32c6d1d99bc3a8abd16cd88c51a8e73 data/hexcasting/recipes/dye_colorizer_orange.json +7caa7a8d9f8b0859f9507376bb715bdbe4b3fb56 data/hexcasting/recipes/dye_colorizer_blue.json +b7fc41f8cfd83a0d138290251d63bb6cc04e0f9a data/hexcasting/recipes/edified_pressure_plate.json +b21f6cbf11e23eac313d68805428cc0da55edb83 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json +f0a77ba758e649d0c16a8e2d9964d18f95a544f4 data/hexcasting/advancements/recipes/hexcasting.creative_tab/slate.json +7ae2bd282afbf2f460a6bb705fe301a2a11d7835 data/hexcasting/advancements/recipes/hexcasting.creative_tab/akashic_connector.json +63d9172717dd1cbb587fc9d92fd69f47b1bb3307 data/hexcasting/recipes/brainsweep/budding_amethyst.json +da3c95902e93fe82e489ceccc84a56159329e091 data/hexcasting/advancements/recipes/brainsweep/brainsweep/impetus_look.json +c7d28ccf9df6fc46aa142c2e7b176cc0cb5ea62b data/hexcasting/recipes/empty_impetus.json +ae2c6392cc0ec104c4e3019e1824a1e7f811f1de data/hexcasting/advancements/recipes/hexcasting.creative_tab/abacus.json +bd3e10b3d468e48e72ad060b9eb0b9f8f4057bf1 data/hexcasting/recipes/ageing_scroll_paper_lantern.json +182c2b5dd406c80ed957e1b43d554cce1b212d28 data/hexcasting/advancements/recipes/hexcasting.creative_tab/jungle_staff.json +c3f9cca50935f7abf141825d78b441033fc0dab8 data/hexcasting/advancements/recipes/hexcasting.creative_tab/scroll.json +ce0cd4d73792c30dcec2eea306bff44b28cb237f data/hexcasting/recipes/pride_colorizer_agender.json +7c7888ba95d1e2e8620a916df546a2b06b592d37 data/hexcasting/recipes/edified_planks.json diff --git a/Fabric/src/generated/resources/data/create/recipes/crushing/amethyst_block.json b/Fabric/src/generated/resources/data/create/recipes/crushing/amethyst_block.json index 4d640f5c..ad014b5f 100644 --- a/Fabric/src/generated/resources/data/create/recipes/crushing/amethyst_block.json +++ b/Fabric/src/generated/resources/data/create/recipes/crushing/amethyst_block.json @@ -1,22 +1,5 @@ { "type": "create:crushing", - "ingredients": [ - { - "item": "minecraft:amethyst_block" - } - ], - "results": [ - { - "item": "minecraft:amethyst_shard", - "count": 3 - }, - { - "item": "hexcasting:amethyst_dust", - "count": 4, - "chance": 0.5 - } - ], - "processingTime": 150, "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", @@ -24,5 +7,22 @@ "create" ] } + ], + "ingredients": [ + { + "item": "minecraft:amethyst_block" + } + ], + "processingTime": 150, + "results": [ + { + "count": 3, + "item": "minecraft:amethyst_shard" + }, + { + "chance": 0.5, + "count": 4, + "item": "hexcasting:amethyst_dust" + } ] } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json b/Fabric/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json index dcabb9ec..bcc1c7b6 100644 --- a/Fabric/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json +++ b/Fabric/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json @@ -1,25 +1,5 @@ { "type": "create:crushing", - "ingredients": [ - { - "item": "minecraft:amethyst_cluster" - } - ], - "results": [ - { - "item": "minecraft:amethyst_shard", - "count": 7 - }, - { - "item": "hexcasting:amethyst_dust", - "count": 5 - }, - { - "item": "hexcasting:charged_amethyst", - "chance": 0.25 - } - ], - "processingTime": 150, "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", @@ -27,5 +7,25 @@ "create" ] } + ], + "ingredients": [ + { + "item": "minecraft:amethyst_cluster" + } + ], + "processingTime": 150, + "results": [ + { + "count": 7, + "item": "minecraft:amethyst_shard" + }, + { + "count": 5, + "item": "hexcasting:amethyst_dust" + }, + { + "chance": 0.25, + "item": "hexcasting:charged_amethyst" + } ] } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json index b9ecda86..43e555e7 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json @@ -1,21 +1,5 @@ { "type": "create:crushing", - "ingredients": [ - { - "item": "minecraft:amethyst_shard" - } - ], - "results": [ - { - "item": "hexcasting:amethyst_dust", - "count": 4 - }, - { - "item": "hexcasting:amethyst_dust", - "chance": 0.5 - } - ], - "processingTime": 150, "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", @@ -23,5 +7,21 @@ "create" ] } + ], + "ingredients": [ + { + "item": "minecraft:amethyst_shard" + } + ], + "processingTime": 150, + "results": [ + { + "count": 4, + "item": "hexcasting:amethyst_dust" + }, + { + "chance": 0.5, + "item": "hexcasting:amethyst_dust" + } ] } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json index a68deb2c..0e4a2624 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json @@ -1,19 +1,5 @@ { "type": "farmersdelight:cutting", - "ingredients": [ - { - "item": "hexcasting:akashic_door" - } - ], - "tool": { - "type": "farmersdelight:tool", - "tag": "c:tools/axes" - }, - "result": [ - { - "item": "hexcasting:akashic_planks" - } - ], "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", @@ -21,5 +7,19 @@ "farmersdelight" ] } - ] + ], + "ingredients": [ + { + "item": "hexcasting:edified_door" + } + ], + "result": [ + { + "item": "hexcasting:edified_planks" + } + ], + "tool": { + "type": "farmersdelight:tool", + "tag": "c:tools/axes" + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json index 3f0fea02..465824c4 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json @@ -1,23 +1,5 @@ { "type": "farmersdelight:cutting", - "ingredients": [ - { - "item": "hexcasting:akashic_log" - } - ], - "tool": { - "type": "farmersdelight:tool", - "tag": "c:tools/axes" - }, - "result": [ - { - "item": "hexcasting:akashic_log_stripped" - }, - { - "item": "farmersdelight:tree_bark" - } - ], - "sound": "minecraft:item.axe.strip", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", @@ -25,5 +7,23 @@ "farmersdelight" ] } - ] + ], + "ingredients": [ + { + "item": "hexcasting:edified_log" + } + ], + "result": [ + { + "item": "hexcasting:stripped_edified_log" + }, + { + "item": "farmersdelight:tree_bark" + } + ], + "sound": "minecraft:item.axe.strip", + "tool": { + "type": "farmersdelight:tool", + "tag": "c:tools/axes" + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json index 4397c24d..60a932b1 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json @@ -1,19 +1,5 @@ { "type": "farmersdelight:cutting", - "ingredients": [ - { - "item": "hexcasting:akashic_trapdoor" - } - ], - "tool": { - "type": "farmersdelight:tool", - "tag": "c:tools/axes" - }, - "result": [ - { - "item": "hexcasting:akashic_planks" - } - ], "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", @@ -21,5 +7,19 @@ "farmersdelight" ] } - ] + ], + "ingredients": [ + { + "item": "hexcasting:edified_trapdoor" + } + ], + "result": [ + { + "item": "hexcasting:edified_planks" + } + ], + "tool": { + "type": "farmersdelight:tool", + "tag": "c:tools/axes" + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json index c4833f7c..5fa413f5 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json @@ -1,23 +1,5 @@ { "type": "farmersdelight:cutting", - "ingredients": [ - { - "item": "hexcasting:akashic_wood" - } - ], - "tool": { - "type": "farmersdelight:tool", - "tag": "c:tools/axes" - }, - "result": [ - { - "item": "hexcasting:akashic_wood_stripped" - }, - { - "item": "farmersdelight:tree_bark" - } - ], - "sound": "minecraft:item.axe.strip", "fabric:load_conditions": [ { "condition": "fabric:all_mods_loaded", @@ -25,5 +7,23 @@ "farmersdelight" ] } - ] + ], + "ingredients": [ + { + "item": "hexcasting:edified_wood" + } + ], + "result": [ + { + "item": "hexcasting:stripped_edified_wood" + }, + { + "item": "farmersdelight:tree_bark" + } + ], + "sound": "minecraft:item.axe.strip", + "tool": { + "type": "farmersdelight:tool", + "tag": "c:tools/axes" + } } \ No newline at end of file diff --git a/Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json b/Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json index 138661fd..899502d7 100644 --- a/Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json +++ b/Fabric/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json @@ -2,7 +2,14 @@ "type": "minecraft:crafting_shaped", "key": { "C": { - "item": "minecraft:carrot" + "type": "hexcasting:mod_conditional", + "default": { + "item": "minecraft:carrot" + }, + "if_loaded": { + "item": "farmersdelight:skillet" + }, + "modid": "farmersdelight" }, "D": { "item": "hexcasting:amethyst_dust" diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java index 99ac3568..7fe04bf9 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexConfig.java @@ -75,29 +75,29 @@ public class FabricHexConfig { } private static final class Common implements HexConfig.CommonConfigAccess { - private final PropertyMirror dustManaAmount = PropertyMirror.create(ConfigTypes.NATURAL); - private final PropertyMirror shardManaAmount = PropertyMirror.create(ConfigTypes.NATURAL); - private final PropertyMirror chargedCrystalManaAmount = PropertyMirror.create(ConfigTypes.NATURAL); - private final PropertyMirror manaToHealthRate = PropertyMirror.create( + private final PropertyMirror dustMediaAmount = PropertyMirror.create(ConfigTypes.NATURAL); + private final PropertyMirror shardMediaAmount = PropertyMirror.create(ConfigTypes.NATURAL); + private final PropertyMirror chargedCrystalMediaAmount = PropertyMirror.create(ConfigTypes.NATURAL); + private final PropertyMirror mediaToHealthRate = PropertyMirror.create( ConfigTypes.DOUBLE.withMinimum(0d)); public ConfigTree configure(ConfigTreeBuilder bob) { bob.fork("Media Amounts") .beginValue("dustMediaAmount", ConfigTypes.NATURAL, DEFAULT_DUST_MEDIA_AMOUNT) .withComment("How much media a single Amethyst Dust item is worth") - .finishValue(dustManaAmount::mirror) + .finishValue(dustMediaAmount::mirror) .beginValue("shardMediaAmount", ConfigTypes.NATURAL, DEFAULT_SHARD_MEDIA_AMOUNT) .withComment("How much media a single Amethyst Shard item is worth") - .finishValue(shardManaAmount::mirror) + .finishValue(shardMediaAmount::mirror) .beginValue("chargedCrystalMediaAmount", ConfigTypes.NATURAL, DEFAULT_CHARGED_MEDIA_AMOUNT) .withComment("How much media a single Charged Amethyst Crystal item is worth") - .finishValue(chargedCrystalManaAmount::mirror) + .finishValue(chargedCrystalMediaAmount::mirror) - .beginValue("mediaToHealthRate", ConfigTypes.DOUBLE, DEFAULT_MANA_TO_HEALTH_RATE) + .beginValue("mediaToHealthRate", ConfigTypes.DOUBLE, DEFAULT_MEDIA_TO_HEALTH_RATE) .withComment("How many points of media a half-heart is worth when casting from HP") - .finishValue(manaToHealthRate::mirror) + .finishValue(mediaToHealthRate::mirror) .finishBranch(); return bob.build(); @@ -105,22 +105,22 @@ public class FabricHexConfig { @Override public int dustMediaAmount() { - return dustManaAmount.getValue(); + return dustMediaAmount.getValue(); } @Override public int shardMediaAmount() { - return shardManaAmount.getValue(); + return shardMediaAmount.getValue(); } @Override public int chargedCrystalMediaAmount() { - return chargedCrystalManaAmount.getValue(); + return chargedCrystalMediaAmount.getValue(); } @Override public double mediaToHealthRate() { - return manaToHealthRate.getValue(); + return mediaToHealthRate.getValue(); } } diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCHexHolder.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCHexHolder.java index 046edb46..ec2f465f 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCHexHolder.java +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCHexHolder.java @@ -30,8 +30,8 @@ public abstract class CCHexHolder extends ItemComponent implements ADHexHolder { @Override - public boolean canDrawManaFromInventory() { - return this.hexHolder.canDrawManaFromInventory(this.stack); + public boolean canDrawMediaFromInventory() { + return this.hexHolder.canDrawMediaFromInventory(this.stack); } @Override @@ -45,8 +45,8 @@ public abstract class CCHexHolder extends ItemComponent implements ADHexHolder { } @Override - public void writeHex(List patterns, int mana) { - this.hexHolder.writeHex(this.stack, patterns, mana); + public void writeHex(List patterns, int media) { + this.hexHolder.writeHex(this.stack, patterns, media); } @Override diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCMediaHolder.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCMediaHolder.java index 76a871ab..4297730a 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCMediaHolder.java +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/cc/adimpl/CCMediaHolder.java @@ -18,10 +18,10 @@ public abstract class CCMediaHolder extends ItemComponent implements ADMediaHold public ItemBased(ItemStack stack) { super(stack); - if (!(stack.getItem() instanceof MediaHolderItem mana)) { + if (!(stack.getItem() instanceof MediaHolderItem media)) { throw new IllegalStateException("item is not a media holder: " + stack); } - this.mediaHolder = mana; + this.mediaHolder = media; } @Override diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/gravity/OpGetGravity.kt b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/gravity/OpGetGravity.kt index c70b073f..16f5b961 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/gravity/OpGetGravity.kt +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/gravity/OpGetGravity.kt @@ -1,6 +1,6 @@ package at.petrak.hexcasting.fabric.interop.gravity -import at.petrak.hexcasting.api.spell.ConstManaAction +import at.petrak.hexcasting.api.spell.ConstMediaAction import at.petrak.hexcasting.api.spell.asActionResult import at.petrak.hexcasting.api.spell.casting.CastingContext import at.petrak.hexcasting.api.spell.getEntity @@ -8,7 +8,7 @@ import at.petrak.hexcasting.api.spell.iota.Iota import com.fusionflux.gravity_api.api.GravityChangerAPI import net.minecraft.world.phys.Vec3 -object OpGetGravity : ConstManaAction { +object OpGetGravity : ConstMediaAction { override val argc = 1 override fun execute(args: List, ctx: CastingContext): List { @@ -16,4 +16,4 @@ object OpGetGravity : ConstManaAction { val grav = GravityChangerAPI.getGravityDirection(target) return Vec3.atLowerCornerOf(grav.normal).asActionResult } -} \ No newline at end of file +} diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/trinkets/TrinketsApiInterop.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/trinkets/TrinketsApiInterop.java index db1b83a8..9dfafc36 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/trinkets/TrinketsApiInterop.java +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/interop/trinkets/TrinketsApiInterop.java @@ -34,7 +34,7 @@ public class TrinketsApiInterop { TrinketComponent component = optional.get(); return component.getEquipped(MediaHelper::isMediaItem).stream() .map(Tuple::getB) - .map(IXplatAbstractions.INSTANCE::findManaHolder) + .map(IXplatAbstractions.INSTANCE::findMediaHolder) .filter(Objects::nonNull) .toList(); } diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/storage/FabricImpetusStorage.kt b/Fabric/src/main/java/at/petrak/hexcasting/fabric/storage/FabricImpetusStorage.kt index 6fee0265..b49d7290 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/storage/FabricImpetusStorage.kt +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/storage/FabricImpetusStorage.kt @@ -21,14 +21,14 @@ class FabricImpetusStorage(val impetus: BlockEntityAbstractImpetus) : SingleSlot override fun insert(resource: ItemVariant, maxAmount: Long, transaction: TransactionContext): Long { val stackCount = maxAmount / 64 val remainder = (maxAmount % 64).toInt() - var manaToTake = impetus.remainingManaCapacity() + var mediaToTake = impetus.remainingMediaCapacity() var itemsConsumed = 0L fun insertStack(stack: ItemStack, transaction: TransactionContext) { val copied = stack.copy() val size = stack.count - val extractable = impetus.extractManaFromItem(stack, false) - manaToTake -= extractable + val extractable = impetus.extractMediaFromItem(stack, false) + mediaToTake -= extractable val taken = size - stack.count itemsConsumed += taken.toLong() copied.count = taken @@ -36,7 +36,7 @@ class FabricImpetusStorage(val impetus: BlockEntityAbstractImpetus) : SingleSlot if (taken > 0) { transaction.addOuterCloseCallback { if (it.wasCommitted()) { - impetus.insertMana(copied) + impetus.insertMedia(copied) } } } @@ -44,7 +44,7 @@ class FabricImpetusStorage(val impetus: BlockEntityAbstractImpetus) : SingleSlot for (i in 0 until stackCount) { val stack = resource.toStack(64) insertStack(stack, transaction) - if (manaToTake <= 0) { + if (mediaToTake <= 0) { return itemsConsumed } } diff --git a/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java b/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java index 8a4e6ef6..f6d87421 100644 --- a/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java +++ b/Fabric/src/main/java/at/petrak/hexcasting/fabric/xplat/FabricXplatImpl.java @@ -219,7 +219,7 @@ public class FabricXplatImpl implements IXplatAbstractions { @Override public @Nullable - ADMediaHolder findManaHolder(ItemStack stack) { + ADMediaHolder findMediaHolder(ItemStack stack) { var cc = HexCardinalComponents.MEDIA_HOLDER.maybeGet(stack); return cc.orElse(null); } diff --git a/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b b/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b index 17f604bc..48532985 100644 --- a/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b +++ b/Forge/src/generated/resources/.cache/03e4de26f1265135874f8cdcaebc09d9c08eb42b @@ -1,8 +1,9 @@ -// 1.19.2 2022-11-04T11:52:25.238239 Tags for minecraft:item +// 1.19.2 2022-11-09T19:46:44.024478 Tags for minecraft:item 2f5c5bd21580004c998765215166adaa72e0d96b data/forge/tags/items/dusts/amethyst.json 873bab891e0827973ebfe9fedd352c95778d7fbe data/forge/tags/items/gems.json 42c76a43081acfb0194e2cee6de18104fb0ba5ad data/hexcasting/tags/items/edified_logs.json 86828f8056bfdfdd2aff10d7a9dbc6c269c25b8a data/hexcasting/tags/items/edified_planks.json +03bd3a58ae7367d6a21eb3acbbd70fe65a41b8f6 data/hexcasting/tags/items/grants_root_advancement.json 7f7d5f6cc9b5cfb39d240fc901c4ae2d2037ec14 data/hexcasting/tags/items/phial_base.json fd0b813b22847aa5dbe2730d633a342c4978e2b1 data/hexcasting/tags/items/staves.json 841dfbe4970e9167b205e5aa2b0f0936c6b9af60 data/minecraft/tags/items/buttons.json diff --git a/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a017795a..f98b1702 100644 --- a/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/Forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,6 @@ -// 1.19.2 2022-11-04T11:52:25.2592493 Recipes +// 1.19.2 2022-11-09T19:46:44.013201 Recipes +29056d8bbc023668564ee81f4eb8b2a11411cf4a data/create/recipes/crushing/amethyst_block.json +5bb0b70967a422bfd88c01fa1af64e9b98781fd1 data/create/recipes/crushing/amethyst_cluster.json 8d6f58c45be52e22559fdbc2806ee48ab40d133c data/hexcasting/advancements/recipes/brainsweep/brainsweep/akashic_record.json b9202eb55254abe6cbffc6ce73ba9dcf36a84ffe data/hexcasting/advancements/recipes/brainsweep/brainsweep/budding_amethyst.json f58700261f72cf87acacf1df0f163890c8b7ae00 data/hexcasting/advancements/recipes/brainsweep/brainsweep/directrix_redstone.json @@ -106,6 +108,11 @@ f0849d723141b9f02798d474da6594f78755dd51 data/hexcasting/recipes/amethyst_tiles. ae676c825f58eefb2bfbbd866db13dbb59deff0e data/hexcasting/recipes/brainsweep/impetus_look.json 773860888fb2d695b775f3afb93b16f43795bcc6 data/hexcasting/recipes/brainsweep/impetus_rightclick.json c86adafd19871ba67f0b7b693247c0a5bdec1020 data/hexcasting/recipes/brainsweep/impetus_storedplayer.json +c4e770cfd4d855d5b4fdc66e424d58621302f51a data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json +64ee84a9bce988bacde0911d05d0f3834e0b1ae7 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json +f398f4a10736f967482dd1d254d37c7ba9e67bb0 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json +2f945718621cc2a5c1065fe9fb15c3cbe5bad761 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json +4c9a73932167ebd1dcc1edf154ea6e5212ee4b52 data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json 783c691f24bc4259ba5da014133763dce26ee4bd data/hexcasting/recipes/crimson_staff.json 95fac4883f95c2ce0fc42fc9ce164df95e81d99f data/hexcasting/recipes/cypher.json 9d4594ac55f0221fff91bc0a48f54e890edd3596 data/hexcasting/recipes/dark_oak_staff.json @@ -158,7 +165,7 @@ fa49dab810cff4f827d2662a93fc3439a8e99cba data/hexcasting/recipes/pride_colorizer 6c54952ecbb6899f3291fe72486e7205e6ab76cc data/hexcasting/recipes/pride_colorizer_intersex.json 65246cf025a3300dacf9235db546178e83c863e9 data/hexcasting/recipes/pride_colorizer_lesbian.json 07902912a9ca6f8da48ed579ec318bb760d4f8df data/hexcasting/recipes/pride_colorizer_nonbinary.json -af7e33f54e29c497cafc6b4ddf1f494a14ecd83f data/hexcasting/recipes/pride_colorizer_pansexual.json +1754e1304908edf58a70fe8548f9d0ede22a1dd3 data/hexcasting/recipes/pride_colorizer_pansexual.json db105c67babb1ffc1bcad53ed1c98d7eb2fee4b1 data/hexcasting/recipes/pride_colorizer_plural.json dc0fb37084974cf396264d046fa6708338eb0879 data/hexcasting/recipes/pride_colorizer_transgender.json 437f92b83317beda07c55c122224e6740573a05e data/hexcasting/recipes/scroll.json diff --git a/Forge/src/generated/resources/data/create/recipes/crushing/amethyst_block.json b/Forge/src/generated/resources/data/create/recipes/crushing/amethyst_block.json index 7fde51bf..8ad54e92 100644 --- a/Forge/src/generated/resources/data/create/recipes/crushing/amethyst_block.json +++ b/Forge/src/generated/resources/data/create/recipes/crushing/amethyst_block.json @@ -4,8 +4,8 @@ { "conditions": [ { - "modid": "create", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "create" } ], "recipe": { @@ -15,18 +15,18 @@ "item": "minecraft:amethyst_block" } ], + "processingTime": 150, "results": [ { - "item": "minecraft:amethyst_shard", - "count": 3 + "count": 3, + "item": "minecraft:amethyst_shard" }, { - "item": "hexcasting:amethyst_dust", + "chance": 0.5, "count": 4, - "chance": 0.5 + "item": "hexcasting:amethyst_dust" } - ], - "processingTime": 150 + ] } } ] diff --git a/Forge/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json b/Forge/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json index 9f41e187..66731265 100644 --- a/Forge/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json +++ b/Forge/src/generated/resources/data/create/recipes/crushing/amethyst_cluster.json @@ -4,8 +4,8 @@ { "conditions": [ { - "modid": "create", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "create" } ], "recipe": { @@ -15,21 +15,21 @@ "item": "minecraft:amethyst_cluster" } ], + "processingTime": 150, "results": [ { - "item": "minecraft:amethyst_shard", - "count": 7 + "count": 7, + "item": "minecraft:amethyst_shard" }, { - "item": "hexcasting:amethyst_dust", - "count": 5 + "count": 5, + "item": "hexcasting:amethyst_dust" }, { - "item": "hexcasting:charged_amethyst", - "chance": 0.25 + "chance": 0.25, + "item": "hexcasting:charged_amethyst" } - ], - "processingTime": 150 + ] } } ] diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json b/Forge/src/generated/resources/data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json index 028cefb8..29c34436 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/compat/create/crushing/amethyst_shard.json @@ -4,8 +4,8 @@ { "conditions": [ { - "modid": "create", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "create" } ], "recipe": { @@ -15,17 +15,17 @@ "item": "minecraft:amethyst_shard" } ], + "processingTime": 150, "results": [ { - "item": "hexcasting:amethyst_dust", - "count": 4 + "count": 4, + "item": "hexcasting:amethyst_dust" }, { - "item": "hexcasting:amethyst_dust", - "chance": 0.5 + "chance": 0.5, + "item": "hexcasting:amethyst_dust" } - ], - "processingTime": 150 + ] } } ] diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json b/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json index 034ea1d8..01056277 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_door.json @@ -4,26 +4,26 @@ { "conditions": [ { - "modid": "farmersdelight", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "farmersdelight" } ], "recipe": { "type": "farmersdelight:cutting", "ingredients": [ { - "item": "hexcasting:akashic_door" + "item": "hexcasting:edified_door" + } + ], + "result": [ + { + "item": "hexcasting:edified_planks" } ], "tool": { "type": "farmersdelight:tool_action", "action": "axe_dig" - }, - "result": [ - { - "item": "hexcasting:akashic_planks" - } - ] + } } } ] diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json b/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json index 35d3172e..ef802db2 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_log.json @@ -4,30 +4,30 @@ { "conditions": [ { - "modid": "farmersdelight", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "farmersdelight" } ], "recipe": { "type": "farmersdelight:cutting", "ingredients": [ { - "item": "hexcasting:akashic_log" + "item": "hexcasting:edified_log" } ], - "tool": { - "type": "farmersdelight:tool_action", - "action": "axe_strip" - }, "result": [ { - "item": "hexcasting:akashic_log_stripped" + "item": "hexcasting:stripped_edified_log" }, { "item": "farmersdelight:tree_bark" } ], - "sound": "minecraft:item.axe.strip" + "sound": "minecraft:item.axe.strip", + "tool": { + "type": "farmersdelight:tool_action", + "action": "axe_strip" + } } } ] diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json b/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json index ff10f76c..5564ed62 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_trapdoor.json @@ -4,26 +4,26 @@ { "conditions": [ { - "modid": "farmersdelight", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "farmersdelight" } ], "recipe": { "type": "farmersdelight:cutting", "ingredients": [ { - "item": "hexcasting:akashic_trapdoor" + "item": "hexcasting:edified_trapdoor" + } + ], + "result": [ + { + "item": "hexcasting:edified_planks" } ], "tool": { "type": "farmersdelight:tool_action", "action": "axe_dig" - }, - "result": [ - { - "item": "hexcasting:akashic_planks" - } - ] + } } } ] diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json b/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json index af981c0e..3a30ec39 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/compat/farmersdelight/cutting/akashic_wood.json @@ -4,30 +4,30 @@ { "conditions": [ { - "modid": "farmersdelight", - "type": "forge:mod_loaded" + "type": "forge:mod_loaded", + "modid": "farmersdelight" } ], "recipe": { "type": "farmersdelight:cutting", "ingredients": [ { - "item": "hexcasting:akashic_wood" + "item": "hexcasting:edified_wood" } ], - "tool": { - "type": "farmersdelight:tool_action", - "action": "axe_strip" - }, "result": [ { - "item": "hexcasting:akashic_wood_stripped" + "item": "hexcasting:stripped_edified_wood" }, { "item": "farmersdelight:tree_bark" } ], - "sound": "minecraft:item.axe.strip" + "sound": "minecraft:item.axe.strip", + "tool": { + "type": "farmersdelight:tool_action", + "action": "axe_strip" + } } } ] diff --git a/Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json b/Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json index 138661fd..899502d7 100644 --- a/Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json +++ b/Forge/src/generated/resources/data/hexcasting/recipes/pride_colorizer_pansexual.json @@ -2,7 +2,14 @@ "type": "minecraft:crafting_shaped", "key": { "C": { - "item": "minecraft:carrot" + "type": "hexcasting:mod_conditional", + "default": { + "item": "minecraft:carrot" + }, + "if_loaded": { + "item": "farmersdelight:skillet" + }, + "modid": "farmersdelight" }, "D": { "item": "hexcasting:amethyst_dust" diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/grants_root_advancement.json b/Forge/src/generated/resources/data/hexcasting/tags/items/grants_root_advancement.json index afdfee51..f5c26b07 100644 --- a/Forge/src/generated/resources/data/hexcasting/tags/items/grants_root_advancement.json +++ b/Forge/src/generated/resources/data/hexcasting/tags/items/grants_root_advancement.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "hexcasting:amethyst_dust", "minecraft:amethyst_shard", diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexConfig.java b/Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexConfig.java index fbedb4a5..2f823c6e 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexConfig.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexConfig.java @@ -25,7 +25,7 @@ public class ForgeHexConfig implements HexConfig.CommonConfigAccess { chargedCrystalMediaAmount = builder.comment("How much media a single Charged Amethyst Crystal item is worth") .defineInRange("chargedCrystalMediaAmount", DEFAULT_CHARGED_MEDIA_AMOUNT, 0, Integer.MAX_VALUE); mediaToHealthRate = builder.comment("How many points of media a half-heart is worth when casting from HP") - .defineInRange("mediaToHealthRate", DEFAULT_MANA_TO_HEALTH_RATE, 0.0, Double.POSITIVE_INFINITY); + .defineInRange("mediaToHealthRate", DEFAULT_MEDIA_TO_HEALTH_RATE, 0.0, Double.POSITIVE_INFINITY); builder.pop(); } diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeCapabilityHandler.java b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeCapabilityHandler.java index 8d549186..c15e5391 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeCapabilityHandler.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeCapabilityHandler.java @@ -84,26 +84,26 @@ public class ForgeCapabilityHandler { if (stack.getItem() instanceof MediaHolderItem holder) { evt.addCapability(MEDIA_STORAGE_CAP, - provide(stack, HexCapabilities.MANA, () -> new ItemBasedMediaHolder(holder, stack))); + provide(stack, HexCapabilities.MEDIA, () -> new ItemBasedMediaHolder(holder, stack))); } else if (stack.is(HexItems.AMETHYST_DUST)) { - evt.addCapability(MEDIA_STATIC_CAP, provide(stack, HexCapabilities.MANA, () -> + evt.addCapability(MEDIA_STATIC_CAP, provide(stack, HexCapabilities.MEDIA, () -> new StaticMediaHolder(HexConfig.common()::dustMediaAmount, ADMediaHolder.AMETHYST_DUST_PRIORITY, stack))); } else if (stack.is(Items.AMETHYST_SHARD)) { - evt.addCapability(MEDIA_STATIC_CAP, provide(stack, HexCapabilities.MANA, () -> new StaticMediaHolder( + evt.addCapability(MEDIA_STATIC_CAP, provide(stack, HexCapabilities.MEDIA, () -> new StaticMediaHolder( HexConfig.common()::shardMediaAmount, ADMediaHolder.AMETHYST_SHARD_PRIORITY, stack))); } else if (stack.is(HexItems.CHARGED_AMETHYST)) { evt.addCapability(MEDIA_STATIC_CAP, - provide(stack, HexCapabilities.MANA, () -> new StaticMediaHolder( + provide(stack, HexCapabilities.MEDIA, () -> new StaticMediaHolder( HexConfig.common()::chargedCrystalMediaAmount, ADMediaHolder.CHARGED_AMETHYST_PRIORITY, stack))); } if (stack.getItem() instanceof IotaHolderItem holder) { evt.addCapability(IOTA_STORAGE_CAP, - provide(stack, HexCapabilities.DATUM, () -> new ItemBasedIotaHolder(holder, stack))); + provide(stack, HexCapabilities.IOTA, () -> new ItemBasedIotaHolder(holder, stack))); } else if (stack.is(Items.PUMPKIN_PIE)) { // haha yes - evt.addCapability(IOTA_STATIC_CAP, provide(stack, HexCapabilities.DATUM, () -> + evt.addCapability(IOTA_STATIC_CAP, provide(stack, HexCapabilities.IOTA, () -> new StaticIotaHolder((s) -> new DoubleIota(Math.PI * s.getCount()), stack))); } @@ -340,8 +340,8 @@ public class ForgeCapabilityHandler { ItemStack stack) implements ADHexHolder { @Override - public boolean canDrawManaFromInventory() { - return holder.canDrawManaFromInventory(stack); + public boolean canDrawMediaFromInventory() { + return holder.canDrawMediaFromInventory(stack); } @Override @@ -355,8 +355,8 @@ public class ForgeCapabilityHandler { } @Override - public void writeHex(List patterns, int mana) { - holder.writeHex(stack, patterns, mana); + public void writeHex(List patterns, int media) { + holder.writeHex(stack, patterns, media); } @Override diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeImpetusCapability.java b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeImpetusCapability.java index 77287ce4..fac4a70d 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeImpetusCapability.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/ForgeImpetusCapability.java @@ -27,9 +27,9 @@ public record ForgeImpetusCapability(BlockEntityAbstractImpetus impetus) impleme ItemStack stack = originalStack.copy(); if (!simulate) { - impetus.insertMana(stack); + impetus.insertMedia(stack); } else { - impetus.extractManaFromItem(stack, false); // Mana goes nowhere, since nothing is actually being done + impetus.extractMediaFromItem(stack, false); // Media goes nowhere, since nothing is actually being done } return stack; diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/HexCapabilities.java b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/HexCapabilities.java index b53ca007..53c3d6b7 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/HexCapabilities.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/HexCapabilities.java @@ -10,9 +10,9 @@ import net.minecraftforge.common.capabilities.CapabilityToken; public final class HexCapabilities { - public static final Capability MANA = CapabilityManager.get(new CapabilityToken<>() { + public static final Capability MEDIA = CapabilityManager.get(new CapabilityToken<>() { }); - public static final Capability DATUM = CapabilityManager.get(new CapabilityToken<>() { + public static final Capability IOTA = CapabilityManager.get(new CapabilityToken<>() { }); public static final Capability STORED_HEX = CapabilityManager.get(new CapabilityToken<>() { }); diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java index 3701b237..3721c797 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java @@ -107,8 +107,8 @@ public class HexItemModels extends PaucalItemModelProvider { float fillProp = (float) fill / maxFill; getBuilder(getPath(HexItems.BATTERY)).override() - .predicate(ItemMediaBattery.MANA_PREDICATE, fillProp) - .predicate(ItemMediaBattery.MAX_MANA_PREDICATE, size) + .predicate(ItemMediaBattery.MEDIA_PREDICATE, fillProp) + .predicate(ItemMediaBattery.MAX_MEDIA_PREDICATE, size) .model(new ModelFile.UncheckedModelFile(modLoc("item/" + name))) .end(); } diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/curios/CuriosApiInterop.java b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/curios/CuriosApiInterop.java index 0e9f0ce8..4b90e7f8 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/interop/curios/CuriosApiInterop.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/interop/curios/CuriosApiInterop.java @@ -50,7 +50,7 @@ public class CuriosApiInterop { for (int i = 0; i < stacks.getSlots(); i++) { var stack = stacks.getStackInSlot(i); if (MediaHelper.isMediaItem(stack)) { - var holder = IXplatAbstractions.INSTANCE.findManaHolder(stack); + var holder = IXplatAbstractions.INSTANCE.findMediaHolder(stack); if (holder != null) { holders.add(holder); } diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java b/Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java index 2d482524..bdc44e81 100644 --- a/Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java +++ b/Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeXplatImpl.java @@ -256,21 +256,21 @@ public class ForgeXplatImpl implements IXplatAbstractions { @Override public @Nullable - ADMediaHolder findManaHolder(ItemStack stack) { - var maybeCap = stack.getCapability(HexCapabilities.MANA).resolve(); + ADMediaHolder findMediaHolder(ItemStack stack) { + var maybeCap = stack.getCapability(HexCapabilities.MEDIA).resolve(); return maybeCap.orElse(null); } @Override public @Nullable ADIotaHolder findDataHolder(ItemStack stack) { - var maybeCap = stack.getCapability(HexCapabilities.DATUM).resolve(); + var maybeCap = stack.getCapability(HexCapabilities.IOTA).resolve(); return maybeCap.orElse(null); } @Override public @Nullable ADIotaHolder findDataHolder(Entity entity) { - var maybeCap = entity.getCapability(HexCapabilities.DATUM).resolve(); + var maybeCap = entity.getCapability(HexCapabilities.IOTA).resolve(); return maybeCap.orElse(null); } From 9730a252f2066b2e658b78f8195a1328c0706eac Mon Sep 17 00:00:00 2001 From: "yrsegal@gmail.com" Date: Wed, 9 Nov 2022 19:53:40 -0500 Subject: [PATCH 2/4] fix two arguments incorrectly being inclusive --- .../common/casting/operators/lists/OpModifyInPlace.kt | 2 +- .../petrak/hexcasting/common/casting/operators/spells/OpBeep.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt index d008c15e..25106049 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/lists/OpModifyInPlace.kt @@ -8,7 +8,7 @@ object OpModifyInPlace : ConstMediaAction { override val argc = 3 override fun execute(args: List, ctx: CastingContext): List { val list = args.getList(0, argc) - val index = args.getPositiveIntUnderInclusive(1, list.size(), argc) + val index = args.getPositiveIntUnder(1, list.size(), argc) val iota = args[2] return list.modifyAt(index) { SpellList.LPair(iota, it.cdr) }.asActionResult } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBeep.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBeep.kt index b9b0556c..a3fd5eca 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBeep.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/spells/OpBeep.kt @@ -17,7 +17,7 @@ object OpBeep : SpellAction { ctx: CastingContext ): Triple> { val target = args.getVec3(0, argc) - val instrument = args.getPositiveIntUnderInclusive(1, NoteBlockInstrument.values().size, argc) + val instrument = args.getPositiveIntUnder(1, NoteBlockInstrument.values().size, argc) val note = args.getPositiveIntUnderInclusive(2, 24, argc) // mojang don't have magic numbers challenge ctx.assertVecInRange(target) From 7356b95c75936c02c6d0dacc6dbac94cd6823bef Mon Sep 17 00:00:00 2001 From: "yrsegal@gmail.com" Date: Wed, 9 Nov 2022 19:58:27 -0500 Subject: [PATCH 3/4] fix an incorrect merge with the impetus tooltip --- .../api/block/circle/BlockEntityAbstractImpetus.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java b/Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java index 41421acc..c89be939 100644 --- a/Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java +++ b/Common/src/main/java/at/petrak/hexcasting/api/block/circle/BlockEntityAbstractImpetus.java @@ -123,8 +123,8 @@ public abstract class BlockEntityAbstractImpetus extends HexBlockEntity implemen lines.add(new Pair<>(new ItemStack(HexItems.AMETHYST_DUST), ItemCreativeUnlocker.infiniteMedia(world))); } else { var dustCount = (float) beai.getMedia() / (float) MediaConstants.DUST_UNIT; - var dustCmp = Component.translatable("hexcasting.tooltip.lens.impetus.media", - String.format("%.2f", dustCount)); + var dustCmp = Component.translatable("hexcasting.tooltip.media", + DUST_AMOUNT.format(dustCount)); lines.add(new Pair<>(new ItemStack(HexItems.AMETHYST_DUST), dustCmp)); } From fd62955347c1463875b01795b6db6f66e7afe839 Mon Sep 17 00:00:00 2001 From: "yrsegal@gmail.com" Date: Wed, 9 Nov 2022 20:29:41 -0500 Subject: [PATCH 4/4] swindler's was not removing the top of the stack --- .../operators/stack/OpAlwinfyHasAscendedToABeingOfPureMath.kt | 3 +-- Common/src/main/resources/assets/hexcasting/lang/en_us.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpAlwinfyHasAscendedToABeingOfPureMath.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpAlwinfyHasAscendedToABeingOfPureMath.kt index 57f40664..22dd577e 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpAlwinfyHasAscendedToABeingOfPureMath.kt +++ b/Common/src/main/java/at/petrak/hexcasting/common/casting/operators/stack/OpAlwinfyHasAscendedToABeingOfPureMath.kt @@ -8,8 +8,6 @@ import at.petrak.hexcasting.api.spell.getPositiveInt import at.petrak.hexcasting.api.spell.iota.Iota import at.petrak.hexcasting.api.spell.mishaps.MishapNotEnoughArgs import it.unimi.dsi.fastutil.ints.IntArrayList -import kotlin.math.abs -import kotlin.math.roundToInt // "lehmer code" object OpAlwinfyHasAscendedToABeingOfPureMath : Action { @@ -23,6 +21,7 @@ object OpAlwinfyHasAscendedToABeingOfPureMath : Action { throw MishapNotEnoughArgs(1, 0) val code = stack.getPositiveInt(stack.lastIndex) + stack.removeLast() val strides = IntArrayList() for (f in FactorialIter()) { diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.json b/Common/src/main/resources/assets/hexcasting/lang/en_us.json index 8c2c87e8..5d7b875a 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.json +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.json @@ -320,7 +320,7 @@ "hexcasting.spell.hexcasting:zone_entity/not_living": "Zone Distillation: Non-Living", "hexcasting.spell.hexcasting:duplicate": "Gemini Decomposition", - "hexcasting.spell.hexcasting:duplicate_n": "Gemini Gambit", + "hexcasting.spell.hexcasting:duplicate_n": "Gemini's Gambit", "hexcasting.spell.hexcasting:over": "Dioscuri's Gambit", "hexcasting.spell.hexcasting:stack_len": "Flock's Reflection", "hexcasting.spell.hexcasting:swap": "Jester's Gambit",