diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be2d1016a..d9d25b67d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ build: parallel: matrix: - MC_VER: [ - "1.26.1", + "26.1.0", "1.21.11", "1.21.10", "1.21.9", "1.21.8", "1.21.6", "1.21.5", "1.21.4", "1.21.3", "1.21.1", "1.20.6", "1.20.4", "1.20.2", "1.20.1", "1.19.4", "1.19.2", diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java index 4d2470a82..addab10a9 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java @@ -93,8 +93,8 @@ public class VersionConstants implements IVersionConstants return "1.21.10"; #elif MC_VER == MC_1_21_11 return "1.21.11"; - #elif MC_VER == MC_1_26_1 - return "21.6"; + #elif MC_VER == MC_26_1_0 + return "21.6.0"; #else ERROR MC version constant missing #endif diff --git a/common/src/main/resources/1_26_1.distanthorizons.accesswidener b/common/src/main/resources/26_1.distanthorizons.accesswidener similarity index 100% rename from common/src/main/resources/1_26_1.distanthorizons.accesswidener rename to common/src/main/resources/26_1.distanthorizons.accesswidener diff --git a/gradle.properties b/gradle.properties index 393d8b95d..462790c79 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,7 +46,7 @@ versionStr= # This defines what MC version Intellij will use for the preprocessor # and what version is used automatically by build and run commands -mcVer=1.26.1 +mcVer=26.1.0 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment #minecraftMemoryJavaArg="-Xmx4G" diff --git a/versionProperties/1.26.1.properties b/versionProperties/26.1.0.properties similarity index 96% rename from versionProperties/1.26.1.properties rename to versionProperties/26.1.0.properties index 9bec661cb..0c3bfdc6b 100644 --- a/versionProperties/1.26.1.properties +++ b/versionProperties/26.1.0.properties @@ -1,9 +1,9 @@ -# 1.26.1 version +# 26.1.0 version java_version=25 minecraft_version=26.1 parchment_version=1.21:2024.07.28 compatible_minecraft_versions=["26.1"] -accessWidenerVersion=1_26_1 +accessWidenerVersion=26_1 builds_for=fabric,neoforge # forge is broken due to gradle/build script issues