From 4f2151e5c70441e66060118e3142980799d7b3a2 Mon Sep 17 00:00:00 2001 From: Wynd Date: Thu, 8 Aug 2024 01:01:50 +0300 Subject: [PATCH] Added cardinal direction names in the F3 debug menu --- .../xyz/pixelatedw/finalbeta/Direction.java | 29 +++++++++++++++++++ .../xyz/pixelatedw/finalbeta/WyHelper.java | 15 ++++------ .../finalbeta/mixin/OverlayMixin.java | 4 ++- 3 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 src/main/java/xyz/pixelatedw/finalbeta/Direction.java diff --git a/src/main/java/xyz/pixelatedw/finalbeta/Direction.java b/src/main/java/xyz/pixelatedw/finalbeta/Direction.java new file mode 100644 index 0000000..0381cc0 --- /dev/null +++ b/src/main/java/xyz/pixelatedw/finalbeta/Direction.java @@ -0,0 +1,29 @@ +package xyz.pixelatedw.finalbeta; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.util.maths.MathsHelper; + +public enum Direction { + SOUTH, + WEST, + NORTH, + EAST, + ; + + private String displayName; + + private Direction() { + String name = this.name(); + this.displayName = Character.toUpperCase(name.charAt(0)) + name.substring(1).toLowerCase(); + } + + public static Direction fromEntity(LivingEntity entity) { + int dir = MathsHelper.floor(entity.yaw / 90.0D + 0.5D) & 3; + return values()[Math.abs(dir) % values().length]; + } + + @Override + public String toString() { + return this.displayName; + } +} diff --git a/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java b/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java index 08276e3..a933547 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/WyHelper.java @@ -8,8 +8,6 @@ import java.util.HashMap; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.Player; -import net.minecraft.item.ItemInstance; -import net.minecraft.item.ItemType; public class WyHelper { @@ -88,14 +86,13 @@ public class WyHelper { public static float clamp(float val, float min, float max) { return val < min ? min : Math.min(val, max); } - + public static void cheatCommand(Player player) { - player.dropItem(new ItemInstance(ItemType.pickaxeIron, 1, 100)); - player.dropItem(new ItemInstance(ItemType.pickaxeIron, 1, 150)); - player.dropItem(new ItemInstance(ItemType.pickaxeDiamond, 1, 150)); -// player.dropItem(new ItemInstance(Tile.WOOD, 64)); -// player.dropItem(new ItemInstance(ItemType.snowball, 60)); - +// player.dropItem(new ItemInstance(ItemType.minecartFurnace, 1)); +// player.dropItem(new ItemInstance(ItemType.minecartChest, 1)); +// player.dropItem(new ItemInstance(ItemType.coal, 64)); +// player.dropItem(new ItemInstance(Tile.WOODEN_PRESSURE_PLATE, 2)); + player.level.setLevelTime(0); player.level.getProperties().setRaining(false); player.level.getProperties().setRainTime(0); diff --git a/src/main/java/xyz/pixelatedw/finalbeta/mixin/OverlayMixin.java b/src/main/java/xyz/pixelatedw/finalbeta/mixin/OverlayMixin.java index 8a63212..35c7768 100644 --- a/src/main/java/xyz/pixelatedw/finalbeta/mixin/OverlayMixin.java +++ b/src/main/java/xyz/pixelatedw/finalbeta/mixin/OverlayMixin.java @@ -12,6 +12,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.gui.Overlay; import net.minecraft.client.render.TextRenderer; +import xyz.pixelatedw.finalbeta.Direction; import xyz.pixelatedw.finalbeta.ModConfig; import xyz.pixelatedw.finalbeta.WyHelper; @@ -41,8 +42,9 @@ public class OverlayMixin extends DrawableHelper { ) ) public void render(float f, boolean flag, int i, int j, CallbackInfo ci) { + TextRenderer textRenderer = this.minecraft.textRenderer; + this.drawTextWithShadow(textRenderer, "(" + Direction.fromEntity(this.minecraft.player).toString() + ")", 23, 88, 14737632); if (ModConfig.ENABLE_TIME_TRACKING.get()) { - TextRenderer textRenderer = this.minecraft.textRenderer; this.drawTextWithShadow(textRenderer, "Play Time: " + WyHelper.getGameDaysPlayed() + " (" + WyHelper.getRealDaysPlayed() + ")", 2, 96, 14737632); } }