Make pickaxe ability display use AbilityUtils

[no changelog]

1 files changed, 68 insertions, 63 deletions

diff --git a/src/main/kotlin/util/MC.kt b/src/main/kotlin/util/MC.kt
index db8eccb..09aa7aa 100644
--- a/src/main/kotlin/util/MC.kt
+++ b/src/main/kotlin/util/MC.kt
@@ -4,7 +4,9 @@ import io.github.moulberry.repo.data.Coordinate
 import java.util.concurrent.ConcurrentLinkedQueue
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.screen.ingame.HandledScreen
+import net.minecraft.client.option.GameOptions
 import net.minecraft.client.render.WorldRenderer
+import net.minecraft.item.Item
 import net.minecraft.network.packet.c2s.play.CommandExecutionC2SPacket
 import net.minecraft.registry.BuiltinRegistries
 import net.minecraft.registry.RegistryKeys
@@ -16,79 +18,82 @@ import moe.nea.firmament.events.TickEvent
 
 object MC {
 
-    private val messageQueue = ConcurrentLinkedQueue<Text>()
+	private val messageQueue = ConcurrentLinkedQueue<Text>()
 
-    init {
-        TickEvent.subscribe("MC:push") {
-            while (true) {
-                inGameHud.chatHud.addMessage(messageQueue.poll() ?: break)
-            }
-            while (true) {
-                (nextTickTodos.poll() ?: break).invoke()
-            }
-        }
-    }
+	init {
+		TickEvent.subscribe("MC:push") {
+			while (true) {
+				inGameHud.chatHud.addMessage(messageQueue.poll() ?: break)
+			}
+			while (true) {
+				(nextTickTodos.poll() ?: break).invoke()
+			}
+		}
+	}
 
-    fun sendChat(text: Text) {
-        if (instance.isOnThread)
-            inGameHud.chatHud.addMessage(text)
-        else
-            messageQueue.add(text)
-    }
+	fun sendChat(text: Text) {
+		if (instance.isOnThread)
+			inGameHud.chatHud.addMessage(text)
+		else
+			messageQueue.add(text)
+	}
 
-    fun sendServerCommand(command: String) {
-        val nh = player?.networkHandler ?: return
-        nh.sendPacket(
-            CommandExecutionC2SPacket(
-                command,
-            )
-        )
-    }
+	fun sendServerCommand(command: String) {
+		val nh = player?.networkHandler ?: return
+		nh.sendPacket(
+			CommandExecutionC2SPacket(
+				command,
+			)
+		)
+	}
 
-    fun sendServerChat(text: String) {
-        player?.networkHandler?.sendChatMessage(text)
-    }
+	fun sendServerChat(text: String) {
+		player?.networkHandler?.sendChatMessage(text)
+	}
 
-    fun sendCommand(command: String) {
-        player?.networkHandler?.sendCommand(command)
-    }
+	fun sendCommand(command: String) {
+		player?.networkHandler?.sendCommand(command)
+	}
 
-    fun onMainThread(block: () -> Unit) {
-        if (instance.isOnThread)
-            block()
-        else
-            instance.send(block)
-    }
+	fun onMainThread(block: () -> Unit) {
+		if (instance.isOnThread)
+			block()
+		else
+			instance.send(block)
+	}
 
-    private val nextTickTodos = ConcurrentLinkedQueue<() -> Unit>()
-    fun nextTick(function: () -> Unit) {
-        nextTickTodos.add(function)
-    }
+	private val nextTickTodos = ConcurrentLinkedQueue<() -> Unit>()
+	fun nextTick(function: () -> Unit) {
+		nextTickTodos.add(function)
+	}
 
 
-    inline val resourceManager get() = (instance.resourceManager as ReloadableResourceManagerImpl)
-    inline val worldRenderer: WorldRenderer get() = instance.worldRenderer
-    inline val networkHandler get() = player?.networkHandler
-    inline val instance get() = MinecraftClient.getInstance()
-    inline val keyboard get() = instance.keyboard
-    inline val textureManager get() = instance.textureManager
-    inline val inGameHud get() = instance.inGameHud
-    inline val font get() = instance.textRenderer
-    inline val soundManager get() = instance.soundManager
-    inline val player get() = instance.player
-    inline val camera get() = instance.cameraEntity
-    inline val guiAtlasManager get() = instance.guiAtlasManager
-    inline val world get() = instance.world
-    inline var screen
-        get() = instance.currentScreen
-        set(value) = instance.setScreen(value)
-    inline val handledScreen: HandledScreen<*>? get() = instance.currentScreen as? HandledScreen<*>
-    inline val window get() = instance.window
-    inline val currentRegistries: RegistryWrapper.WrapperLookup? get() = world?.registryManager
-    val defaultRegistries: RegistryWrapper.WrapperLookup = BuiltinRegistries.createWrapperLookup()
-    val defaultItems = defaultRegistries.getWrapperOrThrow(RegistryKeys.ITEM)
+	inline val resourceManager get() = (instance.resourceManager as ReloadableResourceManagerImpl)
+	inline val worldRenderer: WorldRenderer get() = instance.worldRenderer
+	inline val networkHandler get() = player?.networkHandler
+	inline val instance get() = MinecraftClient.getInstance()
+	inline val keyboard get() = instance.keyboard
+	inline val interactionManager get() = instance.interactionManager
+	inline val textureManager get() = instance.textureManager
+	inline val options get() = instance.options
+	inline val inGameHud get() = instance.inGameHud
+	inline val font get() = instance.textRenderer
+	inline val soundManager get() = instance.soundManager
+	inline val player get() = instance.player
+	inline val camera get() = instance.cameraEntity
+	inline val guiAtlasManager get() = instance.guiAtlasManager
+	inline val world get() = instance.world
+	inline var screen
+		get() = instance.currentScreen
+		set(value) = instance.setScreen(value)
+	inline val handledScreen: HandledScreen<*>? get() = instance.currentScreen as? HandledScreen<*>
+	inline val window get() = instance.window
+	inline val currentRegistries: RegistryWrapper.WrapperLookup? get() = world?.registryManager
+	val defaultRegistries: RegistryWrapper.WrapperLookup = BuiltinRegistries.createWrapperLookup()
+	inline val currentOrDefaultRegistries get() = currentRegistries ?: defaultRegistries
+	val defaultItems: RegistryWrapper.Impl<Item> = defaultRegistries.getWrapperOrThrow(RegistryKeys.ITEM)
 }
 
 
 val Coordinate.blockPos: BlockPos
-    get() = BlockPos(x, y, z)
+	get() = BlockPos(x, y, z)