diff --git a/src/main/java/com/minelazz/epicworldgenerator/structures/StructureObject.java b/src/main/java/com/minelazz/epicworldgenerator/structures/StructureObject.java deleted file mode 100644 index 65a715208..000000000 --- a/src/main/java/com/minelazz/epicworldgenerator/structures/StructureObject.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.minelazz.epicworldgenerator.structures; - -import com.volmit.iris.Iris; -import com.volmit.iris.object.IrisObject; -import com.volmit.iris.util.B; -import com.volmit.iris.util.DontObfuscate; -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.block.data.BlockData; -import org.bukkit.util.BlockVector; - -import java.io.*; -import java.util.EnumSet; - -@DontObfuscate -public class StructureObject implements Serializable -{ - @DontObfuscate - public static final String MESSAGE0 = "This was created from .ewg serialization files"; - - @DontObfuscate - public static final String MESSAGE1 = "This is not copied code, it is intended to "; - - @DontObfuscate - public static final String MESSAGE2 = "be used so that people can convert EWG files"; - - @DontObfuscate - public static final String MESSAGE3 = "into .IOB files (iris objects)"; - - @DontObfuscate - public static IrisObject convert(File so) throws IOException, ClassNotFoundException - { - FileInputStream fin = new FileInputStream(so); - ObjectInputStream in = new ObjectInputStream(fin); - StructureObject o = (StructureObject) in.readObject(); - in.close(); - int maxX = 0; - int maxY = 0; - int maxZ = 0; - int minX = 0; - int minY = 0; - int minZ = 0; - - for(SOBlock i : o.blocks) - { - maxX = maxX < i.x ? i.x : maxX; - maxY = maxY < i.y ? i.y : maxY; - maxZ = maxZ < i.z ? i.z : maxZ; - minX = minX > i.x ? i.x : minX; - minY = minY > i.y ? i.y : minY; - minZ = minZ > i.z ? i.z : minZ; - } - - IrisObject iob = new IrisObject(maxX - minX, maxY - minY, maxZ - minZ); - - for(SOBlock i : o.blocks) - { - BlockData bdx = null; - - if(i.blockData == null) - { - BlockData f = map(i.id, i.data); - bdx = f == null ? null : f; - } - - else - { - bdx = B.get(i.blockData); - } - - if(bdx != null) - { - iob.getBlocks().put(new BlockVector(i.x, -i.y, i.z), bdx); - } - } - - return iob; - } - - @DontObfuscate - @SuppressWarnings("deprecation") - private static final BlockData map(int id, int dat) - { - for(Material i : EnumSet.allOf(Material.class)) - { - if(!i.isLegacy()) - { - continue; - } - - if(i.getId() == id) - { - return Bukkit.getUnsafe().fromLegacy(i, (byte) dat); - } - } - - Iris.warn("Unknown Type " + id + ":" + dat); - - return null; - } - - @DontObfuscate - private static final long serialVersionUID = -905274143366977303L; - - @DontObfuscate - public SOBlock[] blocks; - @DontObfuscate - public String name; - - @DontObfuscate - public final class SOBlock implements Serializable - { - @DontObfuscate - private static final long serialVersionUID = 2610063934261982315L; - - @DontObfuscate - public final int x; - - @DontObfuscate - public final int y; - - @DontObfuscate - public final int z; - - @DontObfuscate - public final int id; - - @DontObfuscate - public final int data; - - @DontObfuscate - public String meta; - - @DontObfuscate - public String blockData; - - @DontObfuscate - final StructureObject ref; - - @DontObfuscate - public SOBlock(StructureObject structureObject, int x, int y, int z, String string) - { - this.ref = structureObject; - meta = null; - this.x = x; - this.y = y; - this.z = z; - id = -1; - data = 0; - blockData = string; - } - } -} diff --git a/src/main/java/com/volmit/iris/manager/ConversionManager.java b/src/main/java/com/volmit/iris/manager/ConversionManager.java index bc913b941..3b9e73a3f 100644 --- a/src/main/java/com/volmit/iris/manager/ConversionManager.java +++ b/src/main/java/com/volmit/iris/manager/ConversionManager.java @@ -1,16 +1,15 @@ package com.volmit.iris.manager; import com.google.gson.Gson; -import com.minelazz.epicworldgenerator.structures.StructureObject; import com.volmit.iris.Iris; import com.volmit.iris.object.*; import com.volmit.iris.pregen.DirectWorldWriter; import com.volmit.iris.util.*; -import net.querz.nbt.io.NBTUtil; -import net.querz.nbt.io.NamedTag; -import net.querz.nbt.tag.CompoundTag; -import net.querz.nbt.tag.IntTag; -import net.querz.nbt.tag.ListTag; +import com.volmit.iris.scaffold.data.nbt.io.NBTUtil; +import com.volmit.iris.scaffold.data.nbt.io.NamedTag; +import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.scaffold.data.nbt.tag.IntTag; +import com.volmit.iris.scaffold.data.nbt.tag.ListTag; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.data.BlockData; @@ -80,35 +79,6 @@ public class ConversionManager } }); }, 5); - - converters.add(new Converter() - { - @Override - public String getOutExtension() - { - return "iob"; - } - - @Override - public String getInExtension() - { - return "ewg"; - } - - @Override - public void convert(File in, File out) - { - try - { - StructureObject.convert(in).write(out); - } - - catch(ClassNotFoundException | IOException e) - { - e.printStackTrace(); - } - } - }); } private String toPoolName(String poolReference)