requested changes part 2

2 files changed, 2 insertions, 21 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java b/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java
index ca0f08c4..43ed7d12 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/events/JacobEventToast.java
@@ -1,8 +1,6 @@
 package de.hysky.skyblocker.skyblock.events;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import de.hysky.skyblocker.skyblock.tabhud.widget.JacobsContestWidget;
-import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.render.RenderHelper;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
@@ -13,30 +11,12 @@ import net.minecraft.item.Items;
 import net.minecraft.util.Colors;
 import net.minecraft.util.math.MathHelper;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class JacobEventToast extends EventToast {
 
     private final String[] crops;
 
     private static final ItemStack DEFAULT_ITEM = new ItemStack(Items.IRON_HOE);
 
-    public static final Map<String, ItemStack> cropItems = new HashMap<>();
-
-    static {
-        cropItems.put("Wheat", new ItemStack(Items.WHEAT));
-        cropItems.put("Mushroom", new ItemStack(Items.RED_MUSHROOM));
-        cropItems.put("Pumpkin", new ItemStack(Items.CARVED_PUMPKIN));
-        cropItems.put("Melon", new ItemStack(Items.MELON));
-        cropItems.put("Sugar Cane", new ItemStack(Items.SUGAR_CANE));
-        cropItems.put("Cactus", new ItemStack(Items.CACTUS));
-        cropItems.put("Carrot", new ItemStack(Items.CARROT));
-        cropItems.put("Cocoa Beans", new ItemStack(Items.COCOA_BEANS));
-        cropItems.put("Potato", new ItemStack(Items.POTATO));
-        cropItems.put("Nether Wart", new ItemStack(Items.NETHER_WART));
-    }
-
     public JacobEventToast(long eventStartTime, String name, String[] crops) {
         super(eventStartTime, name, new ItemStack(Items.IRON_HOE));
         this.crops = crops;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java
index ce48018d..64154af3 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/UpcomingEventsTab.java
@@ -3,6 +3,7 @@ package de.hysky.skyblocker.skyblock.itemlist;
 import de.hysky.skyblocker.mixins.accessors.DrawContextInvoker;
 import de.hysky.skyblocker.skyblock.events.EventNotifications;
 import de.hysky.skyblocker.skyblock.events.JacobEventToast;
+import de.hysky.skyblocker.skyblock.tabhud.widget.JacobsContestWidget;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.scheduler.MessageScheduler;
 import net.minecraft.client.MinecraftClient;
@@ -160,7 +161,7 @@ public class UpcomingEventsTab extends ItemListWidget.TabContainerWidget {
         public void drawItems(TextRenderer textRenderer, int x, int y, DrawContext context) {
             for (int i = 0; i < crops.length; i++) {
                 String crop = crops[i];
-                context.drawItem(JacobEventToast.cropItems.getOrDefault(crop, BARRIER), x + 18 * i, y + 2);
+                context.drawItem(JacobsContestWidget.FARM_DATA.getOrDefault(crop, BARRIER), x + 18 * i, y + 2);
             }
         }