diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java index a6d749316..6501e49aa 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/recipe/BukkitRecipeManager.java @@ -420,7 +420,7 @@ public class BukkitRecipeManager implements RecipeManager { } @Override - public CompletableFuture delayedLoad() { + public CompletableFuture asyncDelayedLoad() { if (!ConfigManager.enableRecipeSystem()) return CompletableFuture.completedFuture(null); return this.processVanillaRecipes().thenRun(() -> { try { diff --git a/core/src/main/java/net/momirealms/craftengine/core/block/BlockManager.java b/core/src/main/java/net/momirealms/craftengine/core/block/BlockManager.java index 3ff93fd51..4b20d0e78 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/block/BlockManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/block/BlockManager.java @@ -20,6 +20,10 @@ public interface BlockManager extends Reloadable, ModelGenerator, ConfigSectionP return CONFIG_SECTION_NAME; } + default int loadingSequence() { + return LoadingSequence.BLOCK; + } + Collection modelsToGenerate(); Map> blockOverrides(); @@ -35,12 +39,4 @@ public interface BlockManager extends Reloadable, ModelGenerator, ConfigSectionP Map soundMapper(); void initSuggestions(); - - void delayedLoad(); - - void delayedInit(); - - default int loadingSequence() { - return LoadingSequence.BLOCK; - } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/FurnitureManager.java b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/FurnitureManager.java index e14dd5836..8f053198c 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/FurnitureManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/entity/furniture/FurnitureManager.java @@ -13,14 +13,10 @@ public interface FurnitureManager extends Reloadable, ConfigSectionParser { String[] CONFIG_SECTION_NAME = new String[] { "furniture" }; String FURNITURE_ADMIN_NODE = "craftengine.furniture.admin"; - void delayedLoad(); - void initSuggestions(); Collection cachedSuggestions(); - void delayedInit(); - @Override default String[] sectionId() { return CONFIG_SECTION_NAME; diff --git a/core/src/main/java/net/momirealms/craftengine/core/font/ImageManager.java b/core/src/main/java/net/momirealms/craftengine/core/font/ImageManager.java index 357d80795..cf398ddf2 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/font/ImageManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/font/ImageManager.java @@ -24,10 +24,6 @@ public interface ImageManager extends Reloadable, ConfigSectionParser { return CONFIG_SECTION_NAME; } - void delayedLoad(); - - void delayedInit(); - default int loadingSequence() { return LoadingSequence.FONT; } diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/ItemManager.java b/core/src/main/java/net/momirealms/craftengine/core/item/ItemManager.java index 0e9829e5e..5279003cd 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/ItemManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/ItemManager.java @@ -85,7 +85,5 @@ public interface ItemManager extends Reloadable, ModelGenerator, ConfigSectio Collection cachedSuggestions(); - void delayedInit(); - Object encodeJava(Key componentType, @Nullable Object component); } \ No newline at end of file diff --git a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/RecipeManager.java b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/RecipeManager.java index 6e5ef3d37..55556118f 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/item/recipe/RecipeManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/item/recipe/RecipeManager.java @@ -35,9 +35,7 @@ public interface RecipeManager extends Reloadable, ConfigSectionParser { @Nullable Recipe getRecipe(Key type, RecipeInput input, @Nullable Key lastRecipe); - CompletableFuture delayedLoad(); - - void delayedInit(); + CompletableFuture asyncDelayedLoad(); default int loadingSequence() { return LoadingSequence.RECIPE; diff --git a/core/src/main/java/net/momirealms/craftengine/core/loot/VanillaLootManager.java b/core/src/main/java/net/momirealms/craftengine/core/loot/VanillaLootManager.java index 97c2b0d59..b1d672f65 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/loot/VanillaLootManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/loot/VanillaLootManager.java @@ -19,7 +19,5 @@ public interface VanillaLootManager extends ConfigSectionParser, Reloadable { return CONFIG_SECTION_NAME; } - void delayedInit(); - Optional getBlockLoot(int blockState); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/PackManager.java b/core/src/main/java/net/momirealms/craftengine/core/pack/PackManager.java index ee8a19e90..958bd219a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/PackManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/PackManager.java @@ -22,8 +22,6 @@ public interface PackManager extends Reloadable { } } - void delayedInit(); - void generateResourcePack(); Path resourcePackPath(); diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java index 684fee835..32ce2432b 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java @@ -132,7 +132,7 @@ public abstract class CraftEngine implements Plugin { this.debugger = (s) -> {}; } } finally { - this.recipeManager.delayedLoad().thenRun(() -> this.isReloading = false); + this.recipeManager.asyncDelayedLoad().thenRun(() -> this.isReloading = false); } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/Reloadable.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/Reloadable.java index 01fae3bee..a589ffbb1 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/Reloadable.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/Reloadable.java @@ -19,4 +19,10 @@ public interface Reloadable { default void disable() { unload(); } + + default void delayedLoad() { + } + + default void delayedInit() { + } } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/gui/GuiManager.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/gui/GuiManager.java index 8cca44c58..4e2287eb5 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/gui/GuiManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/gui/GuiManager.java @@ -5,6 +5,4 @@ import net.momirealms.craftengine.core.plugin.Reloadable; public interface GuiManager extends Reloadable { Inventory createInventory(Gui gui, int size); - - void delayedInit(); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/locale/ClientLangManager.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/locale/ClientLangManager.java index 7380b2f5c..575ff8904 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/locale/ClientLangManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/locale/ClientLangManager.java @@ -53,6 +53,4 @@ public interface ClientLangManager extends Reloadable, ConfigSectionParser { } void addTranslation(String langId, Map translations); - - void delayedLoad(); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/locale/TranslationManager.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/locale/TranslationManager.java index 721eeadf2..52cf9559c 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/locale/TranslationManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/locale/TranslationManager.java @@ -24,8 +24,6 @@ public interface TranslationManager extends Reloadable, ConfigSectionParser { void forcedLocale(Locale locale); - void delayedLoad(); - String miniMessageTranslation(String key, @Nullable Locale locale); default Component render(Component component) { diff --git a/core/src/main/java/net/momirealms/craftengine/core/sound/SoundManager.java b/core/src/main/java/net/momirealms/craftengine/core/sound/SoundManager.java index 230e03650..56aceec51 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/sound/SoundManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/sound/SoundManager.java @@ -11,8 +11,6 @@ import java.util.Map; public interface SoundManager extends Reloadable, ConfigSectionParser { String[] CONFIG_SECTION_NAME = new String[] {"sounds", "sound"}; - void delayedLoad(); - Map sounds(); JukeboxSongManager jukeboxSongManager(); diff --git a/core/src/main/java/net/momirealms/craftengine/core/sound/song/JukeboxSongManager.java b/core/src/main/java/net/momirealms/craftengine/core/sound/song/JukeboxSongManager.java index 52448fefd..25d6ca26b 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/sound/song/JukeboxSongManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/sound/song/JukeboxSongManager.java @@ -16,6 +16,4 @@ public interface JukeboxSongManager extends Reloadable, ConfigSectionParser { default String[] sectionId() { return CONFIG_SECTION_NAME; } - - void delayedLoad(); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/world/WorldManager.java b/core/src/main/java/net/momirealms/craftengine/core/world/WorldManager.java index 58db10caf..5cfef4fd5 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/world/WorldManager.java +++ b/core/src/main/java/net/momirealms/craftengine/core/world/WorldManager.java @@ -13,8 +13,6 @@ public interface WorldManager extends Reloadable { CEWorld getWorld(UUID uuid); - void delayedInit(); - void loadWorld(World world); void loadWorld(CEWorld world);