Katting (#447)

Co-authored-by: nea <romangraef@gmail.com>
Co-authored-by: nea <roman.graef@gmail.com>
Co-authored-by: nea <nea@nea.moe>
Co-authored-by: nea <romangraef@loves.dicksinhisan.us>
Co-authored-by: nea <roman.graef@grb-online.net>
Co-authored-by: nea <hello@nea89.moe>
Co-authored-by: nea <roman.graef@stud.tu-darmstadt.de>

2 files changed, 26 insertions, 21 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiItemRecipe.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiItemRecipe.java
index cc9f36fa..e4b4269d 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiItemRecipe.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiItemRecipe.java
@@ -28,6 +28,7 @@ import io.github.moulberry.notenoughupdates.recipes.RecipeHistory;
 import io.github.moulberry.notenoughupdates.recipes.RecipeSlot;
 import io.github.moulberry.notenoughupdates.recipes.RecipeType;
 import io.github.moulberry.notenoughupdates.util.Utils;
+import lombok.var;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
@@ -314,7 +315,7 @@ public class GuiItemRecipe extends GuiScreen {
 				TAB_SIZE_X,
 				TAB_SIZE_Y
 			)) {
-				changeRecipe(i, currentIndex);
+				changeRecipe(i, 0);
 				Utils.playPressSound();
 				return;
 			}
@@ -336,6 +337,16 @@ public class GuiItemRecipe extends GuiScreen {
 		currentRecipe.mouseClicked(this, mouseX, mouseY, mouseButton);
 	}
 
+	@Override
+	public void handleMouseInput() throws IOException {
+		super.handleMouseInput();
+		ScaledResolution scaledResolution = Utils.peekGuiScale();
+		int mouseX = Mouse.getX() * scaledResolution.getScaledWidth() / Minecraft.getMinecraft().displayWidth;
+		int mouseY = scaledResolution.getScaledHeight() -
+			Mouse.getY() * scaledResolution.getScaledHeight() / Minecraft.getMinecraft().displayHeight - 1;
+		getCurrentRecipe().genericMouseInput(mouseX, mouseY);
+	}
+
 	public void arrowKeyboardInput() {
 		ArrowPagesUtils.onPageSwitchKey(currentIndex, getCurrentRecipeList().size(), pageChange ->
 			changeRecipe(currentTab, pageChange));
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/KatSitterOverlay.java b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/KatSitterOverlay.java
index 62aba35b..288c3926 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/KatSitterOverlay.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/KatSitterOverlay.java
@@ -21,8 +21,9 @@ package io.github.moulberry.notenoughupdates.miscgui;
 
 import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
+import io.github.moulberry.notenoughupdates.miscfeatures.PetInfoOverlay;
 import io.github.moulberry.notenoughupdates.mixins.AccessorGuiContainer;
-import io.github.moulberry.notenoughupdates.profileviewer.GuiProfileViewer;
+import io.github.moulberry.notenoughupdates.util.PetLeveling;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -63,14 +64,21 @@ public class KatSitterOverlay {
 		if (petInfo == null || !petInfo.has("exp") || !petInfo.has("tier") || !petInfo.has("type")) return;
 		String petId = petInfo.get("type").getAsString();
 		double xp = petInfo.get("exp").getAsDouble();
-		String rarity = petInfo.get("tier").getAsString();
+		PetInfoOverlay.Rarity rarity = PetInfoOverlay.Rarity.valueOf(petInfo.get("tier").getAsString());
 		Slot katSlot = container.getSlot(22);
-		String upgradedRarity = nextRarity(rarity);
+		PetInfoOverlay.Rarity upgradedRarity = rarity.nextRarity();
 		boolean nextRarityPresent = katSlot.getStack() != null && katSlot.getStack().getItem() != Item.getItemFromBlock(
 			Blocks.barrier) && upgradedRarity != null;
 		renderPetInformation(
-			(int) GuiProfileViewer.getPetLevel(petId, rarity, (float) xp).level,
-			nextRarityPresent ? (int) GuiProfileViewer.getPetLevel(petId, upgradedRarity, (float) xp).level : null,
+			PetLeveling
+				.getPetLevelingForPet(petId, rarity)
+				.getPetLevel(xp)
+				.getCurrentLevel(),
+			nextRarityPresent ?
+				PetLeveling
+					.getPetLevelingForPet(petId, rarity)
+					.getPetLevel(xp)
+					.getCurrentLevel() : null,
 			gui
 		);
 	}
@@ -100,20 +108,6 @@ public class KatSitterOverlay {
 			);
 	}
 
-	public String nextRarity(String currentRarity) {
-		switch (currentRarity.intern()) {
-			case "COMMON":
-				return "UNCOMMON";
-			case "UNCOMMON":
-				return "RARE";
-			case "RARE":
-				return "EPIC";
-			case "EPIC":
-				return "LEGENDARY";
-			case "LEGENDARY":
-				return "MYTHIC";
-		}
-		return null;
-	}
+
 
 }