From 6931da87249f2003239a44c89a7e6a1a47206361 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Mon, 16 Sep 2019 22:10:54 +0200 Subject: [PATCH] Use dots instead of colon --- .../network/item/NetworkItemHandler.java | 2 +- .../refinedstorage/item/NetworkItem.java | 6 ++-- .../refinedstorage/util/TimeUtils.java | 14 ++++---- .../assets/refinedstorage/lang/en_us.json | 32 +++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java index 8cca6ecd0..bc910712d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/item/NetworkItemHandler.java @@ -41,7 +41,7 @@ public class NetworkItemHandler implements INetworkItemHandler { } if (!inRange) { - player.sendMessage(new TranslationTextComponent("misc.refinedstorage:network_item.out_of_range")); + player.sendMessage(new TranslationTextComponent("misc.refinedstorage.network_item.out_of_range")); return; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java index 585948c5e..72f1b1ad4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/NetworkItem.java @@ -54,7 +54,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv private void applyNetwork(MinecraftServer server, ItemStack stack, Consumer onNetwork, Consumer onError) { if (!isValid(stack)) { - onError.accept(new TranslationTextComponent("misc.refinedstorage:network_item.not_found")); + onError.accept(new TranslationTextComponent("misc.refinedstorage.network_item.not_found")); } else { World networkWorld = DimensionManager.getWorld(server, getDimension(stack), true, true); @@ -63,7 +63,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv if (networkWorld != null && ((network = networkWorld.getTileEntity(new BlockPos(getX(stack), getY(stack), getZ(stack)))) instanceof INetwork)) { onNetwork.accept((INetwork) network); } else { - onError.accept(new TranslationTextComponent("misc.refinedstorage:network_item.not_found")); + onError.accept(new TranslationTextComponent("misc.refinedstorage.network_item.not_found")); } } } @@ -73,7 +73,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv super.addInformation(stack, world, tooltip, flag); if (isValid(stack)) { - tooltip.add(new TranslationTextComponent("misc.refinedstorage:network_item.tooltip", getX(stack), getY(stack), getZ(stack)).setStyle(new Style().setColor(TextFormatting.GRAY))); + tooltip.add(new TranslationTextComponent("misc.refinedstorage.network_item.tooltip", getX(stack), getY(stack), getZ(stack)).setStyle(new Style().setColor(TextFormatting.GRAY))); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/TimeUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/TimeUtils.java index b4a8115d5..5d6f48c9a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/util/TimeUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/util/TimeUtils.java @@ -14,19 +14,19 @@ public final class TimeUtils { long diff = System.currentTimeMillis() - ago; if (diff < SECOND * 10) { - return I18n.format("misc.refinedstorage:last_modified.just_now", by); + return I18n.format("misc.refinedstorage.last_modified.just_now", by); } else if (diff < MINUTE) { - return I18n.format("misc.refinedstorage:last_modified.second" + ((diff / SECOND) > 1 ? "s" : ""), diff / SECOND, by); + return I18n.format("misc.refinedstorage.last_modified.second" + ((diff / SECOND) > 1 ? "s" : ""), diff / SECOND, by); } else if (diff < HOUR) { - return I18n.format("misc.refinedstorage:last_modified.minute" + ((diff / MINUTE) > 1 ? "s" : ""), diff / MINUTE, by); + return I18n.format("misc.refinedstorage.last_modified.minute" + ((diff / MINUTE) > 1 ? "s" : ""), diff / MINUTE, by); } else if (diff < DAY) { - return I18n.format("misc.refinedstorage:last_modified.hour" + ((diff / HOUR) > 1 ? "s" : ""), diff / HOUR, by); + return I18n.format("misc.refinedstorage.last_modified.hour" + ((diff / HOUR) > 1 ? "s" : ""), diff / HOUR, by); } else if (diff < WEEK) { - return I18n.format("misc.refinedstorage:last_modified.day" + ((diff / DAY) > 1 ? "s" : ""), diff / DAY, by); + return I18n.format("misc.refinedstorage.last_modified.day" + ((diff / DAY) > 1 ? "s" : ""), diff / DAY, by); } else if (diff < YEAR) { - return I18n.format("misc.refinedstorage:last_modified.week" + ((diff / WEEK) > 1 ? "s" : ""), diff / WEEK, by); + return I18n.format("misc.refinedstorage.last_modified.week" + ((diff / WEEK) > 1 ? "s" : ""), diff / WEEK, by); } - return I18n.format("misc.refinedstorage:last_modified.year" + ((diff / YEAR) > 1 ? "s" : ""), diff / YEAR, by); + return I18n.format("misc.refinedstorage.last_modified.year" + ((diff / YEAR) > 1 ? "s" : ""), diff / YEAR, by); } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_us.json b/src/main/resources/assets/refinedstorage/lang/en_us.json index 163a008e5..e082e94e4 100644 --- a/src/main/resources/assets/refinedstorage/lang/en_us.json +++ b/src/main/resources/assets/refinedstorage/lang/en_us.json @@ -92,9 +92,9 @@ "misc.refinedstorage.storage.stored_minimal": "%s", "misc.refinedstorage.storage.stored_capacity_minimal": "%s / %s", "misc.refinedstorage.storage.full": "%d%% full", - "misc.refinedstorage:network_item.tooltip": "Linked to %d, %d, %d.", - "misc.refinedstorage:network_item.out_of_range": "There is no Wireless Transmitter in range.", - "misc.refinedstorage:network_item.not_found": "Controller not found.", + "misc.refinedstorage.network_item.tooltip": "Linked to %d, %d, %d.", + "misc.refinedstorage.network_item.out_of_range": "There is no Wireless Transmitter in range.", + "misc.refinedstorage.network_item.not_found": "Controller not found.", "misc.refinedstorage.network_card.tooltip": "Linked to %d, %d, %d.", "misc.refinedstorage.pattern.inputs": "Inputs", "misc.refinedstorage.pattern.outputs": "Outputs", @@ -110,19 +110,19 @@ "misc.refinedstorage.processing": "Processing", "misc.refinedstorage:reader_writer.redstone": "Redstone strength: %d", "misc.refinedstorage:total": "%s total", - "misc.refinedstorage:last_modified.just_now": "Last modified just now by %s", - "misc.refinedstorage:last_modified.second": "Last modified %d second ago by %s", - "misc.refinedstorage:last_modified.seconds": "Last modified %d seconds ago by %s", - "misc.refinedstorage:last_modified.minute": "Last modified %d minute ago by %s", - "misc.refinedstorage:last_modified.minutes": "Last modified %d minutes ago by %s", - "misc.refinedstorage:last_modified.hour": "Last modified %d hour ago by %s", - "misc.refinedstorage:last_modified.hours": "Last modified %d hours ago by %s", - "misc.refinedstorage:last_modified.day": "Last modified %d day ago by %s", - "misc.refinedstorage:last_modified.days": "Last modified %d days ago by %s", - "misc.refinedstorage:last_modified.week": "Last modified %d week ago by %s", - "misc.refinedstorage:last_modified.weeks": "Last modified %d weeks ago by %s", - "misc.refinedstorage:last_modified.year": "Last modified %d year ago by %s", - "misc.refinedstorage:last_modified.years": "Last modified %d years ago by %s", + "misc.refinedstorage.last_modified.just_now": "Last modified just now by %s", + "misc.refinedstorage.last_modified.second": "Last modified %d second ago by %s", + "misc.refinedstorage.last_modified.seconds": "Last modified %d seconds ago by %s", + "misc.refinedstorage.last_modified.minute": "Last modified %d minute ago by %s", + "misc.refinedstorage.last_modified.minutes": "Last modified %d minutes ago by %s", + "misc.refinedstorage.last_modified.hour": "Last modified %d hour ago by %s", + "misc.refinedstorage.last_modified.hours": "Last modified %d hours ago by %s", + "misc.refinedstorage.last_modified.day": "Last modified %d day ago by %s", + "misc.refinedstorage.last_modified.days": "Last modified %d days ago by %s", + "misc.refinedstorage.last_modified.week": "Last modified %d week ago by %s", + "misc.refinedstorage.last_modified.weeks": "Last modified %d weeks ago by %s", + "misc.refinedstorage.last_modified.year": "Last modified %d year ago by %s", + "misc.refinedstorage.last_modified.years": "Last modified %d years ago by %s", "sidebutton.refinedstorage:compare.1": "Use damage", "sidebutton.refinedstorage:compare.2": "Use NBT", "sidebutton.refinedstorage:redstone_mode": "Redstone mode",