Skip to content
This repository was archived by the owner on May 27, 2023. It is now read-only.

Commit 3147722

Browse files
committed
chore: cleanup
1 parent 56b15fb commit 3147722

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

src/main/java/net/crystalgames/scaffolding/schematic/impl/MCEditSchematic.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package net.crystalgames.scaffolding.schematic.impl;
22

3-
import java.io.OutputStream;
4-
import java.util.ArrayList;
5-
import java.util.List;
6-
import java.util.Objects;
7-
import java.util.concurrent.CompletableFuture;
83
import net.crystalgames.scaffolding.region.Region;
94
import net.crystalgames.scaffolding.schematic.Schematic;
105
import net.minestom.server.coordinate.Pos;
@@ -16,6 +11,12 @@
1611
import org.jglrxavpok.hephaistos.nbt.NBTCompound;
1712
import org.jglrxavpok.hephaistos.nbt.NBTException;
1813

14+
import java.io.OutputStream;
15+
import java.util.ArrayList;
16+
import java.util.List;
17+
import java.util.Objects;
18+
import java.util.concurrent.CompletableFuture;
19+
1920
// https://github.com/EngineHub/WorldEdit/blob/version/5.x/src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java
2021
public class MCEditSchematic implements Schematic {
2122

@@ -128,12 +129,10 @@ public CompletableFuture<Region> build(Instance instance, Pos position) {
128129
short stateId = regionBlock.stateId();
129130

130131
Block block = Block.fromStateId(stateId);
131-
if (block != null) {
132-
blockBatch.setBlock(blockPosition.add(position), block);
133-
}
132+
if (block != null) blockBatch.setBlock(blockPosition.add(position), block);
134133
}
135134

136-
blockBatch.apply(instance, () -> future.complete(new Region(instance, position, position)));
135+
blockBatch.apply(instance, () -> future.complete(new Region(instance, position, position.add(width, height, length))));
137136
});
138137
return future;
139138
}

src/main/java/net/crystalgames/scaffolding/schematic/impl/SpongeSchematic.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@
1212
import org.jglrxavpok.hephaistos.nbt.NBTException;
1313

1414
import java.io.OutputStream;
15-
import java.util.ArrayList;
16-
import java.util.HashMap;
17-
import java.util.LinkedHashMap;
18-
import java.util.List;
19-
import java.util.Map;
20-
import java.util.Set;
15+
import java.util.*;
2116
import java.util.concurrent.CompletableFuture;
2217

2318
// https://github.com/EngineHub/WorldEdit/blob/303f5a76b2df70d63480f2126c9ef4b228eb3c59/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java#L261-L297
@@ -85,8 +80,7 @@ private void readBlockPalette(@NotNull NBTCompound nbtTag) throws NBTException {
8580
if (nbtPalette == null) throw new NBTException("Invalid Schematic: No Palette");
8681

8782
Set<String> keys = nbtPalette.getKeys();
88-
if (keys.size() != maxPalette)
89-
throw new NBTException("Invalid Schematic: PaletteMax does not match Palette size");
83+
if (keys.size() != maxPalette) throw new NBTException("Invalid Schematic: PaletteMax does not match Palette size");
9084

9185
for (String key : keys) {
9286
Integer value = nbtPalette.getInt(key);
@@ -155,11 +149,9 @@ public CompletableFuture<Region> build(Instance instance, Pos position) {
155149
short stateId = regionBlock.stateId();
156150

157151
Block block = Block.fromStateId(stateId);
158-
if (block != null) {
159-
blockBatch.setBlock(blockPosition.add(position), block);
160-
}
152+
if (block != null) blockBatch.setBlock(blockPosition.add(position), block);
161153
}
162-
blockBatch.apply(instance, () -> future.complete(new Region(instance, position, position)));
154+
blockBatch.apply(instance, () -> future.complete(new Region(instance, position, position.add(width, height, length))));
163155
});
164156
return future;
165157
}

0 commit comments

Comments
 (0)