From b1f15e00500e8e5bfa5346403259b3e08acdaeab Mon Sep 17 00:00:00 2001 From: Minerman Date: Wed, 7 Nov 2012 11:09:48 -0500 Subject: [PATCH 01/28] Fixing minor Auto-detected smelting issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Auto-detected portable smelting recipes should now take into account the output number of the recipe. Example here (Wheat Block smelts to 3 Bread each) : http://puu.sh/1nuLD --- ee3_common/ee3/common/core/helper/RecipeHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee3_common/ee3/common/core/helper/RecipeHelper.java b/ee3_common/ee3/common/core/helper/RecipeHelper.java index b4261d9d..5debf90b 100644 --- a/ee3_common/ee3/common/core/helper/RecipeHelper.java +++ b/ee3_common/ee3/common/core/helper/RecipeHelper.java @@ -142,7 +142,7 @@ public class RecipeHelper { for (int i = 2; i < 9; i++) list[i] = new ItemStack(input.getItem(), 1, input.getItemDamage()); - GameRegistry.addShapelessRecipe(new ItemStack(result.getItem(), 7, result.getItemDamage()), list); + GameRegistry.addShapelessRecipe(new ItemStack(result.getItem(), (result.stackSize*7), result.getItemDamage()), list); } } From 99b53e0ddc011d8f834be0fd94af11bd09ecf324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9BAZ27?= Date: Wed, 7 Nov 2012 22:34:07 +0600 Subject: [PATCH 02/28] JAFU --- resources/ee3/lang/ru_RU.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/ee3/lang/ru_RU.xml b/resources/ee3/lang/ru_RU.xml index d649b7bc..caefa529 100644 --- a/resources/ee3/lang/ru_RU.xml +++ b/resources/ee3/lang/ru_RU.xml @@ -10,10 +10,19 @@ Инертный Камень Сурик Философский Камень + Пепел + Пыль Сурика + Изумрудная Пыль + Лазурная Пыль + Пурпурная Пыль + Радужная Пыль Красная Вода (Стоящая) Красная Вода (Текущая) Кальцинатор Кальцинатор + Equivalent Exchange 3 + Нечистый + Чистый Инициализация проверки версии в удаленном файле, находящемся на Проверка версии не была завершена успешно (проверка версии не инициализирована правильно) Вы используете самую последнюю версию для вашей версии Minecraft From b0d0e13a2228f8f9d4033c2bf3ec6f10e6361bc4 Mon Sep 17 00:00:00 2001 From: pahimar Date: Wed, 7 Nov 2012 13:32:34 -0500 Subject: [PATCH 03/28] Proper fix for Pull #75 --- ee3_common/ee3/common/core/helper/RecipeHelper.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ee3_common/ee3/common/core/helper/RecipeHelper.java b/ee3_common/ee3/common/core/helper/RecipeHelper.java index 5debf90b..e2a169dd 100644 --- a/ee3_common/ee3/common/core/helper/RecipeHelper.java +++ b/ee3_common/ee3/common/core/helper/RecipeHelper.java @@ -139,10 +139,16 @@ public class RecipeHelper { list[0] = stone; list[1] = fuel; - for (int i = 2; i < 9; i++) + for (int i = 2; i < 9; i++) { list[i] = new ItemStack(input.getItem(), 1, input.getItemDamage()); + } - GameRegistry.addShapelessRecipe(new ItemStack(result.getItem(), (result.stackSize*7), result.getItemDamage()), list); + if (result.stackSize * 7 <= result.getItem().getItemStackLimit()) { + GameRegistry.addShapelessRecipe(new ItemStack(result.getItem(), (result.stackSize*7), result.getItemDamage()), list); + } + else { + GameRegistry.addShapelessRecipe(new ItemStack(result.getItem(), result.getItem().getItemStackLimit(), result.getItemDamage()), list); + } } } From 235403a67dc2fb335b1f53dd4a789e0ec27cb88d Mon Sep 17 00:00:00 2001 From: Bram Van der Sype Date: Fri, 9 Nov 2012 23:04:51 +0100 Subject: [PATCH 04/28] Updated Dutch translations Added the latest lines, updated a few older ones. --- resources/ee3/lang/nl_NL.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/ee3/lang/nl_NL.xml b/resources/ee3/lang/nl_NL.xml index ee1acef0..b0d0fb5b 100644 --- a/resources/ee3/lang/nl_NL.xml +++ b/resources/ee3/lang/nl_NL.xml @@ -7,13 +7,23 @@ Wissel Opladen Minium Scherf + Inerte Steen Minium Steen Steen der Wijzen + As + Minium Stof + Helgroen Stof + Azuurblauw Stof + Amarant Stof + Iriserend Stof Rood Water (Stilstaand) Rood Water (Vloeiend) Calcinator Calcinator - Initialisatie versiecontrole tegen extern versie bestand, te vinden op + Equivalent Exchange 3 + Onpuur + Puur + Start versiecontrole tegen extern versiebestand, te vinden op De versiecontrole is niet geslaagd (versiecontrole niet correct gestart) Je gebruikt momenteel de meest recente versie voor jouw Minecraft versie Je gebruikt momenteel een verouderde versie; overweeg om up te daten - http://goo.gl/Ria2V From 1d0d954b7746615c22275619549424b71bd8c187 Mon Sep 17 00:00:00 2001 From: aritzhack Date: Sun, 11 Nov 2012 17:10:14 +0100 Subject: [PATCH 05/28] Updated spanish translation on 11/11/2012 Signed-off-by: aritzhack --- resources/ee3/lang/es_ES.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/ee3/lang/es_ES.xml b/resources/ee3/lang/es_ES.xml index 02bfc87c..701a27ac 100644 --- a/resources/ee3/lang/es_ES.xml +++ b/resources/ee3/lang/es_ES.xml @@ -10,10 +10,19 @@ Piedra Inerte Piedra de Minio Piedra Filosofal + Ceniza + Polvo de Minio + Polvo verdante + Polvo azur + Polvo purpúreo + Polvo iridiscente Agua Roja (Quieta) Agua Roja (Fluyendo) Calcinador Calcinador + Equivalent Exchange 3 + Impuro + Puro 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 más actualizada para tu versión de Minecraft From 55ca9beef5805a1acb27dabb87db135b9b30e5fe Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 15 Nov 2012 17:17:33 -0500 Subject: [PATCH 06/28] Added README.md Nothing in it yet, going to change it on Github (online). --- README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..e69de29b From 4f64ae9fc8b0bd18ab2dc4c0a9189a9ddf4938d5 Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 15 Nov 2012 17:31:12 -0500 Subject: [PATCH 07/28] Make README.md Making a Readme for EE3, this is not done yet! --- README.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/README.md b/README.md index e69de29b..d8f12a9c 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,19 @@ +## Welcome to Equivalent Exchange 3! + +The MinecraftForum page can be found [here] (www.minecraftforum.net/topic/1540010-equivalent-exchange-3). + +### Compiling Equivalent Exchange 3 + +#### Setup MCP +1. Create an empty directory for EE3 development. This directory is referenced as mcdev from now on +2. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases) , e.g. mcp719.zip. Install MCP dependencies as listed on the website if neccessary. +3. Install Apache Ant [here] (ant.apache.org.) +3. Inside mcdev, create a directory named mcp and unzip the MCP ZIP file into it +4. To verify, check if a file name CHANGELOG exists inside the mcp directory. +5. Get a clean (unmodded!) copy of minecraft. Currently EE3 runs on 1.4.2 but that might have changed. +6. From your .minecraft directory, copy the bin and the resources directory to the jars directory inside the mcp directory. +7. Get a clean (unmodded!) copy of minecraft_server.jar and also place it into the jars directory inside mcp +8. Download the latest forge source for Minecraft 1.4.2 and unzip it into the mcp directory so that mcp/forge/install.sh exists. You need at least Forge 6.0.1, best way is to get it from [here] (http://files.minecraftforge.net/): http://files.minecraftforge.net/ NOTE: 6.0.1.355 was the last version to support 1.4.2, do not get anything later than that for 1.4.2 versions of EE3! +9. Execute mcp/forge/install.sh or mcp/forge/install.cmd, depending on your platform. 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. + +#### Setup EE3 \ No newline at end of file From f9cfa9d0da39e32306edc5307653241c9f9ece05 Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 15 Nov 2012 17:46:46 -0500 Subject: [PATCH 08/28] Test test --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d8f12a9c..6ce7b740 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The MinecraftForum page can be found [here] (www.minecraftforum.net/topic/1540010-equivalent-exchange-3). ### Compiling Equivalent Exchange 3 - +____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________ #### Setup MCP 1. Create an empty directory for EE3 development. This directory is referenced as mcdev from now on 2. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases) , e.g. mcp719.zip. Install MCP dependencies as listed on the website if neccessary. From dc5fb94fcdd52b6365ddd23d515b2334ce56f3ff Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 15 Nov 2012 17:50:51 -0500 Subject: [PATCH 09/28] Continue README.md Continuing Readme, trying out new stuff. --- README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6ce7b740..c8cbaea6 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ ## Welcome to Equivalent Exchange 3! -The MinecraftForum page can be found [here] (www.minecraftforum.net/topic/1540010-equivalent-exchange-3). +The Minecraft Forums page can be found [here] (www.minecraftforum.net/topic/1540010-equivalent-exchange-3). ### Compiling Equivalent Exchange 3 ____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________ #### Setup MCP -1. Create an empty directory for EE3 development. This directory is referenced as mcdev from now on +1. Create an empty directory for EE3 development. This directory is referenced as 'mcdev' from now on 2. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases) , e.g. mcp719.zip. Install MCP dependencies as listed on the website if neccessary. 3. Install Apache Ant [here] (ant.apache.org.) 3. Inside mcdev, create a directory named mcp and unzip the MCP ZIP file into it @@ -16,4 +16,9 @@ ________________________________________________________________________________ 8. Download the latest forge source for Minecraft 1.4.2 and unzip it into the mcp directory so that mcp/forge/install.sh exists. You need at least Forge 6.0.1, best way is to get it from [here] (http://files.minecraftforge.net/): http://files.minecraftforge.net/ NOTE: 6.0.1.355 was the last version to support 1.4.2, do not get anything later than that for 1.4.2 versions of EE3! 9. Execute mcp/forge/install.sh or mcp/forge/install.cmd, depending on your platform. 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. -#### Setup EE3 \ No newline at end of file +#### Setup EE3 +1. Inside the mcdev directory, create a directory named source. Clone EE3 into this directory. +2. Inside sources/Equivalent-Exchange-3 execute ant build -Ddir.development=../../ . If you've done everything right, BUILD SUCCESSFUL is displayed. +3. Execute ant recompile -Ddir.development=../../ +4. Execute ant reobfuscate -Ddir.development=../../ +5. If you've done everything right AND the source code currently compiles, you can execute startclient.sh or startclient.bat inside the mcp directory now to start Minecraft with EE3. From 04dba4a2366ca9ea9176ddea77659e2a9eca8abb Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 15 Nov 2012 17:58:54 -0500 Subject: [PATCH 10/28] Continue README.md Finished it, fixed some stuff. --- README.md | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c8cbaea6..a73311d6 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,27 @@ ## Welcome to Equivalent Exchange 3! - +The Compilation part (Setup) was done mostly by Minalien, I just changed it a bit. The Minecraft Forums page can be found [here] (www.minecraftforum.net/topic/1540010-equivalent-exchange-3). ### Compiling Equivalent Exchange 3 +IMPORTANT: This is not guaranteed to work as it has not been tested extensively (only done on Linux so far, partly on Windows). ____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________ #### Setup MCP -1. Create an empty directory for EE3 development. This directory is referenced as 'mcdev' from now on +1. Create an empty directory for EE3 development. This directory is referenced as `mcdev` from now on 2. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases) , e.g. mcp719.zip. Install MCP dependencies as listed on the website if neccessary. 3. Install Apache Ant [here] (ant.apache.org.) -3. Inside mcdev, create a directory named mcp and unzip the MCP ZIP file into it -4. To verify, check if a file name CHANGELOG exists inside the mcp directory. +3. Inside `mcdev`, create a directory named `mcp` and unzip the MCP ZIP file into it +4. To verify, check if a file name `CHANGELOG` exists inside the mcp directory. 5. Get a clean (unmodded!) copy of minecraft. Currently EE3 runs on 1.4.2 but that might have changed. -6. From your .minecraft directory, copy the bin and the resources directory to the jars directory inside the mcp directory. -7. Get a clean (unmodded!) copy of minecraft_server.jar and also place it into the jars directory inside mcp -8. Download the latest forge source for Minecraft 1.4.2 and unzip it into the mcp directory so that mcp/forge/install.sh exists. You need at least Forge 6.0.1, best way is to get it from [here] (http://files.minecraftforge.net/): http://files.minecraftforge.net/ NOTE: 6.0.1.355 was the last version to support 1.4.2, do not get anything later than that for 1.4.2 versions of EE3! -9. Execute mcp/forge/install.sh or mcp/forge/install.cmd, depending on your platform. 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. +6. From your .minecraft directory, copy the bin and the resources directory to the `jars` directory inside `mcp`. +7. Get a clean (unmodded!) copy of minecraft_server.jar and also place it into `jars`. +8. Download the latest forge source for Minecraft 1.4.2 and unzip it into `mcp` so that `mcp/forge/install.sh` exists. You need at least Forge 6.0.1, best way is to get it from [here] (http://files.minecraftforge.net/): http://files.minecraftforge.net/ NOTE: 6.0.1.355 was the last version to support 1.4.2, do not get anything later than that for 1.4.2 versions of EE3! +9. Execute `mcdev/mcp/forge/install.sh` or `mcp/forge/install.cmd`, depending on your platform. 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. #### Setup EE3 -1. Inside the mcdev directory, create a directory named source. Clone EE3 into this directory. -2. Inside sources/Equivalent-Exchange-3 execute ant build -Ddir.development=../../ . If you've done everything right, BUILD SUCCESSFUL is displayed. -3. Execute ant recompile -Ddir.development=../../ -4. Execute ant reobfuscate -Ddir.development=../../ +1. Inside `mcdev`, create a directory named `source`. Clone EE3 into this directory. +2. [FOR WINDOWS] Open up cmd. Type `cmd` in Run. +3. [FOR WINDOWS] Navigate to `mcdev\source` by executing `cd [wherever your mcdev is located, just copy and paste the path in]`. +2. Inside `sources\Equivalent-Exchange-3` execute `ant build -Ddir.development=../../`. If you've done everything right, BUILD SUCCESSFUL is displayed. +3. Execute `ant recompile -Ddir.development=../../`. +4. Execute `ant reobfuscate -Ddir.development=../../`. 5. If you've done everything right AND the source code currently compiles, you can execute startclient.sh or startclient.bat inside the mcp directory now to start Minecraft with EE3. From 5f74ed828c19beea2e5f86af52643bc9167d6789 Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 15 Nov 2012 17:59:54 -0500 Subject: [PATCH 11/28] Update README.md Forgot a period :3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a73311d6..65752385 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The Minecraft Forums page can be found [here] (www.minecraftforum.net/topic/1540 IMPORTANT: This is not guaranteed to work as it has not been tested extensively (only done on Linux so far, partly on Windows). ____________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________ #### Setup MCP -1. Create an empty directory for EE3 development. This directory is referenced as `mcdev` from now on +1. Create an empty directory for EE3 development. This directory is referenced as `mcdev` from now on. 2. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases) , e.g. mcp719.zip. Install MCP dependencies as listed on the website if neccessary. 3. Install Apache Ant [here] (ant.apache.org.) 3. Inside `mcdev`, create a directory named `mcp` and unzip the MCP ZIP file into it From 30bbb3d02e563e11901a4535cf4ed3ef5c6fe015 Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 15 Nov 2012 18:00:46 -0500 Subject: [PATCH 12/28] Update README.md Gave some credit to BuildCraft's README.md file. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65752385..a2c29fcd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## Welcome to Equivalent Exchange 3! -The Compilation part (Setup) was done mostly by Minalien, I just changed it a bit. +The Compilation part (Setup) was done mostly by Minalien, I just changed it a bit. Some credit goes to BuildCraft's README.md, which I based this README off of. The Minecraft Forums page can be found [here] (www.minecraftforum.net/topic/1540010-equivalent-exchange-3). ### Compiling Equivalent Exchange 3 From 2ee63ca5ff74c0127bfe8bd95a0c304864d5c8c9 Mon Sep 17 00:00:00 2001 From: Wliu Date: Thu, 15 Nov 2012 18:01:05 -0500 Subject: [PATCH 13/28] Update README.md Added a enter. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a2c29fcd..914f8211 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ## Welcome to Equivalent Exchange 3! The Compilation part (Setup) was done mostly by Minalien, I just changed it a bit. Some credit goes to BuildCraft's README.md, which I based this README off of. + The Minecraft Forums page can be found [here] (www.minecraftforum.net/topic/1540010-equivalent-exchange-3). ### Compiling Equivalent Exchange 3 From 818f76481cd64522d912d845c7d1811672293cb6 Mon Sep 17 00:00:00 2001 From: TJ Date: Thu, 15 Nov 2012 17:12:18 -0800 Subject: [PATCH 14/28] Adding localization Localization for latin --- resources/ee3/lang/la_IT.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 resources/ee3/lang/la_IT.xml diff --git a/resources/ee3/lang/la_IT.xml b/resources/ee3/lang/la_IT.xml new file mode 100644 index 00000000..e3b8c4f7 --- /dev/null +++ b/resources/ee3/lang/la_IT.xml @@ -0,0 +1,32 @@ + + + + English (US) Localization File + Extra + Libere + Mutare + Tradere + Pars Rufi Plumbi + Ignavus Lapidus + Pars Rufi Lapidus + Lapis Philosophi + Fraxinus + Afa Rufi Plumbi + Viridis Afae + Caeruleus Afae + Amarantus Afae + Iris Afae + Rufi Aqua (Residans) + Rufi Aqua (Fluens) + Auctor Calcus + Auctor Calcus + Aequipollens Conlubi Trium + Spurcus + Purum + Incipiens senecti quaesitum contra procul senecti auctoritatis scapus, positus ad + Senecti quaesitum non adimplet cum fortuna (Senecti quaestim non incipit recte) + Iam abutas the most novellissimus senectus tuo senecto Meiarti(Minecraft) + Iam abutas non tempore senectus; Consule hic afferte hodie - http://goo.gl/Ria2V + Erratum annectans ad procul senecto auctoritatis scapus (Scisa tuum retiacula ad invicem nexus?) + Procul senectus debilitatus, neglectens + From 5edc78124739557517a267ae8be1834b4b666312 Mon Sep 17 00:00:00 2001 From: TJ Date: Fri, 16 Nov 2012 14:44:53 -0800 Subject: [PATCH 15/28] correction --- resources/ee3/lang/la_IT.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ee3/lang/la_IT.xml b/resources/ee3/lang/la_IT.xml index e3b8c4f7..f4185690 100644 --- a/resources/ee3/lang/la_IT.xml +++ b/resources/ee3/lang/la_IT.xml @@ -1,7 +1,7 @@  - English (US) Localization File + Latina (Italia) Lingua Scapi Extra Libere Mutare From b250509962be6beffbe0539c5712871115ef9d95 Mon Sep 17 00:00:00 2001 From: pahimar Date: Mon, 19 Nov 2012 19:49:39 -0500 Subject: [PATCH 16/28] Update to MC 1.4.5b (nothing needed to be done), re-implement colour overlays, reduce the number of dusts --- .../ee3/common/item/ItemAlchemyDust.java | 21 +++++------------- .../ee3/common/item/ItemMiniumStone.java | 7 +++--- .../ee3/common/item/ItemPhilosopherStone.java | 2 +- resources/ee3/art/sprites/ee3_items.png | Bin 8904 -> 6841 bytes resources/ee3/art/sprites/xcf/ee3_items.xcf | Bin 41888 -> 33717 bytes 5 files changed, 11 insertions(+), 19 deletions(-) diff --git a/ee3_common/ee3/common/item/ItemAlchemyDust.java b/ee3_common/ee3/common/item/ItemAlchemyDust.java index 8734af83..7aaa1bbe 100644 --- a/ee3_common/ee3/common/item/ItemAlchemyDust.java +++ b/ee3_common/ee3/common/item/ItemAlchemyDust.java @@ -45,24 +45,15 @@ public class ItemAlchemyDust extends ItemEE { } public String getItemNameIS(ItemStack stack) { - int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11); - return super.getItemName() + "." + alchemyDustNames[meta / 2]; + int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 5); + return super.getItemName() + "." + alchemyDustNames[meta]; } - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { - int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11); - - String key = (meta % 2 == 0) ? Strings.TEXT_IMPURE : Strings.TEXT_PURE; - - list.add(LanguageRegistry.instance().getStringLocalization(key)); - } - @SideOnly(Side.CLIENT) public boolean hasEffect(ItemStack stack) { - int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11); + int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 5); - if (meta >= 10) { + if (meta == 5) { return true; } else { @@ -74,7 +65,7 @@ public class ItemAlchemyDust extends ItemEE { public EnumRarity getRarity(ItemStack stack) { int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 11); - switch(meta / 2) { + switch(meta) { case 0: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.NORMAL); case 1: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.NORMAL); case 2: return EquivalentExchange3.proxy.getCustomRarityType(CustomItemRarity.UNCOMMON); @@ -89,7 +80,7 @@ public class ItemAlchemyDust extends ItemEE { @SideOnly(Side.CLIENT) public void getSubItems(int id, CreativeTabs creativeTab, List list) { - for (int meta = 0; meta < 12; ++meta) { + for (int meta = 0; meta < 6; ++meta) { list.add(new ItemStack(id, 1, meta)); } } diff --git a/ee3_common/ee3/common/item/ItemMiniumStone.java b/ee3_common/ee3/common/item/ItemMiniumStone.java index 4e493127..5d20b384 100644 --- a/ee3_common/ee3/common/item/ItemMiniumStone.java +++ b/ee3_common/ee3/common/item/ItemMiniumStone.java @@ -32,7 +32,7 @@ public class ItemMiniumStone extends ItemEE implements ITransmutationStone { public ItemMiniumStone(int id) { super(id); - this.setIconCoord(2, 0); + this.setIconCoord(1, 0); this.setItemName(Strings.MINIUM_STONE_NAME); this.setCreativeTab(EquivalentExchange3.tabsEE3); this.setMaxDamage(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY - 1); @@ -72,8 +72,9 @@ public class ItemMiniumStone extends ItemEE implements ITransmutationStone { } @SideOnly(Side.CLIENT) - public boolean hasEffect(ItemStack stack) { - return false; + public int getColorFromItemStack(ItemStack par1ItemStack, int par2) + { + return Integer.parseInt(Colours.PURE_RED, 16); } @Override diff --git a/ee3_common/ee3/common/item/ItemPhilosopherStone.java b/ee3_common/ee3/common/item/ItemPhilosopherStone.java index dd910d70..04ac9fbf 100644 --- a/ee3_common/ee3/common/item/ItemPhilosopherStone.java +++ b/ee3_common/ee3/common/item/ItemPhilosopherStone.java @@ -34,7 +34,7 @@ public class ItemPhilosopherStone extends ItemEE public ItemPhilosopherStone(int id) { super(id); - this.setIconCoord(3, 0); + this.setIconCoord(2, 0); this.setItemName(Strings.PHILOSOPHER_STONE_NAME); this.setCreativeTab(EquivalentExchange3.tabsEE3); this.maxChargeLevel = 4; diff --git a/resources/ee3/art/sprites/ee3_items.png b/resources/ee3/art/sprites/ee3_items.png index 9a368892e400c11bf7d5c126fa3b4600f5af44da..0294c74aa960cc49f4efe5b3f9eb06460db3c56f 100644 GIT binary patch literal 6841 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 KCsmK_-~A6vm6!ei diff --git a/resources/ee3/art/sprites/xcf/ee3_items.xcf b/resources/ee3/art/sprites/xcf/ee3_items.xcf index 2906c8674a4421fea8c4a92d27aa124534d02211..85bb27481dbd865929b67a1fad1aca6568427551 100644 GIT binary patch delta 4414 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 delta 10271 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 From 41c715bb0d86cff49b79fa655891a033432b7daf Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 20 Nov 2012 13:05:07 -0500 Subject: [PATCH 17/28] Trying something different with the remote version check - moving it to the GitHub repo --- version.xml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 version.xml diff --git a/version.xml b/version.xml new file mode 100644 index 00000000..81e01f84 --- /dev/null +++ b/version.xml @@ -0,0 +1,6 @@ + + + + Version lookup for Equivalent Exchange 3 + EE3|pre2|http://goo.gl/Ria2V + \ No newline at end of file From e0783ef4b5575f1222bc0527ea6a138839d128fb Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 20 Nov 2012 13:49:48 -0500 Subject: [PATCH 18/28] Channel name was an unnecessary field --- version.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.xml b/version.xml index 81e01f84..328e1458 100644 --- a/version.xml +++ b/version.xml @@ -2,5 +2,5 @@ Version lookup for Equivalent Exchange 3 - EE3|pre2|http://goo.gl/Ria2V + pre2|http://goo.gl/Ria2V \ No newline at end of file From 01304fb4c45b8926788e6756a28a29ac8fd51b3a Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 20 Nov 2012 14:42:39 -0500 Subject: [PATCH 19/28] Refactored the remote version check to check against the GitHub repo instead of my DropBox folder, added some colourized text to the result message on the client, and reformatted some of the localization. --- .../handlers/VersionCheckTickHandler.java | 70 +++--- .../ee3/common/core/helper/VersionHelper.java | 236 ++++++++++-------- ee3_common/ee3/common/lib/Colours.java | 4 +- .../ee3/common/lib/CustomItemRarity.java | 2 +- ee3_common/ee3/common/lib/Reference.java | 8 +- ee3_common/ee3/common/lib/Strings.java | 10 +- resources/ee3/lang/en_US.xml | 12 +- 7 files changed, 188 insertions(+), 154 deletions(-) diff --git a/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java b/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java index 6608c45a..ce264c86 100644 --- a/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java +++ b/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java @@ -4,7 +4,9 @@ import java.util.EnumSet; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.ITickHandler; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.TickType; +import cpw.mods.fml.common.registry.LanguageRegistry; import ee3.common.core.helper.VersionHelper; import ee3.common.lib.Colours; import ee3.common.lib.ConfigurationSettings; @@ -13,7 +15,8 @@ import ee3.common.lib.Reference; /** * VersionCheckTickHandler * - * Class for notifying the player on their client when they get in game the outcome of the remote version check + * Class for notifying the player on their client when they get in game the + * outcome of the remote version check * * @author pahimar * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) @@ -21,37 +24,42 @@ import ee3.common.lib.Reference; */ public class VersionCheckTickHandler implements ITickHandler { - private static boolean initialized = false; - - @Override - public void tickStart(EnumSet type, Object... tickData) { } + private static boolean initialized = false; - @Override - public void tickEnd(EnumSet type, Object... tickData) { - if (ConfigurationSettings.ENABLE_VERSION_CHECK) { - if (!initialized) { - for (TickType tickType : type) { - if (tickType == TickType.CLIENT) { - if (FMLClientHandler.instance().getClient().currentScreen == null) { - initialized = true; - if (VersionHelper.result != VersionHelper.CURRENT){ - FMLClientHandler.instance().getClient().ingameGUI.getChatGUI().printChatMessage(Colours.VERSION_CHECK_PREFIX + "[" + Reference.MOD_NAME + "] " + VersionHelper.getResultMessage()); - } - } - } - } - } - } - } + @Override + public void tickStart(EnumSet type, Object... tickData) { - @Override - public EnumSet ticks() { - return EnumSet.of(TickType.CLIENT); - } + } + + @Override + public void tickEnd(EnumSet type, Object... tickData) { + + if (ConfigurationSettings.ENABLE_VERSION_CHECK) { + if (!initialized) { + 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()); + } + } + } + } + } + } + } + + @Override + public EnumSet ticks() { + + return EnumSet.of(TickType.CLIENT); + } + + @Override + public String getLabel() { + + return Reference.MOD_NAME + ": " + this.getClass().getSimpleName(); + } - @Override - public String getLabel() { - return Reference.MOD_NAME + ": " + this.getClass().getSimpleName(); - } - } diff --git a/ee3_common/ee3/common/core/helper/VersionHelper.java b/ee3_common/ee3/common/core/helper/VersionHelper.java index 48d39417..37e67e00 100644 --- a/ee3_common/ee3/common/core/helper/VersionHelper.java +++ b/ee3_common/ee3/common/core/helper/VersionHelper.java @@ -1,131 +1,151 @@ package ee3.common.core.helper; -import java.io.BufferedReader; -import java.io.InputStreamReader; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; +import java.util.Properties; import java.util.logging.Level; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.LanguageRegistry; +import ee3.common.lib.Colours; import ee3.common.lib.ConfigurationSettings; import ee3.common.lib.Reference; +import ee3.common.lib.Strings; /** * VersionHelper * - * Contains methods for checking the version of the currently running instance of the mod against a remote version number authority. - * Meant to help users by notifying them if they are behind the latest published version of the mod + * Contains methods for checking the version of the currently running instance + * of the mod against a remote version number authority. Meant to help users by + * notifying them if they are behind the latest published version of the mod * * @author pahimar * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ public class VersionHelper { - - // The (publicly available) remote version number authority file - private static final String REMOTE_VERSION_FILE = "https://dl.dropbox.com/u/25591134/EE3/version.txt"; - - // All possible results of the remote version number check - public static final byte UNINITIALIZED = 0; - public static final byte CURRENT = 1; - public static final byte OUTDATED = 2; - public static final byte CONNECTION_ERROR = 3; - - // Localization keys - private static final String VERSION_CHECK_DISABLED = "version.check_disabled"; - private static final String VERSION_CHECK_INIT_LOG_MESSAGE = "version.init_log_message"; - private static final String UNINITIALIZED_MESSAGE = "version.uninitialized"; - private static final String CURRENT_MESSAGE = "version.current"; - private static final String OUTDATED_MESSAGE = "version.outdated"; - private static final String CONNECTION_ERROR_MESSAGE = "version.connection_error"; - // Var to hold the result of the remote version check, initially set to uninitialized - public static byte result = UNINITIALIZED; - - /*** - * Checks the version of the currently running instance of the mod against the remote version authority, and sets the result of the check appropriately - */ - public static void checkVersion() { - try { - URL url = new URL(REMOTE_VERSION_FILE); - - InputStreamReader isr = new InputStreamReader(url.openStream()); - BufferedReader reader = new BufferedReader(isr); - - String line = null; - - // While we are not at the end of the file, fetch the next line in the file - while ((line = reader.readLine()) != null) { - // If the current line is for this version of Minecraft, read further - if (line.startsWith(Loader.instance().getMCVersionString())) { - // If the current line is also for this mod, read further - if (line.contains(Reference.CHANNEL_NAME)) { - // If the current line is also the same as the running version of the mod, set the result appropriately - if (line.endsWith(Reference.VERSION)) { - // Set the version check result to CURRENT - result = CURRENT; - - // Close the associated network resources - reader.close(); - isr.close(); - - return; - } - } - } - } - - // Since this mod version is not the current version, set the version check appropriately - result = OUTDATED; - - // Close the associated network resources - reader.close(); - isr.close(); - } catch (Exception e) { - // If we cannot connect to the remote version number authority, set the version check appropriately - e.printStackTrace(System.err); - result = CONNECTION_ERROR; - } - - } - - public static void logResult() { - if (ConfigurationSettings.ENABLE_VERSION_CHECK) { - LogHelper.log(Level.INFO, LanguageRegistry.instance().getStringLocalization(VERSION_CHECK_INIT_LOG_MESSAGE) + " " + REMOTE_VERSION_FILE); - if ((result == CURRENT) || (result == OUTDATED)) { - LogHelper.log(Level.INFO, getResultMessage()); - } - else { - LogHelper.log(Level.WARNING, getResultMessage()); - } - } - else { - LogHelper.log(Level.INFO, getResultMessage()); - } - } - - public static String getResultMessage() { - if (ConfigurationSettings.ENABLE_VERSION_CHECK) { - if (result == UNINITIALIZED) { - return LanguageRegistry.instance().getStringLocalization(UNINITIALIZED_MESSAGE); - } - else if (result == CURRENT) { - return LanguageRegistry.instance().getStringLocalization(CURRENT_MESSAGE); - } - else if (result == OUTDATED) { - return LanguageRegistry.instance().getStringLocalization(OUTDATED_MESSAGE); - } - else if (result == CONNECTION_ERROR) { - return LanguageRegistry.instance().getStringLocalization(CONNECTION_ERROR_MESSAGE); - } - else { - return null; - } - } - else { - return LanguageRegistry.instance().getStringLocalization(VERSION_CHECK_DISABLED); - } - } + // 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"; + + public static Properties remoteVersionProperties = new Properties(); + + // All possible results of the remote version number check + 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; + + // Var to hold the result of the remote version check, initially set to uninitialized + public static byte result = UNINITIALIZED; + public static String remoteVersion = null; + public static String remoteUpdateLocation = null; + + /*** + * Checks the version of the currently running instance of the mod against + * the remote version authority, and sets the result of the check + * appropriately + */ + public static void checkVersion() { + + InputStream remoteVersionRepoStream = null; + + try { + URL remoteVersionURL = new URL(REMOTE_VERSION_XML_FILE); + remoteVersionRepoStream = remoteVersionURL.openStream(); + remoteVersionProperties.loadFromXML(remoteVersionRepoStream); + + String remoteVersionProperty = remoteVersionProperties.getProperty(Loader.instance().getMCVersionString()); + + if (remoteVersionProperty != null) { + remoteVersion = remoteVersionProperty.substring(0, remoteVersionProperty.indexOf("|")); + remoteUpdateLocation = remoteVersionProperty.substring(remoteVersionProperty.indexOf("|") + 1); + } + + if ((remoteVersion != null) && (remoteVersion.equals(Reference.VERSION))) { + result = CURRENT; + return; + } + + result = OUTDATED; + } + catch (IOException e) { + e.printStackTrace(); + } + finally { + if (result == UNINITIALIZED) { + result = GENERAL_ERROR; + } + + try { + if (remoteVersionRepoStream != null) { + remoteVersionRepoStream.close(); + } + } + catch (IOException ex) { + ex.printStackTrace(); + } + } + } + + 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()); + } + else { + LogHelper.log(Level.WARNING, getResultMessage()); + } + } + else { + LogHelper.log(Level.INFO, getResultMessage()); + } + } + + public static String getResultMessage() { + + if (ConfigurationSettings.ENABLE_VERSION_CHECK) { + if (result == UNINITIALIZED) { + return LanguageRegistry.instance().getStringLocalization(Strings.UNINITIALIZED_MESSAGE); + } + else if (result == CURRENT) { + String returnString = LanguageRegistry.instance().getStringLocalization(Strings.CURRENT_MESSAGE); + returnString = returnString.replace("@REMOTE_MOD_VERSION@", remoteVersion); + returnString = returnString.replace("@MINECRAFT_VERSION@", Loader.instance().getMCVersionString()); + return returnString; + } + else if (result == OUTDATED) { + String returnString = LanguageRegistry.instance().getStringLocalization(Strings.OUTDATED_MESSAGE); + returnString = returnString.replace("@MOD_NAME@", Reference.MOD_NAME); + returnString = returnString.replace("@REMOTE_MOD_VERSION@", remoteVersion); + returnString = returnString.replace("@MINECRAFT_VERSION@", Loader.instance().getMCVersionString()); + returnString = returnString.replace("@MOD_UPDATE_LOCATION@", remoteUpdateLocation); + return returnString; + } + else if (result == GENERAL_ERROR) { + return LanguageRegistry.instance().getStringLocalization(Strings.GENERAL_ERROR_MESSAGE); + } + else { + return null; + } + } + else { + return LanguageRegistry.instance().getStringLocalization(Strings.VERSION_CHECK_DISABLED); + } + } + + public static String getResultMessageForClient() { + + String returnString = LanguageRegistry.instance().getStringLocalization(Strings.OUTDATED_MESSAGE); + returnString = returnString.replace("@MOD_NAME@", Colours.TEXT_COLOUR_PREFIX_YELLOW + Reference.MOD_NAME + Colours.TEXT_COLOUR_PREFIX_WHITE); + returnString = returnString.replace("@REMOTE_MOD_VERSION@", Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteVersion + Colours.TEXT_COLOUR_PREFIX_WHITE); + returnString = returnString.replace("@MINECRAFT_VERSION@", Colours.TEXT_COLOUR_PREFIX_YELLOW + Loader.instance().getMCVersionString() + Colours.TEXT_COLOUR_PREFIX_WHITE); + returnString = returnString.replace("@MOD_UPDATE_LOCATION@", Colours.TEXT_COLOUR_PREFIX_YELLOW + VersionHelper.remoteUpdateLocation + Colours.TEXT_COLOUR_PREFIX_WHITE); + return returnString; + } } diff --git a/ee3_common/ee3/common/lib/Colours.java b/ee3_common/ee3/common/lib/Colours.java index 070979e6..a65fe95f 100644 --- a/ee3_common/ee3/common/lib/Colours.java +++ b/ee3_common/ee3/common/lib/Colours.java @@ -14,6 +14,8 @@ public class Colours { public static final String PURE_RED = "ff0000"; /* Text colour related constants */ - public static final String VERSION_CHECK_PREFIX = "\u00a7e"; + public static final String TEXT_COLOUR_PREFIX_YELLOW = "\u00a7e"; + + public static final String TEXT_COLOUR_PREFIX_WHITE = "\u00a7f"; } diff --git a/ee3_common/ee3/common/lib/CustomItemRarity.java b/ee3_common/ee3/common/lib/CustomItemRarity.java index eb9e0ab3..51f0b6ae 100644 --- a/ee3_common/ee3/common/lib/CustomItemRarity.java +++ b/ee3_common/ee3/common/lib/CustomItemRarity.java @@ -53,4 +53,4 @@ public class CustomItemRarity { public static final String DISPLAY_NAME_EPIC = "Epic"; public static final String DISPLAY_NAME_LEGENDARY = "Legendary"; -} \ No newline at end of file +} diff --git a/ee3_common/ee3/common/lib/Reference.java b/ee3_common/ee3/common/lib/Reference.java index 6d344c9e..e5ef090e 100644 --- a/ee3_common/ee3/common/lib/Reference.java +++ b/ee3_common/ee3/common/lib/Reference.java @@ -23,13 +23,13 @@ public class Reference { public static final int SHIFTED_ID_RANGE_CORRECTION = 256; public static final String SERVER_PROXY_CLASS = "ee3.common.core.CommonProxy"; public static final String CLIENT_PROXY_CLASS = "ee3.client.core.ClientProxy"; - + /* Configuration related constants */ public static final String ENABLE_VERSION_CHECK = "enable_version_check"; public static final String ENABLE_SOUNDS = "enable_sounds"; public static final String ENABLE_PARTICLE_FX = "enable_particle_fx"; public static final String AUTO_RESOLVE_BLOCK_IDS = "auto_resolve_block_ids"; - + /* KeyBinding related constants */ public static final String KEYBINDING_EXTRA = "key.extra"; public static final int KEYBINDING_EXTRA_DEFAULT = 46; @@ -47,12 +47,12 @@ public class Reference { public static final String ITEM_SPRITE_SHEET = "ee3_items.png"; public static final String BLOCK_SPRITE_SHEET = "ee3_blocks.png"; public static final String CALCINATOR_TEXTURE_SHEET = "calcinator.png"; - + /* General Tile Entity related constants */ public static final String TE_GEN_OWNER_NBT_TAG_LABEL = "owner"; public static final String TE_GEN_STATE_NBT_TAG_LABEL = "state"; public static final String TE_GEN_DIRECTION_NBT_TAG_LABEL = "direction"; - + // TODO: Find a better spot for these public static final int BLOCK_RED_WATER_EFFECT_DURATION_BASE = 5; public static final int BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER = 2; diff --git a/ee3_common/ee3/common/lib/Strings.java b/ee3_common/ee3/common/lib/Strings.java index 1a180f4b..8e31eda1 100644 --- a/ee3_common/ee3/common/lib/Strings.java +++ b/ee3_common/ee3/common/lib/Strings.java @@ -3,8 +3,14 @@ package ee3.common.lib; public class Strings { /* General text keys */ - public static final String TEXT_IMPURE = "text.impure"; - public static final String TEXT_PURE = "text.pure"; + + /* Version check related constants */ + public static final String VERSION_CHECK_DISABLED = "version.check_disabled"; + public static final String VERSION_CHECK_INIT_LOG_MESSAGE = "version.init_log_message"; + public static final String UNINITIALIZED_MESSAGE = "version.uninitialized"; + 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"; /* Gui related constants */ public static final String GUI_CALCINATOR_NAME = "gui.calcinator.name"; diff --git a/resources/ee3/lang/en_US.xml b/resources/ee3/lang/en_US.xml index 233decf6..66e55db6 100644 --- a/resources/ee3/lang/en_US.xml +++ b/resources/ee3/lang/en_US.xml @@ -21,12 +21,10 @@ Calcinator Calcinator Equivalent Exchange 3 - Impure - Pure - Initializing version check against the remote version authority file, located at - The version check did not complete successfully (version check did not initialize properly) - You are currently using the most up to date version for your version of Minecraft - You are currently using an out of date version; consider updating here - http://goo.gl/Ria2V - Error connecting to the remote version authority file (check your Internet connection?) + Initializing remote version check against remote version authority, located at + 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 Remote version check disabled, skipping From 1c3da781ea6ef8a843e34d5dd2333d97b90dfe46 Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 20 Nov 2012 14:50:40 -0500 Subject: [PATCH 20/28] Updated the localization files to use the new remote update location variable (see en_US.xml) and made sure all localization files get initialized into the LanguageRegistry --- ee3_common/ee3/common/lib/Localizations.java | 2 ++ resources/ee3/lang/cs_CZ.xml | 2 +- resources/ee3/lang/cy_GB.xml | 2 +- resources/ee3/lang/de_DE.xml | 2 +- resources/ee3/lang/es_ES.xml | 4 +--- resources/ee3/lang/fr_FR.xml | 2 +- resources/ee3/lang/ja_JP.xml | 2 +- resources/ee3/lang/la_IT.xml | 2 +- resources/ee3/lang/nl_NL.xml | 4 +--- resources/ee3/lang/no_NO.xml | 2 +- resources/ee3/lang/pl_PL.xml | 2 +- resources/ee3/lang/pt_PT.xml | 2 +- resources/ee3/lang/ru_RU.xml | 4 +--- resources/ee3/lang/sr_RS.xml | 2 +- resources/ee3/lang/sv_SE.xml | 2 +- resources/ee3/lang/zh_CN.xml | 11 ----------- 16 files changed, 16 insertions(+), 31 deletions(-) diff --git a/ee3_common/ee3/common/lib/Localizations.java b/ee3_common/ee3/common/lib/Localizations.java index 81856bff..995931ad 100644 --- a/ee3_common/ee3/common/lib/Localizations.java +++ b/ee3_common/ee3/common/lib/Localizations.java @@ -22,7 +22,9 @@ public class Localizations { LANG_RESOURCE_LOCATION + "fr_FR.xml", LANG_RESOURCE_LOCATION + "it_IT.xml", LANG_RESOURCE_LOCATION + "ja_JP.xml", + LANG_RESOURCE_LOCATION + "la_IT.xml", LANG_RESOURCE_LOCATION + "nl_NL.xml", + LANG_RESOURCE_LOCATION + "no_NO.xml", LANG_RESOURCE_LOCATION + "pl_PL.xml", LANG_RESOURCE_LOCATION + "pt_PT.xml", LANG_RESOURCE_LOCATION + "ru_RU.xml", diff --git a/resources/ee3/lang/cs_CZ.xml b/resources/ee3/lang/cs_CZ.xml index 9b6233a6..0f4d5f02 100644 --- a/resources/ee3/lang/cs_CZ.xml +++ b/resources/ee3/lang/cs_CZ.xml @@ -20,7 +20,7 @@ Provádím kontrolu verze, vzdálený soubor umístěn na Kontrola verze neproběhla úspěšně (nezdařila se inicializace) Používáte nejaktuálnější verzi, která je pro vaši verzi Minecraftu - Používáte neaktuální verzi; zvažte aktualizaci - http://goo.gl/Ria2V + Používáte neaktuální verzi; zvažte aktualizaci - @MOD_UPDATE_LOCATION@ Chyba při připojování k servru poskytujícímu informace o verzi (je v pořádku vaše připojení k Internetu?) Kontrola verze deaktivována, přeskakuji diff --git a/resources/ee3/lang/cy_GB.xml b/resources/ee3/lang/cy_GB.xml index 2d56d5a9..cf0f471b 100644 --- a/resources/ee3/lang/cy_GB.xml +++ b/resources/ee3/lang/cy_GB.xml @@ -17,7 +17,7 @@ Ymgychwynnu gwiriad fersiwn yn erbyn y ffeil awdurdod fersiwn o bell, a leolir ar Ni gyflawnwyd y gwiriad fersiwn yn llwyddiannus (ni ymgychwynodd y gwiriad fersiwn yn briodol) Rydych yn defnyddio y fersiwn diweddaraf ar gyfer eich fersiwn o Minecraft - Rydych yn defnyddio fersiwn wedi dyddio; cysidrwch diweddaru yma - http://goo.gl/Ria2V + Rydych yn defnyddio fersiwn wedi dyddio; cysidrwch diweddaru yma - @MOD_UPDATE_LOCATION@ Gwall wrth drio cysylltu gyda'r ffeil awdurdod fersiwn o bell (Gwiriwch eich cysylltiad rhwydwaith) Gwiriad fersiwn o bell wedi'i ddiffodd, esgusodid diff --git a/resources/ee3/lang/de_DE.xml b/resources/ee3/lang/de_DE.xml index 738f0a53..5b61eca0 100644 --- a/resources/ee3/lang/de_DE.xml +++ b/resources/ee3/lang/de_DE.xml @@ -18,7 +18,7 @@ Initialisiere Versionsvergleich mit der Remotedatei, die sich auf folgendem Server befindet Die Versionsprüfung wurde nicht erfolgreich abgeschlossen (Versionsprüfung wurde nicht entsprechend initialisiert) Du benutzt gerade die aktuellste Version für deine Minecraft-Version - Du benutzt gerade eine veraltete Version; bitte ziehe es in Betracht sie hier zu updaten - http://goo.gl/Ria2V + Du benutzt gerade eine veraltete Version; bitte ziehe es in Betracht sie hier zu updaten - @MOD_UPDATE_LOCATION@ Fehler bei der Verbindung zur Remotedatei(überprüfe bitte deine Internetverbindung) Versionsvergleich mit der Remotedatei deaktiviert, überspringe diff --git a/resources/ee3/lang/es_ES.xml b/resources/ee3/lang/es_ES.xml index 701a27ac..8e897b41 100644 --- a/resources/ee3/lang/es_ES.xml +++ b/resources/ee3/lang/es_ES.xml @@ -21,12 +21,10 @@ Calcinador Calcinador Equivalent Exchange 3 - Impuro - Puro 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 más actualizada para tu versión de Minecraft - Actualmente estás usando una versión desactualizada; considera actualizarla aquí - http://goo.gl/Ria2V + 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 diff --git a/resources/ee3/lang/fr_FR.xml b/resources/ee3/lang/fr_FR.xml index b30ec8d1..4f36f4c2 100644 --- a/resources/ee3/lang/fr_FR.xml +++ b/resources/ee3/lang/fr_FR.xml @@ -15,7 +15,7 @@ Lancement de la vérification de votre version par rapport à cette de reference : Le lancement de la vérification a échoué Vous utilisez la version la plus à jour pour votre version de Minecraft - Vous utilisez une verison obsolète, pensez à effecuter une mise a jour ici - http://goo.gl/Ria2V + Vous utilisez une verison obsolète, pensez à effecuter une mise a jour ici - @MOD_UPDATE_LOCATION@ Erreur de connexion vers la version de référence (vérifiez votre connexion internet ?) Verification de version désactiée diff --git a/resources/ee3/lang/ja_JP.xml b/resources/ee3/lang/ja_JP.xml index c4942191..8b7806da 100644 --- a/resources/ee3/lang/ja_JP.xml +++ b/resources/ee3/lang/ja_JP.xml @@ -26,7 +26,7 @@ オンラインバージョンチェックの初期化中。場所: バージョンチェックに失敗しました。 (初期化に失敗しました。) Minecraft本体に適合する最新バージョンです。 - 古いバージョンが使用されています。 http://goo.gl/Ria2V からアップデートしてください。 + 古いバージョンが使用されています。 @MOD_UPDATE_LOCATION@ からアップデートしてください。 リモートのバージョン情報ファイルへ接続中にエラーが発生しました。インターネット接続を確認してください。 オンラインバージョンチェックは無効化されています。処理をスキップします。 \ No newline at end of file diff --git a/resources/ee3/lang/la_IT.xml b/resources/ee3/lang/la_IT.xml index f4185690..ffb8fcf1 100644 --- a/resources/ee3/lang/la_IT.xml +++ b/resources/ee3/lang/la_IT.xml @@ -26,7 +26,7 @@ Incipiens senecti quaesitum contra procul senecti auctoritatis scapus, positus ad Senecti quaesitum non adimplet cum fortuna (Senecti quaestim non incipit recte) Iam abutas the most novellissimus senectus tuo senecto Meiarti(Minecraft) - Iam abutas non tempore senectus; Consule hic afferte hodie - http://goo.gl/Ria2V + Iam abutas non tempore senectus; Consule hic afferte hodie - @MOD_UPDATE_LOCATION@ Erratum annectans ad procul senecto auctoritatis scapus (Scisa tuum retiacula ad invicem nexus?) Procul senectus debilitatus, neglectens diff --git a/resources/ee3/lang/nl_NL.xml b/resources/ee3/lang/nl_NL.xml index b0d0fb5b..e851949a 100644 --- a/resources/ee3/lang/nl_NL.xml +++ b/resources/ee3/lang/nl_NL.xml @@ -21,12 +21,10 @@ Calcinator Calcinator Equivalent Exchange 3 - Onpuur - Puur Start versiecontrole tegen extern versiebestand, te vinden op De versiecontrole is niet geslaagd (versiecontrole niet correct gestart) Je gebruikt momenteel de meest recente versie voor jouw Minecraft versie - Je gebruikt momenteel een verouderde versie; overweeg om up te daten - http://goo.gl/Ria2V + Je gebruikt momenteel een verouderde versie; overweeg om up te daten - @MOD_UPDATE_LOCATION@ Fout bij het verbinden met het extern versiecontrole bestand (controleer je internetverbinding) Externe versiecontrole uitgeschakeld, wordt overgeslagen diff --git a/resources/ee3/lang/no_NO.xml b/resources/ee3/lang/no_NO.xml index 1d9cc9ac..b957dbd1 100644 --- a/resources/ee3/lang/no_NO.xml +++ b/resources/ee3/lang/no_NO.xml @@ -17,7 +17,7 @@ Initaliserer versjonskontroll mot fjernversjonens autoritetsfil, plassert i Versjonkontrollen mislyktes (Versjonkontrollen initaliserte ikke korrekt) Du bruker den mest oppdaterte versjonen for din versjon av Minecraft - Du bruker en utdatert versjon; Vurder å oppdatere her: - http://goo.gl/Ria2V + Du bruker en utdatert versjon; Vurder å oppdatere her: - @MOD_UPDATE_LOCATION@ Misslykkes med å koble til fjernversjonens autoritetsfil (Kontroller internetttilgangen din?) Fjernversjonens versjonsjekk koblet fra, hopper over \ No newline at end of file diff --git a/resources/ee3/lang/pl_PL.xml b/resources/ee3/lang/pl_PL.xml index 38a4957a..1879cced 100644 --- a/resources/ee3/lang/pl_PL.xml +++ b/resources/ee3/lang/pl_PL.xml @@ -18,7 +18,7 @@ Inicjowanie sprawdzania wersji względem zdalnego pliku autoryzacji, umieszczonego na Sprawdzenie wersji nie zakończyło się sukcesem (Sprawdzanie wersji nie zostało poprawnie zainicjowane) Korzystasz aktualnie z najaktualniejszej wersji dla Twojej wersji Minecraft - Korzystasz aktualnie ze starszej wersji moda; Pomyśl nad aktualizacją tutaj - http://goo.gl/Ria2V + Korzystasz aktualnie ze starszej wersji moda; Pomyśl nad aktualizacją tutaj - @MOD_UPDATE_LOCATION@ Wystąpił bład podczas łaczenia ze zdalnym plikiem wersji (sprawdź Twoje połączenie z Internetem?) Zdalne sprawdzanie wersji wyłączone, pomijanie diff --git a/resources/ee3/lang/pt_PT.xml b/resources/ee3/lang/pt_PT.xml index b21b39e4..1baa6350 100644 --- a/resources/ee3/lang/pt_PT.xml +++ b/resources/ee3/lang/pt_PT.xml @@ -26,7 +26,7 @@ A inicializar verificação da versão contra o ficheiro autoritário de versão remoto, localizado em A verificação da versão não concluiu com sucesso (a verificação da versão não inicializou correctamente) Estás actualmente a usar a versão mais actualizada para a tua versão do Minecraft - Estás actualmente a usar uma versão desactualizada; considera actualizar aqui - http://goo.gl/Ria2V + Estás actualmente a usar uma versão desactualizada; considera actualizar aqui - @MOD_UPDATE_LOCATION@ Erro ao ligar ao ficheiro autoritário de versão remoto (verifica a tua ligação de Internet?) Verificação de versão remota desactivada, a ignorar diff --git a/resources/ee3/lang/ru_RU.xml b/resources/ee3/lang/ru_RU.xml index caefa529..86aec312 100644 --- a/resources/ee3/lang/ru_RU.xml +++ b/resources/ee3/lang/ru_RU.xml @@ -21,12 +21,10 @@ Кальцинатор Кальцинатор Equivalent Exchange 3 - Нечистый - Чистый Инициализация проверки версии в удаленном файле, находящемся на Проверка версии не была завершена успешно (проверка версии не инициализирована правильно) Вы используете самую последнюю версию для вашей версии Minecraft - Вы используете устаревшую версию, обновите здесь - http://goo.gl/Ria2V + Вы используете устаревшую версию, обновите здесь - @MOD_UPDATE_LOCATION@ Ошибка подключения к удаленному файлу (проверьте подключение к Интернету) Удаленная проверка версии отключена, пропуск diff --git a/resources/ee3/lang/sr_RS.xml b/resources/ee3/lang/sr_RS.xml index 6baf87c7..70e36c08 100644 --- a/resources/ee3/lang/sr_RS.xml +++ b/resources/ee3/lang/sr_RS.xml @@ -18,7 +18,7 @@ Покретање верзије провера према Приступу удаљеним фајловима верзије ауторитета, који се налази у Провера Верзије није успешно завршена (верзија провере није покренута правилно) Ви тренутно користите најновију верзију за мајнкрафт - Ви тренутно користите застарелу верзију; Размотрити надоградљу на - http://goo.gl/Ria2V + Ви тренутно користите застарелу верзију; Размотрити надоградљу на - @MOD_UPDATE_LOCATION@ Грешка у повезивању удаљене верзије ауторетета податка (Погледајте вашу конекцију?) Провера верзије је искључено, Прескочено \ No newline at end of file diff --git a/resources/ee3/lang/sv_SE.xml b/resources/ee3/lang/sv_SE.xml index d8223cae..5940c38b 100644 --- a/resources/ee3/lang/sv_SE.xml +++ b/resources/ee3/lang/sv_SE.xml @@ -17,7 +17,7 @@ Initierar versionskontroll mot fjärrversions auktoritetsfil, lokaliserad vid Versionskontrollen misslyckades (Versionskontrollen initierades inte korrekt) Du använder den mest uppdaterade versionen för din version av Minecraft - Du använder en utdaterad version; överväg att uppdatera här - http://goo.gl/Ria2V + Du använder en utdaterad version; överväg att uppdatera här - @MOD_UPDATE_LOCATION@ Misslyckades med att ansluta till fjärrversions auktoritetsfil (Kontrollera din internetanslutning?) Fjärrversions versionskontroll inaktiverad, hoppar över diff --git a/resources/ee3/lang/zh_CN.xml b/resources/ee3/lang/zh_CN.xml index cb378b2c..078dd51c 100644 --- a/resources/ee3/lang/zh_CN.xml +++ b/resources/ee3/lang/zh_CN.xml @@ -2,10 +2,6 @@ Chinese (Simplified) Localization File - Extra - Release - Toggle - Charge 铅丹碎片 惰性石 铅丹石 @@ -14,11 +10,4 @@ 红水 (流动) 煅烧炉 煅烧炉 - 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) - You are currently using the most up to date version for your version of Minecraft - You are currently using an out of date version; consider updating here - http://goo.gl/Ria2V - Error connecting to the remote version authority file (check your Internet connection?) - Remote version check disabled, skipping \ No newline at end of file From 95f9b00e622e8a711ef759d304e4236b918a8c06 Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 20 Nov 2012 14:54:41 -0500 Subject: [PATCH 21/28] Little more detail in the remote version authority file --- version.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/version.xml b/version.xml index 328e1458..ad091f0c 100644 --- a/version.xml +++ b/version.xml @@ -1,6 +1,8 @@ - Version lookup for Equivalent Exchange 3 + Version lookup for Equivalent Exchange 3. Format is "Current Version Number|URL to update page" + pre1a|http://goo.gl/Ria2V + pre1b|http://goo.gl/Ria2V pre2|http://goo.gl/Ria2V \ No newline at end of file From 97cd5905c3e399ec03d46b3c642362e3ad2fd386 Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 20 Nov 2012 15:29:13 -0500 Subject: [PATCH 22/28] Fixed bug where EE3 sounds were not being loaded properly --- ee3_client/ee3/client/core/handlers/SoundHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ee3_client/ee3/client/core/handlers/SoundHandler.java b/ee3_client/ee3/client/core/handlers/SoundHandler.java index 5cd79cde..159b695a 100644 --- a/ee3_client/ee3/client/core/handlers/SoundHandler.java +++ b/ee3_client/ee3/client/core/handlers/SoundHandler.java @@ -27,10 +27,9 @@ public class SoundHandler { for (String soundFile : Sounds.soundFiles) { // Try to add the custom sound file to the pool of sounds try { - event.manager.addSound(soundFile, new File(this.getClass().getResource("/" + soundFile).toURI())); + event.manager.soundPoolSounds.addSound(soundFile, this.getClass().getResource("/" + soundFile)); } - // If we cannot add the custom sound file to the pool, log the - // exception + // If we cannot add the custom sound file to the pool, log the exception catch (Exception e) { LogHelper.log(Level.WARNING, "Failed loading sound file: " + soundFile); } From 218fc8ceef25a233d1f429d22f8a11fb17815a8d Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 20 Nov 2012 15:39:32 -0500 Subject: [PATCH 23/28] Cleaned up detection of hostile mobs --- .../ee3/common/core/helper/GeneralHelper.java | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/ee3_common/ee3/common/core/helper/GeneralHelper.java b/ee3_common/ee3/common/core/helper/GeneralHelper.java index 8d062fda..146eb8ae 100644 --- a/ee3_common/ee3/common/core/helper/GeneralHelper.java +++ b/ee3_common/ee3/common/core/helper/GeneralHelper.java @@ -3,22 +3,8 @@ package ee3.common.core.helper; import java.util.ArrayList; import net.minecraft.src.Block; -import net.minecraft.src.EntityBlaze; -import net.minecraft.src.EntityCaveSpider; -import net.minecraft.src.EntityCreeper; -import net.minecraft.src.EntityDragon; -import net.minecraft.src.EntityEnderman; -import net.minecraft.src.EntityGhast; import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityMagmaCube; -import net.minecraft.src.EntityPigZombie; -import net.minecraft.src.EntitySilverfish; -import net.minecraft.src.EntitySkeleton; -import net.minecraft.src.EntitySlime; -import net.minecraft.src.EntitySpider; -import net.minecraft.src.EntityWitch; -import net.minecraft.src.EntityWither; -import net.minecraft.src.EntityZombie; +import net.minecraft.src.EntityMob; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; @@ -58,21 +44,7 @@ public class GeneralHelper { } public static boolean isHostileEntity(EntityLiving entity) { - if ((entity instanceof EntityBlaze) || - (entity instanceof EntityCaveSpider) || - (entity instanceof EntityCreeper) || - (entity instanceof EntityDragon) || - (entity instanceof EntityEnderman) || - (entity instanceof EntityGhast) || - (entity instanceof EntityMagmaCube) || - (entity instanceof EntityPigZombie) || - (entity instanceof EntitySilverfish) || - (entity instanceof EntitySkeleton) || - (entity instanceof EntitySlime) || - (entity instanceof EntitySpider) || - (entity instanceof EntityWitch) || - (entity instanceof EntityWither) || - (entity instanceof EntityZombie)) { + if (entity instanceof EntityMob) { return true; } else { From 659b2a96203de77908269cf63ffea6a2d4649679 Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 20 Nov 2012 22:33:50 -0500 Subject: [PATCH 24/28] Some work on what I hope could be a cool overlay for managing the different modes of the P Stone/etc. Thanks Azanor for the concept --- .../ee3/client/core/helper/RenderUtils.java | 47 ++++++++++ .../ee3/common/EquivalentExchange3.java | 4 + .../core/handlers/RenderTickHandler.java | 93 +++++++++++++++++++ 3 files changed, 144 insertions(+) create mode 100644 ee3_client/ee3/client/core/helper/RenderUtils.java create mode 100644 ee3_common/ee3/common/core/handlers/RenderTickHandler.java diff --git a/ee3_client/ee3/client/core/helper/RenderUtils.java b/ee3_client/ee3/client/core/helper/RenderUtils.java new file mode 100644 index 00000000..01e54caa --- /dev/null +++ b/ee3_client/ee3/client/core/helper/RenderUtils.java @@ -0,0 +1,47 @@ +package ee3.client.core.helper; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.src.FontRenderer; +import net.minecraft.src.Item; +import net.minecraft.src.ItemStack; +import net.minecraft.src.RenderEngine; +import net.minecraft.src.Tessellator; + +public class RenderUtils { + + public static void renderItemIntoGUI(FontRenderer fontRenderer, RenderEngine renderEngine, ItemStack stack, int x, int y) { + + int itemID = stack.itemID; + int meta = stack.getItemDamage(); + int iconIndex = stack.getIconIndex(); + + GL11.glDisable(GL11.GL_LIGHTING); + + renderEngine.bindTexture(renderEngine.getTexture(stack.getItem().getTextureFile())); + + int overlayColour = Item.itemsList[itemID].getColorFromItemStack(stack, 0); + float var17 = (float) (overlayColour >> 16 & 255) / 255.0F; + float var16 = (float) (overlayColour >> 8 & 255) / 255.0F; + float var12 = (float) (overlayColour & 255) / 255.0F; + + GL11.glColor4f(var17, var16, var12, 1.0F); + + drawTexturedQuad(x, y, iconIndex % 16 * 16*4, iconIndex / 16 * 16*4, 16*4, 16*4, -90); + GL11.glEnable(GL11.GL_LIGHTING); + } + + public static void drawTexturedQuad(int x, int y, int u, int v, int width, int height, double zLevel) { + + float var7 = 0.00390625F/4; + float var8 = 0.00390625F/4; + Tessellator var9 = Tessellator.instance; + var9.startDrawingQuads(); + var9.addVertexWithUV(x + 0, y + height, zLevel, (u + 0) * var7, (v + height) * var8); + var9.addVertexWithUV(x + width, y + height, zLevel, (u + width) * var7, (v + height) * var8); + var9.addVertexWithUV(x + width, y + 0, zLevel, (u + width) * var7, (v + 0) * var8); + var9.addVertexWithUV(x + 0, y + 0, zLevel, (u + 0) * var7, (v + 0) * var8); + var9.draw(); + } + +} diff --git a/ee3_common/ee3/common/EquivalentExchange3.java b/ee3_common/ee3/common/EquivalentExchange3.java index d0031501..27462f8f 100644 --- a/ee3_common/ee3/common/EquivalentExchange3.java +++ b/ee3_common/ee3/common/EquivalentExchange3.java @@ -28,6 +28,7 @@ import ee3.common.core.handlers.ItemPickupHandler; import ee3.common.core.handlers.LocalizationHandler; import ee3.common.core.handlers.PacketHandler; import ee3.common.core.handlers.PlayerDestroyItemHandler; +import ee3.common.core.handlers.RenderTickHandler; import ee3.common.core.handlers.VersionCheckTickHandler; import ee3.common.core.helper.LogHelper; import ee3.common.core.helper.VersionHelper; @@ -78,6 +79,9 @@ public class EquivalentExchange3 { // Initialize the Version Check Tick Handler (Client only) TickRegistry.registerTickHandler(new VersionCheckTickHandler(), Side.CLIENT); + // Initialize the Render Tick Handler (Client only) + TickRegistry.registerTickHandler(new RenderTickHandler(), Side.CLIENT); + // Register the KeyBinding Handler (Client only) proxy.registerKeyBindingHandler(); diff --git a/ee3_common/ee3/common/core/handlers/RenderTickHandler.java b/ee3_common/ee3/common/core/handlers/RenderTickHandler.java new file mode 100644 index 00000000..53c1e04f --- /dev/null +++ b/ee3_common/ee3/common/core/handlers/RenderTickHandler.java @@ -0,0 +1,93 @@ +package ee3.common.core.handlers; + +import java.util.EnumSet; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import net.minecraft.client.Minecraft; +import net.minecraft.src.EntityPlayer; +import net.minecraft.src.ItemStack; +import net.minecraft.src.RenderHelper; +import net.minecraft.src.RenderItem; +import net.minecraft.src.ScaledResolution; + +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.ITickHandler; +import cpw.mods.fml.common.TickType; +import ee3.client.core.helper.RenderUtils; +import ee3.common.core.helper.VersionHelper; +import ee3.common.item.ItemPhilosopherStone; +import ee3.common.lib.ConfigurationSettings; +import ee3.common.lib.Reference; + +public class RenderTickHandler implements ITickHandler { + + @Override + public void tickStart(EnumSet type, Object... tickData) { + + } + + @Override + public void tickEnd(EnumSet type, Object... tickData) { + + Minecraft minecraft = FMLClientHandler.instance().getClient(); + EntityPlayer player = minecraft.thePlayer; + ItemStack currentItemStack = null; + + if (type.contains(TickType.RENDER)) { + if (player != null) { + currentItemStack = player.inventory.getCurrentItem(); + } + + if ((player != null) && (currentItemStack != null) && (minecraft.inGameHasFocus) && (currentItemStack.getItem() instanceof ItemPhilosopherStone)) { + renderStoneHUD(minecraft, player, currentItemStack, (Float) tickData[0]); + } + } + } + + @Override + public EnumSet ticks() { + + return EnumSet.of(TickType.CLIENT, TickType.CLIENTGUI, TickType.RENDER); + } + + @Override + public String getLabel() { + + return Reference.MOD_NAME + ": " + this.getClass().getSimpleName(); + } + + private static void renderStoneHUD(Minecraft minecraft, EntityPlayer player, ItemStack stack, float partialTicks) { + + int loc = player.inventory.currentItem*20; + int shift = player.capabilities.isCreativeMode?0:20; + GL11.glPushMatrix(); + + ScaledResolution sr = new ScaledResolution(minecraft.gameSettings, minecraft.displayWidth, minecraft.displayHeight); + GL11.glClear(256); + GL11.glMatrixMode(GL11.GL_PROJECTION); + GL11.glLoadIdentity(); + GL11.glOrtho(0.0D, sr.getScaledWidth_double(), sr.getScaledHeight_double(), 0.0D, 1000.0D, 3000.0D); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glLoadIdentity(); + GL11.glTranslatef(0.0F, 0.0F, -2000.0F); + int k = sr.getScaledWidth(); + int l = sr.getScaledHeight(); + + GL11.glPushMatrix(); + RenderHelper.enableGUIStandardItemLighting(); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glEnable(GL11.GL_COLOR_MATERIAL); + GL11.glEnable(GL11.GL_LIGHTING); + RenderItem itemRenderer = new RenderItem(); + RenderUtils.renderItemIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, stack, 0, 0); + //itemRenderer.renderItemIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, stack, 0, 0); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + + GL11.glPopMatrix(); + } + +} From 845f4ed672c0fbbbd771a57d2b494f68f6c54f41 Mon Sep 17 00:00:00 2001 From: Lure Date: Wed, 21 Nov 2012 13:56:27 -0200 Subject: [PATCH 25/28] Portuguese(BR) Localization also enabled pt_BR --- ee3_common/ee3/common/lib/Localizations.java | 1 + resources/ee3/lang/pt_BR.xml | 30 ++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 resources/ee3/lang/pt_BR.xml diff --git a/ee3_common/ee3/common/lib/Localizations.java b/ee3_common/ee3/common/lib/Localizations.java index 995931ad..7d9befa0 100644 --- a/ee3_common/ee3/common/lib/Localizations.java +++ b/ee3_common/ee3/common/lib/Localizations.java @@ -23,6 +23,7 @@ public class Localizations { LANG_RESOURCE_LOCATION + "it_IT.xml", LANG_RESOURCE_LOCATION + "ja_JP.xml", LANG_RESOURCE_LOCATION + "la_IT.xml", + LANG_RESOURCE_LOCATION + "pt_BR.xml", LANG_RESOURCE_LOCATION + "nl_NL.xml", LANG_RESOURCE_LOCATION + "no_NO.xml", LANG_RESOURCE_LOCATION + "pl_PL.xml", diff --git a/resources/ee3/lang/pt_BR.xml b/resources/ee3/lang/pt_BR.xml new file mode 100644 index 00000000..293471ca --- /dev/null +++ b/resources/ee3/lang/pt_BR.xml @@ -0,0 +1,30 @@ +? + + + Portuguese(BR) Localization File + Extra + Liberar + Alternar + Carregar + Fragmento de Minium + Pedra Inerte + Pedra de Minium + Pedra Filosofal + Cinzas + P de Minium + P Verdejante + P ndigo + P Amarantino + P Iridescente + gua Vermelha (Parada) + gua Vermelha (Corrente) + Calcinador + Calcinador + Equivalent Exchange 3 + Inicializando checagem de verso remota contra a verso remota mestre, localizada em: + Checagem de verso remota no conseguiu ser inicializada adequadamente + Usando a verso mais recente(@REMOTE_MOD_VERSION@) de Equivalent Exchange 3 para @MINECRAFT_VERSION@ + Uma nova verso de @MOD_NAME@ existe (@REMOTE_MOD_VERSION@) para @MINECRAFT_VERSION@. Consiga-a aqui: @MOD_UPDATE_LOCATION@ + Erro checando a verso remota mestre + Checagem remota desligada, pulando + \ No newline at end of file From 17e931498634d74e44c2ff1cec4a2600aebf096d Mon Sep 17 00:00:00 2001 From: Lure Date: Wed, 21 Nov 2012 14:04:35 -0200 Subject: [PATCH 26/28] Alphabetical Order alphabetical order should been obvious to me first... don't know why it wasn't --- ee3_common/ee3/common/lib/Localizations.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee3_common/ee3/common/lib/Localizations.java b/ee3_common/ee3/common/lib/Localizations.java index 7d9befa0..d0b8cf01 100644 --- a/ee3_common/ee3/common/lib/Localizations.java +++ b/ee3_common/ee3/common/lib/Localizations.java @@ -23,10 +23,10 @@ public class Localizations { LANG_RESOURCE_LOCATION + "it_IT.xml", LANG_RESOURCE_LOCATION + "ja_JP.xml", LANG_RESOURCE_LOCATION + "la_IT.xml", - LANG_RESOURCE_LOCATION + "pt_BR.xml", LANG_RESOURCE_LOCATION + "nl_NL.xml", LANG_RESOURCE_LOCATION + "no_NO.xml", LANG_RESOURCE_LOCATION + "pl_PL.xml", + LANG_RESOURCE_LOCATION + "pt_BR.xml", LANG_RESOURCE_LOCATION + "pt_PT.xml", LANG_RESOURCE_LOCATION + "ru_RU.xml", LANG_RESOURCE_LOCATION + "sr_RS.xml", From d703b7668375303b6a85cd6fe25dacb493370df4 Mon Sep 17 00:00:00 2001 From: Lure Date: Wed, 21 Nov 2012 14:41:24 -0200 Subject: [PATCH 27/28] alteration suggested by @Pyker --- resources/ee3/lang/pt_BR.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ee3/lang/pt_BR.xml b/resources/ee3/lang/pt_BR.xml index 293471ca..f97d1f49 100644 --- a/resources/ee3/lang/pt_BR.xml +++ b/resources/ee3/lang/pt_BR.xml @@ -1,7 +1,7 @@ ? - Portuguese(BR) Localization File + Brazilian Portguese(pt-BR) Localization File Extra Liberar Alternar From f5fa81ac5d08648ccc090dccce3c809a057ee354 Mon Sep 17 00:00:00 2001 From: Lure Date: Wed, 21 Nov 2012 14:42:24 -0200 Subject: [PATCH 28/28] Spelling check --- resources/ee3/lang/pt_BR.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/ee3/lang/pt_BR.xml b/resources/ee3/lang/pt_BR.xml index f97d1f49..067c4fa8 100644 --- a/resources/ee3/lang/pt_BR.xml +++ b/resources/ee3/lang/pt_BR.xml @@ -1,7 +1,7 @@ ? - Brazilian Portguese(pt-BR) Localization File + Brazilian Portuguese(pt-BR) Localization File Extra Liberar Alternar