Siphalor/tweed5
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects 1 Releases Wiki Activity

feat(minecraft): Update and Gradle changes for Minecraft 26.1

Browse Source
This commit is contained in:
Siphalor
2026-03-29 15:44:22 +02:00
parent 3add9da6d4
commit 14a2d1c3c2
30 changed files with 150 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tweed5-minecraft/coat-bridge/build.gradle.kts
View File

@@ -8,16 +8,17 @@ dependencies {
compileOnly("de.siphalor.tweed5:tweed5-attributes-extension")
compileOnly("de.siphalor.tweed5:tweed5-default-extensions")
compileOnly("de.siphalor.tweed5:tweed5-weaver-pojo")
compileOnly(project(":tweed5-logging", configuration = "minecraftModApiElements"))
modCompileOnly(mcLibs.coat)
listOf("fabric-key-binding-api-v1", "fabric-resource-loader-v0").forEach {
listOf(smcmtk.mcProps.getting("fabric.api.key_mapping").get(), "fabric-resource-loader-v0").forEach {
modTestmodImplementation(fabricApi.module(it, mcLibs.versions.fabric.api.get()))
}
testmodImplementation(project(":tweed5-logging", configuration = "minecraftModApiElements"))
testmodImplementation(project(":tweed5-logging", configuration = "minecraftModElements"))
testmodImplementation(project(":tweed5-bundle", configuration = "runtimeElements"))
testmodImplementation(project(":tweed5-bundle-pojo-weaving", configuration = "runtimeElements"))
testmodImplementation(project(":tweed5-fabric-helper", configuration = "namedElements"))
modTestmodImplementation(mcLibs.coat)
modTestmodImplementation(mcLibs.amecs.api)
modTestmodImplementation(mcLibs.amecs.priorityKeyMappings)
testmodImplementation("de.siphalor.tweed5:tweed5-serde-hjson")
}

4
tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/api/mapping/handler/BasicTweedCoatEntryHandler.java
View File

@@ -7,7 +7,7 @@ import de.siphalor.tweed5.defaultextensions.validation.api.ValidationExtension;
import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationIssueLevel;
import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationIssues;
import de.siphalor.tweed5.defaultextensions.validation.api.result.ValidationResult;
import lombok.extern.apachecommons.CommonsLog;
import lombok.CustomLog;
import net.minecraft.network.chat.Component;
import org.jspecify.annotations.Nullable;
@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
import static de.siphalor.tweed5.coat.bridge.api.TweedCoatMappingUtils.literalComponent;
@CommonsLog
@CustomLog
public class BasicTweedCoatEntryHandler<T extends @Nullable Object> implements ConfigEntryHandler<T> {
protected final ConfigEntry<T> configEntry;
protected final T defaultValue;

4
tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/api/mapping/handler/ConvertingTweedCoatEntryHandler.java
View File

@@ -2,8 +2,8 @@ package de.siphalor.tweed5.coat.bridge.api.mapping.handler;
import de.siphalor.coat.handler.ConfigEntryHandler;
import de.siphalor.coat.handler.Message;
import lombok.CustomLog;
import lombok.RequiredArgsConstructor;
import lombok.extern.apachecommons.CommonsLog;
import net.minecraft.network.chat.Component;
import org.jspecify.annotations.Nullable;
@@ -16,7 +16,7 @@ import static de.siphalor.tweed5.coat.bridge.api.TweedCoatMappingUtils.literalCo
import static de.siphalor.tweed5.coat.bridge.api.TweedCoatMappingUtils.translatableComponent;
@RequiredArgsConstructor
@CommonsLog
@CustomLog
public class ConvertingTweedCoatEntryHandler<T extends @Nullable Object, C> implements ConfigEntryHandler<C> {
private static final String CONVERSION_EXCEPTION_TEXT_KEY = "tweed5_coat_bridge.handler.conversion.exception";

19
tweed5-minecraft/coat-bridge/src/main/java/de/siphalor/tweed5/coat/bridge/impl/TweedCoatMappersImpl.java
View File

@@ -20,13 +20,14 @@ import de.siphalor.tweed5.coat.bridge.api.mapping.handler.BasicTweedCoatEntryHan
import de.siphalor.tweed5.coat.bridge.api.mapping.handler.ConvertingTweedCoatEntryHandler;
import de.siphalor.tweed5.core.api.entry.CompoundConfigEntry;
import de.siphalor.tweed5.core.api.entry.ConfigEntry;
import lombok.CustomLog;
import lombok.RequiredArgsConstructor;
import lombok.Value;
import lombok.extern.apachecommons.CommonsLog;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.language.I18n;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
//- import net.minecraft.resources.ResourceLocation;
import org.jspecify.annotations.NonNull;
import org.jspecify.annotations.Nullable;
@@ -37,7 +38,7 @@ import java.util.stream.Collectors;
import static de.siphalor.tweed5.coat.bridge.api.TweedCoatMappingUtils.translatableComponent;
import static de.siphalor.tweed5.coat.bridge.api.TweedCoatMappingUtils.translatableComponentWithFallback;
@CommonsLog
@CustomLog
@SuppressWarnings("unchecked")
public class TweedCoatMappersImpl {
public static TweedCoatMapper<Byte> BYTE_TEXT_MAPPER = convertingTextMapper(
@@ -255,12 +256,20 @@ public class TweedCoatMappersImpl {
CompoundConfigEntry<T> compoundEntry = (CompoundConfigEntry<T>) entry;
Optional<AttributesExtension> attributesExtension = entry.container().extension(AttributesExtension.class);
ResourceLocation backgroundTexture = attributesExtension
//# if MC_VERSION_NUMBER >= 260100
Identifier backgroundTexture = attributesExtension
//# else
//- ResourceLocation backgroundTexture = attributesExtension
//# end
.map(extension -> extension.getAttributeValue(
entry,
TweedCoatAttributes.BACKGROUND_TEXTURE
))
.map(ResourceLocation::tryParse)
//# if MC_VERSION_NUMBER >= 260100
.map(Identifier::tryParse)
//# else
//- .map(ResourceLocation::tryParse)
//# end
.orElse(null);
String translationKey = attributesExtension
.map(extension -> extension.getAttributeValue(

13
tweed5-minecraft/coat-bridge/src/testmod/java/de/siphalor/tweed5/coat/bridge/testmod/TweedCoatBridgeTestMod.java
View File

@@ -1,6 +1,6 @@
package de.siphalor.tweed5.coat.bridge.testmod;
import de.siphalor.amecs.api.PriorityKeyBinding;
import de.siphalor.amecs.priority_key_mappings.api.AmecsPriorityKeyMapping;
import de.siphalor.coat.screen.ConfigScreen;
import de.siphalor.tweed5.coat.bridge.api.ConfigScreenCreateParams;
import de.siphalor.tweed5.coat.bridge.api.TweedCoatBridgeExtension;
@@ -12,7 +12,8 @@ import de.siphalor.tweed5.fabric.helper.api.FabricConfigContainerHelper;
import de.siphalor.tweed5.weaver.pojo.api.TweedPojoWeaver;
import lombok.CustomLog;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
//- import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.TitleScreen;
@@ -54,7 +55,11 @@ public class TweedCoatBridgeTestMod implements ClientModInitializer {
config = configContainerHelper.loadAndUpdateInConfigDirectory(() -> DEFAULT_CONFIG_VALUE);
KeyBindingHelper.registerKeyBinding(new ScreenKeyBinding(
//# if MC_VERSION_NUMBER >= 260100
KeyMappingHelper.registerKeyMapping(new ScreenKeyBinding(
//# else
//- KeyBindingHelper.registerKeyBinding(new ScreenKeyBinding(
//# end
MOD_ID + ".config",
GLFW.GLFW_KEY_T,
//# if MC_VERSION_NUMBER >= 12109
@@ -67,7 +72,7 @@ public class TweedCoatBridgeTestMod implements ClientModInitializer {
log.info("Current config: " + config);
}
private class ScreenKeyBinding extends KeyMapping implements PriorityKeyBinding {
private class ScreenKeyBinding extends KeyMapping implements AmecsPriorityKeyMapping {
//# if MC_VERSION_NUMBER >= 12109
public ScreenKeyBinding(String name, int key, Category category) {
//# else