From 6ba1901490ecd57b4641cf788fd0fff2f1444180 Mon Sep 17 00:00:00 2001 From: LCastr0 Date: Wed, 18 Jan 2017 01:07:50 -0200 Subject: [PATCH] Revert "Revered changes to chest page" This reverts commit 419c4b1053677234f87531194551e5ea6c90124d. --- .../core/treasure/gui/TreasurePage.java | 51 +++++++++++++++---- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java index 9f15e54cc..12e3a69f9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java @@ -1,6 +1,5 @@ package mineplex.core.treasure.gui; -import java.io.File; import java.util.ArrayList; import java.util.List; @@ -137,6 +136,13 @@ public class TreasurePage extends ShopPageBase int gingerbreadCount = _inventoryManager.Get(getPlayer()).getItemCount(TreasureType.GINGERBREAD.getItemName()); int minestrikeCount = _inventoryManager.Get(getPlayer()).getItemCount(TreasureType.MINESTRIKE.getItemName()); + boolean availableChristmas = false; + boolean availableFreedom = false; + boolean availableHaunted = false; + boolean availableTrick = false; + boolean availableThank = false; + boolean availableGingerbread = false; + List shardLore = new ArrayList<>(); shardLore.add(" "); shardLore.add(C.cGray + "This seems like it might come in"); @@ -296,8 +302,7 @@ public class TreasurePage extends ShopPageBase } else { - boolean available = new File("../../update/files/EnableTrickOrTreat.dat").exists(); - if (!available) + if (!availableTrick) { trickLore.add(C.cRed + "This item is no longer available!"); } @@ -323,8 +328,7 @@ public class TreasurePage extends ShopPageBase } else { - boolean available = new File("../../update/files/EnableThankful.dat").exists(); - if (!available) + if (!availableThank) { thankLore.add(C.cRed + "This item is no longer available!"); } @@ -422,12 +426,37 @@ public class TreasurePage extends ShopPageBase _normalTreasures.add(omegaTreasureItem); _normalTreasures.add(minestrikeTreasureItem); - _seasonalTreasures.add(winterTreasureItem); - _seasonalTreasures.add(freedomTreasureItem); - _seasonalTreasures.add(hauntedTreasureItem); - _seasonalTreasures.add(trickTreasureItem); - _seasonalTreasures.add(thankTreasureItem); - _seasonalTreasures.add(gingerbreadTreasureItem); + + + if (availableChristmas) + _specialTreasures.add(winterTreasureItem); + else + _seasonalTreasures.add(winterTreasureItem); + + if (availableFreedom) + _specialTreasures.add(freedomTreasureItem); + else + _seasonalTreasures.add(freedomTreasureItem); + + if (availableHaunted) + _specialTreasures.add(hauntedTreasureItem); + else + _seasonalTreasures.add(hauntedTreasureItem); + + if (availableTrick) + _specialTreasures.add(trickTreasureItem); + else + _seasonalTreasures.add(trickTreasureItem); + + if (availableThank) + _specialTreasures.add(thankTreasureItem); + else + _seasonalTreasures.add(thankTreasureItem); + + if (availableGingerbread) + _specialTreasures.add(gingerbreadTreasureItem); + else + _seasonalTreasures.add(gingerbreadTreasureItem); } private void buildFirstPage()