From b6bf2cd950e186827ad4c4647ff4f471652f7cdf Mon Sep 17 00:00:00 2001 From: Matsv Date: Tue, 13 Jun 2017 21:06:07 +0200 Subject: [PATCH] Handle observer facing position --- .../matsv/viabackwards/api/ViaBackwardsPlatform.java | 2 +- .../packets/BlockItemPackets1_11.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 f4f457ce..514609ab 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java +++ b/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java @@ -43,7 +43,7 @@ public interface ViaBackwardsPlatform { */ Logger getLogger(); - // TODO remove or better implement on full release + // TODO remove or better implement later default boolean isOutdated() { Class clazz = null; try { 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 bc5ac5c1..cca1eb2a 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 @@ -401,8 +401,8 @@ public class BlockItemPackets1_11 extends BlockItemRewriter return tag; }); - // Observer to Dispenser TODO facing position? - rewrite(218).repItem(new Item((short) 23, (byte) 1, (short) 0, getNamedTag("1.11 Observer"))).repBlock(new Block(23, 0)); + // Observer to Dispenser + rewrite(218).repItem(new Item((short) 23, (byte) 1, (short) 0, getNamedTag("1.11 Observer"))).repBlock(new Block(23, -1)); // Handle spawner block entity rewrite(52).blockEntityHandler((b, tag) -> { @@ -445,7 +445,7 @@ public class BlockItemPackets1_11 extends BlockItemRewriter } // TODO improve the llama inventory part - public int getNewSlotId(ChestedHorseStorage storage, int slotId) { + private int getNewSlotId(ChestedHorseStorage storage, int slotId) { int totalSlots = !storage.isChested() ? 38 : 53; int strength = storage.isChested() ? storage.getLiamaStrength() : 0; int startNonExistingFormula = 2 + 3 * strength; @@ -458,7 +458,7 @@ public class BlockItemPackets1_11 extends BlockItemRewriter return slotId; } - public int getOldSlotId(ChestedHorseStorage storage, int slotId) { + private int getOldSlotId(ChestedHorseStorage storage, int slotId) { int strength = storage.isChested() ? storage.getLiamaStrength() : 0; int startNonExistingFormula = 2 + 3 * strength; int endNonExistingFormula = 2 + 3 * (storage.isChested() ? 5 : 0); @@ -473,7 +473,7 @@ public class BlockItemPackets1_11 extends BlockItemRewriter return slotId; } - public Item getNewItem(ChestedHorseStorage storage, int slotId, Item current) { + private Item getNewItem(ChestedHorseStorage storage, int slotId, Item current) { int strength = storage.isChested() ? storage.getLiamaStrength() : 0; int startNonExistingFormula = 2 + 3 * strength; int endNonExistingFormula = 2 + 3 * (storage.isChested() ? 5 : 0);