Use custom block feature

esoterictemplates · Oct 30, 2024 · 382ebb6 · 382ebb6
1 parent 6084bfa
commit 382ebb6
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 296 deletions.
diff --git a/src/main/java/foundation/esoteric/minecraft/plugins/template/PaperTemplatePlugin.java b/src/main/java/foundation/esoteric/minecraft/plugins/template/PaperTemplatePlugin.java
@@ -2,6 +2,7 @@
 
 import dev.jorel.commandapi.CommandAPI;
 import dev.jorel.commandapi.CommandAPIBukkitConfig;
+import foundation.esoteric.minecraft.plugins.library.block.CustomBlockManager;
 import foundation.esoteric.minecraft.plugins.library.commands.GiveCustomItemCommand;
 import foundation.esoteric.minecraft.plugins.library.entity.CustomEntityManager;
 import foundation.esoteric.minecraft.plugins.library.file.FileManagedPlugin;
@@ -12,10 +13,7 @@
 import foundation.esoteric.minecraft.plugins.library.resourcepack.ResourcePackManager;
 import foundation.esoteric.minecraft.plugins.library.resourcepack.ResourcePackPlugin;
 import org.bukkit.plugin.java.JavaPlugin;
-import foundation.esoteric.minecraft.plugins.template.commands.PlaceCustomMultiblockCommand;
 import foundation.esoteric.minecraft.plugins.template.commands.SetLanguageCommand;
-import foundation.esoteric.minecraft.plugins.template.custom.multiblocks.CustomMultiblock;
-import foundation.esoteric.minecraft.plugins.template.custom.multiblocks.CustomMultiblockManager;
 import foundation.esoteric.minecraft.plugins.template.data.player.PlayerDataManager;
 import foundation.esoteric.minecraft.plugins.template.language.LanguageManager;
 import foundation.esoteric.minecraft.plugins.template.language.Message;
@@ -27,7 +25,7 @@ public final class PaperTemplatePlugin extends JavaPlugin implements FileManaged
   private LanguageManager languageManager;
   private ResourcePackManager resourcePackManager;
   private CustomItemManager customItemManager;
-  private CustomMultiblockManager customMultiblockManager;
+  private CustomBlockManager customMultiblockManager;
 
   public FileManager getFileManager() {
     return fileManager;
@@ -49,7 +47,7 @@ public CustomItemManager getCustomItemManager() {
     return customItemManager;
   }
 
-  public CustomMultiblockManager getCustomMultiblockManager() {
+  public CustomBlockManager getCustomMultiblockManager() {
     return customMultiblockManager;
   }
 
@@ -73,17 +71,12 @@ public void onEnable() {
     new HttpServerManager(this);
     customItemManager = new CustomItemManager(this);
     new CustomEntityManager(this);
-    if (CustomMultiblock.isEnabled()) {
-      customMultiblockManager = new CustomMultiblockManager(this);
-    }
+    customMultiblockManager = new CustomBlockManager(this);
 
     if (Message.isEnabled()) {
       new SetLanguageCommand(this);
     }
     new GiveCustomItemCommand(this);
-    if (CustomMultiblock.isEnabled()) {
-      new PlaceCustomMultiblockCommand(this);
-    }
   }
 
   @Override

diff --git a/...foundation/esoteric/minecraft/plugins/template/commands/PlaceCustomMultiblockCommand.java b/...foundation/esoteric/minecraft/plugins/template/commands/PlaceCustomMultiblockCommand.java
diff --git a/...tion/esoteric/minecraft/plugins/template/custom/multiblocks/AbstractCustomMultiblock.java b/...tion/esoteric/minecraft/plugins/template/custom/multiblocks/AbstractCustomMultiblock.java
diff --git a/...a/foundation/esoteric/minecraft/plugins/template/custom/multiblocks/CustomMultiblock.java b/...a/foundation/esoteric/minecraft/plugins/template/custom/multiblocks/CustomMultiblock.java
diff --git a/...ation/esoteric/minecraft/plugins/template/custom/multiblocks/CustomMultiblockManager.java b/...ation/esoteric/minecraft/plugins/template/custom/multiblocks/CustomMultiblockManager.java
diff --git a/...dation/esoteric/minecraft/plugins/template/custom/multiblocks/StoredCustomMultiblock.java b/...dation/esoteric/minecraft/plugins/template/custom/multiblocks/StoredCustomMultiblock.java
diff --git a/...ation/esoteric/minecraft/plugins/template/custom/multiblocks/StoredCustomMultiblocks.java b/...ation/esoteric/minecraft/plugins/template/custom/multiblocks/StoredCustomMultiblocks.java
diff --git a/src/main/java/foundation/esoteric/minecraft/plugins/template/language/Message.java b/src/main/java/foundation/esoteric/minecraft/plugins/template/language/Message.java
@@ -1,7 +1,5 @@
 package foundation.esoteric.minecraft.plugins.template.language;
 
-import foundation.esoteric.minecraft.plugins.template.custom.multiblocks.CustomMultiblock;
-
 import java.util.function.BooleanSupplier;
 
 public enum Message {
@@ -10,7 +8,7 @@ public enum Message {
 
   UNKNOWN_CUSTOM_ITEM(),
   UNKNOWN_CUSTOM_MULTIENTITY(),
-  UNKNOWN_CUSTOM_MULTIBLOCK(CustomMultiblock::isEnabled);
+  UNKNOWN_CUSTOM_MULTIBLOCK();
 
   private final BooleanSupplier isMessageInUseSupplier;