Added Rift Tab Hud + 1 Rift related fix

3 files changed, 70 insertions, 0 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
index 2ed15f27..6d06c637 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/Screen.java
@@ -6,6 +6,7 @@ import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.TabHud;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.genericInfo.GardenInfoScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.genericInfo.GenericInfoScreen;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.genericInfo.GenericRiftInfoScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main.CrimsonIsleScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main.DungeonHubScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main.DungeonScreen;
@@ -17,6 +18,7 @@ import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main.HomeServerScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main.HubServerScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main.MineServerScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main.ParkServerScreen;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main.RiftScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.playerList.DungeonPlayerScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.playerList.GuestPlayerScreen;
 import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.playerList.HomePlayerScreen;
@@ -51,6 +53,7 @@ public class Screen {
     private static Screen correctGenericScrn(int w, int h, Text footer) {
         return switch (PlayerLocator.getPlayerLocation()) {
             case GARDEN -> new GardenInfoScreen(w, h, footer); // ok
+            case THE_RIFT -> new GenericRiftInfoScreen(w, h, footer);
             case UNKNOWN -> new EmptyScreen(w, h, footer); // ok
             default -> new GenericInfoScreen(w, h, footer); // ok
         };
@@ -78,6 +81,7 @@ public class Screen {
             case DUNGEON -> new DungeonScreen(w, h, footer); // ok
             case CRIMSON_ISLE -> new CrimsonIsleScreen(w, h, footer);
             case GARDEN -> new GardenScreen(w, h, footer); // ok
+            case THE_RIFT -> new RiftScreen(w, h, footer);
             case UNKNOWN -> new EmptyScreen(w, h, footer); // ok
             default -> new GenericServerScreen(w, h, footer); // ok
         };
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericRiftInfoScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericRiftInfoScreen.java
new file mode 100644
index 00000000..9821b5a3
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/genericInfo/GenericRiftInfoScreen.java
@@ -0,0 +1,38 @@
+package me.xmrvizzy.skyblocker.skyblock.tabhud.screens.genericInfo;
+
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.Screen;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.rift.RiftProfileWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.rift.RiftStatsWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.rift.ShenWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.CookieWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.rift.AdvertisementWidget;
+import net.minecraft.text.Text;
+
+public class GenericRiftInfoScreen extends Screen {
+
+	public GenericRiftInfoScreen(int w, int h, Text footer) {
+		super(w, h);
+		
+		String f = footer.getString();
+		
+		RiftProfileWidget profile = new RiftProfileWidget();
+		RiftStatsWidget stats = new RiftStatsWidget();
+		ShenWidget shen = new ShenWidget();
+		
+		CookieWidget cookie = new CookieWidget(f);
+		AdvertisementWidget advertisement = new AdvertisementWidget();
+		
+		this.stackWidgetsH(stats, advertisement);
+		this.stackWidgetsH(profile, shen, cookie);
+
+		this.offCenterL(stats);
+		this.offCenterL(advertisement);
+		
+		this.offCenterR(profile);
+		this.offCenterR(shen);
+		this.offCenterR(cookie);
+		
+		this.addWidgets(profile, stats, shen, cookie, advertisement);
+	}
+
+}
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/RiftScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/RiftScreen.java
new file mode 100644
index 00000000..d63bcf62
--- /dev/null
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/screens/main/RiftScreen.java
@@ -0,0 +1,28 @@
+package me.xmrvizzy.skyblocker.skyblock.tabhud.screens.main;
+
+import me.xmrvizzy.skyblocker.skyblock.tabhud.screens.Screen;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.rift.RiftProgressWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.rift.GoodToKnowWidget;
+import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.rift.RiftServerInfoWidget;
+
+
+import net.minecraft.text.Text;
+
+public class RiftScreen extends Screen {
+
+	public RiftScreen(int w, int h, Text footer) {
+		super(w, h);
+		
+		RiftProgressWidget rftProg = new RiftProgressWidget();
+		GoodToKnowWidget gtk = new GoodToKnowWidget();
+		RiftServerInfoWidget si = new RiftServerInfoWidget();
+		
+		this.stackWidgetsH(si, gtk);
+		this.stackWidgetsH(rftProg);
+		this.offCenterL(si);
+		this.offCenterL(gtk);
+		this.offCenterR(rftProg);
+		this.addWidgets(si, gtk, rftProg);
+	}
+
+}