more improvements

Author: moehreag

CHANGELOG.md

@@ -42,3 +42,8 @@
 - now using the provided DefaultConfigManager.
 - Full Changelog: https://github.com/AxolotlClient/AxolotlClient-mod/compare/v2.2.1+1.19.2...v2.2.2+1.19.2
 
+### 2.2.3
+
+- fix some nasty bugs
+- re-add an option that had been removed in 2.2.2
+- update german translation

build.gradle

@@ -38,7 +38,7 @@ dependencies {
 	modImplementation "org.quiltmc:quilt-loader:${project.loader_version}"
 	modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quilted_fabric_api_version}"
 
-	include(modImplementation "io.github.axolotlclient:AxolotlClient-config:1.0.11+1.19.2")
+	include(modImplementation "io.github.axolotlclient:AxolotlClient-config:1.0.12+1.19.2")
 
 	modImplementation "com.terraformersmc:modmenu:4.0.5"
 

gradle.properties

@@ -5,12 +5,12 @@ org.gradle.parallel = true
 # Dependencies
 minecraft_version = 1.19.2
 quilt_mappings = 21
-loader_version = 0.17.5-beta.4
+loader_version = 0.17.6
 
 # Quilted Fabric API
-quilted_fabric_api_version = 4.0.0-beta.14+0.62.0-1.19.2
+quilted_fabric_api_version = 4.0.0-beta.19+0.64.0-1.19.2
 
 # Mod Properties
-version = 2.2.2+1.19.2
+version = 2.2.3+1.19.2
 maven_group = io.github.axolotlclient
 archives_base_name = AxolotlClient

src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -1,6 +1,7 @@
 package io.github.axolotlclient;
 
 import com.mojang.blaze3d.systems.RenderSystem;
+import io.github.axolotlclient.AxolotlclientConfig.AxolotlClientConfigManager;
 import io.github.axolotlclient.AxolotlclientConfig.DefaultConfigManager;
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
@@ -61,7 +62,7 @@ public class AxolotlClient implements ClientModInitializer {
 	public static final BooleanOption someNiceBackground = new BooleanOption("defNoSecret", false);
 	public static final List<AbstractModule> modules= new ArrayList<>();
 
-	public static Integer tickTime = 0;
+	private static int tickTime = 0;
 
 	public static UnsupportedMod badmod;
 	public static boolean titleDisclaimer = false;
@@ -82,8 +83,10 @@ public void onInitializeClient(ModContainer container) {
             badmod = new UnsupportedMod("Baritone", UnsupportedMod.UnsupportedReason.BAN_REASON);
 		} else if (QuiltLoader.isModLoaded("xaerominimap")) {
             badmod = new UnsupportedMod("Xaero's Minimap", UnsupportedMod.UnsupportedReason.UNKNOWN_CONSEQUENSES);
-        } else if (QuiltLoader.isModLoaded("essential-container")){
-            badmod = new UnsupportedMod("Essential", UnsupportedMod.UnsupportedReason.MIGHT_CRASH, UnsupportedMod.UnsupportedReason.UNKNOWN_CONSEQUENSES);
+        } else if (QuiltLoader.isModLoaded("essential-container")) {
+			badmod = new UnsupportedMod("Essential", UnsupportedMod.UnsupportedReason.MIGHT_CRASH, UnsupportedMod.UnsupportedReason.UNKNOWN_CONSEQUENSES);
+		} else if (QuiltLoader.isModLoaded("optifabric")) {
+			badmod = new UnsupportedMod("OptiFine", UnsupportedMod.UnsupportedReason.MIGHT_CRASH, UnsupportedMod.UnsupportedReason.UNKNOWN_CONSEQUENSES);
 		} else {
 			showWarning = false;
 		}
@@ -93,13 +96,16 @@ public void onInitializeClient(ModContainer container) {
 
 		getModules();
 		addExternalModules();
+
 		CONFIG.init();
 		modules.forEach(AbstractModule::init);
 
 		CONFIG.getConfig().addAll(CONFIG.getCategories());
 		CONFIG.getConfig().add(config);
 
-		io.github.axolotlclient.AxolotlclientConfig.AxolotlClientConfigManager.registerConfig(modid, CONFIG, configManager = new DefaultConfigManager(modid, QuiltLoader.getConfigDir().resolve("AxolotlClient.json"), CONFIG.getConfig()));
+		AxolotlClientConfigManager.registerConfig(modid, CONFIG, configManager = new DefaultConfigManager(modid, QuiltLoader.getConfigDir().resolve("AxolotlClient.json"), CONFIG.getConfig()));
+		AxolotlClientConfigManager.addIgnoredName(modid, "x");
+		AxolotlClientConfigManager.addIgnoredName(modid, "y");
 
 		modules.forEach(AbstractModule::lateInit);
 

src/main/java/io/github/axolotlclient/config/screen/CreditsScreen.java

@@ -231,7 +231,7 @@ public void appendNarrations(NarrationMessageBuilder builder) {
 
         @Override
         protected void renderList(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-            Util.applyScissor(new Rectangle(0, top, this.width, bottom - top));
+            Util.applyScissor(0, top, this.width, bottom - top);
             super.renderList(matrices, mouseX, mouseY, delta);
             GL11.glDisable(GL11.GL_SCISSOR_TEST);
         }
@@ -345,8 +345,8 @@ public void init() {
         }
 
         public void render(MatrixStack matrices) {
-            DrawUtil.fillRect(matrices, new io.github.axolotlclient.modules.hud.util.Rectangle(x, y, width, height), io.github.axolotlclient.AxolotlclientConfig.Color.DARK_GRAY.withAlpha(127));
-            DrawUtil.outlineRect(matrices, new Rectangle(x, y, width, height), io.github.axolotlclient.AxolotlclientConfig.Color.BLACK);
+            DrawUtil.fillRect(matrices, x, y, width, height, io.github.axolotlclient.AxolotlclientConfig.Color.DARK_GRAY.withAlpha(127));
+            DrawUtil.outlineRect(matrices, x, y, width, height, io.github.axolotlclient.AxolotlclientConfig.Color.BLACK.getAsInt());
 
             DrawUtil.drawCenteredString(matrices, MinecraftClient.getInstance().textRenderer, credit.name, window.getScaledWidth() / 2, y + 7, -16784327, true);
 

src/main/java/io/github/axolotlclient/modules/hud/gui/AbstractHudEntry.java

@@ -180,7 +180,8 @@ public void setBounds(float scale) {
         if (trueHeight < client.getWindow().getScaledHeight() && scaledY + trueHeight > client.getWindow().getScaledHeight()) {
             scaledY = client.getWindow().getScaledHeight() - trueHeight;
         }
-        truePosition = new DrawPosition(scaledX, scaledY);
+        truePosition.x = scaledX;
+        truePosition.y = scaledY;
         renderPosition = truePosition.divide(getScale());
         renderBounds = new Rectangle(renderPosition.x(), renderPosition.y(), getWidth(), getHeight());
         trueBounds = new Rectangle(scaledX, scaledY, (int) (getWidth() * getScale()), (int) (getHeight() * getScale()));

src/main/java/io/github/axolotlclient/modules/hud/gui/hud/vanilla/CrosshairHud.java

@@ -68,7 +68,9 @@ public void render(MatrixStack matrices, float delta) {
 
         matrices.push();
         scale(matrices);
-        DrawPosition pos = getPos().subtract(0, -1);
+        
+        int x = getPos().x;
+        int y = getPos().y + 1;
         Color color = getColor();
         AttackIndicator indicator = this.client.options.getAttackIndicator().get();
 
@@ -87,12 +89,12 @@ public void render(MatrixStack matrices, float delta) {
         }
 
         if (type.get().equals(Crosshair.DOT.toString())) {
-            RenderUtil.fillBlend(matrices, pos.x() + (getWidth() / 2) - 2, pos.y() + (getHeight() / 2) - 2, 3, 3, color);
+            RenderUtil.fillBlend(matrices, x + (getWidth() / 2) - 2, y + (getHeight() / 2) - 2, 3, 3, color);
         } else if (type.get().equals(Crosshair.CROSS.toString())) {
-            RenderUtil.fillBlend(matrices,pos.x() + (getWidth() / 2) - 6, pos.y() + (getHeight() / 2) - 1, 6, 1, color);
-            RenderUtil.fillBlend(matrices, pos.x() + (getWidth() / 2), pos.y() + (getHeight() / 2) - 1, 5, 1, color);
-            RenderUtil.fillBlend(matrices, pos.x() + (getWidth() / 2) - 1, pos.y() + (getHeight() / 2) - 6, 1, 5, color);
-            RenderUtil.fillBlend(matrices, pos.x() + (getWidth() / 2) - 1, pos.y() + (getHeight() / 2), 1, 5, color);
+            RenderUtil.fillBlend(matrices, x + (getWidth() / 2) - 6, y + (getHeight() / 2) - 1, 6, 1, color);
+            RenderUtil.fillBlend(matrices, x + (getWidth() / 2), y + (getHeight() / 2) - 1, 5, 1, color);
+            RenderUtil.fillBlend(matrices, x + (getWidth() / 2) - 1, y + (getHeight() / 2) - 6, 1, 5, color);
+            RenderUtil.fillBlend(matrices, x + (getWidth() / 2) - 1, y + (getHeight() / 2), 1, 5, color);
         } else if (type.get().equals(Crosshair.DIRECTION.toString())) {
             Camera camera = this.client.gameRenderer.getCamera();
             MatrixStack matrixStack = RenderSystem.getModelViewStack();
@@ -131,8 +133,8 @@ public void render(MatrixStack matrices, float delta) {
                     targetingEntity &= this.client.targetedEntity.isAlive();
                 }
 
-                int x = (int) ((client.getWindow().getScaledWidth() / getScale()) / 2 - 8);
-                int y = (int) ((client.getWindow().getScaledHeight() / getScale()) / 2 - 7 + 16);
+                x = (int) ((client.getWindow().getScaledWidth() / getScale()) / 2 - 8);
+                y = (int) ((client.getWindow().getScaledHeight() / getScale()) / 2 - 7 + 16);
 
                 if (targetingEntity) {
                     client.inGameHud.drawTexture(matrices, x, y, 68, 94, 16, 16);

src/main/java/io/github/axolotlclient/util/Util.java

@@ -146,11 +146,11 @@ public static List<String> getSidebar() {
 		return lines;
 	}
 
-	public static void applyScissor(Rectangle scissor){
+	public static void applyScissor(int x, int y, int width, int height){
 		GL11.glEnable(GL11.GL_SCISSOR_TEST);
 		Window window = MinecraftClient.getInstance().getWindow();
 		double scale = window.getScaleFactor();
-		GL11.glScissor((int) (scissor.x * scale), (int) ((window.getScaledHeight() - scissor.height - scissor.y) * scale), (int) (scissor.width * scale), (int) (scissor.height * scale));
+		GL11.glScissor((int) (x * scale), (int) ((window.getScaledHeight() - height - y) * scale), (int) (width * scale), (int) (height * scale));
 	}
 
 	public static double lerp(double start, double end, double percent) {

src/main/resources/assets/axolotlclient/lang/de_DE.json renamed to src/main/resources/assets/axolotlclient/lang/de_de.json

@@ -3,9 +3,6 @@
 	"config": "AxolotlClient Optionen",
 	"title_short": "Client Optionen",
 
-	"sky_loading_text": "Lade Himmelstexturen aus Pack",
-	"resource_loading_finished": "Laden beendet! Starte Minecraft...",
-	
 	"general": "Allgemein",
 	"general.tooltip": "Allgemeine Optionen",
 	"showActivity": "Zeige Aktivität",
@@ -39,8 +36,7 @@
 	"blockOutlines": "Block Outlines",
 	"outlineWidth": "Breite",
 	"scrollableTooltips": "Scrollable Tooltips",
-	"shiftHorizontalScroll": "Horizontales Scrollen (wenn Taste gedrückt)",
-	"shiftHorizontalScroll.tooltip": "Ob horizontal gescrollt werden soll, <br>falls die Shift-Taste gedrückt ist.",
+	"shiftHorizontalScroll": "Horizontales Scrollen (Shift)",
 	"scrollAmount": "Scrollstufe",
 	"scrollAmount.tooltip": "Wie viel der Tooltip beim scrollen verschoben wird.",
 
@@ -124,7 +120,7 @@
 	"arrowhud": "Arrow HUD",
 	"itemupdatehud": "Item Update HUD",
 	"packdisplayhud": "Pack Display HUD",
-	"realtimehud": "Echtzeit HUD",
+	"irltimehud": "Echtzeit HUD",
 	"dynamic": "Dynamisch",
 	"text": "Text",
 	"bar": "Leiste",
@@ -154,7 +150,7 @@
 	"scrollbarColor": "Scrollleistenfarbe",
 	"lineSpacing": "Zeilenabstand",
 	"timeout": "Timeout",
-	"reachdisplayhud": "ReachDisplay HUD",
+	"reachhud": "Reach HUD",
 	"blocks": "Blöcke",
 
 	"toggleSprint": "Erlaube Sprint toggle",
@@ -167,18 +163,17 @@
 
 	"enabled": "Aktiviert",
 	"scale": "Größe",
-	"textColor": "Textfarbe",
+	"textcolor": "Textfarbe",
 	"color": "Farbe",
-	"textChroma": "Textchroma",
 	"chroma": "Chroma",
 	"chromaSpeed": "Chromageschwindigkeit",
 	"heldtextcolor": "Textfarbe (wenn gedrückt)",
-	"bgColor": "Hintergrundfarbe",
+	"bgcolor": "Hintergrundfarbe",
 	"placeholder": "Platzhalter",
 	"heldbackgroundcolor": "Hintergrundfarbe (wenn gedrückt)",
 	"background": "Hintergrund",
 	"outline": "Umrandung",
-	"outlineColor": "Umrandungsfarbe",
+	"outlinecolor": "Umrandungsfarbe",
 	"shadow": "Schatten",
 
 	"rpc": "Discord RPC",
@@ -214,13 +209,12 @@
 	"DOT": "Punkt",
 	"CROSS": "Kreuz",
 	"tnttime": "TntTime",
-	"textAlignment": "Textausrichtung",
 	"screenshotUtils": "Screenshot Utils",
 	"copyAction": "[Kopieren]",
 	"copy_image": "Dieses Bildschirmfoto kopieren",
 	"headless_exception": "Bild konnte nicht kopiert werden, da die JVM im 'Headless'-Modus läuft.\n Bitte ändere das.",
 	"deleteAction": "[Löschen]",
-	"delete_action": "Dieses Bildschirmfoto löschen.",
+	"delete_image": "Dieses Bildschirmfoto löschen.",
 	"screenshot_deleted": "Bildschirmfoto <name> wurde erfolgreich gelöscht!",
 	"lowShield": "Niedriges Schild",
 	"lowShield.tooltip": "Reduziert die Höhe des Schild-Overlays während des Blockens.",
@@ -236,7 +230,6 @@
 	"count.tooltip": "How much to increase the amount of particles spawned.<br>Only works on EmitterParticles <br>(all that spread out and consist of usually 16 single ones, <br>e.g. Crit Particles).",
 	"key.freelook": "Freelook",
 	"refreshTime": "Refresh Delay",
-	"customtextcolor": "Custom Text Color",
 	"format": "Format",
 	"hotbarhud": "Hotbar HUD",
 	"memoryhud": "Memory HUD",
@@ -247,13 +240,9 @@
 	"showAllocated": "Alloziiertes RAM anzeigen",
 	"playercounthud": "PlayerCount HUD",
 	"players": "Spieler",
-	"combocounterhud": "ComboCounter HUD",
 	"combocounter.no_hits": "Keine Schläge",
 	"combocounter.one_hit": "1 Schlag",
 	"combocounter.hits": "%s Schläge",
-	"center": "Zentriert",
-	"left": "Links",
-	"right": "Rechts",
 	"showServerNameMode": "Beschreibungsmodus",
 	"showIp": "Server IP zeigen",
 	"showName": "Server Name zeigen",
@@ -264,5 +253,66 @@
 	"THIRD_PERSON_BACK": "Dritte Person (Hinten)",
 	"THIRD_PERSON_FRONT": "Dritte Person (Vorne)",
 	"invert": "Umkehren",
-	"external_modules": "Externe Module"
+	"external_modules": "Externe Module",
+	"mousemovement": "Mausbewegungen anzeigen",
+	"heldoutlinecolor": "Umrandungsfarbe (Taste gedrückt)",
+	"compasshud": "Compass HUD",
+	"tpshud": "TPS HUD",
+	"combohud": "Combo HUD",
+	"playerhud": "Player HUD",
+	"toppadding": "Top Padding",
+	"iconsonly": "Nur Icons",
+	"horizontal": "Nur Horizontal",
+	"applyBlend": "Blend verwendedn",
+	"overrideF3": "Auf dem Debug-Hud anzeigen",
+	"enabled.tooltip": "Ob dieses Modul aktiviert ist.",
+	"scale.tooltip": "Die Skalierung dieses Moduls.",
+	"textcolor.tooltip": "Die Farbe für Text in diesem Element",
+	"color.tooltip": "Die Farbe für dieses Element",
+	"textChroma": "Text Chroma",
+	"justification": "Justification",
+	"CENTER": "Zentriert",
+	"LEFT": "Links",
+	"RIGHT": "Rechts",
+	"anchorpoint": "Ankerpunkt",
+	"TOP_LEFT": "Oben Links §b↖§d",
+	"TOP_MIDDLE": "Oben Zentriert §b↑§d",
+	"TOP_RIGHT": "Oben Rechts §b↗§d",
+	"MIDDLE_LEFT": "Mittig Links §b←§d",
+	"MIDDLE_MIDDLE": "Direct Zentriert §b•§d",
+	"MIDDLE_RIGHT": "Mittig Rechts §b→§d",
+	"BOTTOM_LEFT": "Unten Links §b↙§d",
+	"BOTTOM_MIDDLE": "Untere Mitte §b↓§d",
+	"BOTTOM_RIGHT": "Unten Rechts §b↘§d",
+	"TOP_LEFT.tooltip": "Oben Links corner",
+	"TOP_MIDDLE.tooltip": "Oben mittlerer Punkt",
+	"TOP_RIGHT.tooltip": "Obere Rechte Ecke",
+	"MIDDLE_LEFT.tooltip": "Mittlerer Punkt Links",
+	"MIDDLE_MIDDLE.tooltip": "Die Exakte Mitte",
+	"MIDDLE_RIGHT.tooltip": "Mittlerer Punkt Rechts",
+	"BOTTOM_LEFT.tooltip": "Untere Linke Ecke",
+	"BOTTOM_MIDDLE.tooltip": "Untere Mitte",
+	"BOTTOM_RIGHT.tooltip": "Untere Rechte Ecke",
+	"cardinalorder": "Kardinale Richtung",
+	"TOP_DOWN": "Oben → Bottom",
+	"DOWN_TOP": "Bottom → Oben",
+	"LEFT_RIGHT": "Links → Rechts",
+	"RIGHT_LEFT": "Rechts → Links",
+	"width": "Breite",
+	"minwidth": "Minimale Breite",
+	"minimal": "Minimal",
+	"timeshown": "Angezeigte Zeit",
+	"customtextcolor": "Eigene Textfarbe",
+	"dateformat": "Datumsformat",
+	"showdegrees": "Grad anzeigen",
+	"invert_direction": "Richtung umkehren",
+	"lookingbox": "Lookingbox Farbe",
+	"degreescolor": "Grad Farbe",
+	"cardinalcolor": "Kardinalanzeiger Farbe",
+	"semicardinalcolor": "Semi-Kardinalanzeiger Farbe",
+	"majorindicator": "Indikatorfarbe (Major)",
+	"minorindicator": "Indikatorfarbe (Minor)",
+	"dynamicrotation": "Dynamische Rotation",
+	"rotation": "Rotation"
+
 }

src/main/resources/assets/axolotlclient/lang/en_us.json

@@ -55,6 +55,7 @@
 	"scrollableTooltips": "Scrollable Tooltips",
 	"shiftHorizontalScroll": "Scroll Horizontally (Shift)",
 	"scrollAmount": "Scroll Amount",
+	"scrollAmount.tooltip": "On scrolling, move the tooltip around this amount.",
 	"inverse": "Inverse",
 	"tnttime": "TntTime",
 	"particles": "Particles",
@@ -308,13 +309,6 @@
 	"other_people": "Other People",
 	"external_modules": "External Modules",
 
-	"pickColor": "Pick Color",
-	"currentColor": "Current",
-	"alpha": "Alpha",
-	"red": "Red",
-	"green": "Green",
-	"blue": "Blue",
-
 	"disableReason.crash": "This option has been disabled <br>because it would crash your game.",
 	"disableReason.ban_reason": "This option is disabled <br>because it is known to be bannable on your current server.",