diff --git a/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatBridgeExtensionImpl.java b/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatBridgeExtensionImpl.java index 5ad776f..d388dee 100644 --- a/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatBridgeExtensionImpl.java +++ b/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatBridgeExtensionImpl.java @@ -12,6 +12,7 @@ import de.siphalor.tweed5.core.api.entry.ConfigEntry; import de.siphalor.tweed5.core.api.extension.TweedExtensionSetupContext; import de.siphalor.tweed5.patchwork.api.PatchworkPartAccess; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import java.util.ArrayList; @@ -67,7 +68,12 @@ public class TweedCoatBridgeExtensionImpl implements TweedCoatBridgeExtension { } else { title = translatableComponent(params.translationKeyPrefix() + ".title"); } - ConfigScreen configScreen = new ConfigScreen(minecraft.screen, title, Collections.singletonList(contentWidget)); + //# if MC_VERSION_NUMBER >= 260200 + Screen parent = minecraft.gui.screen(); + //# else + //- Screen parent = minecraft.screen; + //# end + ConfigScreen configScreen = new ConfigScreen(parent, title, Collections.singletonList(contentWidget)); if (params.saveHandler() != null) { configScreen.setOnSave(() -> params.saveHandler().accept(value)); } diff --git a/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java b/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java index 6dc81a9..98a0edd 100644 --- a/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java +++ b/tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java @@ -38,7 +38,8 @@ import lombok.RequiredArgsConstructor; import lombok.Value; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.language.I18n; +//- import net.minecraft.client.resources.language.I18n; +import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.resources.Identifier; //- import net.minecraft.resources.ResourceLocation; @@ -592,7 +593,11 @@ public class TweedCoatMappersImpl { ); String descriptionKey = translationKey + ".description"; - if (I18n.exists(descriptionKey)) { + //# if MC_VERSION_NUMBER >= 260200 + if (Language.getInstance().has(descriptionKey)) { + //# else + //- if (I18n.exists(descriptionKey)) { + //# end categoryWidget.addEntry(new ConfigListTextEntry( translatableComponent(descriptionKey).withStyle(ChatFormatting.GRAY) )); diff --git a/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java b/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java index 12459b3..a31f5da 100644 --- a/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java +++ b/tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java @@ -83,7 +83,11 @@ public class TweedCoatBridgeTestMod implements ClientModInitializer { @Override public boolean onPressedPriority() { - if (!(Minecraft.getInstance().screen instanceof TitleScreen)) { + //# if MC_VERSION_NUMBER >= 260200 + if (!(Minecraft.getInstance().gui.screen() instanceof TitleScreen)) { + //# else + //- if (!(Minecraft.getInstance().screen instanceof TitleScreen)) { + //# end return false; } @@ -101,7 +105,11 @@ public class TweedCoatBridgeTestMod implements ClientModInitializer { }) .build() ); - Minecraft.getInstance().setScreen(configScreen); + //# if MC_VERSION_NUMBER >= 260200 + Minecraft.getInstance().gui.setScreen(configScreen); + //# else + //- Minecraft.getInstance().setScreen(configScreen); + //# end return true; } } diff --git a/tweed5-minecraft/gradle.properties b/tweed5-minecraft/gradle.properties index f9de4d9..2c68ee8 100644 --- a/tweed5-minecraft/gradle.properties +++ b/tweed5-minecraft/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs = -Xmx2G org.gradle.configuration-cache = true -minecraft.version.descriptor = 26.1.0 +minecraft.version.descriptor = 26.2.0 diff --git a/tweed5-minecraft/gradle/mc-26.2.0/gradle.properties b/tweed5-minecraft/gradle/mc-26.2.0/gradle.properties new file mode 100644 index 0000000..a95a7d9 --- /dev/null +++ b/tweed5-minecraft/gradle/mc-26.2.0/gradle.properties @@ -0,0 +1,3 @@ +fabric.api.key_mapping = fabric-key-mapping-api-v1 + +preprocessor.mc_version_number = 260200 diff --git a/tweed5-minecraft/gradle/mc-26.2.0/mc.versions.toml b/tweed5-minecraft/gradle/mc-26.2.0/mc.versions.toml new file mode 100644 index 0000000..56fb696 --- /dev/null +++ b/tweed5-minecraft/gradle/mc-26.2.0/mc.versions.toml @@ -0,0 +1,16 @@ +[versions] +amecs-priorityKeyMappings = "1.0.1" +coat = "1.1.3" +fabric-api = "0.152.0+26.2" +fabric-loom = "1.15-SNAPSHOT" +java = "25" +minecraft = "26.2-rc-2" + +[plugins] +fabric-loom = { id = "net.fabricmc.fabric-loom", version.ref = "fabric-loom" } + +[libraries] +amecs-priorityKeyMappings = { group = "de.siphalor.amecs.amecs-priority-key-mappings", name = "amecs-priority-key-mappings-mc26.2.0", version.ref = "amecs-priorityKeyMappings" } +coat = { group = "de.siphalor.coat", name = "coat-mc26.2.0", version.ref = "coat" } +fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" } +minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }