Skip to content

Commit

Permalink
stash
Browse files Browse the repository at this point in the history
  • Loading branch information
@wizjany
wizjany committed Mar 6, 2019
1 parent c014bea commit cd38993
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 43 deletions.
5 changes: 4 additions & 1 deletion worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View file
Expand Up @@ -160,7 +160,10 @@ public void setupRegistries() {
}
// Entity
for (org.bukkit.entity.EntityType entityType : org.bukkit.entity.EntityType.values()) {
EntityType.REGISTRY.register("minecraft:" + entityType.name().toLowerCase(), new EntityType("minecraft:" + entityType.name().toLowerCase()));
String mcid = entityType.getName();
if (mcid != null) {
EntityType.REGISTRY.register("minecraft:" + mcid.toLowerCase(), new EntityType("minecraft:" + mcid.toLowerCase()));
}
}
// Tags
try {
Expand Down
84 changes: 48 additions & 36 deletions ...-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/MinecraftStructureReader.java
View file
Expand Up @@ -16,7 +16,6 @@
import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
import com.sk89q.worldedit.extent.clipboard.Clipboard;
import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.math.Vector3;
import com.sk89q.worldedit.regions.CuboidRegion;
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.block.BaseBlock;
Expand Down Expand Up @@ -55,7 +54,10 @@ public MinecraftStructureReader(NBTInputStream inputStream) {
@Override
public Clipboard read() throws IOException {
NamedTag rootTag = inputStream.readNamedTag();
// MC structures are all unnamed, but this doesn't seem to be necessary

// MC structures are all unnamed, but this doesn't seem to be necessary?
// if (!rootTag.getName().isEmpty()) throw new IOException("bad format");

CompoundTag structureTag = (CompoundTag) rootTag.getTag();
Map<String, Tag> structure = structureTag.getValue();
int version = requireTag(structure, "DataVersion", IntTag.class).getValue();
Expand All @@ -67,40 +69,11 @@ public Clipboard read() throws IOException {
int height = ((IntTag) size.get(1)).getValue();
int length = ((IntTag) size.get(2)).getValue();

// TODO support random (or non-random) palette from 'palettes' tag
List<CompoundTag> paletteObject = requireTag(structure, "palette", ListTag.class).getValue()
.stream().map(t -> ((CompoundTag) t)).collect(Collectors.toList());
Map<Integer, BlockState> palette = new HashMap<>();
ParserContext parserContext = new ParserContext();
parserContext.setRestricted(false);
parserContext.setTryLegacy(false);
parserContext.setPreferringWildcard(false);
if (structure.containsKey("palettes")) {

for (int i = 0; i < paletteObject.size(); i++) {
CompoundTag palettePart = paletteObject.get(i);
String blockName = palettePart.getString("Name");
if (blockName.isEmpty()) throw new IOException("Palette block name empty.");
StringBuilder stateBuilder = new StringBuilder(blockName);
Tag props = palettePart.getValue().getOrDefault("Properties", null);
if (props instanceof CompoundTag) {
CompoundTag properties = ((CompoundTag) props);
if (!properties.getValue().isEmpty())
{
stateBuilder.append('[');
stateBuilder.append(properties.getValue().entrySet().stream().map(e ->
e.getKey() + "=" + (String) e.getValue().getValue()).collect(Collectors.joining(",")));
stateBuilder.append(']');
}
}
BlockState state;
try {
state = WorldEdit.getInstance().getBlockFactory().parseFromInput(stateBuilder.toString(), parserContext).toImmutableState();
} catch (InputParseException e) {
throw new IOException("Invalid BlockState in structure: " + palettePart +
". Are you missing a mod or using a structure made in a newer version of Minecraft?");
}
palette.put(i, state);
}
List<CompoundTag> paletteObject = (List<CompoundTag>) (List<?>) requireTag(structure, "palette", ListTag.class).getValue();
Map<Integer, BlockState> palette = readPalette(paletteObject);

BlockArrayClipboard clipboard = new BlockArrayClipboard(
new CuboidRegion(BlockVector3.ZERO, BlockVector3.at(width, height, length).subtract(BlockVector3.ONE)));
Expand All @@ -111,7 +84,7 @@ public Clipboard read() throws IOException {
BlockVector3 vec = BlockVector3.at(pos.getInt(0), pos.getInt(1), pos.getInt(2));
int state = requireTag(block.getValue(), "state", IntTag.class).getValue();
BlockState blockState = palette.get(state);
CompoundTag nbt = getTag(block, CompoundTag.class, "nbt");
CompoundTag nbt = getTag(block.getValue(), "nbt", CompoundTag.class);
try {
if (nbt == null) {
clipboard.setBlock(vec, blockState);
Expand All @@ -121,6 +94,7 @@ public Clipboard read() throws IOException {
values.put("y", new IntTag(vec.getBlockY()));
values.put("z", new IntTag(vec.getBlockZ()));
BaseBlock baseBlock = blockState.toBaseBlock(nbt);
clipboard.setBlock(vec, baseBlock);
}
} catch (WorldEditException e) {
throw new IOException("Failed to load a block in the schematic");
Expand All @@ -141,14 +115,52 @@ public Clipboard read() throws IOException {
BaseEntity state = new BaseEntity(entityType, compound);
clipboard.createEntity(location, state);
} else {
log.warning("Unknown entity when pasting schematic: " + id.toLowerCase());
log.warning("Unknown entity when loading structure: " + id.toLowerCase());
}
}
}

return clipboard;
}

private Map<Integer, BlockState> readPalette(List<CompoundTag> paletteTag) throws IOException {
Map<Integer, BlockState> palette = new HashMap<>();
ParserContext parserContext = new ParserContext();
parserContext.setRestricted(false);
parserContext.setTryLegacy(false);
parserContext.setPreferringWildcard(false);

for (int i = 0; i < paletteTag.size(); i++) {
CompoundTag palettePart = paletteTag.get(i);
String blockName = palettePart.getString("Name");
if (blockName.isEmpty()) {
throw new IOException("Palette block name empty.");
}
StringBuilder stateBuilder = new StringBuilder(blockName);
Tag props = palettePart.getValue().getOrDefault("Properties", null);
if (props instanceof CompoundTag) {
CompoundTag properties = ((CompoundTag) props);
if (!properties.getValue().isEmpty())
{
stateBuilder.append('[');
stateBuilder.append(properties.getValue().entrySet().stream().map(e ->
e.getKey() + "=" + (String) e.getValue().getValue()).collect(Collectors.joining(",")));
stateBuilder.append(']');
}
}
BlockState state;
String stateString = stateBuilder.toString();
try {
state = WorldEdit.getInstance().getBlockFactory().parseFromInput(stateString, parserContext).toImmutableState();
} catch (InputParseException e) {
throw new IOException("Invalid BlockState in structure: " + stateString +
". Are you missing a mod or using a structure made in a newer version of Minecraft?");
}
palette.put(i, state);
}
return palette;
}

@Override
public void close() throws IOException {
inputStream.close();
Expand Down
4 changes: 1 addition & 3 deletions worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/NBTSchematicReader.java
View file
Expand Up @@ -46,9 +46,7 @@ protected static <T extends Tag> T requireTag(Map<String, Tag> items, String key
}

@Nullable
protected static <T extends Tag> T getTag(CompoundTag tag, Class<T> expected, String key) {
Map<String, Tag> items = tag.getValue();

protected static <T extends Tag> T getTag(Map<String, Tag> items, String key, Class<T> expected) {
if (!items.containsKey(key)) {
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions ...dit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
View file
Expand Up @@ -88,16 +88,16 @@ public Clipboard read() throws IOException {
int version = requireTag(schematic, "Version", IntTag.class).getValue();
switch (version) {
case 1:
return readVersion1(schematic);
return readVersion1(schematicTag);
default:
throw new IOException("This schematic version is currently not supported");
}
}

private Clipboard readVersion1(Map<String, Tag> schematic) throws IOException {
private Clipboard readVersion1(CompoundTag schematicTag) throws IOException {
BlockVector3 origin;
Region region;

Map<String, Tag> schematic = schematicTag.getValue();
Map<String, Tag> metadata = requireTag(schematic, "Metadata", CompoundTag.class).getValue();

int width = requireTag(schematic, "Width", ShortTag.class).getValue();
Expand Down

0 comments on commit cd38993

Please sign in to comment.