cleanup

- added missing translation keys

Author: moehreag

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

@@ -30,7 +30,6 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.resource.Resource;
-import net.minecraft.resource.ResourcePack;
 import net.minecraft.util.Identifier;
 
 import java.nio.file.Path;
@@ -45,11 +44,8 @@ public class AxolotlClient implements ClientModInitializer {
     public static ConfigManager configManager;
     public static HashMap<UUID, Boolean> playerCache = new HashMap<>();
 
-    public static List<ResourcePack> packs = new ArrayList<>();
     public static HashMap<Identifier, Resource> runtimeResources = new HashMap<>();
 
-    public static boolean initalized = false;
-
     public static final Identifier badgeIcon = new Identifier("axolotlclient", "textures/badge.png");
 
     public static final OptionCategory config = new OptionCategory("storedOptions");
@@ -62,7 +58,6 @@ public class AxolotlClient implements ClientModInitializer {
     public void onInitializeClient() {
         CONFIG = new AxolotlClientConfig();
         config.add(someNiceBackground);
-        config.add(CONFIG.rotateWorld);
 
         getModules();
         addExternalModules();

src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java

@@ -24,7 +24,6 @@ public class AxolotlClientConfig extends ConfigHolder {
     public final BooleanOption timeChangerEnabled = new BooleanOption("enabled", false);
     public final IntegerOption customTime = new IntegerOption("time", 0, 0, 24000);
     public final BooleanOption customSky = new BooleanOption("customSky", true);
-    public final BooleanOption showSunMoon = new BooleanOption("showSunMoon", true);
     public final IntegerOption cloudHeight = new IntegerOption("cloudHeight", 128, 100, 512);
     public final BooleanOption dynamicFOV = new BooleanOption("dynamicFov", true);
     public final BooleanOption fullBright = new BooleanOption("fullBright", false);
@@ -34,8 +33,6 @@ public class AxolotlClientConfig extends ConfigHolder {
     public final BooleanOption nightMode = new BooleanOption("nightMode", false);
     public final BooleanOption rawMouseInput = new BooleanOption("rawMouseInput", false);
 
-    public final BooleanOption rotateWorld = new BooleanOption("rotateWorld", false);
-
     public final BooleanOption enableCustomOutlines = new BooleanOption("enabled", false);
     public final ColorOption outlineColor = new ColorOption("color", Color.parse("#DD000000"));
     public final IntegerOption outlineWidth = new IntegerOption("outlineWidth", 1, 1, 10);
@@ -107,7 +104,6 @@ public void init(){
         general.addSubCategory(searchFilters);
 
         rendering.add(customSky,
-                showSunMoon,
                 cloudHeight,
                 AxolotlClientConfigConfig.chromaSpeed,
                 dynamicFOV,

src/main/java/io/github/axolotlclient/mixin/MinecraftClientMixin.java

@@ -5,7 +5,6 @@
 import io.github.axolotlclient.modules.hud.HudManager;
 import io.github.axolotlclient.modules.hud.gui.hud.CPSHud;
 import io.github.axolotlclient.modules.rpc.DiscordRPC;
-import io.github.axolotlclient.modules.sky.SkyResourceManager;
 import io.github.axolotlclient.modules.zoom.Zoom;
 import io.github.axolotlclient.util.Util;
 import net.minecraft.client.MinecraftClient;
@@ -19,7 +18,6 @@
 import net.minecraft.entity.player.ClientPlayerEntity;
 import net.minecraft.world.level.LevelInfo;
 import org.apache.logging.log4j.Logger;
-import org.lwjgl.LWJGLException;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.Display;
@@ -40,7 +38,9 @@ public abstract class MinecraftClientMixin {
 
     @Shadow public ClientPlayerEntity player;
 
-    @Shadow protected abstract void loadLogo(TextureManager textureManager) throws LWJGLException;
+    protected MinecraftClientMixin(TextureManager textureManager) {
+        this.textureManager = textureManager;
+    }
 
     @Shadow private TextureManager textureManager;
 
@@ -64,17 +64,6 @@ public void setWindowTitle(CallbackInfo ci){
         Display.setTitle("AxolotlClient "+ this.gameVersion);
     }
 
-    @Redirect(method = "initializeGame", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;loadLogo(Lnet/minecraft/client/texture/TextureManager;)V"))
-    public void noLogo(MinecraftClient instance, TextureManager textureManager){}
-
-    @Inject(method = "initializeGame", at = @At(value = "INVOKE", target = "Lnet/minecraft/advancement/Achievement;setStatFormatter(Lnet/minecraft/stat/StatFormatter;)Lnet/minecraft/advancement/Achievement;"))
-    public void loadSkiesOnStartup(CallbackInfo ci){
-        //SkyResourceManager.onStartup();
-        try {
-            this.loadLogo(this.textureManager);
-        } catch (Exception ignored){}
-    }
-
     @Redirect(method = "handleKeyInput", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/options/KeyBinding;getCode()I", ordinal = 5))
     // Fix taking a screenshot when pressing '<' (Because it has the same keyCode as F2)
     public int iTryToFixTheScreenshotKey(KeyBinding instance) {

src/main/java/io/github/axolotlclient/mixin/ReloadableResourceManagerImplMixin.java

@@ -4,7 +4,6 @@
 import io.github.axolotlclient.modules.hud.HudManager;
 import io.github.axolotlclient.modules.hud.gui.hud.PackDisplayHud;
 import io.github.axolotlclient.modules.hypixel.HypixelAbstractionLayer;
-import io.github.axolotlclient.modules.sky.SkyboxManager;
 import net.minecraft.resource.ReloadableResourceManagerImpl;
 import net.minecraft.resource.Resource;
 import net.minecraft.resource.ResourcePack;
@@ -20,27 +19,13 @@
 @Mixin(ReloadableResourceManagerImpl.class)
 public abstract class ReloadableResourceManagerImplMixin {
 
-    /*@Inject(method = "reload", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;info(Ljava/lang/String;)V", shift = At.Shift.AFTER), remap = false)
-    public void stopRenderingSkies(List<ResourcePack> resourcePacks, CallbackInfo ci){
-        SkyboxManager.getInstance().clearSkyboxes();
-    }*/
-
-    /*@Inject(method = "clear", at = @At("TAIL"))
-    public void startReload(CallbackInfo ci){
-        SkyboxManager.getInstance().clearSkyboxes();
-    }*/
-
     @Inject(method = "reload", at=@At("TAIL"))
     public void onReload(List<ResourcePack> resourcePacks, CallbackInfo ci){
         HypixelAbstractionLayer.clearPlayerData();
-        /*if(AxolotlClient.initalized)SkyResourceManager.reload(resourcePacks);
-        else{SkyResourceManager.packs=resourcePacks;}*/
-        AxolotlClient.packs=resourcePacks;
 
         PackDisplayHud hud = (PackDisplayHud) HudManager.getInstance().get(PackDisplayHud.ID);
         if(hud != null && hud.isEnabled()){
-            hud.widgets.clear();
-            hud.init();
+            hud.setPacks(resourcePacks);
         }
     }
 

src/main/java/io/github/axolotlclient/mixin/WorldRendererMixin.java

@@ -4,14 +4,11 @@
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.sky.SkyboxManager;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.*;
+import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Identifier;
 import net.minecraft.util.hit.BlockHitResult;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.dimension.Dimension;
-import org.lwjgl.opengl.GL11;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/java/io/github/axolotlclient/modules/ModuleLoader.java

@@ -1,6 +1,5 @@
 package io.github.axolotlclient.modules;
 
-import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.config.screen.CreditsScreen;
 import io.github.axolotlclient.util.Logger;
 import net.fabricmc.loader.api.FabricLoader;

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

@@ -22,13 +22,15 @@ public class PackDisplayHud extends AbstractHudEntry {
 
     public final List<packWidget> widgets = new ArrayList<>();
 
+    private final List<ResourcePack> packs = new ArrayList<>();
+
     public PackDisplayHud() {
         super(200, 50);
     }
 
     @Override
     public void init() {
-        AxolotlClient.packs.forEach(pack -> {
+        packs.forEach(pack -> {
             try {
                 if(!pack.getName().equalsIgnoreCase("Default") && pack.getIcon()!=null)
                     widgets.add(new packWidget(pack));
@@ -47,6 +49,12 @@ public void init() {
         height=(widgets.size()-1)*18+18;
     }
 
+    public void setPacks(List<ResourcePack> packs){
+        widgets.clear();
+        this.packs.addAll(packs);
+        init();
+    }
+
     @Override
     public void render() {
         scale();

src/main/java/io/github/axolotlclient/modules/sky/SkyResourceManager.java

@@ -3,7 +3,6 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
-import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.AbstractModule;
 import io.github.axolotlclient.util.Logger;
 import io.github.moehreag.searchInResources.SearchableResourceManager;
@@ -100,8 +99,6 @@ public void reload(ResourceManager resourceManager) {
             Logger.debug("Loaded sky: " + entry.getKey());
             loadMCPSky("mcpatcher", entry.getKey(), entry.getValue());
         }
-
-        AxolotlClient.initalized = true;
     }
 
     @Override

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

@@ -1,7 +1,5 @@
 package io.github.axolotlclient.util;
 
-import io.github.axolotlclient.AxolotlClient;
-
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;

src/main/resources/assets/axolotlclient/lang/en_US.lang

@@ -38,10 +38,10 @@ copy_image=Copy this Screenshot
 deleteAction=[Delete]
 delete_image=Delete this Screenshot
 screenshot_deleted=Screenshot <name> has been successfully deleted!
+debugLogOutput=Debug Log Output
 
 rendering=Rendering Options
 customSky=Custom Skies
-showSunMoon=Custom Sky Sun & Moon
 cloudHeight=Cloud Height
 zoomDivisor=FOV Divisor
 zoomSpeed=Animation Speed
@@ -249,6 +249,10 @@ showActivity=Show Activity
 showActivity.tooltip=Whether to show your current In-Game Activity.
 showTime=Show Time
 showTime.tooltip=Whether to show a timestamp.
+showServerNameMode=Description Mode
+showIp=Show Server IP
+showName=Show Server Name
+off=Disabled
 
 freelook=Freelook
 perspective=Perspective