From b87a810d2cf520298b6e72508e5a5506ca2f4d5f Mon Sep 17 00:00:00 2001 From: Runemoro Date: Wed, 28 Mar 2018 21:39:32 -0400 Subject: [PATCH] Merge multiline lang keys --- .../java/org/dimdev/ddutils/I18nUtils.java | 21 -------- .../dimdev/dimdoors/shared/EventHandler.java | 1 - .../shared/blocks/BlockFloatingRift.java | 3 -- .../shared/items/ItemDimensionalDoor.java | 15 ++++++ .../items/ItemDimensionalDoorChaos.java | 14 ----- .../shared/items/ItemDimensionalDoorGold.java | 13 ----- .../shared/items/ItemDimensionalDoorIron.java | 14 ----- .../items/ItemDimensionalDoorQuartz.java | 14 ----- .../shared/items/ItemDimensionalDoorWood.java | 13 ----- .../shared/items/ItemDimensionalTrapdoor.java | 15 ++++++ .../items/ItemDimensionalTrapdoorWood.java | 15 ------ .../dimdoors/shared/items/ItemRiftBlade.java | 6 +-- .../items/ItemRiftConfigurationTool.java | 14 +++++ .../shared/items/ItemRiftRemover.java | 8 +-- .../shared/items/ItemRiftSignature.java | 7 ++- .../items/ItemStabilizedRiftSignature.java | 7 ++- .../tileentities/TileEntityFloatingRift.java | 1 - .../resources/assets/dimdoors/lang/de_DE.lang | 51 +++++------------- .../resources/assets/dimdoors/lang/en_US.lang | 51 ++++++------------ .../resources/assets/dimdoors/lang/fr_CA.lang | 52 +++++------------- .../resources/assets/dimdoors/lang/it_IT.lang | 52 +++++------------- .../resources/assets/dimdoors/lang/nl_NL.lang | 52 +++++------------- .../resources/assets/dimdoors/lang/ro_RO.lang | 53 +++++-------------- .../resources/assets/dimdoors/lang/ru_RU.lang | 52 +++++------------- .../resources/assets/dimdoors/lang/zh_CN.lang | 52 +++++------------- 25 files changed, 172 insertions(+), 424 deletions(-) delete mode 100644 src/main/java/org/dimdev/ddutils/I18nUtils.java diff --git a/src/main/java/org/dimdev/ddutils/I18nUtils.java b/src/main/java/org/dimdev/ddutils/I18nUtils.java deleted file mode 100644 index b94ab804..00000000 --- a/src/main/java/org/dimdev/ddutils/I18nUtils.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.dimdev.ddutils; - -import net.minecraft.client.resources.I18n; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.ArrayList; -import java.util.List; - -public final class I18nUtils { - @SideOnly(Side.CLIENT) - public static List translateMultiline(String key) { - List list = new ArrayList<>(); - int i = 0; - while (I18n.hasKey(key + i)) { - list.add(I18n.format(key + i)); - i++; - } - return list; - } -} diff --git a/src/main/java/org/dimdev/dimdoors/shared/EventHandler.java b/src/main/java/org/dimdev/dimdoors/shared/EventHandler.java index 5c33eaae..17b9dbfa 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/EventHandler.java +++ b/src/main/java/org/dimdev/dimdoors/shared/EventHandler.java @@ -31,7 +31,6 @@ public final class EventHandler { EntityPlayerMP player = (EntityPlayerMP) entity; World world = entity.world; int dim = world.provider.getDimension(); - //noinspection StatementWithEmptyBody if (!world.isRemote && !player.isDead && ModDimensions.isDimDoorsPocketDimension(world) diff --git a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFloatingRift.java b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFloatingRift.java index df8f541a..5e2f951f 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFloatingRift.java +++ b/src/main/java/org/dimdev/dimdoors/shared/blocks/BlockFloatingRift.java @@ -2,7 +2,6 @@ package org.dimdev.dimdoors.shared.blocks; import java.util.*; -import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import org.dimdev.dimdoors.DimDoors; @@ -18,8 +17,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoor.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoor.java index 6032be3c..e32609c0 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoor.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoor.java @@ -1,5 +1,10 @@ package org.dimdev.dimdoors.shared.items; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.shared.blocks.IRiftProvider; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -14,6 +19,8 @@ import org.dimdev.dimdoors.shared.blocks.ModBlocks; import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift; import org.dimdev.dimdoors.shared.tileentities.TileEntityFloatingRift; +import java.util.List; + public abstract class ItemDimensionalDoor extends ItemDoor { // TODO: Biomes O' Plenty doors public > ItemDimensionalDoor(T block) { @@ -59,6 +66,14 @@ public abstract class ItemDimensionalDoor extends ItemDoor { // TODO: Biomes O' return result; } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + if (I18n.hasKey(getUnlocalizedName() + ".info")) { + tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + } + } + public abstract void setupRift(TileEntityEntranceRift entranceRift); // TODO: NBT-based, or maybe lambda function-based? public abstract boolean canBePlacedOnRift(); // TODO: NBT-based, true when no NBT is present } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorChaos.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorChaos.java index 0639ce62..b57c64bd 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorChaos.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorChaos.java @@ -1,16 +1,8 @@ package org.dimdev.dimdoors.shared.items; -import java.util.List; - import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.shared.blocks.ModBlocks; -import org.dimdev.ddutils.I18nUtils; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift; public class ItemDimensionalDoorChaos extends ItemDimensionalDoor { // TODO: remove this when converting to NBT setup, and just add creative menu item? @@ -22,12 +14,6 @@ public class ItemDimensionalDoorChaos extends ItemDimensionalDoor { // TODO: rem setRegistryName(new ResourceLocation(DimDoors.MODID, "chaos_dimensional_door")); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { - tooltip.addAll(I18nUtils.translateMultiline("info.chaos_dimensional_door")); - } - @Override public void setupRift(TileEntityEntranceRift rift) { // TODO diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorGold.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorGold.java index bd034b3c..da8ae9e7 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorGold.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorGold.java @@ -1,12 +1,6 @@ package org.dimdev.dimdoors.shared.items; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import org.dimdev.ddutils.I18nUtils; import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.shared.blocks.BlockDimensionalDoorGold; import org.dimdev.dimdoors.shared.blocks.ModBlocks; @@ -17,7 +11,6 @@ import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import java.util.List; public class ItemDimensionalDoorGold extends ItemDimensionalDoor { @@ -28,12 +21,6 @@ public class ItemDimensionalDoorGold extends ItemDimensionalDoor { setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorGold.ID)); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { - tooltip.addAll(I18nUtils.translateMultiline("info.gold_dimensional_door")); - } - @Override public void setupRift(TileEntityEntranceRift rift) { rift.setProperties(LinkProperties.builder() diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorIron.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorIron.java index 637f8419..f0bb2dee 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorIron.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorIron.java @@ -1,17 +1,9 @@ package org.dimdev.dimdoors.shared.items; -import java.util.List; - import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.shared.blocks.BlockDimensionalDoorIron; import org.dimdev.dimdoors.shared.blocks.ModBlocks; -import org.dimdev.ddutils.I18nUtils; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.shared.rifts.destinations.PublicPocketDestination; import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift; @@ -24,12 +16,6 @@ public class ItemDimensionalDoorIron extends ItemDimensionalDoor { setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorIron.ID)); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { - tooltip.addAll(I18nUtils.translateMultiline("info.iron_dimensional_door")); - } - @Override public void setupRift(TileEntityEntranceRift rift) { PublicPocketDestination destination = PublicPocketDestination.builder().build(); diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorQuartz.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorQuartz.java index f301005e..c5f26848 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorQuartz.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorQuartz.java @@ -1,17 +1,9 @@ package org.dimdev.dimdoors.shared.items; -import java.util.List; - import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.shared.blocks.BlockDimensionalDoorQuartz; import org.dimdev.dimdoors.shared.blocks.ModBlocks; -import org.dimdev.ddutils.I18nUtils; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.shared.rifts.destinations.PrivateDestination; import org.dimdev.dimdoors.shared.rifts.destinations.PrivatePocketExitDestination; import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift; @@ -26,12 +18,6 @@ public class ItemDimensionalDoorQuartz extends ItemDimensionalDoor { setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorQuartz.ID)); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { - tooltip.addAll(I18nUtils.translateMultiline("info.quartz_dimensional_door")); - } - @Override public void setupRift(TileEntityEntranceRift rift) { if (rift.getWorld().provider instanceof WorldProviderPersonalPocket) { diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorWood.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorWood.java index 41ea6b6c..16f5f6fd 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorWood.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalDoorWood.java @@ -1,18 +1,11 @@ package org.dimdev.dimdoors.shared.items; import java.util.Collections; -import java.util.List; import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.shared.blocks.BlockDimensionalDoorWood; import org.dimdev.dimdoors.shared.blocks.ModBlocks; -import org.dimdev.ddutils.I18nUtils; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.shared.rifts.destinations.AvailableLinkDestination; import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift; @@ -25,12 +18,6 @@ public class ItemDimensionalDoorWood extends ItemDimensionalDoor { setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalDoorWood.ID)); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { - tooltip.addAll(I18nUtils.translateMultiline("info.oak_dimensional_door")); - } - @Override public void setupRift(TileEntityEntranceRift rift) { rift.setDestination(AvailableLinkDestination.builder() diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoor.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoor.java index 45ac4ed1..6523fc8d 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoor.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoor.java @@ -1,5 +1,10 @@ package org.dimdev.dimdoors.shared.items; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.shared.blocks.IRiftProvider; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -12,6 +17,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift; +import java.util.List; + public abstract class ItemDimensionalTrapdoor extends ItemBlock { // TODO: Iron dimensional trapdoor public >ItemDimensionalTrapdoor(T block) { @@ -40,5 +47,13 @@ public abstract class ItemDimensionalTrapdoor extends ItemBlock { // TODO: Iron return result; } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + if (I18n.hasKey(getUnlocalizedName() + ".info")) { + tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + } + } + protected abstract void setupRift(TileEntityEntranceRift entranceRift); // TODO: NBT-based } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java index d812cbc2..f932eeb4 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemDimensionalTrapdoorWood.java @@ -3,19 +3,10 @@ package org.dimdev.dimdoors.shared.items; import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.shared.blocks.BlockDimensionalTrapdoorWood; import org.dimdev.dimdoors.shared.blocks.ModBlocks; -import org.dimdev.ddutils.I18nUtils; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.shared.rifts.destinations.EscapeDestination; import org.dimdev.dimdoors.shared.tileentities.TileEntityEntranceRift; -import java.util.List; - - public class ItemDimensionalTrapdoorWood extends ItemDimensionalTrapdoor { public ItemDimensionalTrapdoorWood() { @@ -25,12 +16,6 @@ public class ItemDimensionalTrapdoorWood extends ItemDimensionalTrapdoor { setRegistryName(new ResourceLocation(DimDoors.MODID, BlockDimensionalTrapdoorWood.ID)); } - @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.addAll(I18nUtils.translateMultiline("info.dimensional_trapdoor")); - } - @Override public void setupRift(TileEntityEntranceRift rift) { rift.setDestination(new EscapeDestination()); diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java index 25a31dfe..afb77dd1 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftBlade.java @@ -1,8 +1,8 @@ package org.dimdev.dimdoors.shared.items; +import net.minecraft.client.resources.I18n; import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.shared.tileentities.TileEntityFloatingRift; -import org.dimdev.ddutils.I18nUtils; import org.dimdev.ddutils.Location; import org.dimdev.dimdoors.shared.RayTraceHelper; import org.dimdev.ddutils.TeleportUtils; @@ -76,7 +76,7 @@ public class ItemRiftBlade extends ItemSword { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { - tooltip.addAll(I18nUtils.translateMultiline("info.rift_blade")); + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + tooltip.add(I18n.format(getUnlocalizedName() + ".info")); } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java index 61382656..9c527693 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftConfigurationTool.java @@ -1,5 +1,7 @@ package org.dimdev.dimdoors.shared.items; +import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -8,8 +10,12 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.dimdev.dimdoors.DimDoors; +import java.util.List; + public class ItemRiftConfigurationTool extends Item { public static final String ID = "rift_configuration_tool"; @@ -28,4 +34,12 @@ public class ItemRiftConfigurationTool extends Item { ItemStack stack = player.getHeldItem(handIn); return new ActionResult<>(EnumActionResult.FAIL, stack); } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + if (I18n.hasKey(getUnlocalizedName() + ".info")) { + tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + } + } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java index 762d0a71..edc33bae 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftRemover.java @@ -1,5 +1,6 @@ package org.dimdev.dimdoors.shared.items; +import net.minecraft.client.resources.I18n; import net.minecraft.util.*; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.fml.relauncher.Side; @@ -8,7 +9,6 @@ import org.dimdev.dimdoors.DimDoors; import org.dimdev.dimdoors.shared.RayTraceHelper; import org.dimdev.dimdoors.shared.sound.ModSounds; import org.dimdev.dimdoors.shared.tileentities.TileEntityFloatingRift; -import org.dimdev.ddutils.I18nUtils; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -32,8 +32,10 @@ public class ItemRiftRemover extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { - tooltip.addAll(I18nUtils.translateMultiline("info.rift_remover")); + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { + if (I18n.hasKey(getUnlocalizedName() + ".info")) { + tooltip.add(I18n.format(getUnlocalizedName() + ".info")); + } } @Override diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java index 1a778567..97ef3c8a 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemRiftSignature.java @@ -9,7 +9,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.dimdev.ddutils.I18nUtils; import org.dimdev.ddutils.Location; import org.dimdev.dimdoors.DimDoors; import net.minecraft.client.util.ITooltipFlag; @@ -117,12 +116,12 @@ public class ItemRiftSignature extends Item { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { RotatedLocation transform = getSource(stack); if (transform != null) { - tooltip.add(I18n.format("info.rift_signature.bound", transform.getLocation().getX(), transform.getLocation().getY(), transform.getLocation().getZ(), transform.getLocation().getDim())); + tooltip.add(I18n.format(I18n.format(getUnlocalizedName() + ".bound.info", transform.getLocation().getX(), transform.getLocation().getY(), transform.getLocation().getZ(), transform.getLocation().getDim()))); } else { - tooltip.addAll(I18nUtils.translateMultiline("info.rift_signature.unbound")); + tooltip.add(I18n.format(getUnlocalizedName() + ".unbound.info")); } } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java b/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java index d12f3f38..63ef7da7 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java +++ b/src/main/java/org/dimdev/dimdoors/shared/items/ItemStabilizedRiftSignature.java @@ -13,7 +13,6 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.dimdev.ddutils.I18nUtils; import org.dimdev.ddutils.Location; import org.dimdev.dimdoors.DimDoors; import org.dimdev.ddutils.RotatedLocation; @@ -114,12 +113,12 @@ public class ItemStabilizedRiftSignature extends Item { // TODO: common supercla @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flagIn) { + public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { RotatedLocation transform = getTarget(stack); if (transform != null) { - tooltip.add(I18n.format("info.stabilized_rift_signature.bound", transform.getLocation().getX(), transform.getLocation().getY(), transform.getLocation().getZ(), transform.getLocation().getDim())); + tooltip.add(I18n.format("item.stabilized_rift_signature.bound.info", transform.getLocation().getX(), transform.getLocation().getY(), transform.getLocation().getZ(), transform.getLocation().getDim())); } else { - tooltip.addAll(I18nUtils.translateMultiline("info.stabilized_rift_signature.unbound")); + tooltip.add(I18n.format("item.stabilized_rift_signature.unbound.info")); } } } diff --git a/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityFloatingRift.java b/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityFloatingRift.java index 24e701dd..0d60b526 100644 --- a/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityFloatingRift.java +++ b/src/main/java/org/dimdev/dimdoors/shared/tileentities/TileEntityFloatingRift.java @@ -1,6 +1,5 @@ package org.dimdev.dimdoors.shared.tileentities; -import lombok.Getter; import lombok.Setter; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/resources/assets/dimdoors/lang/de_DE.lang b/src/main/resources/assets/dimdoors/lang/de_DE.lang index e96e43eb..454ce0a6 100644 --- a/src/main/resources/assets/dimdoors/lang/de_DE.lang +++ b/src/main/resources/assets/dimdoors/lang/de_DE.lang @@ -1,3 +1,4 @@ +#PARSE_ESCAPES itemGroup.dimensional_doors_creative_tab=Dimensional Doors: Items tile.gold_door.name=Goldtür @@ -37,43 +38,19 @@ item.rift_blade.name=Spaltklinge item.world_thread.name=Weltenfaden item.stable_fabric.name=Stabiler Stoff -info.rift_key.bound=Gebunden -info.rift_key.unbound=Nicht gebunden +item.rift_key.bound.info=Gebunden +item.rift_key.unbound.info=Nicht gebunden -info.iron_dimensional_door0=Platziere auf dem Block unterhalb eines Spalts, -info.iron_dimensional_door1=um diesen Spalt zu aktivieren, oder -info.iron_dimensional_door2=irgendwo anders, um eine -info.iron_dimensional_door3=kleine Dimension to erschaffen. - -info.gold_dimensional_door0=Ähnlich einer Dimensionaltür, -info.gold_dimensional_door1=aber hält die kleine Dimension geladen, -info.gold_dimensional_door2=sollte sie in einer solchen platziert sein. - -info.quartz_dimensional_door0=Erstellt einen Pfad zu -info.quartz_dimensional_door1=deiner persönlichen Dimension - -info.rift_blade0=Öffnet temporäre Türen auf Spalten -info.rift_blade1=und hat einen Teleport-Angriff. - -info.rift_remover0=Verwende nahe eines offenen Spalts, -info.rift_remover1=um ihn und jegliche Spalte -info.rift_remover2=in der Nähe zu entfernen. - -info.rift_signature.bound=Führt zu(%d, %d, %d) in Dimension #%d -info.rift_signature.unbound0=Erster Klick speichert die Position; -info.rift_signature.unbound1=zweiter Klick kreiert ein Paar von Spalten, -info.rift_signature.unbound2=welche zu den zwei Positionen führen. - -info.stabilized_rift_signature.bound=Führt zu(%d, %d, %d) in Dimension #%d -info.stabilized_rift_signature.unbound0=Erster Klick speichert die Position, -info.stabilized_rift_signature.unbound1=weitere Klicks kreieren Spalte, die -info.stabilized_rift_signature.unbound2=die erste und die aktuelle Position verbinden. - -info.chaos_dimensional_door=Vorsicht: Führt zu einem zufälligen Ziel - -info.oak_dimensional_door0=Platziere auf dem Block unterhalb eines -info.oak_dimensional_door1=Spalts, um ein Portal zu erstellen, -info.oak_dimensional_door2=oder platziere irgendwo in einer -info.oak_dimensional_door3=kleinen Dimension, um sie zu verlassen. +item.iron_dimensional_door.info=Platziere auf dem Block unterhalb eines Spalts, \num diesen Spalt zu aktivieren, oder \nirgendwo anders, um eine \nkleine Dimension to erschaffen. +item.gold_dimensional_door.info=Ähnlich einer Dimensionaltür, \naber hält die kleine Dimension geladen, \nsollte sie in einer solchen platziert sein. +item.quartz_dimensional_door.info=Erstellt einen Pfad zu \ndeiner persönlichen Dimension +item.rift_blade.info=Öffnet temporäre Türen auf Spalten \nund hat einen Teleport-Angriff. +item.rift_remover.info=Verwende nahe eines offenen Spalts, \num ihn und jegliche Spalte \nin der Nähe zu entfernen. +item.rift_signature.bound.info=Führt zu(%d, %d, %d) in Dimension #%d +item.rift_signature.unbound.info=Erster Klick speichert die Position; \nzweiter Klick kreiert ein Paar von Spalten, \nwelche zu den zwei Positionen führen. +item.stabilized_rift_signature.bound.info=Führt zu(%d, %d, %d) in Dimension #%d +item.stabilized_rift_signature.unbound.info=Erster Klick speichert die Position, \nweitere Klicks kreieren Spalte, die \ndie erste und die aktuelle Position verbinden. +item.chaos_dimensional_door.info=Vorsicht: Führt zu einem zufälligen Ziel +item.oak_dimensional_door.info=Platziere auf dem Block unterhalb eines \nSpalts, um ein Portal zu erstellen, \noder platziere irgendwo in einer \nkleinen Dimension, um sie zu verlassen. entity.dimdoors.monolith.name=Monolith diff --git a/src/main/resources/assets/dimdoors/lang/en_US.lang b/src/main/resources/assets/dimdoors/lang/en_US.lang index ab71c346..f6c476f0 100644 --- a/src/main/resources/assets/dimdoors/lang/en_US.lang +++ b/src/main/resources/assets/dimdoors/lang/en_US.lang @@ -1,3 +1,5 @@ +#PARSE_ESCAPES + itemGroup.dimensional_doors_creative_tab=Dimensional Doors Items tile.gold_door.name=Gold Door @@ -56,7 +58,7 @@ item.quartz_door.name=Quartz Door item.iron_dimensional_door.name=Iron Dimensional Door item.gold_dimensional_door.name=Gold Dimensional Door -item.quartz_dimensional_door.name=Personal Dimensional Door +item.quartz_dimensional_door.name=Quartz Dimensional Door item.chaos_dimensional_door.name=Unstable Dimensional Door item.oak_dimensional_door.name=Wood Dimensional Door @@ -80,41 +82,20 @@ item.helmet_woven_world_thread.name=Woven World Thread Helmet item.leggings_woven_world_thread.name=Woven World Thread Leggings item.chestplate_woven_world_thread.name=Woven World Thread Chestplate -info.rift_key.bound=Bound -info.rift_key.unbound=Unbound +item.rift_key.bound.info=Bound +item.rift_key.unbound.info=Unbound -info.iron_dimensional_door0=Place on the block under a rift -info.iron_dimensional_door1=to activate that rift or place -info.iron_dimensional_door2=anywhere else to create a -info.iron_dimensional_door3=pocket dimension. - -info.gold_dimensional_door0=Similar to a Dimensional Door -info.gold_dimensional_door1=but keeps a pocket dimension -info.gold_dimensional_door2=loaded if placed on the inside. - -info.quartz_dimensional_door0=Creates a pathway to -info.quartz_dimensional_door1=your personal pocket - -info.rift_blade0=Opens temporary doors on rifts -info.rift_blade1=and has a teleport attack. - -info.rift_remover0=Use near exposed rift -info.rift_remover1=to remove it and -info.rift_remover2=any nearby rifts. - -info.rift_signature.bound=Leads to (%d, %d, %d) at dimension #%d -info.rift_signature.unbound0=First click stores a location; -info.rift_signature.unbound1=second click creates a pair of -info.rift_signature.unbound2=rifts linking the two locations. - -info.stabilized_rift_signature.bound=Leads to (%d, %d, %d) at dimension #%d -info.stabilized_rift_signature.unbound0=First click stores a location, -info.stabilized_rift_signature.unbound1=other clicks create rifts linking -info.stabilized_rift_signature.unbound2=the first and last locations together. - -info.chaos_dimensional_door=Caution: Leads to random destination - -info.oak_dimensional_door0=Place on the block under a rift to create a portal, or place anywhere in a pocket dimension to exit. +item.iron_dimensional_door.info=Place on the block under a rift \nto activate that rift or place \nanywhere else to create a \npocket dimension. +item.gold_dimensional_door.info=Similar to a Dimensional Door \nbut keeps a pocket dimension \nloaded if placed on the inside. +item.quartz_dimensional_door.info=Creates a pathway to your personal pocket. +item.rift_blade.info=Opens temporary doors on rifts \nand has a teleport attack. +item.rift_remover.info=Use near exposed rift \nto remove it and \nany nearby rifts. +item.rift_signature.bound.info=Leads to (%d, %d, %d) at dimension #%d +item.rift_signature.unbound.info=First click stores a location; \nsecond click creates a pair of \nrifts linking the two locations. +item.stabilized_rift_signature.bound.info=Leads to (%d, %d, %d) at dimension #%d +item.stabilized_rift_signature.unbound.info=First click stores a location, \nother clicks create rifts linking \nthe first and last locations together. +item.chaos_dimensional_door.info=Caution: Leads to random destination +item.oak_dimensional_door.info=Place on the block under a rift \nto create a portal, or place anywhere \nin a pocket dimension to exit. entity.dimdoors.monolith.name=Monolith diff --git a/src/main/resources/assets/dimdoors/lang/fr_CA.lang b/src/main/resources/assets/dimdoors/lang/fr_CA.lang index 980f9b70..d8385318 100644 --- a/src/main/resources/assets/dimdoors/lang/fr_CA.lang +++ b/src/main/resources/assets/dimdoors/lang/fr_CA.lang @@ -1,3 +1,4 @@ +#PARSE_ESCAPES itemGroup.dimensional_doors_creative_tab=Objets Portes dimensionelles tile.gold_door.name=Porte d'or @@ -68,45 +69,20 @@ item.rift_blade.name=Lame de fissure item.world_thread.name=Fil du monde item.stable_fabric.name=Étoffe stable -info.rift_key.bound=Liée -info.rift_key.unbound=Non liée - -info.iron_dimensional_door0=Placez sur le bloc sous une fissure -info.iron_dimensional_door1=pour activer cette fissure ou placez -info.iron_dimensional_door2=n'importe où ailleurs pour créer une -info.iron_dimensional_door3=dimension de poche. - -info.gold_dimensional_door0=Similaire à une porte dimensionnelle -info.gold_dimensional_door1=mais garde une dimension de poche -info.gold_dimensional_door2=chargée si elle est placée à l'intérieur. - -info.quartz_dimensional_door0=Crée un passage vers votre -info.quartz_dimensional_door1=dimension de poche personnelle. - -info.rift_blade0=Ouvre des portes temporaires sur des fissures -info.rift_blade1=et possède une attaque de téléporation. - -info.rift_remover0=Utilisez près d'une fissure -info.rift_remover1=exposée pour l'enlever ainsi -info.rift_remover2=que celles à proximité. - -info.rift_signature.bound=Mène aux coordonnées (%d, %d, %d) à la dimension #%d -info.rift_signature.unbound0=Le premier clic stocke un emplacement ; -info.rift_signature.unbound1=le deuxième clic crée une paire de -info.rift_signature.unbound2=fissures qui lient les deux emplacements. - -info.stabilized_rift_signature.bound=Mène aux coordonnées (%d, %d, %d) à la dimension #%d -info.stabilized_rift_signature.unbound0=Le premier clic stocke un emplacement, -info.stabilized_rift_signature.unbound1=les autres clics créent des fissurent qui lient -info.stabilized_rift_signature.unbound2=le premier et les derniers emplacements ensemble. - -info.chaos_dimensional_door=Attention : mène vers une destination aléatoire - -info.oak_dimensional_door0=Placez sur le bloc sous une -info.oak_dimensional_door1=fissure pour créer un portail, -info.oak_dimensional_door2=ou placez n'importe où dans une -info.oak_dimensional_door3=dimension de poche pour sortir. +item.rift_key.bound.info=Liée +item.rift_key.unbound.info=Non liée +item.iron_dimensional_door.info=Placez sur le bloc sous une fissure \npour activer cette fissure ou placez \nn'importe où ailleurs pour créer une \ndimension de poche. +item.gold_dimensional_door.info=Similaire à une porte dimensionnelle \nmais garde une dimension de poche \nchargée si elle est placée à l'intérieur. +item.quartz_dimensional_door.info=Crée un passage vers votre \ndimension de poche personnelle. +item.rift_blade.info=Ouvre des portes temporaires sur des fissures \net possède une attaque de téléporation. +item.rift_remover.info=Utilisez près d'une fissure \nexposée pour l'enlever ainsi \nque celles à proximité. +item.rift_signature.bound.info=Mène aux coordonnées (%d, %d, %d) à la dimension #%d +item.rift_signature.unbound.info=Le premier clic stocke un emplacement ; \nle deuxième clic crée une paire de \nfissures qui lient les deux emplacements. +item.stabilized_rift_signature.bound.info=Mène aux coordonnées (%d, %d, %d) à la dimension #%d +item.stabilized_rift_signature.unbound.info=Le premier clic stocke un emplacement, \nles autres clics créent des fissurent qui lient \nle premier et les derniers emplacements ensemble. +item.chaos_dimensional_door.info=Attention : mène vers une destination aléatoire +item.oak_dimensional_door.info=Placez sur le bloc sous une \nfissure pour créer un portail, \nou placez n'importe où dans une \ndimension de poche pour sortir. entity.dimdoors.monolith.name=Monolithe commands.dimteleport.usage=/dimteleport [lacet] [tanage] diff --git a/src/main/resources/assets/dimdoors/lang/it_IT.lang b/src/main/resources/assets/dimdoors/lang/it_IT.lang index 719357a0..5303ed58 100644 --- a/src/main/resources/assets/dimdoors/lang/it_IT.lang +++ b/src/main/resources/assets/dimdoors/lang/it_IT.lang @@ -1,3 +1,4 @@ +#PARSE_ESCAPES itemGroup.dimensional_doors_creative_tab=Dimensional Doors oggetti tile.gold_door.name=Porta d'oro @@ -37,43 +38,18 @@ item.rift_blade.name=Lama dimensionale item.world_thread.name=Filo di mondo item.stable_fabric.name=Tessuto stabile -info.rift_key.bound=Legato -info.rift_key.unbound=Non legato - -info.iron_dimensional_door0=Piazzalo sul blocco sotto una -info.iron_dimensional_door1=frattura per attivarla o piazzalo -info.iron_dimensional_door2=da qualunque altra parte per creare -info.iron_dimensional_door3=una dimensione tascabile. - -info.gold_dimensional_door0=Simile a una Porta dimensionale -info.gold_dimensional_door1=ma tiene la dimensione tascabile -info.gold_dimensional_door2=caricata se piazzata all'interno. - -info.quartz_dimensional_door0=Crea un sentiero alla -info.quartz_dimensional_door1=tua dimensione tascabile - -info.rift_blade0=Apre porte temporanee su fratture -info.rift_blade1=e ha un colpo che teletrasporta. - -info.rift_remover0=Usalo presso una frattura -info.rift_remover1=esposta per rimuovere quello -info.rift_remover2=e altre fratture vicine. - -info.rift_signature.bound=Porta a (%d, %d, %d) nella dimensione #%d -info.rift_signature.unbound0=Al primo clic salva la posizione; al -info.rift_signature.unbound1=secondo clic crea un paio di fratture -info.rift_signature.unbound2=che collegano le due posizioni. - -info.stabilized_rift_signature.bound=Porta a (%d, %d, %d) nella dimensione #%d -info.stabilized_rift_signature.unbound0=Al primo clic salva la posizione; al -info.stabilized_rift_signature.unbound1=secondo clic crea fratture che -info.stabilized_rift_signature.unbound2=collegano la prima e ultima posizione. - -info.chaos_dimensional_door=Attenziione: Porta a una destinazione casuale - -info.oak_dimensional_door0=Piazzalo sul blocco sotto una -info.oak_dimensional_door1=frattura per creare un portale, -info.oak_dimensional_door2=o piazzalo da qualunque altra parte -info.oak_dimensional_door3=in una dimensione tascabile per uscire. +item.rift_key.bound.info=Legato +item.rift_key.unbound.info=Non legato +item.iron_dimensional_door.info=Piazzalo sul blocco sotto una \nfrattura per attivarla o piazzalo \nda qualunque altra parte per creare \nuna dimensione tascabile. +item.gold_dimensional_door.info=Simile a una Porta dimensionale \nma tiene la dimensione tascabile \ncaricata se piazzata all'interno. +item.quartz_dimensional_door.info=Crea un sentiero alla \ntua dimensione tascabile +item.rift_blade.info=Apre porte temporanee su fratture \ne ha un colpo che teletrasporta. +item.rift_remover.info=Usalo presso una frattura \nesposta per rimuovere quello \ne altre fratture vicine. +item.rift_signature.bound.info=Porta a (%d, %d, %d) nella dimensione #%d +item.rift_signature.unbound.info=Al primo clic salva la posizione; al \nsecondo clic crea un paio di fratture \nche collegano le due posizioni. +item.stabilized_rift_signature.bound.info=Porta a (%d, %d, %d) nella dimensione #%d +item.stabilized_rift_signature.unbound.info=Al primo clic salva la posizione; al \nsecondo clic crea fratture che \ncollegano la prima e ultima posizione. +item.chaos_dimensional_door.info=Attenziione: Porta a una destinazione casuale +item.oak_dimensional_door.info=Piazzalo sul blocco sotto una \nfrattura per creare un portale, \no piazzalo da qualunque altra parte \nin una dimensione tascabile per uscire. entity.dimdoors.monolith.name=Monolito diff --git a/src/main/resources/assets/dimdoors/lang/nl_NL.lang b/src/main/resources/assets/dimdoors/lang/nl_NL.lang index 0d7cf0dc..bd77cfce 100644 --- a/src/main/resources/assets/dimdoors/lang/nl_NL.lang +++ b/src/main/resources/assets/dimdoors/lang/nl_NL.lang @@ -1,3 +1,4 @@ +#PARSE_ESCAPES itemGroup.dimensional_doors_creative_tab=Dimensional Doors Voorwerpen tile.gold_door.name=Gouden Deur @@ -68,43 +69,18 @@ item.rift_blade.name=Scheurkling item.world_thread.name=Werelddraad item.stable_fabric.name=Stabiel Weefsel -info.rift_key.bound=Gebonden -info.rift_key.unbound=Ontbonden - -info.iron_dimensional_door0=Plaats op het blok onder een scheur -info.iron_dimensional_door1=om deze scheur te activeren of -info.iron_dimensional_door2=op een andere plaats om een -info.iron_dimensional_door3=publieke broekzak-dimensie te creëren. - -info.gold_dimensional_door0=Net als een Dimensiedeur, maar houdt -info.gold_dimensional_door1=een broekzak dimensie geladen als -info.gold_dimensional_door2=deze er binnen geplaatst wordt. - -info.quartz_dimensional_door0=Creëert een pad naar -info.quartz_dimensional_door1=je persoonlijke broekzak - -info.rift_blade0=Opent tijdelijke deuren op scheuren -info.rift_blade1=en heeft een teleportatie aanval. - -info.rift_remover0=Gebruik dichtbij een scheur -info.rift_remover1=om het te verwijderen en -info.rift_remover2=alle dichtbijzijnde scheuren. - -info.rift_signature.bound=Leidt naar (%d, %d, %d) in dimensie #%d -info.rift_signature.unbound0=De eerste klik slaat een locatie op; -info.rift_signature.unbound1=de tweede creëert een paar scheuren -info.rift_signature.unbound2=die beide locaties met elkaar verbinden. - -info.stabilized_rift_signature.bound=Leidt naar (%d, %d, %d) in dimensie #%d -info.stabilized_rift_signature.unbound0=De eerste klik slaat een locatie op, -info.stabilized_rift_signature.unbound1=andere klikken creëren scheuren die de eerste -info.stabilized_rift_signature.unbound2=en laatste locaties met elkaar verbinden. - -info.chaos_dimensional_door=Pas op: Leidt naar een willekeurige bestemming - -info.oak_dimensional_door0=Plaats op het blok onder een scheur -info.oak_dimensional_door1=om een portaal te creëren, -info.oak_dimensional_door2=of plaats het ergens in een -info.oak_dimensional_door3=broekzak dimensie om deze te verlaten. +item.rift_key.bound.info=Gebonden +item.rift_key.unbound.info=Ontbonden +item.iron_dimensional_door.info=Plaats op het blok onder een scheur \nom deze scheur te activeren of \nop een andere plaats om een \npublieke broekzak-dimensie te creëren. +item.gold_dimensional_door.info=Net als een Dimensiedeur, maar houdt \neen broekzak dimensie geladen als \ndeze er binnen geplaatst wordt. +item.quartz_dimensional_door.info=Creëert een pad naar \nje persoonlijke broekzak +item.rift_blade.info=Opent tijdelijke deuren op scheuren \nen heeft een teleportatie aanval. +item.rift_remover.info=Gebruik dichtbij een scheur \nom het te verwijderen en \nalle dichtbijzijnde scheuren. +item.rift_signature.bound.info=Leidt naar (%d, %d, %d) in dimensie #%d +item.rift_signature.unbound.info=De eerste klik slaat een locatie op; \nde tweede creëert een paar scheuren \ndie beide locaties met elkaar verbinden. +item.stabilized_rift_signature.bound.info=Leidt naar (%d, %d, %d) in dimensie #%d +item.stabilized_rift_signature.unbound.info=De eerste klik slaat een locatie op, \nandere klikken creëren scheuren die de eerste \nen laatste locaties met elkaar verbinden. +item.chaos_dimensional_door.info=Pas op: Leidt naar een willekeurige bestemming +item.oak_dimensional_door.info=Plaats op het blok onder een scheur \nom een portaal te creëren, \nof plaats het ergens in een \nbroekzak dimensie om deze te verlaten. entity.dimdoors.monolith.name=Monoliet diff --git a/src/main/resources/assets/dimdoors/lang/ro_RO.lang b/src/main/resources/assets/dimdoors/lang/ro_RO.lang index 850d7738..b1583249 100644 --- a/src/main/resources/assets/dimdoors/lang/ro_RO.lang +++ b/src/main/resources/assets/dimdoors/lang/ro_RO.lang @@ -1,3 +1,4 @@ +#PARSE_ESCAPES itemGroup.dimensional_doors_creative_tab=Obiecte Dimensional Doors tile.gold_door.name=Ușă de aur @@ -54,44 +55,18 @@ item.rift_blade.name=Lamă de fisură item.world_thread.name=Ața lumii item.stable_fabric.name=Ață stabilă -info.rift_key.bound=Legat -info.rift_key.unbound=Dezlegat - -info.iron_dimensional_door0=Plasează pe blocul de sub o fisură -info.iron_dimensional_door1=pentru a activa acea fisură sau -info.iron_dimensional_door2=oriunde altundeva pentru a crea -info.iron_dimensional_door3=o dimensiune de buzunar. - -info.gold_dimensional_door0=Similară la o ușă dimensională -info.gold_dimensional_door1=doar că păstrează o dimensiune -info.gold_dimensional_door2=de buzunar încărcată dacă e -info.gold_dimensional_door3=plasată la interior. - -info.quartz_dimensional_door0=Crează o trecere spre dimensiunea -info.quartz_dimensional_door1=ta de buzunar personală. - -info.rift_blade0=Deschide uși temporare pe fisuri -info.rift_blade1=și are un atac de teleportare. - -info.rift_remover0=Folosește aproape de o fisură -info.rift_remover1=expusa pentru a sterge acea -info.rift_remover2=fisură și ori ce fisuri apropiate. - -info.rift_signature.bound=Duce la (%d, %d, %d) în dimensiunea #%d -info.rift_signature.unbound0=Primul clic stochează o locație; -info.rift_signature.unbound1=al doilea clic crează o pereche -info.rift_signature.unbound2=de fisuri conectând cele doua locații. - -info.stabilized_rift_signature.bound=Duce la (%d, %d, %d) în dimensiunea #%d -info.stabilized_rift_signature.unbound0=Primul clic stochează o locație; -info.stabilized_rift_signature.unbound1=alte clicuri crează fisuri conectând -info.stabilized_rift_signature.unbound2=prima și ultima conectiuni împreună. - -info.chaos_dimensional_door=Atenție: Duce la o destinație aleatorie - -info.oak_dimensional_door0=Plasează pe blocul sub o fisură -info.oak_dimensional_door1=pentru a crea un portal sau -info.oak_dimensional_door2=plasează ori unde într-o dimensiune -info.oak_dimensional_door3=de buzunar pentru a ieșii. +item.rift_key.bound.info=Legat +item.rift_key.unbound.info=Dezlegat +item.iron_dimensional_door.info=Plasează pe blocul de sub o fisură \npentru a activa acea fisură sau \noriunde altundeva pentru a crea \no dimensiune de buzunar. +item.gold_dimensional_door.info=Similară la o ușă dimensională \ndoar că păstrează o dimensiune \nde buzunar încărcată dacă e \nplasată la interior. +item.quartz_dimensional_door.info=Crează o trecere spre dimensiunea \nta de buzunar personală. +item.rift_blade.info=Deschide uși temporare pe fisuri \nși are un atac de teleportare. +item.rift_remover.info=Folosește aproape de o fisură \nexpusa pentru a sterge acea \nfisură și ori ce fisuri apropiate. +item.rift_signature.bound.info=Duce la (%d, %d, %d) în dimensiunea #%d +item.rift_signature.unbound.info=Primul clic stochează o locație; \nal doilea clic crează o pereche \nde fisuri conectând cele doua locații. +item.stabilized_rift_signature.bound.info=Duce la (%d, %d, %d) în dimensiunea #%d +item.stabilized_rift_signature.unbound.info=Primul clic stochează o locație; \nalte clicuri crează fisuri conectând \nprima și ultima conectiuni împreună. +item.chaos_dimensional_door.info=Atenție: Duce la o destinație aleatorie +item.oak_dimensional_door.info=Plasează pe blocul sub o fisură \npentru a crea un portal sau \nplasează ori unde într-o dimensiune \nde buzunar pentru a ieșii. entity.dimdoors.monolith.name=Monolit diff --git a/src/main/resources/assets/dimdoors/lang/ru_RU.lang b/src/main/resources/assets/dimdoors/lang/ru_RU.lang index 9e7249df..742cb907 100644 --- a/src/main/resources/assets/dimdoors/lang/ru_RU.lang +++ b/src/main/resources/assets/dimdoors/lang/ru_RU.lang @@ -1,3 +1,4 @@ +#PARSE_ESCAPES itemGroup.dimensional_doors_creative_tab=Dimensional Doors: Предметы tile.gold_door.name=Золотая дверь @@ -37,43 +38,18 @@ item.rift_blade.name=Клинок разлома item.world_thread.name=Мировая нить item.stable_fabric.name=Стабильная ткань -info.rift_key.bound=Связан -info.rift_key.unbound=Не связан - -info.iron_dimensional_door0=Поставьте на блок под разломом, -info.iron_dimensional_door1=чтобы активировать этот разлом или -info.iron_dimensional_door2=поставьте куда угодно, чтобы создать -info.iron_dimensional_door3=карманное измерение. - -info.gold_dimensional_door0=Схожа с пространственной дверью, -info.gold_dimensional_door1=но она также держит карманное измерение -info.gold_dimensional_door2=загруженным, если она размещена внутри его. - -info.quartz_dimensional_door0=Создает путь к -info.quartz_dimensional_door1=Вашему карману - -info.rift_blade0=Открывает временные двери на разломах -info.rift_blade1=и наносит урон при телепортации. - -info.rift_remover0=Используйте рядом с разломом, -info.rift_remover1=чтобы убрать его и -info.rift_remover2=другие ближайшие разломы. - -info.rift_signature.bound=Ведёт в (%d, %d, %d) в измерение #%d -info.rift_signature.unbound0=Первое нажатие сохраняет расположение; -info.rift_signature.unbound1=второе нажатие создаёт пару -info.rift_signature.unbound2=разломов, соединяющих два расположения. - -info.stabilized_rift_signature.bound=Ведёт в (%d, %d, %d) в измерение #%d -info.stabilized_rift_signature.unbound0=Первое нажатие сохраняет расположение, -info.stabilized_rift_signature.unbound1=остальные нажатия создают разломы, соединяющие -info.stabilized_rift_signature.unbound2=первое и последнее расположения вместе. - -info.chaos_dimensional_door=Внимание: Ведёт неизвестно куда - -info.oak_dimensional_door0=Поставьте на блок под -info.oak_dimensional_door1=разломом, чтобы создать портал -info.oak_dimensional_door2=или поставьте куда угодно в -info.oak_dimensional_door3=карманном измерении, чтобы выйти из него. +item.rift_key.bound.info=Связан +item.rift_key.unbound.info=Не связан +item.iron_dimensional_door.info=Поставьте на блок под разломом, \nчтобы активировать этот разлом или \nпоставьте куда угодно, чтобы создать \nкарманное измерение. +item.gold_dimensional_door.info=Схожа с пространственной дверью, \nно она также держит карманное измерение \nзагруженным, если она размещена внутри его. +item.quartz_dimensional_door.info=Создает путь к \nВашему карману +item.rift_blade.info=Открывает временные двери на разломах \nи наносит урон при телепортации. +item.rift_remover.info=Используйте рядом с разломом, \nчтобы убрать его и \nдругие ближайшие разломы. +item.rift_signature.bound.info=Ведёт в (%d, %d, %d) в измерение #%d +item.rift_signature.unbound.info=Первое нажатие сохраняет расположение; \nвторое нажатие создаёт пару \nразломов, соединяющих два расположения. +item.stabilized_rift_signature.bound.info=Ведёт в (%d, %d, %d) в измерение #%d +item.stabilized_rift_signature.unbound.info=Первое нажатие сохраняет расположение, \nостальные нажатия создают разломы, соединяющие \nпервое и последнее расположения вместе. +item.chaos_dimensional_door.info=Внимание: Ведёт неизвестно куда +item.oak_dimensional_door.info=Поставьте на блок под \nразломом, чтобы создать портал \nили поставьте куда угодно в \nкарманном измерении, чтобы выйти из него. entity.dimdoors.monolith.name=Монолит diff --git a/src/main/resources/assets/dimdoors/lang/zh_CN.lang b/src/main/resources/assets/dimdoors/lang/zh_CN.lang index 3a53f1cc..bdf7abad 100644 --- a/src/main/resources/assets/dimdoors/lang/zh_CN.lang +++ b/src/main/resources/assets/dimdoors/lang/zh_CN.lang @@ -1,3 +1,4 @@ +#PARSE_ESCAPES itemGroup.dimensional_doors_creative_tab=次元门物品 tile.gold_door.name=金门 @@ -37,43 +38,18 @@ item.rift_blade.name=裂痕之刃 item.world_thread.name=世界纤维 item.stable_fabric.name=稳定构造 -info.rift_key.bound=绑定 -info.rift_key.unbound=取消绑定 - -info.iron_dimensional_door0=放在裂痕下方的方块上 -info.iron_dimensional_door1=来激活裂痕 -info.iron_dimensional_door2=或放在任意地点生成 -info.iron_dimensional_door3=一个口袋次元. - -info.gold_dimensional_door0=类似于次元门 -info.gold_dimensional_door1=但它放在次元内部时 -info.gold_dimensional_door2=会保持次元的加载. - -info.quartz_dimensional_door0=生成一个通向你 -info.quartz_dimensional_door1=口袋次元的路径 - -info.rift_blade0=在裂痕上开启临时的门 -info.rift_blade1=它还拥有瞬移攻击的能力. - -info.rift_remover0=在外露的裂痕附近使用 -info.rift_remover1=来移除它以及附近的其他 -info.rift_remover2=裂痕. - -info.rift_signature.bound=指向(%d, %d, %d) 位于#%d -info.rift_signature.unbound0=第一次点击记录一个位置; -info.rift_signature.unbound1=第二次点击在两地间创造 -info.rift_signature.unbound2=一对相互连接的裂痕. - -info.stabilized_rift_signature.bound=指向(%d, %d, %d) 位于#%d -info.stabilized_rift_signature.unbound0=首次点击记录一个位置, -info.stabilized_rift_signature.unbound1=再次点击生成连接两地的 -info.stabilized_rift_signature.unbound2=裂痕. - -info.chaos_dimensional_door=注意: 将会随机传送 - -info.oak_dimensional_door0=放在裂痕下方的方块上 -info.oak_dimensional_door1=来制造传送门, -info.oak_dimensional_door2=放在口袋次元中 -info.oak_dimensional_door3=以退出空间. +item.rift_key.bound.info=绑定 +item.rift_key.unbound.info=取消绑定 +item.iron_dimensional_door.info=放在裂痕下方的方块上 \n来激活裂痕 \n或放在任意地点生成 \n一个口袋次元. +item.gold_dimensional_door.info=类似于次元门 \n但它放在次元内部时 \n会保持次元的加载. +item.quartz_dimensional_door.info=生成一个通向你 \n口袋次元的路径 +item.rift_blade.info=在裂痕上开启临时的门 \n它还拥有瞬移攻击的能力. +item.rift_remover.info=在外露的裂痕附近使用 \n来移除它以及附近的其他 \n裂痕. +item.rift_signature.bound.info=指向(%d, %d, %d) 位于#%d +item.rift_signature.unbound.info=第一次点击记录一个位置; \n第二次点击在两地间创造 \n一对相互连接的裂痕. +item.stabilized_rift_signature.bound.info=指向(%d, %d, %d) 位于#%d +item.stabilized_rift_signature.unbound.info=首次点击记录一个位置, \n再次点击生成连接两地的 \n裂痕. +item.chaos_dimensional_door.info=注意: 将会随机传送 +item.oak_dimensional_door.info=放在裂痕下方的方块上 \n来制造传送门, \n放在口袋次元中 \n以退出空间. entity.dimdoors.monolith.name=巨石