From 84537a7495e8f3f6df644efb7762017595c14c0a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 11 Nov 2019 17:30:59 -0600 Subject: [PATCH] Always sync curios, fixes some desyncs. Also clarify that ring of far reach only works on blocks (for now?) --- .../botania/common/integration/curios/CurioIntegration.java | 2 +- .../botania/common/item/equipment/bauble/ItemBauble.java | 4 ---- .../common/item/equipment/bauble/ItemFlightTiara.java | 5 ----- .../botania/common/item/equipment/bauble/ItemItemFinder.java | 5 ----- src/main/resources/assets/botania/lang/en_us.json | 2 +- 5 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java index 8c5676212..603ba6225 100644 --- a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java +++ b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java @@ -121,7 +121,7 @@ public class CurioIntegration extends EquipmentHandler { @Override public boolean shouldSyncToTracking(String identifier, LivingEntity entity) { - return getItem().shouldSyncToTracking(stack, entity); + return true; } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 6299236b5..fea465e6a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -151,10 +151,6 @@ public abstract class ItemBauble extends ItemMod implements ICosmeticAttachable, return HashMultimap.create(); } - public boolean shouldSyncToTracking(ItemStack stack, LivingEntity entity) { - return false; - } - public boolean hasRender(ItemStack stack, LivingEntity living) { return !(stack.getItem() instanceof ICosmeticAttachable && !((ICosmeticAttachable) stack.getItem()).getCosmeticItem(stack).isEmpty()) && !(stack.getItem() instanceof IPhantomInkable && ((IPhantomInkable) stack.getItem()).hasPhantomInk(stack)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 3c15432f4..193a45c89 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -289,11 +289,6 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { } } - @Override - public boolean shouldSyncToTracking(ItemStack stack, LivingEntity living) { - return true; - } - @Override public boolean hasRender(ItemStack stack, LivingEntity living) { return super.hasRender(stack, living) && living instanceof PlayerEntity; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 11f010a1b..a2dbafd6a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -68,11 +68,6 @@ public class ItemItemFinder extends ItemBauble { else this.tickServer(stack, (PlayerEntity) player); } - @Override - public boolean shouldSyncToTracking(ItemStack stack, LivingEntity living) { - return true; - } - @Override @OnlyIn(Dist.CLIENT) public void doRender(ItemStack stack, LivingEntity living, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index 250362161..83ebca553 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -3184,7 +3184,7 @@ "botania.entry.reachRing": "Ring of Far Reach", "botania.tagline.reachRing": "Reach farther, build farther", - "botania.page.reachRing0": "Through the power of one's Pride, nothing is out of their reach. By wearing the $(1)Ring of Far Reach$(0), the maximum distance the wearer can break, place or interact with blocks, as well as attack or interact with entities is increased by about three blocks.", + "botania.page.reachRing0": "Through the power of one's Pride, nothing is out of their reach. By wearing the $(1)Ring of Far Reach$(0), the maximum distance the wearer can break, place or interact with blocks is increased by about three blocks.", "botania.page.reachRing1": "Fire and Blood", "botania.entry.divaCharm": "Charm of the Diva",