RepoMirrors/kami-blue
1
0
Fork 1
mirror of https://github.com/kami-blue/client synced 2025-03-25 04:38:05 +00:00
Code Issues Releases Wiki Activity

Include diagonal X/Z for Coordinates in GUI

Browse Source
This commit is contained in:
Dominika 2020-05-25 12:01:27 -04:00
parent fda2eec4dc
commit 321dc9e9d8
No known key found for this signature in database
GPG Key ID: B4A5A6DCA70F861F
3 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java
View File

@ -20,10 +20,7 @@ import me.zeroeightsix.kami.gui.rgui.util.Docking;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.module.modules.client.InfoOverlay;
import me.zeroeightsix.kami.module.modules.movement.AutoWalk;
import me.zeroeightsix.kami.util.ColourHolder;
import me.zeroeightsix.kami.util.Friends;
import me.zeroeightsix.kami.util.Pair;
import me.zeroeightsix.kami.util.Wrapper;
import me.zeroeightsix.kami.util.*;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -42,7 +39,6 @@ import java.util.*;
import java.util.stream.Collectors;
import static me.zeroeightsix.kami.KamiMod.MODULE_MANAGER;
import static me.zeroeightsix.kami.util.InfoCalculator.cardinalToAxis;
/**
* Created by 086 on 25/06/2017.
@ -457,7 +453,6 @@ public class KamiGUI extends GUI {
int hposX = (int) (mc.player.posX * f);
int hposZ = (int) (mc.player.posZ * f);
String cardinal = cardinalToAxis(Character.toUpperCase(mc.player.getHorizontalFacing().toString().charAt(0)));
/* The 7 and f in the string formatter is the color */
String colouredSeparator = KamiMod.colour + "7 " + KamiMod.separator + KamiMod.colour + "r";
String ow = String.format("%sf%,d%s7, %sf%,d%s7, %sf%,d %s7",
@ -484,7 +479,7 @@ public class KamiGUI extends GUI {
);
coordsLabel.setText("");
coordsLabel.addLine(ow);
coordsLabel.addLine(cardinal + colouredSeparator + nether);
coordsLabel.addLine(MathsUtils.getPlayerCardinal(mc).cardinalName + colouredSeparator + nether);
}
});
frame.addChild(coordsLabel);

17
src/main/java/me/zeroeightsix/kami/util/InfoCalculator.java
View File

@ -80,23 +80,6 @@ public class InfoCalculator {
}
// }
// Cardinal to Axis {
public static String cardinalToAxis(char cardinal) {
switch (cardinal) {
case 'N':
return "-Z";
case 'S':
return "+Z";
case 'E':
return "+X";
case 'W':
return "-X";
default:
return "invalid";
}
}
// }
// Dimension {
public static String playerDimension(Minecraft mc) {
if (mc.player == null) return "No Dimension";

29
src/main/java/me/zeroeightsix/kami/util/MathsUtils.java
View File

@ -70,6 +70,22 @@ public class MathsUtils {
}
}
public static CardinalMain getPlayerMainCardinal(Minecraft mc) {
char cardinal = Character.toUpperCase(mc.player.getHorizontalFacing().toString().charAt(0));
switch (cardinal) {
case 'N':
return MathsUtils.CardinalMain.NEG_Z;
case 'S':
return MathsUtils.CardinalMain.POS_Z;
case 'E':
return MathsUtils.CardinalMain.POS_X;
case 'W':
return MathsUtils.CardinalMain.NEG_X;
default:
return null;
}
}
public enum Cardinal {
POS_Z("+Z"),
NEG_X_POS_Z("-X / +Z"),
@ -87,4 +103,17 @@ public class MathsUtils {
this.cardinalName = cardinalName;
}
}
public enum CardinalMain {
POS_Z("+Z"),
NEG_X("-X"),
NEG_Z("-Z"),
POS_X("+X");
public String cardinalName;
CardinalMain(String cardinalName) {
this.cardinalName = cardinalName;
}
}
}