Add IoticBlocks dependency, update Gradle and Loom, remove read/write block patterns

Author: object-Object

CHANGELOG.md

@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
   - Debug Locator's Reflection: Pushes the index of the next iota to be evaluated.
   - Cognitohazard Reflection: Pushes a cognitohazard iota to the stack, which halts debugging immediately if detected in a hex to be evaluated by a debugger.
 - Added ru_ru translations, by JustS-js in [#25](https://github.com/object-Object/HexDebug/pull/25).
+- New dependency: IoticBlocks.
 
 ### Changed
 
@@ -35,7 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ### Notes
 
-- This update also contains a new undocumented block (Focus Holder) and some undocumented patterns. Please don't use these for anything important, as they'll probably be moved to a separate mod at some point.
+- This update also contains a new undocumented block (Focus Holder). Please don't use this for anything important, as it'll probably be moved to a separate mod at some point.
 - I likely will not be backporting this update to 1.19.2, due to the many GUI-related changes between that version and this one. 
 
 ## `0.2.2+1.20.1` - 2024-05-28

Common/build.gradle.kts

@@ -29,4 +29,6 @@ dependencies {
     api(libs.bundles.lsp4j)
 
     implementation(libs.bundles.ktor)
+
+    modApi(libs.ioticblocks.common)
 }

Common/src/main/kotlin/gay/object/hexdebug/casting/actions/OpReadBlock.kt

@@ -9,7 +9,9 @@ import at.petrak.hexcasting.common.casting.actions.spells.OpMakePackagedSpell
 import at.petrak.hexcasting.common.items.magic.ItemPackagedHex
 import at.petrak.hexcasting.common.lib.HexRegistries
 import at.petrak.hexcasting.common.lib.hex.HexActions
-import gay.`object`.hexdebug.casting.actions.*
+import gay.`object`.hexdebug.casting.actions.OpBreakpoint
+import gay.`object`.hexdebug.casting.actions.OpIsDebugging
+import gay.`object`.hexdebug.casting.actions.OpNextEvalIndex
 import gay.`object`.hexdebug.casting.iotas.CognitohazardIota
 
 object HexDebugActions : HexDebugRegistrar<ActionRegistryEntry>(HexRegistries.ACTION, { HexActions.REGISTRY }) {
@@ -27,12 +29,6 @@ object HexDebugActions : HexDebugRegistrar<ActionRegistryEntry>(HexRegistries.AC
         OpMakePackagedSpell(HexDebugItems.DEBUGGER.value as ItemPackagedHex, 10 * MediaConstants.CRYSTAL_UNIT)
     }
 
-    // temporary implementation of FallingColors/HexMod#412 since there's no 1.20 gloop
-    val BLOCK_READ = make("block_read", HexDir.EAST, "aqqqqqeawqwaw", OpReadBlock)
-    val BLOCK_WRITE = make("block_write", HexDir.EAST, "deeeeeqdwewewewdw", OpWriteBlock)
-    val BLOCK_READ_INDEXED = make("block_read_indexed", HexDir.EAST, "aqqqqqedwewewewdw", OpReadBlockIndexed)
-    val BLOCK_WRITE_INDEXED = make("block_write_indexed", HexDir.EAST, "deeeeeqawqwaw", OpWriteBlockIndexed)
-
     private fun make(name: String, startDir: HexDir, signature: String, action: Action) =
         make(name, startDir, signature) { action }
 

Common/src/main/kotlin/gay/object/hexdebug/casting/actions/OpReadBlockIndexed.kt

@@ -1,14 +1,6 @@
 package gay.`object`.hexdebug.utils
 
-import at.petrak.hexcasting.api.addldata.ADIotaHolder
 import at.petrak.hexcasting.xplat.IXplatAbstractions
-import net.minecraft.core.BlockPos
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.level.Level
 
 fun isIotaHolder(stack: ItemStack) = IXplatAbstractions.INSTANCE.findDataHolder(stack) != null
-
-fun findDataHolder(world: Level, pos: BlockPos): ADIotaHolder? {
-    return world.getBlockState(pos).block as? ADIotaHolder
-        ?: world.getBlockEntity(pos) as? ADIotaHolder
-}

Common/src/main/kotlin/gay/object/hexdebug/casting/actions/OpWriteBlock.kt

@@ -1,3 +1,5 @@
+import hexdebug.libs
+
 plugins {
     id("hexdebug.conventions.platform")
 }
@@ -22,6 +24,7 @@ hexdebugModDependencies {
     requires("architectury-api")
     requires("cloth-config")
     requires(curseforge = "hexcasting", modrinth = "hex-casting")
+    requires("ioticblocks")
 
     requires("fabric-api")
     requires("fabric-language-kotlin")
@@ -73,6 +76,8 @@ dependencies {
     }
 
     modLocalRuntime(libs.devAuth.fabric)
+
+    modApi(libs.ioticblocks.fabric)
 }
 
 publishMods {

Common/src/main/kotlin/gay/object/hexdebug/casting/actions/OpWriteBlockIndexed.kt

@@ -38,7 +38,8 @@
     "fabric-language-kotlin": ">=${versions.kotlin_fabric}",
     "architectury": ">=${versions.architectury}",
     "hexcasting": ">=${versions.hexcasting_dependency}",
-    "cloth-config": ">=${versions.clothConfig}"
+    "cloth-config": ">=${versions.clothConfig}",
+    "ioticblocks": ">=${versions.ioticblocks}"
   },
   "suggests": {
     "modmenu": ">=${versions.modMenu}"