From a34aa48d25d90ecc98081e289bcc3362abb21aa9 Mon Sep 17 00:00:00 2001 From: Yasin Date: Sun, 10 Sep 2023 21:11:33 +0200 Subject: add missing items to rei/emi --- .../me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java | 1 + .../skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java | 1 + .../java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java | 4 ++++ 3 files changed, 6 insertions(+) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java b/src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java index 526ac885..b2e163ac 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java @@ -22,6 +22,7 @@ public class SkyblockerEMIPlugin implements EmiPlugin { @Override public void register(EmiRegistry registry) { ItemRegistry.getRecipeResultsStream().map(EmiStack::of).forEach(registry::addEmiStack); + ItemRegistry.getItemsStream().map(EmiStack::of).forEach(registry::addEmiStack); registry.addCategory(SKYBLOCK); registry.addWorkstation(SKYBLOCK, EmiStack.of(Items.CRAFTING_TABLE)); ItemRegistry.getRecipesStream().map(SkyblockEmiRecipe::new).forEach(registry::addRecipe); diff --git a/src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java b/src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java index 5c97a274..ce728072 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java @@ -30,5 +30,6 @@ public class SkyblockerREIClientPlugin implements REIClientPlugin { @Override public void registerEntries(EntryRegistry entryRegistry) { entryRegistry.addEntries(ItemRegistry.getRecipeResultsStream().map(EntryStacks::of).toList()); + entryRegistry.addEntries(ItemRegistry.getItemsStream().map(EntryStacks::of).toList()); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java index a4b566e8..9b4fa166 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java @@ -114,6 +114,10 @@ public class ItemRegistry { return recipes.stream().map(SkyblockCraftingRecipe::getResult); } + public static Stream getItemsStream() { + return items.stream(); + } + /** * Get Internal name of an ItemStack * -- cgit From 367444333aed57855e7a65e6898a26e973bb153f Mon Sep 17 00:00:00 2001 From: Yasin Date: Sun, 10 Sep 2023 22:10:19 +0200 Subject: remove ItemRegistry.getRecipeResultsStream part reciperesult isnt needed anymore --- .../me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java | 1 - .../xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java | 1 - 2 files changed, 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java b/src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java index b2e163ac..1df75de0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/compatibility/emi/SkyblockerEMIPlugin.java @@ -21,7 +21,6 @@ public class SkyblockerEMIPlugin implements EmiPlugin { @Override public void register(EmiRegistry registry) { - ItemRegistry.getRecipeResultsStream().map(EmiStack::of).forEach(registry::addEmiStack); ItemRegistry.getItemsStream().map(EmiStack::of).forEach(registry::addEmiStack); registry.addCategory(SKYBLOCK); registry.addWorkstation(SKYBLOCK, EmiStack.of(Items.CRAFTING_TABLE)); diff --git a/src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java b/src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java index ce728072..32f0bd85 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/compatibility/rei/SkyblockerREIClientPlugin.java @@ -29,7 +29,6 @@ public class SkyblockerREIClientPlugin implements REIClientPlugin { @Override public void registerEntries(EntryRegistry entryRegistry) { - entryRegistry.addEntries(ItemRegistry.getRecipeResultsStream().map(EntryStacks::of).toList()); entryRegistry.addEntries(ItemRegistry.getItemsStream().map(EntryStacks::of).toList()); } } -- cgit From 0a60278fc03c71ed1b58f74eeecc27c5bc92a595 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 17 Sep 2023 11:47:16 -0400 Subject: Fix missing head textures (most of them) --- .../xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java index d420d54f..6884c7c1 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java @@ -61,11 +61,12 @@ public class ItemStackBuilder { String nbttag = obj.get("nbttag").getAsString(); // add skull texture - Matcher skullMatcher = Pattern.compile("SkullOwner:\\{Id:\"(.{36})\",Properties:\\{textures:\\[0:\\{Value:\"(.+)\"}]}}").matcher(nbttag); - if (skullMatcher.find()) { + Matcher skullUuid = Pattern.compile("(?:(?<=SkullOwner:\\{)Id:\"(.{36})\")").matcher(nbttag); + Matcher skullTexture = Pattern.compile("(?:(?<=Properties:\\{textures:\\[0:\\{Value:)\"(.+?)\")").matcher(nbttag); + if (skullUuid.find() && skullTexture.find()) { NbtCompound skullOwner = new NbtCompound(); tag.put("SkullOwner", skullOwner); - UUID uuid = UUID.fromString(skullMatcher.group(1)); + UUID uuid = UUID.fromString(skullUuid.group(1)); skullOwner.put("Id", NbtHelper.fromUuid(uuid)); skullOwner.put("Name", NbtString.of(internalName)); @@ -75,7 +76,7 @@ public class ItemStackBuilder { properties.put("textures", textures); NbtCompound texture = new NbtCompound(); textures.add(texture); - texture.put("Value", NbtString.of(skullMatcher.group(2))); + texture.put("Value", NbtString.of(skullTexture.group(1))); } // add leather armor dye color Matcher colorMatcher = Pattern.compile("color:(\\d+)").matcher(nbttag); -- cgit From 815d9079d91da71480978bbb7079077df20200e3 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sun, 17 Sep 2023 21:26:03 -0400 Subject: Refactor ItemRegistry --- .../skyblocker/skyblock/itemlist/ItemRegistry.java | 15 ++++++++------- .../skyblocker/skyblock/itemlist/ItemStackBuilder.java | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'src/main') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java index 9b4fa166..c0685ec7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java @@ -7,6 +7,8 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.text.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; @@ -19,6 +21,7 @@ import java.util.Map; import java.util.stream.Stream; public class ItemRegistry { + protected static final Logger LOGGER = LoggerFactory.getLogger(ItemRegistry.class); protected static final Path ITEM_LIST_DIR = NEURepo.LOCAL_REPO_DIR.resolve("items"); protected static final List items = new ArrayList<>(); @@ -46,7 +49,7 @@ public class ItemRegistry { String fileContent = Files.readString(path); jsonObjs.add(JsonParser.parseString(fileContent).getAsJsonObject()); } catch (Exception e) { - e.printStackTrace(); + LOGGER.error("Failed to read file " + path, e); } } @@ -87,8 +90,10 @@ public class ItemRegistry { return fileJson.get("info").getAsJsonArray().get(0).getAsString(); } } catch (IOException | NullPointerException e) { - e.printStackTrace(); - client.player.sendMessage(Text.of("Can't locate a wiki article for this item..."), false); + LOGGER.error("Failed to read item file " + internalName + ".json", e); + if (client.player != null) { + client.player.sendMessage(Text.of("Can't locate a wiki article for this item..."), false); + } return null; } } @@ -110,10 +115,6 @@ public class ItemRegistry { return recipes.stream(); } - public static Stream getRecipeResultsStream() { - return recipes.stream().map(SkyblockCraftingRecipe::getResult); - } - public static Stream getItemsStream() { return items.stream(); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java index 6884c7c1..e74c145d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemStackBuilder.java @@ -24,7 +24,7 @@ public class ItemStackBuilder { try { petNums = JsonParser.parseString(Files.readString(PETNUMS_PATH)).getAsJsonObject(); } catch (Exception e) { - e.printStackTrace(); + ItemRegistry.LOGGER.error("Failed to load petnums.json"); } } @@ -61,8 +61,8 @@ public class ItemStackBuilder { String nbttag = obj.get("nbttag").getAsString(); // add skull texture - Matcher skullUuid = Pattern.compile("(?:(?<=SkullOwner:\\{)Id:\"(.{36})\")").matcher(nbttag); - Matcher skullTexture = Pattern.compile("(?:(?<=Properties:\\{textures:\\[0:\\{Value:)\"(.+?)\")").matcher(nbttag); + Matcher skullUuid = Pattern.compile("(?<=SkullOwner:\\{)Id:\"(.{36})\"").matcher(nbttag); + Matcher skullTexture = Pattern.compile("(?<=Properties:\\{textures:\\[0:\\{Value:)\"(.+?)\"").matcher(nbttag); if (skullUuid.find() && skullTexture.find()) { NbtCompound skullOwner = new NbtCompound(); tag.put("SkullOwner", skullOwner); -- cgit