code cleanup

doej1367 · Feb 9, 2022 · 41f979c · 41f979c
1 parent 108ac34
commit 41f979c
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 61 deletions.
diff --git a/src/main/java/me/hyblockrnganalyzer/HypixelEventHandler.java b/src/main/java/me/hyblockrnganalyzer/HypixelEventHandler.java
@@ -8,12 +8,10 @@
 import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.inventory.ContainerChest;
 import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.client.event.sound.PlaySoundEvent;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -41,6 +39,10 @@ public void onChatMessageReceived(ClientChatReceivedEvent event) {
 		else if (plainText.trim().matches("Something went wrong trying to send you to that server!"
 				+ " If this keeps happening please report it! \\((mini|mega)[0-9]+[A-Z]\\)"))
 			main.getLobbyStatus().setServerChangeFailed(plainText.trim().replaceAll("\\)", "").split("\\(")[1]);
+		if (plainText.substring(1).startsWith(" ") && ((plainText.contains(" found ") && plainText
+				.contains(Minecraft.getMinecraft().thePlayer.getDisplayNameString().replaceAll("\\u00a7.", "")))
+				|| plainText.contains(" claimed ")) && plainText.endsWith(" Jerry Box!"))
+			MinecraftForge.EVENT_BUS.post(new JerryBoxOpenedEvent(plainText.trim()));
 		else if (plainText.startsWith("The Catacombs - Floor"))
 			main.getDungeonChestStatus().resetDungeonChestStatus(plainText.split("Floor ")[1], false);
 		else if (plainText.startsWith("Master Mode Catacombs - Floor "))

diff --git a/src/main/java/me/hyblockrnganalyzer/Main.java b/src/main/java/me/hyblockrnganalyzer/Main.java
@@ -8,8 +8,9 @@
 import me.hyblockrnganalyzer.eventhandler.JerryBoxEventHandler;
 import me.hyblockrnganalyzer.eventhandler.NucleusLootEventHandler;
 import me.hyblockrnganalyzer.eventhandler.TreasureChestEventHandler;
-import me.hyblockrnganalyzer.util.DungeonChestStatus;
-import me.hyblockrnganalyzer.util.LobbyStatus;
+import me.hyblockrnganalyzer.status.DungeonChestStatus;
+import me.hyblockrnganalyzer.status.JerryBoxStatus;
+import me.hyblockrnganalyzer.status.LobbyStatus;
 import me.hyblockrnganalyzer.util.TxtDatabase;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.common.MinecraftForge;
@@ -27,12 +28,14 @@ public class Main {
 	private TxtDatabase txtDatabase;
 	private LobbyStatus lobbyStatus;
 	private DungeonChestStatus dungeonChestStatus;
+	private JerryBoxStatus jerryBoxStatus;
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event) {
 		txtDatabase = new TxtDatabase(this);
 		lobbyStatus = new LobbyStatus();
 		dungeonChestStatus = new DungeonChestStatus();
+		jerryBoxStatus = new JerryBoxStatus();
 		txtDatabase.setFolder(event);
 		System.out.println("[OK] preInit Hyblock RNG Analyzer");
 	}
@@ -73,4 +76,8 @@ public LobbyStatus getLobbyStatus() {
 	public DungeonChestStatus getDungeonChestStatus() {
 		return dungeonChestStatus;
 	}
+
+	public JerryBoxStatus getJerryBoxStatus() {
+		return jerryBoxStatus;
+	}
 }
diff --git a/src/main/java/me/hyblockrnganalyzer/event/JerryBoxOpenedEvent.java b/src/main/java/me/hyblockrnganalyzer/event/JerryBoxOpenedEvent.java
@@ -3,44 +3,22 @@
 import net.minecraftforge.fml.common.eventhandler.Event;
 
 public class JerryBoxOpenedEvent extends Event {
-	private String boxType;
 	private String name;
 	private int count = 1;
 
-	public JerryBoxOpenedEvent(String boxType, String text) {
-		this.boxType = boxType;
+	public JerryBoxOpenedEvent(String text) {
 		String lootText = text.replaceAll(".* claimed ", "").replaceAll(".* found ", "")
 				.replaceAll(" from the Jerry Box!", "").replaceAll(" in a Jerry Box!", "");
 		if (lootText.matches("[0-9,]+ [a-zA-Z3\\- ]+"))
 			count = Integer.parseInt(lootText.replaceAll(" [a-zA-Z]+", "").replaceAll(",", ""));
 		name = lootText.replaceAll("[0-9,]+ ", "");
 	}
 
-	public String getBoxType() {
-		return boxType;
-	}
-
-	public int getBoxTypeNumber() {
-		if (boxType == null)
-			return -1;
-		switch (boxType.charAt(1)) {
-		case 'r':
-			return 0;
-		case 'l':
-			return 1;
-		case 'u':
-			return 2;
-		case 'o':
-			return 3;
-		}
-		return -1;
-	}
-
-	public String getName() {
+	public String getItemName() {
 		return name;
 	}
 
-	public int getCount() {
+	public int getItemCount() {
 		return count;
 	}
 

diff --git a/src/main/java/me/hyblockrnganalyzer/eventhandler/JerryBoxEventHandler.java b/src/main/java/me/hyblockrnganalyzer/eventhandler/JerryBoxEventHandler.java
@@ -3,52 +3,29 @@
 import me.hyblockrnganalyzer.Main;
 import me.hyblockrnganalyzer.event.JerryBoxOpenedEvent;
 import me.hyblockrnganalyzer.event.OpenCustomChestEvent;
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.StringUtils;
-import net.minecraftforge.client.event.ClientChatReceivedEvent;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class JerryBoxEventHandler {
-	private String fileName = "databaseJerryBoxes.txt";
 	private Main main;
+	private String fileName = "databaseJerryBoxes.txt";
 	private String jerryBoxType;
 
 	public JerryBoxEventHandler(Main main) {
 		this.main = main;
 		main.getTxtDatabase().addFileName(fileName);
 	}
 
-	@SideOnly(Side.CLIENT)
-	@SubscribeEvent
-	public void onChatMessageReceived(ClientChatReceivedEvent event) {
-		if (event.type == 2) {
-			return;
-		}
-
-		String plainText = StringUtils.stripControlCodes(event.message.getFormattedText());
-		if (plainText.length() < 3) {
-			return;
-		}
-		if (plainText.substring(1).startsWith(" ") && ((plainText.contains(" found ") && plainText
-				.contains(Minecraft.getMinecraft().thePlayer.getDisplayNameString().replaceAll("\\u00a7.", "")))
-				|| plainText.contains(" claimed ")) && plainText.endsWith(" Jerry Box!"))
-			MinecraftForge.EVENT_BUS.post(new JerryBoxOpenedEvent(jerryBoxType, plainText.trim()));
-	}
-
 	@SubscribeEvent
 	public void onOpenCustomChest(OpenCustomChestEvent event) {
 		String chestName = event.getChestTitle().getUnformattedText().replaceAll("\\u00a7.", "");
-		if (!chestName.contains("Open a Jerry Box")) {
+		if (!chestName.contains("Open a Jerry Box"))
 			return;
-		}
-
 		for (String itemName : event.getChestContentsSummary().keySet()) {
 			itemName = itemName.replaceAll("\\u00a7.", "");
 			if (itemName.endsWith("Jerry Box")) {
-				jerryBoxType = itemName.split(" ")[0];
+				main.getJerryBoxStatus().setBoxType(itemName.split(" ")[0]);
 				break;
 			}
 		}
@@ -57,8 +34,8 @@ public void onOpenCustomChest(OpenCustomChestEvent event) {
 	@SideOnly(Side.CLIENT)
 	@SubscribeEvent
 	public void onJerryBox(JerryBoxOpenedEvent event) {
-		main.getTxtDatabase().addDataset(
-				"_boxType:" + event.getBoxTypeNumber() + "," + event.getName() + ":" + event.getCount() + "\n",
-				fileName);
+		main.getTxtDatabase().addDataset("_boxType:" + main.getJerryBoxStatus().getBoxTypeNumber() + ","
+				+ event.getItemName() + ":" + event.getItemCount() + "\n", fileName);
 	}
+
 }
diff --git a/src/main/java/me/hyblockrnganalyzer/eventhandler/NucleusLootEventHandler.java b/src/main/java/me/hyblockrnganalyzer/eventhandler/NucleusLootEventHandler.java
@@ -48,7 +48,8 @@ public void run() {
 				for (Entry<String, Integer> e : event.getArmorStandContentsSummary().entrySet())
 					sb.append(e.getKey() + ":" + e.getValue() + ",");
 				main.getTxtDatabase().addDataset(sb.toString() + "\n", fileName);
-				Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("RNG Analyzer > Loot is recorded!"));
+				Minecraft.getMinecraft().thePlayer
+						.addChatMessage(new ChatComponentText("RNG Analyzer > Loot is recorded!"));
 			}
 		}.start();
 	}

diff --git a/...krnganalyzer/util/DungeonChestStatus.java → ...nganalyzer/status/DungeonChestStatus.java b/...krnganalyzer/util/DungeonChestStatus.java → ...nganalyzer/status/DungeonChestStatus.java
@@ -1,4 +1,4 @@
-package me.hyblockrnganalyzer.util;
+package me.hyblockrnganalyzer.status;
 
 public class DungeonChestStatus {
 	private int floor;

diff --git a/src/main/java/me/hyblockrnganalyzer/status/JerryBoxStatus.java b/src/main/java/me/hyblockrnganalyzer/status/JerryBoxStatus.java
@@ -0,0 +1,30 @@
+package me.hyblockrnganalyzer.status;
+
+public class JerryBoxStatus {
+	private String boxType;
+
+	public void setBoxType(String boxType) {
+		this.boxType = boxType;
+	}
+
+	public String getBoxType() {
+		return boxType;
+	}
+
+	public int getBoxTypeNumber() {
+		if (boxType == null || boxType.length() < 2)
+			return -1;
+		switch (boxType.charAt(1)) {
+		case 'r':
+			return 0;
+		case 'l':
+			return 1;
+		case 'u':
+			return 2;
+		case 'o':
+			return 3;
+		}
+		return -1;
+	}
+
+}
diff --git a/.../hyblockrnganalyzer/util/LobbyStatus.java → ...yblockrnganalyzer/status/LobbyStatus.java b/.../hyblockrnganalyzer/util/LobbyStatus.java → ...yblockrnganalyzer/status/LobbyStatus.java
@@ -1,4 +1,4 @@
-package me.hyblockrnganalyzer.util;
+package me.hyblockrnganalyzer.status;
 
 public class LobbyStatus {
 	private String oldServer;