From 3cc6dc7bd044ec7e35e4a63451d6739a38707a8b Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Tue, 24 May 2016 12:22:44 -0400 Subject: [PATCH] implemented #48 & #49 --- gradle.properties | 2 +- latestversion.txt | 2 +- .../handlers/AchievementHandler.java | 4 +- .../handlers/ConfigHandler.java | 4 ++ .../handlers/LocaleHandler.java | 7 +-- .../items/ItemEnum.java | 2 +- .../items/ItemMagnet.java | 45 ++++++++++++++--- .../proxy/ClientProxy.java | 49 +++++++++++++++++++ .../proxy/CommonProxy.java | 4 +- .../reference/Reference.java | 2 + src/resources/assets/ae2wct/lang/de_DE.lang | 15 ++++++ src/resources/assets/ae2wct/lang/en_CA.lang | 14 ++++++ src/resources/assets/ae2wct/lang/en_GB.lang | 14 ++++++ src/resources/assets/ae2wct/lang/en_US.lang | 15 ++++++ src/resources/assets/ae2wct/lang/es_ES.lang | 14 ++++++ 15 files changed, 175 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 82ef722..7a23a96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel=b -wctbuild=1.7 +wctbuild=1.8.4 wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal diff --git a/latestversion.txt b/latestversion.txt index ab38f25..da58bc6 100644 --- a/latestversion.txt +++ b/latestversion.txt @@ -1 +1 @@ -1.8.3b \ No newline at end of file +1.8.4b \ No newline at end of file diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java index c6335ac..03ad1b0 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java @@ -6,13 +6,11 @@ import net.minecraft.stats.Achievement; import net.minecraft.stats.AchievementList; import net.minecraftforge.common.AchievementPage; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; -import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; public class AchievementHandler { - private static ItemInfinityBooster booster = (ItemInfinityBooster) ItemEnum.BOOSTER_ICON.getItem(); public static final Achievement wctAch = new Achievement("achievement.wctAchievement", "wctAchievement", 0, 0, new ItemStack(ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem(), 1), (Achievement) null); - public static final Achievement boosterAch = new Achievement("achievment.boosterAchievement", "boosterAchievement", 0, 2, booster.hasEffect(true), wctAch); + public static final Achievement boosterAch = new Achievement("achievment.boosterAchievement", "boosterAchievement", 0, 2, ItemEnum.BOOSTER_ICON.getItem(), wctAch); public static final Achievement magnetAch = new Achievement("achievement.magnetAchievement", "magnetAchievement", 2, 0, ItemEnum.MAGNET_CARD.getItem(), wctAch); private static final AchievementPage achPage = new AchievementPage("Wireless Crafting Term", wctAch, boosterAch, magnetAch); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java index 4dc1e73..e3cb22c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java @@ -24,6 +24,7 @@ public class ConfigHandler { public static int boosterDropChance = Reference.WCT_BOOSTER_DROPCHANCE; public static boolean boosterDropsEnabled = Reference.WCT_BOOSTERDROP_ENABLED; public static boolean mineTweakerOverride = Reference.WCT_MINETWEAKER_OVERRIDE; + public static boolean doVersionCheck = Reference.WCT_DOVERSIONCHECK; private static boolean doSave; public static boolean firstLoad = true; private static int pwrInCfgFile, boosterDropInCfgFile; @@ -51,10 +52,12 @@ public class ConfigHandler { String boosterDropDesc = LocaleHandler.BoosterDropChance.getLocal(); String boosterDropEnabledDesc = LocaleHandler.DisableBoosterDrop.getLocal(); String mineTweakerOverrideDesc = LocaleHandler.MineTweakerOverride.getLocal(); + String doVersionCheckDesc = LocaleHandler.DoVersionCheck.getLocal(); enableInfinityBooster = config.getBoolean("enableInfinityBooster", Configuration.CATEGORY_GENERAL, true, boosterDesc); enableEasyMode = config.getBoolean("enableEasyMode", Configuration.CATEGORY_GENERAL, false, easyModeDesc); boosterDropsEnabled = config.getBoolean("boosterDropsEnabled", Configuration.CATEGORY_GENERAL, true, boosterDropEnabledDesc); mineTweakerOverride = config.getBoolean("mineTweakerOverride", Configuration.CATEGORY_GENERAL, false, mineTweakerOverrideDesc); + doVersionCheck = config.getBoolean("doVersionCheck", Configuration.CATEGORY_GENERAL, true, doVersionCheckDesc); /* * I did the max power cfg loading like this because while using * Configuration#getInt did enforce the min/max values in-game, it @@ -105,6 +108,7 @@ public class ConfigHandler { Reference.WCT_BOOSTER_DROPCHANCE = boosterDropChance; Reference.WCT_BOOSTERDROP_ENABLED = boosterDropsEnabled; Reference.WCT_MINETWEAKER_OVERRIDE = mineTweakerOverride; + Reference.WCT_DOVERSIONCHECK = doVersionCheck; if (config.hasChanged() || doSave) { config.save(); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java index 6b936d1..fc74a3d 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java @@ -4,12 +4,13 @@ import net.minecraft.util.StatCollector; public enum LocaleHandler { - TitleDesc, InfinityBoosterDesc, WirelessTermLabel("gui.labels.ae2wct"), - MaxPowerDesc("config.ae2wct"), InfinityBoosterCfgDesc("config.ae2wct"), EasyModeDesc("config.ae2wct"), + TitleDesc, InfinityBoosterDesc, WirelessTermLabel("gui.labels.ae2wct"), DoVersionCheck("config.ae2wct"), NewVersionAvailable("config.ae2wct"), + MaxPowerDesc("config.ae2wct"), InfinityBoosterCfgDesc("config.ae2wct"), EasyModeDesc("config.ae2wct"), ClickString("config.ae2wct"), MagnetDesc, MagnetDesc2, PressShift, OnlyWorks, LinkStatus, Installed, NotInstalled, Active, Inactive, Status, EmptyTrash, EmptyTrashDesc, MagnetFilterTitle, NoNetworkPower("chatmessages.ae2wct"), InitializeMagnet("chatmessages.ae2wct"), FilterMode, Whitelisting, Blacklisting, MagnetMode1("chatmessages.ae2wct"), MagnetMode2("chatmessages.ae2wct"), MagnetMode3("chatmessages.ae2wct"), - MagnetActiveDesc1, MagnetActiveDesc2, BoosterDropChance("config.ae2wct"), DisableBoosterDrop("config.ae2wct"), MineTweakerOverride("config.ae2wct"); + MagnetActiveDesc1, MagnetActiveDesc2, BoosterDropChance("config.ae2wct"), DisableBoosterDrop("config.ae2wct"), MineTweakerOverride("config.ae2wct"), + Not, Using, Ignore, Ignoring, NBTData, MetaData, OreDict, FilteredItems, OrPress, Press, ToSwitchMode; private final String root; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java index 4d328b2..04361dc 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; public enum ItemEnum { BOOSTER_CARD("infinityBoosterCard", new ItemInfinityBooster().setUnlocalizedName("infinityBoosterCard")), - BOOSTER_ICON("infinityBoosterIcon", new ItemInfinityBooster().setUnlocalizedName("infinityBoosterIcon")), + BOOSTER_ICON("infinityBoosterIcon", new ItemInfinityBooster().hasEffect(true)), WIRELESS_CRAFTING_TERMINAL("wirelessCraftingTerminal", new ItemWirelessCraftingTerminal()), MAGNET_CARD("magnetCard", new ItemMagnet().setUnlocalizedName("magnetCard")), WCT_BOOSTER_BG_ICON("boosterBG", new ItemBoosterBGIcon()); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java index 53840f9..f7219a7 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java @@ -46,12 +46,13 @@ import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMagnetFilter; +import net.p455w0rd.wirelesscraftingterminal.handlers.KeybindHandler; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; /** - * Jotato's amazing magnet item from QuantumFlux adpated for use in the Wireless + * Jotato's amazing magnet item from QuantumFlux adapted for use in the Wireless * Crafting Terminal * * @author p455w0rd, Jotato @@ -105,7 +106,7 @@ public class ItemMagnet extends Item { @SideOnly(Side.CLIENT) public void addInformation(ItemStack is, EntityPlayer player, List list, boolean par4) { list.add(color("aqua") + "=============================="); - String shift = LocaleHandler.PressShift.getLocal().replace("Shift", color("yellow") + "" + color("bold") + "" + color("italics") + "Shift" + color("gray")); + String shift = LocaleHandler.PressShift.getLocal().replace("Shift", color("yellow") + color("bold") + color("italics") + "Shift" + color("gray")); if (isShiftKeyDown()) { String info = LocaleHandler.MagnetDesc.getLocal(); for (String line : Splitter.on("\n").split(WordUtils.wrap(info, 37, "\n", false))) { @@ -113,10 +114,21 @@ public class ItemMagnet extends Item { } list.add(""); - list.add(LocaleHandler.MagnetDesc2.getLocal()); + list.add(color("italics") + "" + LocaleHandler.MagnetDesc2.getLocal()); + + if (isActivated(getItemStack())) { + String boundKey = Keyboard.getKeyName(KeybindHandler.openMagnetFilter.getKeyCode()); + if (!boundKey.equals("NONE")) { + list.add(color("italics") + LocaleHandler.OrPress.getLocal() + " " + color("yellow") + color("bold") + "[" + boundKey + "]"); + } + String boundKey2 = Keyboard.getKeyName(KeybindHandler.changeMagnetMode.getKeyCode()); + if (!boundKey2.equals("NONE")) { + list.add(color("italics") + LocaleHandler.Press.getLocal() + " " + color("yellow") + color("bold") + "[" + boundKey2 + "] " + color("gray") + color("italics") + LocaleHandler.ToSwitchMode.getLocal()); + } + } list.add(""); - list.add(LocaleHandler.Status.getLocal() + ": " + (isActivated(is) ? color("green") + "" + LocaleHandler.Active.getLocal() : color("red") + "" + LocaleHandler.Inactive.getLocal())); + list.add(LocaleHandler.Status.getLocal() + ": " + (isActivated(is) ? color("green") + LocaleHandler.Active.getLocal() : color("red") + LocaleHandler.Inactive.getLocal())); if (is.getItemDamage() == 1) { list.add(color("white") + " " + LocaleHandler.MagnetActiveDesc1.getLocal()); } @@ -127,12 +139,31 @@ public class ItemMagnet extends Item { String white = LocaleHandler.Whitelisting.getLocal(); String black = LocaleHandler.Blacklisting.getLocal(); - list.add(LocaleHandler.FilterMode.getLocal() + ": " + color("white") + "" + (getMode(is) ? white : black)); - list.add(""); + list.add(LocaleHandler.FilterMode.getLocal() + ": " + color("white") + (getMode(is) ? white : black)); + String not = LocaleHandler.Not.getLocal(); + String ignoring = LocaleHandler.Ignoring.getLocal(); + String nbtData = LocaleHandler.NBTData.getLocal(); + String metaData = LocaleHandler.MetaData.getLocal(); + String usingOreDict = LocaleHandler.Using.getLocal() + " " + LocaleHandler.OreDict.getLocal(); + + list.add((!doesMagnetUseOreDict() ? " " + not : color("green")) + " " + usingOreDict); + list.add((!doesMagnetIgnoreNBT() ? " " + not : color("green")) + " " + ignoring + " " + nbtData); + list.add((!doesMagnetIgnoreMeta() ? " " + not : color("green")) + " " + ignoring + " " + metaData); + List filteredItems = getFilteredItems(getItemStack()); + + if (filteredItems != null) { + list.add(""); + list.add(color("gray") + LocaleHandler.FilteredItems.getLocal() + ":"); + for (int i = 0; i < filteredItems.size(); i++) { + list.add(" " + filteredItems.get(i).getDisplayName()); + } + } + + list.add(""); String onlyWorks = LocaleHandler.OnlyWorks.getLocal(); for (String line : Splitter.on("\n").split(WordUtils.wrap(onlyWorks, 27, "\n", false))) { - list.add(color("white") + "" + color("bold") + "" + color("italics") + "" + line.trim()); + list.add(color("white") + color("bold") + color("italics") + line.trim()); } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java index 120b394..49268c9 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java @@ -1,7 +1,9 @@ package net.p455w0rd.wirelesscraftingterminal.proxy; +import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; import java.util.List; @@ -15,16 +17,24 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.p455w0rd.wirelesscraftingterminal.handlers.KeybindHandler; +import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class ClientProxy extends CommonProxy { + + int timer = 150; public ClientProxy() { MinecraftForge.EVENT_BUS.register(this); @@ -44,6 +54,45 @@ public class ClientProxy extends CommonProxy { // No renderers...yet =] } + @SubscribeEvent + public void tickStart(TickEvent.PlayerTickEvent event) { + if (event.phase != TickEvent.Phase.START) { + return; + } + if (Reference.WCT_DOVERSIONCHECK && !Reference.WCT_HASCHECKEDVERSION) { + if (timer > 0) { + timer--; + return; + } + checkVersion(event.player); + } + } + + private void checkVersion(EntityPlayer player) { + if (!fetchVersion().equals(Reference.VERSION) && !Reference.WCT_HASCHECKEDVERSION) { + Reference.WCT_HASCHECKEDVERSION = true; + player.addChatMessage(new ChatComponentText(EnumChatFormatting.BLUE + "-=-=-=-=-=[" + EnumChatFormatting.WHITE + "Wireless Crafting Terminal" + EnumChatFormatting.BLUE + "]=-=-=-=-=-")); + player.addChatMessage(new ChatComponentText(LocaleHandler.NewVersionAvailable.getLocal())); + IChatComponent component = IChatComponent.Serializer.func_150699_a(LocaleHandler.ClickString.getLocal()); + player.addChatComponentMessage(component); + player.addChatMessage(new ChatComponentText(EnumChatFormatting.BLUE + "-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-")); + } + } + + private String fetchVersion() { + try { + InputStream in = new URL(new String("https://raw.githubusercontent.com/p455w0rd/WirelessCraftingTerminal/master/latestversion.txt")).openStream(); + BufferedReader r = new BufferedReader(new InputStreamReader(in)); + return r.readLine(); + } + catch (MalformedURLException ignored) { + return Reference.VERSION; + } + catch (IOException ignored) { + return Reference.VERSION; + } + } + @SubscribeEvent public void renderPlayer(RenderPlayerEvent.Specials.Pre event) { if (Reference.WCT_DIDTHEDIDDLE) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java index 8ea0d02..2e76270 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java @@ -1,7 +1,6 @@ package net.p455w0rd.wirelesscraftingterminal.proxy; import java.util.Random; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -140,6 +139,7 @@ public class CommonProxy { final PacketConfigSync p = new PacketConfigSync(Reference.WCT_MAX_POWER, Reference.WCT_EASYMODE_ENABLED, Reference.WCT_BOOSTER_ENABLED, Reference.WCT_BOOSTER_DROPCHANCE, Reference.WCT_MINETWEAKER_OVERRIDE); NetworkHandler.instance.sendTo((WCTPacket) p, (EntityPlayerMP) e.player); } + } @SubscribeEvent @@ -185,7 +185,7 @@ public class CommonProxy { if (event.crafting.getItem() == ItemEnum.MAGNET_CARD.getItem()) { AchievementHandler.triggerAch(magnetAch, event.player); } - + /* * if (event.crafting.getItem() == * ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem()) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java b/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java index 7b1564f..6d3a835 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java @@ -17,6 +17,8 @@ public class Reference { public static int WCT_BOOSTER_DROPCHANCE = 50; public static boolean WCT_BOOSTERDROP_ENABLED = true; public static boolean WCT_MINETWEAKER_OVERRIDE = false; + public static boolean WCT_DOVERSIONCHECK = true; + public static boolean WCT_HASCHECKEDVERSION = false; // Gui IDs private static int ae2wctGuiIndex = 0; diff --git a/src/resources/assets/ae2wct/lang/de_DE.lang b/src/resources/assets/ae2wct/lang/de_DE.lang index eeb1270..a646cff 100644 --- a/src/resources/assets/ae2wct/lang/de_DE.lang +++ b/src/resources/assets/ae2wct/lang/de_DE.lang @@ -29,6 +29,18 @@ gui.tooltips.ae2wct.Whitelisting=Erlauben gui.tooltips.ae2wct.Blacklisting=Verbieten gui.tooltips.ae2wct.MagnetActiveDesc1=Zusätzliche Items im Inventar platzieren gui.tooltips.ae2wct.MagnetActiveDesc2=Zusätzliche Items auf dem Boden liegen lassen +gui.tooltips.ae2wct.Not=Not +gui.tooltips.ae2wct.Using=Using +gui.tooltips.ae2wct.Ignore=Ignore +gui.tooltips.ae2wct.Ignoring=Ignoring +gui.tooltips.ae2wct.NBTData=NBT Data +gui.tooltips.ae2wct.MetaData=Meta Data +gui.tooltips.ae2wct.OreDict=Ore Dictionary +gui.tooltips.ae2wct.FilteredItems=Filtered Items +gui.tooltips.ae2wct.OrPress=or press +gui.tooltips.ae2wct.Press=Press +gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode + //Labels gui.labels.ae2wct.WirelessTermLabel=Drahtloskonsole @@ -39,6 +51,9 @@ config.ae2wct.EasyModeDesc=Aktiviere den "Einfachen Modus" (Einfachere Rezepte + config.ae2wct.BoosterDropChance=Wahrscheinlichkeit, dass ein Wither eine unendliche Drahtlosverstärkerkarte dropt (in % - 100=immer) config.ae2wct.DisableBoosterDrop=Enabled Booster Card drops in hard mode (true=enabled) config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes) +config.ae2wct.DoVersionCheck=Check for updates +config.ae2wct.NewVersionAvailable=New version of Wireless Crafting Terminal is available! +config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"] //Achievements achievement.wctAchievement=Digitales Fertigen über WLAN diff --git a/src/resources/assets/ae2wct/lang/en_CA.lang b/src/resources/assets/ae2wct/lang/en_CA.lang index 8d9f6b7..2e37cc6 100644 --- a/src/resources/assets/ae2wct/lang/en_CA.lang +++ b/src/resources/assets/ae2wct/lang/en_CA.lang @@ -29,6 +29,18 @@ gui.tooltips.ae2wct.Whitelisting=Whitelisting gui.tooltips.ae2wct.Blacklisting=Blacklisting gui.tooltips.ae2wct.MagnetActiveDesc1=Extra items added to inventory gui.tooltips.ae2wct.MagnetActiveDesc2=Extra items left on ground +gui.tooltips.ae2wct.Not=Not +gui.tooltips.ae2wct.Using=Using +gui.tooltips.ae2wct.Ignore=Ignore +gui.tooltips.ae2wct.Ignoring=Ignoring +gui.tooltips.ae2wct.NBTData=NBT Data +gui.tooltips.ae2wct.MetaData=Meta Data +gui.tooltips.ae2wct.OreDict=Ore Dictionary +gui.tooltips.ae2wct.FilteredItems=Filtered Items +gui.tooltips.ae2wct.OrPress=or press +gui.tooltips.ae2wct.Press=Press +gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode + //Labels gui.labels.ae2wct.WirelessTermLabel=Wireless Term @@ -39,6 +51,8 @@ config.ae2wct.EasyModeDesc=Enable Easy Mode (Easier Recipes+Infinity Booster Rec config.ae2wct.BoosterDropChance=Chance that Wither will drop Infinity Booster Card (in %-100=always drop) config.ae2wct.DisableBoosterDrop=Enabled Booster Card drops in hard mode (true=enabled) config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes) +config.ae2wct.DoVersionCheck=Check for updates +config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"] //Achievements achievement.wctAchievement=Digital Crafting Over WiFi diff --git a/src/resources/assets/ae2wct/lang/en_GB.lang b/src/resources/assets/ae2wct/lang/en_GB.lang index 8d9f6b7..2e37cc6 100644 --- a/src/resources/assets/ae2wct/lang/en_GB.lang +++ b/src/resources/assets/ae2wct/lang/en_GB.lang @@ -29,6 +29,18 @@ gui.tooltips.ae2wct.Whitelisting=Whitelisting gui.tooltips.ae2wct.Blacklisting=Blacklisting gui.tooltips.ae2wct.MagnetActiveDesc1=Extra items added to inventory gui.tooltips.ae2wct.MagnetActiveDesc2=Extra items left on ground +gui.tooltips.ae2wct.Not=Not +gui.tooltips.ae2wct.Using=Using +gui.tooltips.ae2wct.Ignore=Ignore +gui.tooltips.ae2wct.Ignoring=Ignoring +gui.tooltips.ae2wct.NBTData=NBT Data +gui.tooltips.ae2wct.MetaData=Meta Data +gui.tooltips.ae2wct.OreDict=Ore Dictionary +gui.tooltips.ae2wct.FilteredItems=Filtered Items +gui.tooltips.ae2wct.OrPress=or press +gui.tooltips.ae2wct.Press=Press +gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode + //Labels gui.labels.ae2wct.WirelessTermLabel=Wireless Term @@ -39,6 +51,8 @@ config.ae2wct.EasyModeDesc=Enable Easy Mode (Easier Recipes+Infinity Booster Rec config.ae2wct.BoosterDropChance=Chance that Wither will drop Infinity Booster Card (in %-100=always drop) config.ae2wct.DisableBoosterDrop=Enabled Booster Card drops in hard mode (true=enabled) config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes) +config.ae2wct.DoVersionCheck=Check for updates +config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"] //Achievements achievement.wctAchievement=Digital Crafting Over WiFi diff --git a/src/resources/assets/ae2wct/lang/en_US.lang b/src/resources/assets/ae2wct/lang/en_US.lang index 8d9f6b7..a79d102 100644 --- a/src/resources/assets/ae2wct/lang/en_US.lang +++ b/src/resources/assets/ae2wct/lang/en_US.lang @@ -29,6 +29,18 @@ gui.tooltips.ae2wct.Whitelisting=Whitelisting gui.tooltips.ae2wct.Blacklisting=Blacklisting gui.tooltips.ae2wct.MagnetActiveDesc1=Extra items added to inventory gui.tooltips.ae2wct.MagnetActiveDesc2=Extra items left on ground +gui.tooltips.ae2wct.Not=Not +gui.tooltips.ae2wct.Using=Using +gui.tooltips.ae2wct.Ignore=Ignore +gui.tooltips.ae2wct.Ignoring=Ignoring +gui.tooltips.ae2wct.NBTData=NBT Data +gui.tooltips.ae2wct.MetaData=Meta Data +gui.tooltips.ae2wct.OreDict=Ore Dictionary +gui.tooltips.ae2wct.FilteredItems=Filtered Items +gui.tooltips.ae2wct.OrPress=or press +gui.tooltips.ae2wct.Press=Press +gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode + //Labels gui.labels.ae2wct.WirelessTermLabel=Wireless Term @@ -39,6 +51,9 @@ config.ae2wct.EasyModeDesc=Enable Easy Mode (Easier Recipes+Infinity Booster Rec config.ae2wct.BoosterDropChance=Chance that Wither will drop Infinity Booster Card (in %-100=always drop) config.ae2wct.DisableBoosterDrop=Enabled Booster Card drops in hard mode (true=enabled) config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes) +config.ae2wct.DoVersionCheck=Check for updates +config.ae2wct.NewVersionAvailable=New version of Wireless Crafting Terminal is available! +config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"] //Achievements achievement.wctAchievement=Digital Crafting Over WiFi diff --git a/src/resources/assets/ae2wct/lang/es_ES.lang b/src/resources/assets/ae2wct/lang/es_ES.lang index 5c53f49..c4c0168 100644 --- a/src/resources/assets/ae2wct/lang/es_ES.lang +++ b/src/resources/assets/ae2wct/lang/es_ES.lang @@ -29,6 +29,18 @@ gui.tooltips.ae2wct.Whitelisting=Lista Blanca gui.tooltips.ae2wct.Blacklisting=Lista Negra gui.tooltips.ae2wct.MagnetActiveDesc1=Art?culos extra a?adidos en el inventario gui.tooltips.ae2wct.MagnetActiveDesc2=Art?culos adicionales dejados en suelo +gui.tooltips.ae2wct.Not=Not +gui.tooltips.ae2wct.Using=Using +gui.tooltips.ae2wct.Ignore=Ignore +gui.tooltips.ae2wct.Ignoring=Ignoring +gui.tooltips.ae2wct.NBTData=NBT Data +gui.tooltips.ae2wct.MetaData=Meta Data +gui.tooltips.ae2wct.OreDict=Ore Dictionary +gui.tooltips.ae2wct.FilteredItems=Filtered Items +gui.tooltips.ae2wct.OrPress=or press +gui.tooltips.ae2wct.Press=Press +gui.tooltips.ae2wct.ToSwitchMode=to switch magnet mode + //Labels gui.labels.ae2wct.WirelessTermLabel=T?rmino Inal?mbrico @@ -39,6 +51,8 @@ config.ae2wct.EasyModeDesc=Activar el modo f?cil (Recetas m?s f?ciles y Infinity config.ae2wct.BoosterDropChance=Oportunidad que marchitar caer? infinito Booster tarjeta (en %-100 = caer siempre) config.ae2wct.DisableBoosterDrop=Activado Booster Card cae en modo dif?cil (true=permitir) config.ae2wct.MineTweakerOverride=Enable MineTweaker Override (true=disables all recipes) +config.ae2wct.DoVersionCheck=Check for updates +config.ae2wct.ClickString=["Click here to go to download page [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to download the latest version","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/wireless-crafting-terminal"}},"]"] //Achievements achievement.wctAchievement=Digital elaboraci?n sobre WLAN