From a7d15d116ab81805ba8fbb05a8b4481e98386054 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 9 May 2016 22:17:09 +0200 Subject: [PATCH] General improvements #2 --- src/main/java/refinedstorage/gui/GuiCrafter.java | 2 +- src/main/java/refinedstorage/item/ItemPattern.java | 6 ------ src/main/resources/assets/refinedstorage/lang/en_US.lang | 2 +- src/main/resources/assets/refinedstorage/lang/nl_NL.lang | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/refinedstorage/gui/GuiCrafter.java index cf1dcf2fd..197757b3d 100755 --- a/src/main/java/refinedstorage/gui/GuiCrafter.java +++ b/src/main/java/refinedstorage/gui/GuiCrafter.java @@ -52,7 +52,7 @@ public class GuiCrafter extends GuiBase { if (crafter.getStackInSlot(i) != null) { ItemStack pattern = crafter.getStackInSlot(i); - String text = t("misc.refinedstorage:processing"); + String text = t("gui.refinedstorage:crafter.processing"); if (!ItemPattern.isProcessing(pattern)) { ItemStack result = ItemPattern.getOutputs(pattern)[0]; diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java index a94a9f1bc..dfa920607 100755 --- a/src/main/java/refinedstorage/item/ItemPattern.java +++ b/src/main/java/refinedstorage/item/ItemPattern.java @@ -4,8 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.util.Constants; import java.util.List; @@ -25,10 +23,6 @@ public class ItemPattern extends ItemBase { for (ItemStack output : getOutputs(pattern)) { list.add(output.getDisplayName()); } - - if (isProcessing(pattern)) { - list.add(TextFormatting.ITALIC + I18n.translateToLocal("misc.refinedstorage:processing") + TextFormatting.RESET); - } } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 6c91cfd6e..a1b0ce70e 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -28,6 +28,7 @@ gui.refinedstorage:crafting_monitor.items_processing=Items processing: gui.refinedstorage:wireless_transmitter=Wireless Transmitter gui.refinedstorage:wireless_transmitter.distance=%d blocks gui.refinedstorage:crafter=Crafter +gui.refinedstorage:crafter.processing=Processing gui.refinedstorage:processing_pattern_encoder=Processing Pattern Encoder gui.refinedstorage:processing_pattern_encoder.pattern_create=Create Pattern @@ -55,7 +56,6 @@ misc.refinedstorage:none=None misc.refinedstorage:cancel=Cancel misc.refinedstorage:cancel_all=Cancel All misc.refinedstorage:priority=Priority -misc.refinedstorage:processing=Processing sidebutton.refinedstorage:compare.1=Compare Damage sidebutton.refinedstorage:compare.2=Compare NBT diff --git a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang index 9e7cbc7c6..8d8124b6e 100755 --- a/src/main/resources/assets/refinedstorage/lang/nl_NL.lang +++ b/src/main/resources/assets/refinedstorage/lang/nl_NL.lang @@ -28,6 +28,7 @@ gui.refinedstorage:crafting_monitor.items_processing=Items aan het verwerken: gui.refinedstorage:wireless_transmitter=Draadloze Zender gui.refinedstorage:wireless_transmitter.distance=%d blokken gui.refinedstorage:crafter=Crafter +gui.refinedstorage:crafter.processing=Verwerking gui.refinedstorage:processing_pattern_encoder=Verwerkingspatroon Codeerder gui.refinedstorage:processing_pattern_encoder.pattern_create=Patroon maken @@ -55,7 +56,6 @@ misc.refinedstorage:none=Geen misc.refinedstorage:cancel=Annuleer misc.refinedstorage:cancel_all=Annuleer alles misc.refinedstorage:priority=Prioriteit -misc.refinedstorage:processing=Verwerking sidebutton.refinedstorage:compare.1=Vergelijken op schade sidebutton.refinedstorage:compare.2=Vergelijken op NBT