feat: move beacon beam to common

Floweynt · Floweynt · commit 8f504bd3bcc8 · 2025-10-28T13:37:02.000-05:00
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClient.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClient.java
@@ -36,7 +36,7 @@
 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.renderOptions.BeaconBeam;
+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;
@@ -71,7 +71,6 @@ private void addBuiltinModules() {
 		registerModule(TntTime.getInstance());
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
-		registerModule(BeaconBeam.getInstance());
 		registerModule(Tablist.getInstance());
 		registerModule(Auth.getInstance());
 		registerModule(APIOptions.getInstance());
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java
@@ -22,7 +22,7 @@
 
 package io.github.axolotlclient.mixin;
 
-import io.github.axolotlclient.modules.renderOptions.BeaconBeam;
+import io.github.axolotlclient.modules.render.BeaconBeam;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
diff --git a/1.20/src/main/java/io/github/axolotlclient/AxolotlClient.java b/1.20/src/main/java/io/github/axolotlclient/AxolotlClient.java
@@ -36,7 +36,7 @@
 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.renderOptions.BeaconBeam;
+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;
@@ -71,7 +71,6 @@ private void addBuiltinModules() {
 		registerModule(TntTime.getInstance());
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
-		registerModule(BeaconBeam.getInstance());
 		registerModule(Tablist.getInstance());
 		registerModule(Auth.getInstance());
 		registerModule(APIOptions.getInstance());
diff --git a/1.20/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java b/1.20/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java
@@ -22,7 +22,7 @@
 
 package io.github.axolotlclient.mixin;
 
-import io.github.axolotlclient.modules.renderOptions.BeaconBeam;
+import io.github.axolotlclient.modules.render.BeaconBeam;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/renderOptions/BeaconBeam.java b/1.20/src/main/java/io/github/axolotlclient/modules/renderOptions/BeaconBeam.java
diff --git a/1.21/src/main/java/io/github/axolotlclient/AxolotlClient.java b/1.21/src/main/java/io/github/axolotlclient/AxolotlClient.java
@@ -35,7 +35,7 @@
 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.renderOptions.BeaconBeam;
+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;
@@ -67,7 +67,6 @@ private void addBuiltinModules() {
 		registerModule(TntTime.getInstance());
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
-		registerModule(BeaconBeam.getInstance());
 		registerModule(Tablist.getInstance());
 		registerModule(Auth.getInstance());
 		registerModule(APIOptions.getInstance());
diff --git a/1.21/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java b/1.21/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java
@@ -22,7 +22,7 @@
 
 package io.github.axolotlclient.mixin;
 
-import io.github.axolotlclient.modules.renderOptions.BeaconBeam;
+import io.github.axolotlclient.modules.render.BeaconBeam;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/renderOptions/BeaconBeam.java b/1.21/src/main/java/io/github/axolotlclient/modules/renderOptions/BeaconBeam.java
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClient.java b/1.8.9/src/main/java/io/github/axolotlclient/AxolotlClient.java
@@ -37,7 +37,7 @@
 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.renderOptions.BeaconBeam;
+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;
@@ -73,7 +73,6 @@ private void addBuiltinModules() {
 		registerModule(TntTime.getInstance());
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
-		registerModule(BeaconBeam.getInstance());
 		registerModule(UnfocusedFpsLimiter.getInstance());
 		registerModule(Tablist.getInstance());
 		registerModule(Auth.getInstance());
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java
@@ -22,7 +22,7 @@
 
 package io.github.axolotlclient.mixin;
 
-import io.github.axolotlclient.modules.renderOptions.BeaconBeam;
+import io.github.axolotlclient.modules.render.BeaconBeam;
 import net.minecraft.block.entity.BeaconBlockEntity;
 import net.minecraft.client.render.block.entity.BeaconRenderer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -35,7 +35,7 @@ public abstract class BeaconBlockEntityRendererMixin {
 
 	@Inject(method = "render(Lnet/minecraft/block/entity/BeaconBlockEntity;DDDFI)V", at = @At("HEAD"), cancellable = true)
 	private void axolotlclient$cancelBeamRendering(BeaconBlockEntity beaconBlockEntity, double d, double e, double f, float g, int i, CallbackInfo ci) {
-		if (!BeaconBeam.getInstance().showBeam()) {
+		if (!BeaconBeam.getInstance().showBeam(false)) {
 			ci.cancel();
 		}
 	}
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/renderOptions/BeaconBeam.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/renderOptions/BeaconBeam.java
diff --git a/1.latest/src/main/java/io/github/axolotlclient/AxolotlClient.java b/1.latest/src/main/java/io/github/axolotlclient/AxolotlClient.java
@@ -34,7 +34,7 @@
 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.renderOptions.BeaconBeam;
+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;
@@ -66,7 +66,6 @@ private void addBuiltinModules() {
 		registerModule(TntTime.getInstance());
 		registerModule(Particles.getInstance());
 		registerModule(ScreenshotUtils.getInstance());
-		registerModule(BeaconBeam.getInstance());
 		registerModule(Tablist.getInstance());
 		registerModule(Auth.getInstance());
 		registerModule(APIOptions.getInstance());
diff --git a/1.latest/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java b/1.latest/src/main/java/io/github/axolotlclient/mixin/BeaconBlockEntityRendererMixin.java
@@ -23,7 +23,7 @@
 package io.github.axolotlclient.mixin;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import io.github.axolotlclient.modules.renderOptions.BeaconBeam;
+import io.github.axolotlclient.modules.render.BeaconBeam;
 import net.minecraft.client.renderer.SubmitNodeCollector;
 import net.minecraft.client.renderer.blockentity.BeaconRenderer;
 import net.minecraft.resources.ResourceLocation;
diff --git a/1.latest/src/main/java/io/github/axolotlclient/modules/renderOptions/BeaconBeam.java b/1.latest/src/main/java/io/github/axolotlclient/modules/renderOptions/BeaconBeam.java
diff --git a/common/src/main/java/io/github/axolotlclient/AxolotlClientCommon.java b/common/src/main/java/io/github/axolotlclient/AxolotlClientCommon.java
@@ -45,6 +45,7 @@
 import io.github.axolotlclient.config.profiles.Profiles;
 import io.github.axolotlclient.modules.Module;
 import io.github.axolotlclient.modules.hud.ClickInputTracker;
+import io.github.axolotlclient.modules.render.BeaconBeam;
 import io.github.axolotlclient.util.Logger;
 import io.github.axolotlclient.util.OSUtil;
 import io.github.axolotlclient.util.notifications.NotificationProvider;
@@ -121,6 +122,7 @@ public static AxolotlClientCommon getInstance() {
 
 	private void addBuiltinCommonModules() {
 		registerModule(ClickInputTracker.getInstance());
+		registerModule(BeaconBeam.getInstance());
 	}
 
 	// init logic
diff --git a/common/src/main/java/io/github/axolotlclient/modules/render/BeaconBeam.java b/common/src/main/java/io/github/axolotlclient/modules/render/BeaconBeam.java
@@ -20,15 +20,16 @@
  * For more information, see the LICENSE file.
  */
 
-package io.github.axolotlclient.modules.renderOptions;
+package io.github.axolotlclient.modules.render;
 
-import io.github.axolotlclient.AxolotlClient;
+import io.github.axolotlclient.AxolotlClientCommon;
 import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.BooleanOption;
-import io.github.axolotlclient.modules.AbstractModule;
+import io.github.axolotlclient.bridge.BridgeVersion;
+import io.github.axolotlclient.modules.AbstractCommonModule;
 import lombok.Getter;
 
-public class BeaconBeam extends AbstractModule {
+public class BeaconBeam extends AbstractCommonModule {
 
 	@Getter
 	private final static BeaconBeam Instance = new BeaconBeam();
@@ -40,9 +41,13 @@ public class BeaconBeam extends AbstractModule {
 
 	@Override
 	public void init() {
-		beams.add(showBeaconBeams, showEndGatewayBeams);
+		beams.add(showBeaconBeams);
 
-		AxolotlClient.config().rendering.add(beams);
+		if(!BridgeVersion.V1_8.isCurrent()) {
+			beams.add(showEndGatewayBeams);
+		}
+
+		AxolotlClientCommon.getInstance().getConfig().rendering.add(beams);
 	}
 
 	public boolean showBeam(boolean endGateway) {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`
`23`	`23`	`package io.github.axolotlclient.mixin;`
`24`	`24`
`25`		`-import io.github.axolotlclient.modules.renderOptions.BeaconBeam;`
	`25`	`+import io.github.axolotlclient.modules.render.BeaconBeam;`
`26`	`26`	`import net.minecraft.block.entity.BeaconBlockEntity;`
`27`	`27`	`import net.minecraft.client.render.block.entity.BeaconRenderer;`
`28`	`28`	`import org.spongepowered.asm.mixin.Mixin;`
`@@ -35,7 +35,7 @@ public abstract class BeaconBlockEntityRendererMixin {`
`35`	`35`
`36`	`36`	`@Inject(method = "render(Lnet/minecraft/block/entity/BeaconBlockEntity;DDDFI)V", at = @At("HEAD"), cancellable = true)`
`37`	`37`	`private void axolotlclient$cancelBeamRendering(BeaconBlockEntity beaconBlockEntity, double d, double e, double f, float g, int i, CallbackInfo ci) {`
`38`		`- if (!BeaconBeam.getInstance().showBeam()) {`
	`38`	`+ if (!BeaconBeam.getInstance().showBeam(false)) {`
`39`	`39`	`ci.cancel();`
`40`	`40`	`}`
`41`	`41`	`}`