diff --git a/fabric/src/main/java/net/blay09/mods/waystones/datagen/ModItemTagProvider.java b/fabric/src/main/java/net/blay09/mods/waystones/datagen/ModItemTagProvider.java index ad645a49..ee3b2e09 100644 --- a/fabric/src/main/java/net/blay09/mods/waystones/datagen/ModItemTagProvider.java +++ b/fabric/src/main/java/net/blay09/mods/waystones/datagen/ModItemTagProvider.java @@ -21,7 +21,6 @@ public ModItemTagProvider(FabricDataOutput output, CompletableFuture placeWarpPlate(Level level, BlockPos pos) { } @Override - public Optional getBoundWaystone(ItemStack itemStack) { + public Optional getBoundWaystone(Player player, ItemStack itemStack) { if (itemStack.getItem() instanceof IAttunementItem attunementItem) { - return Optional.ofNullable(attunementItem.getWaystoneAttunedTo(Balm.getHooks().getServer(), itemStack)); + return Optional.ofNullable(attunementItem.getWaystoneAttunedTo(Balm.getHooks().getServer(), player, itemStack)); } return Optional.empty(); } diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/IAttunementItem.java b/shared/src/main/java/net/blay09/mods/waystones/api/IAttunementItem.java index 6b736720..516cc185 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/api/IAttunementItem.java +++ b/shared/src/main/java/net/blay09/mods/waystones/api/IAttunementItem.java @@ -1,12 +1,13 @@ package net.blay09.mods.waystones.api; import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.Nullable; public interface IAttunementItem { @Nullable - IWaystone getWaystoneAttunedTo(@Nullable MinecraftServer server, ItemStack itemStack); + IWaystone getWaystoneAttunedTo(@Nullable MinecraftServer server, @Nullable Player player, ItemStack itemStack); void setWaystoneAttunedTo(ItemStack itemStack, @Nullable IWaystone waystone); } diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/InternalMethods.java b/shared/src/main/java/net/blay09/mods/waystones/api/InternalMethods.java index 25538956..c19e156c 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/api/InternalMethods.java +++ b/shared/src/main/java/net/blay09/mods/waystones/api/InternalMethods.java @@ -4,6 +4,7 @@ import net.blay09.mods.waystones.core.WarpMode; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -41,7 +42,7 @@ public interface InternalMethods { Optional placeWarpPlate(Level level, BlockPos pos); - Optional getBoundWaystone(ItemStack itemStack); + Optional getBoundWaystone(Player player, ItemStack itemStack); void setBoundWaystone(ItemStack itemStack, @Nullable IWaystone waystone); } diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/WaystonesAPI.java b/shared/src/main/java/net/blay09/mods/waystones/api/WaystonesAPI.java index c2d3ecea..4a416fd0 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/api/WaystonesAPI.java +++ b/shared/src/main/java/net/blay09/mods/waystones/api/WaystonesAPI.java @@ -6,6 +6,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -82,8 +83,8 @@ public static Optional placeWarpPlate(Level level, BlockPos pos) { return __internalMethods.placeWarpPlate(level, pos); } - public static Optional getBoundWaystone(ItemStack itemStack) { - return __internalMethods.getBoundWaystone(itemStack); + public static Optional getBoundWaystone(Player player, ItemStack itemStack) { + return __internalMethods.getBoundWaystone(player, itemStack); } public static void setBoundWaystone(ItemStack itemStack, IWaystone waystone) { diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/WaystoneBlock.java b/shared/src/main/java/net/blay09/mods/waystones/block/WaystoneBlock.java index 733efa5e..75cc6397 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/WaystoneBlock.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/WaystoneBlock.java @@ -80,10 +80,6 @@ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { @Override protected InteractionResult handleActivation(Level world, BlockPos pos, Player player, WaystoneBlockEntityBase tileEntity, IWaystone waystone) { - if (player.getMainHandItem().is(ModItemTags.BOUND_SCROLLS)) { - return InteractionResult.PASS; - } - boolean isActivated = PlayerWaystoneManager.isWaystoneActivated(player, waystone); if (isActivated) { if (!world.isClientSide) { diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/WaystoneBlockBase.java b/shared/src/main/java/net/blay09/mods/waystones/block/WaystoneBlockBase.java index b304db88..ac5751a0 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/WaystoneBlockBase.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/WaystoneBlockBase.java @@ -130,7 +130,7 @@ public BlockState playerWillDestroy(Level world, BlockPos pos, BlockState state, // If not silk touching, don't bother dropping shards attuned to this waystone, since the waystone is gonna die anyways if (!hasSilkTouch && itemStack.getItem() == ModItems.attunedShard) { - IWaystone waystoneAttunedTo = ((IAttunementItem) ModItems.attunedShard).getWaystoneAttunedTo(world.getServer(), itemStack); + IWaystone waystoneAttunedTo = ((IAttunementItem) ModItems.attunedShard).getWaystoneAttunedTo(world.getServer(), player, itemStack); if (waystoneAttunedTo != null && waystoneAttunedTo.getWaystoneUid().equals(waystoneBlockEntity.getWaystone().getWaystoneUid())) { continue; } diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WarpPlateBlockEntity.java b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WarpPlateBlockEntity.java index effad986..b275c7e6 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WarpPlateBlockEntity.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WarpPlateBlockEntity.java @@ -172,7 +172,7 @@ public void serverTick() { iterator.remove(); } else if (ticksPassed > useTime) { ItemStack targetAttunementStack = getTargetAttunementStack(); - IWaystone targetWaystone = WaystonesAPI.getBoundWaystone(targetAttunementStack).orElse(null); + IWaystone targetWaystone = WaystonesAPI.getBoundWaystone(null, targetAttunementStack).orElse(null); if (targetWaystone != null && targetWaystone.isValid()) { teleportToTarget(entity, targetWaystone, targetAttunementStack); } @@ -295,7 +295,7 @@ public ItemStack getTargetAttunementStack() { for (int i = 0; i < getContainerSize(); i++) { ItemStack itemStack = getItem(i); if (itemStack.is(ModItemTags.WARP_SHARDS)) { - IWaystone waystoneAttunedTo = WaystonesAPI.getBoundWaystone(itemStack).orElse(null); + IWaystone waystoneAttunedTo = WaystonesAPI.getBoundWaystone(null, itemStack).orElse(null); if (waystoneAttunedTo != null && !waystoneAttunedTo.getWaystoneUid().equals(getWaystone().getWaystoneUid())) { attunedShards.add(itemStack); } @@ -318,7 +318,7 @@ public ItemStack getTargetAttunementStack() { } public Optional getTargetWaystone() { - return WaystonesAPI.getBoundWaystone(getTargetAttunementStack()); + return WaystonesAPI.getBoundWaystone(null, getTargetAttunementStack()); } public void markEntityForCooldown(Entity entity) { diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntityBase.java b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntityBase.java index 6732eb08..c908ddb6 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntityBase.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WaystoneBlockEntityBase.java @@ -283,8 +283,15 @@ protected WaystoneRecipe trySelectRecipe() { if (level == null) { return null; } + + // Prevent crafting when more than one item is present in center slot if (getItem(0).getCount() > 1) { - return null; //prevents crafting when more than 1 ingredient is present + return null; + } + + // Prevent crafting if center slot is already attuned + if (WaystonesAPI.getBoundWaystone(null, getItem(0)).isPresent()) { + return null; } return level.getRecipeManager().getRecipeFor(ModRecipes.waystoneRecipeType, this, level) @@ -326,7 +333,7 @@ protected void craft(WaystoneRecipe recipe) { public Collection getAuxiliaryTargets() { final var result = new ArrayList(); for (final var item : getItems()) { - WaystonesAPI.getBoundWaystone(item).ifPresent(result::add); + WaystonesAPI.getBoundWaystone(null, item).ifPresent(result::add); } return result; } diff --git a/shared/src/main/java/net/blay09/mods/waystones/client/gui/widget/WaystoneInventoryButton.java b/shared/src/main/java/net/blay09/mods/waystones/client/gui/widget/WaystoneInventoryButton.java index 58e8cfc1..123686b1 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/client/gui/widget/WaystoneInventoryButton.java +++ b/shared/src/main/java/net/blay09/mods/waystones/client/gui/widget/WaystoneInventoryButton.java @@ -36,7 +36,7 @@ public WaystoneInventoryButton(AbstractContainerScreen parentScreen, OnPress this.visiblePredicate = visiblePredicate; this.xPosition = xPosition; this.yPosition = yPosition; - this.iconItem = new ItemStack(ModItems.boundScroll); + this.iconItem = new ItemStack(ModItems.returnScroll); this.iconItemHovered = new ItemStack(ModItems.warpScroll); } diff --git a/shared/src/main/java/net/blay09/mods/waystones/core/PlayerWaystoneManager.java b/shared/src/main/java/net/blay09/mods/waystones/core/PlayerWaystoneManager.java index 4b0e5508..f40e3961 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/core/PlayerWaystoneManager.java +++ b/shared/src/main/java/net/blay09/mods/waystones/core/PlayerWaystoneManager.java @@ -155,7 +155,6 @@ public static ItemStack findWarpItem(Entity entity, WarpMode warpMode) { case WARP_SCROLL -> findWarpItem(entity, ModItemTags.WARP_SCROLLS); case WARP_STONE -> findWarpItem(entity, ModItemTags.WARP_STONES); case RETURN_SCROLL -> findWarpItem(entity, ModItemTags.RETURN_SCROLLS); - case BOUND_SCROLL -> findWarpItem(entity, ModItemTags.BOUND_SCROLLS); default -> ItemStack.EMPTY; }; } @@ -180,7 +179,6 @@ public static boolean canUseWarpMode(Entity entity, WarpMode warpMode, ItemStack return switch (warpMode) { case INVENTORY_BUTTON -> entity instanceof Player && PlayerWaystoneManager.canUseInventoryButton(((Player) entity)); case WARP_SCROLL -> !heldItem.isEmpty() && heldItem.is(ModItemTags.WARP_SCROLLS); - case BOUND_SCROLL -> !heldItem.isEmpty() && heldItem.is(ModItemTags.BOUND_SCROLLS); case RETURN_SCROLL -> !heldItem.isEmpty() && heldItem.is(ModItemTags.RETURN_SCROLLS); case WARP_STONE -> !heldItem.isEmpty() && heldItem.is(ModItemTags.WARP_STONES) && entity instanceof Player && PlayerWaystoneManager.canUseWarpStone(((Player) entity), heldItem); diff --git a/shared/src/main/java/net/blay09/mods/waystones/core/WarpMode.java b/shared/src/main/java/net/blay09/mods/waystones/core/WarpMode.java index c8bdad86..b87f2c73 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/core/WarpMode.java +++ b/shared/src/main/java/net/blay09/mods/waystones/core/WarpMode.java @@ -18,7 +18,6 @@ public enum WarpMode { INVENTORY_BUTTON(() -> WaystonesConfig.getActive().xpCost.inventoryButtonXpCostMultiplier, WarpMode::always, false), WARP_SCROLL(() -> 0.0, WarpMode::always, true), RETURN_SCROLL(() -> 0.0, WarpMode::always, true), - BOUND_SCROLL(() -> 0.0, WarpMode::always, true), WARP_STONE(() -> WaystonesConfig.getActive().xpCost.warpStoneXpCostMultiplier, WarpMode::always, false), WAYSTONE_TO_WAYSTONE(() -> WaystonesConfig.getActive().xpCost.waystoneXpCostMultiplier, WarpMode::always, false), SHARESTONE_TO_SHARESTONE(() -> WaystonesConfig.getActive().xpCost.sharestoneXpCostMultiplier, WarpMode::always, false), diff --git a/shared/src/main/java/net/blay09/mods/waystones/item/AbstractAttunedShardItem.java b/shared/src/main/java/net/blay09/mods/waystones/item/AbstractAttunedShardItem.java index 8f2a64f9..89fb8fac 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/item/AbstractAttunedShardItem.java +++ b/shared/src/main/java/net/blay09/mods/waystones/item/AbstractAttunedShardItem.java @@ -31,7 +31,7 @@ public AbstractAttunedShardItem(Properties properties) { @Override public boolean isFoil(ItemStack itemStack) { - IWaystone waystoneAttunedTo = getWaystoneAttunedTo(null, itemStack); + IWaystone waystoneAttunedTo = getWaystoneAttunedTo(null, null, itemStack); return waystoneAttunedTo != null && waystoneAttunedTo.isValid(); } @@ -39,7 +39,7 @@ public boolean isFoil(ItemStack itemStack) { public void appendHoverText(ItemStack stack, @Nullable Level world, List list, TooltipFlag flag) { super.appendHoverText(stack, world, list, flag); - IWaystone attunedWaystone = getWaystoneAttunedTo(null, stack); + IWaystone attunedWaystone = getWaystoneAttunedTo(null, null, stack); if (attunedWaystone == null || !attunedWaystone.isValid()) { var textComponent = Component.translatable("tooltip.waystones.attuned_shard.attunement_lost"); textComponent.withStyle(ChatFormatting.GRAY); @@ -68,7 +68,7 @@ public void appendHoverText(ItemStack stack, @Nullable Level world, List use(Level world, Player player, InteractionHand hand) { - ItemStack itemStack = player.getItemInHand(hand); - IWaystone boundTo = getBoundTo(player, itemStack); - if (boundTo != null) { - if (!player.isUsingItem() && world.isClientSide) { - world.playSound(null, player, SoundEvents.PORTAL_TRIGGER, SoundSource.PLAYERS, 0.1f, 2f); - } - - if (getUseDuration(itemStack) <= 0 || Compat.isVivecraftInstalled) { - finishUsingItem(itemStack, world, player); - } else { - player.startUsingItem(hand); - } - - return new InteractionResultHolder<>(InteractionResult.SUCCESS, itemStack); - } else { - var chatComponent = Component.translatable("chat.waystones.scroll_not_yet_bound"); - chatComponent.withStyle(ChatFormatting.RED); - player.displayClientMessage(chatComponent, true); - return new InteractionResultHolder<>(InteractionResult.FAIL, itemStack); - } - - } - - @Override - public void appendHoverText(ItemStack stack, @Nullable Level world, List list, TooltipFlag flag) { - Player player = Balm.getProxy().getClientPlayer(); - if (player == null) { - return; - } - - IWaystone boundTo = getBoundTo(player, stack); - MutableComponent targetText = boundTo != null ? Component.literal(boundTo.getName()) : Component.translatable("tooltip.waystones.bound_to_none"); - if (boundTo != null) { - targetText.withStyle(ChatFormatting.AQUA); - } - - var boundToText = Component.translatable("tooltip.waystones.bound_to", targetText); - boundToText.withStyle(ChatFormatting.GRAY); - list.add(boundToText); - } - -} diff --git a/shared/src/main/java/net/blay09/mods/waystones/item/CrumblingAttunedShardItem.java b/shared/src/main/java/net/blay09/mods/waystones/item/CrumblingAttunedShardItem.java index eed5873f..12edbadf 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/item/CrumblingAttunedShardItem.java +++ b/shared/src/main/java/net/blay09/mods/waystones/item/CrumblingAttunedShardItem.java @@ -23,7 +23,7 @@ public CrumblingAttunedShardItem(Properties properties) { public void appendHoverText(ItemStack stack, @Nullable Level world, List list, TooltipFlag flag) { super.appendHoverText(stack, world, list, flag); - IWaystone attunedWarpPlate = getWaystoneAttunedTo(null, stack); + IWaystone attunedWarpPlate = getWaystoneAttunedTo(null, null, stack); if (attunedWarpPlate != null && attunedWarpPlate.isValid()) { var textComponent = Component.translatable("tooltip.waystones.attuned_shard.attunement_crumbling"); textComponent.withStyle(ChatFormatting.WHITE).withStyle(ChatFormatting.ITALIC); diff --git a/shared/src/main/java/net/blay09/mods/waystones/item/ModItems.java b/shared/src/main/java/net/blay09/mods/waystones/item/ModItems.java index 01c9eb31..7a34f14e 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/item/ModItems.java +++ b/shared/src/main/java/net/blay09/mods/waystones/item/ModItems.java @@ -14,7 +14,6 @@ public class ModItems { public static DeferredObject creativeModeTab; public static Item returnScroll; - public static Item boundScroll; public static Item warpScroll; public static Item warpStone; public static Item warpDust; @@ -23,7 +22,6 @@ public class ModItems { public static void initialize(BalmItems items) { items.registerItem(() -> returnScroll = new ReturnScrollItem(items.itemProperties()), id("return_scroll")); - items.registerItem(() -> boundScroll = new BoundScrollItem(items.itemProperties()), id("bound_scroll")); items.registerItem(() -> warpScroll = new WarpScrollItem(items.itemProperties()), id("warp_scroll")); items.registerItem(() -> warpStone = new WarpStoneItem(items.itemProperties()), id("warp_stone")); items.registerItem(() -> warpDust = new WarpDustItem(items.itemProperties()), id("warp_dust")); diff --git a/shared/src/main/java/net/blay09/mods/waystones/item/ReturnScrollItem.java b/shared/src/main/java/net/blay09/mods/waystones/item/ReturnScrollItem.java index d7fc198d..1e3caa0a 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/item/ReturnScrollItem.java +++ b/shared/src/main/java/net/blay09/mods/waystones/item/ReturnScrollItem.java @@ -2,25 +2,19 @@ import net.blay09.mods.waystones.api.IWaystone; import net.blay09.mods.waystones.core.PlayerWaystoneManager; -import net.blay09.mods.waystones.core.WarpMode; +import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.Nullable; -public class ReturnScrollItem extends BoundScrollItem { +public class ReturnScrollItem extends WarpScrollItem { public ReturnScrollItem(Properties properties) { super(properties); } - @Nullable @Override - protected IWaystone getBoundTo(Player player, ItemStack itemStack) { + public @Nullable IWaystone getWaystoneAttunedTo(MinecraftServer server, Player player, ItemStack itemStack) { return PlayerWaystoneManager.getNearestWaystone(player); } - - @Override - protected WarpMode getWarpMode() { - return WarpMode.RETURN_SCROLL; - } } diff --git a/shared/src/main/java/net/blay09/mods/waystones/item/WarpScrollItem.java b/shared/src/main/java/net/blay09/mods/waystones/item/WarpScrollItem.java index 2964f2da..5215e8e2 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/item/WarpScrollItem.java +++ b/shared/src/main/java/net/blay09/mods/waystones/item/WarpScrollItem.java @@ -2,16 +2,22 @@ import net.blay09.mods.balm.api.Balm; import net.blay09.mods.balm.api.menu.BalmMenuProvider; +import net.blay09.mods.waystones.api.IAttunementItem; import net.blay09.mods.waystones.api.IResetUseOnDamage; +import net.blay09.mods.waystones.api.IWaystone; import net.blay09.mods.waystones.compat.Compat; import net.blay09.mods.waystones.config.WaystonesConfig; -import net.blay09.mods.waystones.core.PlayerWaystoneManager; -import net.blay09.mods.waystones.core.WarpMode; -import net.blay09.mods.waystones.core.Waystone; +import net.blay09.mods.waystones.core.*; import net.blay09.mods.waystones.menu.ModMenus; import net.blay09.mods.waystones.menu.WaystoneSelectionMenu; +import net.minecraft.ChatFormatting; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtUtils; +import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -23,9 +29,14 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; -public class WarpScrollItem extends ScrollItemBase implements IResetUseOnDamage { +import java.util.List; +import java.util.Objects; + +public class WarpScrollItem extends ScrollItemBase implements IResetUseOnDamage, IAttunementItem { public WarpScrollItem(Properties properties) { super(properties); @@ -39,24 +50,29 @@ public int getUseDuration(ItemStack itemStack) { @Override public ItemStack finishUsingItem(ItemStack itemStack, Level world, LivingEntity entity) { if (!world.isClientSide && entity instanceof ServerPlayer player) { - final var waystones = PlayerWaystoneManager.getTargetsForItem(player, itemStack); - PlayerWaystoneManager.ensureSortingIndex(player, waystones); - Balm.getNetworking().openGui(((ServerPlayer) entity), new BalmMenuProvider() { - @Override - public Component getDisplayName() { - return Component.translatable("container.waystones.waystone_selection"); - } - - @Override - public AbstractContainerMenu createMenu(int windowId, Inventory playerInventory, Player player) { - return new WaystoneSelectionMenu(ModMenus.warpScrollSelection.get(), WarpMode.WARP_SCROLL, null, windowId, waystones); - } - - @Override - public void writeScreenOpeningData(ServerPlayer player, FriendlyByteBuf buf) { - Waystone.writeList(buf, waystones); - } - }); + final var boundTo = getWaystoneAttunedTo(player.getServer(), player, itemStack); + if (boundTo != null) { + WaystoneTeleportManager.tryTeleportToWaystone(player, boundTo, WarpMode.WARP_SCROLL, null); + } else { + final var waystones = PlayerWaystoneManager.getTargetsForItem(player, itemStack); + PlayerWaystoneManager.ensureSortingIndex(player, waystones); + Balm.getNetworking().openGui(((ServerPlayer) entity), new BalmMenuProvider() { + @Override + public Component getDisplayName() { + return Component.translatable("container.waystones.waystone_selection"); + } + + @Override + public AbstractContainerMenu createMenu(int windowId, Inventory playerInventory, Player player) { + return new WaystoneSelectionMenu(ModMenus.warpScrollSelection.get(), WarpMode.WARP_SCROLL, null, windowId, waystones); + } + + @Override + public void writeScreenOpeningData(ServerPlayer player, FriendlyByteBuf buf) { + Waystone.writeList(buf, waystones); + } + }); + } } return itemStack; } @@ -80,5 +96,43 @@ public boolean isFoil(ItemStack itemStack) { return true; } + @Nullable + @Override + public IWaystone getWaystoneAttunedTo(MinecraftServer server, Player player, ItemStack itemStack) { + CompoundTag compound = itemStack.getTag(); + if (compound != null && compound.contains("AttunedToWaystone", Tag.TAG_INT_ARRAY)) { + return new WaystoneProxy(server, NbtUtils.loadUUID(Objects.requireNonNull(compound.get("AttunedToWaystone")))); + } + + return null; + } + + @Override + public void setWaystoneAttunedTo(ItemStack itemStack, @Nullable IWaystone waystone) { + CompoundTag tagCompound = itemStack.getTag(); + if (tagCompound == null) { + tagCompound = new CompoundTag(); + itemStack.setTag(tagCompound); + } + if (waystone != null) { + tagCompound.put("AttunedToWaystone", NbtUtils.createUUID(waystone.getWaystoneUid())); + } else { + tagCompound.remove("AttunedToWaystone"); + } + } + + @Override + public void appendHoverText(ItemStack itemStack, @Nullable Level world, List list, TooltipFlag flag) { + final var player = Balm.getProxy().getClientPlayer(); + if (player == null) { + return; + } + + final var boundTo = getWaystoneAttunedTo(player.getServer(), player, itemStack); + if (boundTo != null) { + final var boundToValueComponent = Component.literal(boundTo.getName()).withStyle(ChatFormatting.AQUA); + list.add(Component.translatable("tooltip.waystones.bound_to", boundToValueComponent).withStyle(ChatFormatting.GRAY)); + } + } } diff --git a/shared/src/main/java/net/blay09/mods/waystones/recipe/WaystoneRecipe.java b/shared/src/main/java/net/blay09/mods/waystones/recipe/WaystoneRecipe.java index 3db5e653..f2762ef7 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/recipe/WaystoneRecipe.java +++ b/shared/src/main/java/net/blay09/mods/waystones/recipe/WaystoneRecipe.java @@ -108,12 +108,8 @@ static class Serializer implements RecipeSerializer { Ingredient.CODEC.listOf().fieldOf("secondary") .flatXmap(secondary -> { Ingredient[] ingredients = secondary.stream().filter((ingredient) -> !ingredient.isEmpty()).toArray(Ingredient[]::new); - if (ingredients.length == 0) { - return DataResult.error(() -> "No secondary ingredients for warp plate recipe"); - } else { - return ingredients.length > 4 ? DataResult.error(() -> "Too many secondary ingredients for warp plate recipe") : DataResult.success( - NonNullList.of(Ingredient.EMPTY, ingredients)); - } + return ingredients.length > 4 ? DataResult.error(() -> "Too many secondary ingredients for warp plate recipe") : DataResult.success( + NonNullList.of(Ingredient.EMPTY, ingredients)); }, DataResult::success) .forGetter(recipe -> recipe.secondaryIngredients) ) diff --git a/shared/src/main/java/net/blay09/mods/waystones/tag/ModItemTags.java b/shared/src/main/java/net/blay09/mods/waystones/tag/ModItemTags.java index bc8d578b..8b83c51a 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/tag/ModItemTags.java +++ b/shared/src/main/java/net/blay09/mods/waystones/tag/ModItemTags.java @@ -7,7 +7,6 @@ import net.minecraft.world.item.Item; public class ModItemTags { - public static final TagKey BOUND_SCROLLS = TagKey.create(Registries.ITEM, new ResourceLocation(Waystones.MOD_ID, "bound_scrolls")); public static final TagKey RETURN_SCROLLS = TagKey.create(Registries.ITEM, new ResourceLocation(Waystones.MOD_ID, "return_scrolls")); public static final TagKey WARP_SCROLLS = TagKey.create(Registries.ITEM, new ResourceLocation(Waystones.MOD_ID, "warp_scrolls")); public static final TagKey WARP_STONES = TagKey.create(Registries.ITEM, new ResourceLocation(Waystones.MOD_ID, "warp_stones")); diff --git a/shared/src/main/resources/assets/waystones/lang/cs_cz.json b/shared/src/main/resources/assets/waystones/lang/cs_cz.json index 525f7d72..d990e81a 100644 --- a/shared/src/main/resources/assets/waystones/lang/cs_cz.json +++ b/shared/src/main/resources/assets/waystones/lang/cs_cz.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Teleportační deska", "block.waystones.portstone": "Teleportační kámen", "item.waystones.warp_scroll": "Cestovní svitek", - "item.waystones.warp_scroll_bound": "Cestovní svitek (Spojený)", "item.waystones.return_scroll": "Svitek návratu", "item.waystones.warp_stone": "Kámen zvlnění", - "item.waystones.bound_scroll": "Spojený svitek", "item.waystones.warp_dust": "Teleportační prach", "item.waystones.attuned_shard": "Naladěný úlomek", "container.waystones.waystone_selection": "Vyber svou destinaci:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Vrátit se k cestovnímu kameni...", "gui.waystones.inventory.return_to_nearest_waystone": "Vrátit se k nejbližšímu cestovnímu kameni", "chat.waystones.waystone_activated": "Aktivovaný cestovní kámen: %s", - "chat.waystones.scroll_bound": "Svitek spojen: %s", - "chat.waystones.scroll_not_yet_bound": "Tento svitek není spojen s žádným cestovním kamenem.", "chat.waystones.cannot_dimension_warp": "Nemůžeš se teleportovat mezi těmito světy.", "chat.waystones.waystone_missing": "Cestovní kámen ke kterému jsi se zkoušel teleportovat je v přesunu nebo zmizel.", "chat.waystones.cannot_transport_leashed": "Nemůžeš s sebou vzít mobové s lanem", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Úlomek uvnitř této cestovní desky ztratil svoje zasvěcení.", "tooltip.waystones.cooldown_left": "Obnova: %d sekund", "tooltip.waystones.bound_to": "Spojeno s: %s", - "tooltip.waystones.bound_to_none": "Nic", "tooltip.waystones.portstone": "Nemůže být k němu teleportováno.", "tooltip.waystones.sharestone": "Teleportuj se k jinému bezbarvému kameni sdílení", "tooltip.waystones.white_sharestone": "Teleportuj se k jinému bílému kameni sdílení", diff --git a/shared/src/main/resources/assets/waystones/lang/de_de.json b/shared/src/main/resources/assets/waystones/lang/de_de.json index 55f85190..97d45e2c 100644 --- a/shared/src/main/resources/assets/waystones/lang/de_de.json +++ b/shared/src/main/resources/assets/waystones/lang/de_de.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Warpplatte", "block.waystones.portstone": "Portstein", "item.waystones.warp_scroll": "Warp-Schriftrolle", - "item.waystones.warp_scroll_bound": "Warp-Schriftrolle (Gebunden)", "item.waystones.return_scroll": "Rückkehr-Schriftrolle", "item.waystones.warp_stone": "Warpstein", - "item.waystones.bound_scroll": "Gebundene Schriftrolle", "item.waystones.warp_dust": "Warppulver", "item.waystones.attuned_shard": "Eingestellter Splitter", "container.waystones.waystone_selection": "Wähle dein Ziel:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Zurück zum Wegstein ...", "gui.waystones.inventory.return_to_nearest_waystone": "Kehre zum nächsten Wegstein zurück", "chat.waystones.waystone_activated": "Aktivierter Wegstein: %s", - "chat.waystones.scroll_bound": "Schriftrolle gebunden: %s", - "chat.waystones.scroll_not_yet_bound": "Diese Schriftrolle ist nicht an einen Wegstein gebunden.", "chat.waystones.cannot_dimension_warp": "Du kannst nicht zwischen disen Welten hin- und herwechseln.", "chat.waystones.waystone_missing": "Der Wegstein, zu dem Du versucht hast, dich zu teleportieren, wird derzeit verschoben oder ist verschwunden.", "chat.waystones.cannot_transport_leashed": "Du kannst keine angeleinten Kreaturen mitnehmen", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Der Splitter in dieser Warpplatte hat seine Einstellung verloren.", "tooltip.waystones.cooldown_left": "Abklingzeit: %d Sekunden", "tooltip.waystones.bound_to": "Gebunden an: %s", - "tooltip.waystones.bound_to_none": "None", "tooltip.waystones.portstone": "Kann nicht dorthin teleportieren.", "tooltip.waystones.sharestone": "Teleportiere zu jedem anderen farblosen Teilstein", "tooltip.waystones.white_sharestone": "Teleportiere zu jedem anderen weißen Teilstein", diff --git a/shared/src/main/resources/assets/waystones/lang/en_us.json b/shared/src/main/resources/assets/waystones/lang/en_us.json index b8395d5a..813ef1a3 100644 --- a/shared/src/main/resources/assets/waystones/lang/en_us.json +++ b/shared/src/main/resources/assets/waystones/lang/en_us.json @@ -27,10 +27,8 @@ "block.waystones.portstone": "Portstone", "block.waystones.landing_stone": "Landing Stone", "item.waystones.warp_scroll": "Warp Scroll", - "item.waystones.warp_scroll_bound": "Warp Scroll (Bound)", "item.waystones.return_scroll": "Return Scroll", "item.waystones.warp_stone": "Warp Stone", - "item.waystones.bound_scroll": "Bound Scroll", "item.waystones.warp_dust": "Warp Dust", "item.waystones.attuned_shard": "Attuned Shard", "item.waystones.crumbling_attuned_shard": "Crumbling Attuned Shard", @@ -57,8 +55,6 @@ "gui.waystones.inventory.return_to_waystone": "Return to Waystone ...", "gui.waystones.inventory.return_to_nearest_waystone": "Return to Nearest Waystone", "chat.waystones.waystone_activated": "Activated Waystone: %s", - "chat.waystones.scroll_bound": "Scroll bound: %s", - "chat.waystones.scroll_not_yet_bound": "This scroll is not bound to a waystone.", "chat.waystones.cannot_dimension_warp": "You cannot warp between these worlds.", "chat.waystones.waystone_missing": "The waystone you tried to teleport to is currently being moved or has gone missing.", "chat.waystones.cannot_transport_leashed": "You cannot take leashed mobs with you", @@ -73,7 +69,6 @@ "chat.waystones.not_enough_xp": "You do not have enough experience to teleport.", "tooltip.waystones.cooldown_left": "Cooldown: %d seconds", "tooltip.waystones.bound_to": "Bound to: %s", - "tooltip.waystones.bound_to_none": "None", "tooltip.waystones.portstone": "Can not be teleported to.", "tooltip.waystones.sharestone": "Teleport to any other colorless Sharestone", "tooltip.waystones.white_sharestone": "Teleport to any other White Sharestone", diff --git a/shared/src/main/resources/assets/waystones/lang/es_ar.json b/shared/src/main/resources/assets/waystones/lang/es_ar.json index 6bb2396f..9a570c98 100644 --- a/shared/src/main/resources/assets/waystones/lang/es_ar.json +++ b/shared/src/main/resources/assets/waystones/lang/es_ar.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Warp Plate", "block.waystones.portstone": "Portstone", "item.waystones.warp_scroll": "Warp en Pergamino", - "item.waystones.warp_scroll_bound": "Warp en Pergamino (Atado)", "item.waystones.return_scroll": "Pergamino para volver", "item.waystones.warp_stone": "Warp Stone", - "item.waystones.bound_scroll": "Pergamino Atado", "item.waystones.warp_dust": "Warp Dust", "item.waystones.attuned_shard": "Fragmento Sintonizado", "container.waystones.waystone_selection": "Selecciona tu destino:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Volver al Waystone ...", "gui.waystones.inventory.return_to_nearest_waystone": "Volver a la Waystone más cercana", "chat.waystones.waystone_activated": " Waystone Activada: %s", - "chat.waystones.scroll_bound": "Pergamino atado a: %s", - "chat.waystones.scroll_not_yet_bound": "Este Pergamino no está atado a un Waystone.", "chat.waystones.cannot_dimension_warp": "No puedes atravesar entre estos mundos.", "chat.waystones.waystone_missing": "El Waystone al que intentaste teletransportarte está siendo movido o ha desaparecido.", "chat.waystones.cannot_transport_leashed": "No puedes llevar mobs atados contigo", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "El Fragmento dentro de este Warp Plate ha perdido su sintonía.", "tooltip.waystones.cooldown_left": "Enfriamiento: %d segundos", "tooltip.waystones.bound_to": "Enlazado a: %s", - "tooltip.waystones.bound_to_none": "Ninguno", "tooltip.waystones.portstone": "No se puede teletransportar a.", "tooltip.waystones.sharestone": "Teletransportarse a cualquier otro Sharestone Incoloro", "tooltip.waystones.white_sharestone": "Teletransportarte a cualquier otra Sharestone Blanca", diff --git a/shared/src/main/resources/assets/waystones/lang/es_cl.json b/shared/src/main/resources/assets/waystones/lang/es_cl.json index 6bb2396f..9a570c98 100644 --- a/shared/src/main/resources/assets/waystones/lang/es_cl.json +++ b/shared/src/main/resources/assets/waystones/lang/es_cl.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Warp Plate", "block.waystones.portstone": "Portstone", "item.waystones.warp_scroll": "Warp en Pergamino", - "item.waystones.warp_scroll_bound": "Warp en Pergamino (Atado)", "item.waystones.return_scroll": "Pergamino para volver", "item.waystones.warp_stone": "Warp Stone", - "item.waystones.bound_scroll": "Pergamino Atado", "item.waystones.warp_dust": "Warp Dust", "item.waystones.attuned_shard": "Fragmento Sintonizado", "container.waystones.waystone_selection": "Selecciona tu destino:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Volver al Waystone ...", "gui.waystones.inventory.return_to_nearest_waystone": "Volver a la Waystone más cercana", "chat.waystones.waystone_activated": " Waystone Activada: %s", - "chat.waystones.scroll_bound": "Pergamino atado a: %s", - "chat.waystones.scroll_not_yet_bound": "Este Pergamino no está atado a un Waystone.", "chat.waystones.cannot_dimension_warp": "No puedes atravesar entre estos mundos.", "chat.waystones.waystone_missing": "El Waystone al que intentaste teletransportarte está siendo movido o ha desaparecido.", "chat.waystones.cannot_transport_leashed": "No puedes llevar mobs atados contigo", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "El Fragmento dentro de este Warp Plate ha perdido su sintonía.", "tooltip.waystones.cooldown_left": "Enfriamiento: %d segundos", "tooltip.waystones.bound_to": "Enlazado a: %s", - "tooltip.waystones.bound_to_none": "Ninguno", "tooltip.waystones.portstone": "No se puede teletransportar a.", "tooltip.waystones.sharestone": "Teletransportarse a cualquier otro Sharestone Incoloro", "tooltip.waystones.white_sharestone": "Teletransportarte a cualquier otra Sharestone Blanca", diff --git a/shared/src/main/resources/assets/waystones/lang/es_es.json b/shared/src/main/resources/assets/waystones/lang/es_es.json index 6bb2396f..9a570c98 100644 --- a/shared/src/main/resources/assets/waystones/lang/es_es.json +++ b/shared/src/main/resources/assets/waystones/lang/es_es.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Warp Plate", "block.waystones.portstone": "Portstone", "item.waystones.warp_scroll": "Warp en Pergamino", - "item.waystones.warp_scroll_bound": "Warp en Pergamino (Atado)", "item.waystones.return_scroll": "Pergamino para volver", "item.waystones.warp_stone": "Warp Stone", - "item.waystones.bound_scroll": "Pergamino Atado", "item.waystones.warp_dust": "Warp Dust", "item.waystones.attuned_shard": "Fragmento Sintonizado", "container.waystones.waystone_selection": "Selecciona tu destino:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Volver al Waystone ...", "gui.waystones.inventory.return_to_nearest_waystone": "Volver a la Waystone más cercana", "chat.waystones.waystone_activated": " Waystone Activada: %s", - "chat.waystones.scroll_bound": "Pergamino atado a: %s", - "chat.waystones.scroll_not_yet_bound": "Este Pergamino no está atado a un Waystone.", "chat.waystones.cannot_dimension_warp": "No puedes atravesar entre estos mundos.", "chat.waystones.waystone_missing": "El Waystone al que intentaste teletransportarte está siendo movido o ha desaparecido.", "chat.waystones.cannot_transport_leashed": "No puedes llevar mobs atados contigo", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "El Fragmento dentro de este Warp Plate ha perdido su sintonía.", "tooltip.waystones.cooldown_left": "Enfriamiento: %d segundos", "tooltip.waystones.bound_to": "Enlazado a: %s", - "tooltip.waystones.bound_to_none": "Ninguno", "tooltip.waystones.portstone": "No se puede teletransportar a.", "tooltip.waystones.sharestone": "Teletransportarse a cualquier otro Sharestone Incoloro", "tooltip.waystones.white_sharestone": "Teletransportarte a cualquier otra Sharestone Blanca", diff --git a/shared/src/main/resources/assets/waystones/lang/es_mx.json b/shared/src/main/resources/assets/waystones/lang/es_mx.json index 6bb2396f..9a570c98 100644 --- a/shared/src/main/resources/assets/waystones/lang/es_mx.json +++ b/shared/src/main/resources/assets/waystones/lang/es_mx.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Warp Plate", "block.waystones.portstone": "Portstone", "item.waystones.warp_scroll": "Warp en Pergamino", - "item.waystones.warp_scroll_bound": "Warp en Pergamino (Atado)", "item.waystones.return_scroll": "Pergamino para volver", "item.waystones.warp_stone": "Warp Stone", - "item.waystones.bound_scroll": "Pergamino Atado", "item.waystones.warp_dust": "Warp Dust", "item.waystones.attuned_shard": "Fragmento Sintonizado", "container.waystones.waystone_selection": "Selecciona tu destino:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Volver al Waystone ...", "gui.waystones.inventory.return_to_nearest_waystone": "Volver a la Waystone más cercana", "chat.waystones.waystone_activated": " Waystone Activada: %s", - "chat.waystones.scroll_bound": "Pergamino atado a: %s", - "chat.waystones.scroll_not_yet_bound": "Este Pergamino no está atado a un Waystone.", "chat.waystones.cannot_dimension_warp": "No puedes atravesar entre estos mundos.", "chat.waystones.waystone_missing": "El Waystone al que intentaste teletransportarte está siendo movido o ha desaparecido.", "chat.waystones.cannot_transport_leashed": "No puedes llevar mobs atados contigo", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "El Fragmento dentro de este Warp Plate ha perdido su sintonía.", "tooltip.waystones.cooldown_left": "Enfriamiento: %d segundos", "tooltip.waystones.bound_to": "Enlazado a: %s", - "tooltip.waystones.bound_to_none": "Ninguno", "tooltip.waystones.portstone": "No se puede teletransportar a.", "tooltip.waystones.sharestone": "Teletransportarse a cualquier otro Sharestone Incoloro", "tooltip.waystones.white_sharestone": "Teletransportarte a cualquier otra Sharestone Blanca", diff --git a/shared/src/main/resources/assets/waystones/lang/fr_fr.json b/shared/src/main/resources/assets/waystones/lang/fr_fr.json index 11072503..238741f2 100644 --- a/shared/src/main/resources/assets/waystones/lang/fr_fr.json +++ b/shared/src/main/resources/assets/waystones/lang/fr_fr.json @@ -24,10 +24,8 @@ "block.waystones.portstone": "Portstone", "item.waystones.warp_scroll": "Parchemin de téléportation", - "item.waystones.warp_scroll_bound": "Parchemin de téléportation (lié)", "item.waystones.return_scroll": "Parchemin de retour", "item.waystones.warp_stone": "Pierre de téléportation", - "item.waystones.bound_scroll": "Parchemin lié", "item.waystones.warp_dust": "Poudre de téléportation", "container.waystones.waystone_selection": "Choisissez votre destination:", @@ -51,8 +49,6 @@ "gui.waystones.inventory.return_to_nearest_waystone": "Retour à la waystone la plus proche", "chat.waystones.waystone_activated": "Waystone activée: %s", - "chat.waystones.scroll_bound": "Parchemin lié: %s", - "chat.waystones.scroll_not_yet_bound": "Ce parchemin n'est lié à aucune waystone.", "chat.waystones.cannot_dimension_warp": "Vous ne pouvez pas vous téléporter entre deux mondes.", "chat.waystones.warpstone_not_charged": "La pierre de téléportation n'est pas encore chargée.", "chat.waystones.only_owner_can_edit": "Le nom des waystones ne peut être changé que par leur propriétaires.", @@ -66,7 +62,6 @@ "tooltip.waystones.cooldown_left": "Recharge: %d secondes", "tooltip.waystones.bound_to": "Lié à: %s", - "tooltip.waystones.bound_to_none": "Aucune", "tooltip.waystones.portstone": "Ne peut être téléporté.", "tooltip.waystones.sharestone": "Téléportation vers n'importe quel autre Sharestone incolore", "tooltip.waystones.white_sharestone": "Se téléporter vers n'importe quel autre Blanc Sharestone", diff --git a/shared/src/main/resources/assets/waystones/lang/hu_hu.json b/shared/src/main/resources/assets/waystones/lang/hu_hu.json index b534d6fa..bb6b735e 100644 --- a/shared/src/main/resources/assets/waystones/lang/hu_hu.json +++ b/shared/src/main/resources/assets/waystones/lang/hu_hu.json @@ -4,10 +4,8 @@ "block.waystones.mossy_waystone": "Mohás irányoszlop", "block.waystones.sandy_waystone": "Homokos irányoszlop", "item.waystones.warp_scroll": "Ugró tekercs", - "item.waystones.warp_scroll_bound": "Ugró tekercs (Hozzákötve)", "item.waystones.return_scroll": "Visszatérő tekercs", "item.waystones.warp_stone": "Ugrókő", - "item.waystones.bound_scroll": "Kötött tekercs", "container.waystones.waystone_selection": "Uticél kiválasztása:", "container.waystones.waystone_settings": "Irányoszlop nevének megadása:", "gui.waystones.waystone_selection.next_page": "Következő", @@ -24,14 +22,11 @@ "gui.waystones.inventory.return_to_waystone": "Visszatérés az irányoszlophoz ...", "gui.waystones.inventory.return_to_nearest_waystone": "Visszatérés a legközelebbi irányoszlophoz", "chat.waystones.waystone_activated": "Aktivált irányoszlop: %s", - "chat.waystones.scroll_bound": "Tekercs hozzákötve: %s", - "chat.waystones.scroll_not_yet_bound": "Ez a tekercs nincs hozzákötve irányoszlophoz.", "chat.waystones.cannot_dimension_warp": "Nem ugorhatsz világok között.", "chat.waystones.warpstone_not_charged": "Az ugrókő még nincs teljesen feltöltve.", "chat.waystones.only_owner_can_edit": "Az irányoszlopok nevét csak az módosíthatja, aki lehelyezte.", "chat.waystones.only_creative_can_edit": "Kreatív módban kell lenned a globális irányoszlop módosításához.", "tooltip.waystones.cooldown_left": "Visszaszámlálás: %d másodperc", "tooltip.waystones.bound_to": "Hozzákötve: %s", - "tooltip.waystones.bound_to_none": "Semelyikhez", "stat.waystones.waystone_activated": "Aktivált irányoszlopok" } diff --git a/shared/src/main/resources/assets/waystones/lang/it_it.json b/shared/src/main/resources/assets/waystones/lang/it_it.json index e19e6380..764e75ee 100644 --- a/shared/src/main/resources/assets/waystones/lang/it_it.json +++ b/shared/src/main/resources/assets/waystones/lang/it_it.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Placca del teletrasporto", "block.waystones.portstone": "Portstone", "item.waystones.warp_scroll": "Pergamena del teletrasporto", - "item.waystones.warp_scroll_bound": "Pergamena del teletrasporto (Connessa)", "item.waystones.return_scroll": "Pergamena del ritorno", "item.waystones.warp_stone": "Pietra del viaggio rapido", - "item.waystones.bound_scroll": "Pergamena connessa", "item.waystones.warp_dust": "Polvere del teletrasporto", "item.waystones.attuned_shard": "Frammento sincronizzato", "container.waystones.waystone_selection": "Seleziona la destinazione:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Ritorno alla pietra miliare ...", "gui.waystones.inventory.return_to_nearest_waystone": "Ritorno alla più vicina pietra miliare", "chat.waystones.waystone_activated": "Luoghi attivi: %s", - "chat.waystones.scroll_bound": "Pergamena collegata: %s", - "chat.waystones.scroll_not_yet_bound": "Questa pergamena non è collegata a una pietra miliare.", "chat.waystones.cannot_dimension_warp": "Non puoi viaggiare attraverso i mondi.", "chat.waystones.waystone_missing": "La Pietra miliare a cui hai cercato di teletrasportarti è attualmente in fase di spostamento o è scomparsa.", "chat.waystones.cannot_transport_leashed": "Non puoi portare animali al guinzaglio con te", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Il frammento all'interno di questo piatto di curvatura ha perso la sua sintonia.", "tooltip.waystones.cooldown_left": "Rimanenti: %d secondi", "tooltip.waystones.bound_to": "Collegato a: %s", - "tooltip.waystones.bound_to_none": "Nessuno", "tooltip.waystones.portstone": "Non puoi teletrasportarti.", "tooltip.waystones.sharestone": "Teletrasportati su qualsiasi altra Sharestone incolore", "tooltip.waystones.white_sharestone": "Teletrasportati su qualsiasi altra Sharestone bianca", diff --git a/shared/src/main/resources/assets/waystones/lang/ja_jp.json b/shared/src/main/resources/assets/waystones/lang/ja_jp.json index 8a5969a5..8e547030 100644 --- a/shared/src/main/resources/assets/waystones/lang/ja_jp.json +++ b/shared/src/main/resources/assets/waystones/lang/ja_jp.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "ワーププレート", "block.waystones.portstone": "片道転移ポイント", "item.waystones.warp_scroll": "転移の巻物", - "item.waystones.warp_scroll_bound": "転移の巻物(行先固定)", "item.waystones.return_scroll": "帰還の巻物", "item.waystones.warp_stone": "ワープストーン", - "item.waystones.bound_scroll": "固定転移の巻物", "item.waystones.warp_dust": "ワープダスト", "item.waystones.attuned_shard": "ワーププレートの欠片", "container.waystones.waystone_selection": "転移先を選択してください:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "転移ポイントに転移", "gui.waystones.inventory.return_to_nearest_waystone": "最も近くの転移ポイントに転移", "chat.waystones.waystone_activated": "転移ポイント%sを活性化しました", - "chat.waystones.scroll_bound": "転移先を%sに設定しました", - "chat.waystones.scroll_not_yet_bound": "この巻物は転移先が設定されていません", "chat.waystones.cannot_dimension_warp": "異なるディメンジョンには転移できません", "chat.waystones.waystone_missing": "転移先の転移ポイントが移動したか破壊されています", "chat.waystones.cannot_transport_leashed": "Mobを連れたままでは転移できません", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "このワーププレートは転移先設定が破損した欠片があります", "tooltip.waystones.cooldown_left": "あと%d秒で使用可能", "tooltip.waystones.bound_to": "転移先: %s", - "tooltip.waystones.bound_to_none": "未設定", "tooltip.waystones.portstone": "設置場所からの転移だけが可能", "tooltip.waystones.sharestone": "任意の無色の共有転移ポイントに移動できる", "tooltip.waystones.white_sharestone": "任意の白色の共有転移ポイントに移動できる", diff --git a/shared/src/main/resources/assets/waystones/lang/ko_kr.json b/shared/src/main/resources/assets/waystones/lang/ko_kr.json index 51c13991..f59f23e7 100644 --- a/shared/src/main/resources/assets/waystones/lang/ko_kr.json +++ b/shared/src/main/resources/assets/waystones/lang/ko_kr.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "전송판", "block.waystones.portstone": "사출석", "item.waystones.warp_scroll": "전송 주문서", - "item.waystones.warp_scroll_bound": "전송 주문서 (연결)", "item.waystones.return_scroll": "귀환 주문서", "item.waystones.warp_stone": "휴대용 전송석", - "item.waystones.bound_scroll": "연결 주문서", "item.waystones.warp_dust": "전송 가루", "item.waystones.attuned_shard": "익숙한 파편", "container.waystones.waystone_selection": "목적지를 선택하세요:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "전송석으로 귀환 ...", "gui.waystones.inventory.return_to_nearest_waystone": "가장 가까운 전송석으로 귀환", "chat.waystones.waystone_activated": "활성화된 전송석들: %s", - "chat.waystones.scroll_bound": "주문서 연결: %s", - "chat.waystones.scroll_not_yet_bound": "이 주문서은 아직 전송석을 연결 하지 않았습니다.", "chat.waystones.cannot_dimension_warp": "이 월드간을 전송 할 수 없습니다.", "chat.waystones.waystone_missing": "당신이 이동하려는 전송석이 이동되었거나 사라졌습니다.", "chat.waystones.cannot_transport_leashed": "당신은 끈을 묶은 몹과 함께 이동할 수 없습니다.", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "전송판의 조각이 감응능력을 잃었습니다.", "tooltip.waystones.cooldown_left": "대기 시간: %d초", "tooltip.waystones.bound_to": "연결: %s", - "tooltip.waystones.bound_to_none": "없음", "tooltip.waystones.portstone": "이동할 수 없습니다.", "tooltip.waystones.sharestone": "다른 무색 공명석으로 이동할 수 있습니다", "tooltip.waystones.white_sharestone": "다른 하얀색 공명석으로 이동할 수 있습니다", diff --git a/shared/src/main/resources/assets/waystones/lang/no_no.json b/shared/src/main/resources/assets/waystones/lang/no_no.json index a988c306..a57205d6 100644 --- a/shared/src/main/resources/assets/waystones/lang/no_no.json +++ b/shared/src/main/resources/assets/waystones/lang/no_no.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Portalplate", "block.waystones.portstone": "Portstein", "item.waystones.warp_scroll": "Portalrull", - "item.waystones.warp_scroll_bound": "Portalrull (Bundet)", "item.waystones.return_scroll": "Returneringsrull", "item.waystones.warp_stone": "Portalstein", - "item.waystones.bound_scroll": "Bundet rull", "item.waystones.warp_dust": "Portalstøv", "item.waystones.attuned_shard": "Avstemt skår", "container.waystones.waystone_selection": "Velg din destinasjon:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Returner til vardestein ...", "gui.waystones.inventory.return_to_nearest_waystone": "Returner til nærmeste vardestein", "chat.waystones.waystone_activated": "Aktiverte vardestein: %s", - "chat.waystones.scroll_bound": "Rull bundet til: %s", - "chat.waystones.scroll_not_yet_bound": "Denne rullen er ikke bundet til en vardestein.", "chat.waystones.cannot_dimension_warp": "Du kan ikke teleportere mellom disse dimensjonene.", "chat.waystones.waystone_missing": "Vardesteinen du prøvde å teleportere til blir flyttet eller har forsvunnet.", "chat.waystones.cannot_transport_leashed": "Du kan ikke bringe med deg skapninger i tau", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Skåret i denne portalplaten er ikke lenger avstemt.", "tooltip.waystones.cooldown_left": "Nedkjøling: %d sekunder", "tooltip.waystones.bound_to": "Bundet til: %s", - "tooltip.waystones.bound_to_none": "Ingen", "tooltip.waystones.portstone": "Kan ikke teleporteres til.", "tooltip.waystones.sharestone": "Teleporter til enhver fargeløs delestein", "tooltip.waystones.white_sharestone": "Teleporter til enhver hvit delestein", diff --git a/shared/src/main/resources/assets/waystones/lang/pl_pl.json b/shared/src/main/resources/assets/waystones/lang/pl_pl.json index 788073bd..4cb0526f 100644 --- a/shared/src/main/resources/assets/waystones/lang/pl_pl.json +++ b/shared/src/main/resources/assets/waystones/lang/pl_pl.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Płyta teleportacyjna", "block.waystones.portstone": "Jednostronny kamień teleportacyjny", "item.waystones.warp_scroll": "Zwój teleportacyjny", - "item.waystones.warp_scroll_bound": "Zwój teleportacyjny (Przypisany)", "item.waystones.return_scroll": "Zwój powrotu", "item.waystones.warp_stone": "Klejnot teleportacyjny", - "item.waystones.bound_scroll": "Przypisany zwój", "item.waystones.warp_dust": "Pył teleportacyjny", "item.waystones.attuned_shard": "Dostrojony odłamek", "container.waystones.waystone_selection": "Wybierz cel podróży:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Powróć do kamienia", "gui.waystones.inventory.return_to_nearest_waystone": "Powróć do najbliższego kamienia", "chat.waystones.waystone_activated": "Aktywowany kamień: %s", - "chat.waystones.scroll_bound": "Zwój przypisany: %s", - "chat.waystones.scroll_not_yet_bound": "Ten zwój nie jest przypisany do żadnego kamienia teleportacyjnego.", "chat.waystones.cannot_dimension_warp": "Nie możesz przenosić się między tymi światami.", "chat.waystones.waystone_missing": "Kamień teleportacyjny, do którego próbowałeś się teleportować, jest obecnie przenoszony lub zaginął.", "chat.waystones.cannot_transport_leashed": "Nie możesz zabrać ze sobą mobów na smyczy", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Odłamek znajdujący się w tej płytce stracił moc.", "tooltip.waystones.cooldown_left": "Odnowienie: %d sekund", "tooltip.waystones.bound_to": "Przypisany do: %s", - "tooltip.waystones.bound_to_none": "Żaden", "tooltip.waystones.portstone": "Nie można się do niego teleportować.", "tooltip.waystones.sharestone": "Teleportuj się do dowolnego innego bezbarwnego dzielikamienia.", "tooltip.waystones.white_sharestone": "Teleportuj się do dowolnego innego białego dzielikamienia", diff --git a/shared/src/main/resources/assets/waystones/lang/pt_br.json b/shared/src/main/resources/assets/waystones/lang/pt_br.json index a45b1190..2707b316 100644 --- a/shared/src/main/resources/assets/waystones/lang/pt_br.json +++ b/shared/src/main/resources/assets/waystones/lang/pt_br.json @@ -4,10 +4,8 @@ "block.waystones.mossy_waystone": "Obelisco de Pedra Musgosa", "block.waystones.sandy_waystone": "Obelisco de Arenito", "item.waystones.warp_scroll": "Pergaminho de Teletransporte", - "item.waystones.warp_scroll_bound": "Pergaminho de Teletransporte (Vinculado)", "item.waystones.return_scroll": "Pergaminho do Retorno", "item.waystones.warp_stone": "Pedra de Teleporte", - "item.waystones.bound_scroll": "Pergaminho de Vinculação", "container.waystones.waystone_selection": "Selecione seu destino:", "container.waystones.waystone_settings": "Insira o nome do Obelisco:", "gui.waystones.waystone_selection.next_page": "Próximo", @@ -24,8 +22,6 @@ "gui.waystones.inventory.return_to_waystone": "Voltar para Obelisco ... ...", "gui.waystones.inventory.return_to_nearest_waystone": "Retornar para o Obelisco mais próximo", "chat.waystones.waystone_activated": "Obelisco ativado: %s", - "chat.waystones.scroll_bound": "Pergaminho vinculado: %s", - "chat.waystones.scroll_not_yet_bound": "Este pergaminho não está vinculado a um Obelisco.", "chat.waystones.cannot_dimension_warp": "Você não pode se teletransportar entre mundos.", "chat.waystones.waystone_missing": "O Obelisco para a qual você tentou se teletransportar não foi encontrado.", "chat.waystones.cannot_transport_leashed": "Você não pode levar mobs laçados com você", @@ -36,6 +32,5 @@ "chat.waystones.only_creative_can_edit": "Você tem que estar no modo criativo para editar um Obelisco Global..", "tooltip.waystones.cooldown_left": "Tempo de Recarga: %d segundos", "tooltip.waystones.bound_to": "Vinculado a: %s", - "tooltip.waystones.bound_to_none": "Nenhum", "stat.waystones.waystone_activated": "Obelisco Ativado" } diff --git a/shared/src/main/resources/assets/waystones/lang/pt_pt.json b/shared/src/main/resources/assets/waystones/lang/pt_pt.json index b3010f12..d123c99a 100644 --- a/shared/src/main/resources/assets/waystones/lang/pt_pt.json +++ b/shared/src/main/resources/assets/waystones/lang/pt_pt.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Placa de transporte", "block.waystones.portstone": "Pedra de estação", "item.waystones.warp_scroll": "Pergaminho de transporte", - "item.waystones.warp_scroll_bound": "Pergaminho de transporte (Vinculado)", "item.waystones.return_scroll": "Pergaminho de retorno", "item.waystones.warp_stone": "Pedra de transporte", - "item.waystones.bound_scroll": "Pergaminho vinculado", "item.waystones.warp_dust": "Pó de transporte", "item.waystones.attuned_shard": "Fragmento sintonizado", "container.waystones.waystone_selection": "Escolhe a tua destinação:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Retornar a pedra ...", "gui.waystones.inventory.return_to_nearest_waystone": "Retorna á pedra mas próxima", "chat.waystones.waystone_activated": "Pedra ativada: %s", - "chat.waystones.scroll_bound": "Pergaminho vinculado: %s", - "chat.waystones.scroll_not_yet_bound": "Este pergaminho não está vinculado a nenhuma pedra.", "chat.waystones.cannot_dimension_warp": "Não podes transportar entre estes mundos.", "chat.waystones.waystone_missing": "A pedra a que tentaste teletransportar está a ser movida ou desapareceu.", "chat.waystones.cannot_transport_leashed": "Não podes levar criaturas com trela contigo", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "O fragmento nesta placa de transporte perdeu a sua sintonização.", "tooltip.waystones.cooldown_left": "Tempo de recarga: %d segundos", "tooltip.waystones.bound_to": "Vinculado a: %s", - "tooltip.waystones.bound_to_none": "Nenhum", "tooltip.waystones.portstone": "Não pode ser teletransportado para.", "tooltip.waystones.sharestone": "Teletransporte para qualquer pedra partilhada sem cor", "tooltip.waystones.white_sharestone": "Teletransporte para qualquer pedra partilhada branca", diff --git a/shared/src/main/resources/assets/waystones/lang/ru_ru.json b/shared/src/main/resources/assets/waystones/lang/ru_ru.json index e6253a5b..3a871d3f 100644 --- a/shared/src/main/resources/assets/waystones/lang/ru_ru.json +++ b/shared/src/main/resources/assets/waystones/lang/ru_ru.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Плита перемещения", "block.waystones.portstone": "Портовый обелиск", "item.waystones.warp_scroll": "Свиток перемещения", - "item.waystones.warp_scroll_bound": "Свиток перемещения (Привязан)", "item.waystones.return_scroll": "Свиток возврата", "item.waystones.warp_stone": "Камень перемещения", - "item.waystones.bound_scroll": "Свиток привязки", "item.waystones.warp_dust": "Пыль перемещения", "item.waystones.attuned_shard": "Настроенный осколок", "container.waystones.waystone_selection": "Выберите пункт назначения:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Вернуться к обелиску ...", "gui.waystones.inventory.return_to_nearest_waystone": "Вернуться к ближайшему обелиску", "chat.waystones.waystone_activated": "Активирован обелиск: %s", - "chat.waystones.scroll_bound": "Свиток привязан к: %s", - "chat.waystones.scroll_not_yet_bound": "Этот свиток не привязан к обелиску.", "chat.waystones.cannot_dimension_warp": "Вы не можете перемещаться между мирами.", "chat.waystones.waystone_missing": "Путевой обелиск, к которому вы пытались телепортироваться, в настоящее время перемещается или пропал.", "chat.waystones.cannot_transport_leashed": "Вы не можете брать с собой мобов на поводке", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Осколок внутри этой плиты перемещения потерял свою настройку.", "tooltip.waystones.cooldown_left": "Перезарядка: %d секунд", "tooltip.waystones.bound_to": "Привязан к: %s", - "tooltip.waystones.bound_to_none": "Не привязан", "tooltip.waystones.portstone": "Нельзя телепортироваться.", "tooltip.waystones.sharestone": "Телепортироваться к любому другому бесцветному судьбоносному обелиску", "tooltip.waystones.white_sharestone": "Телепортироваться к любому другому белому судьбоносному обелиску", diff --git a/shared/src/main/resources/assets/waystones/lang/sv_se.json b/shared/src/main/resources/assets/waystones/lang/sv_se.json index 1e8ea8be..dbb09dda 100644 --- a/shared/src/main/resources/assets/waystones/lang/sv_se.json +++ b/shared/src/main/resources/assets/waystones/lang/sv_se.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Teleporteringsplatta", "block.waystones.portstone": "Portsten", "item.waystones.warp_scroll": "Teleporteringsskriftrulle", - "item.waystones.warp_scroll_bound": "Teleporteringsskriftrulle (bunden)", "item.waystones.return_scroll": "Återvändande skriftrulle", "item.waystones.warp_stone": "Teleporteringssten", - "item.waystones.bound_scroll": "Bunden skriftrulle", "item.waystones.warp_dust": "Teleporteringsdamm", "item.waystones.attuned_shard": "Samstämd skärva", "container.waystones.waystone_selection": "Välj din destination:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Återvänd till vägsten...", "gui.waystones.inventory.return_to_nearest_waystone": "Återvänd till närmaste vägsten", "chat.waystones.waystone_activated": "Aktiverad vägsten: %s", - "chat.waystones.scroll_bound": "Skriftrulle bunden till: %s", - "chat.waystones.scroll_not_yet_bound": "Denna skriftrulle är inte bunden till en vägsten.", "chat.waystones.cannot_dimension_warp": "Du kan inte teleportera mellan dessa världar.", "chat.waystones.waystone_missing": "Vägstenen du försökte teleportera till flyttas för tillfället eller är försvunnen.", "chat.waystones.cannot_transport_leashed": "Du kan inte ta med dig varelser i koppel", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Skärvan inuti denna teleporteringsplatta har förlorat sin samstämmighet.", "tooltip.waystones.cooldown_left": "Väntetid: %d sekunder", "tooltip.waystones.bound_to": "Bunden till: %s", - "tooltip.waystones.bound_to_none": "Ingenting", "tooltip.waystones.portstone": "Kan inte teleporteras till.", "tooltip.waystones.sharestone": "Teleportera till en annan färglös delsten", "tooltip.waystones.white_sharestone": "Teleportera till en annan vit delsten", diff --git a/shared/src/main/resources/assets/waystones/lang/tr_tr.json b/shared/src/main/resources/assets/waystones/lang/tr_tr.json index 2474cb52..eb5fec2e 100644 --- a/shared/src/main/resources/assets/waystones/lang/tr_tr.json +++ b/shared/src/main/resources/assets/waystones/lang/tr_tr.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Işınlanma Plakası", "block.waystones.portstone": "Limantaşı", "item.waystones.warp_scroll": "Işınlanma Parşömeni", - "item.waystones.warp_scroll_bound": "Işınlanma Parşömeni (Bağlı)", "item.waystones.return_scroll": "Dönüş Parşömeni", "item.waystones.warp_stone": "Işınlanma Taşı", - "item.waystones.bound_scroll": "Bağlı Parşömen", "item.waystones.warp_dust": "Işınlanma Tozu", "item.waystones.attuned_shard": "Attuned Shard", "container.waystones.waystone_selection": "Hedefinizi seçin:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "... Yoltaşına Dön", "gui.waystones.inventory.return_to_nearest_waystone": "En Yakın Yoltaşına Dön", "chat.waystones.waystone_activated": "Aktifleştirilen Yoltaşı: %s", - "chat.waystones.scroll_bound": "Parşömen bağlı: %s", - "chat.waystones.scroll_not_yet_bound": "Bu parşömen bir yoltaşına bağlı değil.", "chat.waystones.cannot_dimension_warp": "Bu dünyalar arasına yolculuk yapamazsınız.", "chat.waystones.waystone_missing": "Işınlanmaya çalıştığınız yoltaşı şuanda taşınıyor veya kayboldu.", "chat.waystones.cannot_transport_leashed": "You cannot take leashed mobs with you", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "The shard inside this warp plate has lost its attunement.", "tooltip.waystones.cooldown_left": "Bekleme süresi: %d saniye", "tooltip.waystones.bound_to": "Bağlı: %s", - "tooltip.waystones.bound_to_none": "Hiçbir şey", "tooltip.waystones.portstone": "Işınlanılamaz.", "tooltip.waystones.sharestone": "Başka bir renksiz Paylaşımtaşına ışınlan", "tooltip.waystones.white_sharestone": "Başka bir Beyaz Paylaşımtaşına ışınlan", diff --git a/shared/src/main/resources/assets/waystones/lang/uk_ua.json b/shared/src/main/resources/assets/waystones/lang/uk_ua.json index b43af067..cd68261a 100644 --- a/shared/src/main/resources/assets/waystones/lang/uk_ua.json +++ b/shared/src/main/resources/assets/waystones/lang/uk_ua.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Мандрівна плита", "block.waystones.portstone": "Відправний камінь", "item.waystones.warp_scroll": "Мандрівний сувій", - "item.waystones.warp_scroll_bound": "Мандрівний сувій (прив'язано)", "item.waystones.return_scroll": "Сувій повернення", "item.waystones.warp_stone": "Мандрівний камінь", - "item.waystones.bound_scroll": "Сувій прив'язування", "item.waystones.warp_dust": "Мандрівний пил", "item.waystones.attuned_shard": "Врегульований уламок", "container.waystones.waystone_selection": "Оберіть пункт призначення:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Повернутися до дороговказу...", "gui.waystones.inventory.return_to_nearest_waystone": "Повернутися до найближчого дороговказу", "chat.waystones.waystone_activated": "Активовано дороговказ: %s", - "chat.waystones.scroll_bound": "Сувій прив'язування: %s", - "chat.waystones.scroll_not_yet_bound": "Цей сувій не прив'язаний до дороговказу.", "chat.waystones.cannot_dimension_warp": "Ви не можете мандрувати між цими світами.", "chat.waystones.waystone_missing": "Дороговказ, до якого ви намагалися телепортуватися, наразі був переміщений або його немає.", "chat.waystones.cannot_transport_leashed": "Ви не можете взяти з собою прив'язаних мобів", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Уламок всередині цієї мандрівної плити втратив свої налаштування.", "tooltip.waystones.cooldown_left": "Відновлення: %d секунд", "tooltip.waystones.bound_to": "Прив'язаний до: %s", - "tooltip.waystones.bound_to_none": "нічого", "tooltip.waystones.portstone": "Неможливо телепортуватися до нього.", "tooltip.waystones.sharestone": "Телепортує до будь-якого іншого безбарвного спільного каменю", "tooltip.waystones.white_sharestone": "Телепортує до будь-якого іншого білого спільного каменю", diff --git a/shared/src/main/resources/assets/waystones/lang/vi_vn.json b/shared/src/main/resources/assets/waystones/lang/vi_vn.json index 5c3b9108..c9153768 100644 --- a/shared/src/main/resources/assets/waystones/lang/vi_vn.json +++ b/shared/src/main/resources/assets/waystones/lang/vi_vn.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "Đĩa dịch chuyển", "block.waystones.portstone": "Bến dịch chuyển", "item.waystones.warp_scroll": "Cuộn giấy dịch chuyển", - "item.waystones.warp_scroll_bound": "Cuộn giấy dịch chuyển (ràng buộc)", "item.waystones.return_scroll": "Cuộn giấy dịch chuyển về", "item.waystones.warp_stone": "Đá dịch chuyển", - "item.waystones.bound_scroll": "Cuộn giấy dịch chuyển đã xác định điểm đến", "item.waystones.warp_dust": "Bụi dịch chuyển", "item.waystones.attuned_shard": "Mảnh vỡ biến tính", "container.waystones.waystone_selection": "Chọn điểm đến của bạn:", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "Trở về Trụ dịch chuyển...", "gui.waystones.inventory.return_to_nearest_waystone": "Trở về Trụ dịch chuyển gần nhất", "chat.waystones.waystone_activated": "Trụ dịch chuyển đã kích hoạt: %s", - "chat.waystones.scroll_bound": "Đặt điểm dịch chuyển thành: %s", - "chat.waystones.scroll_not_yet_bound": "Cuộn giấy này chưa được kết nối với bất kỳ trụ dịch chuyển nào.", "chat.waystones.cannot_dimension_warp": "Bạn không thể dịch chuyển giữa những thế giới này.", "chat.waystones.waystone_missing": "Trụ dịch chuyển mà bạn đang cố gắng dịch chuyển đến hiện đang được di dời hoặc đã bị mất.", "chat.waystones.cannot_transport_leashed": "Bạn không thể mang theo sinh vật đang bị buộc dây", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "Mảnh vỡ bên trong đĩa dịch chuyển này đã mất đi năng lượng của nó.", "tooltip.waystones.cooldown_left": "Đang hồi: %d giây", "tooltip.waystones.bound_to": "Đang kết nối với: %s", - "tooltip.waystones.bound_to_none": "Không có nơi nào", "tooltip.waystones.portstone": "Không thể dịch chuyển đến.", "tooltip.waystones.sharestone": "Dịch chuyển đến bất kỳ đá sẻ chia không màu khác", "tooltip.waystones.white_sharestone": "Dịch chuyển đến bất kỳ đá sẻ chia trắng khác", diff --git a/shared/src/main/resources/assets/waystones/lang/zh_cn.json b/shared/src/main/resources/assets/waystones/lang/zh_cn.json index 61494f85..8b5d38e0 100644 --- a/shared/src/main/resources/assets/waystones/lang/zh_cn.json +++ b/shared/src/main/resources/assets/waystones/lang/zh_cn.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "传送石板", "block.waystones.portstone": "单向传送石碑", "item.waystones.warp_scroll": "传送卷轴", - "item.waystones.warp_scroll_bound": "传送卷轴（已绑定）", "item.waystones.return_scroll": "返回卷轴", "item.waystones.warp_stone": "传送石", - "item.waystones.bound_scroll": "绑定卷轴", "item.waystones.warp_dust": "传送粉", "item.waystones.attuned_shard": "共鸣碎片", "container.waystones.waystone_selection": "选择目的地：", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "返回传送石碑……", "gui.waystones.inventory.return_to_nearest_waystone": "返回到最近的传送石碑", "chat.waystones.waystone_activated": "已激活的传送石碑：%s", - "chat.waystones.scroll_bound": "卷轴绑定：%s", - "chat.waystones.scroll_not_yet_bound": "该卷轴未绑定到任何传送石碑。", "chat.waystones.cannot_dimension_warp": "无法传送到该维度。", "chat.waystones.waystone_missing": "要传送的传送石碑已被移走或消失了。", "chat.waystones.cannot_transport_leashed": "无法拴着生物传送", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "这个传送石板内的碎片已经无法继续共鸣。", "tooltip.waystones.cooldown_left": "冷却时间：%d秒", "tooltip.waystones.bound_to": "绑定到：%s", - "tooltip.waystones.bound_to_none": "无", "tooltip.waystones.portstone": "无法作为传送目标。", "tooltip.waystones.sharestone": "传送到其他任意的原色共享石碑", "tooltip.waystones.white_sharestone": "传送到其他任意的白色共享石碑", diff --git a/shared/src/main/resources/assets/waystones/lang/zh_tw.json b/shared/src/main/resources/assets/waystones/lang/zh_tw.json index 64168b71..123e1c48 100644 --- a/shared/src/main/resources/assets/waystones/lang/zh_tw.json +++ b/shared/src/main/resources/assets/waystones/lang/zh_tw.json @@ -23,10 +23,8 @@ "block.waystones.warp_plate": "傳送壓力板", "block.waystones.portstone": "交流石碑", "item.waystones.warp_scroll": "傳送卷軸", - "item.waystones.warp_scroll_bound": "傳送卷軸（綁定）", "item.waystones.return_scroll": "返回卷軸", "item.waystones.warp_stone": "傳送石", - "item.waystones.bound_scroll": "綁定卷軸", "item.waystones.warp_dust": "傳送粉", "item.waystones.attuned_shard": "適應碎片", "container.waystones.waystone_selection": "請選擇目的地：", @@ -48,8 +46,6 @@ "gui.waystones.inventory.return_to_waystone": "返回至傳送石碑……", "gui.waystones.inventory.return_to_nearest_waystone": "返回至最接近的傳送石碑", "chat.waystones.waystone_activated": "已啟動傳送石碑「%s」", - "chat.waystones.scroll_bound": "卷軸已綁定至傳送石碑「%s」", - "chat.waystones.scroll_not_yet_bound": "這個卷軸尚未綁定傳送石碑。", "chat.waystones.cannot_dimension_warp": "您不能在這兩個世界間傳送。", "chat.waystones.waystone_missing": "您所選擇的傳送石碑已被移除或遺失。", "chat.waystones.cannot_transport_leashed": "您不能攜帶被拴住的生物", @@ -63,7 +59,6 @@ "chat.waystones.warp_plate_has_invalid_target": "這個傳送壓力板裡的碎片失去了適應力。", "tooltip.waystones.cooldown_left": "冷卻時間：%d 秒", "tooltip.waystones.bound_to": "已綁定至傳送石碑「%s」", - "tooltip.waystones.bound_to_none": "（尚未綁定）", "tooltip.waystones.portstone": "無法作為目的地。", "tooltip.waystones.sharestone": "傳送至其他專用石碑。", "tooltip.waystones.white_sharestone": "傳送至其他白色專用石碑", diff --git a/shared/src/main/resources/data/waystones/recipes/bind_warp_scroll.json b/shared/src/main/resources/data/waystones/recipes/bind_warp_scroll.json new file mode 100644 index 00000000..79f479b1 --- /dev/null +++ b/shared/src/main/resources/data/waystones/recipes/bind_warp_scroll.json @@ -0,0 +1,11 @@ +{ + "type": "waystones:waystone", + "result": { + "item": "waystones:warp_scroll", + "count": 1 + }, + "primary": { + "item": "waystones:warp_scroll" + }, + "secondary": [] +}