From ac1b35379e9296691ad966c926edb482e10b0c95 Mon Sep 17 00:00:00 2001 From: Matsv Date: Wed, 22 Jun 2016 20:38:40 +0200 Subject: [PATCH] Remove not required tags, and remove tested todo's --- .../FakeTileEntity.java | 98 ++++++------------- 1 file changed, 31 insertions(+), 67 deletions(-) diff --git a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/FakeTileEntity.java b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/FakeTileEntity.java index 7e58ffb98..1590185f0 100644 --- a/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/FakeTileEntity.java +++ b/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/FakeTileEntity.java @@ -1,7 +1,9 @@ package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2; import org.bukkit.Material; -import org.spacehq.opennbt.tag.builtin.*; +import org.spacehq.opennbt.tag.builtin.CompoundTag; +import org.spacehq.opennbt.tag.builtin.IntTag; +import org.spacehq.opennbt.tag.builtin.StringTag; import java.util.Arrays; import java.util.List; @@ -16,82 +18,45 @@ public class FakeTileEntity { private static Map tileEntities = new ConcurrentHashMap<>(); static { - register(Material.FURNACE, "Furnace", - new ShortTag("BurnTime"), - new ShortTag("CookTime"), - new ShortTag("CookTimeTotal")); // Maybe items todo test - register(Arrays.asList(Material.CHEST, Material.TRAPPED_CHEST), "Chest", - new ByteArrayTag("Items")); // Todo test + register(Material.FURNACE, "Furnace"); + register(Arrays.asList(Material.CHEST, Material.TRAPPED_CHEST), "Chest"); register(Material.ENDER_CHEST, "EnderChest"); - register(Material.JUKEBOX, "RecordPlayer"); // No required tags found, todo test - register(Material.DISPENSER, "Trap"); // todo test - register(Material.DROPPER, "Dropper"); // todo test - register(Arrays.asList(Material.SIGN_POST, Material.WALL_SIGN), "Sign", - new StringTag("Text1", ""), - new StringTag("Text2", ""), - new StringTag("Text3", ""), - new StringTag("Text4", "")); // todo test - register(Material.MOB_SPAWNER, "MobSpawner"); // todo test - register(Material.NOTE_BLOCK, "Music", - new ByteTag("note"), - new ByteTag("enabled")); // todo test - register(Material.PISTON_BASE, "Piston", - new IntTag("blockId"), - new IntTag("blockData"), - new IntTag("facing"), - new FloatTag("progress"), - new ByteTag("extending")); //TODO test, maybe assign values to them instead of 0. - register(Arrays.asList(Material.BREWING_STAND, Material.CAULDRON), "Cauldron", - new ShortTag("BrewTime"), - new ByteArrayTag("Items") - ); //todo test both, spigot tells me this is a brewing stand. - register(Material.ENCHANTMENT_TABLE, "EnchantTable"); //// TODO: test - register(Arrays.asList(Material.ENDER_PORTAL, Material.ENDER_PORTAL_FRAME), "Airportal"); //todo test - register(Material.BEACON, "Beacon", - new IntTag("Primary"), - new IntTag("Secondary"), - new IntTag("Levels")); //todo test - register(Arrays.asList(Material.SKULL, Material.SKULL_ITEM), "Skull", - new ByteTag("SkullType"), - new ByteTag("Rot")); //todo test - register(Arrays.asList(Material.DAYLIGHT_DETECTOR, Material.DAYLIGHT_DETECTOR_INVERTED), "DLDetector"); //todo test - register(Material.HOPPER, "Hopper", - new IntTag("TransferCooldown")); // todo test - register(Arrays.asList(Material.REDSTONE_COMPARATOR, Material.REDSTONE_COMPARATOR_OFF, Material.REDSTONE_COMPARATOR_ON), "Comparator", - new IntTag("OutputSignal")); //todo test - register(Material.FLOWER_POT, "FlowerPot", - new StringTag("Item", ""), - new IntTag("Data")); //todo test - register(Arrays.asList(Material.STANDING_BANNER, Material.WALL_BANNER, Material.BANNER), "Banner", - new IntTag("Base")); //todo test - register(209, "EndGateway", new LongTag("age")); // todo test - register(Material.COMMAND.getId(), "Control", - new StringTag("Command", "ViaVersion"), - new IntTag("SuccessCount"), - new StringTag("CustomName", "ViaVersion"), - new ByteTag("TrackOutput"), - new ByteTag("powered"), - new ByteTag("conditionMet"), - new ByteTag("auto")); // todo test - - + register(Material.JUKEBOX, "RecordPlayer"); + register(Material.DISPENSER, "Trap"); + register(Material.DROPPER, "Dropper"); + register(Arrays.asList(Material.SIGN_POST, Material.WALL_SIGN), "Sign"); + register(Material.MOB_SPAWNER, "MobSpawner"); + register(Material.NOTE_BLOCK, "Music"); + register(Material.PISTON_BASE, "Piston"); + register(Arrays.asList(Material.BREWING_STAND, Material.CAULDRON), "Cauldron"); + register(Material.ENCHANTMENT_TABLE, "EnchantTable"); + register(Arrays.asList(Material.ENDER_PORTAL, Material.ENDER_PORTAL_FRAME), "Airportal"); + register(Material.BEACON, "Beacon"); + register(Arrays.asList(Material.SKULL, Material.SKULL_ITEM), "Skull"); + register(Arrays.asList(Material.DAYLIGHT_DETECTOR, Material.DAYLIGHT_DETECTOR_INVERTED), "DLDetector"); + register(Material.HOPPER, "Hopper"); + register(Arrays.asList(Material.REDSTONE_COMPARATOR, Material.REDSTONE_COMPARATOR_OFF, Material.REDSTONE_COMPARATOR_ON), "Comparator"); + register(Material.FLOWER_POT, "FlowerPot"); + register(Arrays.asList(Material.STANDING_BANNER, Material.WALL_BANNER, Material.BANNER), "Banner"); + register(209, "EndGateway"); // todo test + register(Material.COMMAND.getId(), "Control"); } - private static void register(Integer material, String name, Tag... tags) { + private static void register(Integer material, String name) { CompoundTag comp = new CompoundTag(""); comp.put(new StringTag(name)); - for (Tag tag : tags) - comp.put(tag); +// for (Tag tag : tags) +// comp.put(tag); tileEntities.put(material, comp); } - private static void register(Material material, String name, Tag... tags) { - register(material.getId(), name, tags); + private static void register(Material material, String name) { + register(material.getId(), name); } - private static void register(List materials, String name, Tag... tags) { + private static void register(List materials, String name) { for (Material m : materials) - register(m.getId(), name, tags); + register(m.getId(), name); } public static boolean hasBlock(int block) { @@ -104,7 +69,6 @@ public class FakeTileEntity { tag.put(new IntTag("x", x)); tag.put(new IntTag("y", y)); tag.put(new IntTag("z", z)); -// System.out.println("Found tile entity " + block + " at position " + x + " " + y + " " + z); return tag; } return null;