Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
70b8c789b3
|
|||
|
a3788929d9
|
|||
|
14a2d1c3c2
|
10
CHANGELOG.md
10
CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [0.7.2] - 2026-03-29
|
||||
### Changed
|
||||
- `minecraft`: Added support for Minecraft 26.1.
|
||||
This includes some required changes in the build process. So this release is published for all versions of Minecraft.
|
||||
|
||||
## [0.7.1] - 2026-02-08
|
||||
|
||||
### Changed
|
||||
- Relicensed to MPL-2.0.
|
||||
|
||||
## [0.7.0] - 2025-12-19
|
||||
|
||||
### Changed
|
||||
|
||||
@@ -49,7 +49,7 @@ abstract class MinecraftModComponentPlugin : Plugin<Project> {
|
||||
attribute(Category.CATEGORY_ATTRIBUTE, objectFactory.named(Category.LIBRARY))
|
||||
attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objectFactory.named(LibraryElements.JAR))
|
||||
attribute(Bundling.BUNDLING_ATTRIBUTE, objectFactory.named(Bundling.EXTERNAL))
|
||||
attribute(Usage.USAGE_ATTRIBUTE, objectFactory.named(Usage.JAVA_RUNTIME))
|
||||
attribute(Usage.USAGE_ATTRIBUTE, objectFactory.named(Usage.JAVA_API))
|
||||
|
||||
project.afterEvaluate {
|
||||
attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, targetJvmVersion.get().toInt())
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
org.gradle.jvmargs = -Xmx2G
|
||||
org.gradle.configuration-cache = true
|
||||
|
||||
tweed5.version = 0.7.1
|
||||
tweed5.version = 0.7.2
|
||||
|
||||
git.url = https://gitea.siphalor.de/siphalor/tweed5
|
||||
|
||||
@@ -10,7 +10,7 @@ java-test = "21"
|
||||
jetbrains-annotations = "26.0.1"
|
||||
jspecify = "1.0.0"
|
||||
junit = "5.12.0"
|
||||
lombok = "1.18.38"
|
||||
lombok = "1.18.44"
|
||||
logback = "1.5.18"
|
||||
mockito = "5.14.2"
|
||||
shadow = "9.3.0"
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
5
gradlew
vendored
5
gradlew
vendored
@@ -57,7 +57,7 @@
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
@@ -114,7 +114,6 @@ case "$( uname )" in #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
CLASSPATH="\\\"\\\""
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
@@ -172,7 +171,6 @@ fi
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
|
||||
3
gradlew.bat
vendored
3
gradlew.bat
vendored
@@ -70,11 +70,10 @@ goto fail
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
|
||||
@@ -7,8 +7,9 @@ plugins {
|
||||
dependencies {
|
||||
implementation("de.siphalor.tweed5:tweed5-conventions")
|
||||
implementation("de.siphalor.tweed5:tweed5-conventions-helpers")
|
||||
implementation(pluginMarker(mcCommonLibs.plugins.fabric.loom))
|
||||
implementation(pluginMarker(mcCommonLibs.plugins.smcmtk))
|
||||
implementation(pluginMarker(mcCommonLibs.plugins.jcyo))
|
||||
implementation(pluginMarker(mcLibs.plugins.fabric.loom))
|
||||
implementation(pluginMarker(libs.plugins.lombok))
|
||||
implementation(pluginMarker(libs.plugins.shadow))
|
||||
}
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
import de.siphalor.jcyo.gradle.JcyoTask
|
||||
import de.siphalor.tweed5.gradle.plugin.minecraft.mod.MinecraftModded
|
||||
import net.fabricmc.loom.api.LoomGradleExtensionAPI
|
||||
import net.fabricmc.loom.task.RemapJarTask
|
||||
import net.fabricmc.loom.util.Constants
|
||||
import java.nio.file.Files
|
||||
import java.nio.file.StandardCopyOption
|
||||
import java.util.Properties
|
||||
|
||||
plugins {
|
||||
java
|
||||
id("fabric-loom")
|
||||
id("de.siphalor.minecraft-modding-toolkit.project-plugin")
|
||||
id("de.siphalor.tweed5.publishing")
|
||||
id("de.siphalor.tweed5.expanded-sources-jar")
|
||||
id("de.siphalor.jcyo")
|
||||
@@ -16,14 +19,21 @@ plugins {
|
||||
id("de.siphalor.tweed5.minecraft.mod.base")
|
||||
}
|
||||
|
||||
val mcCatalog = versionCatalogs.named("mcLibs")
|
||||
val loomPluginId = mcCatalog.findPlugin("fabric.loom").get().get().pluginId
|
||||
if (!loomPluginId.endsWith("-remap")) {
|
||||
project.extensions.extraProperties.set(Constants.Properties.DISABLE_OBFUSCATION, "true")
|
||||
project.extensions.extraProperties.set(Constants.Properties.DONT_REMAP, "true")
|
||||
}
|
||||
|
||||
apply(plugin = loomPluginId)
|
||||
|
||||
val minecraftVersionDescriptor = project.property("minecraft.version.descriptor") as String
|
||||
val mcProps = Properties().apply {
|
||||
val propFile = project.layout.settingsDirectory.file("gradle/mc-$minecraftVersionDescriptor/gradle.properties").asFile
|
||||
propFile.inputStream().use { load(it) }
|
||||
}
|
||||
|
||||
val mcCatalog = versionCatalogs.named("mcLibs")
|
||||
|
||||
group = "de.siphalor.tweed5.minecraft"
|
||||
val archivesBaseName = "${project.name}-mc$minecraftVersionDescriptor"
|
||||
base {
|
||||
@@ -38,7 +48,12 @@ val testmod by sourceSets.creating {
|
||||
runtimeClasspath += sourceSets.main.get().runtimeClasspath
|
||||
}
|
||||
|
||||
loom {
|
||||
smcmtk {
|
||||
useMojangMappings()
|
||||
createModConfigurations(listOf(sourceSets.main.get(), testmod))
|
||||
}
|
||||
|
||||
extensions.configure<LoomGradleExtensionAPI>() {
|
||||
runs {
|
||||
create("testmodClient") {
|
||||
client()
|
||||
@@ -46,7 +61,6 @@ loom {
|
||||
source(testmod)
|
||||
}
|
||||
}
|
||||
createRemapConfigurations(testmod)
|
||||
}
|
||||
|
||||
// For some reason dependencyResolutionManagement from the settings.gradle doesn't seem to be passed through correctly,
|
||||
@@ -78,12 +92,8 @@ configurations {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
minecraft(mcCatalog.findLibrary("minecraft").get())
|
||||
mappings(loom.layered {
|
||||
officialMojangMappings()
|
||||
parchment("org.parchmentmc.data:parchment-$minecraftVersion:${getMcCatalogVersion("parchment")}@zip")
|
||||
})
|
||||
modImplementation(mcCommonLibs.fabric.loader)
|
||||
"minecraft"(mcCatalog.findLibrary("minecraft").get())
|
||||
"modImplementation"(mcCommonLibs.fabric.loader)
|
||||
"modTestmodImplementation"(mcCommonLibs.fabric.loader)
|
||||
|
||||
compileOnly(libs.jspecify.annotations)
|
||||
@@ -91,6 +101,11 @@ dependencies {
|
||||
"testmodImplementation"(sourceSets.main.map { it.output })
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.toVersion(mcCatalog.findVersion("java").get())
|
||||
targetCompatibility = JavaVersion.toVersion(mcCatalog.findVersion("java").get())
|
||||
}
|
||||
|
||||
val jcyoVars = mcProps.stringPropertyNames()
|
||||
.filter { it.startsWith("preprocessor.") }
|
||||
.map { it to mcProps[it] }
|
||||
@@ -116,31 +131,6 @@ lombok {
|
||||
version = libs.versions.lombok.get()
|
||||
}
|
||||
|
||||
val testmodLombokConfigSource = project.layout.settingsDirectory.file("lombok.testmod.config").asFile
|
||||
val testmodLombokConfigTarget = file("src/testmod/lombok.config")
|
||||
val copyTestmodLombokConfig by tasks.register("copyTestmodLombokConfig") {
|
||||
val source = testmodLombokConfigSource
|
||||
val target = testmodLombokConfigTarget
|
||||
inputs.file(source)
|
||||
outputs.file(target)
|
||||
|
||||
doFirst {
|
||||
target.parentFile.mkdirs()
|
||||
Files.copy(source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING)
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named("compileTestmodJava") {
|
||||
inputs.file(testmodLombokConfigSource)
|
||||
dependsOn(copyTestmodLombokConfig)
|
||||
}
|
||||
afterEvaluate {
|
||||
tasks.named("generateTestmodEffectiveLombokConfig") {
|
||||
inputs.file(testmodLombokConfigSource)
|
||||
dependsOn(copyTestmodLombokConfig)
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named<Copy>("processResources") {
|
||||
val processMinecraftModResources = tasks.named<Sync>("processMinecraftModResources")
|
||||
dependsOn(processMinecraftModResources)
|
||||
@@ -159,7 +149,8 @@ shadow {
|
||||
addShadowVariantIntoJavaComponent = false
|
||||
}
|
||||
|
||||
tasks.remapJar {
|
||||
tasks.findByName("remapJar")?.apply {
|
||||
this as RemapJarTask
|
||||
dependsOn(tasks.shadowJar)
|
||||
inputFile = tasks.shadowJar.get().archiveFile
|
||||
}
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -15,11 +15,12 @@ dependencies {
|
||||
compileOnly("de.siphalor.tweed5:tweed5-weaver-pojo-serde-extension")
|
||||
compileOnly("de.siphalor.tweed5:tweed5-weaver-pojo-validation-extension")
|
||||
compileOnly("de.siphalor.tweed5:tweed5-weaver-pojo-presets-extension")
|
||||
compileOnly(project(":tweed5-logging", configuration = "minecraftModApiElements"))
|
||||
|
||||
listOf("fabric-networking-api-v1", "fabric-lifecycle-events-v1").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("de.siphalor.tweed5:tweed5-comment-loader-extension")
|
||||
|
||||
@@ -7,13 +7,13 @@ import de.siphalor.tweed5.core.api.container.ConfigContainer;
|
||||
import de.siphalor.tweed5.dataapi.api.TweedDataReader;
|
||||
import de.siphalor.tweed5.data.gson.GsonReader;
|
||||
import lombok.Builder;
|
||||
import lombok.extern.apachecommons.CommonsLog;
|
||||
import lombok.CustomLog;
|
||||
import org.jspecify.annotations.Nullable;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
|
||||
@CommonsLog
|
||||
@CustomLog
|
||||
@Builder
|
||||
public class FabricConfigCommentLoader {
|
||||
private final ConfigContainer<?> configContainer;
|
||||
|
||||
@@ -10,8 +10,8 @@ import de.siphalor.tweed5.defaultextensions.patch.api.PatchExtension;
|
||||
import de.siphalor.tweed5.defaultextensions.patch.api.PatchInfo;
|
||||
import de.siphalor.tweed5.defaultextensions.presets.api.PresetsExtension;
|
||||
import de.siphalor.tweed5.patchwork.api.Patchwork;
|
||||
import lombok.CustomLog;
|
||||
import lombok.Getter;
|
||||
import lombok.extern.apachecommons.CommonsLog;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import org.jspecify.annotations.Nullable;
|
||||
|
||||
@@ -24,7 +24,7 @@ import java.nio.file.Path;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Supplier;
|
||||
|
||||
@CommonsLog
|
||||
@CustomLog
|
||||
public class FabricConfigContainerHelper<T extends @Nullable Object> {
|
||||
@Getter
|
||||
private final ConfigContainer<T> configContainer;
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
org.gradle.jvmargs = -Xmx2G
|
||||
|
||||
minecraft.version.descriptor = 1.21.10
|
||||
minecraft.version.descriptor = 26.1.0
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
fabric.api.key_mapping = fabric-key-binding-api-v1
|
||||
|
||||
preprocessor.mc_version_number = 11605
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
[versions]
|
||||
amecs-api = "1.6.2"
|
||||
amecs-priorityKeyMappings = "1.0.1"
|
||||
coat = "1.0.0-beta.24"
|
||||
fabric-api = "0.42.0+1.16"
|
||||
fabric-loom = "1.15-SNAPSHOT"
|
||||
java = "8"
|
||||
minecraft = "1.16.5"
|
||||
parchment = "2022.03.06"
|
||||
|
||||
[plugins]
|
||||
fabric-loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
|
||||
|
||||
[libraries]
|
||||
amecs-api = { group = "de.siphalor.amecs-api", name = "amecs-api-mc1.16.5", version.ref = "amecs-api" }
|
||||
amecs-priorityKeyMappings = { group = "de.siphalor.amecs.amecs-priority-key-mappings", name = "amecs-priority-key-mappings-mc1.16.5", version.ref = "amecs-priorityKeyMappings" }
|
||||
coat = { group = "de.siphalor.coat", name = "coat-mc1.16.5", 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" }
|
||||
@@ -1 +1,3 @@
|
||||
fabric.api.key_mapping = fabric-key-binding-api-v1
|
||||
|
||||
preprocessor.mc_version_number = 11701
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
[versions]
|
||||
amecs-api = "1.6.2"
|
||||
amecs-priorityKeyMappings = "1.0.1"
|
||||
coat = "1.0.0-beta.24"
|
||||
fabric-api = "0.46.1+1.17"
|
||||
fabric-loom = "1.15-SNAPSHOT"
|
||||
java = "16"
|
||||
minecraft = "1.17.1"
|
||||
parchment = "2021.12.12"
|
||||
|
||||
[plugins]
|
||||
fabric-loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
|
||||
|
||||
[libraries]
|
||||
amecs-api = { group = "de.siphalor.amecs-api", name = "amecs-api-mc1.17.1", version.ref = "amecs-api" }
|
||||
amecs-priorityKeyMappings = { group = "de.siphalor.amecs.amecs-priority-key-mappings", name = "amecs-priority-key-mappings-mc1.17.1", version.ref = "amecs-priorityKeyMappings" }
|
||||
coat = { group = "de.siphalor.coat", name = "coat-mc1.17.1", 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" }
|
||||
@@ -1 +1,3 @@
|
||||
fabric.api.key_mapping = fabric-key-binding-api-v1
|
||||
|
||||
preprocessor.mc_version_number = 11802
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
[versions]
|
||||
amecs-api = "1.6.2"
|
||||
amecs-priorityKeyMappings = "1.0.1"
|
||||
coat = "1.0.0-beta.24"
|
||||
fabric-api = "0.77.0+1.18.2"
|
||||
fabric-loom = "1.15-SNAPSHOT"
|
||||
java = "17"
|
||||
minecraft = "1.18.2"
|
||||
parchment = "2022.11.06"
|
||||
|
||||
[plugins]
|
||||
fabric-loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
|
||||
|
||||
[libraries]
|
||||
amecs-api = { group = "de.siphalor.amecs-api", name = "amecs-api-mc1.18.2", version.ref = "amecs-api" }
|
||||
amecs-priorityKeyMappings = { group = "de.siphalor.amecs.amecs-priority-key-mappings", name = "amecs-priority-key-mappings-mc1.18.2", version.ref = "amecs-priorityKeyMappings" }
|
||||
coat = { group = "de.siphalor.coat", name = "coat-mc1.18.2", 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" }
|
||||
@@ -1 +1,3 @@
|
||||
fabric.api.key_mapping = fabric-key-binding-api-v1
|
||||
|
||||
preprocessor.mc_version_number = 11904
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
[versions]
|
||||
amecs-api = "1.6.2"
|
||||
amecs-priorityKeyMappings = "1.0.1"
|
||||
coat = "1.0.0-beta.24"
|
||||
fabric-api = "0.87.2+1.19.4"
|
||||
fabric-loom = "1.15-SNAPSHOT"
|
||||
java = "17"
|
||||
minecraft = "1.19.4"
|
||||
parchment = "2023.06.26"
|
||||
|
||||
[plugins]
|
||||
fabric-loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
|
||||
|
||||
[libraries]
|
||||
amecs-api = { group = "de.siphalor.amecs-api", name = "amecs-api-mc1.19.4", version.ref = "amecs-api" }
|
||||
amecs-priorityKeyMappings = { group = "de.siphalor.amecs.amecs-priority-key-mappings", name = "amecs-priority-key-mappings-mc1.19.4", version.ref = "amecs-priorityKeyMappings" }
|
||||
coat = { group = "de.siphalor.coat", name = "coat-mc1.19.4", 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" }
|
||||
@@ -1 +1,3 @@
|
||||
fabric.api.key_mapping = fabric-key-binding-api-v1
|
||||
|
||||
preprocessor.mc_version_number = 12006
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
[versions]
|
||||
amecs-api = "1.6.2"
|
||||
amecs-priorityKeyMappings = "1.0.1"
|
||||
coat = "1.0.0-beta.24"
|
||||
fabric-api = "0.100.8+1.20.6"
|
||||
fabric-loom = "1.15-SNAPSHOT"
|
||||
java = "17"
|
||||
minecraft = "1.20.6"
|
||||
parchment = "2024.06.16"
|
||||
|
||||
[plugins]
|
||||
fabric-loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
|
||||
|
||||
[libraries]
|
||||
amecs-api = { group = "de.siphalor.amecs-api", name = "amecs-api-mc1.20.2", version.ref = "amecs-api" }
|
||||
amecs-priorityKeyMappings = { group = "de.siphalor.amecs.amecs-priority-key-mappings", name = "amecs-priority-key-mappings-mc1.20.2", version.ref = "amecs-priorityKeyMappings" }
|
||||
coat = { group = "de.siphalor.coat", name = "coat-mc1.20.5", 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" }
|
||||
@@ -1 +1,3 @@
|
||||
fabric.api.key_mapping = fabric-key-binding-api-v1
|
||||
|
||||
preprocessor.mc_version_number = 12110
|
||||
|
||||
@@ -1,12 +1,17 @@
|
||||
[versions]
|
||||
amecs-api = "1.6.2"
|
||||
amecs-priorityKeyMappings = "1.0.1"
|
||||
coat = "1.0.0-beta.24"
|
||||
fabric-api = "0.136.0+1.21.10"
|
||||
fabric-loom = "1.15-SNAPSHOT"
|
||||
java = "21"
|
||||
minecraft = "1.21.10"
|
||||
parchment = "2025.10.12"
|
||||
|
||||
[plugins]
|
||||
fabric-loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
|
||||
|
||||
[libraries]
|
||||
amecs-api = { group = "de.siphalor.amecs-api", name = "amecs-api-mc1.21.9", version.ref = "amecs-api" }
|
||||
amecs-priorityKeyMappings = { group = "de.siphalor.amecs.amecs-priority-key-mappings", name = "amecs-priority-key-mappings-mc1.21.9", version.ref = "amecs-priorityKeyMappings" }
|
||||
coat = { group = "de.siphalor.coat", name = "coat-mc1.21.10", 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" }
|
||||
3
tweed5-minecraft/gradle/mc-26.1.0/gradle.properties
Normal file
3
tweed5-minecraft/gradle/mc-26.1.0/gradle.properties
Normal file
@@ -0,0 +1,3 @@
|
||||
fabric.api.key_mapping = fabric-key-mapping-api-v1
|
||||
|
||||
preprocessor.mc_version_number = 260100
|
||||
16
tweed5-minecraft/gradle/mc-26.1.0/mc.versions.toml
Normal file
16
tweed5-minecraft/gradle/mc-26.1.0/mc.versions.toml
Normal file
@@ -0,0 +1,16 @@
|
||||
[versions]
|
||||
amecs-priorityKeyMappings = "1.0.1"
|
||||
coat = "1.1.1"
|
||||
fabric-api = "0.144.3+26.1"
|
||||
fabric-loom = "1.15-SNAPSHOT"
|
||||
java = "25"
|
||||
minecraft = "26.1"
|
||||
|
||||
[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.1.0", version.ref = "amecs-priorityKeyMappings" }
|
||||
coat = { group = "de.siphalor.coat", name = "coat-mc26.1.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" }
|
||||
@@ -1,11 +1,11 @@
|
||||
[versions]
|
||||
fabric-loader = "0.17.2"
|
||||
fabric-loom = "1.11-SNAPSHOT"
|
||||
fabric-loader = "0.18.5"
|
||||
jcyo = "0.5.1"
|
||||
smcmtk = "0.1.0"
|
||||
|
||||
[plugins]
|
||||
jcyo = { id = "de.siphalor.jcyo", version.ref = "jcyo" }
|
||||
fabric-loom = { id = "fabric-loom", version.ref = "fabric-loom" }
|
||||
smcmtk = { id = "de.siphalor.minecraft-modding-toolkit.project-plugin", version.ref = "smcmtk" }
|
||||
|
||||
[libraries]
|
||||
fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader" }
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
lombok.accessors.fluent = true
|
||||
lombok.addLombokGeneratedAnnotation = true
|
||||
|
||||
# Special configuration, so that the testmod can use the correct shadowed logging classes.
|
||||
lombok.log.apacheCommons.flagUsage=WARNING
|
||||
lombok.log.custom.declaration=de.siphalor.tweed5.shadowed.org.apache.commons.logging.Log de.siphalor.tweed5.shadowed.org.apache.commons.logging.LogFactory.getLog(TYPE)
|
||||
@@ -44,7 +44,7 @@ dependencyResolutionManagement {
|
||||
}
|
||||
create("mcLibs") {
|
||||
val mcVersionDescriptor = providers.gradleProperty("minecraft.version.descriptor").get()
|
||||
from(files("gradle/mc-$mcVersionDescriptor/mcLibs.versions.toml"))
|
||||
from(files("gradle/mc-$mcVersionDescriptor/mc.versions.toml"))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user