From 1243e51175c655c71528765aa5d138227c1ae3c6 Mon Sep 17 00:00:00 2001 From: Klemmbaustein Date: Mon, 26 Aug 2024 21:27:59 +0200 Subject: [PATCH] Update HudOverlay.java, JetOverlayHud.java, JetOverlayClient.java, and 2 more files --- .../com/luna/jetoverlay/JetOverlayClient.java | 8 +-- .../luna/jetoverlay/client/HudOverlay.java | 7 +-- .../luna/jetoverlay/client/JetOverlayHud.java | 49 ++----------------- .../mixin/client/MixinEntityRenderer.java | 3 +- .../mixin/client/MixinOutlineRenderer.java | 8 +-- 5 files changed, 12 insertions(+), 63 deletions(-) diff --git a/src/client/java/com/luna/jetoverlay/JetOverlayClient.java b/src/client/java/com/luna/jetoverlay/JetOverlayClient.java index 17e40e7..9db850a 100644 --- a/src/client/java/com/luna/jetoverlay/JetOverlayClient.java +++ b/src/client/java/com/luna/jetoverlay/JetOverlayClient.java @@ -5,7 +5,6 @@ import com.luna.jetoverlay.client.JetOverlayHud; import com.mojang.blaze3d.platform.InputConstants; import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; @@ -17,7 +16,7 @@ import java.util.List; public class JetOverlayClient implements ClientModInitializer { - public static boolean shouldRenderOutline = false; + public static boolean renderOverlay = false; public static List markedEntities = new ArrayList<>(); public static final KeyMapping toggle_outline = new KeyMapping("key.toggle-outline", InputConstants.Type.KEYSYM, @@ -37,11 +36,6 @@ public void onInitializeClient() { HudRenderCallback.EVENT.register(new HudOverlay()); KeyBindingHelper.registerKeyBinding(toggle_outline); KeyBindingHelper.registerKeyBinding(markEntityAsTarget); - ClientTickEvents.END_CLIENT_TICK.register((yippe) -> { - if(toggle_outline.consumeClick()) { - shouldRenderOutline = !shouldRenderOutline; - } - }); MenuScreens.register(JetOverlay.GOGGLES_RECEIVER_SCREEN_HANDLER, GogglesReceiverScreen::new); WorldRenderEvents.END.register((whatever) -> { }); diff --git a/src/client/java/com/luna/jetoverlay/client/HudOverlay.java b/src/client/java/com/luna/jetoverlay/client/HudOverlay.java index 0efbf71..375bab4 100644 --- a/src/client/java/com/luna/jetoverlay/client/HudOverlay.java +++ b/src/client/java/com/luna/jetoverlay/client/HudOverlay.java @@ -12,8 +12,9 @@ public class HudOverlay implements HudRenderCallback { @Override public void onHudRender(GuiGraphics drawContext, float tickDelta) { - if (JetOverlayClient.shouldRenderOutline) { - // drawContext.blit(leftElement, 0, 90, 0, 0, 0,8 ,200 , 8, 200); - } + // TODO: Replace this with a better overlay UI. +// if (JetOverlayClient.renderOverlay) { +// drawContext.blit(leftElement, 0, 90, 0, 0, 0,8 ,200 , 8, 200); +// } } } diff --git a/src/client/java/com/luna/jetoverlay/client/JetOverlayHud.java b/src/client/java/com/luna/jetoverlay/client/JetOverlayHud.java index 963f635..113bb6d 100644 --- a/src/client/java/com/luna/jetoverlay/client/JetOverlayHud.java +++ b/src/client/java/com/luna/jetoverlay/client/JetOverlayHud.java @@ -2,6 +2,7 @@ import com.luna.jetoverlay.CameraRotationDirection; import com.luna.jetoverlay.JetOverlayClient; +import com.luna.jetoverlay.ModItems; import com.luna.jetoverlay.armor.JetGoggles; import com.luna.jetoverlay.networking.PacketSender; import net.minecraft.client.Camera; @@ -125,55 +126,13 @@ private void renderOverlay(GuiGraphics __drawContext, float __tickDelta) { @Override public void onHudRender(GuiGraphics __drawContext, float __tickDelta) { + JetOverlayClient.renderOverlay = Minecraft.getInstance().player != null + && Minecraft.getInstance().player.getInventory().getArmor(3).is(ModItems.JET_GOGGLES); -// CameraRotationDirection rotationDirection = detectCameraRotation(Minecraft.getInstance().gameRenderer.getMainCamera()); -// if (rotationDirection == CameraRotationDirection.LEFT || rotationDirection == CameraRotationDirection.RIGHT) { -// __drawContext.drawString(Minecraft.getInstance().font, rotationDirection.toString(), 0, 10, 0x00FF00); -// } -// if (rotationDirection == CameraRotationDirection.DOWN || rotationDirection == CameraRotationDirection.UP) { -// __drawContext.drawString(Minecraft.getInstance().font, rotationDirection.toString(), 0, 20, 0x00FF00); -// } - - if (JetOverlayClient.shouldRenderOutline) { + if (JetOverlayClient.renderOverlay) { renderOverlay(__drawContext, __tickDelta); } } ResourceLocation _clientChannel = new ResourceLocation("jetoverlay_client", "redstone_emitter_client"); - - public CameraRotationDirection detectCameraRotation(Camera __camera) { - //X axis decreases when going up, increases when going down - - if (__camera.getXRot() != _originalXRot) { - if (__camera.getXRot() < _originalXRot) { - _originalXRot = __camera.getXRot(); - PacketSender.SendPacket("Yippe"); - return CameraRotationDirection.UP; - - } - else { - _originalXRot = __camera.getXRot(); - return CameraRotationDirection.DOWN; - } - } - //Y axis decreases when going to the left, increases when going to the right - if (__camera.getYRot() != _originalYRot) { - if (__camera.getYRot() < _originalYRot) { - _originalYRot = __camera.getYRot(); - return CameraRotationDirection.LEFT; - } - else { - _originalYRot = __camera.getYRot(); - return CameraRotationDirection.RIGHT; - } - } - return CameraRotationDirection.NOTHING; - } - public float ReturnRotationDifference(float __originalPos, float __newPos) { - return __newPos - __originalPos; - } - public float ReturnRedstonePower(float __difference) { - float _redstonePower = 0; - return _redstonePower; - } } diff --git a/src/client/java/com/luna/jetoverlay/mixin/client/MixinEntityRenderer.java b/src/client/java/com/luna/jetoverlay/mixin/client/MixinEntityRenderer.java index 53e3b53..9553644 100644 --- a/src/client/java/com/luna/jetoverlay/mixin/client/MixinEntityRenderer.java +++ b/src/client/java/com/luna/jetoverlay/mixin/client/MixinEntityRenderer.java @@ -1,6 +1,5 @@ package com.luna.jetoverlay.mixin.client; import com.luna.jetoverlay.JetOverlayClient; -import com.luna.jetoverlay.client.JetOverlayHud; import net.minecraft.client.Minecraft; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -19,7 +18,7 @@ public void ShouldEntityAppearGlowing(Entity entity, CallbackInfoReturnable cir) { - if (!this.minecraft.gameRenderer.isPanoramicMode() && this.entityTarget != null && this.entityEffect != null && this.minecraft.player != null || JetOverlayClient.shouldRenderOutline && _trackedEntity != null && JetOverlayClient.markedEntities.contains(_trackedEntity)) { + if (!this.minecraft.gameRenderer.isPanoramicMode() && this.entityTarget != null && this.entityEffect != null && this.minecraft.player != null || JetOverlayClient.renderOverlay && _trackedEntity != null && JetOverlayClient.markedEntities.contains(_trackedEntity)) { cir.setReturnValue(true); } }