From e4998e267eb97874adf98418930667be1d2881a9 Mon Sep 17 00:00:00 2001 From: Matsv Date: Tue, 13 Jun 2017 17:10:56 +0200 Subject: [PATCH] Remove some todos --- README.md | 11 ++--------- .../matsv/viabackwards/api/ViaBackwardsPlatform.java | 4 ++-- .../packets/BlockItemPackets1_11.java | 4 ++-- .../protocol1_10to1_11/packets/EntityPackets1_11.java | 2 +- .../packets/ChangedPacketIds1_12.java | 2 +- .../packets/EntityPackets1_12.java | 2 +- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index af163b99..661d41e7 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,7 @@ # ViaBackwards -Allows 1.9.x on a 1.10 Spigot server +Allows older Minecraft versions on a newer Minecraft server Requires [ViaVersion](http://viaversion.com) to be installed -**Spigot page:** https://www.spigotmc.org/resources/viabackwards.27448/ - - -TODO: - -- Entity names that changed? -- llama inventory slots -- Rewrite Shulker box name \ No newline at end of file +**Spigot page:** https://www.spigotmc.org/resources/viabackwards.27448/ \ No newline at end of file diff --git a/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java b/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java index 4e0f60e8..f4f457ce 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java +++ b/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java @@ -55,8 +55,8 @@ public interface ViaBackwardsPlatform { if (clazz == null) { getLogger().severe("================================"); getLogger().severe("YOUR VIAVERSION IS OUTDATED"); - getLogger().severe("PLEASE USE THE LATEST DEVBUILD"); - getLogger().severe("LINK: https://ci.viaversion.com/job/ViaVersion-DEV/"); + getLogger().severe("PLEASE USE THE LATEST VERSION"); + getLogger().severe("LINK: https://viaversion.com"); getLogger().severe("VIABACKWARDS WILL NOW DISABLE"); getLogger().severe("================================"); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java index 6a6c5628..bc5ac5c1 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java @@ -300,7 +300,7 @@ public class BlockItemPackets1_11 extends BlockItemRewriter handler(new PacketHandler() { @Override public void handle(PacketWrapper wrapper) throws Exception { - // Remove on shulkerbox decleration TODO convert to normal chest to make it work correctly? + // Remove on shulkerbox decleration if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 10) { wrapper.cancel(); } @@ -410,7 +410,7 @@ public class BlockItemPackets1_11 extends BlockItemRewriter return tag; }); - // Rewrite spawn eggs TODO maybe intercept / handle server for creative instead of ViaBackwards NBT + // Rewrite spawn eggs rewrite(383).itemHandler((i) -> { EntityTypeNames.toClientItem(i); return i; diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java index 4ce5218d..ccbff19c 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java @@ -407,7 +407,7 @@ public class EntityPackets1_11 extends EntityRewriter { regEntType(EntityType.EVOCATION_ILLAGER, EntityType.VILLAGER).mobName("Evoker"); regEntType(EntityType.VEX, EntityType.BAT).mobName("Vex"); regEntType(EntityType.VINDICATION_ILLAGER, EntityType.VILLAGER).mobName("Vindicator").spawnMetadata(storage -> storage.add(new Metadata(13, MetaType1_9.VarInt, 4))); // Base Profession - regEntType(EntityType.LIAMA, EntityType.HORSE).mobName("Llama").spawnMetadata(storage -> storage.add(getHorseMetaType(1))); // TODO fix chest slots + regEntType(EntityType.LIAMA, EntityType.HORSE).mobName("Llama").spawnMetadata(storage -> storage.add(getHorseMetaType(1))); regEntType(EntityType.LIAMA_SPIT, EntityType.SNOWBALL); regObjType(ObjectType.LIAMA_SPIT, ObjectType.SNOWBALL, -1); diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds1_12.java index dac5e6ce..cc4ebddf 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/ChangedPacketIds1_12.java @@ -83,7 +83,7 @@ public class ChangedPacketIds1_12 extends Rewriter { } }); } - }); // Advancements TODO + }); // Advancements p.registerOutgoing(State.PLAY, 0x4D, 0x4A); // Entity Properties p.registerOutgoing(State.PLAY, 0x4E, 0x4B); // Entity Effect diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/EntityPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/EntityPackets1_12.java index 4d18c9fc..9b89badf 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/EntityPackets1_12.java +++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_11_1/packets/EntityPackets1_12.java @@ -366,7 +366,7 @@ public class EntityPackets1_12 extends EntityRewriter { regEntType(EntityType.PARROT, EntityType.BAT).mobName("Parrot").spawnMetadata(storage -> storage.add(new Metadata(12, MetaType1_12.Byte, (byte) 0x00))); regEntType(EntityType.ILLUSION_ILLAGER, EntityType.EVOCATION_ILLAGER).mobName("Illusioner"); - // Handle Illager TODO wtf does this metadata do? Is aggresive it is a bitmask? + // Handle Illager registerMetaHandler().filter(EntityType.EVOCATION_ILLAGER, true, 12).removed(); registerMetaHandler().filter(EntityType.EVOCATION_ILLAGER, true, 13).handleIndexChange(12);