From d48b11e67827d9d7dcd10cc739308ba496af7caa Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 20 Dec 2012 19:55:10 -0500 Subject: [PATCH 01/29] Update README.md Last commit, for real. Forgot to update Forge version. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 66187356..78214362 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ ________________________________________________________________________________ 2. Inside `mcdev`, create a directory named `mcp` and unzip the MCP .zip file into it. * To verify, check if a file named `CHANGELOG` exists inside `mcp`. -3. Download the latest forge **source** for Minecraft 1.4.5 and unzip it into `mcp`. You need at least Forge 6.4.0, best way is to get it from [here] (http://files.minecraftforge.net/). +3. Download the latest forge **source** for Minecraft 1.4.5 and unzip it into `mcp`. You need at least Forge 6.5.0, best way is to get it from [here] (http://files.minecraftforge.net/). * To verify, check if a application named `install.sh` exists. 4. Execute `install.sh` (Linux and Mac) or `install.cmd` (Windows), both found in `mcdev\mcp\forge`. On Linux you might have to `chmod +x` `install.sh` before you can execute it. On some system configurations you need to execute `install.sh` from within the `forge` directory whereas on others it doesn't matter. Just check the output for error messages to find out what you need to do. @@ -88,4 +88,4 @@ ________________________________________________________________________________ 5. Click `Sync`, and wait for it to finish. -6. Re-compile (or move it to `mcdev\source` then re-compile, depending on what you did.) \ No newline at end of file +6. Re-compile (or move it to `mcdev\source` then re-compile, depending on what you did.) From a8d77738f3d26688e1aca95a40254463fc1e04ff Mon Sep 17 00:00:00 2001 From: Wliu Date: Fri, 4 Jan 2013 17:11:04 -0500 Subject: [PATCH 02/29] Revert "Update README.md" This reverts commit d48b11e67827d9d7dcd10cc739308ba496af7caa. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 78214362..66187356 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ ________________________________________________________________________________ 2. Inside `mcdev`, create a directory named `mcp` and unzip the MCP .zip file into it. * To verify, check if a file named `CHANGELOG` exists inside `mcp`. -3. Download the latest forge **source** for Minecraft 1.4.5 and unzip it into `mcp`. You need at least Forge 6.5.0, best way is to get it from [here] (http://files.minecraftforge.net/). +3. Download the latest forge **source** for Minecraft 1.4.5 and unzip it into `mcp`. You need at least Forge 6.4.0, best way is to get it from [here] (http://files.minecraftforge.net/). * To verify, check if a application named `install.sh` exists. 4. Execute `install.sh` (Linux and Mac) or `install.cmd` (Windows), both found in `mcdev\mcp\forge`. On Linux you might have to `chmod +x` `install.sh` before you can execute it. On some system configurations you need to execute `install.sh` from within the `forge` directory whereas on others it doesn't matter. Just check the output for error messages to find out what you need to do. @@ -88,4 +88,4 @@ ________________________________________________________________________________ 5. Click `Sync`, and wait for it to finish. -6. Re-compile (or move it to `mcdev\source` then re-compile, depending on what you did.) +6. Re-compile (or move it to `mcdev\source` then re-compile, depending on what you did.) \ No newline at end of file From 240f2462a7ee279e565f4ecf175ac837fa47ed30 Mon Sep 17 00:00:00 2001 From: Bram Date: Wed, 9 Jan 2013 15:21:07 +0100 Subject: [PATCH 03/29] Updated Dutch translations --- resources/com/pahimar/ee3/lang/nl_NL.xml | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/resources/com/pahimar/ee3/lang/nl_NL.xml b/resources/com/pahimar/ee3/lang/nl_NL.xml index d67ab240..5d7debf9 100644 --- a/resources/com/pahimar/ee3/lang/nl_NL.xml +++ b/resources/com/pahimar/ee3/lang/nl_NL.xml @@ -43,4 +43,40 @@ 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 Externe versiecontrole uitgeschakeld, wordt overgeslagen + aan + uit + alle + eigen + overlap + positie + transparantie + schaal + bovenkant + onderkant + links + rechts + deeltjes + geluiden + versie + 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 \ No newline at end of file From e570fc3139998b2346b7cc6b0c18678d637b7c5c Mon Sep 17 00:00:00 2001 From: pahimar Date: Wed, 9 Jan 2013 15:22:21 -0500 Subject: [PATCH 04/29] Fixed non-OPs using /ee3 command on servers, localize a more of the /ee3 command (feel free to submit localizations again), and threaded the version checker --- .../com/pahimar/ee3/EquivalentExchange3.java | 6 +- .../com/pahimar/ee3/command/CommandEE.java | 9 +++ .../pahimar/ee3/command/CommandOverlay.java | 8 +-- .../ee3/core/helper/VersionHelper.java | 64 ++++++++++++++++--- ee3_common/com/pahimar/ee3/lib/Reference.java | 1 + ee3_common/com/pahimar/ee3/lib/Strings.java | 1 + resources/com/pahimar/ee3/lang/en_US.xml | 43 +++++++------ 7 files changed, 92 insertions(+), 40 deletions(-) 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..ca92bf47 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandEE.java +++ b/ee3_common/com/pahimar/ee3/command/CommandEE.java @@ -15,6 +15,12 @@ public class CommandEE extends CommandBase { return COMMAND_EE3; } + + + public boolean canCommandSenderUseCommand(ICommandSender commandSender) { + return true; + } + public List addTabCompletionOptions(ICommandSender commandSender, String[] args) { @@ -87,6 +93,9 @@ public class CommandEE extends CommandBase { else if (commandName.equalsIgnoreCase(getLocalizedString(COMMAND_SOUNDS))) { CommandSounds.processCommand(commandSender, args); } + else { + throw new WrongUsageException(getLocalizedString(COMMAND_EE3_USAGE), new Object[0]); + } } else { throw new WrongUsageException(getLocalizedString(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..34129aa6 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandOverlay.java +++ b/ee3_common/com/pahimar/ee3/command/CommandOverlay.java @@ -56,7 +56,7 @@ public class CommandOverlay { 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]); @@ -80,7 +80,7 @@ public class CommandOverlay { 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]); @@ -106,7 +106,7 @@ public class CommandOverlay { String yPosition, xPosition; - if (args.length >= 3) { + if ((args.length > 2) && (args.length < 5)) { yPosition = args[1]; xPosition = args[2]; @@ -135,7 +135,7 @@ public class CommandOverlay { } } else { - new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_POSITION_USAGE), new Object[0]); + throw new WrongUsageException(getLocalizedString(COMMAND_OVERLAY_POSITION_USAGE), new Object[0]); } } } diff --git a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java index 52330f33..f625f907 100644 --- a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java @@ -25,10 +25,12 @@ 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"; + private static final String REMOTE_VERSION_XML_FILE = "https://raw.github.com/pahimar/Equivalent-Exchange-3/master/version.xml.z"; public static Properties remoteVersionProperties = new Properties(); @@ -36,7 +38,8 @@ 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; @@ -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; } @@ -148,4 +152,44 @@ public class VersionHelper { return returnString; } + @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 != CURRENT) || (result != OUTDATED))) { + + 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/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..1e6b3ce7 100644 --- a/ee3_common/com/pahimar/ee3/lib/Strings.java +++ b/ee3_common/com/pahimar/ee3/lib/Strings.java @@ -17,6 +17,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"; diff --git a/resources/com/pahimar/ee3/lang/en_US.xml b/resources/com/pahimar/ee3/lang/en_US.xml index d41e28bf..295e6cb8 100644 --- a/resources/com/pahimar/ee3/lang/en_US.xml +++ b/resources/com/pahimar/ee3/lang/en_US.xml @@ -41,7 +41,8 @@ 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 @@ -58,25 +59,25 @@ 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 + ee3 [ overlay | particles | sounds | version ] + ee3 overlay [ on | off | position | scale | opacity ] + Target transmutation overlay turned on + Target transmutation overlay turned off + ee3 overlay position [ top | bottom ] [ left | right ] + 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 + ee3 overlay opacity ### (where ### is a decimal value between 0.0 and 1.0) + Target transmutation overlay opacity updated successfully + ee3 overlay scale ### (where ### is a decimal value greater than 0.0) + Target transmutation overlay scale updated successfully + ee3 particles [ on | off ] + Equivalent Exchange 3 particles turned on + Equivalent Exchange 3 particles turned off + ee3 sounds [ all | self | off ] + Playing Equivalent Exchange 3 sounds from all players + Playing Equivalent Exchange 3 sounds from self only + Playing Equivalent Exchange 3 sounds disabled command.ee3.version.usage From 8c26feab5bb5f990dfb0c417ecfe085117cf7172 Mon Sep 17 00:00:00 2001 From: pahimar Date: Wed, 9 Jan 2013 15:37:29 -0500 Subject: [PATCH 05/29] Derped and didn't fix the remote URL. Also made the client message portion of the version check wait for th e result to finally be determined before reporting to the player in game. --- .../ee3/core/handlers/VersionCheckTickHandler.java | 10 +++++++--- .../com/pahimar/ee3/core/helper/VersionHelper.java | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) 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/helper/VersionHelper.java b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java index f625f907..f13c918e 100644 --- a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java @@ -30,7 +30,7 @@ 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.z"; + private static final String REMOTE_VERSION_XML_FILE = "https://raw.github.com/pahimar/Equivalent-Exchange-3/master/version.xml"; public static Properties remoteVersionProperties = new Properties(); @@ -42,7 +42,7 @@ public class VersionHelper implements Runnable { 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; @@ -151,6 +151,10 @@ public class VersionHelper implements Runnable { 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() { From 22f33456c4519bd9be815328d4f8c73dd7e4dda8 Mon Sep 17 00:00:00 2001 From: Santiago Quintero Date: Thu, 10 Jan 2013 00:33:52 -0500 Subject: [PATCH 06/29] Spanish es_ES translation file update --- resources/com/pahimar/ee3/lang/es_ES.xml | 129 +++++++++++++++-------- 1 file changed, 83 insertions(+), 46 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/es_ES.xml b/resources/com/pahimar/ee3/lang/es_ES.xml index c3f574cb..86a19990 100644 --- a/resources/com/pahimar/ee3/lang/es_ES.xml +++ b/resources/com/pahimar/ee3/lang/es_ES.xml @@ -1,46 +1,83 @@ - - - - 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 + activado + desactivado + todos + propio + superposición + posición + opacidad + escala + superior + inferior + izquierda + derecha + partículas + sonidos + versión + ee3 [ superposición | partículas | sonidos | versión ] + ee3 superposición [ activado | desactivado | posición | escala | opacidad ] + Superposicón del objetivo a tranmutar activada + Superposicón del objetivo a tranmutar desactivada + ee3 superposición posición [ superior | inferior ] [ izquierda | derecha ] + 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 + ee3 superposición opacidad ### (donde ### es un número decimal entre 0.0 y 1.0) + Opacidad de la superposición del objetivo a transmutar actualizada exitosamente + ee3 superposición escala ### (donde ### es un número decimal mayor que 0.0) + Escala de la superposición del objetivo a transmutar actualizada exitosamente + ee3 particulas [ activado | desactivado ] + Particulas de ee3 activadas + Particulas de ee3 desactivadas + ee3 sonidos [ activado | propio | desactivado ] + 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 + command.ee3.version.usage + From ff0efd649702195752e92fee6b186bc2e250e3b2 Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 10 Jan 2013 16:02:29 -0500 Subject: [PATCH 07/29] Update README.md Updated to 1.4.7 official, fixed derps. Deleted useless step. --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index eac4be27..a9de6953 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 MC 1.4..7m [Minecraft Forums page] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3) @@ -17,7 +17,7 @@ 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_10` 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`. 2. Download Apache Ant [here] (http://ant.apache.org). @@ -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,10 +63,9 @@ 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/10) + * `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. From 7bd5bccd9330a9affb547411395d6b6a1dbc18c1 Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 10 Jan 2013 16:02:41 -0500 Subject: [PATCH 08/29] Update README.md wut --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a9de6953..bc1dd697 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..7m +**LATEST OFFICIAL VERSION**: EE3 pre1f for MC 1.4.7 [Minecraft Forums page] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3) From d4a97f97be469645484b2c3148b650a8dd78fb40 Mon Sep 17 00:00:00 2001 From: pahimar Date: Fri, 11 Jan 2013 15:01:47 -0500 Subject: [PATCH 09/29] De-localized a fair bit of the commands system (response messages can be localized, but the actual commands you type in will not be localized), changed the colour of the response message the player sees to gray, re-org'd some files, etc --- .../com/pahimar/ee3/command/CommandEE.java | 67 +++++++------------ .../pahimar/ee3/command/CommandOverlay.java | 65 +++++++++--------- .../pahimar/ee3/command/CommandParticles.java | 23 ++++--- .../pahimar/ee3/command/CommandSounds.java | 34 +++++----- ee3_common/com/pahimar/ee3/lib/Colours.java | 1 + ee3_common/com/pahimar/ee3/lib/Commands.java | 51 ++++++++++++++ ee3_common/com/pahimar/ee3/lib/Strings.java | 43 ------------ .../ee3/network/packet/PacketSoundEvent.java | 14 ++-- resources/com/pahimar/ee3/lang/en_US.xml | 25 +------ 9 files changed, 147 insertions(+), 176 deletions(-) create mode 100644 ee3_common/com/pahimar/ee3/lib/Commands.java diff --git a/ee3_common/com/pahimar/ee3/command/CommandEE.java b/ee3_common/com/pahimar/ee3/command/CommandEE.java index ca92bf47..9e21ed66 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandEE.java +++ b/ee3_common/com/pahimar/ee3/command/CommandEE.java @@ -1,73 +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 }); } } } @@ -84,21 +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(getLocalizedString(COMMAND_EE3_USAGE), new Object[0]); + 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 34129aa6..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,42 +17,42 @@ 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) { @@ -61,20 +62,20 @@ public class CommandOverlay { 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]); } } @@ -85,20 +86,20 @@ public class CommandOverlay { 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]); } } @@ -110,32 +111,32 @@ public class CommandOverlay { 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 { - throw 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/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/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java index 1e6b3ce7..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"; @@ -50,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/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/en_US.xml b/resources/com/pahimar/ee3/lang/en_US.xml index 295e6cb8..983497df 100644 --- a/resources/com/pahimar/ee3/lang/en_US.xml +++ b/resources/com/pahimar/ee3/lang/en_US.xml @@ -44,40 +44,19 @@ 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 - ee3 [ overlay | particles | sounds | version ] - ee3 overlay [ on | off | position | scale | opacity ] Target transmutation overlay turned on Target transmutation overlay turned off - ee3 overlay position [ top | bottom ] [ left | right ] 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 - ee3 overlay opacity ### (where ### is a decimal value between 0.0 and 1.0) + (where ### is a decimal value between 0.0 and 1.0) Target transmutation overlay opacity updated successfully - ee3 overlay scale ### (where ### is a decimal value greater than 0.0) + (where ### is a decimal value greater than 0.0) Target transmutation overlay scale updated successfully - ee3 particles [ on | off ] Equivalent Exchange 3 particles turned on Equivalent Exchange 3 particles turned off - ee3 sounds [ all | self | off ] Playing Equivalent Exchange 3 sounds from all players Playing Equivalent Exchange 3 sounds from self only Playing Equivalent Exchange 3 sounds disabled - command.ee3.version.usage From 516e50ca2b30899371c4f879b2ee183c3d6f1081 Mon Sep 17 00:00:00 2001 From: Grovert11 Date: Fri, 11 Jan 2013 21:16:51 +0100 Subject: [PATCH 10/29] Update resources/com/pahimar/ee3/lang/nl_NL.xml Hope this is right now. Again, couldn't think of a fitting translation of "overlay", but I think it will be clear enough. --- resources/com/pahimar/ee3/lang/nl_NL.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/nl_NL.xml b/resources/com/pahimar/ee3/lang/nl_NL.xml index d67ab240..54a8a234 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 stopt na dire mislukte connectie pogingen Externe versiecontrole uitgeschakeld, wordt overgeslagen - \ No newline at end of file + Doel transmutatie overlay aangezet + Doel transmutatie overlay uitgezet + Doel transmutatie overlay positie naar links boven gezet + Doel transmutatie overlay positie naar rechts boven gezet + Doel transmutatie overlay positie naar links onder gezet + Doel transmutatie overlay positie naar rechts onder gezet + (waarbij ### een decimale waarde tussen 0.0 en 1.0 is) + Doel transmutatie overlay ondoorzichtigheid succesvol bijgewerkt + (waarbij ### een decimale waarde groter dan 0.0 is) + Doel transmutatie overlay schaal succesvol bijgewerkt + Equivalent Exchange 3 deeltjes aangezet + Equivalent Exchange 3 deeltjes uitgezet + Equivalent Exchange 3 geluiden worden gespeelt van alle spelers + Equivalent Exchange 3 geluiden worden alleen van jezelf gespeelt + Equivalent Exchange 3 geluiden worden niet gespeelt + From 5a96039cd75eef1c72453c5e7d7eb45679b7b0f0 Mon Sep 17 00:00:00 2001 From: Santiago Quintero Date: Fri, 11 Jan 2013 15:36:10 -0500 Subject: [PATCH 11/29] Updated es_ES localization, deleted commands localization --- resources/com/pahimar/ee3/lang/es_ES.xml | 27 +++--------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/es_ES.xml b/resources/com/pahimar/ee3/lang/es_ES.xml index 86a19990..c8b14d4c 100644 --- a/resources/com/pahimar/ee3/lang/es_ES.xml +++ b/resources/com/pahimar/ee3/lang/es_ES.xml @@ -1,4 +1,4 @@ - + Archivo de Traducción en Español (ES) @@ -44,40 +44,19 @@ 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 - activado - desactivado - todos - propio - superposición - posición - opacidad - escala - superior - inferior - izquierda - derecha - partículas - sonidos - versión - ee3 [ superposición | partículas | sonidos | versión ] - ee3 superposición [ activado | desactivado | posición | escala | opacidad ] Superposicón del objetivo a tranmutar activada Superposicón del objetivo a tranmutar desactivada - ee3 superposición posición [ superior | inferior ] [ izquierda | derecha ] 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 - ee3 superposición opacidad ### (donde ### es un número decimal entre 0.0 y 1.0) + (donde ### es un número decimal entre 0.0 y 1.0) Opacidad de la superposición del objetivo a transmutar actualizada exitosamente - ee3 superposición escala ### (donde ### es un número decimal mayor que 0.0) + (donde ### es un número decimal mayor que 0.0) Escala de la superposición del objetivo a transmutar actualizada exitosamente - ee3 particulas [ activado | desactivado ] Particulas de ee3 activadas Particulas de ee3 desactivadas - ee3 sonidos [ activado | propio | desactivado ] 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 - command.ee3.version.usage From f4aabec501b11569e71c093c16e3fe2acd35a391 Mon Sep 17 00:00:00 2001 From: Dion Williams Date: Fri, 11 Jan 2013 22:25:32 +0000 Subject: [PATCH 12/29] Updated Welsh localisation. Thanks for the command changes :)! --- resources/com/pahimar/ee3/lang/cy_GB.xml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) 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 From de090bddd7c9992c68b1712936f9ba30a922f3a9 Mon Sep 17 00:00:00 2001 From: YoWazzup Date: Sun, 13 Jan 2013 12:20:45 +0100 Subject: [PATCH 13/29] Fixed grammar fails in dutch loc. Read title. --- resources/com/pahimar/ee3/lang/nl_NL.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/nl_NL.xml b/resources/com/pahimar/ee3/lang/nl_NL.xml index 54a8a234..2ba4829c 100644 --- a/resources/com/pahimar/ee3/lang/nl_NL.xml +++ b/resources/com/pahimar/ee3/lang/nl_NL.xml @@ -56,7 +56,7 @@ Doel transmutatie overlay schaal succesvol bijgewerkt Equivalent Exchange 3 deeltjes aangezet Equivalent Exchange 3 deeltjes uitgezet - Equivalent Exchange 3 geluiden worden gespeelt van alle spelers - Equivalent Exchange 3 geluiden worden alleen van jezelf gespeelt - Equivalent Exchange 3 geluiden worden niet gespeelt + 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 From c668c1f8ebe489492cf2d74bc0adc52f32388113 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 13 Jan 2013 21:21:10 -0500 Subject: [PATCH 14/29] Simplified Chinese commands + grammar fix Simplified Chinese commands! Probably not the best translations; someone more eloquent than I should probably look those over. Also removed an extra character in version.current. --- resources/com/pahimar/ee3/lang/zh_CN.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/resources/com/pahimar/ee3/lang/zh_CN.xml b/resources/com/pahimar/ee3/lang/zh_CN.xml index 8cb6d38e..56b8b01e 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@)。 + 你现在用@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 + 目标蜕变图画开了 + 目标蜕变图画关了 + 目标蜕变图画地点移动到左上角 + 目标蜕变图画地点移动到右上角 + 目标蜕变图画地点移动到左下角 + 目标蜕变图画地点移动到右下角 + (###是个介于 0.0 和 1.0 之间的十进制) + 目标蜕变图画不透明度成功地更新了。 + (###是大于 0.0 的) + 目标蜕变图画大小成功地更新了。 + Equivalent Exchange 3 的颗粒开了 + Equivalent Exchange 3 的颗粒关了 + 播放所有的 Equivalent Exchange 3 的声音 + 播放从自己的 Equivalent Exchange 3 的声音 + 播放全无的 Equivalent Exchange 3 的声音 From 2b7a4156d0f6d305e8c7bc1fe821c940eb40777d Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 13 Jan 2013 21:26:42 -0500 Subject: [PATCH 15/29] Traditional Chinese commands These mirror those made in the Simplified Chinese one. --- resources/com/pahimar/ee3/lang/zh_TW.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/com/pahimar/ee3/lang/zh_TW.xml b/resources/com/pahimar/ee3/lang/zh_TW.xml index 60904711..d987b990 100644 --- a/resources/com/pahimar/ee3/lang/zh_TW.xml +++ b/resources/com/pahimar/ee3/lang/zh_TW.xml @@ -43,4 +43,19 @@ 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 的聲音 From 10e48f292d611cce5beb54fe70e8b141a6216039 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 13 Jan 2013 21:31:38 -0500 Subject: [PATCH 16/29] Updated itemGroup.EE3 for Turkish localization If I'm not mistaken, these should all be in English. --- resources/com/pahimar/ee3/lang/tr_TR.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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@ From 52d9a43ae68cb8386e8cee22a388d9c4d567df26 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 13 Jan 2013 22:08:14 -0500 Subject: [PATCH 17/29] Grammar fix to Chinese (simplified) localization --- resources/com/pahimar/ee3/lang/zh_CN.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/zh_CN.xml b/resources/com/pahimar/ee3/lang/zh_CN.xml index 56b8b01e..db34450c 100644 --- a/resources/com/pahimar/ee3/lang/zh_CN.xml +++ b/resources/com/pahimar/ee3/lang/zh_CN.xml @@ -55,7 +55,7 @@ 目标蜕变图画大小成功地更新了。 Equivalent Exchange 3 的颗粒开了 Equivalent Exchange 3 的颗粒关了 - 播放所有的 Equivalent Exchange 3 的声音 - 播放从自己的 Equivalent Exchange 3 的声音 - 播放全无的 Equivalent Exchange 3 的声音 + 播放着所有的 Equivalent Exchange 3 的声音 + 播放这从自己的 Equivalent Exchange 3 的声音 + 播放这全无的 Equivalent Exchange 3 的声音 From 06aca4ef012831ddecaf1f967d51dbc059e79f17 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 13 Jan 2013 22:09:04 -0500 Subject: [PATCH 18/29] Grammar fix to Chinese (traditional) localization --- resources/com/pahimar/ee3/lang/zh_TW.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/zh_TW.xml b/resources/com/pahimar/ee3/lang/zh_TW.xml index d987b990..56fbb02e 100644 --- a/resources/com/pahimar/ee3/lang/zh_TW.xml +++ b/resources/com/pahimar/ee3/lang/zh_TW.xml @@ -55,7 +55,7 @@ 目標蛻變圖畫大小成功地更新了。 Equivalent Exchange 3 的顆粒開了 Equivalent Exchange 3 的顆粒關了 - 播放所有的 Equivalent Exchange 3 的聲音 - 播放從自己的Equivalent Exchange 3 的聲音 - 播放全無的 Equivalent Exchange 3 的聲音 + 播放著所有的 Equivalent Exchange 3 的聲音 + 播放著從自己的Equivalent Exchange 3 的聲音 + 播放著全無的 Equivalent Exchange 3 的聲音 From fc1ce1d19bb1f71f351c64db8fe468276bc85f35 Mon Sep 17 00:00:00 2001 From: Bram Date: Mon, 14 Jan 2013 09:16:06 +0100 Subject: [PATCH 19/29] Fixed typo --- resources/com/pahimar/ee3/lang/nl_NL.xml | 53 +++++++----------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/nl_NL.xml b/resources/com/pahimar/ee3/lang/nl_NL.xml index 154ebf6c..5e14ff13 100644 --- a/resources/com/pahimar/ee3/lang/nl_NL.xml +++ b/resources/com/pahimar/ee3/lang/nl_NL.xml @@ -42,42 +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 stopt na dire mislukte connectie pogingen + Versiecontrole stopt na drie mislukte connectie pogingen Externe versiecontrole uitgeschakeld, wordt overgeslagen - aan - uit - alle - eigen - overlap - positie - transparantie - schaal - bovenkant - onderkant - links - rechts - deeltjes - geluiden - versie - 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 + Doel transmutatie overlay aangezet + Doel transmutatie overlay uitgezet + Doel transmutatie overlay positie naar links boven gezet + Doel transmutatie overlay positie naar rechts boven gezet + Doel transmutatie overlay positie naar links onder gezet + Doel transmutatie overlay positie naar rechts onder gezet + (waarbij ### een decimale waarde tussen 0.0 en 1.0 is) + Doel transmutatie overlay ondoorzichtigheid succesvol bijgewerkt + (waarbij ### een decimale waarde groter dan 0.0 is) + Doel transmutatie overlay schaal 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 From 5a20a0e21db7fa03be31ae8dd741c233037bc653 Mon Sep 17 00:00:00 2001 From: Bram Date: Mon, 14 Jan 2013 09:16:19 +0100 Subject: [PATCH 20/29] Fixed grammar (subject to discussion) --- resources/com/pahimar/ee3/lang/nl_NL.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/nl_NL.xml b/resources/com/pahimar/ee3/lang/nl_NL.xml index 5e14ff13..38056b79 100644 --- a/resources/com/pahimar/ee3/lang/nl_NL.xml +++ b/resources/com/pahimar/ee3/lang/nl_NL.xml @@ -42,18 +42,18 @@ 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 stopt na drie mislukte connectie pogingen + Versiecontrole gestopt na drie mislukte connectie pogingen Externe versiecontrole uitgeschakeld, wordt overgeslagen - Doel transmutatie overlay aangezet - Doel transmutatie overlay uitgezet - Doel transmutatie overlay positie naar links boven gezet - Doel transmutatie overlay positie naar rechts boven gezet - Doel transmutatie overlay positie naar links onder gezet - Doel transmutatie overlay positie naar rechts onder gezet + 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) - Doel transmutatie overlay ondoorzichtigheid succesvol bijgewerkt + Transparantie transmutatiedoel overlay succesvol bijgewerkt (waarbij ### een decimale waarde groter dan 0.0 is) - Doel transmutatie overlay schaal succesvol bijgewerkt + Schaal transmutatiedoel overlay succesvol bijgewerkt Equivalent Exchange 3 deeltjes aangezet Equivalent Exchange 3 deeltjes uitgezet Equivalent Exchange 3 geluiden worden gespeeld van alle spelers From 647f600cba3dd326e29672e0483456414c76241d Mon Sep 17 00:00:00 2001 From: pahimar Date: Mon, 14 Jan 2013 14:57:12 -0500 Subject: [PATCH 21/29] Fixed a logic derp in the version checker, and hopefully fixed positioning of the overlay for all possible positions. --- .../TransmutationTargetOverlayHandler.java | 16 ++++++++-------- .../pahimar/ee3/core/helper/VersionHelper.java | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) 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/helper/VersionHelper.java b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java index f13c918e..ec2603a9 100644 --- a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java @@ -165,7 +165,7 @@ public class VersionHelper implements Runnable { if (ConfigurationSettings.ENABLE_VERSION_CHECK) { try { - while ((count < Reference.VERSION_CHECK_ATTEMPTS) && ((result != CURRENT) || (result != OUTDATED))) { + while ((count < Reference.VERSION_CHECK_ATTEMPTS) && ((result == UNINITIALIZED) || (result == ERROR))) { checkVersion(); count++; From 6ff6dcfa0d03c5f6979c6a3675e104e6243aea7a Mon Sep 17 00:00:00 2001 From: Wliu Date: Mon, 14 Jan 2013 17:18:44 -0500 Subject: [PATCH 22/29] Update resources/com/pahimar/ee3/lang/zh_CN.xml Spacing, *rough* translation of some more version check stuff, and fixed Pineapple's mistakes. --- resources/com/pahimar/ee3/lang/zh_CN.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/zh_CN.xml b/resources/com/pahimar/ee3/lang/zh_CN.xml index db34450c..8675d0c1 100644 --- a/resources/com/pahimar/ee3/lang/zh_CN.xml +++ b/resources/com/pahimar/ee3/lang/zh_CN.xml @@ -39,23 +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 和 1.0 之间的十进制) 目标蜕变图画不透明度成功地更新了。 - (###是大于 0.0 的) + (### 是大于 0.0 的) 目标蜕变图画大小成功地更新了。 Equivalent Exchange 3 的颗粒开了 Equivalent Exchange 3 的颗粒关了 - 播放着所有的 Equivalent Exchange 3 的声音 - 播放这从自己的 Equivalent Exchange 3 的声音 - 播放这全无的 Equivalent Exchange 3 的声音 + 播放着所有 Equivalent Exchange 3 的声音 + 播放着从自己 Equivalent Exchange 3 的声音 + 播放着全无 Equivalent Exchange 3 的声音 From e4fb0fe06254ec66851333f88a89db7665402826 Mon Sep 17 00:00:00 2001 From: Wliu Date: Mon, 14 Jan 2013 17:19:53 -0500 Subject: [PATCH 23/29] Update resources/com/pahimar/ee3/lang/zh_CN.xml stupid font showing a space when there wasn't one >.> --- resources/com/pahimar/ee3/lang/zh_CN.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/com/pahimar/ee3/lang/zh_CN.xml b/resources/com/pahimar/ee3/lang/zh_CN.xml index 8675d0c1..bc76cdd7 100644 --- a/resources/com/pahimar/ee3/lang/zh_CN.xml +++ b/resources/com/pahimar/ee3/lang/zh_CN.xml @@ -40,7 +40,7 @@ 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@)。 - 新的 @MOD_NAME@ 版本存在 (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 请更新:@MOD_UPDATE_LOCATION@ + 新的 @MOD_NAME@ 版本存在 (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 请更新: @MOD_UPDATE_LOCATION@ 查不了更新的版本(有没有网络?) 没有查更新 目标蜕变图画开了 From 0ca5f57b95e71cdd4c0c74c28925f98451c25448 Mon Sep 17 00:00:00 2001 From: Wliu Date: Mon, 14 Jan 2013 17:20:52 -0500 Subject: [PATCH 24/29] Update resources/com/pahimar/ee3/lang/zh_CN.xml And...deleted periods for consistency. --- resources/com/pahimar/ee3/lang/zh_CN.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/zh_CN.xml b/resources/com/pahimar/ee3/lang/zh_CN.xml index bc76cdd7..9d81c36c 100644 --- a/resources/com/pahimar/ee3/lang/zh_CN.xml +++ b/resources/com/pahimar/ee3/lang/zh_CN.xml @@ -39,7 +39,7 @@ 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@) 新的 @MOD_NAME@ 版本存在 (@REMOTE_MOD_VERSION@) for @MINECRAFT_VERSION@. 请更新: @MOD_UPDATE_LOCATION@ 查不了更新的版本(有没有网络?) 没有查更新 @@ -49,10 +49,10 @@ 目标蜕变图画地点移动到右上角 目标蜕变图画地点移动到左下角 目标蜕变图画地点移动到右下角 - (### 是个介于 0.0 和 1.0 之间的十进制) - 目标蜕变图画不透明度成功地更新了。 + (### 是个介于 0.0 和 1.0 之间的十进制) + 目标蜕变图画不透明度成功地更新了 (### 是大于 0.0 的) - 目标蜕变图画大小成功地更新了。 + 目标蜕变图画大小成功地更新了 Equivalent Exchange 3 的颗粒开了 Equivalent Exchange 3 的颗粒关了 播放着所有 Equivalent Exchange 3 的声音 From 09f74323f1b79c739094beecf72aa07b09ca6042 Mon Sep 17 00:00:00 2001 From: Wliu Date: Tue, 15 Jan 2013 18:41:34 -0500 Subject: [PATCH 25/29] Update README.md PSA: UPDATE TO JAVA 7u11! THIS FIXES A MAJOR EXPLOIT! Minor additions/changes, added latest version link. --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bc1dd697..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 +**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. @@ -64,18 +64,18 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively * Open it up with any text editor, and type into it the following (fully customizable except for `dir.development`): * `dir.development=../../` * `dir.release=Releases` - * `release.minecraft.version=1.4.7` (as of 1/10) + * `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). From 1d4f3d5b658fea6b105020759f1deb2b4447f4d9 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 16 Jan 2013 19:07:21 -0500 Subject: [PATCH 26/29] Traditional Chinese localization update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alright, alright, 50Wliu, you win. No 的. :P Just mirroring the changes he made to the simplified localization- spaces and removed periods for consistency, and that little 的 issue.  --- resources/com/pahimar/ee3/lang/zh_TW.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/com/pahimar/ee3/lang/zh_TW.xml b/resources/com/pahimar/ee3/lang/zh_TW.xml index 56fbb02e..8eeee35c 100644 --- a/resources/com/pahimar/ee3/lang/zh_TW.xml +++ b/resources/com/pahimar/ee3/lang/zh_TW.xml @@ -39,7 +39,7 @@ 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 @@ -49,13 +49,13 @@ 目標蛻變圖畫地點移動到右上角 目標蛻變圖畫地點移動到左下角 目標蛻變圖畫地點移動到右下角 - (###是個介於 0.0 和 1.0 之間的十進制) - 目標蛻變圖畫不透明度成功地更新了。 - (###是大於 0.0 的) - 目標蛻變圖畫大小成功地更新了。 + (### 是個介於 0.0 和 1.0 之間的十進制) + 目標蛻變圖畫不透明度成功地更新了 + (### 是大於 0.0 的) + 目標蛻變圖畫大小成功地更新了 Equivalent Exchange 3 的顆粒開了 Equivalent Exchange 3 的顆粒關了 - 播放著所有的 Equivalent Exchange 3 的聲音 - 播放著從自己的Equivalent Exchange 3 的聲音 - 播放著全無的 Equivalent Exchange 3 的聲音 + 播放著所有 Equivalent Exchange 3 的聲音 + 播放著從自己 Equivalent Exchange 3 的聲音 + 播放著全無 Equivalent Exchange 3 的聲音 From 21dd30b42abf153266005418bf6dc7e312570075 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 17 Jan 2013 20:20:04 -0500 Subject: [PATCH 27/29] Removal of unused commands in pt_BR localization --- resources/com/pahimar/ee3/lang/pt_BR.xml | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) 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 + From d16887932e5506c6ecff2738d349b0fc7ec6717e Mon Sep 17 00:00:00 2001 From: pahimar Date: Thu, 17 Jan 2013 22:36:35 -0500 Subject: [PATCH 28/29] Solved Minium/Philosopher stone taking damage on world block transmutation, while also respecting EE3 world block protection. Yay! --- .../handlers/WorldTransmutationHandler.java | 22 ++++++-- .../com/pahimar/ee3/lib/ItemUpdateTypes.java | 7 +++ .../ee3/network/PacketTypeHandler.java | 4 +- .../ee3/network/packet/PacketItemUpdate.java | 54 +++++++++++++++++++ 4 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 ee3_common/com/pahimar/ee3/lib/ItemUpdateTypes.java create mode 100644 ee3_common/com/pahimar/ee3/network/packet/PacketItemUpdate.java diff --git a/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java index ecf54ebd..3732008d 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,24 @@ 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); + } } else { event.actionResult = ActionResult.FAILURE; 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/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..ce1f574e --- /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 isDestroyed) { + + super(PacketTypeHandler.ITEM_UPDATE, false); + this.slot = slot; + this.updateType = isDestroyed; + } + + 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); + } + } +} From 56edefb8d28ed09ccc0456ccdac34d979622bc0d Mon Sep 17 00:00:00 2001 From: pahimar Date: Fri, 18 Jan 2013 16:12:27 -0500 Subject: [PATCH 29/29] Stones make the "break" noise when they are used up during world block transmutation --- .../core/handlers/WorldTransmutationHandler.java | 1 + .../com/pahimar/ee3/item/ItemMiniumStone.java | 16 ++++++++-------- .../ee3/network/packet/PacketItemUpdate.java | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java index 3732008d..9bbd79f9 100644 --- a/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java @@ -163,6 +163,7 @@ public class WorldTransmutationHandler { 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 { 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/network/packet/PacketItemUpdate.java b/ee3_common/com/pahimar/ee3/network/packet/PacketItemUpdate.java index ce1f574e..8b0cfb35 100644 --- a/ee3_common/com/pahimar/ee3/network/packet/PacketItemUpdate.java +++ b/ee3_common/com/pahimar/ee3/network/packet/PacketItemUpdate.java @@ -23,11 +23,11 @@ public class PacketItemUpdate extends PacketEE { super(PacketTypeHandler.ITEM_UPDATE, false); } - public PacketItemUpdate(byte slot, byte isDestroyed) { + public PacketItemUpdate(byte slot, byte updateType) { super(PacketTypeHandler.ITEM_UPDATE, false); this.slot = slot; - this.updateType = isDestroyed; + this.updateType = updateType; } public void writeData(DataOutputStream data) throws IOException {