add HitColor option, allow Snap Perspective mode

Author: moehreag

CHANGELOG.md

@@ -72,4 +72,9 @@
 
 - fix KeyBindOptions not being saved
     - since this is a critical fix, this will also be released for 1.19.2
-- add 'Snap-Perspective' mode to Freelook
+- add 'Snap-Perspective' mode to Freelook
+
+### 2.2.8
+
+- HitColor option
+- Allow Snap Perspective mode to be used on servers where Freelook is disallowed

build.gradle

@@ -71,7 +71,7 @@ dependencies {
 
 // More hacks that make mac os work
 if (System.getProperty("os.name").toLowerCase().contains("mac")) {
-	configurations.all {
+	configurations.configureEach {
 		resolutionStrategy {
 			dependencySubstitution {
 				substitute module('org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-201408222') using module('org.lwjgl.lwjgl:lwjgl_util:2.9.4-nightly-20150209')
@@ -83,7 +83,7 @@ if (System.getProperty("os.name").toLowerCase().contains("mac")) {
 }
 
 // Fix netty with Java 17+ (be happy if it didn't break for you)
-configurations.all {
+configurations.configureEach {
 	resolutionStrategy {
 		dependencySubstitution {
 			substitute module('io.netty:netty-all:4.0.23.Final') using module('io.netty:netty-all:4.0.26.Final')
@@ -153,7 +153,7 @@ modrinth {
 	gameVersions = ["${project.minecraft_version}"]
 	loaders = ["fabric"]
 	dependencies {
-		//required.project "legacy-fabric-api" // Once lfapi is on modrinth (aka 'its next release')
+		required.project "legacy-fabric-api"
 	}
 
 	// Changelog fetching: Credit LambdAurora.

gradle.properties

@@ -12,7 +12,7 @@ org.gradle.jvmargs=-Xmx1G
 	archives_base_name = AxolotlClient
 
 # Dependencies
-	fabric_version = 1.8.0+1.8.9
+	fabric_version = 1.9.0+1.8.9
 
 # AxolotlClientConfig
 config_version = 1.0.14

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

@@ -57,6 +57,7 @@ public class AxolotlClientConfig extends ConfigHolder {
     public final BooleanOption dynamicFOV = new BooleanOption("axolotlclient.dynamicFov", true);
     public final BooleanOption fullBright = new BooleanOption("axolotlclient.fullBright", false);
     public final BooleanOption lowFire = new BooleanOption("axolotlclient.lowFire", false);
+    public final ColorOption hitColor = new ColorOption("axolotlclient.hitColor", new Color(255, 0, 0, 77));
 
     public final ColorOption loadingScreenColor = new ColorOption("axolotlclient.loadingBgColor", new Color(-1));
     public final BooleanOption nightMode = new BooleanOption("axolotlclient.nightMode", false);
@@ -128,7 +129,13 @@ public void init() {
                 AxolotlClientConfigConfig.searchSort, AxolotlClientConfigConfig.searchSortOrder);
         general.addSubCategory(searchFilters);
 
-        rendering.add(customSky, cloudHeight, AxolotlClientConfigConfig.chromaSpeed, dynamicFOV, fullBright, lowFire);
+        rendering.add(customSky,
+                cloudHeight,
+                AxolotlClientConfigConfig.chromaSpeed,
+                dynamicFOV,
+                fullBright,
+                lowFire,
+                hitColor);
 
         timeChanger.add(timeChangerEnabled);
         timeChanger.add(customTime);

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

@@ -32,9 +32,7 @@
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -70,4 +68,24 @@ public void addBadge(LivingEntity livingEntity, double d, double e, double f, Ca
         else if (!NickHider.getInstance().hideOtherNames.get() && !livingEntity.equals(MinecraftClient.getInstance().player))
             AxolotlClient.addBadge(livingEntity);
     }
+
+    @ModifyConstant(method = "method_10252", constant = @Constant(floatValue = 1.0f, ordinal = 0))
+    private float customHitColorRed(float constant){
+        return AxolotlClient.CONFIG.hitColor.get().getRed()/255F;
+    }
+
+    @ModifyConstant(method = "method_10252", constant = @Constant(floatValue = 0.0f, ordinal = 0))
+    private float customHitColorGreen(float constant){
+        return AxolotlClient.CONFIG.hitColor.get().getGreen()/255F;
+    }
+
+    @ModifyConstant(method = "method_10252", constant = @Constant(floatValue = 0.0f, ordinal = 1))
+    private float customHitColorBlue(float constant){
+        return AxolotlClient.CONFIG.hitColor.get().getBlue()/255F;
+    }
+
+    @ModifyConstant(method = "method_10252", constant = @Constant(floatValue = 0.3f, ordinal = 0))
+    private float customHitColorAlpha(float constant){
+        return AxolotlClient.CONFIG.hitColor.get().getAlpha()/255F;
+    }
 }

src/main/java/io/github/axolotlclient/modules/freelook/Freelook.java

@@ -27,6 +27,7 @@
 import io.github.axolotlclient.AxolotlclientConfig.options.EnumOption;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
 import io.github.axolotlclient.modules.AbstractModule;
+import io.github.axolotlclient.util.FeatureDisabler;
 import net.legacyfabric.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.options.KeyBinding;
@@ -46,7 +47,10 @@ public class Freelook extends AbstractModule {
 
     private final OptionCategory category = new OptionCategory("axolotlclient.freelook");
     public final BooleanOption enabled = new BooleanOption("axolotlclient.enabled", false);
-    private final EnumOption mode = new EnumOption("axolotlclient.mode", new String[]{"axolotlclient.snap_perspective", "axolotlclient.freelook"}, "axolotlclient.freelook");
+    private final EnumOption mode = new EnumOption("axolotlclient.mode",
+            new String[]{"axolotlclient.snap_perspective", "axolotlclient.freelook"},
+            value -> FeatureDisabler.update(),
+            "axolotlclient.freelook");
     private final EnumOption perspective = new EnumOption("axolotlclient.perspective", Perspective.values(),
             Perspective.THIRD_PERSON_BACK.toString());
     private final BooleanOption invert = new BooleanOption("axolotlclient.invert", false);
@@ -114,7 +118,7 @@ private void stop() {
     }
 
     public boolean consumeRotation(float dx, float dy) {
-        if (!active || !enabled.get() || !mode.get().equals("freelook"))
+        if (!active || !enabled.get() || !mode.get().equals("axolotlclient.freelook"))
             return false;
 
         if (!invert.get())
@@ -134,16 +138,20 @@ public boolean consumeRotation(float dx, float dy) {
     }
 
     public float yaw(float defaultValue) {
-        if (!active || !enabled.get() || !mode.get().equals("freelook"))
+        if (!active || !enabled.get() || !mode.get().equals("axolotlclient.freelook"))
             return defaultValue;
 
         return yaw;
     }
 
     public float pitch(float defaultValue) {
-        if (!active || !enabled.get() || !mode.get().equals("freelook"))
+        if (!active || !enabled.get() || !mode.get().equals("axolotlclient.freelook"))
             return defaultValue;
 
         return pitch;
     }
+
+    public boolean needsDisabling(){
+        return mode.get().equals("axolotlclient.freelook");
+    }
 }

src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java

@@ -39,6 +39,7 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.resource.language.I18n;
 
 import java.time.Instant;
 import java.util.Optional;
@@ -87,7 +88,7 @@ public void init() {
         AxolotlClient.CONFIG.addCategory(category);
 
         if (OSUtil.getOS() == OSUtil.OperatingSystem.OTHER) {
-            enabled.setForceOff(true, "axolotlclient.crash");
+            enabled.setForceOff(true, I18n.translate("axolotlclient.crash"));
         }
 
         Optional<ModContainer> container = FabricLoader.getInstance().getModContainer("axolotlclient");

src/main/java/io/github/axolotlclient/modules/rpc/gameSdk/GameSdkDownloader.java

@@ -26,6 +26,7 @@
 import io.github.axolotlclient.modules.rpc.DiscordRPC;
 import io.github.axolotlclient.util.Logger;
 import io.github.axolotlclient.util.OSUtil;
+import net.minecraft.client.resource.language.I18n;
 
 import java.io.File;
 import java.io.IOException;
@@ -82,7 +83,7 @@ public static void downloadSdk() {
 
             if (!sdk.exists() || !jni.exists()) {
                 Logger.error("Could not download GameSDK, no copy is available. RPC will be disabled.");
-                DiscordRPC.getInstance().enabled.setForceOff(true, "axolotlclient.crash");
+                DiscordRPC.getInstance().enabled.setForceOff(true, I18n.translate("axolotlclient.crash"));
                 return;
             }
 
@@ -142,7 +143,7 @@ private static void extractJni(File jni) throws IOException {
             extractJni(jni);
         } else {
             Logger.error("Extracting Jni failed, restart your game to try again.");
-            DiscordRPC.getInstance().enabled.setForceOff(true, "axolotlclient.crash");
+            DiscordRPC.getInstance().enabled.setForceOff(true, I18n.translate("axolotlclient.crash"));
         }
     }
 

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

@@ -25,22 +25,30 @@
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
 import io.github.axolotlclient.modules.freelook.Freelook;
+import net.minecraft.client.resource.language.I18n;
 
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.function.Supplier;
 
 public class FeatureDisabler {
 
     private static final HashMap<BooleanOption, String[]> disabledServers = new HashMap<>();
+    private static final HashMap<BooleanOption, Supplier<Boolean>> conditions = new HashMap<>();
+
+    private static final Supplier<Boolean> NONE = () -> true;
+
+    private static String currentAdress;
 
     public static void init() {
-        setServers(AxolotlClient.CONFIG.fullBright, "gommehd");
-        setServers(AxolotlClient.CONFIG.timeChangerEnabled, "gommehd");
-        setServers(Freelook.getInstance().enabled, "hypixel", "mineplex", "gommehd", "nucleoid");
+        setServers(AxolotlClient.CONFIG.fullBright, NONE, "gommehd");
+        setServers(AxolotlClient.CONFIG.timeChangerEnabled, NONE, "gommehd");
+        setServers(Freelook.getInstance().enabled, () -> Freelook.getInstance().needsDisabling(), "hypixel", "mineplex", "gommehd", "nucleoid");
     }
 
     public static void onServerJoin(String address) {
-        disabledServers.forEach((option, strings) -> disableOption(option, strings, address));
+        currentAdress = address;
+        update();
     }
 
     public static void clear() {
@@ -51,17 +59,22 @@ private static void disableOption(BooleanOption option, String[] servers, String
         boolean ban = false;
         for (String s : servers) {
             if (currentServer.toLowerCase(Locale.ROOT).contains(s.toLowerCase(Locale.ROOT))) {
-                ban = true;
+                ban = conditions.get(option).get();
                 break;
             }
         }
 
         if (option.getForceDisabled() != ban) {
-            option.setForceOff(ban, "axolotlclient.ban_reason");
+            option.setForceOff(ban, I18n.translate("axolotlclient.ban_reason"));
         }
     }
 
-    private static void setServers(BooleanOption option, String... servers) {
+    private static void setServers(BooleanOption option, Supplier<Boolean> condition, String... servers) {
         disabledServers.put(option, servers);
+        conditions.put(option, condition);
+    }
+
+    public static void update(){
+        disabledServers.forEach((option, strings) -> disableOption(option, strings, currentAdress));
     }
 }

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

@@ -33,6 +33,7 @@
     "smoothCamera.tooltip": "Whether to enable smooth camera while zoomed.",
     "dynamicFov": "Dynamic FOV",
     "fullBright": "FullBright",
+    "hitColor": "Hit Color",
     "strength": "Strength",
     "inGuis": "Apply to GUIs",
     "lowFire": "Low Fire",
@@ -302,8 +303,8 @@
     "contributors": "Contributors",
     "other_people": "Other People",
     "external_modules": "External Modules",
-    "disableReason.crash.tooltip": "This option has been disabled <br>because it would crash your game.",
-    "disableReason.ban_reason.tooltip": "This option is disabled <br>because it is known to be bannable on your current server.",
+    "disableReason.crash": "This option has been disabled <br>because it would crash your game.",
+    "ban_reason": "This option is disabled <br>because it is known to be bannable on your current server.",
     "back": "Back",
     "close": "Close"
 }