Upstream/Boxed
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/Boxed.git synced 2024-12-12 14:47:13 +01:00
Code Issues Projects Releases Wiki Activity

Support rotation on loading

Browse Source
This commit is contained in:
tastybento 2023-03-05 08:15:16 -08:00
parent 8915ef18f1
commit af2ec9c483
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/boxed/commands/AdminPlaceStructureCommand.java
View File

@ -83,7 +83,7 @@ public class AdminPlaceStructureCommand extends CompositeCommand {
int z = args.size() == 1 || args.get(3).equals("~") ? user.getLocation().getBlockZ() : Integer.valueOf(args.get(3).trim());
Location spot = new Location(user.getWorld(), x, y, z);
s.place(spot, true, StructureRotation.NONE, Mirror.NONE, -1, 1, new Random());
NewAreaListener.removeJigsaw(spot, s);
//NewAreaListener.removeJigsaw(spot, s);
saveStructure(spot, tag, user);
return true;
}

13
src/main/java/world/bentobox/boxed/listeners/NewAreaListener.java
View File

@ -53,7 +53,7 @@ public class NewAreaListener implements Listener {
private File structureFile;
private Queue<Item> itemsToBuild = new LinkedList<>();
private boolean pasting;
private record Item(String name, Structure structure, Location location) {};
private record Item(String name, Structure structure, Location location, StructureRotation rot) {};
Pair<Integer, Integer> min = new Pair<Integer, Integer>(0,0);
Pair<Integer, Integer> max = new Pair<Integer, Integer>(0,0);
@ -104,6 +104,7 @@ public class NewAreaListener implements Listener {
World world = env.equals(Environment.NORMAL) ? addon.getOverWorld() : addon.getNetherWorld();
// Loop through the structures in the file - there could be more than one
for (String vector : section.getKeys(false)) {
StructureRotation rot = StructureRotation.NONE;
String name = section.getString(vector);
// Load Structure
Structure s = Bukkit.getStructureManager().loadStructure(NamespacedKey.fromString("minecraft:" + name));
@ -113,12 +114,16 @@ public class NewAreaListener implements Listener {
}
// Extract coords
String[] value = vector.split(",");
if (value.length == 3) {
if (value.length > 2) {
int x = Integer.valueOf(value[0].strip()) + center.getBlockX();
int y = Integer.valueOf(value[1].strip());
int z = Integer.valueOf(value[2].strip()) + center.getBlockZ();
Location l = new Location(world, x, y, z);
itemsToBuild.add(new Item(name, s, l));
if (value.length > 3) {
// Rotation
rot = Enums.getIfPresent(StructureRotation.class, value[3].strip().toUpperCase(Locale.ENGLISH)).or(StructureRotation.NONE);
}
itemsToBuild.add(new Item(name, s, l, rot));
} else {
addon.logError("Structure file syntax error: " + name + " " + vector);
}
@ -128,7 +133,7 @@ public class NewAreaListener implements Listener {
private void LoadChunksAsync(Item item) {
pasting = true;
item.structure().place(item.location(), true, StructureRotation.NONE, Mirror.NONE, -1, 1, new Random());
item.structure().place(item.location(), true, item.rot(), Mirror.NONE, -1, 1, new Random());
addon.log(item.name() + " placed at " + item.location().getWorld().getName() + " " + Util.xyz(item.location().toVector()));
// Find it
removeJigsaw(item.location(), item.structure());