fix bugs in the bedwars display module (#86)

TheKodeToad · web-flow · commit d38a4ea8274a · 2023-07-20T17:56:32.000+01:00
diff --git a/1.16.5/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java b/1.16.5/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java
@@ -123,10 +123,14 @@ public Text getBottomBarText() {
 	}
 
 	private String calculateTopBarText() {
-		return getFormattedTime()+"\n"+
-			"K: "+me.getStats().getGameKills()+
-			" D: "+me.getStats().getGameDeaths()+
-			" B: "+me.getStats().getGameBedsBroken();
+		String topBar = getFormattedTime();
+		if(me.getStats() != null){
+			topBar += "\n"+
+				"K: "+me.getStats().getGameKills()+
+				" D: "+me.getStats().getGameDeaths()+
+				" B: "+me.getStats().getGameBedsBroken();
+		}
+		return topBar;
 	}
 
 	private String calculateBottomBarText() {
diff --git a/1.16.5/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java b/1.16.5/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java
@@ -162,8 +162,8 @@ public void tick() {
 			waiting = false;
 			if (currentGame.isStarted()) {
 				// Trigger setting the header
-				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 				currentGame.tick();
+				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 			} else {
 				if (checkReady()) {
 					currentGame.onStart();
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java
@@ -123,10 +123,14 @@ public Text getBottomBarText() {
 	}
 
 	private String calculateTopBarText() {
-		return getFormattedTime()+"\n"+
-			"K: "+me.getStats().getGameKills()+
-			" D: "+me.getStats().getGameDeaths()+
-			" B: "+me.getStats().getGameBedsBroken();
+		String topBar = getFormattedTime();
+		if(me.getStats() != null){
+			topBar += "\n"+
+				"K: "+me.getStats().getGameKills()+
+				" D: "+me.getStats().getGameDeaths()+
+				" B: "+me.getStats().getGameBedsBroken();
+		}
+		return topBar;
 	}
 
 	private String calculateBottomBarText() {
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java
@@ -163,8 +163,8 @@ public void tick() {
 			waiting = false;
 			if (currentGame.isStarted()) {
 				// Trigger setting the header
-				MinecraftClient.getInstance().inGameHud.getPlayerListWidget().setHeader(null);
 				currentGame.tick();
+				MinecraftClient.getInstance().inGameHud.getPlayerListWidget().setHeader(null);
 			} else {
 				if (checkReady()) {
 					currentGame.onStart();
diff --git a/1.19.2/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java b/1.19.2/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java
@@ -123,10 +123,14 @@ public Text getBottomBarText() {
 	}
 
 	private String calculateTopBarText() {
-		return getFormattedTime()+"\n"+
-			"K: "+me.getStats().getGameKills()+
-			" D: "+me.getStats().getGameDeaths()+
-			" B: "+me.getStats().getGameBedsBroken();
+		String topBar = getFormattedTime();
+		if(me.getStats() != null){
+			topBar += "\n"+
+				"K: "+me.getStats().getGameKills()+
+				" D: "+me.getStats().getGameDeaths()+
+				" B: "+me.getStats().getGameBedsBroken();
+		}
+		return topBar;
 	}
 
 	private String calculateBottomBarText() {
diff --git a/1.19.2/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java b/1.19.2/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java
@@ -161,8 +161,8 @@ public void tick() {
 			waiting = false;
 			if (currentGame.isStarted()) {
 				// Trigger setting the header
-				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 				currentGame.tick();
+				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 			} else {
 				if (checkReady()) {
 					currentGame.onStart();
diff --git a/1.19.3/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java b/1.19.3/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java
@@ -123,10 +123,14 @@ public Text getBottomBarText() {
 	}
 
 	private String calculateTopBarText() {
-		return getFormattedTime()+"\n"+
-			"K: "+me.getStats().getGameKills()+
-			" D: "+me.getStats().getGameDeaths()+
-			" B: "+me.getStats().getGameBedsBroken();
+		String topBar = getFormattedTime();
+		if(me.getStats() != null){
+			topBar += "\n"+
+				"K: "+me.getStats().getGameKills()+
+				" D: "+me.getStats().getGameDeaths()+
+				" B: "+me.getStats().getGameBedsBroken();
+		}
+		return topBar;
 	}
 
 	private String calculateBottomBarText() {
diff --git a/1.19.3/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java b/1.19.3/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java
@@ -161,8 +161,8 @@ public void tick() {
 			waiting = false;
 			if (currentGame.isStarted()) {
 				// Trigger setting the header
-				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 				currentGame.tick();
+				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 			} else {
 				if (checkReady()) {
 					currentGame.onStart();
diff --git a/1.19.4/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java b/1.19.4/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java
@@ -122,10 +122,14 @@ public Text getBottomBarText() {
 	}
 
 	private String calculateTopBarText() {
-		return getFormattedTime()+"\n"+
-			"K: "+me.getStats().getGameKills()+
-			" D: "+me.getStats().getGameDeaths()+
-			" B: "+me.getStats().getGameBedsBroken();
+		String topBar = getFormattedTime();
+		if(me.getStats() != null){
+			topBar += "\n"+
+				"K: "+me.getStats().getGameKills()+
+				" D: "+me.getStats().getGameDeaths()+
+				" B: "+me.getStats().getGameBedsBroken();
+		}
+		return topBar;
 	}
 
 	private String calculateBottomBarText() {
diff --git a/1.19.4/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java b/1.19.4/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java
@@ -161,8 +161,8 @@ public void tick() {
 			waiting = false;
 			if (currentGame.isStarted()) {
 				// Trigger setting the header
-				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 				currentGame.tick();
+				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 			} else {
 				if (checkReady()) {
 					currentGame.onStart();
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java b/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java
@@ -122,10 +122,14 @@ public Text getBottomBarText() {
 	}
 
 	private String calculateTopBarText() {
-		return getFormattedTime()+"\n"+
-			"K: "+me.getStats().getGameKills()+
-			" D: "+me.getStats().getGameDeaths()+
-			" B: "+me.getStats().getGameBedsBroken();
+		String topBar = getFormattedTime();
+		if(me.getStats() != null){
+			topBar += "\n"+
+				"K: "+me.getStats().getGameKills()+
+				" D: "+me.getStats().getGameDeaths()+
+				" B: "+me.getStats().getGameBedsBroken();
+		}
+		return topBar;
 	}
 
 	private String calculateBottomBarText() {
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java b/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java
@@ -162,8 +162,8 @@ public void tick() {
 			waiting = false;
 			if (currentGame.isStarted()) {
 				// Trigger setting the header
-				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 				currentGame.tick();
+				MinecraftClient.getInstance().inGameHud.getPlayerListHud().setHeader(null);
 			} else {
 				if (checkReady()) {
 					currentGame.onStart();
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java
@@ -122,10 +122,14 @@ public Text getBottomBarText() {
 	}
 
 	private String calculateTopBarText() {
-		return getFormattedTime()+"\n"+
-			"K: "+me.getStats().getGameKills()+
-			" D: "+me.getStats().getGameDeaths()+
-			" B: "+me.getStats().getGameBedsBroken();
+		String topBar = getFormattedTime();
+		if(me.getStats() != null){
+			topBar += "\n"+
+				"K: "+me.getStats().getGameKills()+
+				" D: "+me.getStats().getGameDeaths()+
+				" B: "+me.getStats().getGameBedsBroken();
+		}
+		return topBar;
 	}
 
 	private String calculateBottomBarText() {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsMod.java
@@ -161,8 +161,8 @@ public void tick() {
 			waiting = false;
 			if (currentGame.isStarted()) {
 				// Trigger setting the header
-				MinecraftClient.getInstance().inGameHud.getPlayerListWidget().setHeader(null);
 				currentGame.tick();
+				MinecraftClient.getInstance().inGameHud.getPlayerListWidget().setHeader(null);
 			} else {
 				if (checkReady()) {
 					currentGame.onStart();
diff --git a/common/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelAbstractionLayer.java b/common/src/main/java/io/github/axolotlclient/modules/hypixel/HypixelAbstractionLayer.java
@@ -51,6 +51,7 @@
 public class HypixelAbstractionLayer {
 
 	private static final HashMap<String, CompletableFuture<PlayerReply>> cachedPlayerData = new HashMap<>();
+	private static final HashMap<String, Integer> tempValues = new HashMap<>();
 	private static final AtomicInteger hypixelApiCalls = new AtomicInteger(0);
 	private static Supplier<String> keySupplier;
 	private static HypixelAPI api;
@@ -79,23 +80,25 @@ public static int getPlayerLevel(String uuid, String mode) {
 		if (loadPlayerDataIfAbsent(uuid)) {
 			PlayerReply.Player player = getPlayer(uuid);
 			if (player != null) {
+				int value = -1;
 				if (Objects.equals(mode, LevelHeadMode.NETWORK.toString())) {
-					return (int) player.getNetworkLevel();
+					value = (int) player.getNetworkLevel();
 				} else if (Objects.equals(mode, LevelHeadMode.BEDWARS.toString())) {
-					int level = player.getIntProperty("achievements.bedwars_level", -1);
-					if(level != -1){
-						return level;
-					}
+					value = player.getIntProperty("achievements.bedwars_level", -1);
 				} else if (Objects.equals(mode, LevelHeadMode.SKYWARS.toString())) {
 					int exp = player
 						.getIntProperty("stats.SkyWars.skywars_experience", -1);
 					if(exp != -1) {
-						return Math.round(ExpCalculator.getLevelForExp(exp));
+						value = Math.round(ExpCalculator.getLevelForExp(exp));
 					}
 				}
+				if(value > -1){
+					tempValues.remove(uuid);
+					return value;
+				}
 			}
 		}
-		return (int) (new Random().nextGaussian()+150*30);
+		return tempValues.computeIfAbsent(uuid, s -> (int) (new Random().nextGaussian()*30+150));
 	}
 
 	private static PlayerReply.Player getPlayer(String uuid) {
diff --git a/common/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsPlayerStats.java b/common/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsPlayerStats.java
@@ -78,21 +78,25 @@ public static BedwarsPlayerStats generateFake(String name) {
 		int star = (int) getGaussian(random, 150, 30);
 		double fkdr = Math.min(getGaussian(random, 1.3F, 0.5F), 0.6F);
 		double bblr = (fkdr * 8) / getGaussian(random, 10, 2);
-		int wins = (int) (star * (fkdr * 4) * random.nextFloat(0.95F, 1.05F));
-		int losses = (int) (wins * (2/fkdr) * random.nextFloat(0.95F, 1.05F));
+		int wins = (int) (star * (fkdr * 4) * getFloat(random, 0.95F, 1.05F));
+		int losses = (int) (wins * (2/fkdr) * getFloat(random, 0.95F, 1.05F));
 		int beds = (int) (bblr * losses);
-		int finalDeaths = (int) (losses * random.nextFloat(1F, 1.03F));
-		int deaths = (int) (finalDeaths * random.nextFloat(8, 20));
+		int finalDeaths = (int) (losses * getFloat(random, 1F, 1.03F));
+		int deaths = (int) (finalDeaths * getFloat(random, 8, 20));
 		int finalKills = (int) (deaths * fkdr);
-		int kills = (int) (finalKills * random.nextFloat(1, 2));
+		int kills = (int) (finalKills * getFloat(random, 1, 2));
 
 		return new BedwarsPlayerStats(finalKills, finalDeaths, beds, deaths, kills,
 			0, 0, 0, 0, 0,
 			losses, wins, 0, star);
 	}
 
 	private static double getGaussian(Random random, float mean, float deviation){
-		return Math.max(Math.min(random.nextGaussian()+mean*deviation, mean - deviation*3), mean + deviation*3);
+		return Math.max(Math.min(random.nextGaussian()*deviation+mean, mean - deviation*3), mean + deviation*3);
+	}
+
+	private static float getFloat(Random random, float origin, float bound){
+		return random.nextFloat()*(bound - origin)+origin;
 	}
 
 	@Nullable
