3.1.5 (#172)

**Changelog**:

- fix a few bugs (#154, #155, #168)
- add Bedwars StatsOverlay (#145)
- Fix various hypixel issues (#167)
- add Inventory HUD (#152)
- big internal refactors (#143)
- add Config Profiles (#161)

Author: moehreag

.editorconfig

@@ -9,11 +9,5 @@ trim_trailing_whitespace = true
 indent_style = tab
 max_line_length = 120
 
-[*.json]
-indent_size = 2
-
-[quilt.mod.json]
-tab_width = 2
-
 [*.properties]
 indent_size = 2

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
         with:
-            cache-read-only: ${{ github.ref != 'refs/heads/multiversion' }}
+            cache-read-only: ${{ github.ref != 'refs/heads/multiversion' || github.ref != 'refs/heads/dev' }}
 
       - name: Build
         run: ./gradlew build collectBuilds

1.16_combat-6/build.gradle.kts

@@ -47,10 +47,11 @@ dependencies {
 
 	implementation(include(project(path = ":common", configuration = "shadow"))!!)
 
-	include("org.apache.logging.log4j:log4j-slf4j-impl:2.0-beta9") {
+	include("org.apache.logging.log4j:log4j-slf4j-impl:2.19.0") {
 		exclude(group = "org.apache.logging.log4j", module = "log4j-api")
 		exclude(group = "org.apache.logging.log4j", module = "log4j-core")
 	}
+	include("org.apache.logging.log4j:log4j-core:2.19.0")
 	implementation(include("org.slf4j:slf4j-api:1.7.36")!!)
 	localRuntime("org.slf4j:slf4j-jdk14:1.7.36")
 

1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -22,21 +22,12 @@
 
 package io.github.axolotlclient;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
 
-import com.google.gson.JsonObject;
-import io.github.axolotlclient.AxolotlClientConfig.api.manager.ConfigManager;
-import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
-import io.github.axolotlclient.AxolotlClientConfig.impl.managers.VersionedJsonConfigManager;
-import io.github.axolotlclient.AxolotlClientConfig.impl.options.BooleanOption;
 import io.github.axolotlclient.api.API;
 import io.github.axolotlclient.api.APIOptions;
 import io.github.axolotlclient.api.StatusUpdateProviderImpl;
-import io.github.axolotlclient.config.AxolotlClientConfig;
-import io.github.axolotlclient.modules.Module;
+import io.github.axolotlclient.bridge.impl.Bridge;
 import io.github.axolotlclient.modules.ModuleLoader;
 import io.github.axolotlclient.modules.auth.Auth;
 import io.github.axolotlclient.modules.blur.MenuBlur;
@@ -58,131 +49,64 @@
 import io.github.axolotlclient.util.LoggerImpl;
 import io.github.axolotlclient.util.notifications.Notifications;
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.client.resource.language.I18n;
 import net.minecraft.resource.Resource;
 import net.minecraft.util.Identifier;
 
-public class AxolotlClient implements ClientModInitializer {
+public class AxolotlClient extends AxolotlClientCommon implements ClientModInitializer {
 
-	public static final String MODID = "axolotlclient";
 	public static final HashMap<Identifier, Resource> runtimeResources = new HashMap<>();
-	public static final Identifier badgeIcon = new Identifier(MODID, "textures/badge.png");
-	public static final OptionCategory config = OptionCategory.create("storedOptions");
-	public static final BooleanOption someNiceBackground = new BooleanOption("defNoSecret", false);
-	public static final List<Module> modules = new ArrayList<>();
+	public static final Identifier badgeIcon = new Identifier("axolotlclient", "textures/badge.png");
 	public static final Logger LOGGER = new LoggerImpl();
-	public static String VERSION;
-	public static AxolotlClientConfig CONFIG;
-	public static ConfigManager configManager;
 
-	public static void getModules() {
-		modules.add(SkyResourceManager.getInstance());
-		modules.add(Zoom.getInstance());
-		modules.add(HudManager.getInstance());
-		modules.add(HypixelMods.getInstance());
-		modules.add(MotionBlur.getInstance());
-		modules.add(MenuBlur.getInstance());
-		modules.add(ScrollableTooltips.getInstance());
-		modules.add(DiscordRPC.getInstance());
-		modules.add(Freelook.getInstance());
-		modules.add(TntTime.getInstance());
-		modules.add(Particles.getInstance());
-		modules.add(ScreenshotUtils.getInstance());
-		modules.add(BeaconBeam.getInstance());
-		modules.add(Tablist.getInstance());
-		modules.add(Auth.getInstance());
-		modules.add(APIOptions.getInstance());
+	private void addBuiltinModules() {
+		registerModule(SkyResourceManager.getInstance());
+		registerModule(Zoom.getInstance());
+		registerModule(HudManager.getInstance());
+		registerModule(HypixelMods.getInstance());
+		registerModule(MotionBlur.getInstance());
+		registerModule(MenuBlur.getInstance());
+		registerModule(ScrollableTooltips.getInstance());
+		registerModule(DiscordRPC.getInstance());
+		registerModule(Freelook.getInstance());
+		registerModule(TntTime.getInstance());
+		registerModule(Particles.getInstance());
+		registerModule(ScreenshotUtils.getInstance());
+		registerModule(BeaconBeam.getInstance());
+		registerModule(Tablist.getInstance());
+		registerModule(Auth.getInstance());
+		registerModule(APIOptions.getInstance());
 	}
 
-	private static void addExternalModules() {
-		modules.addAll(ModuleLoader.loadExternalModules());
+	private void addExternalModules() {
+		ModuleLoader.loadExternalModules().forEach(this::registerModule);
 	}
 
 	@Override
 	public void onInitializeClient() {
+		Bridge.init();
 
-		VERSION = FabricLoader.getInstance().getModContainer(MODID).orElseThrow(IllegalStateException::new)
-			.getMetadata().getVersion().getFriendlyString();
-
-		CONFIG = new AxolotlClientConfig();
-		config.add(someNiceBackground);
-
-		getModules();
+		addBuiltinModules();
 		addExternalModules();
-		CONFIG.init();
-
-		new AxolotlClientCommon(LOGGER, Notifications.getInstance(), () -> configManager);
-		new API(LOGGER, I18n::translate, new StatusUpdateProviderImpl(), APIOptions.getInstance());
-		ClientLifecycleEvents.CLIENT_STOPPING.register(c -> API.getInstance().shutdown());
-
-		modules.forEach(Module::init);
-
-		CONFIG.config.add(config);
-
-		io.github.axolotlclient.AxolotlClientConfig.api.AxolotlClientConfig.getInstance()
-			.register(configManager = new VersionedJsonConfigManager(AxolotlClientCommon.getInstance().getMainConfigFile(),
-				CONFIG.config, 4, (oldVersion, newVersion, config, json) -> {
-				if (oldVersion.getMajor() <= 1) {
-					if (json.has("hud")) {
-						var hud = json.get("hud").getAsJsonObject();
-						if (hud.has("keystrokehud")) {
-							var keystrokes = hud.get("keystrokehud")
-								.getAsJsonObject();
-							var mousemovement = new JsonObject();
-							mousemovement.addProperty("enabled", keystrokes.get("enabled").getAsBoolean() && keystrokes.get("mousemovement").getAsBoolean());
-							mousemovement.addProperty("mouseMovementIndicator", keystrokes.get("mouseMovementIndicator").getAsString());
-							mousemovement.addProperty("mouseMovementIndicatorOuter", keystrokes.get("mouseMovementIndicatorOuter").getAsString());
-							hud.add("mousemovementhud", mousemovement);
-						}
-					}
-				}
-				if (oldVersion.getMajor() <= 2) {
-					if (json.has("hud")) {
-						var hud = json.get("hud").getAsJsonObject();
-						if (hud.has("armorhud")) {
-							var armorhud = hud.get("armorhud").getAsJsonObject();
-							if (armorhud.has("armorhud.main_hand_item_top")) {
-								var mainItemTop = armorhud.get("armorhud.main_hand_item_top").getAsBoolean();
-								if (mainItemTop) {
-									armorhud.addProperty("armorhud.main_hand_item_position", "armorhud.main_hand_item_position.top");
-								}
-							}
-						}
-					}
-				}
-				if (oldVersion.getMajor() <= 3) {
-					if (json.has("storedOptions")) {
-						var hiddenOptions = json.get("storedOptions").getAsJsonObject();
-
-						JsonObject apiOptions;
-						if (json.has("api.category")) {
-							apiOptions = json.get("api.category").getAsJsonObject();
-						} else {
-							apiOptions = new JsonObject();
-							json.add("api.category", apiOptions);
-						}
-
-						apiOptions.addProperty("api.privacy_policy_accepted", "privacy_policy_state."+hiddenOptions.get("privacyPolicyAccepted").getAsString().toLowerCase(Locale.ROOT));
-					}
-				}
-				return json;
-			}));
-		configManager.load();
-		configManager.suppressName("x");
-		configManager.suppressName("y");
-		configManager.suppressName(config.getName());
 
-		modules.forEach(Module::lateInit);
+		init(LOGGER, Notifications.getInstance());
+		new API(new StatusUpdateProviderImpl(), APIOptions.getInstance());
 
-		ClientTickEvents.END_CLIENT_TICK.register(client -> modules.forEach(Module::tick));
+		LOGGER.debug("Debug Output enabled, Logs will be quite verbose!");
+		LOGGER.info("AxolotlClient Initialized");
+		Bridge.postInit();
+	}
 
+	@Override
+	protected void initFeatureDisabler() {
 		FeatureDisabler.init();
+	}
 
-		LOGGER.debug("Debug Output activated, Logs will be more verbose!");
+	@Override
+	protected AxolotlClientConfigCommon createConfig() {
+		return new io.github.axolotlclient.config.AxolotlClientConfig();
+	}
 
-		LOGGER.info("AxolotlClient Initialized");
+	public static io.github.axolotlclient.config.AxolotlClientConfig config() {
+		return (io.github.axolotlclient.config.AxolotlClientConfig) getInstance().getConfig();
 	}
 }

1.16_combat-6/src/main/java/io/github/axolotlclient/api/APIOptions.java

@@ -119,7 +119,7 @@ public void init() {
 			}
 		};
 		if (Constants.ENABLED) {
-			AxolotlClient.CONFIG.addCategory(category);
+			AxolotlClient.config().addCategory(category);
 		}
 	}
 }

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/impl/AxoSpriteImpl.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2025 moehreag <[email protected]> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.bridge.impl;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import io.github.axolotlclient.AxolotlClientConfig.impl.options.GraphicsOption;
+import io.github.axolotlclient.bridge.render.AxoSprite;
+import io.github.axolotlclient.util.Util;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.texture.Sprite;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.Identifier;
+
+public interface AxoSpriteImpl extends AxoSprite {
+	void draw(MinecraftClient client, MatrixStack stack, int sX, int sY, int sW, int sH);
+
+	record Simple(Identifier id, int x, int y, int width, int height) implements AxoSpriteImpl {
+		@Override
+		public void draw(MinecraftClient client, MatrixStack stack, int sX, int sY, int sW, int sH) {
+			client.getTextureManager().bindTexture(id);
+			DrawableHelper.drawTexture(stack, sX, sY, x, y, sW, sH, width, height);
+		}
+	}
+
+	record Vanilla(Sprite sprite) implements AxoSpriteImpl {
+		@Override
+		public void draw(MinecraftClient client, MatrixStack stack, int sX, int sY, int sW, int sH) {
+			MinecraftClient.getInstance().getTextureManager().bindTexture(sprite.getAtlas().getId());
+			RenderSystem.color4f(1, 1, 1, 1);
+			DrawableHelper.drawSprite(stack, sX, sY, 0, sW, sH, sprite);
+		}
+	}
+
+	record Config(GraphicsOption option) implements AxoSpriteImpl {
+		@Override
+		public void draw(MinecraftClient client, MatrixStack stack, int sX, int sY, int sW, int sH) {
+			Util.bindTexture(option);
+			DrawableHelper.drawTexture(stack, sX, sY, 0, 0, sW, sH, option.get().getWidth(), option.get().getHeight());
+		}
+	}
+}

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2025 moehreag <[email protected]> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.bridge.impl;
+
+import com.mojang.brigadier.CommandDispatcher;
+import io.github.axolotlclient.bridge.events.Events;
+import net.fabricmc.fabric.api.client.command.v1.ClientCommandManager;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Identifier;
+
+public class Bridge {
+	public static void init() {
+		ClientLifecycleEvents.CLIENT_STARTED.register(minecraft -> Events.CLIENT_START.invoker().run());
+		ClientLifecycleEvents.CLIENT_STOPPING.register(minecraft -> Events.CLIENT_STOP.invoker().run());
+		ClientTickEvents.END_CLIENT_TICK.register(minecraft -> Events.TICK.invoker().run());
+		ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
+
+			@Override
+			public void apply(ResourceManager manager) {
+				Events.END_RESOURCE_RELOAD.invoker().run();
+			}
+
+			@Override
+			public Identifier getFabricId() {
+				return new Identifier("axolotlclient", "bridge/resource_listener");
+			}
+		});
+		ClientPlayConnectionEvents.INIT.register((clientPlayNetworkHandler, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
+		ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());
+	}
+
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	public static void postInit() {
+		Events.COMMAND_REGISTER.invoker().accept(
+			() -> (CommandDispatcher) ClientCommandManager.DISPATCHER
+		);
+	}
+}