feat: move freelook to common

Author: Floweynt

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

@@ -32,11 +32,9 @@
 import io.github.axolotlclient.modules.auth.Auth;
 import io.github.axolotlclient.modules.blur.MenuBlur;
 import io.github.axolotlclient.modules.blur.MotionBlur;
-import io.github.axolotlclient.modules.freelook.Freelook;
 import io.github.axolotlclient.modules.hud.HudManager;
 import io.github.axolotlclient.modules.hypixel.HypixelMods;
 import io.github.axolotlclient.modules.particles.Particles;
-import io.github.axolotlclient.modules.render.BeaconBeam;
 import io.github.axolotlclient.modules.rpc.DiscordRPC;
 import io.github.axolotlclient.modules.screenshotUtils.ScreenshotUtils;
 import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
@@ -45,6 +43,7 @@
 import io.github.axolotlclient.modules.tnttime.TntTime;
 import io.github.axolotlclient.modules.zoom.Zoom;
 import io.github.axolotlclient.util.FeatureDisabler;
+import io.github.axolotlclient.util.FeatureDisablerCommon;
 import io.github.axolotlclient.util.Logger;
 import io.github.axolotlclient.util.LoggerImpl;
 import io.github.axolotlclient.util.notifications.Notifications;
@@ -67,7 +66,6 @@ private void addBuiltinModules() {
 		registerModule(MenuBlur.getInstance());
 		registerModule(ScrollableTooltips.getInstance());
 		registerModule(DiscordRPC.getInstance());
-		registerModule(Freelook.getInstance());
 		registerModule(TntTime.getInstance());
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
@@ -96,8 +94,8 @@ public void onInitializeClient() {
 	}
 
 	@Override
-	protected void initFeatureDisabler() {
-		FeatureDisabler.init();
+	protected FeatureDisablerCommon getFeatureDisabler() {
+		return FeatureDisabler.getInstance();
 	}
 
 	@Override

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

@@ -51,6 +51,10 @@ public Identifier getFabricId() {
 				return new Identifier("axolotlclient", "bridge/resource_listener");
 			}
 		});
+
+		ClientPlayConnectionEvents.INIT.register((handler, client) ->
+			Events.JOIN.invoker().accept(new Events.ServerJoinInfo(handler.getConnection().getAddress().toString())));
+
 		ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
 		ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());
 	}

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/MinecraftClientMixin.java

@@ -28,8 +28,9 @@
 import io.github.axolotlclient.bridge.AxoMinecraftClient;
 import io.github.axolotlclient.bridge.AxoPlayerListEntry;
 import io.github.axolotlclient.bridge.AxoSession;
+import io.github.axolotlclient.bridge.entity.AxoEntity;
 import io.github.axolotlclient.bridge.entity.AxoPlayer;
-import io.github.axolotlclient.bridge.key.AxoClientKeybinds;
+import io.github.axolotlclient.bridge.AxoGameOptions;
 import io.github.axolotlclient.bridge.render.AxoFont;
 import io.github.axolotlclient.bridge.resource.AxoResourceManager;
 import io.github.axolotlclient.bridge.util.AxoText;
@@ -41,8 +42,10 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.util.Session;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.text.Text;
 import net.minecraft.util.thread.ReentrantThreadExecutor;
@@ -89,6 +92,14 @@ public abstract class MinecraftClientMixin extends ReentrantThreadExecutor<Runna
 	@Shadow
 	public abstract ResourceManager getResourceManager();
 
+	@Shadow
+	@Final
+	public WorldRenderer worldRenderer;
+
+	@Shadow
+	@Nullable
+	public Entity cameraEntity;
+
 	public MinecraftClientMixin(String string) {
 		super(string);
 	}
@@ -111,7 +122,7 @@ public MinecraftClientMixin(String string) {
 
 	@Override
 
-	public AxoClientKeybinds br$getKeybinds() {
+	public AxoGameOptions br$getGameOptions() {
 		return options;
 	}
 
@@ -161,4 +172,14 @@ public MinecraftClientMixin(String string) {
 	public Object br$getScreen() {
 		return currentScreen;
 	}
+
+	@Override
+	public void br$notifyLevelRenderer() {
+		worldRenderer.scheduleTerrainUpdate();
+	}
+
+	@Override
+	public AxoEntity axo$getCameraEntity() {
+		return cameraEntity;
+	}
 }

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/mixin/key/GameOptionsMixin.java

@@ -22,16 +22,18 @@
 
 package io.github.axolotlclient.bridge.mixin.key;
 
-import io.github.axolotlclient.bridge.key.AxoClientKeybinds;
+import io.github.axolotlclient.bridge.AxoGameOptions;
+import io.github.axolotlclient.bridge.AxoPerspective;
 import io.github.axolotlclient.bridge.key.AxoKeybinding;
 import net.minecraft.client.options.GameOptions;
 import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.options.Perspective;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(GameOptions.class)
-public abstract class GameOptionsMixin implements AxoClientKeybinds {
+public abstract class GameOptionsMixin implements AxoGameOptions {
 	@Shadow
 	@Final
 	public KeyBinding keyAttack;
@@ -48,6 +50,12 @@ public abstract class GameOptionsMixin implements AxoClientKeybinds {
 	@Final
 	public KeyBinding keyUse;
 
+	@Shadow
+	public abstract Perspective getPerspective();
+
+	@Shadow
+	public abstract void method_31043(Perspective par1);
+
 	@Override
 	public AxoKeybinding br$getSprintKeybind() {
 		return keySprint;
@@ -67,4 +75,22 @@ public abstract class GameOptionsMixin implements AxoClientKeybinds {
 	public AxoKeybinding br$getUseKey() {
 		return keyUse;
 	}
+
+	@Override
+	public AxoPerspective br$getCameraType() {
+		return switch (getPerspective()) {
+			case FIRST_PERSON -> AxoPerspective.FIRST_PERSON;
+			case THIRD_PERSON_BACK -> AxoPerspective.THIRD_PERSON_BACK;
+			case THIRD_PERSON_FRONT -> AxoPerspective.THIRD_PERSON_FRONT;
+		};
+	}
+
+	@Override
+	public void br$setCameraType(AxoPerspective perspective) {
+		method_31043(switch (perspective) {
+			case FIRST_PERSON -> Perspective.FIRST_PERSON;
+			case THIRD_PERSON_BACK -> Perspective.THIRD_PERSON_BACK;
+			case THIRD_PERSON_FRONT -> Perspective.THIRD_PERSON_FRONT;
+		});
+	}
 }