From 56531253380bcbcb7d98ea074ba31a314a39ac8f Mon Sep 17 00:00:00 2001 From: inyourwalls Date: Thu, 13 Jun 2024 12:59:08 -0400 Subject: un-bump version, fix config screen --- build.gradle.kts | 10 +++++----- flake.lock | 6 +++--- flake.nix | 4 ++-- gradle/wrapper/gradle-wrapper.jar | Bin 63721 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++++++---------- .../net/inyourwalls/frank/config/ConfigScreen.java | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9e0650a..f961e14 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,10 @@ plugins { java - id("fabric-loom") version "1.4-SNAPSHOT" + id("fabric-loom") version "1.6-SNAPSHOT" } -val minecraftVersion = "1.20.2" -version = "1.0.2+$minecraftVersion" +val minecraftVersion = "1.21" +version = "1.0.0+$minecraftVersion" group = "net.inyourwalls" repositories { @@ -14,11 +14,11 @@ repositories { dependencies { // Fabric/Minecraft dependencies. - val yarnBuild = "4" + val yarnBuild = "1" minecraft("com.mojang:minecraft:$minecraftVersion") mappings("net.fabricmc:yarn:$minecraftVersion+build.$yarnBuild:v2") modImplementation("net.fabricmc:fabric-loader:0.14.23") - modImplementation("net.fabricmc.fabric-api:fabric-api:0.90.4+$minecraftVersion") + modImplementation("net.fabricmc.fabric-api:fabric-api:0.100.1+$minecraftVersion") modImplementation("com.terraformersmc:modmenu:9.0.0") } diff --git a/flake.lock b/flake.lock index 69af9ec..34acd63 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cef73c2..5716063 100644 --- a/flake.nix +++ b/flake.nix @@ -9,9 +9,9 @@ devShells.x86_64-linux.default = let pkgs = nixpkgs.legacyPackages.x86_64-linux; in pkgs.mkShell { nativeBuildInputs = with pkgs.buildPackages; [ - openjdk17 - jdt-language-server gradle + jdk21 + jdt-language-server ]; }; }; diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..b82aa23 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.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java b/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java index 211dee5..c67b478 100644 --- a/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java +++ b/src/main/java/net/inyourwalls/frank/config/ConfigScreen.java @@ -18,7 +18,7 @@ import static net.minecraft.client.gui.widget.ButtonWidget.DEFAULT_WIDTH_SMALL; import static net.minecraft.client.gui.widget.ButtonWidget.DEFAULT_HEIGHT; public class ConfigScreen extends Screen { - private static final Identifier FURNACE_UI_TEXTURE = new Identifier("textures/gui/container/furnace.png"); + private static final Identifier FURNACE_UI_TEXTURE = Identifier.ofVanilla("textures/gui/container/furnace.png"); private static final int FURNACE_TEXTURE_WIDTH = 176; private static final int FURNACE_TEXTURE_HEIGHT = 166; private static final Text DISPLAY_MODE_LABEL = Text.translatable("ui.frank.config.display_mode"); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index eb98d3d..e608d30 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,9 +23,9 @@ }, "depends": { "fabricloader": ">=0.14.22", - "fabric-screen-api-v1": ">=0.90.4+1.20.2", - "minecraft": "^1.20.2", - "java": ">=17" + "fabric-screen-api-v1": ">=0.100.1+1.21", + "java": ">=17", + "minecraft": "~1.21" }, "suggests": {}, "custom": { -- cgit v1.3.1