diff options
Diffstat (limited to 'src/compat')
13 files changed, 64 insertions, 64 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); } diff --git a/src/compat/moulconfig/java/MCConfigEditorIntegration.kt b/src/compat/moulconfig/java/MCConfigEditorIntegration.kt index f0e7f16..6b2df21 100644 --- a/src/compat/moulconfig/java/MCConfigEditorIntegration.kt +++ b/src/compat/moulconfig/java/MCConfigEditorIntegration.kt @@ -36,11 +36,11 @@ import java.net.URI import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds import kotlin.time.DurationUnit -import net.minecraft.client.gui.screen.Screen -import net.minecraft.text.Text -import net.minecraft.util.Identifier -import net.minecraft.util.StringIdentifiable -import net.minecraft.util.Util +import net.minecraft.client.gui.screens.Screen +import net.minecraft.network.chat.Component +import net.minecraft.resources.ResourceLocation +import net.minecraft.util.StringRepresentable +import net.minecraft.Util import moe.nea.firmament.Firmament import moe.nea.firmament.gui.config.AllConfigsGui import moe.nea.firmament.gui.config.BooleanHandler @@ -129,7 +129,7 @@ class MCConfigEditorIntegration : FirmamentConfigScreenProvider { } } - fun <T> helpRegisterChoice() where T : Enum<T>, T : StringIdentifiable { + fun <T> helpRegisterChoice() where T : Enum<T>, T : StringRepresentable { register(ChoiceHandler::class.java as Class<ChoiceHandler<T>>) { handler, option, categoryAccordionId, configObject -> object : ProcessedEditableOptionFirm<T>(option, categoryAccordionId, configObject) { override fun createEditor(): GuiOptionEditor { @@ -356,9 +356,9 @@ class MCConfigEditorIntegration : FirmamentConfigScreenProvider { return DescriptionRendereringBehaviour.EXPAND_PANEL } - fun mkSocial(name: String, identifier: Identifier, link: String) = object : Social() { + fun mkSocial(name: String, identifier: ResourceLocation, link: String) = object : Social() { override fun onClick() { - Util.getOperatingSystem().open(URI(link)) + MC.openUrl(link) } override fun getTooltip(): List<StructuredText> { @@ -437,7 +437,7 @@ class MCConfigEditorIntegration : FirmamentConfigScreenProvider { if (search != null) editor.search(search) editor.setWide(AllConfigsGui.ConfigConfig.enableWideMC) - return MoulConfigScreenComponent(Text.empty(), GuiContext(GuiElementComponent(editor)), parent) // TODO : add parent support + return MoulConfigScreenComponent(Component.empty(), GuiContext(GuiElementComponent(editor)), parent) // TODO : add parent support } } diff --git a/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/custommodels/PatchBlockModelInSodiumChunkGenerator.java b/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/custommodels/PatchBlockModelInSodiumChunkGenerator.java index 50a545a..50dba85 100644 --- a/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/custommodels/PatchBlockModelInSodiumChunkGenerator.java +++ b/src/compat/sodium/java/moe/nea/firmament/mixins/sodium/custommodels/PatchBlockModelInSodiumChunkGenerator.java @@ -5,10 +5,10 @@ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.sugar.Local; import moe.nea.firmament.features.texturepack.CustomBlockTextures; import net.caffeinemc.mods.sodium.client.render.chunk.compile.tasks.ChunkBuilderMeshingTask; -import net.minecraft.block.BlockState; -import net.minecraft.client.render.block.BlockModels; -import net.minecraft.client.render.model.BlockStateModel; -import net.minecraft.util.math.BlockPos; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.client.renderer.block.BlockModelShaper; +import net.minecraft.client.renderer.block.model.BlockStateModel; +import net.minecraft.core.BlockPos; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -16,9 +16,9 @@ import org.spongepowered.asm.mixin.injection.At; public class PatchBlockModelInSodiumChunkGenerator { @WrapOperation( method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/block/BlockModels;getModel(Lnet/minecraft/block/BlockState;)Lnet/minecraft/client/render/model/BlockStateModel;")) - private BlockStateModel replaceBlockModel(BlockModels instance, BlockState state, Operation<BlockStateModel> original, - @Local(name = "blockPos") BlockPos.Mutable pos) { + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/BlockModelShaper;getBlockModel(Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/block/model/BlockStateModel;")) + private BlockStateModel replaceBlockModel(BlockModelShaper instance, BlockState state, Operation<BlockStateModel> original, + @Local(name = "blockPos") BlockPos.MutableBlockPos pos) { var replacement = CustomBlockTextures.getReplacementModel(state, pos); if (replacement != null) return replacement; CustomBlockTextures.enterFallbackCall(); diff --git a/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java b/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java index cf499f0..c3c206f 100644 --- a/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java +++ b/src/compat/wildfireGender/java/moe/nea/firmament/mixins/compat/wildfiregender/PatchArmorTexturesInGenderMod.java @@ -4,9 +4,9 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; import com.wildfire.render.GenderArmorLayer; import moe.nea.firmament.features.texturepack.CustomGlobalArmorOverrides; -import net.minecraft.component.type.EquippableComponent; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.item.ItemStack; +import net.minecraft.world.item.equipment.Equippable; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Pseudo; import org.spongepowered.asm.mixin.injection.At; @@ -14,10 +14,10 @@ import org.spongepowered.asm.mixin.injection.At; @Mixin(GenderArmorLayer.class) @Pseudo public class PatchArmorTexturesInGenderMod { - @ModifyExpressionValue(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;get(Lnet/minecraft/component/ComponentType;)Ljava/lang/Object;")) + @ModifyExpressionValue(method = "submit(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;ILnet/minecraft/client/renderer/entity/state/HumanoidRenderState;FF)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;get(Lnet/minecraft/core/component/DataComponentType;)Ljava/lang/Object;")) private Object replaceArmorMaterial(Object original, @Local ItemStack chestplate) { var overrides = CustomGlobalArmorOverrides.overrideArmor(chestplate, EquipmentSlot.CHEST); - return overrides.orElse((EquippableComponent) original); + return overrides.orElse((Equippable) original); } } diff --git a/src/compat/yacl/java/KeybindingController.kt b/src/compat/yacl/java/KeybindingController.kt index 6ceef5d..3714455 100644 --- a/src/compat/yacl/java/KeybindingController.kt +++ b/src/compat/yacl/java/KeybindingController.kt @@ -6,9 +6,9 @@ import dev.isxander.yacl3.api.utils.Dimension import dev.isxander.yacl3.gui.AbstractWidget import dev.isxander.yacl3.gui.YACLScreen import dev.isxander.yacl3.gui.controllers.ControllerWidget -import net.minecraft.client.gui.Click -import net.minecraft.client.input.KeyInput -import net.minecraft.text.Text +import net.minecraft.client.input.MouseButtonEvent +import net.minecraft.client.input.KeyEvent +import net.minecraft.network.chat.Component import moe.nea.firmament.gui.config.KeyBindingHandler import moe.nea.firmament.gui.config.KeyBindingStateManager import moe.nea.firmament.gui.config.ManagedOption @@ -24,7 +24,7 @@ class KeybindingController( return option } - override fun formatValue(): Text { + override fun formatValue(): Component { return option.pendingValue().format() } @@ -55,15 +55,15 @@ class KeybindingWidget( return 130 } - override fun getValueText(): Text { + override fun getValueText(): Component { return sm.label } - override fun keyPressed(keyEvent: KeyInput): Boolean { + override fun keyPressed(keyEvent: KeyEvent): Boolean { return sm.keyboardEvent(GenericInputButton.of(keyEvent), true) } - override fun keyReleased(keyEvent: KeyInput): Boolean { + override fun keyReleased(keyEvent: KeyEvent): Boolean { return sm.keyboardEvent(GenericInputButton.of(keyEvent), false) } @@ -76,7 +76,7 @@ class KeybindingWidget( if (!focused) sm.onLostFocus() } - override fun mouseClicked(mouseButtonEvent: Click, doubleClick: Boolean): Boolean { + override fun mouseClicked(mouseButtonEvent: MouseButtonEvent, doubleClick: Boolean): Boolean { if (isHovered) { sm.onClick(mouseButtonEvent.button()) return true diff --git a/src/compat/yacl/java/YaclIntegration.kt b/src/compat/yacl/java/YaclIntegration.kt index d94e96f..e10b8c4 100644 --- a/src/compat/yacl/java/YaclIntegration.kt +++ b/src/compat/yacl/java/YaclIntegration.kt @@ -23,10 +23,10 @@ import java.awt.Color import kotlin.time.Duration import kotlin.time.Duration.Companion.seconds import kotlin.time.DurationUnit -import net.minecraft.client.gui.Element -import net.minecraft.client.gui.screen.Screen -import net.minecraft.client.gui.widget.ContainerWidget -import net.minecraft.text.Text +import net.minecraft.client.gui.components.events.GuiEventListener +import net.minecraft.client.gui.screens.Screen +import net.minecraft.client.gui.components.AbstractContainerWidget +import net.minecraft.network.chat.Component import moe.nea.firmament.gui.config.BooleanHandler import moe.nea.firmament.gui.config.ChoiceHandler import moe.nea.firmament.gui.config.ClickHandler @@ -158,7 +158,7 @@ class YaclIntegration : FirmamentConfigScreenProvider { .binding((binding as Binding<Duration>).xmap({ it.toDouble(DurationUnit.SECONDS) }, { it.seconds })) .controller { DoubleSliderControllerBuilder.create(it) - .formatValue { Text.literal(FirmFormatters.formatTimespan(it.seconds)) } + .formatValue { Component.literal(FirmFormatters.formatTimespan(it.seconds)) } .step(0.1) .range(handler.min.toDouble(DurationUnit.SECONDS), handler.max.toDouble(DurationUnit.SECONDS)) } @@ -168,7 +168,7 @@ class YaclIntegration : FirmamentConfigScreenProvider { KeybindingBuilder(it, managedOption as ManagedOption<SavedKeyBinding>) }.single() - else -> return listOf(LabelOption.create(Text.literal("This option is currently unhandled for this config menu. Please report this as a bug."))) + else -> return listOf(LabelOption.create(Component.literal("This option is currently unhandled for this config menu. Please report this as a bug."))) } } @@ -196,7 +196,7 @@ class YaclIntegration : FirmamentConfigScreenProvider { fun buildConfig(): YetAnotherConfigLib { return YetAnotherConfigLib.createBuilder() - .title(Text.literal("Firmament")) + .title(Component.literal("Firmament")) .categories(buildCategories()) .build() } @@ -206,9 +206,9 @@ class YaclIntegration : FirmamentConfigScreenProvider { override fun open(search: String?, parent: Screen?): Screen { return object : YACLScreen(buildConfig(), parent) { - override fun setFocused(focused: Element?) { + override fun setFocused(focused: GuiEventListener?) { if (this.focused is KeybindingWidget && - focused is ContainerWidget + focused is AbstractContainerWidget ) { return } |