finish some things up

1.19 release coming soon

Author: moehreag

LICENSE

@@ -1,14 +1,167 @@
-Copyright (C) 2020 LoganDark
+Copyright (C) 2020 moehreag + Contributors
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-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 General Public License for more details.
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.md

@@ -1,6 +1,22 @@
-# fabric-branding (Fork for AxolotlClient)
+# Axolotlclient-Mod
 
-Removes different /Fabric and Minecraft modding signs in AxolotlClient
+The mod for Axolotlclient.
+
+## Features
+Features currently include:
+- Various HUD modules
+- Badges for players using the mod
+- Custom Skies (any known format)
+- Configurable Zoom
+- Hypixel Mods
+  - AutoGG
+  - AutoTip
+  - LevelHead
+  - AutoBoop
+- A complete config API for addon modules
+- Discord RPC with in-game activity support
+
+- in total > 200 options
 
 ### Licensing
 This mod (and all of its branches) is licensed under the LGPL 3 (or later). This means you need to give credit to the authors of the code you use in your own project.

run/options.txt

@@ -22,7 +22,7 @@ toggleSprint:false
 darkMojangStudiosBackground:false
 hideLightningFlashes:false
 mouseSensitivity:0.5
-fov:0.4
+fov:1.0
 screenEffectScale:1.0
 fovEffectScale:1.0
 darknessEffectScale:1.0
@@ -38,8 +38,8 @@ ao:2
 prioritizeChunkUpdates:0
 biomeBlendRadius:2
 renderClouds:"false"
-resourcePacks:["vanilla","file/! §bNebula - [sky only]","file/testpack","file/astralex-sky-overlay-for-1-8--sgdsdrgdyhd38745634867djhfkgkdyh.zip"]
-incompatibleResourcePacks:["file/! §bNebula - [sky only]","file/testpack","file/astralex-sky-overlay-for-1-8--sgdsdrgdyhd38745634867djhfkgkdyh.zip"]
+resourcePacks:["vanilla","file/! §bNebula - [sky only]","file/testpack"]
+incompatibleResourcePacks:["file/! §bNebula - [sky only]","file/testpack"]
 lastServer:
 lang:en_us
 soundDevice:""

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

@@ -19,7 +19,7 @@ public class AxolotlClientConfig {
     public final BooleanOption customSky = new BooleanOption("customSky", true);
     public final BooleanOption showSunMoon = new BooleanOption("showSunMoon", true);
 	public final BooleanOption customCloudHeight = new BooleanOption("customCloudHeight", false);
-    public final FloatOption cloudHeight = new FloatOption("cloudHeight", 192F, 100F, 512F);
+    public final FloatOption cloudHeight = new FloatOption("cloudHeight", 100F, 512F, 192F);
     public final BooleanOption dynamicFOV = new BooleanOption("dynamicFov", true);
     public final BooleanOption fullBright = new BooleanOption("fullBright", false);
     public final IntegerOption chromaSpeed = new IntegerOption("chromaSpeed", 20, 10, 50);
@@ -36,12 +36,10 @@ public class AxolotlClientConfig {
     public final ColorOption loadingScreenColor = new ColorOption("loadingBgColor", new Color(-1));
     public final BooleanOption nightMode = new BooleanOption("nightMode", 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("#04000000"));
     public final BooleanOption outlineChroma = new BooleanOption("chroma", false);
-    public final IntegerOption outlineWidth = new IntegerOption("outlineWidth", 1, 1, 10);
+    public final DoubleOption outlineWidth = new DoubleOption("outlineWidth", 1, 1, 10);
 
     public final BooleanOption creditsBGM = new BooleanOption("creditsBGM", true);
 
@@ -115,7 +113,7 @@ public void init(){
         outlines.add(enableCustomOutlines);
         outlines.add(outlineColor);
         outlines.add(outlineChroma);
-        outlines.add(outlineWidth);
+        //outlines.add(outlineWidth); // I could not get this to have an effect.
 
         AxolotlClient.config.add(creditsBGM);
 

src/main/java/io/github/axolotlclient/config/screen/widgets/ColorSelectionWidget.java

@@ -27,8 +27,8 @@ public ColorSelectionWidget(ColorOption option) {
         super(0, 0, 100, 50, Text.empty(), buttonWidget -> {});
         this.option=option;
         Window window= MinecraftClient.getInstance().getWindow();
-        width=window.getWidth()-200;
-        height=window.getHeight()-100;
+        width=window.getScaledWidth()-200;
+        height=window.getScaledHeight()-100;
 
         pickerImage = new Rectangle(120, 70, width/2, height/3);
 

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

@@ -1,5 +1,6 @@
 package io.github.axolotlclient.mixin;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.motionblur.MotionBlur;
 import io.github.axolotlclient.modules.zoom.Zoom;
@@ -111,15 +112,15 @@ public void setZoom(Camera camera, float tickDelta, boolean changingFov, Callbac
 	    cir.setReturnValue(returnValue);
     }
 
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;viewport(IIII)V",
-            shift = Shift.BEFORE))
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/framebuffer/Framebuffer;beginWrite(Z)V",
+            shift = Shift.BEFORE), remap = false)
     public void worldMotionBlur(float tickDelta, long startTime, boolean tick, CallbackInfo ci) {
         motionBlur(tickDelta, startTime, tick, null);
     }
 
     @Inject(method = "render", at = @At("TAIL"))
     public void motionBlur(float tickDelta, long startTime, boolean tick, CallbackInfo ci){
-        if(ci !=null && !AxolotlClient.CONFIG.motionBlurInGuis.get()) {
+        if(ci != null && !AxolotlClient.CONFIG.motionBlurInGuis.get()) {
             return;
         }
 

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

@@ -25,18 +25,25 @@
 @Mixin(ReloadableResourceManager.class)
 public class MixinReloadableResourceManager {
 
-    @Inject(method = "reload", at=@At("HEAD"))
+	@Inject(method = "reload", at = @At("HEAD"))
+	public void reloadStart(Executor prepareExecutor, Executor applyExecutor, CompletableFuture<Unit> initialStage, List<ResourcePack> packs, CallbackInfoReturnable<ResourceReload> cir){
+		SkyboxManager.getInstance().clearSkyboxes();
+	}
+
+    @Inject(method = "reload", at=@At("TAIL"))
     public void loadSkies(Executor prepareExecutor, Executor applyExecutor, CompletableFuture<Unit> initialStage, List<ResourcePack> resourcePacks, CallbackInfoReturnable<ResourceReload> cir){
         HypixelAbstractionLayer.clearPlayerData();
-	    SkyboxManager.getInstance().clearSkyboxes();
 	    SkyResourceManager.reload(resourcePacks);
 
+	    AxolotlClient.packs=resourcePacks;
+
         PackDisplayHud hud = (PackDisplayHud) HudManager.getINSTANCE().get(PackDisplayHud.ID);
         if(hud.isEnabled()){
             hud.widgets.clear();
+			hud.init();
         }
 
-        AxolotlClient.packs=resourcePacks;
+
     }
 
     @Inject(method = "method_14486", at = @At("HEAD"), cancellable = true)

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

@@ -0,0 +1,29 @@
+package io.github.axolotlclient.mixin;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import io.github.axolotlclient.AxolotlClient;
+import net.minecraft.obfuscate.DontObfuscate;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(RenderSystem.class)
+public abstract class MixinRenderSystem {
+
+	@Shadow @Final @DontObfuscate
+	private static float[] shaderColor;
+
+	@Inject(method = "_setShaderColor", at = @At(value = "HEAD"), cancellable = true, remap = false)
+	private static void reduceBlue(float red, float green, float blue, float alpha, CallbackInfo ci){
+		if(AxolotlClient.CONFIG.nightMode.get()){
+			shaderColor[0] = red;
+			shaderColor[1] = green;
+			shaderColor[2] = blue/2;
+			shaderColor[3] = alpha;
+			ci.cancel();
+		}
+	}
+}

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

@@ -25,6 +25,7 @@
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.Vec3f;
 import org.jetbrains.annotations.Nullable;
+import org.quiltmc.loader.api.QuiltLoader;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -56,9 +57,9 @@ public abstract class MixinWorldRenderer {
 
 	@Shadow @Nullable private VertexBuffer lightSkyBuffer;
 
-	@Inject(method = "renderSky", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;disableTexture()V"), cancellable = true)
+	@Inject(method = "renderSky", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/RenderSystem;disableTexture()V"), cancellable = true, remap = false)
 	public void renderSky(MatrixStack matrices, Matrix4f projectionMatrix, float tickDelta, Camera preStep, boolean bl, Runnable runnable, CallbackInfo ci){
-		if(AxolotlClient.CONFIG.customSky.get() && SkyboxManager.getInstance().hasSkyBoxes()) {
+		if(AxolotlClient.CONFIG.customSky.get() && SkyboxManager.getInstance().hasSkyBoxes() && !QuiltLoader.isModLoaded("fabricskyboxes")) {
 			RenderSystem.disableTexture();
 			Vec3d vec3d = this.world.getSkyColor(this.client.gameRenderer.getCamera().getPos(), tickDelta);
 			float f = (float) vec3d.x;
@@ -194,14 +195,6 @@ public float customCloudHeight(SkyProperties instance){
 		return instance.getCloudsHeight();
 	}
 
-    /*@ModifyArg(method = "method_1380", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glLineWidth(F)V"))
-    public float OutlineWidth(float width){
-        if(AxolotlClient.CONFIG.enableCustomOutlines.get() && AxolotlClient.CONFIG.outlineWidth.get()>1){
-            return 1.0F+ AxolotlClient.CONFIG.outlineWidth.get();
-        }
-        return width;
-    }*/
-
     @ModifyArgs(method = "drawBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;drawShapeOutline(Lnet/minecraft/client/util/math/MatrixStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/util/shape/VoxelShape;DDDFFFF)V"))
     public void customOutlineColor(Args args){
         if(AxolotlClient.CONFIG.enableCustomOutlines.get()){