From 4b15e51d33edec6e7e905ad307c9a7f9760804ed Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Tue, 7 Oct 2025 23:07:28 +0200 Subject: [PATCH] Update to 1.21.6 --- gradle.properties | 12 ++++++------ .../advancedscripts/lexer/TokenTypeColors.java | 4 ++-- .../advancedscripts/screen/ScriptEditScreen.java | 9 ++------- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index b7c68d0..30ed31e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.5 -yarn_mappings=1.21.5+build.1 -loader_version=0.16.14 -loom_version=1.10-SNAPSHOT +minecraft_version=1.21.6 +yarn_mappings=1.21.6+build.1 +loader_version=0.17.2 +loom_version=1.11-SNAPSHOT # Fabric API -fabric_version=0.119.3+1.21.5 +fabric_version=0.128.2+1.21.6 # Mod Properties -mod_version = 2.2.2 +mod_version = 2.2.3 maven_group = de.steamwar archives_base_name = AdvancedScripts \ No newline at end of file diff --git a/src/main/java/de/steamwar/advancedscripts/lexer/TokenTypeColors.java b/src/main/java/de/steamwar/advancedscripts/lexer/TokenTypeColors.java index 6510fb0..d65c781 100644 --- a/src/main/java/de/steamwar/advancedscripts/lexer/TokenTypeColors.java +++ b/src/main/java/de/steamwar/advancedscripts/lexer/TokenTypeColors.java @@ -33,9 +33,9 @@ public class TokenTypeColors { public static final int VARIABLE = 0xFFFFFFFF; public static final int COMMENT = 0xFF656565; - public static final int CONSTANT = 0x3F6EC6; + public static final int CONSTANT = 0xFF3F6EC6; public static final int NUMBER = 0xFF61839F; public static final int BOOLEAN = 0xFF925F35; - public static final int STRING = 0x6a8759; + public static final int STRING = 0xFF6a8759; } diff --git a/src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java b/src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java index 8640d73..0a137e0 100644 --- a/src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java +++ b/src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java @@ -19,6 +19,7 @@ package de.steamwar.advancedscripts.screen; +import com.mojang.blaze3d.buffers.GpuBufferSlice; import com.mojang.blaze3d.systems.RenderSystem; import de.steamwar.advancedscripts.lexer.ScriptColorizer; import de.steamwar.advancedscripts.lexer.Token; @@ -156,15 +157,9 @@ public class ScriptEditScreen extends Screen { } } - @Override - protected void applyBlur() { - } - @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { setFocused(null); - this.renderBackground(context, mouseX, mouseY, delta); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); context.fill(23, 23, this.width - 23, this.height - 63, TokenTypeColors.BACKGROUND); int lineNumberLength = textRenderer.getWidth(lines.size() + ""); @@ -194,7 +189,7 @@ public class ScriptEditScreen extends Screen { if (lineTooLong(s)) { context.fill(25 + lineNumberLength + 2, 25 + lineNumber.getValue() * 9, 25 + lineNumberLength + 3, 25 + lineNumber.getValue() * 9 + height, TokenTypeColors.ERROR); } - context.drawText(textRenderer, String.valueOf(lineNumberText), (int) (25f + lineNumberLength - textRenderer.getWidth(String.valueOf(lineNumberText))), (int) (25f + lineNumber.getValue() * 9f), 0xFFFFFF, false); + context.drawText(textRenderer, String.valueOf(lineNumberText), (int) (25f + lineNumberLength - textRenderer.getWidth(String.valueOf(lineNumberText))), (int) (25f + lineNumber.getValue() * 9f), 0xFFFFFFFF, false); lineNumberText++; // Line text