From 04d6cf604ced1b59b8c08e7097fc9daecd37089a Mon Sep 17 00:00:00 2001 From: xGinko Date: Mon, 2 Sep 2024 01:47:56 +0200 Subject: [PATCH] try recreate vanilla restocking mechanic --- .../{utils => logging}/ComponentLoggerProviderImpl.java | 0 .../{utils => logging}/TranslatableMapper.java | 0 .../xginko/villageroptimizer/{utils => struct}/Disableable.java | 0 .../xginko/villageroptimizer/{utils => struct}/Enableable.java | 0 .../me/xginko/villageroptimizer/{ => struct}/enums/Keyring.java | 2 +- .../villageroptimizer/{ => struct}/enums/OptimizationType.java | 0 .../villageroptimizer/{ => struct}/enums/Permissions.java | 0 .../villageroptimizer/{utils => struct/models}/ExpiringSet.java | 0 8 files changed, 1 insertion(+), 1 deletion(-) rename src/main/java/me/xginko/villageroptimizer/{utils => logging}/ComponentLoggerProviderImpl.java (100%) rename src/main/java/me/xginko/villageroptimizer/{utils => logging}/TranslatableMapper.java (100%) rename src/main/java/me/xginko/villageroptimizer/{utils => struct}/Disableable.java (100%) rename src/main/java/me/xginko/villageroptimizer/{utils => struct}/Enableable.java (100%) rename src/main/java/me/xginko/villageroptimizer/{ => struct}/enums/Keyring.java (98%) rename src/main/java/me/xginko/villageroptimizer/{ => struct}/enums/OptimizationType.java (100%) rename src/main/java/me/xginko/villageroptimizer/{ => struct}/enums/Permissions.java (100%) rename src/main/java/me/xginko/villageroptimizer/{utils => struct/models}/ExpiringSet.java (100%) diff --git a/src/main/java/me/xginko/villageroptimizer/utils/ComponentLoggerProviderImpl.java b/src/main/java/me/xginko/villageroptimizer/logging/ComponentLoggerProviderImpl.java similarity index 100% rename from src/main/java/me/xginko/villageroptimizer/utils/ComponentLoggerProviderImpl.java rename to src/main/java/me/xginko/villageroptimizer/logging/ComponentLoggerProviderImpl.java diff --git a/src/main/java/me/xginko/villageroptimizer/utils/TranslatableMapper.java b/src/main/java/me/xginko/villageroptimizer/logging/TranslatableMapper.java similarity index 100% rename from src/main/java/me/xginko/villageroptimizer/utils/TranslatableMapper.java rename to src/main/java/me/xginko/villageroptimizer/logging/TranslatableMapper.java diff --git a/src/main/java/me/xginko/villageroptimizer/utils/Disableable.java b/src/main/java/me/xginko/villageroptimizer/struct/Disableable.java similarity index 100% rename from src/main/java/me/xginko/villageroptimizer/utils/Disableable.java rename to src/main/java/me/xginko/villageroptimizer/struct/Disableable.java diff --git a/src/main/java/me/xginko/villageroptimizer/utils/Enableable.java b/src/main/java/me/xginko/villageroptimizer/struct/Enableable.java similarity index 100% rename from src/main/java/me/xginko/villageroptimizer/utils/Enableable.java rename to src/main/java/me/xginko/villageroptimizer/struct/Enableable.java diff --git a/src/main/java/me/xginko/villageroptimizer/enums/Keyring.java b/src/main/java/me/xginko/villageroptimizer/struct/enums/Keyring.java similarity index 98% rename from src/main/java/me/xginko/villageroptimizer/enums/Keyring.java rename to src/main/java/me/xginko/villageroptimizer/struct/enums/Keyring.java index a7de718..53caade 100644 --- a/src/main/java/me/xginko/villageroptimizer/enums/Keyring.java +++ b/src/main/java/me/xginko/villageroptimizer/struct/enums/Keyring.java @@ -52,7 +52,7 @@ public final class Keyring { OPTIMIZATION_TYPE("optimization-type"), LAST_OPTIMIZE_SYSTIME_MILLIS("last-optimize"), LAST_LEVELUP_SYSTIME_MILLIS("last-levelup"), - LAST_RESTOCK_SYSTIME_MILLIS("last-restock"); + LAST_RESTOCK_SYSTIME_MILLIS("last-restock-systime"); private final @NotNull NamespacedKey key; diff --git a/src/main/java/me/xginko/villageroptimizer/enums/OptimizationType.java b/src/main/java/me/xginko/villageroptimizer/struct/enums/OptimizationType.java similarity index 100% rename from src/main/java/me/xginko/villageroptimizer/enums/OptimizationType.java rename to src/main/java/me/xginko/villageroptimizer/struct/enums/OptimizationType.java diff --git a/src/main/java/me/xginko/villageroptimizer/enums/Permissions.java b/src/main/java/me/xginko/villageroptimizer/struct/enums/Permissions.java similarity index 100% rename from src/main/java/me/xginko/villageroptimizer/enums/Permissions.java rename to src/main/java/me/xginko/villageroptimizer/struct/enums/Permissions.java diff --git a/src/main/java/me/xginko/villageroptimizer/utils/ExpiringSet.java b/src/main/java/me/xginko/villageroptimizer/struct/models/ExpiringSet.java similarity index 100% rename from src/main/java/me/xginko/villageroptimizer/utils/ExpiringSet.java rename to src/main/java/me/xginko/villageroptimizer/struct/models/ExpiringSet.java