Merge branch 'main' into SlateLimit

object-Object · web-flow · commit 7e8c89c529e9 · 2025-10-14T17:48:16.000-04:00
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_5.json b/Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_5.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_ancient_cypher"
   }
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_5_filled.json b/Common/src/generated/resources/assets/hexcasting/models/item/ancient_cypher_5_filled.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_ancient_cypher",
     "layer1": "hexcasting:item/cad/5_ancient_cypher_overlay"
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/artifact_5.json b/Common/src/generated/resources/assets/hexcasting/models/item/artifact_5.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_artifact"
   }
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/artifact_5_filled.json b/Common/src/generated/resources/assets/hexcasting/models/item/artifact_5_filled.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_artifact",
     "layer1": "hexcasting:item/cad/5_artifact_overlay"
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/cypher_5.json b/Common/src/generated/resources/assets/hexcasting/models/item/cypher_5.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_cypher"
   }
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/cypher_5_filled.json b/Common/src/generated/resources/assets/hexcasting/models/item/cypher_5_filled.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_cypher",
     "layer1": "hexcasting:item/cad/5_cypher_overlay"
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/trinket_5.json b/Common/src/generated/resources/assets/hexcasting/models/item/trinket_5.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_trinket"
   }
diff --git a/Common/src/generated/resources/assets/hexcasting/models/item/trinket_5_filled.json b/Common/src/generated/resources/assets/hexcasting/models/item/trinket_5_filled.json
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/generated",
+  "parent": "minecraft:item/handheld_rod",
   "textures": {
     "layer0": "hexcasting:item/cad/5_trinket",
     "layer1": "hexcasting:item/cad/5_trinket_overlay"
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/castables/Action.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/castables/Action.kt
@@ -5,6 +5,7 @@ import at.petrak.hexcasting.api.casting.eval.OperationResult
 import at.petrak.hexcasting.api.casting.eval.vm.CastingImage
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
 import at.petrak.hexcasting.api.casting.iota.Iota
+import at.petrak.hexcasting.api.casting.mishaps.Mishap
 import net.minecraft.world.phys.Vec3
 import java.text.DecimalFormat
 
@@ -33,6 +34,7 @@ interface Action {
      * The userdata tag is copied for you, so you don't need to worry about mutation messing up things
      * behind the scenes.
      */
+    @Throws(Mishap::class)
     fun operate(
         env: CastingEnvironment,
         image: CastingImage,
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/castables/ConstMediaAction.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/castables/ConstMediaAction.kt
@@ -6,6 +6,7 @@ import at.petrak.hexcasting.api.casting.eval.sideeffects.OperatorSideEffect
 import at.petrak.hexcasting.api.casting.eval.vm.CastingImage
 import at.petrak.hexcasting.api.casting.eval.vm.SpellContinuation
 import at.petrak.hexcasting.api.casting.iota.Iota
+import at.petrak.hexcasting.api.casting.mishaps.Mishap
 import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughArgs
 import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughMedia
 import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
@@ -18,8 +19,10 @@ interface ConstMediaAction : Action {
     val mediaCost: Long
         get() = 0
 
+    @Throws(Mishap::class)
     fun execute(args: List<Iota>, env: CastingEnvironment): List<Iota>
 
+    @Throws(Mishap::class)
     fun executeWithOpCount(args: List<Iota>, env: CastingEnvironment): CostMediaActionResult {
         val stack = this.execute(args, env)
         return CostMediaActionResult(stack)
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/castables/SpellAction.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/castables/SpellAction.kt
@@ -11,6 +11,7 @@ import at.petrak.hexcasting.api.casting.iota.Iota
 import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughArgs
 import at.petrak.hexcasting.api.casting.mishaps.MishapNotEnoughMedia
 import at.petrak.hexcasting.common.lib.hex.HexEvalSounds
+import at.petrak.hexcasting.api.casting.mishaps.Mishap
 import net.minecraft.nbt.CompoundTag
 
 interface SpellAction : Action {
@@ -20,11 +21,14 @@ interface SpellAction : Action {
 
     fun awardsCastingStat(ctx: CastingEnvironment): Boolean = true
 
+    @Throws(Mishap::class)
     fun execute(
         args: List<Iota>,
         env: CastingEnvironment
     ): Result
 
+    @Throws(Mishap::class)
+
     fun executeWithUserdata(
         args: List<Iota>, env: CastingEnvironment, userData: CompoundTag
     ): Result {
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/iota/ListIota.java b/Common/src/main/java/at/petrak/hexcasting/api/casting/iota/ListIota.java
@@ -136,7 +136,7 @@ public Component display(Tag tag) {
                 if (i < list.size() - 1) {
                     var thisIotaNeedsComma = IotaType.getTypeFromTag(csub) != PatternIota.TYPE;
                     var nextIotaNeedsComma = IotaType.getTypeFromTag(HexUtils.downcast(list.get(i+1), CompoundTag.TYPE)) != PatternIota.TYPE;
-                    var alwaysShowCommas = HexConfig.client().alwaysShowListCommas();
+                    var alwaysShowCommas = HexConfig.client() != null && HexConfig.client().alwaysShowListCommas();
                     if (thisIotaNeedsComma || nextIotaNeedsComma || alwaysShowCommas)
                         out.append(", ");
                 }
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/math/HexAngle.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/math/HexAngle.kt
@@ -5,4 +5,19 @@ enum class HexAngle {
 
     fun rotatedBy(a: HexAngle) = values()[(this.ordinal + a.ordinal) % values().size]
     operator fun times(a: HexAngle) = this.rotatedBy(a)
+
+    companion object {
+        fun fromChar(c: Char): HexAngle? {
+            return when (c) {
+                'w' -> FORWARD
+                'e' -> RIGHT
+                'd' -> RIGHT_BACK
+                // for completeness ...
+                's' -> BACK
+                'a' -> LEFT_BACK
+                'q' -> LEFT
+                else -> null
+            }
+        }
+    }
 }
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/math/HexPattern.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/math/HexPattern.kt
@@ -9,6 +9,7 @@ import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.nbt.Tag
 import net.minecraft.world.phys.Vec2
+import kotlin.jvm.Throws
 
 /**
  * Sequence of angles to define a pattern traced.
@@ -130,11 +131,12 @@ data class HexPattern(val startDir: HexDir, val angles: MutableList<HexAngle> =
         const val TAG_ANGLES = "angles"
 
         @JvmField
-        val CODEC: Codec<HexPattern> = RecordCodecBuilder.create({instance -> instance.group(
-            Codec.STRING.fieldOf(TAG_START_DIR).forGetter(HexPattern::anglesSignature),
-            HexDir.CODEC.fieldOf(TAG_ANGLES).forGetter(HexPattern::startDir)
-        ).apply(instance, HexPattern::fromAngles)
-        })
+        val CODEC: Codec<HexPattern> = RecordCodecBuilder.create { instance ->
+            instance.group(
+                Codec.STRING.fieldOf(TAG_START_DIR).forGetter(HexPattern::anglesSignature),
+                HexDir.CODEC.fieldOf(TAG_ANGLES).forGetter(HexPattern::startDir)
+            ).apply(instance, HexPattern::fromAnglesUnchecked)
+        }
 
         @JvmStatic
         fun isPattern(tag: CompoundTag): Boolean {
@@ -149,30 +151,61 @@ data class HexPattern(val startDir: HexDir, val angles: MutableList<HexAngle> =
             return HexPattern(startDir, angles.toMutableList())
         }
 
+        /**
+         * Construct a [HexPattern] from an angle signature and starting direction.
+         *
+         * Throws if the signature contains an invalid character, or if the resulting pattern would contain overlaps.
+         */
         @JvmStatic
+        @Throws(IllegalArgumentException::class, IllegalStateException::class)
         fun fromAngles(signature: String, startDir: HexDir): HexPattern {
             val out = HexPattern(startDir)
+
+            var cursor = HexCoord.Origin
             var compass = startDir
+            val linesSeen = mutableSetOf(
+                cursor to compass,
+                cursor + compass to compass.rotatedBy(HexAngle.BACK),
+            )
 
             for ((idx, c) in signature.withIndex()) {
-                val angle = when (c) {
-                    'w' -> HexAngle.FORWARD
-                    'e' -> HexAngle.RIGHT
-                    'd' -> HexAngle.RIGHT_BACK
-                    // for completeness ...
-                    's' -> HexAngle.BACK
-                    'a' -> HexAngle.LEFT_BACK
-                    'q' -> HexAngle.LEFT
-                    else -> throw IllegalArgumentException("Cannot match $c at idx $idx to a direction")
-                }
+                val angle = HexAngle.fromChar(c)
+                    ?: throw IllegalArgumentException("Cannot match $c at idx $idx to a direction")
+
+                cursor += compass
                 compass *= angle
-                val success = out.tryAppendDir(compass)
-                if (!success) {
+
+                if (
+                    !linesSeen.add(cursor to compass)
+                    // Line from here to there also blocks there to here
+                    || !linesSeen.add(cursor + compass to compass.rotatedBy(HexAngle.BACK))
+                ) {
                     throw IllegalStateException("Adding the angle $c at index $idx made the pattern invalid by looping back on itself")
                 }
+
+                out.angles.add(angle)
             }
+
             return out
         }
 
+        /**
+         * Construct a [HexPattern] from an angle signature and starting direction, without checking for overlaps.
+         *
+         * Throws if the signature contains an invalid character.
+         */
+        @JvmStatic
+        @Throws(IllegalArgumentException::class)
+        fun fromAnglesUnchecked(signature: String, startDir: HexDir): HexPattern {
+            val out = HexPattern(startDir)
+
+            for ((idx, c) in signature.withIndex()) {
+                val angle = HexAngle.fromChar(c)
+                    ?: throw IllegalArgumentException("Cannot match $c at idx $idx to a direction")
+                out.angles.add(angle)
+            }
+
+            return out
+        }
     }
 }
diff --git a/Common/src/main/java/at/petrak/hexcasting/api/casting/mishaps/Mishap.kt b/Common/src/main/java/at/petrak/hexcasting/api/casting/mishaps/Mishap.kt
@@ -18,8 +18,9 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.item.DyeColor
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.phys.Vec3
+import java.lang.RuntimeException
 
-abstract class Mishap : Throwable() {
+abstract class Mishap : RuntimeException() {
     /** Mishaps spray half-red, half-this-color. */
     abstract fun accentColor(ctx: CastingEnvironment, errorCtx: Context): FrozenPigment
 
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/PatternRegistryManifest.java b/Common/src/main/java/at/petrak/hexcasting/common/casting/PatternRegistryManifest.java
@@ -128,6 +128,6 @@ public static HexPattern getCanonicalStrokesPerWorld(ResourceKey<ActionRegistryE
 
         var sig = pair.getFirst();
         var entry = pair.getSecond();
-        return HexPattern.fromAngles(sig, entry.canonicalStartDir());
+        return HexPattern.fromAnglesUnchecked(sig, entry.canonicalStartDir());
     }
 }
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/spells/OpMakePackagedSpell.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/spells/OpMakePackagedSpell.kt
@@ -19,10 +19,11 @@ import net.minecraft.world.entity.item.ItemEntity
 import net.minecraft.world.item.ItemStack
 import net.minecraft.network.chat.Component
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 // TODO: How to handle in circles
-class OpMakePackagedSpell(val isValid: Predicate<ItemStack>, val expectedTypeDesc: Component, val cost: Long) : SpellAction {
-    constructor(itemType: ItemPackagedHex, cost: Long) : this({s -> s.`is`(itemType)}, itemType.description, cost) {}
+class OpMakePackagedSpell(val isValid: Predicate<ItemStack>, val expectedTypeDesc: Supplier<Component>, val cost: Long) : SpellAction {
+    constructor(itemType: ItemPackagedHex, cost: Long) : this({s -> s.`is`(itemType)}, itemType::getDescription, cost) {}
     
     override val argc = 2
     override fun execute(
@@ -36,11 +37,11 @@ class OpMakePackagedSpell(val isValid: Predicate<ItemStack>, val expectedTypeDes
             val hexHolder = IXplatAbstractions.INSTANCE.findHexHolder(it)
             isValid.test(it) && hexHolder != null && !hexHolder.hasHex()
         }
-            ?: throw MishapBadOffhandItem(ItemStack.EMPTY.copy(), expectedTypeDesc) // TODO: hack
+            ?: throw MishapBadOffhandItem(ItemStack.EMPTY.copy(), expectedTypeDesc.get()) // TODO: hack
 
         val hexHolder = IXplatAbstractions.INSTANCE.findHexHolder(handStack)
         if (!isValid.test(handStack)) {
-            throw MishapBadOffhandItem(handStack, expectedTypeDesc)
+            throw MishapBadOffhandItem(handStack, expectedTypeDesc.get())
         } else if (hexHolder == null || hexHolder.hasHex()) {
             throw MishapBadOffhandItem.of(handStack, "iota.write")
         }
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/spells/great/OpBrainsweep.kt b/Common/src/main/java/at/petrak/hexcasting/common/casting/actions/spells/great/OpBrainsweep.kt
@@ -1,5 +1,6 @@
 package at.petrak.hexcasting.common.casting.actions.spells.great
 
+import at.petrak.hexcasting.api.HexAPI
 import at.petrak.hexcasting.api.casting.ParticleSpray
 import at.petrak.hexcasting.api.casting.RenderedSpell
 import at.petrak.hexcasting.api.casting.castables.SpellAction
@@ -74,7 +75,8 @@ object OpBrainsweep : SpellAction {
         override fun cast(env: CastingEnvironment) {
             env.world.setBlockAndUpdate(pos, BrainsweepRecipe.copyProperties(state, recipe.result))
 
-            IXplatAbstractions.INSTANCE.setBrainsweepAddlData(sacrifice)
+            HexAPI.instance().brainsweep(sacrifice)
+
             if (sacrifice is Villager && HexConfig.server().doVillagersTakeOffenseAtMindMurder()) {
                 env.castingEntity?.let { sacrifice.tellWitnessesThatIWasMurdered(it) }
             }
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/command/ListPerWorldPatternsCommand.java b/Common/src/main/java/at/petrak/hexcasting/common/command/ListPerWorldPatternsCommand.java
@@ -96,7 +96,7 @@ private static int giveAll(CommandSourceStack source, Collection<ServerPlayer> t
                     var found = save.lookupReverse(key);
                     var signature = found.getFirst();
                     var startDir = found.getSecond().canonicalStartDir();
-                    var pat = HexPattern.fromAngles(signature, startDir);
+                    var pat = HexPattern.fromAnglesUnchecked(signature, startDir);
 
                     var tag = new CompoundTag();
                     tag.putString(ItemScroll.TAG_OP_ID, key.location().toString());
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/hex/HexActions.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/hex/HexActions.java
@@ -275,7 +275,7 @@ public class HexActions {
 
     public static final ActionRegistryEntry CRAFT$CYPHER = make("craft/cypher", new ActionRegistryEntry(
         HexPattern.fromAngles("waqqqqq", HexDir.EAST), 
-        new OpMakePackagedSpell(s -> (s.is(HexItems.CYPHER)||s.is(HexItems.ANCIENT_CYPHER)), HexItems.CYPHER.getDescription(), MediaConstants.CRYSTAL_UNIT)
+        new OpMakePackagedSpell(s -> (s.is(HexItems.CYPHER)||s.is(HexItems.ANCIENT_CYPHER)), HexItems.CYPHER::getDescription, MediaConstants.CRYSTAL_UNIT)
     ));
     public static final ActionRegistryEntry CRAFT$TRINKET = make("craft/trinket", new ActionRegistryEntry(
         HexPattern.fromAngles("wwaqqqqqeaqeaeqqqeaeq", HexDir.EAST), 
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/loot/AddHexToAncientCypherFunc.java b/Common/src/main/java/at/petrak/hexcasting/common/loot/AddHexToAncientCypherFunc.java
@@ -44,7 +44,7 @@ public static ItemStack doStatic(ItemStack stack, RandomSource rand) {
         var patsTag = new ListTag();
         for (var patString : hex.getSecond()){
             var pieces = patString.split(" ");
-            var pat = HexPattern.fromAngles(pieces[1],HexDir.fromString(pieces[0]));
+            var pat = HexPattern.fromAnglesUnchecked(pieces[1],HexDir.fromString(pieces[0]));
             patsTag.add(IotaType.serialize(new PatternIota(pat)));
         }
         
diff --git a/Common/src/main/java/at/petrak/hexcasting/interop/inline/HexPatternMatcher.java b/Common/src/main/java/at/petrak/hexcasting/interop/inline/HexPatternMatcher.java
@@ -53,7 +53,7 @@ public Tuple<InlineMatch, Integer> getMatchAndGroup(MatchResult regexMatch, Matc
             angleSigs = "";
         }
         try{
-            pat = HexPattern.fromAngles(angleSigs.toLowerCase(), dir);
+            pat = HexPattern.fromAnglesUnchecked(angleSigs.toLowerCase(), dir);
             InlinePatternData patData = new InlinePatternData(pat);
             Style patDataStyle = patData.getExtraStyle();
             if(sizeModString != null && sizeModString.equals("+"))
diff --git a/Common/src/main/java/at/petrak/hexcasting/interop/patchouli/ManualPatternComponent.java b/Common/src/main/java/at/petrak/hexcasting/interop/patchouli/ManualPatternComponent.java
@@ -33,7 +33,7 @@ public List<HexPattern> getPatterns(UnaryOperator<IVariable> lookup) {
             RawPattern raw = new Gson().fromJson(json, RawPattern.class);
 
             var dir = HexDir.fromString(raw.startdir);
-            var pat = HexPattern.fromAngles(raw.signature, dir);
+            var pat = HexPattern.fromAnglesUnchecked(raw.signature, dir);
             out.add(pat);
         }
 
diff --git a/Common/src/main/resources/assets/hexcasting/lang/zh_cn.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/zh_cn.flatten.json5
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
diff --git a/doc/resources/assets/hexcasting/lang/en_us.flatten.json5 b/doc/resources/assets/hexcasting/lang/en_us.flatten.json5
diff --git a/doc/src/hexdoc_hexcasting/book/__init__.py b/doc/src/hexdoc_hexcasting/book/__init__.py
diff --git a/doc/src/hexdoc_hexcasting/book/page/pages.py b/doc/src/hexdoc_hexcasting/book/page/pages.py
diff --git a/doc/src/hexdoc_hexcasting/metadata.py b/doc/src/hexdoc_hexcasting/metadata.py
diff --git a/doc/src/hexdoc_hexcasting/utils/pattern.py b/doc/src/hexdoc_hexcasting/utils/pattern.py
diff --git a/pyproject.toml b/pyproject.toml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "parent": "minecraft:item/generated",`
	`2`	`+ "parent": "minecraft:item/handheld_rod",`
`3`	`3`	`"textures": {`
`4`	`4`	`"layer0": "hexcasting:item/cad/5_ancient_cypher"`
`5`	`5`	`}`