Always sync curios, fixes some desyncs. Also clarify that ring of far reach only works on blocks (for now?)

This commit is contained in:
Vincent Lee committed 2019-11-11 17:30:59 -06:00
1 parent 1e8c3fce46
commit 84537a7495
5 files changed
+2 -16

No files matched your search

@@ -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
@@ -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))
@@ -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;
@@ -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) {
@@ -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",