1.4.7: Goblin Eggs and more (#58)

* Added the new items for the bazaar to the mod. (#57) * Versioning Co-authored-by: MagicPotatoooo <[email protected]>
symt · Nov 9, 2021 · 44f644f · 44f644f
1 parent 61bcb24
commit 44f644f
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 43 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ compileJava {
     sourceCompatibility = '1.8'
     targetCompatibility = '1.8'
 }
-version = "1.4.6"
+version = "1.4.7"
 group = "dev.meyi.bn"
 archivesBaseName = "BazaarNotifier"
 

diff --git a/discord-bot/src/bazaar/bazaarConversions.json b/discord-bot/src/bazaar/bazaarConversions.json
@@ -263,44 +263,53 @@
   "RAW_SOULFLOW": "Raw Soulflow",
   "SOULFLOW": "Soulflow",
   "ABSOLUTE_ENDER_PEARL": "Absolute Ender Pearl",
-  "ROUGH_JADE_GEM": "Rough Jade Gemstone",
-  "FLAWED_JADE_GEM": "Flawed Jade Gemstone",
-  "FINE_JADE_GEM": "Fine Jade Gemstone",
-  "FLAWLESS_JADE_GEM": "Flawless Jade Gemstone",
-  "PERFECT_JADE_GEM": "Perfect Jade Gemstone",
-  "ROUGH_AMBER_GEM": "Rough Amber Gemstone",
-  "FLAWED_AMBER_GEM": "Flawed Amber Gemstone",
-  "FINE_AMBER_GEM": "Fine Amber Gemstone",
-  "FLAWLESS_AMBER_GEM": "Flawless Amber Gemstone",
-  "PERFECT_AMBER_GEM": "Perfect Amber Gemstone",
-  "ROUGH_TOPAZ_GEM": "Rough Topaz Gemstone",
-  "FLAWED_TOPAZ_GEM": "Flawed Topaz Gemstone",
-  "FINE_TOPAZ_GEM": "Fine Topaz Gemstone",
-  "FLAWLESS_TOPAZ_GEM": "Flawless Topaz Gemstone",
-  "PERFECT_TOPAZ_GEM": "Perfect Topaz Gemstone",
-  "ROUGH_SAPPHIRE_GEM": "Rough Sapphire Gemstone",
-  "FLAWED_SAPPHIRE_GEM": "Flawed Sapphire Gemstone",
-  "FINE_SAPPHIRE_GEM": "Fine Sapphire Gemstone",
-  "FLAWLESS_SAPPHIRE_GEM": "Flawless Sapphire Gemstone",
-  "PERFECT_SAPPHIRE_GEM": "Perfect Sapphire Gemstone",
-  "ROUGH_AMETHYST_GEM": "Rough Amethyst Gemstone",
-  "FLAWED_AMETHYST_GEM": "Flawed Amethyst Gemstone",
-  "FINE_AMETHYST_GEM": "Fine Amethyst Gemstone",
-  "FLAWLESS_AMETHYST_GEM": "Flawless Amethyst Gemstone",
-  "PERFECT_AMETHYST_GEM": "Perfect Amethyst Gemstone",
-  "ROUGH_JASPER_GEM": "Rough Jasper Gemstone",
-  "FLAWED_JASPER_GEM": "Flawed Jasper Gemstone",
-  "FINE_JASPER_GEM": "Fine Jasper Gemstone",
-  "FLAWLESS_JASPER_GEM": "Flawless Jasper Gemstone",
-  "PERFECT_JASPER_GEM": "Perfect Jasper Gemstone",
-  "ROUGH_RUBY_GEM": "Rough Ruby Gemstone",
-  "FLAWED_RUBY_GEM": "Flawed Ruby Gemstone",
-  "FINE_RUBY_GEM": "Fine Ruby Gemstone",
-  "FLAWLESS_RUBY_GEM": "Flawless Ruby Gemstone",
-  "PERFECT_RUBY_GEM": "Perfect Ruby Gemstone",
+  "ROUGH_JADE_GEM": "\u2618 Rough Jade Gemstone",
+  "FLAWED_JADE_GEM": "\u2618 Flawed Jade Gemstone",
+  "FINE_JADE_GEM": "\u2618 Fine Jade Gemstone",
+  "FLAWLESS_JADE_GEM": "\u2618 Flawless Jade Gemstone",
+  "PERFECT_JADE_GEM": "\u2618 Perfect Jade Gemstone",
+  "ROUGH_AMBER_GEM": "\u2E15 Rough Amber Gemstone",
+  "FLAWED_AMBER_GEM": "\u2E15 Flawed Amber Gemstone",
+  "FINE_AMBER_GEM": "\u2E15 Fine Amber Gemstone",
+  "FLAWLESS_AMBER_GEM": "\u2E15 Flawless Amber Gemstone",
+  "PERFECT_AMBER_GEM": "\u2E15 Perfect Amber Gemstone",
+  "ROUGH_TOPAZ_GEM": "\u2727 Rough Topaz Gemstone",
+  "FLAWED_TOPAZ_GEM": "\u2727 Flawed Topaz Gemstone",
+  "FINE_TOPAZ_GEM": "\u2727 Fine Topaz Gemstone",
+  "FLAWLESS_TOPAZ_GEM": "\u2727 Flawless Topaz Gemstone",
+  "PERFECT_TOPAZ_GEM": "\u2727 Perfect Topaz Gemstone",
+  "ROUGH_SAPPHIRE_GEM": "\u270E Rough Sapphire Gemstone",
+  "FLAWED_SAPPHIRE_GEM": "\u270E Flawed Sapphire Gemstone",
+  "FINE_SAPPHIRE_GEM": "\u270E Fine Sapphire Gemstone",
+  "FLAWLESS_SAPPHIRE_GEM": "\u270E Flawless Sapphire Gemstone",
+  "PERFECT_SAPPHIRE_GEM": "\u270E Perfect Sapphire Gemstone",
+  "ROUGH_AMETHYST_GEM": "\u2748 Rough Amethyst Gemstone",
+  "FLAWED_AMETHYST_GEM": "\u2748 Flawed Amethyst Gemstone",
+  "FINE_AMETHYST_GEM": "\u2748 Fine Amethyst Gemstone",
+  "FLAWLESS_AMETHYST_GEM": "\u2748 Flawless Amethyst Gemstone",
+  "PERFECT_AMETHYST_GEM": "\u2748 Perfect Amethyst Gemstone",
+  "ROUGH_JASPER_GEM": "\u2741 Rough Jasper Gemstone",
+  "FLAWED_JASPER_GEM": "\u2741 Flawed Jasper Gemstone",
+  "FINE_JASPER_GEM": "\u2741 Fine Jasper Gemstone",
+  "FLAWLESS_JASPER_GEM": "\u2741 Flawless Jasper Gemstone",
+  "PERFECT_JASPER_GEM": "\u2741 Perfect Jasper Gemstone",
+  "ROUGH_RUBY_GEM": "\u2764 Rough Ruby Gemstone",
+  "FLAWED_RUBY_GEM": "\u2764 Flawed Ruby Gemstone",
+  "FINE_RUBY_GEM": "\u2764 Fine Ruby Gemstone",
+  "FLAWLESS_RUBY_GEM": "\u2764 Flawless Ruby Gemstone",
+  "PERFECT_RUBY_GEM": "\u2764 Perfect Ruby Gemstone",
   "HARD_STONE": "Hard Stone",
   "ENCHANTED_HARD_STONE": "Enchanted Hard Stone",
   "CONCENTRATED_STONE": "Concentrated Stone",
   "YOGGIE": "Yoggie",
-  "SLUDGE_JUICE": "Sludge Juice"
+  "SLUDGE_JUICE": "Sludge Juice",
+  "WORM_MEMBRANE": "Worm Membrane",
+  "GOBLIN_EGG_GREEN": "Green Goblin Egg",
+  "GOBLIN_EGG_BLUE": "Blue Goblin Egg",
+  "GOBLIN_EGG_RED": "Red Goblin Egg",
+  "GOBLIN_EGG_YELLOW": "Yellow Goblin Egg",
+  "GOBLIN_EGG": "Goblin Egg",
+  "ARACHNE_KEEPER_FRAGMENT": "Arachne's Keeper Fragment",
+  "SOUL_STRING": "Soul String",
+  "CHEESE_FUEL": "Cheese"
 }
diff --git a/src/main/java/dev/meyi/bn/BazaarNotifier.java b/src/main/java/dev/meyi/bn/BazaarNotifier.java
@@ -28,7 +28,7 @@
 public class BazaarNotifier {
 
   public static final String MODID = "BazaarNotifier";
-  public static final String VERSION = "1.4.6";
+  public static final String VERSION = "1.4.7";
   public static final String prefix =
       EnumChatFormatting.GOLD + "[" + EnumChatFormatting.YELLOW + "BN" + EnumChatFormatting.GOLD + "] " + EnumChatFormatting.RESET;
   public static String apiKey = "";

diff --git a/src/main/java/dev/meyi/bn/handlers/EventHandler.java b/src/main/java/dev/meyi/bn/handlers/EventHandler.java
@@ -103,8 +103,9 @@ public void bazaarChatHandler(ClientChatReceivedEvent e) {
         }
       }
     } else if (message.startsWith("Bazaar! Claimed ")) {
-      ChestTickHandler.updateBazaarOrders(
-          ((GuiChest) Minecraft.getMinecraft().currentScreen).lowerChestInventory);
+      ChestTickHandler.lastScreenDisplayName = ""; // Force update on next tick
+      // ChestTickHandler.updateBazaarOrders(
+      //    ((GuiChest) Minecraft.getMinecraft().currentScreen).lowerChestInventory);
     }
   }
 

diff --git a/src/main/resources/bazaarConversions.json b/src/main/resources/bazaarConversions.json
@@ -302,5 +302,14 @@
   "ENCHANTED_HARD_STONE": "Enchanted Hard Stone",
   "CONCENTRATED_STONE": "Concentrated Stone",
   "YOGGIE": "Yoggie",
-  "SLUDGE_JUICE": "Sludge Juice"
-}
+  "SLUDGE_JUICE": "Sludge Juice",
+  "WORM_MEMBRANE": "Worm Membrane",
+  "GOBLIN_EGG_GREEN": "Green Goblin Egg",
+  "GOBLIN_EGG_BLUE": "Blue Goblin Egg",
+  "GOBLIN_EGG_RED": "Red Goblin Egg",
+  "GOBLIN_EGG_YELLOW": "Yellow Goblin Egg",
+  "GOBLIN_EGG": "Goblin Egg",
+  "ARACHNE_KEEPER_FRAGMENT": "Arachne's Keeper Fragment",
+  "SOUL_STRING": "Soul String",
+  "CHEESE_FUEL": "Cheese"
+}
diff --git a/src/main/resources/bazaarConversionsReversed.json b/src/main/resources/bazaarConversionsReversed.json
@@ -301,5 +301,14 @@
   "Enchanted Hard Stone": "ENCHANTED_HARD_STONE",
   "Concentrated Stone": "CONCENTRATED_STONE",
   "Yoggie": "YOGGIE",
-  "Sludge Juice": "SLUDGE_JUICE"
+  "Sludge Juice": "SLUDGE_JUICE",
+  "Worm Membrane": "WORM_MEMBRANE",
+  "Green Goblin Egg": "GOBLIN_EGG_GREEN",
+  "Blue Goblin Egg": "GOBLIN_EGG_BLUE",
+  "Red Goblin Egg": "GOBLIN_EGG_RED",
+  "Yellow Goblin Egg": "GOBLIN_EGG_YELLOW",
+  "Goblin Egg": "GOBLIN_EGG",
+  "Arachne's Keeper Fragment": "ARACHNE_KEEPER_FRAGMENT",
+  "Soul String": "SOUL_STRING",
+  "Cheese": "CHEESE_FUEL"
 }