From e57d393c25702def14a71abf62c95afad522257a Mon Sep 17 00:00:00 2001 From: Paul Schifferer Date: Fri, 13 Dec 2024 20:51:50 -0800 Subject: [PATCH] Update to catch up with 1.18 --- .idea/modules.xml | 2 + .idea/runConfigurations/client.xml | 4 +- .idea/runConfigurations/data.xml | 6 +- .idea/runConfigurations/server.xml | 4 +- CHANGELOG/1.20/current.md | 2 + .../assets/crafttracker/lang/de_de.json | 44 +- .../client/overlay/CraftQueueOverlay.java | 10 +- .../client/overlay/ShoppingListOverlay.java | 14 +- .../common/config/ConfigHandler.java | 140 ++- .../common/event/EventHandler.java | 7 - .../crafttracker/common/lib/Constants.java | 2 + .../crafttracker/common/lib/Costs.java | 1085 +++++++++++++++++ .../crafttracker/common/lib/Multipliers.java | 20 + .../common/manager/CraftingQueueManager.java | 80 +- .../common/model/CraftingQueueItem.java | 8 + .../common/model/CraftingQueueProduct.java | 9 +- .../crafttracker/common/util/DebugUtil.java | 53 +- .../crafttracker/common/util/RecipeUtil.java | 228 +--- .../common/util/calc/ICostCalculator.java | 7 + .../util/calc/IngredientCostCalculator.java | 97 ++ .../common/util/calc/ItemCostCalculator.java | 90 ++ .../util/calc/RecipeCostCalculator.java | 75 ++ .../crafttracker/ingredient-costs.properties | 308 ----- .../ingredient-overrides.properties | 2 - .../crafttracker/common/util/UtilTest.java | 31 - 25 files changed, 1623 insertions(+), 705 deletions(-) create mode 100644 src/main/java/com/sweetrpg/crafttracker/common/lib/Costs.java create mode 100644 src/main/java/com/sweetrpg/crafttracker/common/lib/Multipliers.java create mode 100644 src/main/java/com/sweetrpg/crafttracker/common/util/calc/ICostCalculator.java create mode 100644 src/main/java/com/sweetrpg/crafttracker/common/util/calc/IngredientCostCalculator.java create mode 100644 src/main/java/com/sweetrpg/crafttracker/common/util/calc/ItemCostCalculator.java create mode 100644 src/main/java/com/sweetrpg/crafttracker/common/util/calc/RecipeCostCalculator.java delete mode 100644 src/main/resources/assets/crafttracker/ingredient-costs.properties delete mode 100644 src/main/resources/assets/crafttracker/ingredient-overrides.properties delete mode 100644 src/test/java/com/sweetrpg/crafttracker/test/crafttracker/common/util/UtilTest.java diff --git a/.idea/modules.xml b/.idea/modules.xml index d9ebdec..01c952f 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,8 @@ + + diff --git a/.idea/runConfigurations/client.xml b/.idea/runConfigurations/client.xml index 516f291..dbebe82 100644 --- a/.idea/runConfigurations/client.xml +++ b/.idea/runConfigurations/client.xml @@ -2,10 +2,10 @@