From 61c755aabc2e63119f389c21881f03311f3afdf5 Mon Sep 17 00:00:00 2001 From: MeexReay Date: Sat, 14 Jun 2025 03:02:04 +0300 Subject: [PATCH] move to 1.21 and fix for nixos --- .gitignore | 42 ++++++++++++++++++ build.gradle | 12 ++--- gradle.properties | 13 +++--- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- shell.nix | 6 +++ .../repeating/mod/RepeatingScreen.java | 2 +- .../mod/render/shader/ShaderManager.java | 2 +- 8 files changed, 64 insertions(+), 15 deletions(-) create mode 100644 .gitignore create mode 100644 shell.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34d600a --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr + +remappedSrc/ diff --git a/build.gradle b/build.gradle index 84a69d1..383e374 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version "${loom_version}" id 'maven-publish' } @@ -19,8 +19,8 @@ repositories { } dependencies { - compileOnly 'org.projectlombok:lombok:1.18.24' - annotationProcessor 'org.projectlombok:lombok:1.18.24' + compileOnly 'org.projectlombok:lombok:1.18.38' + annotationProcessor 'org.projectlombok:lombok:1.18.38' //add joml modImplementation 'org.joml:joml:1.10.4' @@ -45,7 +45,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { @@ -54,8 +54,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { diff --git a/gradle.properties b/gradle.properties index be55ec6..8feaa20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,15 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.3 -loader_version=0.15.10 +minecraft_version=1.21 +yarn_mappings=1.21+build.9 +loader_version=0.16.14 +loom_version=1.10-SNAPSHOT -#Fabric api -fabric_version=0.97.0+1.20.4 +# Fabric API +fabric_version=0.102.0+1.21 # Mod Properties -mod_version = 1.1.2+1.20.1 +mod_version = 1.1.2+1.21 maven_group = themixray.repeating.mod archives_base_name = repeating-mod \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 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 BT1x-` delta 12460 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 T`Z7J93TASz(qo%C2V^+_d67$> diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..e18bc25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..27efeb0 --- /dev/null +++ b/shell.nix @@ -0,0 +1,6 @@ +{ pkgs ? import {} }: +pkgs.mkShell { + shellHook = '' + export LD_LIBRARY_PATH="''${LD_LIBRARY_PATH}''${LD_LIBRARY_PATH:+:}${pkgs.libglvnd}/lib" + ''; +} \ No newline at end of file diff --git a/src/main/java/themixray/repeating/mod/RepeatingScreen.java b/src/main/java/themixray/repeating/mod/RepeatingScreen.java index 015feaf..78f2121 100644 --- a/src/main/java/themixray/repeating/mod/RepeatingScreen.java +++ b/src/main/java/themixray/repeating/mod/RepeatingScreen.java @@ -51,7 +51,7 @@ public class RepeatingScreen extends Screen { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - renderBackground(context); + renderBackground(context, mouseX, mouseY, delta); for (RenderListener l : render_listeners) { if (l.beforeRender()) { diff --git a/src/main/java/themixray/repeating/mod/render/shader/ShaderManager.java b/src/main/java/themixray/repeating/mod/render/shader/ShaderManager.java index f11c98b..08d6a9b 100644 --- a/src/main/java/themixray/repeating/mod/render/shader/ShaderManager.java +++ b/src/main/java/themixray/repeating/mod/render/shader/ShaderManager.java @@ -41,7 +41,7 @@ public class ShaderManager { try { boolean file_present = true; ResourceFactory resourceFactory = MinecraftClient.getInstance().getResourceManager(); - Optional resource = resourceFactory.getResource(new Identifier("renderer", "shader/" + name + type.fileExtension)); + Optional resource = resourceFactory.getResource(Identifier.of("renderer", "shader/" + name + type.fileExtension)); int i = glCreateShader(type.glType); if (resource.isPresent()) { GlStateManager.glShaderSource(i, new GlImportProcessor() {