From 16d8079d7314ff72ab1e1a65474533668c8b3743 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Mon, 20 Feb 2023 05:16:25 +0100 Subject: [PATCH] fixed Protocol Range impl --- README.md | 7 ------- .../definition/ItemReleaseVersionDefinition.java | 2 +- .../viafabricplus/platform/ProtocolRange.java | 8 +++++--- .../value/impl/ProtocolSyncBooleanValue.java | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 786c30eb..2e8620a4 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,3 @@ # ViaFabricPlus Clientside ViaVersion, ViaLegacy and ViaAprilFools implementation with clientside fixes for Fabric -TODO: -ViaFabricPlus-Visual: - -Armor -Hunger bar -Signature indicator -Petrified Oak slab diff --git a/src/main/java/de/florianmichael/viafabricplus/definition/ItemReleaseVersionDefinition.java b/src/main/java/de/florianmichael/viafabricplus/definition/ItemReleaseVersionDefinition.java index 3c6333a3..b248ec68 100644 --- a/src/main/java/de/florianmichael/viafabricplus/definition/ItemReleaseVersionDefinition.java +++ b/src/main/java/de/florianmichael/viafabricplus/definition/ItemReleaseVersionDefinition.java @@ -41,7 +41,7 @@ public class ItemReleaseVersionDefinition { private final static Map itemMap = new HashMap<>(); public static boolean contains(final Item item, final ComparableProtocolVersion version) { - if (!itemMap.containsKey(item)) return false; + if (!itemMap.containsKey(item)) return true; return Arrays.stream(itemMap.get(item)).anyMatch(protocolRange -> protocolRange.contains(version)); } diff --git a/src/main/java/de/florianmichael/viafabricplus/platform/ProtocolRange.java b/src/main/java/de/florianmichael/viafabricplus/platform/ProtocolRange.java index 9a7f5fe6..e21b883b 100644 --- a/src/main/java/de/florianmichael/viafabricplus/platform/ProtocolRange.java +++ b/src/main/java/de/florianmichael/viafabricplus/platform/ProtocolRange.java @@ -50,9 +50,11 @@ public class ProtocolRange { } public boolean contains(final ComparableProtocolVersion protocolVersion) { - if (this.lowerBound != null && this.lowerBound.getIndex() < protocolVersion.getIndex()) return false; - - return this.upperBound == null || this.upperBound.getIndex() <= protocolVersion.getIndex(); + if (this.lowerBound != null && protocolVersion.getIndex() < lowerBound.getIndex()) + return false; + if (this.upperBound != null && protocolVersion.getIndex() > upperBound.getIndex()) + return false; + return true; } @Override diff --git a/src/main/java/de/florianmichael/viafabricplus/value/impl/ProtocolSyncBooleanValue.java b/src/main/java/de/florianmichael/viafabricplus/value/impl/ProtocolSyncBooleanValue.java index 8e1855e1..d950cd44 100644 --- a/src/main/java/de/florianmichael/viafabricplus/value/impl/ProtocolSyncBooleanValue.java +++ b/src/main/java/de/florianmichael/viafabricplus/value/impl/ProtocolSyncBooleanValue.java @@ -31,7 +31,7 @@ public class ProtocolSyncBooleanValue extends AbstractValue { private boolean syncWithProtocol; public ProtocolSyncBooleanValue(String name, ProtocolRange protocolRange) { - super(name, true); + super(name + " (" + protocolRange.toString() + ")", true); this.protocolRange = protocolRange; }