enchanting book name remapping (#237)

* enchanting book name remapping
(omg remapping, minecraft obfuscation reference)

* Fix gui resetting

2 files changed, 14 insertions, 2 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
index 3fc34d10..c3999fb6 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/auction/APIManager.java
@@ -59,6 +59,8 @@ import java.util.TreeMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Consumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class APIManager {
 	private final NEUManager manager;
@@ -702,6 +704,16 @@ public class APIManager {
 		);
 	}
 
+	private static final Pattern BAZAAR_ENCHANTMENT_PATTERN = Pattern.compile("ENCHANTMENT_(\\D*)_(\\d+)");
+
+	public String transformHypixelBazaarToNEUItemId(String hypixelId) {
+		Matcher matcher = BAZAAR_ENCHANTMENT_PATTERN.matcher(hypixelId);
+		if (matcher.matches()) {
+			return matcher.group(1) + ";" + matcher.group(2);
+		}
+		return hypixelId.replace(":", "-");
+	}
+
 	public void updateBazaar() {
 		manager.hypixelApi.getHypixelApiAsync(
 			NotEnoughUpdates.INSTANCE.config.apiData.apiKey,
@@ -738,7 +750,7 @@ public class APIManager {
 							}
 						}
 
-						bazaarJson.add(entry.getKey().replace(":", "-"), productInfo);
+						bazaarJson.add(transformHypixelBazaarToNEUItemId(entry.getKey()), productInfo);
 					}
 				}
 				GuiPriceGraph.addToCache(bazaarJson, true);
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 69343e99..e06c271f 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiItemRecipe.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscgui/GuiItemRecipe.java
@@ -89,13 +89,13 @@ public class GuiItemRecipe extends GuiScreen {
 			if (!tabs.contains(recipe.getType()))
 				tabs.add(recipe.getType());
 		}
+		changeRecipe(0, 0);
 	}
 
 	@Override
 	public void initGui() {
 		this.guiLeft = (width - this.xSize) / 2;
 		this.guiTop = (height - this.ySize) / 2;
-		changeRecipe(0, 0);
 	}
 
 	public NeuRecipe getCurrentRecipe() {