aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPauline <git@ethanlibs.co>2025-02-26 19:49:55 +0100
committerLinnea Grรคf <nea@nea.moe>2025-03-08 16:01:00 +0100
commitd3930d3da3509909a8ce44e4e86605127cb1e992 (patch)
treece0a55f3861fba0b57bdc9d95d28d20d46badd41
parentd176e0a52e68ee7ee7a4b66feef9874fb954243b (diff)
downloadFirmament-d3930d3da3509909a8ce44e4e86605127cb1e992.tar.gz
Firmament-d3930d3da3509909a8ce44e4e86605127cb1e992.tar.bz2
Firmament-d3930d3da3509909a8ce44e4e86605127cb1e992.zip
๐Ÿ› fix: explain
Signed-off-by: Pauline <git@ethanlibs.co>
-rw-r--r--src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolHandler.kt2
-rw-r--r--src/compat/jade/java/moe/nea/firmament/compat/jade/SkyblockProgressProvider.kt5
-rw-r--r--src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt4
3 files changed, 9 insertions, 2 deletions
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolHandler.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolHandler.kt
index d31532a..d3edb58 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolHandler.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolHandler.kt
@@ -9,7 +9,7 @@ import net.minecraft.world.World
class DrillToolHandler : ToolHandler {
override fun test(state: BlockState, world: World, pos: BlockPos): ItemStack {
- TODO("We need to override the existing tool handler tests because they use state.getHardness(world, pos), which doesn't work with Skyblocks NMS fuckery")
+ TODO("We need to override the existing tool handler tests because they use state.getHardness(world, pos) instead of using Breaking Power")
}
override fun getTools(): List<ItemStack> {
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/SkyblockProgressProvider.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/SkyblockProgressProvider.kt
index cdb849f..fdb86ce 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/SkyblockProgressProvider.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/SkyblockProgressProvider.kt
@@ -12,7 +12,10 @@ import net.minecraft.util.Identifier
class SkyblockProgressProvider : IClientExtensionProvider<ProgressView.Data, ProgressView> {
// wtf does this do i think its for the little progress bar which breaks in mining fatigue mining system
// but like this is just copied from the example plugin soo
- // TODO :3
+ // this is different from the toolhandler/toolprovider, this one adjusts the mining progress bar to
+ // adjust with skyblock's nms packet fuckery (see pr for references on how those packets probably work)
+ // so yeah we need to fix that.
+ // TODO :3 lol
override fun getClientGroups(accessor: Accessor<*>, groups: List<ViewGroup<ProgressView.Data>>): List<ClientViewGroup<ProgressView>> {
return ClientViewGroup.map(groups, ProgressView::read,
BiConsumer { group: ViewGroup<ProgressView.Data>, clientGroup: ClientViewGroup<ProgressView> ->
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt
index 3a0a18c..2fdd031 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/utils.kt
@@ -1,5 +1,6 @@
package moe.nea.firmament.compat.jade
+import snownee.jade.api.IWailaClientRegistration
import snownee.jade.api.ui.IElement
import snownee.jade.api.ui.IElementHelper
import net.minecraft.item.ItemStack
@@ -14,3 +15,6 @@ fun String.jadeId(): Identifier = Identifier.of("firmament", this)
// This drill icon should work for CIT resource packs
val drillItem: ItemStack = Items.PRISMARINE_SHARD.defaultStack.setSkyBlockId(SkyblockId("TITANIUM_DRILL_1"))
val drillIcon: IElement = IElementHelper.get().item(drillItem, 0.5f).message(null)
+fun IWailaClientRegistration.registerGemstone(type: String) {
+
+}