refactor: port to mojmaps

8 files changed, 25 insertions, 25 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 f5b58c5..58344ad 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
@@ -4,7 +4,7 @@ import snownee.jade.api.Accessor
 import snownee.jade.api.BlockAccessor
 import snownee.jade.api.IWailaClientRegistration
 import snownee.jade.api.callback.JadeRayTraceCallback
-import net.minecraft.util.hit.HitResult
+import net.minecraft.world.phys.HitResult
 import moe.nea.firmament.repo.MiningRepoData
 import moe.nea.firmament.util.mc.FirmamentDataComponentTypes
 
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomMiningHardnessProvider.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomMiningHardnessProvider.kt
index 29fecd2..01c06e5 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomMiningHardnessProvider.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/CustomMiningHardnessProvider.kt
@@ -5,9 +5,9 @@ import snownee.jade.api.IBlockComponentProvider
 import snownee.jade.api.ITooltip
 import snownee.jade.api.config.IPluginConfig
 import kotlin.time.DurationUnit
-import net.minecraft.block.BlockState
-import net.minecraft.util.Identifier
-import net.minecraft.util.math.BlockPos
+import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.core.BlockPos
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.annotations.Subscribe
 import moe.nea.firmament.events.TickEvent
@@ -27,7 +27,7 @@ object CustomMiningHardnessProvider : IBlockComponentProvider {
 			tooltip.add(tr("firmament.jade.breaking_power", "Required Breaking Power: ${customBlock.breakingPower}"))
 	}
 
-	override fun getUid(): Identifier =
+	override fun getUid(): ResourceLocation =
 		Firmament.identifier("custom_mining_hardness")
 
 	data class BreakingInfo(
@@ -41,7 +41,7 @@ object CustomMiningHardnessProvider : IBlockComponentProvider {
 
 	@Subscribe
 	fun clearInfoOnStopBreaking(event: TickEvent) {
-		val isBreakingBlock = MC.interactionManager?.isBreakingBlock ?: false
+		val isBreakingBlock = MC.interactionManager?.isDestroying ?: false
 		if (!isBreakingBlock) {
 			previousBreakingInfo = null
 			currentBreakingInfo = null
@@ -54,7 +54,7 @@ object CustomMiningHardnessProvider : IBlockComponentProvider {
 		val state = MC.world?.getBlockState(blockPos)
 		if (previousBreakingInfo?.let { it.state != state || it.blockPos != blockPos } ?: false)
 			previousBreakingInfo == null
-		currentBreakingInfo = BreakingInfo(blockPos.toImmutable(), stage, state)
+		currentBreakingInfo = BreakingInfo(blockPos.immutable(), stage, state)
 		// For some reason hypixel initially sends a stage 10 packet, and then fixes it up with a stage 0 packet.
 		// Ignore the stage 10 packet if we dont have any previous packets for this block.
 		// This could in theory still have issues if someone perfectly stops breaking a block the tick it finishes and then does not break another block until it respawns, but i deem that to be too much of an edge case.
@@ -68,7 +68,7 @@ object CustomMiningHardnessProvider : IBlockComponentProvider {
 	fun replaceBreakProgress(original: Float): Float {
 		if (!JadeIntegration.TConfig.miningProgress) return original
 		if (!isOnMiningIsland()) return original
-		val pos = MC.interactionManager?.currentBreakingPos ?: return original
+		val pos = MC.interactionManager?.destroyBlockPos ?: return original
 		val info = currentBreakingInfo
 		if (info?.blockPos != pos || info.state != MC.world?.getBlockState(pos)) {
 			currentBreakingInfo = null
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
index addfc42..0083d78 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/DrillToolProvider.kt
@@ -12,8 +12,8 @@ import snownee.jade.api.ui.JadeUI
 import snownee.jade.gui.JadeLinearLayout
 import snownee.jade.impl.ui.ItemStackElement
 import snownee.jade.impl.ui.TextElementImpl
-import net.minecraft.text.Text
-import net.minecraft.util.Identifier
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
 import moe.nea.firmament.Firmament
 import moe.nea.firmament.repo.ExpensiveItemCacheApi
 import moe.nea.firmament.repo.RepoManager
@@ -63,10 +63,10 @@ class DrillToolProvider : IBlockComponentProvider {
 			.alignSelfCenter()
 	}
 
-	private val CHECK: Text = Text.literal("✔")
-	private val X: Text = Text.literal("✕")
+	private val CHECK: Component = Component.literal("✔")
+	private val X: Component = Component.literal("✕")
 
-	override fun getUid(): Identifier {
+	override fun getUid(): ResourceLocation {
 		return Firmament.identifier("toolprovider")
 	}
 }
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/FirmamentJadePlugin.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/FirmamentJadePlugin.kt
index 51e2453..a31492e 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/FirmamentJadePlugin.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/FirmamentJadePlugin.kt
@@ -4,7 +4,7 @@ import snownee.jade.api.IWailaClientRegistration
 import snownee.jade.api.IWailaCommonRegistration
 import snownee.jade.api.IWailaPlugin
 import snownee.jade.api.WailaPlugin
-import net.minecraft.block.Block
+import net.minecraft.world.level.block.Block
 import moe.nea.firmament.Firmament
 
 @WailaPlugin
diff --git a/src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt b/src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt
index 57749da..c289810 100644
--- a/src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt
+++ b/src/compat/jade/java/moe/nea/firmament/compat/jade/JadeIntegration.kt
@@ -5,7 +5,7 @@ import moe.nea.firmament.events.SkyblockServerUpdateEvent
 import moe.nea.firmament.repo.MiningRepoData
 import moe.nea.firmament.repo.RepoManager
 import moe.nea.firmament.util.ErrorUtil
-import net.minecraft.block.Block
+import net.minecraft.world.level.block.Block
 import moe.nea.firmament.events.ReloadRegistrationEvent
 import moe.nea.firmament.util.data.Config
 import moe.nea.firmament.util.data.ManagedConfig
diff --git a/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/EnforceToolDisplayForCustomBlocksInHarvestToolProvider.java b/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/EnforceToolDisplayForCustomBlocksInHarvestToolProvider.java
index 3677d01..27e3fa8 100644
--- a/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/EnforceToolDisplayForCustomBlocksInHarvestToolProvider.java
+++ b/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/EnforceToolDisplayForCustomBlocksInHarvestToolProvider.java
@@ -3,8 +3,8 @@ package moe.nea.firmament.mixins.compat.jade;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import moe.nea.firmament.compat.jade.CustomFakeBlockProvider;
-import net.minecraft.block.Blocks;
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import snownee.jade.addon.harvest.HarvestToolProvider;
@@ -14,7 +14,7 @@ import java.util.List;
 
 @Mixin(HarvestToolProvider.class)
 public class EnforceToolDisplayForCustomBlocksInHarvestToolProvider {
-	@ModifyExpressionValue(method = "getText", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isToolRequired()Z"))
+	@ModifyExpressionValue(method = "getText", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;isToolRequired()Z"))
 	private boolean overwriteRequiresTool(boolean original, @Local(argsOnly = true) BlockAccessor accessor) {
 		if (CustomFakeBlockProvider.hasCustomBlock(accessor))
 			return true;
diff --git a/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/OnUpdateBreakProgress.java b/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/OnUpdateBreakProgress.java
index 7d71ae8..76084f8 100644
--- a/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/OnUpdateBreakProgress.java
+++ b/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/OnUpdateBreakProgress.java
@@ -2,8 +2,8 @@ package moe.nea.firmament.mixins.compat.jade;
 
 import moe.nea.firmament.compat.jade.CustomMiningHardnessProvider;
 import moe.nea.firmament.util.MC;
-import net.minecraft.client.render.WorldRenderer;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.client.renderer.LevelRenderer;
+import net.minecraft.core.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -11,11 +11,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.Objects;
 
-@Mixin(WorldRenderer.class)
+@Mixin(LevelRenderer.class)
 public class OnUpdateBreakProgress {
-	@Inject(method = "setBlockBreakingInfo", at = @At("HEAD"))
+	@Inject(method = "destroyBlockProgress", at = @At("HEAD"))
 	private void replaceBreakProgress(int entityId, BlockPos pos, int stage, CallbackInfo ci) {
-		if (entityId == 0 && null != MC.INSTANCE.getInteractionManager() && Objects.equals(MC.INSTANCE.getInteractionManager().currentBreakingPos, pos)) {
+		if (entityId == 0 && null != MC.INSTANCE.getInteractionManager() && Objects.equals(MC.INSTANCE.getInteractionManager().destroyBlockPos, pos)) {
 			CustomMiningHardnessProvider.setBreakingInfo(pos, stage);
 		}
 	}
diff --git a/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/PatchBreakingBarSpeedJade.java b/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/PatchBreakingBarSpeedJade.java
index 203f7e4..a8d39a8 100644
--- a/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/PatchBreakingBarSpeedJade.java
+++ b/src/compat/jade/java/moe/nea/firmament/mixins/compat/jade/PatchBreakingBarSpeedJade.java
@@ -11,14 +11,14 @@ import snownee.jade.JadeClient;
 public class PatchBreakingBarSpeedJade {
 	@ModifyExpressionValue(
 		method = "drawBreakingProgress",
-		at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;currentBreakingProgress:F", opcode = Opcodes.GETFIELD)
+		at = @At(value = "FIELD", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;destroyProgress:F", opcode = Opcodes.GETFIELD)
 	)
 	private static float replaceBlockBreakingProgress(float original) {
 		return CustomMiningHardnessProvider.replaceBreakProgress(original);
 	}
 
 	@ModifyExpressionValue(method = "drawBreakingProgress",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;calcBlockBreakingDelta(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)F"))
+		at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;calcBlockBreakingDelta(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)F"))
 	private static float replacePlayerSpecificBreakingProgress(float original) {
 		return CustomMiningHardnessProvider.replaceBlockBreakSpeed(original);
 	}