Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
André Carvalho 2013-01-20 13:25:58 +00:00
commit 4cef7a5cc0
27 changed files with 480 additions and 313 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
README.md
View file

@ -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).

6
ee3_common/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -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);

68
ee3_common/com/pahimar/ee3/command/CommandEE.java
View file

@ -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]);
}
}
}

71
ee3_common/com/pahimar/ee3/command/CommandOverlay.java
View file

@ -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]);
}
}
}

23
ee3_common/com/pahimar/ee3/command/CommandParticles.java
View file

@ -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));
}
}

34
ee3_common/com/pahimar/ee3/command/CommandSounds.java
View file

@ -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));
}
}

16
ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java
View file

@ -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;

10
ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java
View file

@ -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());
}
}
}
}

23
ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java
View file

@ -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;

68
ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java
View file

@ -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();
}
}

16
ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java
View file

@ -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());
}
}
}

1
ee3_common/com/pahimar/ee3/lib/Colours.java
View file

@ -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 */

51
ee3_common/com/pahimar/ee3/lib/Commands.java Normal file
View file

@ -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";
}

7
ee3_common/com/pahimar/ee3/lib/ItemUpdateTypes.java Normal file
View file

@ -0,0 +1,7 @@
package com.pahimar.ee3.lib;
public class ItemUpdateTypes {
public static final byte DESTROYED = 0;
}

1
ee3_common/com/pahimar/ee3/lib/Reference.java
View file

@ -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;
}

44
ee3_common/com/pahimar/ee3/lib/Strings.java
View file

@ -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";
}

4
ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java
View file

@ -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<? extends PacketEE> clazz;

54
ee3_common/com/pahimar/ee3/network/packet/PacketItemUpdate.java Normal file
View file

@ -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);
}
}
}

14
ee3_common/com/pahimar/ee3/network/packet/PacketSoundEvent.java
View file

@ -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);
}
}
}
}
}

18
resources/com/pahimar/ee3/lang/cy_GB.xml
View file

@ -41,6 +41,22 @@
<entry key="version.uninitialized">Ni ymgychwynodd y gwiriad fersiwn yn briodol</entry>
<entry key="version.current">Rydych yn defnyddio y fersiwn diweddaraf (@REMOTE_MOD_VERSION@) o Equivalent Exchange 3 ar gyfer @MINECRAFT_VERSION@</entry>
<entry key="version.outdated">Mae yna fersiwn mwy diweddar o @MOD_NAME@ ar gael (@REMOTE_MOD_VERSION@) ar gyfer @MINECRAFT_VERSION@. Ffeindiwch o yma: @MOD_UPDATE_LOCATION@</entry>
<entry key="version.general_error">Gwall wrth drio gwirio y ffeil awdurdod fersiwn pell</entry>
<entry key="version.general_error">Gwall wrth drio gysylltu gyda'r ffeil awdurdod fersiwn pell; trio eto</entry>
<entry key="version.final_error">Gwiriad fersiwn yn stopio ar ôl tri tro aflwyddiannus</entry>
<entry key="version.check_disabled">Gwiriad fersiwn pell wedi'i ddiffodd, esgusodid</entry>
<entry key="command.ee3.overlay.turned_on">Wedi troi troshaen targed trawsnewidiad ymlaen</entry>
<entry key="command.ee3.overlay.turned_off">Wedi diffodd troshaen targed trawsnewidiad</entry>
<entry key="command.ee3.overlay.position.top_left">Safle troshaen targed trawsnewidiad wedi ei osod i'r top chwith</entry>
<entry key="command.ee3.overlay.position.top_right">Safle troshaen targed trawsnewidiad wedi ei osod i'r top dde</entry>
<entry key="command.ee3.overlay.position.bottom_left">Safle troshaen targed trawsnewidiad wedi ei osod i'r gwaelod chwith</entry>
<entry key="command.ee3.overlay.position.bottom_right">Safle troshaen targed trawsnewidiad wedi ei osod i'r gwaelod dde</entry>
<entry key="command.ee3.overlay.opacity.usage.additional_text">(ble mae ### yn werth degol rhwng 0.0 ac 1.0) </entry>
<entry key="command.ee3.overlay.opacity.updated">Didreiddedd troshaen targed trawsnewidiad wedi'i ddiweddaru yn llwyddiannus</entry>
<entry key="command.ee3.overlay.scale.usage.additional_text">(ble mae ### yn werth degol mwy na 0.0) </entry>
<entry key="command.ee3.overlay.scale.updated">Graddfa troshaen targed trawsnewidiad wedi'i ddiweddaru yn llwyddiannus</entry>
<entry key="command.ee3.particles.turned_on">Wedi troi gronynnau Equivalent Exchange 3 ymlaen</entry>
<entry key="command.ee3.particles.turned_off">Wedi diffodd gronynnau Equivalent Exchange 3</entry>
<entry key="command.ee3.sounds.set_to_all">Chwaraeir seiniau Equivalent Exchange 3 o holl chwaraewyr</entry>
<entry key="command.ee3.sounds.set_to_self">Chwaraeir seiniau Equivalent Exchange 3 o'n hunan yn unig</entry>
<entry key="command.ee3.sounds.turned_off">Ni chwaraeir seiniau Equivalent Exchange 3 o gwbl</entry>
</properties>

54
resources/com/pahimar/ee3/lang/en_US.xml
View file

@ -41,42 +41,22 @@
<entry key="version.uninitialized">Remote version check failed to initialize properly</entry>
<entry key="version.current">Currently using the most up to date version (@REMOTE_MOD_VERSION@) of Equivalent Exchange 3 for @MINECRAFT_VERSION@</entry>
<entry key="version.outdated">A new @MOD_NAME@ version exists (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. Get it here: @MOD_UPDATE_LOCATION@</entry>
<entry key="version.general_error">Error checking the remote version authority file</entry>
<entry key="version.general_error">Error while connecting to remote version authority file; trying again</entry>
<entry key="version.final_error">Version check stopping after three unsuccessful connection attempts</entry>
<entry key="version.check_disabled">Remote version check disabled, skipping</entry>
<entry key="command.ee3.on">on</entry>
<entry key="command.ee3.off">off</entry>
<entry key="command.ee3.all">all</entry>
<entry key="command.ee3.self">self</entry>
<entry key="command.ee3.overlay">overlay</entry>
<entry key="command.ee3.position">position</entry>
<entry key="command.ee3.opacity">opacity</entry>
<entry key="command.ee3.scale">scale</entry>
<entry key="command.ee3.top">top</entry>
<entry key="command.ee3.bottom">bottom</entry>
<entry key="command.ee3.left">left</entry>
<entry key="command.ee3.right">right</entry>
<entry key="command.ee3.particles">particles</entry>
<entry key="command.ee3.sounds">sounds</entry>
<entry key="command.ee3.version">version</entry>
<entry key="command.ee3.usage">command.ee3.usage</entry>
<entry key="command.ee3.overlay.usage">command.ee3.overlay.usage</entry>
<entry key="command.ee3.overlay.turned_on">command.ee3.overlay.turned_on</entry>
<entry key="command.ee3.overlay.turned_off">command.ee3.overlay.turned_off</entry>
<entry key="command.ee3.overlay.position.usage">command.ee3.overlay.position.usage</entry>
<entry key="command.ee3.overlay.position.top_left">command.ee3.overlay.position.top_left</entry>
<entry key="command.ee3.overlay.position.top_right">command.ee3.overlay.position.top_right</entry>
<entry key="command.ee3.overlay.position.bottom_left">command.ee3.overlay.position.bottom_left</entry>
<entry key="command.ee3.overlay.position.bottom_right">command.ee3.overlay.position.bottom_right</entry>
<entry key="command.ee3.overlay.opacity.usage">command.ee3.overlay.opacity.usage</entry>
<entry key="command.ee3.overlay.opacity.updated">command.ee3.overlay.opacity.updated</entry>
<entry key="command.ee3.overlay.scale.usage">command.ee3.overlay.scale.usage</entry>
<entry key="command.ee3.overlay.scale.updated">command.ee3.overlay.scale.updated</entry>
<entry key="command.ee3.particles.usage">command.ee3.particles.usage</entry>
<entry key="command.ee3.particles.turned_on">command.ee3.particles.turned_on</entry>
<entry key="command.ee3.particles.turned_off">command.ee3.particles.turned_off</entry>
<entry key="command.ee3.sounds.usage">command.ee3.sounds.usage</entry>
<entry key="command.ee3.sounds.set_to_all">command.ee3.sounds.set_to_all</entry>
<entry key="command.ee3.sounds.set_to_self">command.ee3.sounds.set_to_self</entry>
<entry key="command.ee3.sounds.turned_off">command.ee3.sounds.turned_off</entry>
<entry key="command.ee3.version.usage">command.ee3.version.usage</entry>
<entry key="command.ee3.overlay.turned_on">Target transmutation overlay turned on</entry>
<entry key="command.ee3.overlay.turned_off">Target transmutation overlay turned off</entry>
<entry key="command.ee3.overlay.position.top_left">Target transmutation overlay position set to top left</entry>
<entry key="command.ee3.overlay.position.top_right">Target transmutation overlay position set to top right</entry>
<entry key="command.ee3.overlay.position.bottom_left">Target transmutation overlay position set to bottom left</entry>
<entry key="command.ee3.overlay.position.bottom_right">Target transmutation overlay position set to bottom right</entry>
<entry key="command.ee3.overlay.opacity.usage.additional_text">(where ### is a decimal value between 0.0 and 1.0) </entry>
<entry key="command.ee3.overlay.opacity.updated">Target transmutation overlay opacity updated successfully</entry>
<entry key="command.ee3.overlay.scale.usage.additional_text">(where ### is a decimal value greater than 0.0) </entry>
<entry key="command.ee3.overlay.scale.updated">Target transmutation overlay scale updated successfully</entry>
<entry key="command.ee3.particles.turned_on">Equivalent Exchange 3 particles turned on</entry>
<entry key="command.ee3.particles.turned_off">Equivalent Exchange 3 particles turned off</entry>
<entry key="command.ee3.sounds.set_to_all">Playing Equivalent Exchange 3 sounds from all players</entry>
<entry key="command.ee3.sounds.set_to_self">Playing Equivalent Exchange 3 sounds from self only</entry>
<entry key="command.ee3.sounds.turned_off">Playing Equivalent Exchange 3 sounds disabled</entry>
</properties>

108
resources/com/pahimar/ee3/lang/es_ES.xml
View file

@ -1,46 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<comment>Archivo de Traducción en Español (ES)</comment>
<entry key="key.extra">Extra</entry>
<entry key="key.release">Lanzamiento</entry>
<entry key="key.toggle">Alternar</entry>
<entry key="key.charge">Carga</entry>
<entry key="item.miniumShard.name">Fragmento de Minio</entry>
<entry key="item.inertStone.name">Piedra Inerte</entry>
<entry key="item.miniumStone.name">Piedra de Minio</entry>
<entry key="item.philStone.name">Piedra Filosofal</entry>
<entry key="item.alchemyDust.ash.name">Ceniza</entry>
<entry key="item.alchemyDust.minium.name">Polvo de Minio</entry>
<entry key="item.alchemyDust.verdant.name">Polvo Verdante</entry>
<entry key="item.alchemyDust.azure.name">Polvo Azur</entry>
<entry key="item.alchemyDust.amaranthine.name">Polvo Purpúreo</entry>
<entry key="item.alchemyDust.iridescent.name">Polvo Iridiscente</entry>
<entry key="item.alchemyBag.white.name">Bolsa de Alquimia Blanca</entry>
<entry key="item.alchemyBag.orange.name">Bolsa de Alquimia Naranja</entry>
<entry key="item.alchemyBag.magenta.name">Bolsa de Alquimia Magenta</entry>
<entry key="item.alchemyBag.light_blue.name">Bolsa de Alquimia Celeste</entry>
<entry key="item.alchemyBag.yellow.name">Bolsa de Alquimia Amarilla</entry>
<entry key="item.alchemyBag.lime.name">Bolsa de Alquimia Verde Lima</entry>
<entry key="item.alchemyBag.pink.name">Bolsa de Alquimia Rosa</entry>
<entry key="item.alchemyBag.gray.name">Bolsa de Alquimia Gris</entry>
<entry key="item.alchemyBag.light_gray.name">Bolsa de Alquimia Gris Claro</entry>
<entry key="item.alchemyBag.cyan.name">Bolsa de Alquimia Cian</entry>
<entry key="item.alchemyBag.purple.name">Bolsa de Alquimia Púrpura</entry>
<entry key="item.alchemyBag.blue.name">Bolsa de Alquimia Azul</entry>
<entry key="item.alchemyBag.brown.name">Bolsa de Alquimia Marrón</entry>
<entry key="item.alchemyBag.green.name">Bolsa de Alquimia Verde</entry>
<entry key="item.alchemyBag.red.name">Bolsa de Alquimia Roja</entry>
<entry key="item.alchemyBag.black.name">Bolsa de Alquimia Negra</entry>
<entry key="tile.redWaterStill.name">Agua Roja (Quieta)</entry>
<entry key="tile.redWaterFlowing.name">Agua Roja (Fluyendo)</entry>
<entry key="tile.calcinator.name">Calcinador</entry>
<entry key="gui.calcinator.name">Calcinador</entry>
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
<entry key="version.init_log_message">Inicializando chequeo de versión contra el archivo autoritario remoto, ubicado en</entry>
<entry key="version.uninitialized">El chequeo de versiones no se completó exitosamente (el chequeo de versiones no se inicializó correctamente)</entry>
<entry key="version.current">Actualmente estás usando la versión de Equivalent Exchange 3 (@REMOTE_MOD_VERSION) más actualizada para @MINECRAFT_VERSION@</entry>
<entry key="version.outdated">Actualmente estás usando una versión desactualizada; considera actualizarla aquí - @MOD_UPDATE_LOCATION@</entry>
<entry key="version.connection_error">Error al conectar con el archivo autoritario remoto (¿Comprueba tu conexión a internet?)</entry>
<entry key="version.check_disabled">Chequeo remoto de versiones desactivado, omitiendo</entry>
</properties>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<comment>Archivo de Traducción en Español (ES)</comment>
<entry key="key.extra">Extra</entry>
<entry key="key.release">Lanzar</entry>
<entry key="key.toggle">Alternar</entry>
<entry key="key.charge">Cargar</entry>
<entry key="item.miniumShard.name">Fragmento de Minio</entry>
<entry key="item.inertStone.name">Piedra Inerte</entry>
<entry key="item.miniumStone.name">Piedra de Minio</entry>
<entry key="item.philStone.name">Piedra Filosofal</entry>
<entry key="item.alchemyDust.ash.name">Ceniza</entry>
<entry key="item.alchemyDust.minium.name">Polvo de Minio</entry>
<entry key="item.alchemyDust.verdant.name">Polvo Verdante</entry>
<entry key="item.alchemyDust.azure.name">Polvo Azur</entry>
<entry key="item.alchemyDust.amaranthine.name">Polvo Purpúreo</entry>
<entry key="item.alchemyDust.iridescent.name">Polvo Iridiscente</entry>
<entry key="item.alchemyBag.white.name">Bolsa de Alquimia Blanca</entry>
<entry key="item.alchemyBag.orange.name">Bolsa de Alquimia Naranja</entry>
<entry key="item.alchemyBag.magenta.name">Bolsa de Alquimia Magenta</entry>
<entry key="item.alchemyBag.light_blue.name">Bolsa de Alquimia Celeste</entry>
<entry key="item.alchemyBag.yellow.name">Bolsa de Alquimia Amarilla</entry>
<entry key="item.alchemyBag.lime.name">Bolsa de Alquimia Verde Lima</entry>
<entry key="item.alchemyBag.pink.name">Bolsa de Alquimia Rosa</entry>
<entry key="item.alchemyBag.gray.name">Bolsa de Alquimia Gris</entry>
<entry key="item.alchemyBag.light_gray.name">Bolsa de Alquimia Gris Claro</entry>
<entry key="item.alchemyBag.cyan.name">Bolsa de Alquimia Cian</entry>
<entry key="item.alchemyBag.purple.name">Bolsa de Alquimia Púrpura</entry>
<entry key="item.alchemyBag.blue.name">Bolsa de Alquimia Azul</entry>
<entry key="item.alchemyBag.brown.name">Bolsa de Alquimia Marrón</entry>
<entry key="item.alchemyBag.green.name">Bolsa de Alquimia Verde</entry>
<entry key="item.alchemyBag.red.name">Bolsa de Alquimia Roja</entry>
<entry key="item.alchemyBag.black.name">Bolsa de Alquimia Negra</entry>
<entry key="tile.redWaterStill.name">Agua Roja (Quieta)</entry>
<entry key="tile.redWaterFlowing.name">Agua Roja (Fluyendo)</entry>
<entry key="tile.calcinator.name">Calcinador</entry>
<entry key="gui.calcinator.name">Calcinador</entry>
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
<entry key="version.init_log_message">Inicializando chequeo de versión contra el archivo autoritario remoto, ubicado en</entry>
<entry key="version.uninitialized">El chequeo de versiones no se iniicalizó adecuadamente</entry>
<entry key="version.current">Actualmente estás usando la versión de Equivalent Exchange 3 (@REMOTE_MOD_VERSION) más actualizada para @MINECRAFT_VERSION@</entry>
<entry key="version.outdated">Existe una nueva versión (@REMOTE_MOD_VERSION@) de @MOD_NAME@ para @MINECRAFT_VERSION@. Consíguela aquí: @MOD_UPDATE_LOCATION@</entry>
<entry key="version.general_error">Error al conectar con el archivo autoritario remoto (¿Comprueba tu conexión a internet?)</entry>
<entry key="version.final_error">Chequeo de versión detenido después de tres intentos de conexión sin éxito</entry>
<entry key="version.check_disabled">Chequeo remoto de versiones desactivado, omitiendo</entry>
<entry key="command.ee3.overlay.turned_on">Superposicón del objetivo a tranmutar activada</entry>
<entry key="command.ee3.overlay.turned_off">Superposicón del objetivo a tranmutar desactivada</entry>
<entry key="command.ee3.overlay.position.top_left">Posición de la superposición del objetivo a transmutar fijada a la parte superior izquierda</entry>
<entry key="command.ee3.overlay.position.top_right">Posición de la superposición del objetivo a transmutar fijada a la parte superior derecha</entry>
<entry key="command.ee3.overlay.position.bottom_left">Posición de la superposición del objetivo a transmutar fijada a la parte inferior izquierda</entry>
<entry key="command.ee3.overlay.position.bottom_right">Posición de la superposición del objetivo a transmutar fijada a la parte inferior derecha</entry>
<entry key="command.ee3.overlay.opacity.usage.additional_text">(donde ### es un número decimal entre 0.0 y 1.0) </entry>
<entry key="command.ee3.overlay.opacity.updated">Opacidad de la superposición del objetivo a transmutar actualizada exitosamente</entry>
<entry key="command.ee3.overlay.scale.usage.additional_text">(donde ### es un número decimal mayor que 0.0) </entry>
<entry key="command.ee3.overlay.scale.updated">Escala de la superposición del objetivo a transmutar actualizada exitosamente</entry>
<entry key="command.ee3.particles.turned_on">Particulas de ee3 activadas</entry>
<entry key="command.ee3.particles.turned_off">Particulas de ee3 desactivadas</entry>
<entry key="command.ee3.sounds.set_to_all">Reproduciendo sonidos de Equivalent Exchange 3 provenientes de todos los jugadores</entry>
<entry key="command.ee3.sounds.set_to_self">Solo reproduciendo sonidos de Equivalent Exchange 3 propios</entry>
<entry key="command.ee3.sounds.turned_off">Desactivados los sonidos de Equivalent Exchange 3</entry>
</properties>

20
resources/com/pahimar/ee3/lang/nl_NL.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<comment>Dutch (NL) Localization File</comment>
@ -42,5 +42,21 @@
<entry key="version.current">Je gebruikt momenteel de meest recente versie (@REMOTE_MOD_VERSION@) van Equivalent Exchange 3 voor @MINECRAFT_VERSION@</entry>
<entry key="version.outdated">Een nieuwe @MOD_NAME@ versie bestaat (@REMOTE_MOD_VERSION@) voor @MINECRAFT_VERSION@. Je vindt deze hier: @MOD_UPDATE_LOCATION@</entry>
<entry key="version.general_error">Er deed zich een fout voor tijdens de versiecontrole</entry>
<entry key="version.final_error">Versiecontrole gestopt na drie mislukte connectie pogingen</entry>
<entry key="version.check_disabled">Externe versiecontrole uitgeschakeld, wordt overgeslagen</entry>
</properties>
<entry key="command.ee3.overlay.turned_on">Transmutatiedoel overlay aangezet</entry>
<entry key="command.ee3.overlay.turned_off">Transmutatiedoel overlay uitgezet</entry>
<entry key="command.ee3.overlay.position.top_left">Positie ransmutatiedoel overlay naar links boven gezet</entry>
<entry key="command.ee3.overlay.position.top_right">Positie transmutatiedoel overlay naar rechts boven gezet</entry>
<entry key="command.ee3.overlay.position.bottom_left">Positie transmutatiedoel overlay naar links onder gezet</entry>
<entry key="command.ee3.overlay.position.bottom_right">Positie transmutatiedoel overlay naar rechts onder gezet</entry>
<entry key="command.ee3.overlay.opacity.usage.additional_text">(waarbij ### een decimale waarde tussen 0.0 en 1.0 is) </entry>
<entry key="command.ee3.overlay.opacity.updated">Transparantie transmutatiedoel overlay succesvol bijgewerkt</entry>
<entry key="command.ee3.overlay.scale.usage.additional_text">(waarbij ### een decimale waarde groter dan 0.0 is) </entry>
<entry key="command.ee3.overlay.scale.updated">Schaal transmutatiedoel overlay succesvol bijgewerkt</entry>
<entry key="command.ee3.particles.turned_on">Equivalent Exchange 3 deeltjes aangezet</entry>
<entry key="command.ee3.particles.turned_off">Equivalent Exchange 3 deeltjes uitgezet</entry>
<entry key="command.ee3.sounds.set_to_all">Equivalent Exchange 3 geluiden worden gespeeld van alle spelers</entry>
<entry key="command.ee3.sounds.set_to_self">Equivalent Exchange 3 geluiden worden alleen van jezelf gespeeld</entry>
<entry key="command.ee3.sounds.turned_off">Equivalent Exchange 3 geluiden worden niet gespeeld</entry>
</properties>

20
resources/com/pahimar/ee3/lang/pt_BR.xml
View file

@ -43,23 +43,6 @@
<entry key="version.outdated">Uma nova versão de @MOD_NAME@ existe (@REMOTE_MOD_VERSION@) para @MINECRAFT_VERSION@. Consiga-a aqui: @MOD_UPDATE_LOCATION@</entry>
<entry key="version.general_error">Erro checando a versão remota mestre</entry>
<entry key="version.check_disabled">Checagem remota desligada, pulando</entry>
<entry key="command.ee3.on">Ligado</entry>
<entry key="command.ee3.off">Desligado</entry>
<entry key="command.ee3.all">Tudo</entry>
<entry key="command.ee3.self">Próprio</entry>
<entry key="command.ee3.overlay">Sobreposição</entry>
<entry key="command.ee3.position">Posição</entry>
<entry key="command.ee3.opacity">Opacidade</entry>
<entry key="command.ee3.scale">Escala</entry>
<entry key="command.ee3.top">Topo</entry>
<entry key="command.ee3.bottom">Base</entry>
<entry key="command.ee3.left">Esquerda</entry>
<entry key="command.ee3.right">Direita</entry>
<entry key="command.ee3.particles">Partículas</entry>
<entry key="command.ee3.sounds">Sons</entry>
<entry key="command.ee3.version">Versão</entry>
<entry key="command.ee3.usage">command.ee3.usage</entry>
<entry key="command.ee3.overlay.usage"> </entry>
<entry key="command.ee3.overlay.turned_on"> </entry>
<entry key="command.ee3.overlay.turned_off"> </entry>
<entry key="command.ee3.overlay.position.usage"> </entry>
@ -78,5 +61,4 @@
<entry key="command.ee3.sounds.set_to_all"> </entry>
<entry key="command.ee3.sounds.set_to_self"> </entry>
<entry key="command.ee3.sounds.turned_off"> </entry>
<entry key="command.ee3.version.usage"> </entry>
</properties>
</properties>

2
resources/com/pahimar/ee3/lang/tr_TR.xml
View file

@ -36,7 +36,7 @@
<entry key="tile.redWaterFlowing.name">Kızıl Su (Akışkan)</entry>
<entry key="tile.calcinator.name">Kalsinator</entry>
<entry key="gui.calcinator.name">Kalsinator</entry>
<entry key="itemGroup.EE3">Eşit Takas 3</entry>
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
<entry key="version.init_log_message">Uzak versiyon denetlemesi, bulundugu yer</entry>
<entry key="version.uninitialized">Uzak versiyon denetlemesi başarisiz</entry>
<entry key="version.current">En yeni versiyonu kullanıyorsunuz (@REMOTE_MOD_VERSION@) of Equivalent Exchange 3 for @MINECRAFT_VERSION@</entry>

23
resources/com/pahimar/ee3/lang/zh_CN.xml
View file

@ -39,8 +39,23 @@
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
<entry key="version.init_log_message">Initializing version check against the remote version authority file, located at</entry>
<entry key="version.uninitialized">The version check did not complete successfully (version check did not initialize properly)</entry>
<entry key="version.current">你现在在用@MINECRAFT_VERSION@的Equivalent Exchange 3的最新的现代化 (@REMOTE_MOD_VERSION@)。</entry>
<entry key="version.outdated">A new @MOD_NAME@ version exists (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 请更新： @MOD_UPDATE_LOCATION@</entry>
<entry key="version.connection_error">Error connecting to the remote version authority file (check your Internet connection?)</entry>
<entry key="version.check_disabled">Remote version check disabled, skipping</entry>
<entry key="version.current">你现在用 @MINECRAFT_VERSION@ 的 Equivalent Exchange 3 的最新的现代化 (@REMOTE_MOD_VERSION@)</entry>
<entry key="version.outdated">新的 @MOD_NAME@ 版本存在 (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 请更新： @MOD_UPDATE_LOCATION@</entry>
<entry key="version.connection_error">查不了更新的版本(有没有网络？)</entry>
<entry key="version.check_disabled">没有查更新</entry>
<entry key="command.ee3.overlay.turned_on">目标蜕变图画开了</entry>
<entry key="command.ee3.overlay.turned_off">目标蜕变图画关了</entry>
<entry key="command.ee3.overlay.position.top_left">目标蜕变图画地点移动到左上角</entry>
<entry key="command.ee3.overlay.position.top_right">目标蜕变图画地点移动到右上角</entry>
<entry key="command.ee3.overlay.position.bottom_left">目标蜕变图画地点移动到左下角</entry>
<entry key="command.ee3.overlay.position.bottom_right">目标蜕变图画地点移动到右下角</entry>
<entry key="command.ee3.overlay.opacity.usage.additional_text">(### 是个介于 0.0 和 1.0 之间的十进制)</entry>
<entry key="command.ee3.overlay.opacity.updated">目标蜕变图画不透明度成功地更新了</entry>
<entry key="command.ee3.overlay.scale.usage.additional_text">(### 是大于 0.0 的) </entry>
<entry key="command.ee3.overlay.scale.updated">目标蜕变图画大小成功地更新了</entry>
<entry key="command.ee3.particles.turned_on">Equivalent Exchange 3 的颗粒开了</entry>
<entry key="command.ee3.particles.turned_off">Equivalent Exchange 3 的颗粒关了</entry>
<entry key="command.ee3.sounds.set_to_all">播放着所有 Equivalent Exchange 3 的声音</entry>
<entry key="command.ee3.sounds.set_to_self">播放着从自己 Equivalent Exchange 3 的声音</entry>
<entry key="command.ee3.sounds.turned_off">播放着全无 Equivalent Exchange 3 的声音</entry>
</properties>

17
resources/com/pahimar/ee3/lang/zh_TW.xml
View file

@ -39,8 +39,23 @@
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
<entry key="version.init_log_message">Initializing version check against the remote version authority file, located at</entry>
<entry key="version.uninitialized">The version check did not complete successfully (version check did not initialize properly)</entry>
<entry key="version.current">你現在在用@MINECRAFT_VERSION@的Equivalent Exchange 3的最新的現代化 (@REMOTE_MOD_VERSION@)。</entry>
<entry key="version.current">你現在在用 @MINECRAFT_VERSION@ 的 Equivalent Exchange 3 的最新的現代化 (@REMOTE_MOD_VERSION@)</entry>
<entry key="version.outdated">A new @MOD_NAME@ version exists (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 請更新： http://goo.gl/sNcGl</entry>
<entry key="version.connection_error">Error connecting to the remote version authority file (check your Internet connection?)</entry>
<entry key="version.check_disabled">Remote version check disabled, skipping</entry>
<entry key="command.ee3.overlay.turned_on">目標蛻變圖畫開了</entry>
<entry key="command.ee3.overlay.turned_off">目標蛻變圖畫關了</entry>
<entry key="command.ee3.overlay.position.top_left">目標蛻變圖畫地點移動到左上角</entry>
<entry key="command.ee3.overlay.position.top_right">目標蛻變圖畫地點移動到右上角</entry>
<entry key="command.ee3.overlay.position.bottom_left">目標蛻變圖畫地點移動到左下角</entry>
<entry key="command.ee3.overlay.position.bottom_right">目標蛻變圖畫地點移動到右下角</entry>
<entry key="command.ee3.overlay.opacity.usage.additional_text">(### 是個介於 0.0 和 1.0 之間的十進制)</entry>
<entry key="command.ee3.overlay.opacity.updated">目標蛻變圖畫不透明度成功地更新了</entry>
<entry key="command.ee3.overlay.scale.usage.additional_text">(### 是大於 0.0 的) </entry>
<entry key="command.ee3.overlay.scale.updated">目標蛻變圖畫大小成功地更新了</entry>
<entry key="command.ee3.particles.turned_on">Equivalent Exchange 3 的顆粒開了</entry>
<entry key="command.ee3.particles.turned_off">Equivalent Exchange 3 的顆粒關了</entry>
<entry key="command.ee3.sounds.set_to_all">播放著所有 Equivalent Exchange 3 的聲音</entry>
<entry key="command.ee3.sounds.set_to_self">播放著從自己 Equivalent Exchange 3 的聲音</entry>
<entry key="command.ee3.sounds.turned_off">播放著全無 Equivalent Exchange 3 的聲音</entry>
</properties>