cleanup and actually implement elevators

build.gradle

@@ -138,6 +138,7 @@ allprojects {
         compileOnly "com.github.TechFortress:GriefPrevention:16.18.1"
         implementation 'xyz.xenondevs:particle:1.8.1'
         implementation "com.frengor:ultimateadvancementapi-shadeable:2.4.2"
+        implementation 'com.jeff-media:custom-block-data:2.2.3'
         compileOnly 'com.griefdefender:api:2.1.0-SNAPSHOT'
         compileOnly 'io.netty:netty-all:4.1.68.Final'
 
@@ -171,11 +172,13 @@ shadowJar {
     relocate 'Fukkit.extensions', 'com.volmit.adapt.util.extensions'
     relocate 'Amulet.extensions', 'com.volmit.adapt.util.extensions'
     relocate 'com.fren_gor.ultimateAdvancementAPI', 'com.volmit.adapt.util.advancements'
+    relocate 'com.jeff_media.customblockdata', 'com.volmit.util.customblocks'
     dependencies {
         include(dependency('systems.manifold:'))
         include(dependency('xyz.xenondevs:'))
         include(dependency('com.github.VolmitDev:'))
         include(dependency('com.frengor:ultimateadvancementapi-shadeable:'))
+        include(dependency('com.jeff-media:custom-block-data:'))
     }
 }
 

src/main/java/com/volmit/adapt/Adapt.java

@@ -19,6 +19,7 @@
 package com.volmit.adapt;
 
 import art.arcane.amulet.io.FolderWatcher;
+import com.jeff_media.customblockdata.CustomBlockData;
 import com.volmit.adapt.api.advancement.AdvancementManager;
 import com.volmit.adapt.api.data.WorldData;
 import com.volmit.adapt.api.potion.BrewingManager;
@@ -116,6 +117,7 @@ public void start() {
             sqlManager.establishConnection();
         }
         startSim();
+        CustomBlockData.registerListener(this);
         registerListener(new BrewingManager());
         registerListener(Version.get());
         setupMetrics();

src/main/java/com/volmit/adapt/api/recipe/AdaptRecipe.java

@@ -291,7 +291,7 @@ public ItemStack getResult() {
         public void register() {
             ShapedRecipe s = new ShapedRecipe(new NamespacedKey(Adapt.instance, getKey()), result);
             s.shape(shapes.toArray(new String[0]));
-            ingredients.forEach(i -> s.setIngredient(i.getCharacter(), i.getMaterial()));
+            ingredients.forEach(i -> s.setIngredient(i.getCharacter(), i.getChoice()));
             Bukkit.getServer().addRecipe(s);
             Adapt.verbose("Registered Shaped Crafting Recipe " + s.getKey());
         }

src/main/java/com/volmit/adapt/api/recipe/MaterialChar.java

@@ -21,10 +21,28 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.RecipeChoice;
 
 @AllArgsConstructor
 @Data
 public class MaterialChar {
     private char character;
-    private Material material;
+    private RecipeChoice choice;
+
+    public MaterialChar(char character, Tag<Material> tag) {
+        this.character = character;
+        this.choice = new RecipeChoice.MaterialChoice(tag);
+    }
+
+    public MaterialChar(char character, Material... material) {
+        this.character = character;
+        this.choice = new RecipeChoice.MaterialChoice(material);
+    }
+
+    public MaterialChar(char character, ItemStack... itemStack) {
+        this.character = character;
+        this.choice = new RecipeChoice.ExactChoice(itemStack);
+    }
 }