diff --git a/README.md b/README.md index eac4be27..d5a8a56b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## Welcome to Equivalent Exchange 3! -**LATEST OFFICIAL VERSION**: EE3 pre1f for MC 1.4.7(pre). +**LATEST OFFICIAL VERSION**: EE3 pre1f for Minecraft 1.4.7 ([link] (http://adf.ly/GjT3c)) [Minecraft Forums page] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3) @@ -17,9 +17,9 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively * Click on `Environment Variables`. * Under `System Variables`, click `New`. * For `Variable Name`, input `JAVA_HOME`. - * For `Variable Value`, input something similar to `;C:\Program Files (x86)\Java\jdk1.7.0_10` exactly as shown to the end.(or wherever your Java JDK installation is), and click `Ok`. + * For `Variable Value`, input something similar to `;C:\Program Files (x86)\Java\jdk1.7.0_11` exactly as shown to the end (or wherever your Java JDK installation is), and click `Ok`. * Scroll down to a variable named `Path`, and double-click on it. - * Append `;C:\Program Files (x86)\Java\jdk1.7.0_10\bin` (or wherever your Java JDK installation is \bin), and click `Ok`. + * Append `;C:\Program Files (x86)\Java\jdk1.7.0_11\bin` (or wherever your Java JDK installation is \bin), and click `Ok`. 2. Download Apache Ant [here] (http://ant.apache.org). * Unzip the files anywhere you want, eg `C:\Program Files (x86)\Ant`. * Again, go to `Environment Variables` just like you did for the Java JDK. @@ -33,7 +33,6 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively * Scroll to the top of this page, login at the top-right, and then click `Clone to Windows/Mac` near the top-left of the page. * You should see Github flash and `pahimar/Equivalent-Exchange-3` appear. (The local repository on Windows defaults to `C:\Users\(username)\Documents\GitHub\Equivalent-Exchange-3`, you can change it if you want but then you have to find it again on Github). 4. Create an empty directory for EE3 development. This directory is refernced as `mcdev` from now on. It can be where you cloned EE3, but it'll be a little messy. -5. You are now ready to setup MCP! #### Setup MCP (Tested on Linux and Windows) @@ -64,20 +63,19 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively 4. Inside `Equivalent-Exchange-3`, create a new file called `build.properties`. * Open it up with any text editor, and type into it the following (fully customizable except for `dir.development`): * `dir.development=../../` - * `dir.share=Shared` (or what you want it to be-optional) - * `dir.release=Releases` (what you want it to be) - * `release.minecraft.version=1.4.7` (as of 1/04) - * `release.mod.version=your version number here` + * `dir.release=Releases` + * `release.minecraft.version=1.4.7` (as of 1/15) + * `release.mod.version=your version number here` 5. [FOR WINDOWS] Open up `cmd` by typing `cmd` in Run. 6. [FOR WINDOWS] Navigate to `mcdev\source\Equivalent-Exchange-3` by executing `cd mcdev's location\source\Equivalent-Exchange-3`. 7. Execute `ant release`. This will generally take around 5-15 minutes, depending on your computer. If you've done everything right, `BUILD SUCCESSFUL` is displayed after it finishes. * If you see `BUILD FAILED`, check the error output (it should be right around `BUILD FAILED`), fix everything, and try again. -8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.4.7\[version number]` (This might be different according to what you put in build.properties). - * You should see a .jar named `ee3-universal-[version number]jar`. +8. Go to `mcdev\source\Equivalent-Exchange-3\Releases\1.4.7\version#` (This might be different according to what you put in build.properties). + * You should see a .jar named `ee3-universal-version#.jar`. 9. Copy the jar into your Minecraft mods folder, and play Minecraft! #### Update EE3 (For Windows/Mac) -1. Check to see if pahimar updated EE3 since you last compiled. If he/she did, follow these instructions. +1. Check to see if pahimar updated EE3 since you last compiled. If he did, follow these instructions. 2. Open Github. 3. Double-click on pahimar/Equivalent-Exchange-3. 4. At the top, there is a button named `Sync`/`Sync Branch` (Mac) (or `Refreshing...` if it's still checking). diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java index 44857c31..f426ad1f 100644 --- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -6,7 +6,6 @@ import net.minecraftforge.common.MinecraftForge; import com.pahimar.ee3.block.ModBlocks; import com.pahimar.ee3.command.CommandHandler; import com.pahimar.ee3.configuration.ConfigurationHandler; -import com.pahimar.ee3.configuration.ConfigurationSettings; import com.pahimar.ee3.core.handlers.ActionRequestHandler; import com.pahimar.ee3.core.handlers.AddonHandler; import com.pahimar.ee3.core.handlers.EntityLivingHandler; @@ -86,10 +85,7 @@ public class EquivalentExchange3 { ConfigurationHandler.init(event.getSuggestedConfigurationFile()); // Conduct the version check and log the result - if (ConfigurationSettings.ENABLE_VERSION_CHECK) { - VersionHelper.checkVersion(); - } - VersionHelper.logResult(); + VersionHelper.execute(); // Initialize the Version Check Tick Handler (Client only) TickRegistry.registerTickHandler(new VersionCheckTickHandler(), Side.CLIENT); diff --git a/ee3_common/com/pahimar/ee3/command/CommandEE.java b/ee3_common/com/pahimar/ee3/command/CommandEE.java index ec64f079..9e21ed66 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandEE.java +++ b/ee3_common/com/pahimar/ee3/command/CommandEE.java @@ -1,67 +1,54 @@ package com.pahimar.ee3.command; -import static com.pahimar.ee3.core.helper.LocalizationHelper.getLocalizedString; -import static com.pahimar.ee3.lib.Strings.*; - import java.util.List; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; +import com.pahimar.ee3.lib.Commands; + public class CommandEE extends CommandBase { public String getCommandName() { - return COMMAND_EE3; + return Commands.COMMAND_EE3; + } + + public boolean canCommandSenderUseCommand(ICommandSender commandSender) { + + return true; } public List addTabCompletionOptions(ICommandSender commandSender, String[] args) { switch (args.length) { case 1: { - return getListOfStringsMatchingLastWord(args, new String[] { - getLocalizedString(COMMAND_OVERLAY), - getLocalizedString(COMMAND_PARTICLES), - getLocalizedString(COMMAND_SOUNDS) }); + return getListOfStringsMatchingLastWord(args, new String[] { Commands.COMMAND_OVERLAY, Commands.COMMAND_PARTICLES, Commands.COMMAND_SOUNDS }); } case 2: { - if (args[0].equalsIgnoreCase(getLocalizedString(COMMAND_OVERLAY))) { - return getListOfStringsMatchingLastWord(args, new String[] { - getLocalizedString(COMMAND_ON), - getLocalizedString(COMMAND_OFF), - getLocalizedString(COMMAND_POSITION), - getLocalizedString(COMMAND_SCALE), - getLocalizedString(COMMAND_OPACITY) }); + if (args[0].equalsIgnoreCase(Commands.COMMAND_OVERLAY)) { + return getListOfStringsMatchingLastWord(args, new String[] { Commands.COMMAND_ON, Commands.COMMAND_OFF, Commands.COMMAND_POSITION, Commands.COMMAND_SCALE, Commands.COMMAND_OPACITY }); } - else if (args[0].equalsIgnoreCase(getLocalizedString(COMMAND_PARTICLES))) { - return getListOfStringsMatchingLastWord(args, new String[] { - getLocalizedString(COMMAND_ON), - getLocalizedString(COMMAND_OFF) }); + else if (args[0].equalsIgnoreCase(Commands.COMMAND_PARTICLES)) { + return getListOfStringsMatchingLastWord(args, new String[] { Commands.COMMAND_ON, Commands.COMMAND_OFF }); } - else if (args[0].equalsIgnoreCase(getLocalizedString(COMMAND_SOUNDS))) { - return getListOfStringsMatchingLastWord(args, new String[] { - getLocalizedString(COMMAND_ALL), - getLocalizedString(COMMAND_SELF), - getLocalizedString(COMMAND_OFF) }); + else if (args[0].equalsIgnoreCase(Commands.COMMAND_SOUNDS)) { + return getListOfStringsMatchingLastWord(args, new String[] { Commands.COMMAND_ALL, Commands.COMMAND_SELF, Commands.COMMAND_OFF }); } } case 3: { - if (args[0].equalsIgnoreCase(getLocalizedString(COMMAND_OVERLAY))) { - if (args[1].equalsIgnoreCase(getLocalizedString(COMMAND_POSITION))) { - return getListOfStringsMatchingLastWord(args, new String[] { - getLocalizedString(COMMAND_TOP), - getLocalizedString(COMMAND_BOTTOM) }); + if (args[0].equalsIgnoreCase(Commands.COMMAND_OVERLAY)) { + if (args[1].equalsIgnoreCase(Commands.COMMAND_POSITION)) { + return getListOfStringsMatchingLastWord(args, new String[] { Commands.COMMAND_TOP, Commands.COMMAND_BOTTOM }); } } } case 4: { - if (args[0].equalsIgnoreCase(getLocalizedString(COMMAND_OVERLAY))) { - if (args[1].equalsIgnoreCase(getLocalizedString(COMMAND_POSITION))) { - if (args[2].equalsIgnoreCase(getLocalizedString(COMMAND_TOP)) || args[2].equalsIgnoreCase(getLocalizedString(COMMAND_BOTTOM))) { - return getListOfStringsMatchingLastWord(args, new String[] { - getLocalizedString(COMMAND_LEFT), - getLocalizedString(COMMAND_RIGHT) }); + if (args[0].equalsIgnoreCase(Commands.COMMAND_OVERLAY)) { + if (args[1].equalsIgnoreCase(Commands.COMMAND_POSITION)) { + if (args[2].equalsIgnoreCase(Commands.COMMAND_TOP) || args[2].equalsIgnoreCase(Commands.COMMAND_BOTTOM)) { + return getListOfStringsMatchingLastWord(args, new String[] { Commands.COMMAND_LEFT, Commands.COMMAND_RIGHT }); } } } @@ -78,18 +65,21 @@ public class CommandEE extends CommandBase { String commandName = args[0]; System.arraycopy(args, 1, args, 0, args.length - 1); - if (commandName.equalsIgnoreCase(getLocalizedString(COMMAND_OVERLAY))) { + if (commandName.equalsIgnoreCase(Commands.COMMAND_OVERLAY)) { CommandOverlay.processCommand(commandSender, args); } - else if (commandName.equalsIgnoreCase(getLocalizedString(COMMAND_PARTICLES))) { + else if (commandName.equalsIgnoreCase(Commands.COMMAND_PARTICLES)) { CommandParticles.processCommand(commandSender, args); } - else if (commandName.equalsIgnoreCase(getLocalizedString(COMMAND_SOUNDS))) { + else if (commandName.equalsIgnoreCase(Commands.COMMAND_SOUNDS)) { CommandSounds.processCommand(commandSender, args); } + else { + throw new WrongUsageException(Commands.COMMAND_EE3_USAGE, new Object[0]); + } } else { - throw new WrongUsageException(getLocalizedString(COMMAND_EE3_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_EE3_USAGE, new Object[0]); } } } diff --git a/ee3_common/com/pahimar/ee3/command/CommandOverlay.java b/ee3_common/com/pahimar/ee3/command/CommandOverlay.java index 65b56a76..db511f4a 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandOverlay.java +++ b/ee3_common/com/pahimar/ee3/command/CommandOverlay.java @@ -1,13 +1,14 @@ package com.pahimar.ee3.command; -import static com.pahimar.ee3.core.helper.LocalizationHelper.getLocalizedString; -import static com.pahimar.ee3.lib.Strings.*; - import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; +import com.pahimar.ee3.core.helper.LocalizationHelper; +import com.pahimar.ee3.lib.Colours; +import com.pahimar.ee3.lib.Commands; +import com.pahimar.ee3.lib.Strings; public class CommandOverlay { @@ -16,89 +17,89 @@ public class CommandOverlay { if (args.length > 0) { String subCommand = args[0]; - if (subCommand.equalsIgnoreCase(getLocalizedString(COMMAND_ON))) { + if (subCommand.equalsIgnoreCase(Commands.COMMAND_ON)) { processOnCommand(commandSender); } - else if (subCommand.equalsIgnoreCase(getLocalizedString(COMMAND_OFF))) { + else if (subCommand.equalsIgnoreCase(Commands.COMMAND_OFF)) { processOffCommand(commandSender); } - else if (subCommand.equalsIgnoreCase(getLocalizedString(COMMAND_OPACITY))) { + else if (subCommand.equalsIgnoreCase(Commands.COMMAND_OPACITY)) { processOpacityCommand(commandSender, args); } - else if (subCommand.equalsIgnoreCase(getLocalizedString(COMMAND_SCALE))) { + else if (subCommand.equalsIgnoreCase(Commands.COMMAND_SCALE)) { processScaleCommand(commandSender, args); } - else if (subCommand.equalsIgnoreCase(getLocalizedString(COMMAND_POSITION))) { + else if (subCommand.equalsIgnoreCase(Commands.COMMAND_POSITION)) { processPositionCommand(commandSender, args); } else { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_USAGE, new Object[0]); } } else { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_USAGE, new Object[0]); } } private static void processOnCommand(ICommandSender commandSender) { ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION = true; - ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, TRUE); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_OVERLAY_TURNED_ON)); + ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, Strings.TRUE); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_TURNED_ON)); } private static void processOffCommand(ICommandSender commandSender) { ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION = false; - ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, FALSE); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_OVERLAY_TURNED_OFF)); + ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, Strings.FALSE); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_TURNED_OFF)); } private static void processScaleCommand(ICommandSender commandSender, String[] args) { - if (args.length >= 2) { + if ((args.length > 2) && (args.length < 4)) { try { float scale = Float.parseFloat(args[1]); if (scale <= 0F) { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_SCALE_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE + " " + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT), new Object[0]); } else { ConfigurationSettings.TARGET_BLOCK_OVERLAY_SCALE = scale; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_SCALE_CONFIGNAME, args[1]); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_OVERLAY_SCALE_UPDATED)); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_SCALE_UPDATED)); } } catch (Exception e) { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_SCALE_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE + " " + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT), new Object[0]); } } else { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_SCALE_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_SCALE_USAGE + " " + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT), new Object[0]); } } private static void processOpacityCommand(ICommandSender commandSender, String[] args) { - if (args.length >= 2) { + if ((args.length > 2) && (args.length < 4)) { try { float opacity = Float.parseFloat(args[1]); if ((opacity < 0F) || (opacity > 1F)) { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_OPACITY_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE + " " + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT), new Object[0]); } else { ConfigurationSettings.TARGET_BLOCK_OVERLAY_OPACITY = opacity; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_OPACITY_CONFIGNAME, args[1]); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_OVERLAY_OPACITY_UPDATED)); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_OPACITY_UPDATED)); } } catch (Exception e) { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_OPACITY_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE + " " + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT), new Object[0]); } } else { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_OPACITY_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_OPACITY_USAGE + " " + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT), new Object[0]); } } @@ -106,36 +107,36 @@ public class CommandOverlay { String yPosition, xPosition; - if (args.length >= 3) { + if ((args.length > 2) && (args.length < 5)) { yPosition = args[1]; xPosition = args[2]; - if ((yPosition.equalsIgnoreCase(getLocalizedString(COMMAND_TOP))) && (xPosition.equalsIgnoreCase(getLocalizedString(COMMAND_LEFT)))) { + if ((yPosition.equalsIgnoreCase(Commands.COMMAND_TOP)) && (xPosition.equalsIgnoreCase(Commands.COMMAND_LEFT))) { ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 0; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "0"); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_OVERLAY_POSITION_TOP_LEFT)); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_POSITION_TOP_LEFT)); } - else if ((yPosition.equalsIgnoreCase(getLocalizedString(COMMAND_TOP))) && (xPosition.equalsIgnoreCase(getLocalizedString(COMMAND_RIGHT)))) { + else if ((yPosition.equalsIgnoreCase(Commands.COMMAND_TOP)) && (xPosition.equalsIgnoreCase(Commands.COMMAND_RIGHT))) { ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 1; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "1"); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_OVERLAY_POSITION_TOP_RIGHT)); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_POSITION_TOP_RIGHT)); } - else if ((yPosition.equalsIgnoreCase(getLocalizedString(COMMAND_BOTTOM))) && (xPosition.equalsIgnoreCase(getLocalizedString(COMMAND_LEFT)))) { + else if ((yPosition.equalsIgnoreCase(Commands.COMMAND_BOTTOM)) && (xPosition.equalsIgnoreCase(Commands.COMMAND_LEFT))) { ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 2; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "2"); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_OVERLAY_POSITION_BOTTOM_LEFT)); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_LEFT)); } - else if ((yPosition.equalsIgnoreCase(getLocalizedString(COMMAND_BOTTOM))) && (xPosition.equalsIgnoreCase(getLocalizedString(COMMAND_RIGHT)))) { + else if ((yPosition.equalsIgnoreCase(Commands.COMMAND_BOTTOM)) && (xPosition.equalsIgnoreCase(Commands.COMMAND_RIGHT))) { ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION = 3; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION_CONFIGNAME, "3"); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_OVERLAY_POSITION_BOTTOM_RIGHT)); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_RIGHT)); } else { - throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_POSITION_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_POSITION_USAGE, new Object[0]); } } else { - new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_POSITION_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_OVERLAY_POSITION_USAGE, new Object[0]); } } } diff --git a/ee3_common/com/pahimar/ee3/command/CommandParticles.java b/ee3_common/com/pahimar/ee3/command/CommandParticles.java index f7b2f5f2..0c808aba 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandParticles.java +++ b/ee3_common/com/pahimar/ee3/command/CommandParticles.java @@ -1,13 +1,14 @@ package com.pahimar.ee3.command; -import static com.pahimar.ee3.core.helper.LocalizationHelper.getLocalizedString; -import static com.pahimar.ee3.lib.Strings.*; - import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; +import com.pahimar.ee3.core.helper.LocalizationHelper; +import com.pahimar.ee3.lib.Colours; +import com.pahimar.ee3.lib.Commands; +import com.pahimar.ee3.lib.Strings; public class CommandParticles { @@ -18,32 +19,32 @@ public class CommandParticles { if (args.length > 0) { subCommand = args[0]; - if (subCommand.toLowerCase().equals(getLocalizedString(COMMAND_ON))) { + if (subCommand.toLowerCase().equals(Commands.COMMAND_ON)) { processOnCommand(commandSender); } - else if (subCommand.toLowerCase().equals(getLocalizedString(COMMAND_OFF))) { + else if (subCommand.toLowerCase().equals(Commands.COMMAND_OFF)) { processOffCommand(commandSender); } else { - throw new WrongUsageException(getLocalizedString(COMMAND_PARTICLES_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_PARTICLES_USAGE, new Object[0]); } } else { - throw new WrongUsageException(getLocalizedString(COMMAND_PARTICLES_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_PARTICLES_USAGE, new Object[0]); } } private static void processOnCommand(ICommandSender commandSender) { ConfigurationSettings.ENABLE_PARTICLE_FX = true; - ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, TRUE); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_PARTICLES_TURNED_ON)); + ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, Strings.TRUE); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_PARTICLES_TURNED_ON)); } private static void processOffCommand(ICommandSender commandSender) { ConfigurationSettings.ENABLE_PARTICLE_FX = false; - ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, FALSE); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_PARTICLES_TURNED_OFF)); + ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, Strings.FALSE); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_PARTICLES_TURNED_OFF)); } } diff --git a/ee3_common/com/pahimar/ee3/command/CommandSounds.java b/ee3_common/com/pahimar/ee3/command/CommandSounds.java index 385ef1e8..5781640f 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandSounds.java +++ b/ee3_common/com/pahimar/ee3/command/CommandSounds.java @@ -1,13 +1,13 @@ package com.pahimar.ee3.command; -import static com.pahimar.ee3.core.helper.LocalizationHelper.getLocalizedString; -import static com.pahimar.ee3.lib.Strings.*; - import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; +import com.pahimar.ee3.core.helper.LocalizationHelper; +import com.pahimar.ee3.lib.Colours; +import com.pahimar.ee3.lib.Commands; public class CommandSounds { @@ -18,42 +18,42 @@ public class CommandSounds { if (args.length > 0) { subCommand = args[0]; - if (subCommand.toLowerCase().equals(getLocalizedString(COMMAND_ALL))) { + if (subCommand.toLowerCase().equals(Commands.COMMAND_ALL)) { processAllCommand(commandSender); } - else if (subCommand.toLowerCase().equals(getLocalizedString(COMMAND_SELF))) { + else if (subCommand.toLowerCase().equals(Commands.COMMAND_SELF)) { processSelfCommand(commandSender); } - else if (subCommand.toLowerCase().equals(getLocalizedString(COMMAND_OFF))) { + else if (subCommand.toLowerCase().equals(Commands.COMMAND_OFF)) { processOffCommand(commandSender); } else { - throw new WrongUsageException(getLocalizedString(COMMAND_SOUNDS_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_SOUNDS_USAGE, new Object[0]); } } else { - throw new WrongUsageException(getLocalizedString(COMMAND_SOUNDS_USAGE), new Object[0]); + throw new WrongUsageException(Commands.COMMAND_SOUNDS_USAGE, new Object[0]); } } private static void processAllCommand(ICommandSender commandSender) { - ConfigurationSettings.ENABLE_SOUNDS = ALL; - ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, ALL); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_SOUNDS_SET_TO_ALL)); + ConfigurationSettings.ENABLE_SOUNDS = Commands.ALL; + ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.ALL); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_SOUNDS_SET_TO_ALL)); } private static void processSelfCommand(ICommandSender commandSender) { - ConfigurationSettings.ENABLE_SOUNDS = SELF; - ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, SELF); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_SOUNDS_SET_TO_SELF)); + ConfigurationSettings.ENABLE_SOUNDS = Commands.SELF; + ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.SELF); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_SOUNDS_SET_TO_SELF)); } private static void processOffCommand(ICommandSender commandSender) { - ConfigurationSettings.ENABLE_SOUNDS = OFF; - ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, OFF); - commandSender.sendChatToPlayer(getLocalizedString(COMMAND_SOUNDS_TURNED_OFF)); + ConfigurationSettings.ENABLE_SOUNDS = Commands.OFF; + ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.OFF); + commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationHelper.getLocalizedString(Commands.COMMAND_SOUNDS_TURNED_OFF)); } } diff --git a/ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java index 874d7957..f8c0825a 100644 --- a/ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java @@ -93,22 +93,22 @@ public class TransmutationTargetOverlayHandler implements ITickHandler { switch (ConfigurationSettings.TARGET_BLOCK_OVERLAY_POSITION) { case 0: { - hudOverlayX = (int) (overlayScale); - hudBlockX = (int) (overlayScale + 12); - hudOverlayY = (int) (overlayScale); - hudBlockY = (int) (overlayScale + 12); + hudOverlayX = 0; + hudBlockX = (int) ((16 * overlayScale) / 2 - 8); + hudOverlayY = 0; + hudBlockY = (int) ((16 * overlayScale) / 2 - 8); break; } case 1: { hudOverlayX = (int) (sr.getScaledWidth() - (16 * overlayScale)); hudBlockX = (int) (sr.getScaledWidth() - (16 * overlayScale) / 2 - 8); - hudOverlayY = (int) (overlayScale); - hudBlockY = (int) (overlayScale + 12); + hudOverlayY = 0; + hudBlockY = (int) ((16 * overlayScale) / 2 - 8); break; } case 2: { - hudOverlayX = (int) (overlayScale); - hudBlockX = (int) (overlayScale + 12); + hudOverlayX = 0; + hudBlockX = (int) ((16 * overlayScale) / 2 - 8); hudOverlayY = (int) (sr.getScaledHeight() - (16 * overlayScale)); hudBlockY = (int) (sr.getScaledHeight() - (16 * overlayScale) / 2 - 8); break; diff --git a/ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java index 3c8f7154..f2ee94be 100644 --- a/ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java @@ -37,9 +37,13 @@ public class VersionCheckTickHandler implements ITickHandler { for (TickType tickType : type) { if (tickType == TickType.CLIENT) { if (FMLClientHandler.instance().getClient().currentScreen == null) { - initialized = true; - if (VersionHelper.result == VersionHelper.OUTDATED) { - FMLClientHandler.instance().getClient().ingameGUI.getChatGUI().printChatMessage(VersionHelper.getResultMessageForClient()); + if ((VersionHelper.getResult() != VersionHelper.UNINITIALIZED) || (VersionHelper.getResult() != VersionHelper.FINAL_ERROR)) { + + initialized = true; + + if (VersionHelper.getResult() == VersionHelper.OUTDATED) { + FMLClientHandler.instance().getClient().ingameGUI.getChatGUI().printChatMessage(VersionHelper.getResultMessageForClient()); + } } } } diff --git a/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java index ecf54ebd..9bbd79f9 100644 --- a/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java @@ -8,25 +8,29 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.ForgeSubscribe; +import com.pahimar.ee3.configuration.ConfigurationSettings; import com.pahimar.ee3.core.helper.TransmutationHelper; import com.pahimar.ee3.event.ActionEvent; import com.pahimar.ee3.event.ActionEvent.ActionResult; import com.pahimar.ee3.event.ActionRequestEvent; import com.pahimar.ee3.event.WorldTransmutationEvent; import com.pahimar.ee3.lib.ActionTypes; +import com.pahimar.ee3.lib.ItemUpdateTypes; import com.pahimar.ee3.lib.Particles; import com.pahimar.ee3.lib.Sounds; import com.pahimar.ee3.network.PacketTypeHandler; +import com.pahimar.ee3.network.packet.PacketItemUpdate; import com.pahimar.ee3.network.packet.PacketSoundEvent; import com.pahimar.ee3.network.packet.PacketSpawnParticle; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.PacketDispatcher; +import cpw.mods.fml.common.network.Player; public class WorldTransmutationHandler { public static void handleWorldTransmutation(EntityPlayer thePlayer, int originX, int originY, int originZ, byte rangeX, byte rangeY, byte rangeZ, byte sideHit, String data) { - + ActionRequestEvent actionRequestEvent = null; ActionEvent actionEvent = null; @@ -81,7 +85,7 @@ public class WorldTransmutationHandler { default: break; } - + for (int x = lowerBoundX; x <= upperBoundX; x++) { for (int y = lowerBoundY; y <= upperBoundY; y++) { for (int z = lowerBoundZ; z <= upperBoundZ; z++) { @@ -142,14 +146,25 @@ public class WorldTransmutationHandler { if (!worldStack.isItemEqual(targetStack)) { if (EquivalencyHandler.instance().areWorldEquivalent(worldStack, targetStack)) { - if (event.itemStack.getItemDamage() < event.itemStack.getMaxDamage()) { - result = TransmutationHelper.transmuteInWorld(event.world, event.player, event.player.getCurrentEquippedItem(), event.x, event.y, event.z, event.targetID, event.targetMeta); + if (event.itemStack != null) { + if (event.itemStack.getItemDamage() <= event.itemStack.getMaxDamage()) { + result = TransmutationHelper.transmuteInWorld(event.world, event.player, event.player.getCurrentEquippedItem(), event.x, event.y, event.z, event.targetID, event.targetMeta); + } } } } if (result) { event.actionResult = ActionResult.SUCCESS; + + int currentSlot = event.player.inventory.currentItem; + event.itemStack.damageItem(ConfigurationSettings.TRANSMUTE_COST_BLOCK, event.player); + + if (event.itemStack.stackSize < 1) { + event.player.inventory.setInventorySlotContents(currentSlot, null); + PacketDispatcher.sendPacketToPlayer(PacketTypeHandler.populatePacket(new PacketItemUpdate((byte) currentSlot, ItemUpdateTypes.DESTROYED)), (Player) event.player); + event.player.worldObj.playSoundAtEntity(event.player, "random.break", 0.8F, 0.8F + event.player.worldObj.rand.nextFloat() * 0.4F); + } } else { event.actionResult = ActionResult.FAILURE; diff --git a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java index 52330f33..ec2603a9 100644 --- a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java @@ -25,7 +25,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry; * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ -public class VersionHelper { +public class VersionHelper implements Runnable { + + private static VersionHelper instance = new VersionHelper(); // The (publicly available) remote version number authority file private static final String REMOTE_VERSION_XML_FILE = "https://raw.github.com/pahimar/Equivalent-Exchange-3/master/version.xml"; @@ -36,10 +38,11 @@ public class VersionHelper { public static final byte UNINITIALIZED = 0; public static final byte CURRENT = 1; public static final byte OUTDATED = 2; - public static final byte GENERAL_ERROR = 3; + public static final byte ERROR = 3; + public static final byte FINAL_ERROR = 4; // Var to hold the result of the remote version check, initially set to uninitialized - public static byte result = UNINITIALIZED; + private static byte result = UNINITIALIZED; public static String remoteVersion = null; public static String remoteUpdateLocation = null; @@ -51,6 +54,7 @@ public class VersionHelper { public static void checkVersion() { InputStream remoteVersionRepoStream = null; + result = UNINITIALIZED; try { URL remoteVersionURL = new URL(REMOTE_VERSION_XML_FILE); @@ -71,12 +75,11 @@ public class VersionHelper { result = OUTDATED; } - catch (IOException e) { - e.printStackTrace(); + catch (Exception e) { } finally { if (result == UNINITIALIZED) { - result = GENERAL_ERROR; + result = ERROR; } try { @@ -84,8 +87,7 @@ public class VersionHelper { remoteVersionRepoStream.close(); } } - catch (IOException ex) { - ex.printStackTrace(); + catch (Exception ex) { } } } @@ -93,7 +95,6 @@ public class VersionHelper { public static void logResult() { if (ConfigurationSettings.ENABLE_VERSION_CHECK) { - LogHelper.log(Level.INFO, LanguageRegistry.instance().getStringLocalization(Strings.VERSION_CHECK_INIT_LOG_MESSAGE) + " " + REMOTE_VERSION_XML_FILE); if ((result == CURRENT) || (result == OUTDATED)) { LogHelper.log(Level.INFO, getResultMessage()); } @@ -126,9 +127,12 @@ public class VersionHelper { returnString = returnString.replace("@MOD_UPDATE_LOCATION@", remoteUpdateLocation); return returnString; } - else if (result == GENERAL_ERROR) { + else if (result == ERROR) { return LanguageRegistry.instance().getStringLocalization(Strings.GENERAL_ERROR_MESSAGE); } + else if (result == FINAL_ERROR) { + return LanguageRegistry.instance().getStringLocalization(Strings.FINAL_ERROR_MESSAGE); + } else { return null; } @@ -147,5 +151,49 @@ public class VersionHelper { returnString = returnString.replace("@MOD_UPDATE_LOCATION@", Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteUpdateLocation + Colours.TEXT_COLOUR_PREFIX_WHITE); return returnString; } + + public static byte getResult() { + return result; + } + + @Override + public void run() { + + int count = 0; + + LogHelper.log(Level.INFO, LanguageRegistry.instance().getStringLocalization(Strings.VERSION_CHECK_INIT_LOG_MESSAGE) + " " + REMOTE_VERSION_XML_FILE); + + if (ConfigurationSettings.ENABLE_VERSION_CHECK) { + try { + while ((count < Reference.VERSION_CHECK_ATTEMPTS) && ((result == UNINITIALIZED) || (result == ERROR))) { + + checkVersion(); + count++; + logResult(); + + if ((result == UNINITIALIZED) || (result == ERROR)) { + Thread.sleep(10000); + } + } + + if (result == ERROR) { + result = FINAL_ERROR; + logResult(); + } + } + catch (InterruptedException e) { + e.printStackTrace(); + } + } + else { + logResult(); + } + + } + + public static void execute() { + + new Thread(instance).start(); + } } diff --git a/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java b/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java index c3b79b1a..b5b5c8f6 100644 --- a/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java +++ b/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java @@ -8,7 +8,6 @@ import net.minecraft.world.World; import com.pahimar.ee3.EquivalentExchange3; import com.pahimar.ee3.configuration.ConfigurationSettings; import com.pahimar.ee3.core.helper.TransmutationHelper; -import com.pahimar.ee3.lib.ActionTypes; import com.pahimar.ee3.lib.Colours; import com.pahimar.ee3.lib.CustomItemRarity; import com.pahimar.ee3.lib.GuiIds; @@ -26,8 +25,8 @@ import cpw.mods.fml.relauncher.SideOnly; * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ -public class ItemMiniumStone extends ItemEE implements ITransmutationStone, - IKeyBound { +public class ItemMiniumStone extends ItemEE + implements ITransmutationStone, IKeyBound { public ItemMiniumStone(int id) { @@ -99,11 +98,12 @@ public class ItemMiniumStone extends ItemEE implements ITransmutationStone, } else if (keyBinding.equals(ConfigurationSettings.KEYBINDING_TOGGLE)) { if (TransmutationHelper.targetBlockStack != null) { - if(!thePlayer.isSneaking()){ - TransmutationHelper.targetBlockStack = TransmutationHelper.getNextBlock(TransmutationHelper.targetBlockStack.itemID, TransmutationHelper.targetBlockStack.getItemDamage()); - }else{ - TransmutationHelper.targetBlockStack = TransmutationHelper.getPreviousBlock(TransmutationHelper.targetBlockStack.itemID, TransmutationHelper.targetBlockStack.getItemDamage()); - } + if (!thePlayer.isSneaking()) { + TransmutationHelper.targetBlockStack = TransmutationHelper.getNextBlock(TransmutationHelper.targetBlockStack.itemID, TransmutationHelper.targetBlockStack.getItemDamage()); + } + else { + TransmutationHelper.targetBlockStack = TransmutationHelper.getPreviousBlock(TransmutationHelper.targetBlockStack.itemID, TransmutationHelper.targetBlockStack.getItemDamage()); + } } } diff --git a/ee3_common/com/pahimar/ee3/lib/Colours.java b/ee3_common/com/pahimar/ee3/lib/Colours.java index bc79e6aa..5220e1b7 100644 --- a/ee3_common/com/pahimar/ee3/lib/Colours.java +++ b/ee3_common/com/pahimar/ee3/lib/Colours.java @@ -16,6 +16,7 @@ public class Colours { /* Text colour related constants */ public static final String TEXT_COLOUR_PREFIX_YELLOW = "\u00a7e"; + public static final String TEXT_COLOUR_PREFIX_GRAY = "\u00a77"; public static final String TEXT_COLOUR_PREFIX_WHITE = "\u00a7f"; /* Bag colour related constants */ diff --git a/ee3_common/com/pahimar/ee3/lib/Commands.java b/ee3_common/com/pahimar/ee3/lib/Commands.java new file mode 100644 index 00000000..de665d3a --- /dev/null +++ b/ee3_common/com/pahimar/ee3/lib/Commands.java @@ -0,0 +1,51 @@ +package com.pahimar.ee3.lib; + +public class Commands { + + /* Command related contants */ + public static final String ALL = "all"; + public static final String SELF = "self"; + public static final String ON = "on"; + public static final String OFF = "off"; + + public static final String COMMAND_EE3 = "ee3"; + public static final String COMMAND_ON = "on"; + public static final String COMMAND_OFF = "off"; + public static final String COMMAND_ALL = "all"; + public static final String COMMAND_SELF = "self"; + public static final String COMMAND_OVERLAY = "overlay"; + public static final String COMMAND_POSITION = "position"; + public static final String COMMAND_OPACITY = "opacity"; + public static final String COMMAND_SCALE = "scale"; + public static final String COMMAND_TOP = "top"; + public static final String COMMAND_BOTTOM = "bottom"; + public static final String COMMAND_LEFT = "left"; + public static final String COMMAND_RIGHT = "right"; + public static final String COMMAND_PARTICLES = "particles"; + public static final String COMMAND_SOUNDS = "sounds"; + public static final String COMMAND_VERSION = "version"; + public static final String COMMAND_EE3_USAGE = "ee3 [ overlay | particles | sounds ]"; + public static final String COMMAND_OVERLAY_USAGE = "ee3 overlay [ on | off | position | scale | opacity ]"; + public static final String COMMAND_OVERLAY_POSITION_USAGE = "ee3 overlay position [ top | bottom ] [ left | right ]"; + public static final String COMMAND_OVERLAY_OPACITY_USAGE = "ee3 overlay opacity ### "; + public static final String COMMAND_OVERLAY_SCALE_USAGE = "ee3 overlay scale ### "; + public static final String COMMAND_PARTICLES_USAGE = "ee3 particles [ on | off ]"; + public static final String COMMAND_SOUNDS_USAGE = "ee3 sounds [ all | self | off ]"; + public static final String COMMAND_VERSION_USAGE = "command.ee3.version.usage"; + + public static final String COMMAND_OVERLAY_TURNED_ON = "command.ee3.overlay.turned_on"; + public static final String COMMAND_OVERLAY_TURNED_OFF = "command.ee3.overlay.turned_off"; + public static final String COMMAND_OVERLAY_POSITION_TOP_LEFT = "command.ee3.overlay.position.top_left"; + public static final String COMMAND_OVERLAY_POSITION_TOP_RIGHT = "command.ee3.overlay.position.top_right"; + public static final String COMMAND_OVERLAY_POSITION_BOTTOM_LEFT = "command.ee3.overlay.position.bottom_left"; + public static final String COMMAND_OVERLAY_POSITION_BOTTOM_RIGHT = "command.ee3.overlay.position.bottom_right"; + public static final String COMMAND_OVERLAY_OPACITY_USAGE_ADDITIONAL_TEXT = "command.ee3.overlay.opacity.usage.additional_text"; + public static final String COMMAND_OVERLAY_OPACITY_UPDATED = "command.ee3.overlay.opacity.updated"; + public static final String COMMAND_OVERLAY_SCALE_USAGE_ADDITIONAL_TEXT = "command.ee3.overlay.opacity.usage.additional_text"; + public static final String COMMAND_OVERLAY_SCALE_UPDATED = "command.ee3.overlay.scale.updated"; + public static final String COMMAND_PARTICLES_TURNED_ON = "command.ee3.particles.turned_on"; + public static final String COMMAND_PARTICLES_TURNED_OFF = "command.ee3.particles.turned_off"; + public static final String COMMAND_SOUNDS_SET_TO_ALL = "command.ee3.sounds.set_to_all"; + public static final String COMMAND_SOUNDS_SET_TO_SELF = "command.ee3.sounds.set_to_self"; + public static final String COMMAND_SOUNDS_TURNED_OFF = "command.ee3.sounds.turned_off"; +} diff --git a/ee3_common/com/pahimar/ee3/lib/ItemUpdateTypes.java b/ee3_common/com/pahimar/ee3/lib/ItemUpdateTypes.java new file mode 100644 index 00000000..29df62c0 --- /dev/null +++ b/ee3_common/com/pahimar/ee3/lib/ItemUpdateTypes.java @@ -0,0 +1,7 @@ +package com.pahimar.ee3.lib; + +public class ItemUpdateTypes { + + public static final byte DESTROYED = 0; + +} diff --git a/ee3_common/com/pahimar/ee3/lib/Reference.java b/ee3_common/com/pahimar/ee3/lib/Reference.java index 08eaaed2..378e9a18 100644 --- a/ee3_common/com/pahimar/ee3/lib/Reference.java +++ b/ee3_common/com/pahimar/ee3/lib/Reference.java @@ -23,5 +23,6 @@ public class Reference { public static final int SHIFTED_ID_RANGE_CORRECTION = 256; public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy"; public static final String CLIENT_PROXY_CLASS = "com.pahimar.ee3.core.proxy.ClientProxy"; + public static final int VERSION_CHECK_ATTEMPTS = 3; } diff --git a/ee3_common/com/pahimar/ee3/lib/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java index 51d14180..c10548df 100644 --- a/ee3_common/com/pahimar/ee3/lib/Strings.java +++ b/ee3_common/com/pahimar/ee3/lib/Strings.java @@ -5,10 +5,6 @@ public class Strings { /* General keys */ public static final String TRUE = "true"; public static final String FALSE = "false"; - public static final String ALL = "all"; - public static final String SELF = "self"; - public static final String ON = "on"; - public static final String OFF = "off"; /* Version check related constants */ public static final String VERSION_CHECK_DISABLED = "version.check_disabled"; @@ -17,6 +13,7 @@ public class Strings { public static final String CURRENT_MESSAGE = "version.current"; public static final String OUTDATED_MESSAGE = "version.outdated"; public static final String GENERAL_ERROR_MESSAGE = "version.general_error"; + public static final String FINAL_ERROR_MESSAGE = "version.final_error"; /* Gui related constants */ public static final String GUI_CALCINATOR_NAME = "gui.calcinator.name"; @@ -49,44 +46,5 @@ public class Strings { public static final String TRANSMUTATION_COST_ITEM = "item" + TRANSMUTATION_COST; public static final String TRANSMUTATION_COST_BLOCK = "block" + TRANSMUTATION_COST; public static final String TRANSMUTATION_COST_MOB = "mob" + TRANSMUTATION_COST; - - /* Command related contants */ - public static final String COMMAND_EE3 = "ee3"; - public static final String COMMAND_ON = "command.ee3.on"; - public static final String COMMAND_OFF = "command.ee3.off"; - public static final String COMMAND_ALL = "command.ee3.all"; - public static final String COMMAND_SELF = "command.ee3.self"; - public static final String COMMAND_OVERLAY = "command.ee3.overlay"; - public static final String COMMAND_POSITION = "command.ee3.position"; - public static final String COMMAND_OPACITY = "command.ee3.opacity"; - public static final String COMMAND_SCALE = "command.ee3.scale"; - public static final String COMMAND_TOP = "command.ee3.top"; - public static final String COMMAND_BOTTOM = "command.ee3.bottom"; - public static final String COMMAND_LEFT = "command.ee3.left"; - public static final String COMMAND_RIGHT = "command.ee3.right"; - public static final String COMMAND_PARTICLES = "command.ee3.particles"; - public static final String COMMAND_SOUNDS = "command.ee3.sounds"; - public static final String COMMAND_VERSION = "command.ee3.version"; - public static final String COMMAND_EE3_USAGE = "command.ee3.usage"; - public static final String COMMAND_OVERLAY_USAGE = "command.ee3.overlay.usage"; - public static final String COMMAND_OVERLAY_TURNED_ON = "command.ee3.overlay.turned_on"; - public static final String COMMAND_OVERLAY_TURNED_OFF = "command.ee3.overlay.turned_off"; - public static final String COMMAND_OVERLAY_POSITION_USAGE = "command.ee3.overlay.position.usage"; - public static final String COMMAND_OVERLAY_POSITION_TOP_LEFT = "command.ee3.overlay.position.top_left"; - public static final String COMMAND_OVERLAY_POSITION_TOP_RIGHT = "command.ee3.overlay.position.top_right"; - public static final String COMMAND_OVERLAY_POSITION_BOTTOM_LEFT = "command.ee3.overlay.position.bottom_left"; - public static final String COMMAND_OVERLAY_POSITION_BOTTOM_RIGHT = "command.ee3.overlay.position.bottom_right"; - public static final String COMMAND_OVERLAY_OPACITY_USAGE = "command.ee3.overlay.opacity.usage"; - public static final String COMMAND_OVERLAY_OPACITY_UPDATED = "command.ee3.overlay.opacity.updated"; - public static final String COMMAND_OVERLAY_SCALE_USAGE = "command.ee3.overlay.scale.usage"; - public static final String COMMAND_OVERLAY_SCALE_UPDATED = "command.ee3.overlay.scale.updated"; - public static final String COMMAND_PARTICLES_USAGE = "command.ee3.particles.usage"; - public static final String COMMAND_PARTICLES_TURNED_ON = "command.ee3.particles.turned_on"; - public static final String COMMAND_PARTICLES_TURNED_OFF = "command.ee3.particles.turned_off"; - public static final String COMMAND_SOUNDS_USAGE = "command.ee3.sounds.usage"; - public static final String COMMAND_SOUNDS_SET_TO_ALL = "command.ee3.sounds.set_to_all"; - public static final String COMMAND_SOUNDS_SET_TO_SELF = "command.ee3.sounds.set_to_self"; - public static final String COMMAND_SOUNDS_TURNED_OFF = "command.ee3.sounds.turned_off"; - public static final String COMMAND_VERSION_USAGE = "command.ee3.version.usage"; } \ No newline at end of file diff --git a/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java b/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java index eaad2d0b..03bab4a7 100644 --- a/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java +++ b/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java @@ -13,6 +13,7 @@ import com.pahimar.ee3.network.packet.PacketRequestEvent; import com.pahimar.ee3.network.packet.PacketSoundEvent; import com.pahimar.ee3.network.packet.PacketSpawnParticle; import com.pahimar.ee3.network.packet.PacketTileUpdate; +import com.pahimar.ee3.network.packet.PacketItemUpdate; /** * PacketTypeHandler @@ -29,7 +30,8 @@ public enum PacketTypeHandler { TILE(PacketTileUpdate.class), REQUEST_EVENT(PacketRequestEvent.class), SPAWN_PARTICLE(PacketSpawnParticle.class), - SOUND_EVENT(PacketSoundEvent.class); + SOUND_EVENT(PacketSoundEvent.class), + ITEM_UPDATE(PacketItemUpdate.class); private Class clazz; diff --git a/ee3_common/com/pahimar/ee3/network/packet/PacketItemUpdate.java b/ee3_common/com/pahimar/ee3/network/packet/PacketItemUpdate.java new file mode 100644 index 00000000..8b0cfb35 --- /dev/null +++ b/ee3_common/com/pahimar/ee3/network/packet/PacketItemUpdate.java @@ -0,0 +1,54 @@ +package com.pahimar.ee3.network.packet; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.network.INetworkManager; + +import com.pahimar.ee3.lib.ItemUpdateTypes; +import com.pahimar.ee3.network.PacketTypeHandler; + +import cpw.mods.fml.common.network.Player; + +public class PacketItemUpdate extends PacketEE { + + public byte slot; + public byte updateType; + + public PacketItemUpdate() { + + super(PacketTypeHandler.ITEM_UPDATE, false); + } + + public PacketItemUpdate(byte slot, byte updateType) { + + super(PacketTypeHandler.ITEM_UPDATE, false); + this.slot = slot; + this.updateType = updateType; + } + + public void writeData(DataOutputStream data) throws IOException { + + data.writeByte(slot); + data.writeByte(updateType); + } + + public void readData(DataInputStream data) throws IOException { + + this.slot = data.readByte(); + this.updateType = data.readByte(); + } + + public void execute(INetworkManager manager, Player player) { + + EntityPlayer thePlayer = (EntityPlayer) player; + ItemStack destroyedStack = thePlayer.inventory.getStackInSlot(slot); + + if (updateType == ItemUpdateTypes.DESTROYED) { + thePlayer.renderBrokenItemStack(destroyedStack); + } + } +} diff --git a/ee3_common/com/pahimar/ee3/network/packet/PacketSoundEvent.java b/ee3_common/com/pahimar/ee3/network/packet/PacketSoundEvent.java index cd659f46..8945a82a 100644 --- a/ee3_common/com/pahimar/ee3/network/packet/PacketSoundEvent.java +++ b/ee3_common/com/pahimar/ee3/network/packet/PacketSoundEvent.java @@ -8,7 +8,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetworkManager; import com.pahimar.ee3.configuration.ConfigurationSettings; -import com.pahimar.ee3.lib.Strings; +import com.pahimar.ee3.lib.Commands; import com.pahimar.ee3.network.PacketTypeHandler; import cpw.mods.fml.client.FMLClientHandler; @@ -63,14 +63,14 @@ public class PacketSoundEvent extends PacketEE { public void execute(INetworkManager manager, Player player) { EntityPlayer thePlayer = (EntityPlayer) player; - - if (ConfigurationSettings.ENABLE_SOUNDS.equalsIgnoreCase(Strings.ALL)) { - FMLClientHandler.instance().getClient().sndManager.playSound(soundName, (float)x, (float)y, (float)z, volume, pitch); + + if (ConfigurationSettings.ENABLE_SOUNDS.equalsIgnoreCase(Commands.ALL)) { + FMLClientHandler.instance().getClient().sndManager.playSound(soundName, (float) x, (float) y, (float) z, volume, pitch); } - else if (ConfigurationSettings.ENABLE_SOUNDS.equalsIgnoreCase(Strings.SELF)) { + else if (ConfigurationSettings.ENABLE_SOUNDS.equalsIgnoreCase(Commands.SELF)) { if (thePlayer.username.equalsIgnoreCase(playerName)) { - FMLClientHandler.instance().getClient().sndManager.playSound(soundName, (float)x, (float)y, (float)z, volume, pitch); + FMLClientHandler.instance().getClient().sndManager.playSound(soundName, (float) x, (float) y, (float) z, volume, pitch); } - } + } } } diff --git a/resources/com/pahimar/ee3/lang/cy_GB.xml b/resources/com/pahimar/ee3/lang/cy_GB.xml index 17e254fb..8dc5819b 100644 --- a/resources/com/pahimar/ee3/lang/cy_GB.xml +++ b/resources/com/pahimar/ee3/lang/cy_GB.xml @@ -41,6 +41,22 @@ Ni ymgychwynodd y gwiriad fersiwn yn briodol Rydych yn defnyddio y fersiwn diweddaraf (@REMOTE_MOD_VERSION@) o Equivalent Exchange 3 ar gyfer @MINECRAFT_VERSION@ Mae yna fersiwn mwy diweddar o @MOD_NAME@ ar gael (@REMOTE_MOD_VERSION@) ar gyfer @MINECRAFT_VERSION@. Ffeindiwch o yma: @MOD_UPDATE_LOCATION@ - Gwall wrth drio gwirio y ffeil awdurdod fersiwn pell + Gwall wrth drio gysylltu gyda'r ffeil awdurdod fersiwn pell; trio eto + Gwiriad fersiwn yn stopio ar ôl tri tro aflwyddiannus Gwiriad fersiwn pell wedi'i ddiffodd, esgusodid + Wedi troi troshaen targed trawsnewidiad ymlaen + Wedi diffodd troshaen targed trawsnewidiad + Safle troshaen targed trawsnewidiad wedi ei osod i'r top chwith + Safle troshaen targed trawsnewidiad wedi ei osod i'r top dde + Safle troshaen targed trawsnewidiad wedi ei osod i'r gwaelod chwith + Safle troshaen targed trawsnewidiad wedi ei osod i'r gwaelod dde + (ble mae ### yn werth degol rhwng 0.0 ac 1.0) + Didreiddedd troshaen targed trawsnewidiad wedi'i ddiweddaru yn llwyddiannus + (ble mae ### yn werth degol mwy na 0.0) + Graddfa troshaen targed trawsnewidiad wedi'i ddiweddaru yn llwyddiannus + Wedi troi gronynnau Equivalent Exchange 3 ymlaen + Wedi diffodd gronynnau Equivalent Exchange 3 + Chwaraeir seiniau Equivalent Exchange 3 o holl chwaraewyr + Chwaraeir seiniau Equivalent Exchange 3 o'n hunan yn unig + Ni chwaraeir seiniau Equivalent Exchange 3 o gwbl diff --git a/resources/com/pahimar/ee3/lang/en_US.xml b/resources/com/pahimar/ee3/lang/en_US.xml index d41e28bf..983497df 100644 --- a/resources/com/pahimar/ee3/lang/en_US.xml +++ b/resources/com/pahimar/ee3/lang/en_US.xml @@ -41,42 +41,22 @@ Remote version check failed to initialize properly Currently using the most up to date version (@REMOTE_MOD_VERSION@) of Equivalent Exchange 3 for @MINECRAFT_VERSION@ A new @MOD_NAME@ version exists (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. Get it here: @MOD_UPDATE_LOCATION@ - Error checking the remote version authority file + Error while connecting to remote version authority file; trying again + Version check stopping after three unsuccessful connection attempts Remote version check disabled, skipping - on - off - all - self - overlay - position - opacity - scale - top - bottom - left - right - particles - sounds - version - command.ee3.usage - command.ee3.overlay.usage - command.ee3.overlay.turned_on - command.ee3.overlay.turned_off - command.ee3.overlay.position.usage - command.ee3.overlay.position.top_left - command.ee3.overlay.position.top_right - command.ee3.overlay.position.bottom_left - command.ee3.overlay.position.bottom_right - command.ee3.overlay.opacity.usage - command.ee3.overlay.opacity.updated - command.ee3.overlay.scale.usage - command.ee3.overlay.scale.updated - command.ee3.particles.usage - command.ee3.particles.turned_on - command.ee3.particles.turned_off - command.ee3.sounds.usage - command.ee3.sounds.set_to_all - command.ee3.sounds.set_to_self - command.ee3.sounds.turned_off - command.ee3.version.usage + Target transmutation overlay turned on + Target transmutation overlay turned off + Target transmutation overlay position set to top left + Target transmutation overlay position set to top right + Target transmutation overlay position set to bottom left + Target transmutation overlay position set to bottom right + (where ### is a decimal value between 0.0 and 1.0) + Target transmutation overlay opacity updated successfully + (where ### is a decimal value greater than 0.0) + Target transmutation overlay scale updated successfully + Equivalent Exchange 3 particles turned on + Equivalent Exchange 3 particles turned off + Playing Equivalent Exchange 3 sounds from all players + Playing Equivalent Exchange 3 sounds from self only + Playing Equivalent Exchange 3 sounds disabled diff --git a/resources/com/pahimar/ee3/lang/es_ES.xml b/resources/com/pahimar/ee3/lang/es_ES.xml index c3f574cb..c8b14d4c 100644 --- a/resources/com/pahimar/ee3/lang/es_ES.xml +++ b/resources/com/pahimar/ee3/lang/es_ES.xml @@ -1,46 +1,62 @@ - - - - Archivo de Traducción en Español (ES) - Extra - Lanzamiento - Alternar - Carga - Fragmento de Minio - Piedra Inerte - Piedra de Minio - Piedra Filosofal - Ceniza - Polvo de Minio - Polvo Verdante - Polvo Azur - Polvo Purpúreo - Polvo Iridiscente - Bolsa de Alquimia Blanca - Bolsa de Alquimia Naranja - Bolsa de Alquimia Magenta - Bolsa de Alquimia Celeste - Bolsa de Alquimia Amarilla - Bolsa de Alquimia Verde Lima - Bolsa de Alquimia Rosa - Bolsa de Alquimia Gris - Bolsa de Alquimia Gris Claro - Bolsa de Alquimia Cian - Bolsa de Alquimia Púrpura - Bolsa de Alquimia Azul - Bolsa de Alquimia Marrón - Bolsa de Alquimia Verde - Bolsa de Alquimia Roja - Bolsa de Alquimia Negra - Agua Roja (Quieta) - Agua Roja (Fluyendo) - Calcinador - Calcinador - Equivalent Exchange 3 - Inicializando chequeo de versión contra el archivo autoritario remoto, ubicado en - El chequeo de versiones no se completó exitosamente (el chequeo de versiones no se inicializó correctamente) - Actualmente estás usando la versión de Equivalent Exchange 3 (@REMOTE_MOD_VERSION) más actualizada para @MINECRAFT_VERSION@ - Actualmente estás usando una versión desactualizada; considera actualizarla aquí - @MOD_UPDATE_LOCATION@ - Error al conectar con el archivo autoritario remoto (¿Comprueba tu conexión a internet?) - Chequeo remoto de versiones desactivado, omitiendo - + + + + Archivo de Traducción en Español (ES) + Extra + Lanzar + Alternar + Cargar + Fragmento de Minio + Piedra Inerte + Piedra de Minio + Piedra Filosofal + Ceniza + Polvo de Minio + Polvo Verdante + Polvo Azur + Polvo Purpúreo + Polvo Iridiscente + Bolsa de Alquimia Blanca + Bolsa de Alquimia Naranja + Bolsa de Alquimia Magenta + Bolsa de Alquimia Celeste + Bolsa de Alquimia Amarilla + Bolsa de Alquimia Verde Lima + Bolsa de Alquimia Rosa + Bolsa de Alquimia Gris + Bolsa de Alquimia Gris Claro + Bolsa de Alquimia Cian + Bolsa de Alquimia Púrpura + Bolsa de Alquimia Azul + Bolsa de Alquimia Marrón + Bolsa de Alquimia Verde + Bolsa de Alquimia Roja + Bolsa de Alquimia Negra + Agua Roja (Quieta) + Agua Roja (Fluyendo) + Calcinador + Calcinador + Equivalent Exchange 3 + Inicializando chequeo de versión contra el archivo autoritario remoto, ubicado en + El chequeo de versiones no se iniicalizó adecuadamente + Actualmente estás usando la versión de Equivalent Exchange 3 (@REMOTE_MOD_VERSION) más actualizada para @MINECRAFT_VERSION@ + Existe una nueva versión (@REMOTE_MOD_VERSION@) de @MOD_NAME@ para @MINECRAFT_VERSION@. Consíguela aquí: @MOD_UPDATE_LOCATION@ + Error al conectar con el archivo autoritario remoto (¿Comprueba tu conexión a internet?) + Chequeo de versión detenido después de tres intentos de conexión sin éxito + Chequeo remoto de versiones desactivado, omitiendo + Superposicón del objetivo a tranmutar activada + Superposicón del objetivo a tranmutar desactivada + Posición de la superposición del objetivo a transmutar fijada a la parte superior izquierda + Posición de la superposición del objetivo a transmutar fijada a la parte superior derecha + Posición de la superposición del objetivo a transmutar fijada a la parte inferior izquierda + Posición de la superposición del objetivo a transmutar fijada a la parte inferior derecha + (donde ### es un número decimal entre 0.0 y 1.0) + Opacidad de la superposición del objetivo a transmutar actualizada exitosamente + (donde ### es un número decimal mayor que 0.0) + Escala de la superposición del objetivo a transmutar actualizada exitosamente + Particulas de ee3 activadas + Particulas de ee3 desactivadas + Reproduciendo sonidos de Equivalent Exchange 3 provenientes de todos los jugadores + Solo reproduciendo sonidos de Equivalent Exchange 3 propios + Desactivados los sonidos de Equivalent Exchange 3 + diff --git a/resources/com/pahimar/ee3/lang/nl_NL.xml b/resources/com/pahimar/ee3/lang/nl_NL.xml index d67ab240..38056b79 100644 --- a/resources/com/pahimar/ee3/lang/nl_NL.xml +++ b/resources/com/pahimar/ee3/lang/nl_NL.xml @@ -1,4 +1,4 @@ - + Dutch (NL) Localization File @@ -42,5 +42,21 @@ Je gebruikt momenteel de meest recente versie (@REMOTE_MOD_VERSION@) van Equivalent Exchange 3 voor @MINECRAFT_VERSION@ Een nieuwe @MOD_NAME@ versie bestaat (@REMOTE_MOD_VERSION@) voor @MINECRAFT_VERSION@. Je vindt deze hier: @MOD_UPDATE_LOCATION@ Er deed zich een fout voor tijdens de versiecontrole + Versiecontrole gestopt na drie mislukte connectie pogingen Externe versiecontrole uitgeschakeld, wordt overgeslagen - \ No newline at end of file + Transmutatiedoel overlay aangezet + Transmutatiedoel overlay uitgezet + Positie ransmutatiedoel overlay naar links boven gezet + Positie transmutatiedoel overlay naar rechts boven gezet + Positie transmutatiedoel overlay naar links onder gezet + Positie transmutatiedoel overlay naar rechts onder gezet + (waarbij ### een decimale waarde tussen 0.0 en 1.0 is) + Transparantie transmutatiedoel overlay succesvol bijgewerkt + (waarbij ### een decimale waarde groter dan 0.0 is) + Schaal transmutatiedoel overlay succesvol bijgewerkt + Equivalent Exchange 3 deeltjes aangezet + Equivalent Exchange 3 deeltjes uitgezet + Equivalent Exchange 3 geluiden worden gespeeld van alle spelers + Equivalent Exchange 3 geluiden worden alleen van jezelf gespeeld + Equivalent Exchange 3 geluiden worden niet gespeeld + diff --git a/resources/com/pahimar/ee3/lang/pt_BR.xml b/resources/com/pahimar/ee3/lang/pt_BR.xml index febbf26e..c11cde28 100644 --- a/resources/com/pahimar/ee3/lang/pt_BR.xml +++ b/resources/com/pahimar/ee3/lang/pt_BR.xml @@ -43,23 +43,6 @@ Uma nova versão de @MOD_NAME@ existe (@REMOTE_MOD_VERSION@) para @MINECRAFT_VERSION@. Consiga-a aqui: @MOD_UPDATE_LOCATION@ Erro checando a versão remota mestre Checagem remota desligada, pulando - Ligado - Desligado - Tudo - Próprio - Sobreposição - Posição - Opacidade - Escala - Topo - Base - Esquerda - Direita - Partículas - Sons - Versão - command.ee3.usage - @@ -78,5 +61,4 @@ - - \ No newline at end of file + diff --git a/resources/com/pahimar/ee3/lang/tr_TR.xml b/resources/com/pahimar/ee3/lang/tr_TR.xml index 6ca3a479..ebae2c95 100644 --- a/resources/com/pahimar/ee3/lang/tr_TR.xml +++ b/resources/com/pahimar/ee3/lang/tr_TR.xml @@ -36,7 +36,7 @@ Kızıl Su (Akışkan) Kalsinator Kalsinator - Eşit Takas 3 + Equivalent Exchange 3 Uzak versiyon denetlemesi, bulundugu yer Uzak versiyon denetlemesi başarisiz En yeni versiyonu kullanıyorsunuz (@REMOTE_MOD_VERSION@) of Equivalent Exchange 3 for @MINECRAFT_VERSION@ diff --git a/resources/com/pahimar/ee3/lang/zh_CN.xml b/resources/com/pahimar/ee3/lang/zh_CN.xml index 8cb6d38e..9d81c36c 100644 --- a/resources/com/pahimar/ee3/lang/zh_CN.xml +++ b/resources/com/pahimar/ee3/lang/zh_CN.xml @@ -39,8 +39,23 @@ Equivalent Exchange 3 Initializing version check against the remote version authority file, located at The version check did not complete successfully (version check did not initialize properly) - 你现在在用@MINECRAFT_VERSION@的Equivalent Exchange 3的最新的现代化 (@REMOTE_MOD_VERSION@)。 - A new @MOD_NAME@ version exists (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 请更新： @MOD_UPDATE_LOCATION@ - Error connecting to the remote version authority file (check your Internet connection?) - Remote version check disabled, skipping + 你现在用 @MINECRAFT_VERSION@ 的 Equivalent Exchange 3 的最新的现代化 (@REMOTE_MOD_VERSION@) + 新的 @MOD_NAME@ 版本存在 (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 请更新： @MOD_UPDATE_LOCATION@ + 查不了更新的版本(有没有网络？) + 没有查更新 + 目标蜕变图画开了 + 目标蜕变图画关了 + 目标蜕变图画地点移动到左上角 + 目标蜕变图画地点移动到右上角 + 目标蜕变图画地点移动到左下角 + 目标蜕变图画地点移动到右下角 + (### 是个介于 0.0 和 1.0 之间的十进制) + 目标蜕变图画不透明度成功地更新了 + (### 是大于 0.0 的) + 目标蜕变图画大小成功地更新了 + Equivalent Exchange 3 的颗粒开了 + Equivalent Exchange 3 的颗粒关了 + 播放着所有 Equivalent Exchange 3 的声音 + 播放着从自己 Equivalent Exchange 3 的声音 + 播放着全无 Equivalent Exchange 3 的声音 diff --git a/resources/com/pahimar/ee3/lang/zh_TW.xml b/resources/com/pahimar/ee3/lang/zh_TW.xml index 60904711..8eeee35c 100644 --- a/resources/com/pahimar/ee3/lang/zh_TW.xml +++ b/resources/com/pahimar/ee3/lang/zh_TW.xml @@ -39,8 +39,23 @@ Equivalent Exchange 3 Initializing version check against the remote version authority file, located at The version check did not complete successfully (version check did not initialize properly) - 你現在在用@MINECRAFT_VERSION@的Equivalent Exchange 3的最新的現代化 (@REMOTE_MOD_VERSION@)。 + 你現在在用 @MINECRAFT_VERSION@ 的 Equivalent Exchange 3 的最新的現代化 (@REMOTE_MOD_VERSION@) A new @MOD_NAME@ version exists (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 請更新： http://goo.gl/sNcGl Error connecting to the remote version authority file (check your Internet connection?) Remote version check disabled, skipping + 目標蛻變圖畫開了 + 目標蛻變圖畫關了 + 目標蛻變圖畫地點移動到左上角 + 目標蛻變圖畫地點移動到右上角 + 目標蛻變圖畫地點移動到左下角 + 目標蛻變圖畫地點移動到右下角 + (### 是個介於 0.0 和 1.0 之間的十進制) + 目標蛻變圖畫不透明度成功地更新了 + (### 是大於 0.0 的) + 目標蛻變圖畫大小成功地更新了 + Equivalent Exchange 3 的顆粒開了 + Equivalent Exchange 3 的顆粒關了 + 播放著所有 Equivalent Exchange 3 的聲音 + 播放著從自己 Equivalent Exchange 3 的聲音 + 播放著全無 Equivalent Exchange 3 的聲音