Skip to content

Commit eec4ea9

Browse files
committed
Update hexcasting and loom, fix GuiSpellcasting mixin error due to internal refactoring
1 parent de80b3d commit eec4ea9

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

Common/src/main/java/gay/object/hexdebug/mixin/MixinGuiSpellcasting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public abstract class MixinGuiSpellcasting implements IMixinGuiSpellcasting {
4242
public abstract InteractionHand getHandOpenedWith();
4343

4444
@WrapWithCondition(
45-
method = "mouseReleased",
45+
method = "drawEnd",
4646
at = @At(
4747
value = "INVOKE",
4848
target = "Lat/petrak/hexcasting/xplat/IClientXplatAbstractions;sendPacketToServer(Lat/petrak/hexcasting/common/msgs/IMessage;)V",

Common/src/main/kotlin/gay/object/hexdebug/blocks/focusholder/FocusHolderBlockEntity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ class FocusHolderBlockEntity(pos: BlockPos, state: BlockState) :
3737

3838
override fun writeIota(iota: Iota?, simulate: Boolean) = iotaHolder?.writeIota(iota, simulate) ?: false
3939

40+
override fun writeable() = iotaHolder?.writeable() ?: false
41+
4042
override fun setChanged() {
4143
super.setChanged()
4244
if (blockState.getValue(HAS_ITEM) != isNotEmpty) {

Common/src/main/kotlin/gay/object/hexdebug/items/FocusHolderBlockItem.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ class FocusHolderBlockItem(block: Block, properties: Properties) :
3030
return iotaHolder?.readIotaTag(iotaStack)
3131
}
3232

33+
override fun writeable(stack: ItemStack): Boolean {
34+
val (_, iotaHolder) = stack.getIotaStack()
35+
return iotaHolder?.writeable(stack) ?: false
36+
}
37+
3338
override fun canWrite(stack: ItemStack, iota: Iota?): Boolean {
3439
val (iotaStack, iotaHolder) = stack.getIotaStack()
3540
return iotaHolder?.canWrite(iotaStack, iota) ?: false

Common/src/main/kotlin/gay/object/hexdebug/splicing/SplicingTableData.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,4 @@ class ReadListRangeToClipboard(
260260
}
261261
}
262262

263-
// simulate clearing the item, because that should be the most likely to succeed if the item is writable
264-
// writing any other value might give a false negative for specialized items like scrolls
265-
// we check if the write actually succeeded when running actions, so it's ok to be lax here
266-
private fun ADIotaHolder.takeIfWritable() = takeIf { writeIota(null, true) }
263+
private fun ADIotaHolder.takeIfWritable() = takeIf { writeable() }

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ parchment = "2023.09.03"
1212

1313
architectury = "9.2.14"
1414
architectury-plugin = { require="[3.4, 3.5[" }
15-
architectury-loom = { require="[1.5, 1.6[" }
15+
architectury-loom = { require="[1.6, 1.7[" }
1616

1717
fabric-loader = "0.14.21"
1818
fabric-api = "0.85.0+1.20.1"
@@ -22,7 +22,7 @@ forge-dependency = "47" # for mods.toml
2222

2323
# mods
2424

25-
hexcasting = "0.11.1-7-pre-636"
25+
hexcasting = "0.11.1-7-pre-672"
2626
paucal = "0.6.0-pre-118"
2727

2828
patchouli = "1.20.1-84"

0 commit comments

Comments
 (0)