MVP for anvil

IntellectualSites · Aug 20, 2023 · cbba479 · cbba479
1 parent fe33be5
commit cbba479
Show file tree

Hide file tree

Showing 34 changed files with 3,580 additions and 253 deletions.
diff --git a/...-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java b/...-1_17_1/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/PaperweightAdapter.java
@@ -538,6 +538,16 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
         return CraftItemStack.asCraftMirror(stack);
     }
 
+    @Override
+    public char[] getIbdToStateOrdinal() {
+        return new char[0];
+    }
+
+    @Override
+    public int[] getOrdinalToIbdID() {
+        return new int[0];
+    }
+
     @Override
     public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
         final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

diff --git a/...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R2/PaperweightAdapter.java b/...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R2/PaperweightAdapter.java
@@ -544,6 +544,16 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
         return CraftItemStack.asCraftMirror(stack);
     }
 
+    @Override
+    public char[] getIbdToStateOrdinal() {
+        return new char[0];
+    }
+
+    @Override
+    public int[] getOrdinalToIbdID() {
+        return new int[0];
+    }
+
     @Override
     public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
         final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

diff --git a/...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightAdapter.java b/...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_19_R3/PaperweightAdapter.java
@@ -552,6 +552,16 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
         return CraftItemStack.asCraftMirror(stack);
     }
 
+    @Override
+    public char[] getIbdToStateOrdinal() {
+        return new char[0];
+    }
+
+    @Override
+    public int[] getOrdinalToIbdID() {
+        return new int[0];
+    }
+
     @Override
     public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
         final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

diff --git a/...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightAdapter.java b/...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R1/PaperweightAdapter.java
@@ -603,6 +603,16 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
         return CraftItemStack.asCraftMirror(stack);
     }
 
+    @Override
+    public char[] getIbdToStateOrdinal() {
+        return new char[0];
+    }
+
+    @Override
+    public int[] getOrdinalToIbdID() {
+        return new int[0];
+    }
+
     @Override
     public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
         final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java
@@ -45,6 +45,7 @@
 import org.bukkit.plugin.PluginManager;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -320,6 +321,16 @@ public FAWEPlatformAdapterImpl getPlatformAdapter() {
         return platformAdapter;
     }
 
+    @Override
+    public Path getWorldsFolder() {
+        return Bukkit.getWorldContainer().toPath();
+    }
+
+    @Override
+    public boolean isWorldLoaded(String world) {
+        return Bukkit.getWorld(world) != null;
+    }
+
     private void setupPlotSquared() {
         Plugin plotSquared = this.plugin.getServer().getPluginManager().getPlugin("PlotSquared");
         if (plotSquared == null) {

diff --git a/...dedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/CachedBukkitAdapter.java b/...dedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/CachedBukkitAdapter.java
@@ -100,8 +100,4 @@ public BlockState adapt(BlockData blockData) {
         }
     }
 
-    protected abstract char[] getIbdToStateOrdinal();
-
-    protected abstract int[] getOrdinalToIbdID();
-
 }
diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/IBukkitAdapter.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/IBukkitAdapter.java
@@ -392,4 +392,14 @@ default List<org.bukkit.entity.Entity> getEntities(org.bukkit.World world) {
         return TaskManager.taskManager().sync(world::getEntities);
     }
 
+    /**
+     * Get a char array of minecraft internal IDs against FAWE char IDs
+     */
+    char[] getIbdToStateOrdinal();
+
+    /**
+     * Get an int array of FAWE char IDs against minecraft internal IDs
+     */
+    int[] getOrdinalToIbdID();
+
 }
diff --git a/...dedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/SimpleBukkitAdapter.java b/...dedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/SimpleBukkitAdapter.java
@@ -23,12 +23,12 @@ private boolean init() {
     }
 
     @Override
-    protected char[] getIbdToStateOrdinal() {
+    public char[] getIbdToStateOrdinal() {
         return new char[Character.MAX_VALUE + 1];
     }
 
     @Override
-    protected int[] getOrdinalToIbdID() {
+    public int[] getOrdinalToIbdID() {
         return new int[Character.MAX_VALUE + 1];
     }
 

diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java
@@ -495,4 +495,20 @@ public static ItemStack adapt(BaseItemStack item) {
         return getAdapter().adapt(item);
         //FAWE end
     }
+
+    //FAWE start
+    /**
+     * Get a char array of minecraft internal IDs against FAWE char IDs
+     */
+    public static char[] getIbdToStateOrdinal() {
+        return getAdapter().getIbdToStateOrdinal();
+    }
+
+    /**
+     * Get an int array of FAWE char IDs against minecraft internal IDs
+     */
+    public static int[] getOrdinalToIbdID() {
+        return getAdapter().getOrdinalToIbdID();
+    }
+    //FAWE end
 }
diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java
@@ -303,5 +303,17 @@ public IBatchProcessor getPlatformPostProcessor(boolean fastMode) {
         }
         return this.plugin.getBukkitImplAdapter().getTickingPostProcessor();
     }
+
+    @Nullable
+    @Override
+    public char[] getIbdToStateOrdinal() {
+        return BukkitAdapter.getIbdToStateOrdinal();
+    }
+
+    @Nullable
+    @Override
+    public int[] getOrdinalToIbdID() {
+        return BukkitAdapter.getOrdinalToIbdID();
+    }
     //FAWE end
 }
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java
@@ -8,6 +8,7 @@
 import com.sk89q.worldedit.entity.Player;
 
 import java.io.File;
+import java.nio.file.Path;
 import java.util.Collection;
 import java.util.UUID;
 
@@ -49,4 +50,8 @@ default boolean isChunksStretched() {
 
     FAWEPlatformAdapterImpl getPlatformAdapter();
 
+    Path getWorldsFolder();
+
+    boolean isWorldLoaded(String world);
+
 }