Skip to content

Commit 93d48ac

Browse files
committed
MVP for anvil
1 parent 26b09f9 commit 93d48ac

File tree

31 files changed

+3577
-246
lines changed

31 files changed

+3577
-246
lines changed

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,16 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
630630
return CraftItemStack.asCraftMirror(stack);
631631
}
632632

633+
@Override
634+
public char[] getIbdToStateOrdinal() {
635+
return new char[0];
636+
}
637+
638+
@Override
639+
public int[] getOrdinalToIbdID() {
640+
return new int[0];
641+
}
642+
633643
@Override
634644
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
635645
final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R3/PaperweightAdapter.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,16 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack item) {
629629
return CraftItemStack.asCraftMirror(stack);
630630
}
631631

632+
@Override
633+
public char[] getIbdToStateOrdinal() {
634+
return new char[0];
635+
}
636+
637+
@Override
638+
public int[] getOrdinalToIbdID() {
639+
return new int[0];
640+
}
641+
632642
@Override
633643
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
634644
final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,16 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
644644
return CraftItemStack.asCraftMirror(stack);
645645
}
646646

647+
@Override
648+
public char[] getIbdToStateOrdinal() {
649+
return new char[0];
650+
}
651+
652+
@Override
653+
public int[] getOrdinalToIbdID() {
654+
return new int[0];
655+
}
656+
647657
@Override
648658
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
649659
var registryAccess = DedicatedServer.getServer().registryAccess();

worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_R1/PaperweightAdapter.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,16 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
654654
return CraftItemStack.asCraftMirror(stack);
655655
}
656656

657+
@Override
658+
public char[] getIbdToStateOrdinal() {
659+
return new char[0];
660+
}
661+
662+
@Override
663+
public int[] getOrdinalToIbdID() {
664+
return new int[0];
665+
}
666+
657667
@Override
658668
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
659669
var registryAccess = DedicatedServer.getServer().registryAccess();

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.bukkit.plugin.PluginManager;
4646

4747
import java.io.File;
48+
import java.nio.file.Path;
4849
import java.util.ArrayList;
4950
import java.util.Collection;
5051
import java.util.Collections;
@@ -312,6 +313,16 @@ public FAWEPlatformAdapterImpl getPlatformAdapter() {
312313
return platformAdapter;
313314
}
314315

316+
@Override
317+
public Path getWorldsFolder() {
318+
return Bukkit.getWorldContainer().toPath();
319+
}
320+
321+
@Override
322+
public boolean isWorldLoaded(String world) {
323+
return Bukkit.getWorld(world) != null;
324+
}
325+
315326
private void setupPlotSquared() {
316327
Plugin plotSquared = this.plugin.getServer().getPluginManager().getPlugin("PlotSquared");
317328
if (plotSquared == null) {

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/CachedBukkitAdapter.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,4 @@ public BlockState adapt(BlockData blockData) {
100100
}
101101
}
102102

103-
protected abstract char[] getIbdToStateOrdinal();
104-
105-
protected abstract int[] getOrdinalToIbdID();
106-
107103
}

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/IBukkitAdapter.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,4 +396,14 @@ default List<org.bukkit.entity.Entity> getEntities(org.bukkit.World world) {
396396
return TaskManager.taskManager().sync(world::getEntities);
397397
}
398398

399+
/**
400+
* Get a char array of minecraft internal IDs against FAWE char IDs
401+
*/
402+
char[] getIbdToStateOrdinal();
403+
404+
/**
405+
* Get an int array of FAWE char IDs against minecraft internal IDs
406+
*/
407+
int[] getOrdinalToIbdID();
408+
399409
}

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/SimpleBukkitAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ private boolean init() {
2323
}
2424

2525
@Override
26-
protected char[] getIbdToStateOrdinal() {
26+
public char[] getIbdToStateOrdinal() {
2727
return new char[Character.MAX_VALUE + 1];
2828
}
2929

3030
@Override
31-
protected int[] getOrdinalToIbdID() {
31+
public int[] getOrdinalToIbdID() {
3232
return new int[Character.MAX_VALUE + 1];
3333
}
3434

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,4 +495,20 @@ public static ItemStack adapt(BaseItemStack item) {
495495
return getAdapter().adapt(item);
496496
//FAWE end
497497
}
498+
499+
//FAWE start
500+
/**
501+
* Get a char array of minecraft internal IDs against FAWE char IDs
502+
*/
503+
public static char[] getIbdToStateOrdinal() {
504+
return getAdapter().getIbdToStateOrdinal();
505+
}
506+
507+
/**
508+
* Get an int array of FAWE char IDs against minecraft internal IDs
509+
*/
510+
public static int[] getOrdinalToIbdID() {
511+
return getAdapter().getOrdinalToIbdID();
512+
}
513+
//FAWE end
498514
}

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitServerInterface.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,5 +309,17 @@ public IBatchProcessor getPlatformPostProcessor(boolean fastMode) {
309309
}
310310
return this.plugin.getBukkitImplAdapter().getTickingPostProcessor();
311311
}
312+
313+
@Nullable
314+
@Override
315+
public char[] getIbdToStateOrdinal() {
316+
return BukkitAdapter.getIbdToStateOrdinal();
317+
}
318+
319+
@Nullable
320+
@Override
321+
public int[] getOrdinalToIbdID() {
322+
return BukkitAdapter.getOrdinalToIbdID();
323+
}
312324
//FAWE end
313325
}

worldedit-core/src/main/java/com/fastasyncworldedit/core/IFawe.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.sk89q.worldedit.entity.Player;
99

1010
import java.io.File;
11+
import java.nio.file.Path;
1112
import java.util.Collection;
1213
import java.util.UUID;
1314

@@ -49,4 +50,8 @@ default boolean isChunksStretched() {
4950

5051
FAWEPlatformAdapterImpl getPlatformAdapter();
5152

53+
Path getWorldsFolder();
54+
55+
boolean isWorldLoaded(String world);
56+
5257
}

0 commit comments

Comments
 (0)