From ae3caacebf9d339d0eea1968db17c33953b16a54 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 10 Aug 2026 20:06:25 +0200 Subject: [PATCH] Weiter Fixes --- .../resources/Textures/hud/compass_rose.png | Bin 31815 -> 35191 bytes blight-editor/build.gradle | 1 + blight-editor/src/main/resources/logback.xml | 2 +- blight-game/build.gradle | 4 ++++ .../de/blight/game/state/HotbarState.java | 4 +--- blight-game/src/main/resources/logback.xml | 2 +- gradle.properties | 1 + 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/blight-assets/src/main/resources/Textures/hud/compass_rose.png b/blight-assets/src/main/resources/Textures/hud/compass_rose.png index 145e61506f082f980c04e3ded05e0ce78e391997..1f1ab12a528128e8529394bd29cbed410ccdccce 100644 GIT binary patch delta 7257 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 Uwe8R*HUIzs07*qoM6N<$f)m6jssI20 diff --git a/blight-editor/build.gradle b/blight-editor/build.gradle index 49e547c..17a9e1f 100644 --- a/blight-editor/build.gradle +++ b/blight-editor/build.gradle @@ -14,6 +14,7 @@ application { applicationDefaultJvmArgs = [ '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '--add-opens', 'java.desktop/sun.awt=ALL-UNNAMED', + '--enable-native-access=javafx.graphics,ALL-UNNAMED', "-Djava.library.path=${buildDir}/natives", '-Xmx3g', ] diff --git a/blight-editor/src/main/resources/logback.xml b/blight-editor/src/main/resources/logback.xml index bae16b6..4a62fe7 100644 --- a/blight-editor/src/main/resources/logback.xml +++ b/blight-editor/src/main/resources/logback.xml @@ -1,4 +1,4 @@ - + diff --git a/blight-game/build.gradle b/blight-game/build.gradle index 12dd815..2b96095 100644 --- a/blight-game/build.gradle +++ b/blight-game/build.gradle @@ -57,6 +57,7 @@ tasks.register('run', JavaExec) { jvmArgs = [ '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '--add-opens', 'java.desktop/sun.awt=ALL-UNNAMED', + '--enable-native-access=ALL-UNNAMED', "-Djava.library.path=${buildDir}/natives", ] dependsOn extractNatives @@ -64,6 +65,9 @@ tasks.register('run', JavaExec) { } jar { + // logback.xml nicht in die Bibliotheks-Jar einbetten – der Editor bringt seine eigene mit, + // was sonst zu "occurs multiple times on the classpath"-Warnungen führt. + exclude 'logback.xml' manifest { attributes 'Main-Class': mainClassName } diff --git a/blight-game/src/main/java/de/blight/game/state/HotbarState.java b/blight-game/src/main/java/de/blight/game/state/HotbarState.java index fe64d65..27d6dcf 100644 --- a/blight-game/src/main/java/de/blight/game/state/HotbarState.java +++ b/blight-game/src/main/java/de/blight/game/state/HotbarState.java @@ -255,10 +255,8 @@ public class HotbarState extends BaseAppState { m.setColor("Color", col.clone()); if (col.a < 1f) { m.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha); - g.setQueueBucket(RenderQueue.Bucket.Transparent); - } else { - g.setQueueBucket(RenderQueue.Bucket.Gui); } + g.setQueueBucket(RenderQueue.Bucket.Gui); g.setMaterial(m); g.setLocalTranslation(x, y, z); return g; diff --git a/blight-game/src/main/resources/logback.xml b/blight-game/src/main/resources/logback.xml index 174b74e..290b237 100644 --- a/blight-game/src/main/resources/logback.xml +++ b/blight-game/src/main/resources/logback.xml @@ -1,4 +1,4 @@ - + diff --git a/gradle.properties b/gradle.properties index 5e4a383..eadbf74 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ # Gradle-Daemon läuft auf Java 21 (Kompatibilität mit Groovy 3.x ASM). # Source-Kompilierung erfolgt über Toolchain mit Java 26 (→ build.gradle). org.gradle.java.home=/usr/lib/jvm/java-21-openjdk-amd64 +org.gradle.jvmargs=--enable-native-access=ALL-UNNAMED