Skip to content

Commit cbba479

Browse files
committed
MVP for anvil
1 parent fe33be5 commit cbba479

File tree

34 files changed

+3580
-253
lines changed

34 files changed

+3580
-253
lines changed

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

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

541+
@Override
542+
public char[] getIbdToStateOrdinal() {
543+
return new char[0];
544+
}
545+
546+
@Override
547+
public int[] getOrdinalToIbdID() {
548+
return new int[0];
549+
}
550+
541551
@Override
542552
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
543553
final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

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

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

547+
@Override
548+
public char[] getIbdToStateOrdinal() {
549+
return new char[0];
550+
}
551+
552+
@Override
553+
public int[] getOrdinalToIbdID() {
554+
return new int[0];
555+
}
556+
547557
@Override
548558
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
549559
final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

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

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

555+
@Override
556+
public char[] getIbdToStateOrdinal() {
557+
return new char[0];
558+
}
559+
560+
@Override
561+
public int[] getOrdinalToIbdID() {
562+
return new int[0];
563+
}
564+
555565
@Override
556566
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
557567
final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

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

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

606+
@Override
607+
public char[] getIbdToStateOrdinal() {
608+
return new char[0];
609+
}
610+
611+
@Override
612+
public int[] getOrdinalToIbdID() {
613+
return new int[0];
614+
}
615+
606616
@Override
607617
public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
608618
final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);

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;
@@ -320,6 +321,16 @@ public FAWEPlatformAdapterImpl getPlatformAdapter() {
320321
return platformAdapter;
321322
}
322323

324+
@Override
325+
public Path getWorldsFolder() {
326+
return Bukkit.getWorldContainer().toPath();
327+
}
328+
329+
@Override
330+
public boolean isWorldLoaded(String world) {
331+
return Bukkit.getWorld(world) != null;
332+
}
333+
323334
private void setupPlotSquared() {
324335
Plugin plotSquared = this.plugin.getServer().getPluginManager().getPlugin("PlotSquared");
325336
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
@@ -392,4 +392,14 @@ default List<org.bukkit.entity.Entity> getEntities(org.bukkit.World world) {
392392
return TaskManager.taskManager().sync(world::getEntities);
393393
}
394394

395+
/**
396+
* Get a char array of minecraft internal IDs against FAWE char IDs
397+
*/
398+
char[] getIbdToStateOrdinal();
399+
400+
/**
401+
* Get an int array of FAWE char IDs against minecraft internal IDs
402+
*/
403+
int[] getOrdinalToIbdID();
404+
395405
}

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
@@ -303,5 +303,17 @@ public IBatchProcessor getPlatformPostProcessor(boolean fastMode) {
303303
}
304304
return this.plugin.getBukkitImplAdapter().getTickingPostProcessor();
305305
}
306+
307+
@Nullable
308+
@Override
309+
public char[] getIbdToStateOrdinal() {
310+
return BukkitAdapter.getIbdToStateOrdinal();
311+
}
312+
313+
@Nullable
314+
@Override
315+
public int[] getOrdinalToIbdID() {
316+
return BukkitAdapter.getOrdinalToIbdID();
317+
}
306318
//FAWE end
307319
}

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)