From d41dfed0c86fa5c376ec520f59018305dd464633 Mon Sep 17 00:00:00 2001 From: fineless71 Date: Tue, 19 Mar 2024 17:21:07 -0400 Subject: [PATCH] Added Java 8 support --- build.gradle | 8 +++++-- gradlew | 0 .../java/net/mine_diver/macula/Shaders.java | 22 ++++++++++++------- .../macula/gui/ShaderOptionButton.java | 10 +++++---- .../mine_diver/macula/gui/ShadersScreen.java | 7 +++--- .../macula/mixin/TessellatorMixin.java | 2 +- 6 files changed, 31 insertions(+), 18 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index e0793de..6f48201 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,11 @@ plugins { id 'maven-publish' } -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17 +sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 + +tasks.withType(JavaCompile).configureEach { + it.options.release = 8 +} archivesBaseName = project.archives_base_name version = project.mod_version @@ -101,4 +105,4 @@ publishing { // The repositories here will be used for publishing your artifact, not for // retrieving dependencies. } -} \ No newline at end of file +} diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/net/mine_diver/macula/Shaders.java b/src/main/java/net/mine_diver/macula/Shaders.java index 9978982..4a8ca42 100644 --- a/src/main/java/net/mine_diver/macula/Shaders.java +++ b/src/main/java/net/mine_diver/macula/Shaders.java @@ -976,15 +976,18 @@ private static void setEnumShaderOption(ShaderOption eso, String str) { if (str == null) str = eso.getValueDefault(); switch (eso) { - case SHADOW_RES_MUL -> { + case SHADOW_RES_MUL: try { configShadowResMul = Float.parseFloat(str); } catch (NumberFormatException e) { configShadowResMul = 1; } - } - case SHADER_PACK -> currentShaderName = str; - default -> throw new IllegalArgumentException("Unknown option: " + eso); + break; + case SHADER_PACK: + currentShaderName = str; + break; + default: + throw new IllegalArgumentException("Unknown option: " + eso); } } @@ -999,10 +1002,13 @@ public static void storeConfig() { } public static String getEnumShaderOption(ShaderOption eso) { - return switch (eso) { - case SHADOW_RES_MUL -> Float.toString(configShadowResMul); - case SHADER_PACK -> currentShaderName; - }; + switch (eso) { + case SHADOW_RES_MUL: + return Float.toString(configShadowResMul); + case SHADER_PACK: + return currentShaderName; + } + return null; } public static void setShaderPack(String shaderPack) { diff --git a/src/main/java/net/mine_diver/macula/gui/ShaderOptionButton.java b/src/main/java/net/mine_diver/macula/gui/ShaderOptionButton.java index cbd6e39..b641db5 100644 --- a/src/main/java/net/mine_diver/macula/gui/ShaderOptionButton.java +++ b/src/main/java/net/mine_diver/macula/gui/ShaderOptionButton.java @@ -19,10 +19,12 @@ public ShaderOption getEnumShaderOption() { private static String getButtonText(final ShaderOption eso) { final String nameText = I18n.translate(eso.getResourceKey()) + ": "; - return switch (eso) { - case SHADOW_RES_MUL -> nameText + ShadersScreen.toStringQuality(Shaders.configShadowResMul); - default -> throw new IllegalStateException("Unexpected value: " + eso); - }; + switch (eso) { + case SHADOW_RES_MUL: + return nameText + ShadersScreen.toStringQuality(Shaders.configShadowResMul); + default: + throw new IllegalStateException("Unexpected value: " + eso); + } } public void updateButtonText() { diff --git a/src/main/java/net/mine_diver/macula/gui/ShadersScreen.java b/src/main/java/net/mine_diver/macula/gui/ShadersScreen.java index 2736042..69501d8 100644 --- a/src/main/java/net/mine_diver/macula/gui/ShadersScreen.java +++ b/src/main/java/net/mine_diver/macula/gui/ShadersScreen.java @@ -118,12 +118,13 @@ protected void mouseClicked(int i, int j, int action) { protected void buttonClicked(Button button) { super.buttonClicked(button); if (!button.active) return; - if (button instanceof ShaderOptionButton sob) { + if (button instanceof ShaderOptionButton) { + ShaderOptionButton sob = (ShaderOptionButton) button; switch (sob.getEnumShaderOption()) { - case SHADOW_RES_MUL -> { + case SHADOW_RES_MUL: Shaders.configShadowResMul = this.getNextValue(Shaders.configShadowResMul, QUALITY_MULTIPLIERS, QUALITY_MULTIPLIER_DEFAULT, !rightClick, Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)); Shaders.loadShaderPack(); - } + break; } sob.updateButtonText(); } diff --git a/src/main/java/net/mine_diver/macula/mixin/TessellatorMixin.java b/src/main/java/net/mine_diver/macula/mixin/TessellatorMixin.java index bfb195e..dc5d7bb 100644 --- a/src/main/java/net/mine_diver/macula/mixin/TessellatorMixin.java +++ b/src/main/java/net/mine_diver/macula/mixin/TessellatorMixin.java @@ -50,7 +50,7 @@ private void onDraw1(CallbackInfo ci) { if (!Shaders.shaderPackLoaded) return; if (Shaders.entityAttrib >= 0) { ARBVertexProgram.glEnableVertexAttribArrayARB(Shaders.entityAttrib); - ARBVertexProgram.glVertexAttribPointerARB(Shaders.entityAttrib, 2, false, false, 4, shadersShortBuffer.position(0)); + ARBVertexProgram.glVertexAttribPointerARB(Shaders.entityAttrib, 2, false, false, 4, (ShortBuffer) shadersShortBuffer.position(0)); } }