aboutsummaryrefslogtreecommitdiff
path: root/src/compat/jade/java/moe
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2025-11-15 23:42:26 +0100
committerLinnea Gräf <nea@nea.moe>2025-11-15 23:42:26 +0100
commit5632c1d50bb0319886fb6acd54df92bf01491532 (patch)
tree6f9adb070df25a4406cfa7713714f9e348f7445e /src/compat/jade/java/moe
parent4d8399ff4d769def62e6a8241327c4f2dac47e71 (diff)
downloadFirmament-5632c1d50bb0319886fb6acd54df92bf01491532.tar.gz
Firmament-5632c1d50bb0319886fb6acd54df92bf01491532.tar.bz2
Firmament-5632c1d50bb0319886fb6acd54df92bf01491532.zip
snapshot: full 1.21.10 build (- REI; fuck private discord builds)
Diffstat (limited to 'src/compat/jade/java/moe')
-rw-r--r--src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt
index 53e3255..f5b58c5 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomFakeBlockProvider.kt
@@ -17,11 +17,10 @@ class CustomFakeBlockProvider(val registration: IWailaClientRegistration) : Jade
): Accessor<*>? {
if (!JadeIntegration.TConfig.blockDetection) return accessor
if (accessor !is BlockAccessor) return accessor
- val customBlock = JadeIntegration.customBlocks[accessor.block]
- if (customBlock == null) return accessor
+ val customBlock = JadeIntegration.customBlocks[accessor.block] ?: return accessor
return registration.blockAccessor()
.from(accessor)
- .fakeBlock(customBlock.getDisplayItem(accessor.block))
+ .serversideRep(customBlock.getDisplayItem(accessor.block))
.build()
}
@@ -33,8 +32,7 @@ class CustomFakeBlockProvider(val registration: IWailaClientRegistration) : Jade
@JvmStatic
fun getCustomBlock(accessor: BlockAccessor): MiningRepoData.CustomMiningBlock? {
- if (!accessor.isFakeBlock) return null
- val item = accessor.fakeBlock
+ val item = accessor.serversideRep ?: return null
return item.get(FirmamentDataComponentTypes.CUSTOM_MINING_BLOCK_DATA)
}
}