1.7.3: Crash fix, bug fix, and better order tracking (#139)

--------- Co-authored-by: Detlev1 <[email protected]>
symt · Aug 10, 2024 · 5e86d2c · 5e86d2c
1 parent 2b3cea8
commit 5e86d2c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 group = "dev.meyi.bazaarnotifier"
-version = "1.7.2"
+version = "1.7.3"
 val mod_id = "bazaarnotifier"
 
 java {
@@ -48,7 +48,7 @@ dependencies {
     mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
     forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
     modCompileOnly("cc.polyfrost:oneconfig-1.8.9-forge:0.2.2-alpha+")
-    shade("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta+")
+    shade("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta17")
 }
 
 
@@ -131,9 +131,9 @@ tasks{
             archiveClassifier.set("")
             enabled = false
         }
-        processResources {
-            duplicatesStrategy = DuplicatesStrategy.INCLUDE
+       processResources {
+           duplicatesStrategy = DuplicatesStrategy.INCLUDE
 
-        }
+       }
     }
 }
diff --git a/src/main/java/dev/meyi/bn/BazaarNotifier.java b/src/main/java/dev/meyi/bn/BazaarNotifier.java
@@ -44,7 +44,7 @@
 public class BazaarNotifier {
 
   public static final String MODID = "BazaarNotifier";
-  public static final String VERSION = "1.7.2";
+  public static final String VERSION = "1.7.3";
   public static final String prefix =
       EnumChatFormatting.GOLD + "[" + EnumChatFormatting.YELLOW + "BN" + EnumChatFormatting.GOLD
           + "] " + EnumChatFormatting.RESET;

diff --git a/src/main/java/dev/meyi/bn/json/Order.java b/src/main/java/dev/meyi/bn/json/Order.java
@@ -14,6 +14,7 @@ public class Order {
   public OrderStatus orderStatus = OrderStatus.SEARCHING;
   public double orderValue;
   public OrderType type;
+  public long creationTime;
   private int amountRemaining;
 
   public Order(String product, int startAmount, double pricePerUnit, String priceString,
@@ -25,6 +26,7 @@ public Order(String product, int startAmount, double pricePerUnit, String priceS
     this.priceString = priceString;
     this.type = type;
     orderValue = startAmount * pricePerUnit;
+    creationTime = System.currentTimeMillis();
   }
 
   public Order(String product, OrderType type, double pricePerUnit, int startAmount) {
@@ -65,7 +67,10 @@ public void updateStatus() {
       }
       BazaarItem.BazaarSubItem bazaarSubItem = BazaarNotifier.bazaarDataRaw.products
           .get(getProductId()).sell_summary.get(0);
-      if (this.pricePerUnit < bazaarSubItem.pricePerUnit) {
+      if(creationTime > BazaarNotifier.bazaarDataRaw.lastUpdated){
+        newOrderStatus = OrderStatus.SEARCHING;
+      }
+      else if (this.pricePerUnit < bazaarSubItem.pricePerUnit) {
         newOrderStatus = OrderStatus.OUTDATED;
       } else if (this.pricePerUnit == bazaarSubItem.pricePerUnit
           && this.startAmount >= bazaarSubItem.amount
@@ -89,7 +94,10 @@ public void updateStatus() {
       }
       BazaarItem.BazaarSubItem bazaarSubItem = BazaarNotifier.bazaarDataRaw.products
           .get(getProductId()).buy_summary.get(0);
-      if (this.pricePerUnit > bazaarSubItem.pricePerUnit) {
+      if(creationTime > BazaarNotifier.bazaarDataRaw.lastUpdated){
+        newOrderStatus = OrderStatus.SEARCHING;
+      }
+      else if (this.pricePerUnit > bazaarSubItem.pricePerUnit) {
         newOrderStatus = OrderStatus.OUTDATED;
       } else if (this.pricePerUnit == bazaarSubItem.pricePerUnit
           && this.startAmount >= bazaarSubItem.amount && bazaarSubItem.orders == 1) {

diff --git a/src/main/java/dev/meyi/bn/modules/Module.java b/src/main/java/dev/meyi/bn/modules/Module.java
@@ -32,7 +32,7 @@ public abstract class Module extends Hud {
   protected boolean showEverywhere = false;
 
   public Module() {
-    super(true, 20, 20, 2, 1);
+    super(true, 0, 0, 0, 1);
   }
 
   @Override

diff --git a/src/main/java/dev/meyi/bn/modules/module/NotificationModule.java b/src/main/java/dev/meyi/bn/modules/module/NotificationModule.java
@@ -179,6 +179,7 @@ public void highlightOrder(int hoveredText) {
           if (item == null
               || Item.itemRegistry.getIDForObject(item.getItem()) == 160
               || Item.itemRegistry.getIDForObject(item.getItem()) == 102
+              || Item.itemRegistry.getIDForObject(item.getItem()) == 154
               || Item.itemRegistry.getIDForObject(item.getItem()) == 262) {
             continue;
           }