From 2ccd44a55e9361d34e548e4bbf10fd1d545d308b Mon Sep 17 00:00:00 2001 From: Wliu Date: Sun, 14 Jul 2013 20:56:26 -0400 Subject: [PATCH 01/11] README update -Removed spaces between links -Removed some now-useless stuff, and added a generalization (the IMPORTANT part) -Updated Java version -Clarified Github for Windows/Mac part -Updated for pahimar's build.xml change (ant build) -Updated for Repository Next (https://github.com/blog/1529-repository-next) That should be it ;) --- README.md | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 83914225..4776bea8 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,26 @@ ## Welcome to Equivalent Exchange 3! -**LATEST OFFICIAL VERSION**: [EE3 pre1h for 1.5.1/1.5.2] (http://adf.ly/PdBNy) +**LATEST OFFICIAL VERSION**: [EE3 pre1h for 1.5.1/1.5.2](http://adf.ly/PdBNy) -[Minecraft Forums page] (http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3) +[Minecraft Forums page](http://www.minecraftforum.net/topic/1540010-equivalent-exchange-3) -[Compiling EE3] (https://github.com/pahimar/Equivalent-Exchange-3#compiling-equivalent-exchange-3) - For those that want the latest unreleased features. +[Compiling EE3](https://github.com/pahimar/Equivalent-Exchange-3#compiling-equivalent-exchange-3) - For those that want the latest unreleased features. -[Contributing] (https://github.com/pahimar/Equivalent-Exchange-3#contributing) - For those that want to help out. +[Contributing](https://github.com/pahimar/Equivalent-Exchange-3#contributing) - For those that want to help out. ### Compiling Equivalent Exchange 3 -IMPORTANT: This is not guaranteed to work as it has not been tested extensively (Linux and Windows tested). +IMPORTANT: Please report any issues you have, there might be some problems with the documentation! *** -#### Prerequisites (Tested for Windows ONLY!) +#### Prerequisites 1. **WARNING: Make sure you know EXACTLY what you're doing! It's not any of our faults if your OS crashes, becomes corrupted, etc.** -2. Download and install the Java JDK [here] (http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html). Scroll down, accept the `Oracle Binary Code License Agreement for Java SE`, and download the one pertaining to your OS (necessary for MCP). +2. Download and install the Java JDK [here](http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html). Scroll down, accept the `Oracle Binary Code License Agreement for Java SE`, and download the one pertaining to your OS (necessary for MCP). * Go to `Control Panel\System and Security\System`, and click on `Advanced System Settings` on the left-hand side. * 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_21` 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_25` 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_21\bin` (or your Java JDK installation directory\bin), and click `Ok`. -3. Download Apache Ant [here] (http://ant.apache.org). + * Append `;C:\Program Files (x86)\Java\jdk1.7.0_25\bin` (or your Java JDK installation directory\bin), and click `Ok`. +3. 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. * Under `System Variables`, click `New`. @@ -28,22 +28,23 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively * For `Variable Value`, input `C:\Ant\apache-ant-1.9.0` (or your Ant directory\apache-ant-1.9.0). * Scroll down to `Path`, and double-click on it. * Append `;C:\Ant\apache-ant-1.9.0\bin` exactly as shown to the end (or your Ant directory\apache-ant-1.9.0\bin). -4. Download and install Github [here] (http://windows.github.com/) (Windows) or [here] (http://mac.github.com/) (Mac OS X 10.7+). For Linux, you could download it as a .zip/tarball and unzip it. +4. Download and install Github [here](http://windows.github.com/) (Windows) or [here](http://mac.github.com/) (Mac OS X 10.7+). For Linux, you can use a different Git application. NOTE: Github For Windows/Mac is OPTIONAL. You can use your own Git application. * Create an account. - * 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. + * Scroll to the top of this page, login at the top-right, and then click `Clone to Windows/Mac` at the bottom of the right-hand toolbar. * 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). 5. 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. -#### Setup MCP (Tested on Linux and Windows) -1. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/index.php/MCP_Releases), e.g. mcp751.zip. Install MCP dependencies as listed on the website if neccessary. +#### Setup MCP +1. Download the latest version of MCP from [here] (http://mcp.ocean-labs.de/download.php?list.2), e.g. mcp751.zip. 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.5.2 and unzip it into `mcp`. You need at least Forge 7.7.1.500 (Forge 7.8.0.684 if using 1.5.2), best way is to get it from [here] (http://files.minecraftforge.net/). +3. Download the latest Forge **source** for Minecraft 1.5.1/1.5.2 and unzip it into `mcp`. You need at least Forge 7.7.1.500 (Forge 7.8.0.684 if using 1.5.2), the 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. +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. + * This will take some time, be patient. -#### Setup EE3 (Some tested for Linux, tested fully for Windows) +#### Setup EE3 1. Inside `mcdev`, create a directory named `source`. 2. Move/clone `Equivalent-Exchange-3` into `source`. 3. Right now, you should have a directory that looks something like: @@ -68,10 +69,10 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively * `release.mod.version=pre2` 5. Open up your OS's command line (Command Prompt in Windows, Terminal in Linux and Mac). 6. 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. +7. Execute `ant build`. 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.5.2\pre2`. - * You should see a .jar named `ee3-universal-pre2.jar`. + * You should see a `.jar` file named `ee3-universal-pre2.jar`. 9. Copy the jar into your Minecraft mods folder, and play Minecraft! #### Updating Your Repo (For Windows/Mac) @@ -87,11 +88,11 @@ IMPORTANT: This is not guaranteed to work as it has not been tested extensively #### Submitting a PR So you found a bug in pahimar's code? Think you can make it more efficient? Want to help in general? Great! -1. **IMPORTANT: PAHIMAR DOES *NOT* WANT ANY** `build.xml` **CHANGES, UNLESS it fixes up something broken** (See [Pull Request #90] (https://github.com/pahimar/Equivalent-Exchange-3/pull/90)). +1. **IMPORTANT: PAHIMAR DOES *NOT* WANT ANY** `build.xml` **CHANGES, UNLESS it fixes up something broken** (See [Pull Request #90](https://github.com/pahimar/Equivalent-Exchange-3/pull/90)). 2. If you haven't already, create a Github account. -3. Click the little branch/plus icon at the top-right of this page (below your username). +3. Click the `Fork` icon at the top-right of this page (below your username). 4. Make the changes that you want to. -5. Click `Pull Request` at the top-middle of the page (right of your fork's name, to the left of `Watch` and `Fork`). +5. Click `Pull Request` at the right-hand side of the gray bar directly below your fork's name. 6. Enter your PR's title, and create a detailed description telling pahimar what you changed. 7. Click `Send pull request`, and you're done! @@ -99,7 +100,7 @@ So you found a bug in pahimar's code? Think you can make it more efficient? Wa EE3 crashes every time? Have a suggestion? Found a bug? Create an issue now! 1. Please, please don't make any frivolous issues! If it's a crash, try asking the people in IRC or MCF before creating an issue. If it's a bug/suggestion, make sure it hasn't been reported/suggested already. Thanks! :smile: -2. Go to [the issues page] (http://github.com/pahimar/Equivalent-Exchange-3/issues). -3. Click `New Issue` right below `Graphs`. +2. Go to [the issues page](http://github.com/pahimar/Equivalent-Exchange-3/issues). +3. Click `New Issue` right below `Star` and `Fork`. 4. Enter your Issue's title (something that summarizes your issue), and then create a detailed description ("Hey pahimar, could you add/change xxx?" or "Hey, found an exploit: stuff"). -5. Click `Submit new issue`, and you're done! +5. Click `Submit new issue`, and you're done! \ No newline at end of file From 10312ac65ca770846f1a60c3ce9dd021008eee22 Mon Sep 17 00:00:00 2001 From: Wliu Date: Sun, 14 Jul 2013 21:00:39 -0400 Subject: [PATCH 02/11] And updated the PR part Sigh. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4776bea8..18b9529d 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ So you found a bug in pahimar's code? Think you can make it more efficient? Wa 3. Click the `Fork` icon at the top-right of this page (below your username). 4. Make the changes that you want to. 5. Click `Pull Request` at the right-hand side of the gray bar directly below your fork's name. -6. Enter your PR's title, and create a detailed description telling pahimar what you changed. +6. Click `Click to create a pull request for this comparison`, enter your PR's title, and create a detailed description telling pahimar what you changed. 7. Click `Send pull request`, and you're done! #### Creating an Issue @@ -103,4 +103,4 @@ EE3 crashes every time? Have a suggestion? Found a bug? Create an issue now! 2. Go to [the issues page](http://github.com/pahimar/Equivalent-Exchange-3/issues). 3. Click `New Issue` right below `Star` and `Fork`. 4. Enter your Issue's title (something that summarizes your issue), and then create a detailed description ("Hey pahimar, could you add/change xxx?" or "Hey, found an exploit: stuff"). -5. Click `Submit new issue`, and you're done! \ No newline at end of file +5. Click `Submit new issue`, and you're done! From 48a16c676effa4074eff2ddc0d0f82bde575fd03 Mon Sep 17 00:00:00 2001 From: pahimar Date: Mon, 15 Jul 2013 15:31:25 -0400 Subject: [PATCH 03/11] Initial port to MC 1.6.2, some things are still broke --- .../com/pahimar/ee3/EquivalentExchange3.java | 15 +-- .../pahimar/ee3/block/BlockAludelBase.java | 4 +- ee3_common/com/pahimar/ee3/block/BlockEE.java | 11 +- .../com/pahimar/ee3/block/BlockGlassBell.java | 4 +- .../ee3/client/audio/SoundHandler.java | 3 +- .../gui/inventory/GuiAlchemicalBag.java | 7 +- .../gui/inventory/GuiAlchemicalChest.java | 7 +- .../ee3/client/gui/inventory/GuiAludel.java | 4 +- .../client/gui/inventory/GuiCalcinator.java | 7 +- .../client/gui/inventory/GuiGlassBell.java | 4 +- .../gui/inventory/GuiPortableCrafting.java | 4 +- .../inventory/GuiPortableTransmutation.java | 4 +- .../ee3/client/renderer/RenderUtils.java | 12 +- .../item/ItemAlchemicalChestRenderer.java | 5 +- .../renderer/item/ItemAludelRenderer.java | 5 +- .../renderer/item/ItemCalcinatorRenderer.java | 4 +- .../renderer/item/ItemGlassBellRenderer.java | 4 +- .../TileEntityAlchemicalChestRenderer.java | 5 +- .../tileentity/TileEntityAludelRenderer.java | 4 +- .../TileEntityCalcinatorRenderer.java | 4 +- .../TileEntityGlassBellRenderer.java | 4 +- .../com/pahimar/ee3/command/CommandEE.java | 6 + .../pahimar/ee3/command/CommandOverlay.java | 17 +-- .../pahimar/ee3/command/CommandParticles.java | 5 +- .../pahimar/ee3/command/CommandSounds.java | 7 +- .../pahimar/ee3/command/CommandVersion.java | 3 +- .../handlers/DrawBlockHighlightHandler.java | 8 +- .../TransmutationTargetOverlayHandler.java | 4 +- .../pahimar/ee3/core/util/GeneralHelper.java | 4 +- .../com/pahimar/ee3/core/util/ItemUtil.java | 4 +- .../ee3/core/util/ResourceLocationHelper.java | 13 +++ .../ee3/creativetab/CreativeTabEE3.java | 22 ++-- ee3_common/com/pahimar/ee3/emc/DynEMC.java | 7 +- .../ee3/inventory/ContainerAlchemicalBag.java | 4 +- .../inventory/ContainerAlchemicalChest.java | 4 +- .../inventory/ContainerPortableCrafting.java | 4 +- .../ContainerPortableTransmutation.java | 4 +- .../ee3/inventory/WorldSavedDataEE.java | 2 +- .../crafting/RecipesAlchemicalBagDyes.java | 4 +- .../ee3/item/crafting/RecipesPotions.java | 2 +- .../com/pahimar/ee3/lib/Localizations.java | 2 +- ee3_common/com/pahimar/ee3/lib/Models.java | 2 +- ee3_common/com/pahimar/ee3/lib/Sounds.java | 4 +- ee3_common/com/pahimar/ee3/lib/Textures.java | 41 ++++--- .../ee3/tileentity/TileAlchemicalChest.java | 2 +- .../pahimar/ee3/tileentity/TileAludel.java | 2 +- .../ee3/tileentity/TileCalcinator.java | 2 +- .../pahimar/ee3/tileentity/TileGlassBell.java | 2 +- resources/{mods => assets}/ee3/lang/cs_CZ.xml | 102 ++++++++--------- resources/{mods => assets}/ee3/lang/cy_GB.xml | 0 resources/{mods => assets}/ee3/lang/da_DK.xml | 0 resources/{mods => assets}/ee3/lang/de_DE.xml | 0 resources/{mods => assets}/ee3/lang/el_GR.xml | 0 resources/{mods => assets}/ee3/lang/en_US.xml | 0 resources/{mods => assets}/ee3/lang/es_ES.xml | 0 resources/{mods => assets}/ee3/lang/fi_FI.xml | 0 resources/{mods => assets}/ee3/lang/fr_FR.xml | 0 resources/{mods => assets}/ee3/lang/it_IT.xml | 0 resources/{mods => assets}/ee3/lang/ja_JP.xml | 0 resources/{mods => assets}/ee3/lang/la_IT.xml | 0 resources/{mods => assets}/ee3/lang/nb_NO.xml | 0 resources/{mods => assets}/ee3/lang/nl_NL.xml | 0 resources/{mods => assets}/ee3/lang/pl_PL.xml | 106 +++++++++--------- resources/{mods => assets}/ee3/lang/pt_BR.xml | 0 resources/{mods => assets}/ee3/lang/pt_PT.xml | 0 resources/{mods => assets}/ee3/lang/ru_RU.xml | 106 +++++++++--------- resources/{mods => assets}/ee3/lang/sk_SK.xml | 0 resources/{mods => assets}/ee3/lang/sr_RS.xml | 106 +++++++++--------- resources/{mods => assets}/ee3/lang/sv_SE.xml | 0 resources/{mods => assets}/ee3/lang/tr_TR.xml | 0 resources/{mods => assets}/ee3/lang/zh_CN.xml | 0 resources/{mods => assets}/ee3/lang/zh_TW.xml | 0 .../{mods => assets}/ee3/models/aludel.obj | 0 .../ee3/models/calcinator.obj | 0 .../{mods => assets}/ee3/sound/chargeDown.ogg | Bin .../{mods => assets}/ee3/sound/chargeUp.ogg | Bin .../{mods => assets}/ee3/sound/destruct.ogg | Bin resources/{mods => assets}/ee3/sound/fail.ogg | Bin resources/{mods => assets}/ee3/sound/gust.ogg | Bin resources/{mods => assets}/ee3/sound/heal.ogg | Bin .../{mods => assets}/ee3/sound/kinesis.ogg | Bin .../{mods => assets}/ee3/sound/launch.ogg | Bin resources/{mods => assets}/ee3/sound/nova.ogg | Bin .../{mods => assets}/ee3/sound/philball.ogg | Bin resources/{mods => assets}/ee3/sound/tock.ogg | Bin .../{mods => assets}/ee3/sound/transmute.ogg | Bin resources/{mods => assets}/ee3/sound/wall.ogg | Bin .../{mods => assets}/ee3/sound/waterball.ogg | Bin resources/{mods => assets}/ee3/sound/wind.ogg | Bin .../ee3/textures/blocks/alchemicalChest.png | Bin .../ee3/textures/blocks/aludel.png | Bin .../ee3/textures/blocks/calcinator.png | Bin .../ee3/textures/blocks/glassBell.png | Bin .../ee3/textures/effects/noise.png | Bin .../ee3/textures/gui/alchemicalStorage.png | Bin .../ee3/textures/gui/aludel.png | Bin .../ee3/textures/gui/calcinator.png | Bin .../ee3/textures/gui/glassBell.png | Bin .../ee3/textures/gui/ocarina.png | Bin .../textures/gui/portableTransmutation.png | Bin .../textures/gui/sharedAlchemicalStorage.png | Bin .../textures/items/alchemicalBagClosed.png | Bin .../items/alchemicalBagClosedDrawString.png | Bin .../ee3/textures/items/alchemicalBagOpen.png | Bin .../items/alchemicalBagOpenDrawString.png | Bin .../items/alchemicalDustAmaranthine.png | Bin .../ee3/textures/items/alchemicalDustAsh.png | Bin .../textures/items/alchemicalDustAzure.png | Bin .../items/alchemicalDustIridescent.png | Bin .../textures/items/alchemicalDustMinium.png | Bin .../textures/items/alchemicalDustVerdant.png | Bin .../ee3/textures/items/algotGeneric.png | Bin .../ee3/textures/items/chalk.png | Bin .../ee3/textures/items/diviningRod.png | Bin .../textures/items/diviningRodEffectGlow.png | Bin .../ee3/textures/items/kunai.png | Bin .../ee3/textures/items/ocarina.png | Bin .../ee3/textures/items/shardMinium.png | Bin .../ee3/textures/items/spear1.png | Bin .../ee3/textures/items/spear2.png | Bin .../ee3/textures/items/spear3.png | Bin .../ee3/textures/items/spear4.png | Bin .../ee3/textures/items/staff1.png | Bin .../ee3/textures/items/staff2.png | Bin .../ee3/textures/items/staff3.png | Bin .../ee3/textures/items/staff4.png | Bin .../ee3/textures/items/staff5.png | Bin .../ee3/textures/items/staff6.png | Bin .../ee3/textures/items/stoneEffectFlame.png | Bin .../ee3/textures/items/stoneInert.png | Bin .../ee3/textures/items/stoneMinium.png | Bin .../ee3/textures/items/stonePhilosophers.png | Bin .../ee3/textures/logo/logo.png | Bin .../ee3/textures/models/alchemicalChest.png | Bin .../ee3/textures/models/aludel.png | Bin .../ee3/textures/models/calcinator.png | Bin .../textures/xcf/blocks/alchemicalChest.xcf | Bin .../ee3/textures/xcf/blocks/aludel.xcf | Bin .../ee3/textures/xcf/blocks/calcinator.xcf | Bin .../ee3/textures/xcf/blocks/glassBell.xcf | Bin .../ee3/textures/xcf/effects/noise.xcf | Bin .../textures/xcf/gui/alchemicalStorage.xcf | Bin .../ee3/textures/xcf/gui/aludel.xcf | Bin .../ee3/textures/xcf/gui/base_gui.xcf | Bin .../ee3/textures/xcf/gui/calcinator.xcf | Bin .../ee3/textures/xcf/gui/glassBell.xcf | Bin .../ee3/textures/xcf/gui/ocarina.xcf | Bin .../xcf/gui/portableTransmutation.xcf | Bin .../xcf/gui/sharedAlchemicalStorage.xcf | Bin .../xcf/items/alchemicalBagClosed.xcf | Bin .../items/alchemicalBagClosedDrawString.xcf | Bin .../textures/xcf/items/alchemicalBagOpen.xcf | Bin .../xcf/items/alchemicalBagOpenDrawString.xcf | Bin .../ee3/textures/xcf/items/algotGeneric.xcf | Bin .../ee3/textures/xcf/items/chalk.xcf | Bin .../ee3/textures/xcf/items/diviningRod.xcf | Bin .../xcf/items/diviningRodEffectGlow.xcf | Bin .../xcf/items/dustAlchemicalAmaranthine.xcf | Bin .../textures/xcf/items/dustAlchemicalAsh.xcf | Bin .../xcf/items/dustAlchemicalAzure.xcf | Bin .../xcf/items/dustAlchemicalIridescent.xcf | Bin .../xcf/items/dustAlchemicalMinium.xcf | Bin .../xcf/items/dustAlchemicalVerdant.xcf | Bin .../ee3/textures/xcf/items/kunai.xcf | Bin .../ee3/textures/xcf/items/ocarina.xcf | Bin .../ee3/textures/xcf/items/shardMinium.xcf | Bin .../ee3/textures/xcf/items/spear1.xcf | Bin .../ee3/textures/xcf/items/spear2.xcf | Bin .../ee3/textures/xcf/items/spear3.xcf | Bin .../ee3/textures/xcf/items/spear4.xcf | Bin .../ee3/textures/xcf/items/staff1.xcf | Bin .../ee3/textures/xcf/items/staff2.xcf | Bin .../ee3/textures/xcf/items/staff3.xcf | Bin .../ee3/textures/xcf/items/staff4.xcf | Bin .../ee3/textures/xcf/items/staff5.xcf | Bin .../ee3/textures/xcf/items/staff6.xcf | Bin .../textures/xcf/items/stoneEffectFlame.xcf | Bin .../ee3/textures/xcf/items/stoneInert.xcf | Bin .../ee3/textures/xcf/items/stoneMinium.xcf | Bin .../textures/xcf/items/stonePhilosophers.xcf | Bin .../ee3/textures/xcf/logo/logo.xcf | Bin .../textures/xcf/models/alchemicalChest.xcf | Bin .../ee3/textures/xcf/models/aludel.xcf | Bin .../ee3/textures/xcf/models/calcinator.xcf | Bin 184 files changed, 403 insertions(+), 319 deletions(-) create mode 100644 ee3_common/com/pahimar/ee3/core/util/ResourceLocationHelper.java rename resources/{mods => assets}/ee3/lang/cs_CZ.xml (98%) rename resources/{mods => assets}/ee3/lang/cy_GB.xml (100%) rename resources/{mods => assets}/ee3/lang/da_DK.xml (100%) rename resources/{mods => assets}/ee3/lang/de_DE.xml (100%) rename resources/{mods => assets}/ee3/lang/el_GR.xml (100%) rename resources/{mods => assets}/ee3/lang/en_US.xml (100%) rename resources/{mods => assets}/ee3/lang/es_ES.xml (100%) rename resources/{mods => assets}/ee3/lang/fi_FI.xml (100%) rename resources/{mods => assets}/ee3/lang/fr_FR.xml (100%) rename resources/{mods => assets}/ee3/lang/it_IT.xml (100%) rename resources/{mods => assets}/ee3/lang/ja_JP.xml (100%) rename resources/{mods => assets}/ee3/lang/la_IT.xml (100%) rename resources/{mods => assets}/ee3/lang/nb_NO.xml (100%) rename resources/{mods => assets}/ee3/lang/nl_NL.xml (100%) rename resources/{mods => assets}/ee3/lang/pl_PL.xml (98%) rename resources/{mods => assets}/ee3/lang/pt_BR.xml (100%) rename resources/{mods => assets}/ee3/lang/pt_PT.xml (100%) rename resources/{mods => assets}/ee3/lang/ru_RU.xml (99%) rename resources/{mods => assets}/ee3/lang/sk_SK.xml (100%) rename resources/{mods => assets}/ee3/lang/sr_RS.xml (98%) rename resources/{mods => assets}/ee3/lang/sv_SE.xml (100%) rename resources/{mods => assets}/ee3/lang/tr_TR.xml (100%) rename resources/{mods => assets}/ee3/lang/zh_CN.xml (100%) rename resources/{mods => assets}/ee3/lang/zh_TW.xml (100%) rename resources/{mods => assets}/ee3/models/aludel.obj (100%) rename resources/{mods => assets}/ee3/models/calcinator.obj (100%) rename resources/{mods => assets}/ee3/sound/chargeDown.ogg (100%) rename resources/{mods => assets}/ee3/sound/chargeUp.ogg (100%) rename resources/{mods => assets}/ee3/sound/destruct.ogg (100%) rename resources/{mods => assets}/ee3/sound/fail.ogg (100%) rename resources/{mods => assets}/ee3/sound/gust.ogg (100%) rename resources/{mods => assets}/ee3/sound/heal.ogg (100%) rename resources/{mods => assets}/ee3/sound/kinesis.ogg (100%) rename resources/{mods => assets}/ee3/sound/launch.ogg (100%) rename resources/{mods => assets}/ee3/sound/nova.ogg (100%) rename resources/{mods => assets}/ee3/sound/philball.ogg (100%) rename resources/{mods => assets}/ee3/sound/tock.ogg (100%) rename resources/{mods => assets}/ee3/sound/transmute.ogg (100%) rename resources/{mods => assets}/ee3/sound/wall.ogg (100%) rename resources/{mods => assets}/ee3/sound/waterball.ogg (100%) rename resources/{mods => assets}/ee3/sound/wind.ogg (100%) rename resources/{mods => assets}/ee3/textures/blocks/alchemicalChest.png (100%) rename resources/{mods => assets}/ee3/textures/blocks/aludel.png (100%) rename resources/{mods => assets}/ee3/textures/blocks/calcinator.png (100%) rename resources/{mods => assets}/ee3/textures/blocks/glassBell.png (100%) rename resources/{mods => assets}/ee3/textures/effects/noise.png (100%) rename resources/{mods => assets}/ee3/textures/gui/alchemicalStorage.png (100%) rename resources/{mods => assets}/ee3/textures/gui/aludel.png (100%) rename resources/{mods => assets}/ee3/textures/gui/calcinator.png (100%) rename resources/{mods => assets}/ee3/textures/gui/glassBell.png (100%) rename resources/{mods => assets}/ee3/textures/gui/ocarina.png (100%) rename resources/{mods => assets}/ee3/textures/gui/portableTransmutation.png (100%) rename resources/{mods => assets}/ee3/textures/gui/sharedAlchemicalStorage.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalBagClosed.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalBagClosedDrawString.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalBagOpen.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalBagOpenDrawString.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalDustAmaranthine.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalDustAsh.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalDustAzure.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalDustIridescent.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalDustMinium.png (100%) rename resources/{mods => assets}/ee3/textures/items/alchemicalDustVerdant.png (100%) rename resources/{mods => assets}/ee3/textures/items/algotGeneric.png (100%) rename resources/{mods => assets}/ee3/textures/items/chalk.png (100%) rename resources/{mods => assets}/ee3/textures/items/diviningRod.png (100%) rename resources/{mods => assets}/ee3/textures/items/diviningRodEffectGlow.png (100%) rename resources/{mods => assets}/ee3/textures/items/kunai.png (100%) rename resources/{mods => assets}/ee3/textures/items/ocarina.png (100%) rename resources/{mods => assets}/ee3/textures/items/shardMinium.png (100%) rename resources/{mods => assets}/ee3/textures/items/spear1.png (100%) rename resources/{mods => assets}/ee3/textures/items/spear2.png (100%) rename resources/{mods => assets}/ee3/textures/items/spear3.png (100%) rename resources/{mods => assets}/ee3/textures/items/spear4.png (100%) rename resources/{mods => assets}/ee3/textures/items/staff1.png (100%) rename resources/{mods => assets}/ee3/textures/items/staff2.png (100%) rename resources/{mods => assets}/ee3/textures/items/staff3.png (100%) rename resources/{mods => assets}/ee3/textures/items/staff4.png (100%) rename resources/{mods => assets}/ee3/textures/items/staff5.png (100%) rename resources/{mods => assets}/ee3/textures/items/staff6.png (100%) rename resources/{mods => assets}/ee3/textures/items/stoneEffectFlame.png (100%) rename resources/{mods => assets}/ee3/textures/items/stoneInert.png (100%) rename resources/{mods => assets}/ee3/textures/items/stoneMinium.png (100%) rename resources/{mods => assets}/ee3/textures/items/stonePhilosophers.png (100%) rename resources/{mods => assets}/ee3/textures/logo/logo.png (100%) rename resources/{mods => assets}/ee3/textures/models/alchemicalChest.png (100%) rename resources/{mods => assets}/ee3/textures/models/aludel.png (100%) rename resources/{mods => assets}/ee3/textures/models/calcinator.png (100%) rename resources/{mods => assets}/ee3/textures/xcf/blocks/alchemicalChest.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/blocks/aludel.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/blocks/calcinator.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/blocks/glassBell.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/effects/noise.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/gui/alchemicalStorage.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/gui/aludel.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/gui/base_gui.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/gui/calcinator.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/gui/glassBell.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/gui/ocarina.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/gui/portableTransmutation.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/alchemicalBagClosed.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/alchemicalBagOpen.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/algotGeneric.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/chalk.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/diviningRod.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/diviningRodEffectGlow.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/dustAlchemicalAsh.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/dustAlchemicalAzure.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/dustAlchemicalMinium.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/kunai.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/ocarina.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/shardMinium.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/spear1.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/spear2.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/spear3.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/spear4.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/staff1.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/staff2.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/staff3.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/staff4.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/staff5.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/staff6.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/stoneEffectFlame.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/stoneInert.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/stoneMinium.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/items/stonePhilosophers.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/logo/logo.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/models/alchemicalChest.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/models/aludel.xcf (100%) rename resources/{mods => assets}/ee3/textures/xcf/models/calcinator.xcf (100%) diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java index 78b4b9a0..71324277 100644 --- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -37,6 +37,7 @@ import com.pahimar.ee3.nbt.NBTHelper; import com.pahimar.ee3.network.PacketHandler; import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.FingerprintWarning; import cpw.mods.fml.common.Mod.IMCCallback; import cpw.mods.fml.common.Mod.Init; @@ -79,21 +80,21 @@ public class EquivalentExchange3 { public static CreativeTabs tabsEE3 = new CreativeTabEE3(CreativeTabs.getNextID(), Reference.MOD_ID); - @FingerprintWarning + @EventHandler public void invalidFingerprint(FMLFingerprintViolationEvent event) { // Report (log) to the user that the version of Equivalent Exchange 3 they are using has been changed/tampered with LogHelper.severe(Strings.INVALID_FINGERPRINT_MESSAGE); } - @ServerStarting + @EventHandler public void serverStarting(FMLServerStartingEvent event) { // Initialize the custom commands CommandHandler.initCommands(event); } - @PreInit + @EventHandler public void preInit(FMLPreInitializationEvent event) { // Initialize the log helper @@ -127,8 +128,8 @@ public class EquivalentExchange3 { ModItems.init(); } + @EventHandler @SuppressWarnings("unchecked") - @Init public void load(FMLInitializationEvent event) { // Register the GUI Handler @@ -169,18 +170,18 @@ public class EquivalentExchange3 { FMLInterModComms.sendMessage(Reference.MOD_ID, InterModComms.ADD_RECIPE, NBTHelper.encodeRecipeAsNBT(Item.bucketLava, Arrays.asList(Item.bucketEmpty, Block.lavaStill))); } - @PostInit + @EventHandler public void modsLoaded(FMLPostInitializationEvent event) { // Initialize the Addon Handler AddonHandler.init(); // Initialize the DynEMC system - @SuppressWarnings("unused") + // TODO Seems like this happens earlier than it should now, investigate where this should go DynEMC dynEMC = DynEMC.getInstance(); } - @IMCCallback + @EventHandler public void handleIMCMessages(IMCEvent event) { InterModCommsHandler.processIMCMessages(event); diff --git a/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java b/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java index c33ec713..e122cddf 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java +++ b/ee3_common/com/pahimar/ee3/block/BlockAludelBase.java @@ -3,7 +3,7 @@ package com.pahimar.ee3.block; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -103,7 +103,7 @@ public class BlockAludelBase extends BlockEE { } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityLiving, ItemStack itemStack) { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityLiving, ItemStack itemStack) { super.onBlockPlacedBy(world, x, y, z, entityLiving, itemStack); diff --git a/ee3_common/com/pahimar/ee3/block/BlockEE.java b/ee3_common/com/pahimar/ee3/block/BlockEE.java index db52fc33..1b4eafa3 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockEE.java +++ b/ee3_common/com/pahimar/ee3/block/BlockEE.java @@ -3,7 +3,7 @@ package com.pahimar.ee3.block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -35,14 +35,19 @@ public abstract class BlockEE extends BlockContainer { @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - blockIcon = iconRegister.registerIcon(Reference.MOD_ID.toLowerCase() + ":" + this.getUnlocalizedName2()); + blockIcon = iconRegister.registerIcon(String.format("%s:%s", Reference.MOD_ID.toLowerCase(), getUnwrappedUnlocalizedName(this.getUnlocalizedName()))); + } + + protected String getUnwrappedUnlocalizedName(String unlocalizedName) { + + return unlocalizedName.substring(unlocalizedName.indexOf(".") + 1); } /** * Sets the direction of the block when placed */ @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityLiving, ItemStack itemStack) { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityLiving, ItemStack itemStack) { int direction = 0; int facing = MathHelper.floor_double(entityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; diff --git a/ee3_common/com/pahimar/ee3/block/BlockGlassBell.java b/ee3_common/com/pahimar/ee3/block/BlockGlassBell.java index a0cbdd90..0262ff15 100644 --- a/ee3_common/com/pahimar/ee3/block/BlockGlassBell.java +++ b/ee3_common/com/pahimar/ee3/block/BlockGlassBell.java @@ -4,7 +4,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -97,7 +97,7 @@ public class BlockGlassBell extends BlockEE { } @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityLiving, ItemStack itemStack) { + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityLiving, ItemStack itemStack) { if (itemStack.hasDisplayName()) { ((TileEE) world.getBlockTileEntity(x, y, z)).setCustomName(itemStack.getDisplayName()); diff --git a/ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java b/ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java index 744cf5e4..e32f62b5 100644 --- a/ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java +++ b/ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java @@ -4,6 +4,7 @@ import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.event.ForgeSubscribe; import com.pahimar.ee3.core.util.LogHelper; +import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Sounds; /** @@ -24,7 +25,7 @@ public class SoundHandler { for (String soundFile : Sounds.soundFiles) { // Try to add the custom sound file to the pool of sounds try { - event.manager.soundPoolSounds.addSound(soundFile, this.getClass().getResource("/" + soundFile)); + event.manager.addSound(soundFile); } // If we cannot add the custom sound file to the pool, log the exception catch (Exception e) { diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java index d4091e91..6d6f051c 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java @@ -3,10 +3,12 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerAlchemicalBag; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; @@ -45,7 +47,10 @@ public class GuiAlchemicalBag extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(Textures.GUI_ALCHEMICAL_STORAGE); + + // this.mc.getTextureManager().bindTexture(...) + this.mc.func_110434_K().func_110577_a(Textures.GUI_ALCHEMICAL_STORAGE); + int xStart = (width - xSize) / 2; int yStart = (height - ySize) / 2; this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java index f4d14fe1..96024542 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java @@ -2,10 +2,12 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerAlchemicalChest; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; @@ -47,7 +49,10 @@ public class GuiAlchemicalChest extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(Textures.GUI_ALCHEMICAL_STORAGE); + + // this.mc.getTextureManager().bindTexture(...) + this.mc.func_110434_K().func_110577_a(Textures.GUI_ALCHEMICAL_STORAGE); + int xStart = (width - xSize) / 2; int yStart = (height - ySize) / 2; this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java index 72c23bbb..1e1f9490 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java @@ -2,10 +2,12 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerAludel; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; @@ -48,7 +50,7 @@ public class GuiAludel extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(Textures.GUI_ALUDEL); + this.mc.func_110434_K().func_110577_a(Textures.GUI_ALUDEL); int xStart = (width - xSize) / 2; int yStart = (height - ySize) / 2; this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java index f08f4de8..02728c1b 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java @@ -2,10 +2,12 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerCalcinator; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; @@ -47,7 +49,10 @@ public class GuiCalcinator extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(Textures.GUI_CALCINATOR); + + //this.mc.getTextureManager().bindTexture(...) + this.mc.func_110434_K().func_110577_a(Textures.GUI_CALCINATOR); + int xStart = (width - xSize) / 2; int yStart = (height - ySize) / 2; this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java index 1333a49b..fad655c8 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java @@ -2,10 +2,12 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerGlassBell; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; @@ -48,7 +50,7 @@ public class GuiGlassBell extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(Textures.GUI_GLASS_BELL); + this.mc.func_110434_K().func_110577_a(Textures.GUI_GLASS_BELL); int xStart = (width - xSize) / 2; int yStart = (height - ySize) / 2; this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java index 918e5aba..ef3886ad 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java @@ -3,11 +3,13 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerPortableCrafting; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; @@ -52,7 +54,7 @@ public class GuiPortableCrafting extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(Textures.GUI_PORTABLE_CRAFTING); + this.mc.func_110434_K().func_110577_a(Textures.GUI_PORTABLE_CRAFTING); int var5 = (width - xSize) / 2; int var6 = (height - ySize) / 2; this.drawTexturedModalRect(var5, var6, 0, 0, xSize, ySize); diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java index 60ba543b..ddaa4271 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java @@ -3,9 +3,11 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.nbt.NBTHelper; @@ -35,7 +37,7 @@ public class GuiPortableTransmutation extends GuiContainer { protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(Textures.GUI_PORTABLE_TRANSMUTATION); + this.mc.func_110434_K().func_110577_a(Textures.GUI_PORTABLE_TRANSMUTATION); int var5 = (width - xSize) / 2; int var6 = (height - ySize) / 2; this.drawTexturedModalRect(var5, var6, 0, 0, xSize, ySize); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java b/ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java index 2a209f92..6c29da57 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java @@ -3,8 +3,8 @@ package com.pahimar.ee3.client.renderer; import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderEngine; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; @@ -13,6 +13,8 @@ import org.lwjgl.opengl.GL11; import com.pahimar.ee3.lib.Textures; +import cpw.mods.fml.client.FMLClientHandler; + /** * Equivalent-Exchange-3 * @@ -26,12 +28,12 @@ public class RenderUtils { private static int rotationAngle = 0; - public static void renderRotatingBlockIntoGUI(FontRenderer fontRenderer, RenderEngine renderEngine, ItemStack stack, int x, int y, float zLevel, float scale) { + public static void renderRotatingBlockIntoGUI(FontRenderer fontRenderer, ItemStack stack, int x, int y, float zLevel, float scale) { RenderBlocks renderBlocks = new RenderBlocks(); Block block = Block.blocksList[stack.itemID]; - renderEngine.bindTexture(Textures.VANILLA_BLOCK_TEXTURE_SHEET); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.VANILLA_BLOCK_TEXTURE_SHEET); GL11.glPushMatrix(); GL11.glTranslatef(x - 2, y + 3, -3.0F + zLevel); GL11.glScalef(10.0F, 10.0F, 10.0F); @@ -55,11 +57,11 @@ public class RenderUtils { GL11.glPopMatrix(); } - public static void renderItemIntoGUI(FontRenderer fontRenderer, RenderEngine renderEngine, ItemStack itemStack, int x, int y, float opacity, float scale) { + public static void renderItemIntoGUI(FontRenderer fontRenderer, ItemStack itemStack, int x, int y, float opacity, float scale) { Icon icon = itemStack.getIconIndex(); GL11.glDisable(GL11.GL_LIGHTING); - renderEngine.bindTexture(Textures.VANILLA_ITEM_TEXTURE_SHEET); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.VANILLA_ITEM_TEXTURE_SHEET); int overlayColour = itemStack.getItem().getColorFromItemStack(itemStack, 0); float red = (overlayColour >> 16 & 255) / 255.0F; float green = (overlayColour >> 8 & 255) / 255.0F; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java index c3f8b2f1..e815b7b7 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java @@ -2,10 +2,13 @@ package com.pahimar.ee3.client.renderer.item; import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.core.util.ResourceLocationHelper; +import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; @@ -70,7 +73,7 @@ public class ItemAlchemicalChestRenderer implements IItemRenderer { private void renderAlchemicalChest(float x, float y, float z) { - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_ALCHEMICAL_CHEST); GL11.glPushMatrix(); //start GL11.glTranslatef(x, y, z); //size GL11.glRotatef(180, 1, 0, 0); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java index ddfcdd9e..1e61a6de 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java @@ -1,11 +1,14 @@ package com.pahimar.ee3.client.renderer.item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelAludel; +import com.pahimar.ee3.core.util.ResourceLocationHelper; +import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; @@ -79,7 +82,7 @@ public class ItemAludelRenderer implements IItemRenderer { GL11.glRotatef(-90F, 1F, 0, 0); // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_ALUDEL); // Render modelAludel.render(); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java index 928e1804..84fa7389 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java @@ -1,11 +1,13 @@ package com.pahimar.ee3.client.renderer.item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelCalcinator; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; @@ -79,7 +81,7 @@ public class ItemCalcinatorRenderer implements IItemRenderer { GL11.glRotatef(-90F, 1F, 0, 0); // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_CALCINATOR); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_CALCINATOR); // Render modelCalcinator.render(); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java index 7ccf65a7..9f3f9e10 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java @@ -1,11 +1,13 @@ package com.pahimar.ee3.client.renderer.item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelGlassBell; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; @@ -79,7 +81,7 @@ public class ItemGlassBellRenderer implements IItemRenderer { GL11.glRotatef(-90F, 1F, 0, 0); // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_GLASS_BELL); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_GLASS_BELL); // Render modelGlassBell.render(); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java index 1b9a6d2f..2620ba51 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java @@ -3,11 +3,14 @@ package com.pahimar.ee3.client.renderer.tileentity; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.pahimar.ee3.core.util.ResourceLocationHelper; +import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileAlchemicalChest; @@ -42,7 +45,7 @@ public class TileEntityAlchemicalChestRenderer extends direction = ForgeDirection.getOrientation(tileAlchemicalChest.getBlockMetadata()); } - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMICAL_CHEST); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_ALCHEMICAL_CHEST); GL11.glPushMatrix(); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java index ed28fc1b..d01f1413 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java @@ -7,11 +7,13 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelAludel; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileAludel; import com.pahimar.ee3.tileentity.TileGlassBell; @@ -63,7 +65,7 @@ public class TileEntityAludelRenderer extends TileEntitySpecialRenderer { scaleTranslateRotate(x, y, z, tileAludel.getOrientation()); // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALUDEL); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_ALUDEL); // Render modelAludel.render(); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java index 6963c83d..4a08e944 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java @@ -2,10 +2,12 @@ package com.pahimar.ee3.client.renderer.tileentity; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelCalcinator; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileCalcinator; @@ -43,7 +45,7 @@ public class TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer { GL11.glRotatef(-90F, 1F, 0F, 0F); // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_CALCINATOR); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_CALCINATOR); // Render modelCalcinator.renderPart("Calcinator"); diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java index 04c1ab2d..fd6c74d0 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java @@ -7,11 +7,13 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelGlassBell; +import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileGlassBell; @@ -66,7 +68,7 @@ public class TileEntityGlassBellRenderer extends TileEntitySpecialRenderer { renderGlassBellByOrientation(x, y, z, tileGlassBell.getOrientation()); // Bind texture - FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_GLASS_BELL); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(Textures.MODEL_GLASS_BELL); modelGlassBell.render(); diff --git a/ee3_common/com/pahimar/ee3/command/CommandEE.java b/ee3_common/com/pahimar/ee3/command/CommandEE.java index a1a12e44..da68bbb2 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandEE.java +++ b/ee3_common/com/pahimar/ee3/command/CommandEE.java @@ -94,4 +94,10 @@ public class CommandEE extends CommandBase { else throw new WrongUsageException(Commands.COMMAND_EE3_USAGE, new Object[0]); } + + @Override + public String getCommandUsage(ICommandSender icommandsender) { + // TODO Auto-generated method stub + return null; + } } diff --git a/ee3_common/com/pahimar/ee3/command/CommandOverlay.java b/ee3_common/com/pahimar/ee3/command/CommandOverlay.java index 90e47fe2..4be37282 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandOverlay.java +++ b/ee3_common/com/pahimar/ee3/command/CommandOverlay.java @@ -2,6 +2,7 @@ package com.pahimar.ee3.command; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; +import net.minecraft.util.ChatMessageComponent; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; @@ -52,14 +53,14 @@ public class CommandOverlay { ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION = true; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME, Strings.TRUE); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_OVERLAY_TURNED_ON)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(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, Strings.FALSE); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_OVERLAY_TURNED_OFF)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_TURNED_OFF)); } private static void processScaleCommand(ICommandSender commandSender, String[] args) { @@ -73,7 +74,7 @@ public class CommandOverlay { else { ConfigurationSettings.TARGET_BLOCK_OVERLAY_SCALE = scale; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_SCALE_CONFIGNAME, args[1]); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_OVERLAY_SCALE_UPDATED)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_SCALE_UPDATED)); } } catch (Exception e) { @@ -95,7 +96,7 @@ public class CommandOverlay { else { ConfigurationSettings.TARGET_BLOCK_OVERLAY_OPACITY = opacity; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.TARGET_BLOCK_OVERLAY_OPACITY_CONFIGNAME, args[1]); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_OVERLAY_OPACITY_UPDATED)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_OPACITY_UPDATED)); } } catch (Exception e) { @@ -117,22 +118,22 @@ public class CommandOverlay { 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(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_OVERLAY_POSITION_TOP_LEFT)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_POSITION_TOP_LEFT)); } 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(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_OVERLAY_POSITION_TOP_RIGHT)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_POSITION_TOP_RIGHT)); } 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(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_LEFT)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_LEFT)); } 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(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_RIGHT)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_OVERLAY_POSITION_BOTTOM_RIGHT)); } else 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 34c35d1b..08ce8350 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandParticles.java +++ b/ee3_common/com/pahimar/ee3/command/CommandParticles.java @@ -2,6 +2,7 @@ package com.pahimar.ee3.command; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; +import net.minecraft.util.ChatMessageComponent; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; @@ -45,13 +46,13 @@ public class CommandParticles { ConfigurationSettings.ENABLE_PARTICLE_FX = true; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_GRAPHICS, ConfigurationSettings.ENABLE_PARTICLE_FX_CONFIGNAME, Strings.TRUE); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_PARTICLES_TURNED_ON)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(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, Strings.FALSE); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_PARTICLES_TURNED_OFF)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(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 68d9f859..5c686b01 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandSounds.java +++ b/ee3_common/com/pahimar/ee3/command/CommandSounds.java @@ -2,6 +2,7 @@ package com.pahimar.ee3.command; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; +import net.minecraft.util.ChatMessageComponent; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; @@ -47,20 +48,20 @@ public class CommandSounds { ConfigurationSettings.ENABLE_SOUNDS = Commands.ALL; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.ALL); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_SOUNDS_SET_TO_ALL)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_SOUNDS_SET_TO_ALL)); } private static void processSelfCommand(ICommandSender commandSender) { ConfigurationSettings.ENABLE_SOUNDS = Commands.SELF; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.SELF); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_SOUNDS_SET_TO_SELF)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_SOUNDS_SET_TO_SELF)); } private static void processOffCommand(ICommandSender commandSender) { ConfigurationSettings.ENABLE_SOUNDS = Commands.OFF; ConfigurationHandler.set(ConfigurationHandler.CATEGORY_AUDIO, ConfigurationSettings.ENABLE_SOUNDS_CONFIGNAME, Commands.OFF); - commandSender.sendChatToPlayer(Colours.TEXT_COLOUR_PREFIX_GRAY + LocalizationUtil.getLocalizedString(Commands.COMMAND_SOUNDS_TURNED_OFF)); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(Commands.COMMAND_SOUNDS_TURNED_OFF)); } } diff --git a/ee3_common/com/pahimar/ee3/command/CommandVersion.java b/ee3_common/com/pahimar/ee3/command/CommandVersion.java index cc7e3dd6..3f52f2c1 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandVersion.java +++ b/ee3_common/com/pahimar/ee3/command/CommandVersion.java @@ -2,6 +2,7 @@ package com.pahimar.ee3.command; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; +import net.minecraft.util.ChatMessageComponent; import com.pahimar.ee3.core.util.VersionHelper; import com.pahimar.ee3.lib.Commands; @@ -39,7 +40,7 @@ public class CommandVersion { private static void processVersionCommand(ICommandSender commandSender) { - commandSender.sendChatToPlayer(VersionHelper.getResultMessage()); + commandSender.sendChatToPlayer(ChatMessageComponent.func_111077_e(VersionHelper.getResultMessage())); } private static void processChangelogCommand(ICommandSender commandSender) { diff --git a/ee3_common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java index 02967037..a817896e 100644 --- a/ee3_common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java @@ -3,6 +3,7 @@ package com.pahimar.ee3.core.handlers; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.EnumMovingObjectType; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.DrawBlockHighlightEvent; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.event.ForgeSubscribe; @@ -63,7 +64,6 @@ public class DrawBlockHighlightHandler { double iPX = event.player.prevPosX + (event.player.posX - event.player.prevPosX) * event.partialTicks; double iPY = event.player.prevPosY + (event.player.posY - event.player.prevPosY) * event.partialTicks; double iPZ = event.player.prevPosZ + (event.player.posZ - event.player.prevPosZ) * event.partialTicks; - int texture = event.context.renderEngine.getTexture(Textures.EFFECT_WORLD_TRANSMUTATION); float xScale = 1; float yScale = 1; @@ -143,7 +143,7 @@ public class DrawBlockHighlightHandler { GL11.glRotatef(90, forgeDir.offsetX, forgeDir.offsetY, forgeDir.offsetZ); GL11.glTranslated(0, 0, 0.5f * zCorrection); GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT); - renderPulsingQuad(texture, 0.75F); + renderPulsingQuad(Textures.EFFECT_WORLD_TRANSMUTATION, 0.75F); GL11.glPopMatrix(); } @@ -151,11 +151,11 @@ public class DrawBlockHighlightHandler { GL11.glDepthMask(true); } - public static void renderPulsingQuad(int texture, float maxTransparency) { + public static void renderPulsingQuad(ResourceLocation texture, float maxTransparency) { float pulseTransparency = getPulseValue() * maxTransparency / 3000f; - GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture); + FMLClientHandler.instance().getClient().renderEngine.func_110577_a(texture); Tessellator tessellator = Tessellator.instance; GL11.glEnable(GL12.GL_RESCALE_NORMAL); diff --git a/ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java index d4d340af..11afbf0e 100644 --- a/ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/TransmutationTargetOverlayHandler.java @@ -135,10 +135,10 @@ public class TransmutationTargetOverlayHandler implements ITickHandler { } } - RenderUtils.renderItemIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, stack, hudOverlayX, hudOverlayY, overlayOpacity, overlayScale); + RenderUtils.renderItemIntoGUI(minecraft.fontRenderer, stack, hudOverlayX, hudOverlayY, overlayOpacity, overlayScale); if (TransmutationHelper.targetBlockStack != null && TransmutationHelper.targetBlockStack.getItem() instanceof ItemBlock) { - RenderUtils.renderRotatingBlockIntoGUI(minecraft.fontRenderer, minecraft.renderEngine, TransmutationHelper.targetBlockStack, hudBlockX, hudBlockY, -90, blockScale); + RenderUtils.renderRotatingBlockIntoGUI(minecraft.fontRenderer, TransmutationHelper.targetBlockStack, hudBlockX, hudBlockY, -90, blockScale); } GL11.glDisable(GL11.GL_LIGHTING); diff --git a/ee3_common/com/pahimar/ee3/core/util/GeneralHelper.java b/ee3_common/com/pahimar/ee3/core/util/GeneralHelper.java index a194e5a2..fc3cb7c0 100644 --- a/ee3_common/com/pahimar/ee3/core/util/GeneralHelper.java +++ b/ee3_common/com/pahimar/ee3/core/util/GeneralHelper.java @@ -3,7 +3,7 @@ package com.pahimar.ee3.core.util; import java.util.ArrayList; import net.minecraft.block.Block; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -44,7 +44,7 @@ public class GeneralHelper { return list.toArray(); } - public static boolean isHostileEntity(EntityLiving entity) { + public static boolean isHostileEntity(EntityLivingBase entity) { if (entity instanceof IMob) return true; diff --git a/ee3_common/com/pahimar/ee3/core/util/ItemUtil.java b/ee3_common/com/pahimar/ee3/core/util/ItemUtil.java index 3dc1d607..d9b4f22d 100644 --- a/ee3_common/com/pahimar/ee3/core/util/ItemUtil.java +++ b/ee3_common/com/pahimar/ee3/core/util/ItemUtil.java @@ -1,6 +1,6 @@ package com.pahimar.ee3.core.util; -import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -190,7 +190,7 @@ public class ItemUtil { } } - public static void dropMiniumShard(EntityPlayer player, EntityLiving entity) { + public static void dropMiniumShard(EntityPlayer player, EntityLivingBase entity) { if (GeneralHelper.isHostileEntity(entity)) { rand = Math.random(); diff --git a/ee3_common/com/pahimar/ee3/core/util/ResourceLocationHelper.java b/ee3_common/com/pahimar/ee3/core/util/ResourceLocationHelper.java new file mode 100644 index 00000000..148c51da --- /dev/null +++ b/ee3_common/com/pahimar/ee3/core/util/ResourceLocationHelper.java @@ -0,0 +1,13 @@ +package com.pahimar.ee3.core.util; + +import com.pahimar.ee3.lib.Reference; + +import net.minecraft.util.ResourceLocation; + +public class ResourceLocationHelper { + + public static ResourceLocation getResourceLocation(String path) { + + return new ResourceLocation(Reference.MOD_ID.toLowerCase(), path); + } +} diff --git a/ee3_common/com/pahimar/ee3/creativetab/CreativeTabEE3.java b/ee3_common/com/pahimar/ee3/creativetab/CreativeTabEE3.java index 0d24956e..b8e27ccd 100644 --- a/ee3_common/com/pahimar/ee3/creativetab/CreativeTabEE3.java +++ b/ee3_common/com/pahimar/ee3/creativetab/CreativeTabEE3.java @@ -18,19 +18,19 @@ import cpw.mods.fml.relauncher.SideOnly; */ public class CreativeTabEE3 extends CreativeTabs { - public CreativeTabEE3(int par1, String par2Str) { + public CreativeTabEE3(int par1, String par2Str) { - super(par1, par2Str); - } + super(par1, par2Str); + } - @Override - @SideOnly(Side.CLIENT) - /** - * the itemID for the item to be displayed on the tab - */ - public int getTabIconItemIndex() { + @Override + @SideOnly(Side.CLIENT) + /** + * the itemID for the item to be displayed on the tab + */ + public int getTabIconItemIndex() { - return ItemIds.MINIUM_SHARD; - } + return ItemIds.MINIUM_SHARD; + } } diff --git a/ee3_common/com/pahimar/ee3/emc/DynEMC.java b/ee3_common/com/pahimar/ee3/emc/DynEMC.java index 053faa03..0a22867b 100644 --- a/ee3_common/com/pahimar/ee3/emc/DynEMC.java +++ b/ee3_common/com/pahimar/ee3/emc/DynEMC.java @@ -2,6 +2,7 @@ package com.pahimar.ee3.emc; import java.util.Iterator; import java.util.List; +import java.util.NoSuchElementException; import java.util.Set; import com.google.common.collect.Multimap; @@ -64,7 +65,11 @@ public class DynEMC { if (recipeOutput.getStackSize() != 0) { - graph.addEdge(unWrappedRecipeOutput, unWrappedRecipeInput, (recipeInput.getStackSize() * 1.0f) / recipeOutput.getStackSize()); + try { + graph.addEdge(unWrappedRecipeOutput, unWrappedRecipeInput, (recipeInput.getStackSize() * 1.0f) / recipeOutput.getStackSize()); + } catch (NoSuchElementException e) { + LogHelper.severe(e.getLocalizedMessage()); + } } } } diff --git a/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java b/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java index fc417a2c..04a8f51c 100644 --- a/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java @@ -48,9 +48,9 @@ public class ContainerAlchemicalBag extends Container { } @Override - public void onCraftGuiClosed(EntityPlayer player) { + public void onContainerClosed(EntityPlayer player) { - super.onCraftGuiClosed(player); + super.onContainerClosed(player); if (!player.worldObj.isRemote) { InventoryPlayer invPlayer = player.inventory; diff --git a/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java b/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java index fa2222c8..9f8d690f 100644 --- a/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalChest.java @@ -63,9 +63,9 @@ public class ContainerAlchemicalChest extends Container { * Callback for when the crafting gui is closed. */ @Override - public void onCraftGuiClosed(EntityPlayer entityPlayer) { + public void onContainerClosed(EntityPlayer entityPlayer) { - super.onCraftGuiClosed(entityPlayer); + super.onContainerClosed(entityPlayer); tileAlchemicalChest.closeChest(); } diff --git a/ee3_common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java b/ee3_common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java index 37b41052..b41fab2c 100644 --- a/ee3_common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java @@ -32,9 +32,9 @@ public class ContainerPortableCrafting extends ContainerWorkbench { } @Override - public void onCraftGuiClosed(EntityPlayer player) { + public void onContainerClosed(EntityPlayer player) { - super.onCraftGuiClosed(player); + super.onContainerClosed(player); if (!player.worldObj.isRemote) { InventoryPlayer invPlayer = player.inventory; diff --git a/ee3_common/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java b/ee3_common/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java index fac5c572..da0f957b 100644 --- a/ee3_common/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerPortableTransmutation.java @@ -27,9 +27,9 @@ public class ContainerPortableTransmutation extends Container { } @Override - public void onCraftGuiClosed(EntityPlayer player) { + public void onContainerClosed(EntityPlayer player) { - super.onCraftGuiClosed(player); + super.onContainerClosed(player); if (!player.worldObj.isRemote) { InventoryPlayer invPlayer = player.inventory; diff --git a/ee3_common/com/pahimar/ee3/inventory/WorldSavedDataEE.java b/ee3_common/com/pahimar/ee3/inventory/WorldSavedDataEE.java index de1352d1..6b87da05 100644 --- a/ee3_common/com/pahimar/ee3/inventory/WorldSavedDataEE.java +++ b/ee3_common/com/pahimar/ee3/inventory/WorldSavedDataEE.java @@ -122,7 +122,7 @@ public class WorldSavedDataEE extends WorldSavedData implements IInventory { } @Override - public boolean isStackValidForSlot(int i, ItemStack itemstack) { + public boolean isItemValidForSlot(int i, ItemStack itemstack) { return false; } diff --git a/ee3_common/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java b/ee3_common/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java index dc65b590..74d8adb2 100644 --- a/ee3_common/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java +++ b/ee3_common/com/pahimar/ee3/item/crafting/RecipesAlchemicalBagDyes.java @@ -2,7 +2,7 @@ package com.pahimar.ee3.item.crafting; import java.util.ArrayList; -import net.minecraft.block.BlockCloth; +import net.minecraft.block.BlockColored; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -101,7 +101,7 @@ public class RecipesAlchemicalBagDyes implements IRecipe { if (currentStack.itemID != Item.dyePowder.itemID) return null; - float[] dyeColorChannels = EntitySheep.fleeceColorTable[BlockCloth.getBlockFromDye(currentStack.getItemDamage())]; + float[] dyeColorChannels = EntitySheep.fleeceColorTable[BlockColored.getBlockFromDye(currentStack.getItemDamage())]; j1 = (int) (dyeColorChannels[0] * 255.0F); k1 = (int) (dyeColorChannels[1] * 255.0F); newColor = (int) (dyeColorChannels[2] * 255.0F); diff --git a/ee3_common/com/pahimar/ee3/item/crafting/RecipesPotions.java b/ee3_common/com/pahimar/ee3/item/crafting/RecipesPotions.java index 8f44e94c..c270bac9 100644 --- a/ee3_common/com/pahimar/ee3/item/crafting/RecipesPotions.java +++ b/ee3_common/com/pahimar/ee3/item/crafting/RecipesPotions.java @@ -17,7 +17,7 @@ public class RecipesPotions { private static CustomWrappedStack reagentWater = new CustomWrappedStack(new ItemStack(Block.waterStill)); private static CustomWrappedStack reagentNetherWart = new CustomWrappedStack(new ItemStack(372, 1, 0)); - private static CustomWrappedStack reagentGlowstoneDust = new CustomWrappedStack(new ItemStack(Item.lightStoneDust)); + private static CustomWrappedStack reagentGlowstoneDust = new CustomWrappedStack(new ItemStack(Item.glowstone)); private static CustomWrappedStack reagentRedstoneDust = new CustomWrappedStack(new ItemStack(331, 1, 0)); private static CustomWrappedStack reagentGunpowder = new CustomWrappedStack(new ItemStack(Item.gunpowder)); private static CustomWrappedStack reagentGoldenCarrot = new CustomWrappedStack(new ItemStack(Item.goldenCarrot)); diff --git a/ee3_common/com/pahimar/ee3/lib/Localizations.java b/ee3_common/com/pahimar/ee3/lib/Localizations.java index 4c32c2a7..b397f312 100644 --- a/ee3_common/com/pahimar/ee3/lib/Localizations.java +++ b/ee3_common/com/pahimar/ee3/lib/Localizations.java @@ -11,7 +11,7 @@ package com.pahimar.ee3.lib; */ public class Localizations { - private static final String LANG_RESOURCE_LOCATION = "/mods/ee3/lang/"; + private static final String LANG_RESOURCE_LOCATION = "/assets/ee3/lang/"; public static String[] localeFiles = { LANG_RESOURCE_LOCATION + "cs_CZ.xml", LANG_RESOURCE_LOCATION + "cy_GB.xml", LANG_RESOURCE_LOCATION + "da_DK.xml", LANG_RESOURCE_LOCATION + "de_DE.xml", LANG_RESOURCE_LOCATION + "en_US.xml", LANG_RESOURCE_LOCATION + "es_ES.xml", LANG_RESOURCE_LOCATION + "fi_FI.xml", 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 + "nb_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 + "sk_SK.xml", LANG_RESOURCE_LOCATION + "sr_RS.xml", LANG_RESOURCE_LOCATION + "sv_SE.xml", LANG_RESOURCE_LOCATION + "tr_TR.xml", LANG_RESOURCE_LOCATION + "zh_CN.xml", LANG_RESOURCE_LOCATION + "zh_TW.xml", LANG_RESOURCE_LOCATION + "el_GR.xml" }; diff --git a/ee3_common/com/pahimar/ee3/lib/Models.java b/ee3_common/com/pahimar/ee3/lib/Models.java index fc29299f..88a11b25 100644 --- a/ee3_common/com/pahimar/ee3/lib/Models.java +++ b/ee3_common/com/pahimar/ee3/lib/Models.java @@ -3,7 +3,7 @@ package com.pahimar.ee3.lib; public class Models { // Base file paths - public static final String MODEL_LOCATION = "/mods/ee3/models/"; + public static final String MODEL_LOCATION = "/assets/ee3/models/"; public static final String ALUDEL = MODEL_LOCATION + "aludel.obj"; public static final String CALCINATOR = MODEL_LOCATION + "calcinator.obj"; diff --git a/ee3_common/com/pahimar/ee3/lib/Sounds.java b/ee3_common/com/pahimar/ee3/lib/Sounds.java index 93fc854c..242cc796 100644 --- a/ee3_common/com/pahimar/ee3/lib/Sounds.java +++ b/ee3_common/com/pahimar/ee3/lib/Sounds.java @@ -11,8 +11,8 @@ package com.pahimar.ee3.lib; */ public class Sounds { - private static final String SOUND_RESOURCE_LOCATION = "mods/ee3/sound/"; - private static final String SOUND_PREFIX = "mods.ee3.sound."; + private static final String SOUND_RESOURCE_LOCATION = Reference.MOD_ID.toLowerCase() + ":"; + private static final String SOUND_PREFIX = Reference.MOD_ID.toLowerCase() + ":"; public static String[] soundFiles = { SOUND_RESOURCE_LOCATION + "chargeDown.ogg", SOUND_RESOURCE_LOCATION + "chargeUp.ogg", SOUND_RESOURCE_LOCATION + "destruct.ogg", SOUND_RESOURCE_LOCATION + "fail.ogg", SOUND_RESOURCE_LOCATION + "gust.ogg", SOUND_RESOURCE_LOCATION + "heal.ogg", SOUND_RESOURCE_LOCATION + "kinesis.ogg", SOUND_RESOURCE_LOCATION + "launch.ogg", SOUND_RESOURCE_LOCATION + "nova.ogg", SOUND_RESOURCE_LOCATION + "philball.ogg", SOUND_RESOURCE_LOCATION + "tock.ogg", SOUND_RESOURCE_LOCATION + "transmute.ogg", SOUND_RESOURCE_LOCATION + "wall.ogg", SOUND_RESOURCE_LOCATION + "waterball.ogg", SOUND_RESOURCE_LOCATION + "wind.ogg" }; diff --git a/ee3_common/com/pahimar/ee3/lib/Textures.java b/ee3_common/com/pahimar/ee3/lib/Textures.java index acaf0268..51af8788 100644 --- a/ee3_common/com/pahimar/ee3/lib/Textures.java +++ b/ee3_common/com/pahimar/ee3/lib/Textures.java @@ -1,5 +1,10 @@ package com.pahimar.ee3.lib; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.ResourceLocation; + +import com.pahimar.ee3.core.util.ResourceLocationHelper; + /** * Equivalent-Exchange-3 * @@ -12,33 +17,33 @@ package com.pahimar.ee3.lib; public class Textures { // Base file paths - public static final String MODEL_SHEET_LOCATION = "/mods/ee3/textures/models/"; - public static final String ARMOR_SHEET_LOCATION = "/mods/ee3/textures/armor/"; - public static final String GUI_SHEET_LOCATION = "/mods/ee3/textures/gui/"; - public static final String EFFECTS_LOCATION = "/mods/ee3/textures/effects/"; + public static final String MODEL_SHEET_LOCATION = "textures/models/"; + public static final String ARMOR_SHEET_LOCATION = "textures/armor/"; + public static final String GUI_SHEET_LOCATION = "textures/gui/"; + public static final String EFFECTS_LOCATION = "textures/effects/"; // Item/Block sprite sheets - public static final String VANILLA_ITEM_TEXTURE_SHEET = "/gui/items.png"; - public static final String VANILLA_BLOCK_TEXTURE_SHEET = "/terrain.png"; + public static final ResourceLocation VANILLA_BLOCK_TEXTURE_SHEET = TextureMap.field_110575_b; + public static final ResourceLocation VANILLA_ITEM_TEXTURE_SHEET = TextureMap.field_110576_c; // Armor sprite sheets // GUI textures - public static final String GUI_CALCINATOR = GUI_SHEET_LOCATION + "calcinator.png"; - public static final String GUI_ALUDEL = GUI_SHEET_LOCATION + "aludel.png"; - public static final String GUI_ALCHEMICAL_STORAGE = GUI_SHEET_LOCATION + "alchemicalStorage.png"; - public static final String GUI_SHARED_ALCHEMICAL_STORAGE = GUI_SHEET_LOCATION + "sharedAlchemicalStorage.png"; - public static final String GUI_PORTABLE_CRAFTING = "/gui/crafting.png"; - public static final String GUI_PORTABLE_TRANSMUTATION = GUI_SHEET_LOCATION + "portableTransmutation.png"; - public static final String GUI_GLASS_BELL = GUI_SHEET_LOCATION + "glassBell.png"; + public static final ResourceLocation GUI_CALCINATOR = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "calcinator.png"); + public static final ResourceLocation GUI_ALUDEL = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "aludel.png"); + public static final ResourceLocation GUI_ALCHEMICAL_STORAGE = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "alchemicalStorage.png"); + public static final ResourceLocation GUI_SHARED_ALCHEMICAL_STORAGE = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "sharedAlchemicalStorage.png"); + public static final ResourceLocation GUI_PORTABLE_CRAFTING = ResourceLocationHelper.getResourceLocation("/gui/crafting.png"); + public static final ResourceLocation GUI_PORTABLE_TRANSMUTATION = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "portableTransmutation.png"); + public static final ResourceLocation GUI_GLASS_BELL = ResourceLocationHelper.getResourceLocation(GUI_SHEET_LOCATION + "glassBell.png"); // Model textures - public static final String MODEL_CALCINATOR = MODEL_SHEET_LOCATION + "calcinator.png"; - public static final String MODEL_ALUDEL = MODEL_SHEET_LOCATION + "aludel.png"; - public static final String MODEL_ALCHEMICAL_CHEST = MODEL_SHEET_LOCATION + "alchemicalChest.png"; - public static final String MODEL_GLASS_BELL = MODEL_SHEET_LOCATION + "aludel.png"; + public static final ResourceLocation MODEL_CALCINATOR = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "calcinator.png"); + public static final ResourceLocation MODEL_ALUDEL = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "aludel.png"); + public static final ResourceLocation MODEL_ALCHEMICAL_CHEST = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "alchemicalChest.png"); + public static final ResourceLocation MODEL_GLASS_BELL = ResourceLocationHelper.getResourceLocation(MODEL_SHEET_LOCATION + "aludel.png"); // Effect textures - public static final String EFFECT_WORLD_TRANSMUTATION = EFFECTS_LOCATION + "noise.png"; + public static final ResourceLocation EFFECT_WORLD_TRANSMUTATION = ResourceLocationHelper.getResourceLocation(EFFECTS_LOCATION + "noise.png"); } diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileAlchemicalChest.java b/ee3_common/com/pahimar/ee3/tileentity/TileAlchemicalChest.java index 0b578742..994410fa 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileAlchemicalChest.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileAlchemicalChest.java @@ -236,7 +236,7 @@ public class TileAlchemicalChest extends TileEE implements IInventory { } @Override - public boolean isStackValidForSlot(int side, ItemStack itemStack) { + public boolean isItemValidForSlot(int side, ItemStack itemStack) { return true; } diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileAludel.java b/ee3_common/com/pahimar/ee3/tileentity/TileAludel.java index 8671ea2e..f54409cf 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileAludel.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileAludel.java @@ -153,7 +153,7 @@ public class TileAludel extends TileEE implements IInventory { } @Override - public boolean isStackValidForSlot(int i, ItemStack itemstack) { + public boolean isItemValidForSlot(int i, ItemStack itemstack) { return true; } diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java b/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java index fe49f3c5..e3090deb 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java @@ -154,7 +154,7 @@ public class TileCalcinator extends TileEE implements IInventory { } @Override - public boolean isStackValidForSlot(int i, ItemStack itemstack) { + public boolean isItemValidForSlot(int i, ItemStack itemstack) { return true; } diff --git a/ee3_common/com/pahimar/ee3/tileentity/TileGlassBell.java b/ee3_common/com/pahimar/ee3/tileentity/TileGlassBell.java index 21781193..d89ccd0b 100644 --- a/ee3_common/com/pahimar/ee3/tileentity/TileGlassBell.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileGlassBell.java @@ -141,7 +141,7 @@ public class TileGlassBell extends TileEE implements IInventory { } @Override - public boolean isStackValidForSlot(int i, ItemStack itemstack) { + public boolean isItemValidForSlot(int i, ItemStack itemstack) { return true; } diff --git a/resources/mods/ee3/lang/cs_CZ.xml b/resources/assets/ee3/lang/cs_CZ.xml similarity index 98% rename from resources/mods/ee3/lang/cs_CZ.xml rename to resources/assets/ee3/lang/cs_CZ.xml index 0322aa2a..bf638e77 100644 --- a/resources/mods/ee3/lang/cs_CZ.xml +++ b/resources/assets/ee3/lang/cs_CZ.xml @@ -1,52 +1,52 @@ - - - - Czech (cs_CZ) Localization File - Extra - Vypustit - Přepnout - Nabít - Úlomek suříku - Inertní Kámen - Kámen suříku - Kámen mudrců - Popel - Suříkový Prášek - Nazelenalý Prášek - Azurový Prášek - Amarantový Prášek - Duhový Prášek - Alchymistický Pytlík - Rudá voda (v klidu) - Rudá voda (tekoucí) - Kalcinátor - Sublimační Nádoba - Alchymistická Truhla - Kalcinátor - Sublimační Nádoba - Alchymistická Truhla - Alchymistický Pytlík - Equivalent Exchange 3 - 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 (@REMOTE_MOD_VERSION@) modu Equivalent Exchange 3, která je pro vaši verzi Minecraftu (@MINECRAFT_VERSION@) k dispozici - Je k dispozici nová verze @MOD_NAME@ (@REMOTE_MOD_VERSION@) pro MC @MINECRAFT_VERSION@. Ke stažení zde: @MOD_UPDATE_LOCATION@ - Chyba při připojování k servru poskytujícímu informace o verzi, zkouším se znovu připojit - Kontrola verze deaktivována po třech neúspěšných pokusech, přeskakuji - Nepodařilo se nalézt verzi @MOD_NAME@ pro @MINECRAFT_VERSION@ - Zobrazení výsledku transmutace zapnuto - Zobrazení výsledku transmutace vypnuto - Pozice zobrazení výsledku transmutace nastavena na levý horní roh - Pozice zobrazení výsledku transmutace nastavena na pravý horní roh - Pozice zobrazení výsledku transmutace nastavena na levý dolní roh - Pozice zobrazení výsledku transmutace nastavena na pravý dolní roh - (kde ### je desetinná hodnota mezi 0,0 a 1,0) - Průhlednost výsledku transmutace úspěšně změněna - (kde ### je desetinná hodnota větší než 0,0) - Měřítko výsledku transmutace úspěšné změněno - Equivalent Exchange 3 částice zapnuty - Equivalent Exchange 3 částice vypnuty - Přehrávání zvuků z Equivalent Exchange 3 od všech hráčů - Přehrávání zvuků z Equivalent Exchange 3 pouze od aktuálního hráče - Přehrávání zvuků z Equivalent Exchange 3 vypnuto + + + + Czech (cs_CZ) Localization File + Extra + Vypustit + Přepnout + Nabít + Úlomek suříku + Inertní Kámen + Kámen suříku + Kámen mudrců + Popel + Suříkový Prášek + Nazelenalý Prášek + Azurový Prášek + Amarantový Prášek + Duhový Prášek + Alchymistický Pytlík + Rudá voda (v klidu) + Rudá voda (tekoucí) + Kalcinátor + Sublimační Nádoba + Alchymistická Truhla + Kalcinátor + Sublimační Nádoba + Alchymistická Truhla + Alchymistický Pytlík + Equivalent Exchange 3 + 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 (@REMOTE_MOD_VERSION@) modu Equivalent Exchange 3, která je pro vaši verzi Minecraftu (@MINECRAFT_VERSION@) k dispozici + Je k dispozici nová verze @MOD_NAME@ (@REMOTE_MOD_VERSION@) pro MC @MINECRAFT_VERSION@. Ke stažení zde: @MOD_UPDATE_LOCATION@ + Chyba při připojování k servru poskytujícímu informace o verzi, zkouším se znovu připojit + Kontrola verze deaktivována po třech neúspěšných pokusech, přeskakuji + Nepodařilo se nalézt verzi @MOD_NAME@ pro @MINECRAFT_VERSION@ + Zobrazení výsledku transmutace zapnuto + Zobrazení výsledku transmutace vypnuto + Pozice zobrazení výsledku transmutace nastavena na levý horní roh + Pozice zobrazení výsledku transmutace nastavena na pravý horní roh + Pozice zobrazení výsledku transmutace nastavena na levý dolní roh + Pozice zobrazení výsledku transmutace nastavena na pravý dolní roh + (kde ### je desetinná hodnota mezi 0,0 a 1,0) + Průhlednost výsledku transmutace úspěšně změněna + (kde ### je desetinná hodnota větší než 0,0) + Měřítko výsledku transmutace úspěšné změněno + Equivalent Exchange 3 částice zapnuty + Equivalent Exchange 3 částice vypnuty + Přehrávání zvuků z Equivalent Exchange 3 od všech hráčů + Přehrávání zvuků z Equivalent Exchange 3 pouze od aktuálního hráče + Přehrávání zvuků z Equivalent Exchange 3 vypnuto \ No newline at end of file diff --git a/resources/mods/ee3/lang/cy_GB.xml b/resources/assets/ee3/lang/cy_GB.xml similarity index 100% rename from resources/mods/ee3/lang/cy_GB.xml rename to resources/assets/ee3/lang/cy_GB.xml diff --git a/resources/mods/ee3/lang/da_DK.xml b/resources/assets/ee3/lang/da_DK.xml similarity index 100% rename from resources/mods/ee3/lang/da_DK.xml rename to resources/assets/ee3/lang/da_DK.xml diff --git a/resources/mods/ee3/lang/de_DE.xml b/resources/assets/ee3/lang/de_DE.xml similarity index 100% rename from resources/mods/ee3/lang/de_DE.xml rename to resources/assets/ee3/lang/de_DE.xml diff --git a/resources/mods/ee3/lang/el_GR.xml b/resources/assets/ee3/lang/el_GR.xml similarity index 100% rename from resources/mods/ee3/lang/el_GR.xml rename to resources/assets/ee3/lang/el_GR.xml diff --git a/resources/mods/ee3/lang/en_US.xml b/resources/assets/ee3/lang/en_US.xml similarity index 100% rename from resources/mods/ee3/lang/en_US.xml rename to resources/assets/ee3/lang/en_US.xml diff --git a/resources/mods/ee3/lang/es_ES.xml b/resources/assets/ee3/lang/es_ES.xml similarity index 100% rename from resources/mods/ee3/lang/es_ES.xml rename to resources/assets/ee3/lang/es_ES.xml diff --git a/resources/mods/ee3/lang/fi_FI.xml b/resources/assets/ee3/lang/fi_FI.xml similarity index 100% rename from resources/mods/ee3/lang/fi_FI.xml rename to resources/assets/ee3/lang/fi_FI.xml diff --git a/resources/mods/ee3/lang/fr_FR.xml b/resources/assets/ee3/lang/fr_FR.xml similarity index 100% rename from resources/mods/ee3/lang/fr_FR.xml rename to resources/assets/ee3/lang/fr_FR.xml diff --git a/resources/mods/ee3/lang/it_IT.xml b/resources/assets/ee3/lang/it_IT.xml similarity index 100% rename from resources/mods/ee3/lang/it_IT.xml rename to resources/assets/ee3/lang/it_IT.xml diff --git a/resources/mods/ee3/lang/ja_JP.xml b/resources/assets/ee3/lang/ja_JP.xml similarity index 100% rename from resources/mods/ee3/lang/ja_JP.xml rename to resources/assets/ee3/lang/ja_JP.xml diff --git a/resources/mods/ee3/lang/la_IT.xml b/resources/assets/ee3/lang/la_IT.xml similarity index 100% rename from resources/mods/ee3/lang/la_IT.xml rename to resources/assets/ee3/lang/la_IT.xml diff --git a/resources/mods/ee3/lang/nb_NO.xml b/resources/assets/ee3/lang/nb_NO.xml similarity index 100% rename from resources/mods/ee3/lang/nb_NO.xml rename to resources/assets/ee3/lang/nb_NO.xml diff --git a/resources/mods/ee3/lang/nl_NL.xml b/resources/assets/ee3/lang/nl_NL.xml similarity index 100% rename from resources/mods/ee3/lang/nl_NL.xml rename to resources/assets/ee3/lang/nl_NL.xml diff --git a/resources/mods/ee3/lang/pl_PL.xml b/resources/assets/ee3/lang/pl_PL.xml similarity index 98% rename from resources/mods/ee3/lang/pl_PL.xml rename to resources/assets/ee3/lang/pl_PL.xml index 0e991f63..ddf80a70 100644 --- a/resources/mods/ee3/lang/pl_PL.xml +++ b/resources/assets/ee3/lang/pl_PL.xml @@ -1,54 +1,54 @@ - - - - Polish (pl_PL) Localization File - Dodatkowa funkcja - Wypuść - Przełącz - Ładuj - Odłam Minium - Nieaktywny kamień - Minium - Kamień filozoficzny - Popiół - Proszek Minium - Zielony proszek - Lazurowy proszek - Amarantowy proszek - Opalowy Proszek - Torba alchemiczna - Czerwona woda (Stojąca) - Czerwona woda (Płynąca) - Kalcynator - Aludel - Skrzynia alchemiczna - Szklany dzwon - Kalcynator - Aludel - Skrzynia alchemiczna - Torba alchemiczna - Szklany dzwon - Equivalent Exchange 3 - Rozpoczynanie zdalnego sprawdzania wersji, według - Zdalne sprawdzanie wersji nie rozpoczęło się poprawnie - Używasz najnowszej wersji (@REMOTE_MOD_VERSION@) of Equivalent Exchange 3 dla @MINECRAFT_VERSION@ - Nowa wersja @MOD_NAME@ (@REMOTE_MOD_VERSION@) dla @MINECRAFT_VERSION@ dostępna. Pobierz ją tutaj: @MOD_UPDATE_LOCATION@ - Błąd podczas sprawdzania wersji; ponawianie próby - Sprawdzanie wersji przerwane po trzech nieudanych próbach - Odnalezienie wersji @MOD_NAME@ dla @MINECRAFT_VERSION@ niemożliwe - Nakładka transmutacji włączona - Nakładka transmutacji wyłączona - Nakładka transmutacji przeniesona w lewy górny róg - Nakładka transmutacji przeniesona w prawy górny róg - Nakładka transmutacji przeniesona w lewy dolny róg - Nakładka transmutacji przeniesona w prawy dolny róg - (gdzie ### to wartość dziesiętna pomiędzy 0.0 i 1.0) - Przezroczystość nakładki transmutacji zmieniona pomyślnie - (gdzie ### to wartość dziesiętna powyżej 0.0) - Skala nakładki transmutacji zmieniona pomyślnie - Efekty cząsteczek Equivalent Exchange 3 włączone - Efekty cząsteczek Equivalent Exchange 3 wyłączone - Odtwarzanie dźwięków Equivalent Exchange 3 od wszystkich graczy - Odtwarzanie dźwięków Equivalent Exchange 3 tylko od siebie - Odtwarzanie dźwięków Equivalent Exchange 3 wyłączone + + + + Polish (pl_PL) Localization File + Dodatkowa funkcja + Wypuść + Przełącz + Ładuj + Odłam Minium + Nieaktywny kamień + Minium + Kamień filozoficzny + Popiół + Proszek Minium + Zielony proszek + Lazurowy proszek + Amarantowy proszek + Opalowy Proszek + Torba alchemiczna + Czerwona woda (Stojąca) + Czerwona woda (Płynąca) + Kalcynator + Aludel + Skrzynia alchemiczna + Szklany dzwon + Kalcynator + Aludel + Skrzynia alchemiczna + Torba alchemiczna + Szklany dzwon + Equivalent Exchange 3 + Rozpoczynanie zdalnego sprawdzania wersji, według + Zdalne sprawdzanie wersji nie rozpoczęło się poprawnie + Używasz najnowszej wersji (@REMOTE_MOD_VERSION@) of Equivalent Exchange 3 dla @MINECRAFT_VERSION@ + Nowa wersja @MOD_NAME@ (@REMOTE_MOD_VERSION@) dla @MINECRAFT_VERSION@ dostępna. Pobierz ją tutaj: @MOD_UPDATE_LOCATION@ + Błąd podczas sprawdzania wersji; ponawianie próby + Sprawdzanie wersji przerwane po trzech nieudanych próbach + Odnalezienie wersji @MOD_NAME@ dla @MINECRAFT_VERSION@ niemożliwe + Nakładka transmutacji włączona + Nakładka transmutacji wyłączona + Nakładka transmutacji przeniesona w lewy górny róg + Nakładka transmutacji przeniesona w prawy górny róg + Nakładka transmutacji przeniesona w lewy dolny róg + Nakładka transmutacji przeniesona w prawy dolny róg + (gdzie ### to wartość dziesiętna pomiędzy 0.0 i 1.0) + Przezroczystość nakładki transmutacji zmieniona pomyślnie + (gdzie ### to wartość dziesiętna powyżej 0.0) + Skala nakładki transmutacji zmieniona pomyślnie + Efekty cząsteczek Equivalent Exchange 3 włączone + Efekty cząsteczek Equivalent Exchange 3 wyłączone + Odtwarzanie dźwięków Equivalent Exchange 3 od wszystkich graczy + Odtwarzanie dźwięków Equivalent Exchange 3 tylko od siebie + Odtwarzanie dźwięków Equivalent Exchange 3 wyłączone \ No newline at end of file diff --git a/resources/mods/ee3/lang/pt_BR.xml b/resources/assets/ee3/lang/pt_BR.xml similarity index 100% rename from resources/mods/ee3/lang/pt_BR.xml rename to resources/assets/ee3/lang/pt_BR.xml diff --git a/resources/mods/ee3/lang/pt_PT.xml b/resources/assets/ee3/lang/pt_PT.xml similarity index 100% rename from resources/mods/ee3/lang/pt_PT.xml rename to resources/assets/ee3/lang/pt_PT.xml diff --git a/resources/mods/ee3/lang/ru_RU.xml b/resources/assets/ee3/lang/ru_RU.xml similarity index 99% rename from resources/mods/ee3/lang/ru_RU.xml rename to resources/assets/ee3/lang/ru_RU.xml index a266da1e..faff0a55 100644 --- a/resources/mods/ee3/lang/ru_RU.xml +++ b/resources/assets/ee3/lang/ru_RU.xml @@ -1,54 +1,54 @@ - - - - Russian (ru_RU) Localization File - Экстра - Сброс - Переключение - Заряд - Алхимический осколок - Инертный камень - Алхимический камень - Философский камень - Пыль - Алхимический порошок - Зелёный порошок - Лазурный порошок - Пурпурный порошок - Радужный порошок - Алхимическая сумка - Красная вода (Стоящая) - Красная вода (Текущая) - Кальцинатор - Алюдель - Алхимический сундук - Стеклянный колпак - Кальцинатор - Алюдель - Алхимический сундук - Алхимическая сумка - Стеклянный колпак - Equivalent Exchange 3 - Инициализация проверки версии файла по удалённому экземпляру, расположенному на - Не удалась инициализация удалённой проверки версии - Используется самая свежая версия (@REMOTE_MOD_VERSION@) модификации Equivalent Exchange 3 для @MINECRAFT_VERSION@ - Новая версия модификации @MOD_NAME@ существует (@REMOTE_MOD_VERSION@) для @MINECRAFT_VERSION@. Вы можите скачать её здесь: @MOD_UPDATE_LOCATION@ - Ошибка подключения к удалённому файлу проверки версии; новая попытка - Проверка версии отменена после 3х неудачных попыток - Не удаётся найти версию модификации @MOD_NAME@ для @MINECRAFT_VERSION@ в удалённом хранилище версий - Панель цели трансмутации включена - Панель цели трансмутации выключена - Позиция панели цели трансмутации установленна на верхний левый угол - Позиция панели цели трансмутации установленна на верхний правый угол - Позиция панели цели трансмутации установленна на нижний левый угол - Позиция панели цели трансмутации установленна на нижний правый угол - (где ### - десятичное значение между 0.0 и 1.0) - Прозрачность панели цели трансмутации успешно обновлена - (где ### - десятичное значение, больше 0.0) - Размер панели цели трансмутации успешно обновлён - Частицы Equivalent Exchange 3 включены - Частицы Equivalent Exchange 3 выключены - Звуки Equivalent Exchange 3 слышны всем - Звуки Equivalent Exchange 3 слышны только вам - Звуки Equivalent Exchange 3 выключены + + + + Russian (ru_RU) Localization File + Экстра + Сброс + Переключение + Заряд + Алхимический осколок + Инертный камень + Алхимический камень + Философский камень + Пыль + Алхимический порошок + Зелёный порошок + Лазурный порошок + Пурпурный порошок + Радужный порошок + Алхимическая сумка + Красная вода (Стоящая) + Красная вода (Текущая) + Кальцинатор + Алюдель + Алхимический сундук + Стеклянный колпак + Кальцинатор + Алюдель + Алхимический сундук + Алхимическая сумка + Стеклянный колпак + Equivalent Exchange 3 + Инициализация проверки версии файла по удалённому экземпляру, расположенному на + Не удалась инициализация удалённой проверки версии + Используется самая свежая версия (@REMOTE_MOD_VERSION@) модификации Equivalent Exchange 3 для @MINECRAFT_VERSION@ + Новая версия модификации @MOD_NAME@ существует (@REMOTE_MOD_VERSION@) для @MINECRAFT_VERSION@. Вы можите скачать её здесь: @MOD_UPDATE_LOCATION@ + Ошибка подключения к удалённому файлу проверки версии; новая попытка + Проверка версии отменена после 3х неудачных попыток + Не удаётся найти версию модификации @MOD_NAME@ для @MINECRAFT_VERSION@ в удалённом хранилище версий + Панель цели трансмутации включена + Панель цели трансмутации выключена + Позиция панели цели трансмутации установленна на верхний левый угол + Позиция панели цели трансмутации установленна на верхний правый угол + Позиция панели цели трансмутации установленна на нижний левый угол + Позиция панели цели трансмутации установленна на нижний правый угол + (где ### - десятичное значение между 0.0 и 1.0) + Прозрачность панели цели трансмутации успешно обновлена + (где ### - десятичное значение, больше 0.0) + Размер панели цели трансмутации успешно обновлён + Частицы Equivalent Exchange 3 включены + Частицы Equivalent Exchange 3 выключены + Звуки Equivalent Exchange 3 слышны всем + Звуки Equivalent Exchange 3 слышны только вам + Звуки Equivalent Exchange 3 выключены diff --git a/resources/mods/ee3/lang/sk_SK.xml b/resources/assets/ee3/lang/sk_SK.xml similarity index 100% rename from resources/mods/ee3/lang/sk_SK.xml rename to resources/assets/ee3/lang/sk_SK.xml diff --git a/resources/mods/ee3/lang/sr_RS.xml b/resources/assets/ee3/lang/sr_RS.xml similarity index 98% rename from resources/mods/ee3/lang/sr_RS.xml rename to resources/assets/ee3/lang/sr_RS.xml index 08f5ca97..6d80add5 100644 --- a/resources/mods/ee3/lang/sr_RS.xml +++ b/resources/assets/ee3/lang/sr_RS.xml @@ -1,54 +1,54 @@ - - - - Serbian (sr_RS) Localization File - Dodatno - Oslabiti - Menjati - Pojačati - Odlomak Miniuma - Inertni Kamen - Miniumski Kamen - Filozofski Kamen - Pepeo - Miniumska Prašina - Verdantna Prašina - Azurna Prašina - Amarantinska Prašina - Iridesentna Prašina - Alhemijska Vreća - Crvena Voda (Stajaća) - Crvena Voda (Tekuća) - Kalcinator - Aludel - Alhemijski Kovčeg - Stakleno Zvono - Kalcinator - Aludel - Alhemijski Kovčeg - Alhemijska Vreća - Stakleno Zvono - Equivalent Exchange 3 - Započinjem proveru verzije u poređenju sa naj novijom, koji se nalazi u - Provera verzije neuspešna - Trenutno koristite naj noviju verziju (@REMOTE_MOD_VERSION@) Equivalent Exchange 3 moda za @MINECRAFT_VERSION@ - Nova @MOD_NAME@ verzija postoji (@REMOTE_MOD_VERSION@) za @MINECRAFT_VERSION@. Skinite je ovde: @MOD_UPDATE_LOCATION@ - Greška u konektovanju sa serverom; pokusavam ponovo - Provera verzije zaustavljena posle tri neušpesna pokušaja - Potraga za verziju @MOD_NAME@ za @MINECRAFT_VERSION@, neuspešna - Prikaz mete transmutacije uključen - Prikaz mete transmutacije isključen - Prikaz mete transmutacije stavljen na gornji levi ugao - Prikaz mete transmutacije stavljen na gornji desni ugao - Prikaz mete transmutacije stavljen na donji levi ugao - Prikaz mete transmutacije stavljen na donji desni ugao - (gde je ### decimalna vrednost izmedju 0.0 i 1.0) - Prozirnost prikaza mete transmutacije uspešno promenjena - (gde je ### decimalna vrednost veća nego 0.0) - Veličina prikaza mete transmutacije uspešno promenjena - Equivalent Exchange 3 čestice uključene - Equivalent Exchange 3 čestice isključene - Čućete Equivalent Exchange 3 zvukove od svih igrača - Čućete samo svoje Equivalent Exchange 3 zvukove - Equivalent Exchange 3 zvukovi isključeni + + + + Serbian (sr_RS) Localization File + Dodatno + Oslabiti + Menjati + Pojačati + Odlomak Miniuma + Inertni Kamen + Miniumski Kamen + Filozofski Kamen + Pepeo + Miniumska Prašina + Verdantna Prašina + Azurna Prašina + Amarantinska Prašina + Iridesentna Prašina + Alhemijska Vreća + Crvena Voda (Stajaća) + Crvena Voda (Tekuća) + Kalcinator + Aludel + Alhemijski Kovčeg + Stakleno Zvono + Kalcinator + Aludel + Alhemijski Kovčeg + Alhemijska Vreća + Stakleno Zvono + Equivalent Exchange 3 + Započinjem proveru verzije u poređenju sa naj novijom, koji se nalazi u + Provera verzije neuspešna + Trenutno koristite naj noviju verziju (@REMOTE_MOD_VERSION@) Equivalent Exchange 3 moda za @MINECRAFT_VERSION@ + Nova @MOD_NAME@ verzija postoji (@REMOTE_MOD_VERSION@) za @MINECRAFT_VERSION@. Skinite je ovde: @MOD_UPDATE_LOCATION@ + Greška u konektovanju sa serverom; pokusavam ponovo + Provera verzije zaustavljena posle tri neušpesna pokušaja + Potraga za verziju @MOD_NAME@ za @MINECRAFT_VERSION@, neuspešna + Prikaz mete transmutacije uključen + Prikaz mete transmutacije isključen + Prikaz mete transmutacije stavljen na gornji levi ugao + Prikaz mete transmutacije stavljen na gornji desni ugao + Prikaz mete transmutacije stavljen na donji levi ugao + Prikaz mete transmutacije stavljen na donji desni ugao + (gde je ### decimalna vrednost izmedju 0.0 i 1.0) + Prozirnost prikaza mete transmutacije uspešno promenjena + (gde je ### decimalna vrednost veća nego 0.0) + Veličina prikaza mete transmutacije uspešno promenjena + Equivalent Exchange 3 čestice uključene + Equivalent Exchange 3 čestice isključene + Čućete Equivalent Exchange 3 zvukove od svih igrača + Čućete samo svoje Equivalent Exchange 3 zvukove + Equivalent Exchange 3 zvukovi isključeni diff --git a/resources/mods/ee3/lang/sv_SE.xml b/resources/assets/ee3/lang/sv_SE.xml similarity index 100% rename from resources/mods/ee3/lang/sv_SE.xml rename to resources/assets/ee3/lang/sv_SE.xml diff --git a/resources/mods/ee3/lang/tr_TR.xml b/resources/assets/ee3/lang/tr_TR.xml similarity index 100% rename from resources/mods/ee3/lang/tr_TR.xml rename to resources/assets/ee3/lang/tr_TR.xml diff --git a/resources/mods/ee3/lang/zh_CN.xml b/resources/assets/ee3/lang/zh_CN.xml similarity index 100% rename from resources/mods/ee3/lang/zh_CN.xml rename to resources/assets/ee3/lang/zh_CN.xml diff --git a/resources/mods/ee3/lang/zh_TW.xml b/resources/assets/ee3/lang/zh_TW.xml similarity index 100% rename from resources/mods/ee3/lang/zh_TW.xml rename to resources/assets/ee3/lang/zh_TW.xml diff --git a/resources/mods/ee3/models/aludel.obj b/resources/assets/ee3/models/aludel.obj similarity index 100% rename from resources/mods/ee3/models/aludel.obj rename to resources/assets/ee3/models/aludel.obj diff --git a/resources/mods/ee3/models/calcinator.obj b/resources/assets/ee3/models/calcinator.obj similarity index 100% rename from resources/mods/ee3/models/calcinator.obj rename to resources/assets/ee3/models/calcinator.obj diff --git a/resources/mods/ee3/sound/chargeDown.ogg b/resources/assets/ee3/sound/chargeDown.ogg similarity index 100% rename from resources/mods/ee3/sound/chargeDown.ogg rename to resources/assets/ee3/sound/chargeDown.ogg diff --git a/resources/mods/ee3/sound/chargeUp.ogg b/resources/assets/ee3/sound/chargeUp.ogg similarity index 100% rename from resources/mods/ee3/sound/chargeUp.ogg rename to resources/assets/ee3/sound/chargeUp.ogg diff --git a/resources/mods/ee3/sound/destruct.ogg b/resources/assets/ee3/sound/destruct.ogg similarity index 100% rename from resources/mods/ee3/sound/destruct.ogg rename to resources/assets/ee3/sound/destruct.ogg diff --git a/resources/mods/ee3/sound/fail.ogg b/resources/assets/ee3/sound/fail.ogg similarity index 100% rename from resources/mods/ee3/sound/fail.ogg rename to resources/assets/ee3/sound/fail.ogg diff --git a/resources/mods/ee3/sound/gust.ogg b/resources/assets/ee3/sound/gust.ogg similarity index 100% rename from resources/mods/ee3/sound/gust.ogg rename to resources/assets/ee3/sound/gust.ogg diff --git a/resources/mods/ee3/sound/heal.ogg b/resources/assets/ee3/sound/heal.ogg similarity index 100% rename from resources/mods/ee3/sound/heal.ogg rename to resources/assets/ee3/sound/heal.ogg diff --git a/resources/mods/ee3/sound/kinesis.ogg b/resources/assets/ee3/sound/kinesis.ogg similarity index 100% rename from resources/mods/ee3/sound/kinesis.ogg rename to resources/assets/ee3/sound/kinesis.ogg diff --git a/resources/mods/ee3/sound/launch.ogg b/resources/assets/ee3/sound/launch.ogg similarity index 100% rename from resources/mods/ee3/sound/launch.ogg rename to resources/assets/ee3/sound/launch.ogg diff --git a/resources/mods/ee3/sound/nova.ogg b/resources/assets/ee3/sound/nova.ogg similarity index 100% rename from resources/mods/ee3/sound/nova.ogg rename to resources/assets/ee3/sound/nova.ogg diff --git a/resources/mods/ee3/sound/philball.ogg b/resources/assets/ee3/sound/philball.ogg similarity index 100% rename from resources/mods/ee3/sound/philball.ogg rename to resources/assets/ee3/sound/philball.ogg diff --git a/resources/mods/ee3/sound/tock.ogg b/resources/assets/ee3/sound/tock.ogg similarity index 100% rename from resources/mods/ee3/sound/tock.ogg rename to resources/assets/ee3/sound/tock.ogg diff --git a/resources/mods/ee3/sound/transmute.ogg b/resources/assets/ee3/sound/transmute.ogg similarity index 100% rename from resources/mods/ee3/sound/transmute.ogg rename to resources/assets/ee3/sound/transmute.ogg diff --git a/resources/mods/ee3/sound/wall.ogg b/resources/assets/ee3/sound/wall.ogg similarity index 100% rename from resources/mods/ee3/sound/wall.ogg rename to resources/assets/ee3/sound/wall.ogg diff --git a/resources/mods/ee3/sound/waterball.ogg b/resources/assets/ee3/sound/waterball.ogg similarity index 100% rename from resources/mods/ee3/sound/waterball.ogg rename to resources/assets/ee3/sound/waterball.ogg diff --git a/resources/mods/ee3/sound/wind.ogg b/resources/assets/ee3/sound/wind.ogg similarity index 100% rename from resources/mods/ee3/sound/wind.ogg rename to resources/assets/ee3/sound/wind.ogg diff --git a/resources/mods/ee3/textures/blocks/alchemicalChest.png b/resources/assets/ee3/textures/blocks/alchemicalChest.png similarity index 100% rename from resources/mods/ee3/textures/blocks/alchemicalChest.png rename to resources/assets/ee3/textures/blocks/alchemicalChest.png diff --git a/resources/mods/ee3/textures/blocks/aludel.png b/resources/assets/ee3/textures/blocks/aludel.png similarity index 100% rename from resources/mods/ee3/textures/blocks/aludel.png rename to resources/assets/ee3/textures/blocks/aludel.png diff --git a/resources/mods/ee3/textures/blocks/calcinator.png b/resources/assets/ee3/textures/blocks/calcinator.png similarity index 100% rename from resources/mods/ee3/textures/blocks/calcinator.png rename to resources/assets/ee3/textures/blocks/calcinator.png diff --git a/resources/mods/ee3/textures/blocks/glassBell.png b/resources/assets/ee3/textures/blocks/glassBell.png similarity index 100% rename from resources/mods/ee3/textures/blocks/glassBell.png rename to resources/assets/ee3/textures/blocks/glassBell.png diff --git a/resources/mods/ee3/textures/effects/noise.png b/resources/assets/ee3/textures/effects/noise.png similarity index 100% rename from resources/mods/ee3/textures/effects/noise.png rename to resources/assets/ee3/textures/effects/noise.png diff --git a/resources/mods/ee3/textures/gui/alchemicalStorage.png b/resources/assets/ee3/textures/gui/alchemicalStorage.png similarity index 100% rename from resources/mods/ee3/textures/gui/alchemicalStorage.png rename to resources/assets/ee3/textures/gui/alchemicalStorage.png diff --git a/resources/mods/ee3/textures/gui/aludel.png b/resources/assets/ee3/textures/gui/aludel.png similarity index 100% rename from resources/mods/ee3/textures/gui/aludel.png rename to resources/assets/ee3/textures/gui/aludel.png diff --git a/resources/mods/ee3/textures/gui/calcinator.png b/resources/assets/ee3/textures/gui/calcinator.png similarity index 100% rename from resources/mods/ee3/textures/gui/calcinator.png rename to resources/assets/ee3/textures/gui/calcinator.png diff --git a/resources/mods/ee3/textures/gui/glassBell.png b/resources/assets/ee3/textures/gui/glassBell.png similarity index 100% rename from resources/mods/ee3/textures/gui/glassBell.png rename to resources/assets/ee3/textures/gui/glassBell.png diff --git a/resources/mods/ee3/textures/gui/ocarina.png b/resources/assets/ee3/textures/gui/ocarina.png similarity index 100% rename from resources/mods/ee3/textures/gui/ocarina.png rename to resources/assets/ee3/textures/gui/ocarina.png diff --git a/resources/mods/ee3/textures/gui/portableTransmutation.png b/resources/assets/ee3/textures/gui/portableTransmutation.png similarity index 100% rename from resources/mods/ee3/textures/gui/portableTransmutation.png rename to resources/assets/ee3/textures/gui/portableTransmutation.png diff --git a/resources/mods/ee3/textures/gui/sharedAlchemicalStorage.png b/resources/assets/ee3/textures/gui/sharedAlchemicalStorage.png similarity index 100% rename from resources/mods/ee3/textures/gui/sharedAlchemicalStorage.png rename to resources/assets/ee3/textures/gui/sharedAlchemicalStorage.png diff --git a/resources/mods/ee3/textures/items/alchemicalBagClosed.png b/resources/assets/ee3/textures/items/alchemicalBagClosed.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalBagClosed.png rename to resources/assets/ee3/textures/items/alchemicalBagClosed.png diff --git a/resources/mods/ee3/textures/items/alchemicalBagClosedDrawString.png b/resources/assets/ee3/textures/items/alchemicalBagClosedDrawString.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalBagClosedDrawString.png rename to resources/assets/ee3/textures/items/alchemicalBagClosedDrawString.png diff --git a/resources/mods/ee3/textures/items/alchemicalBagOpen.png b/resources/assets/ee3/textures/items/alchemicalBagOpen.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalBagOpen.png rename to resources/assets/ee3/textures/items/alchemicalBagOpen.png diff --git a/resources/mods/ee3/textures/items/alchemicalBagOpenDrawString.png b/resources/assets/ee3/textures/items/alchemicalBagOpenDrawString.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalBagOpenDrawString.png rename to resources/assets/ee3/textures/items/alchemicalBagOpenDrawString.png diff --git a/resources/mods/ee3/textures/items/alchemicalDustAmaranthine.png b/resources/assets/ee3/textures/items/alchemicalDustAmaranthine.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalDustAmaranthine.png rename to resources/assets/ee3/textures/items/alchemicalDustAmaranthine.png diff --git a/resources/mods/ee3/textures/items/alchemicalDustAsh.png b/resources/assets/ee3/textures/items/alchemicalDustAsh.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalDustAsh.png rename to resources/assets/ee3/textures/items/alchemicalDustAsh.png diff --git a/resources/mods/ee3/textures/items/alchemicalDustAzure.png b/resources/assets/ee3/textures/items/alchemicalDustAzure.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalDustAzure.png rename to resources/assets/ee3/textures/items/alchemicalDustAzure.png diff --git a/resources/mods/ee3/textures/items/alchemicalDustIridescent.png b/resources/assets/ee3/textures/items/alchemicalDustIridescent.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalDustIridescent.png rename to resources/assets/ee3/textures/items/alchemicalDustIridescent.png diff --git a/resources/mods/ee3/textures/items/alchemicalDustMinium.png b/resources/assets/ee3/textures/items/alchemicalDustMinium.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalDustMinium.png rename to resources/assets/ee3/textures/items/alchemicalDustMinium.png diff --git a/resources/mods/ee3/textures/items/alchemicalDustVerdant.png b/resources/assets/ee3/textures/items/alchemicalDustVerdant.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemicalDustVerdant.png rename to resources/assets/ee3/textures/items/alchemicalDustVerdant.png diff --git a/resources/mods/ee3/textures/items/algotGeneric.png b/resources/assets/ee3/textures/items/algotGeneric.png similarity index 100% rename from resources/mods/ee3/textures/items/algotGeneric.png rename to resources/assets/ee3/textures/items/algotGeneric.png diff --git a/resources/mods/ee3/textures/items/chalk.png b/resources/assets/ee3/textures/items/chalk.png similarity index 100% rename from resources/mods/ee3/textures/items/chalk.png rename to resources/assets/ee3/textures/items/chalk.png diff --git a/resources/mods/ee3/textures/items/diviningRod.png b/resources/assets/ee3/textures/items/diviningRod.png similarity index 100% rename from resources/mods/ee3/textures/items/diviningRod.png rename to resources/assets/ee3/textures/items/diviningRod.png diff --git a/resources/mods/ee3/textures/items/diviningRodEffectGlow.png b/resources/assets/ee3/textures/items/diviningRodEffectGlow.png similarity index 100% rename from resources/mods/ee3/textures/items/diviningRodEffectGlow.png rename to resources/assets/ee3/textures/items/diviningRodEffectGlow.png diff --git a/resources/mods/ee3/textures/items/kunai.png b/resources/assets/ee3/textures/items/kunai.png similarity index 100% rename from resources/mods/ee3/textures/items/kunai.png rename to resources/assets/ee3/textures/items/kunai.png diff --git a/resources/mods/ee3/textures/items/ocarina.png b/resources/assets/ee3/textures/items/ocarina.png similarity index 100% rename from resources/mods/ee3/textures/items/ocarina.png rename to resources/assets/ee3/textures/items/ocarina.png diff --git a/resources/mods/ee3/textures/items/shardMinium.png b/resources/assets/ee3/textures/items/shardMinium.png similarity index 100% rename from resources/mods/ee3/textures/items/shardMinium.png rename to resources/assets/ee3/textures/items/shardMinium.png diff --git a/resources/mods/ee3/textures/items/spear1.png b/resources/assets/ee3/textures/items/spear1.png similarity index 100% rename from resources/mods/ee3/textures/items/spear1.png rename to resources/assets/ee3/textures/items/spear1.png diff --git a/resources/mods/ee3/textures/items/spear2.png b/resources/assets/ee3/textures/items/spear2.png similarity index 100% rename from resources/mods/ee3/textures/items/spear2.png rename to resources/assets/ee3/textures/items/spear2.png diff --git a/resources/mods/ee3/textures/items/spear3.png b/resources/assets/ee3/textures/items/spear3.png similarity index 100% rename from resources/mods/ee3/textures/items/spear3.png rename to resources/assets/ee3/textures/items/spear3.png diff --git a/resources/mods/ee3/textures/items/spear4.png b/resources/assets/ee3/textures/items/spear4.png similarity index 100% rename from resources/mods/ee3/textures/items/spear4.png rename to resources/assets/ee3/textures/items/spear4.png diff --git a/resources/mods/ee3/textures/items/staff1.png b/resources/assets/ee3/textures/items/staff1.png similarity index 100% rename from resources/mods/ee3/textures/items/staff1.png rename to resources/assets/ee3/textures/items/staff1.png diff --git a/resources/mods/ee3/textures/items/staff2.png b/resources/assets/ee3/textures/items/staff2.png similarity index 100% rename from resources/mods/ee3/textures/items/staff2.png rename to resources/assets/ee3/textures/items/staff2.png diff --git a/resources/mods/ee3/textures/items/staff3.png b/resources/assets/ee3/textures/items/staff3.png similarity index 100% rename from resources/mods/ee3/textures/items/staff3.png rename to resources/assets/ee3/textures/items/staff3.png diff --git a/resources/mods/ee3/textures/items/staff4.png b/resources/assets/ee3/textures/items/staff4.png similarity index 100% rename from resources/mods/ee3/textures/items/staff4.png rename to resources/assets/ee3/textures/items/staff4.png diff --git a/resources/mods/ee3/textures/items/staff5.png b/resources/assets/ee3/textures/items/staff5.png similarity index 100% rename from resources/mods/ee3/textures/items/staff5.png rename to resources/assets/ee3/textures/items/staff5.png diff --git a/resources/mods/ee3/textures/items/staff6.png b/resources/assets/ee3/textures/items/staff6.png similarity index 100% rename from resources/mods/ee3/textures/items/staff6.png rename to resources/assets/ee3/textures/items/staff6.png diff --git a/resources/mods/ee3/textures/items/stoneEffectFlame.png b/resources/assets/ee3/textures/items/stoneEffectFlame.png similarity index 100% rename from resources/mods/ee3/textures/items/stoneEffectFlame.png rename to resources/assets/ee3/textures/items/stoneEffectFlame.png diff --git a/resources/mods/ee3/textures/items/stoneInert.png b/resources/assets/ee3/textures/items/stoneInert.png similarity index 100% rename from resources/mods/ee3/textures/items/stoneInert.png rename to resources/assets/ee3/textures/items/stoneInert.png diff --git a/resources/mods/ee3/textures/items/stoneMinium.png b/resources/assets/ee3/textures/items/stoneMinium.png similarity index 100% rename from resources/mods/ee3/textures/items/stoneMinium.png rename to resources/assets/ee3/textures/items/stoneMinium.png diff --git a/resources/mods/ee3/textures/items/stonePhilosophers.png b/resources/assets/ee3/textures/items/stonePhilosophers.png similarity index 100% rename from resources/mods/ee3/textures/items/stonePhilosophers.png rename to resources/assets/ee3/textures/items/stonePhilosophers.png diff --git a/resources/mods/ee3/textures/logo/logo.png b/resources/assets/ee3/textures/logo/logo.png similarity index 100% rename from resources/mods/ee3/textures/logo/logo.png rename to resources/assets/ee3/textures/logo/logo.png diff --git a/resources/mods/ee3/textures/models/alchemicalChest.png b/resources/assets/ee3/textures/models/alchemicalChest.png similarity index 100% rename from resources/mods/ee3/textures/models/alchemicalChest.png rename to resources/assets/ee3/textures/models/alchemicalChest.png diff --git a/resources/mods/ee3/textures/models/aludel.png b/resources/assets/ee3/textures/models/aludel.png similarity index 100% rename from resources/mods/ee3/textures/models/aludel.png rename to resources/assets/ee3/textures/models/aludel.png diff --git a/resources/mods/ee3/textures/models/calcinator.png b/resources/assets/ee3/textures/models/calcinator.png similarity index 100% rename from resources/mods/ee3/textures/models/calcinator.png rename to resources/assets/ee3/textures/models/calcinator.png diff --git a/resources/mods/ee3/textures/xcf/blocks/alchemicalChest.xcf b/resources/assets/ee3/textures/xcf/blocks/alchemicalChest.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/blocks/alchemicalChest.xcf rename to resources/assets/ee3/textures/xcf/blocks/alchemicalChest.xcf diff --git a/resources/mods/ee3/textures/xcf/blocks/aludel.xcf b/resources/assets/ee3/textures/xcf/blocks/aludel.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/blocks/aludel.xcf rename to resources/assets/ee3/textures/xcf/blocks/aludel.xcf diff --git a/resources/mods/ee3/textures/xcf/blocks/calcinator.xcf b/resources/assets/ee3/textures/xcf/blocks/calcinator.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/blocks/calcinator.xcf rename to resources/assets/ee3/textures/xcf/blocks/calcinator.xcf diff --git a/resources/mods/ee3/textures/xcf/blocks/glassBell.xcf b/resources/assets/ee3/textures/xcf/blocks/glassBell.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/blocks/glassBell.xcf rename to resources/assets/ee3/textures/xcf/blocks/glassBell.xcf diff --git a/resources/mods/ee3/textures/xcf/effects/noise.xcf b/resources/assets/ee3/textures/xcf/effects/noise.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/effects/noise.xcf rename to resources/assets/ee3/textures/xcf/effects/noise.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/alchemicalStorage.xcf b/resources/assets/ee3/textures/xcf/gui/alchemicalStorage.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/alchemicalStorage.xcf rename to resources/assets/ee3/textures/xcf/gui/alchemicalStorage.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/aludel.xcf b/resources/assets/ee3/textures/xcf/gui/aludel.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/aludel.xcf rename to resources/assets/ee3/textures/xcf/gui/aludel.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/base_gui.xcf b/resources/assets/ee3/textures/xcf/gui/base_gui.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/base_gui.xcf rename to resources/assets/ee3/textures/xcf/gui/base_gui.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/calcinator.xcf b/resources/assets/ee3/textures/xcf/gui/calcinator.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/calcinator.xcf rename to resources/assets/ee3/textures/xcf/gui/calcinator.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/glassBell.xcf b/resources/assets/ee3/textures/xcf/gui/glassBell.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/glassBell.xcf rename to resources/assets/ee3/textures/xcf/gui/glassBell.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/ocarina.xcf b/resources/assets/ee3/textures/xcf/gui/ocarina.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/ocarina.xcf rename to resources/assets/ee3/textures/xcf/gui/ocarina.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/portableTransmutation.xcf b/resources/assets/ee3/textures/xcf/gui/portableTransmutation.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/portableTransmutation.xcf rename to resources/assets/ee3/textures/xcf/gui/portableTransmutation.xcf diff --git a/resources/mods/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf b/resources/assets/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf rename to resources/assets/ee3/textures/xcf/gui/sharedAlchemicalStorage.xcf diff --git a/resources/mods/ee3/textures/xcf/items/alchemicalBagClosed.xcf b/resources/assets/ee3/textures/xcf/items/alchemicalBagClosed.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/alchemicalBagClosed.xcf rename to resources/assets/ee3/textures/xcf/items/alchemicalBagClosed.xcf diff --git a/resources/mods/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf b/resources/assets/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf rename to resources/assets/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf diff --git a/resources/mods/ee3/textures/xcf/items/alchemicalBagOpen.xcf b/resources/assets/ee3/textures/xcf/items/alchemicalBagOpen.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/alchemicalBagOpen.xcf rename to resources/assets/ee3/textures/xcf/items/alchemicalBagOpen.xcf diff --git a/resources/mods/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf b/resources/assets/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf rename to resources/assets/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf diff --git a/resources/mods/ee3/textures/xcf/items/algotGeneric.xcf b/resources/assets/ee3/textures/xcf/items/algotGeneric.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/algotGeneric.xcf rename to resources/assets/ee3/textures/xcf/items/algotGeneric.xcf diff --git a/resources/mods/ee3/textures/xcf/items/chalk.xcf b/resources/assets/ee3/textures/xcf/items/chalk.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/chalk.xcf rename to resources/assets/ee3/textures/xcf/items/chalk.xcf diff --git a/resources/mods/ee3/textures/xcf/items/diviningRod.xcf b/resources/assets/ee3/textures/xcf/items/diviningRod.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/diviningRod.xcf rename to resources/assets/ee3/textures/xcf/items/diviningRod.xcf diff --git a/resources/mods/ee3/textures/xcf/items/diviningRodEffectGlow.xcf b/resources/assets/ee3/textures/xcf/items/diviningRodEffectGlow.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/diviningRodEffectGlow.xcf rename to resources/assets/ee3/textures/xcf/items/diviningRodEffectGlow.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf b/resources/assets/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf rename to resources/assets/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAlchemicalAsh.xcf b/resources/assets/ee3/textures/xcf/items/dustAlchemicalAsh.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAlchemicalAsh.xcf rename to resources/assets/ee3/textures/xcf/items/dustAlchemicalAsh.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAlchemicalAzure.xcf b/resources/assets/ee3/textures/xcf/items/dustAlchemicalAzure.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAlchemicalAzure.xcf rename to resources/assets/ee3/textures/xcf/items/dustAlchemicalAzure.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf b/resources/assets/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf rename to resources/assets/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAlchemicalMinium.xcf b/resources/assets/ee3/textures/xcf/items/dustAlchemicalMinium.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAlchemicalMinium.xcf rename to resources/assets/ee3/textures/xcf/items/dustAlchemicalMinium.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf b/resources/assets/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf rename to resources/assets/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf diff --git a/resources/mods/ee3/textures/xcf/items/kunai.xcf b/resources/assets/ee3/textures/xcf/items/kunai.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/kunai.xcf rename to resources/assets/ee3/textures/xcf/items/kunai.xcf diff --git a/resources/mods/ee3/textures/xcf/items/ocarina.xcf b/resources/assets/ee3/textures/xcf/items/ocarina.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/ocarina.xcf rename to resources/assets/ee3/textures/xcf/items/ocarina.xcf diff --git a/resources/mods/ee3/textures/xcf/items/shardMinium.xcf b/resources/assets/ee3/textures/xcf/items/shardMinium.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/shardMinium.xcf rename to resources/assets/ee3/textures/xcf/items/shardMinium.xcf diff --git a/resources/mods/ee3/textures/xcf/items/spear1.xcf b/resources/assets/ee3/textures/xcf/items/spear1.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/spear1.xcf rename to resources/assets/ee3/textures/xcf/items/spear1.xcf diff --git a/resources/mods/ee3/textures/xcf/items/spear2.xcf b/resources/assets/ee3/textures/xcf/items/spear2.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/spear2.xcf rename to resources/assets/ee3/textures/xcf/items/spear2.xcf diff --git a/resources/mods/ee3/textures/xcf/items/spear3.xcf b/resources/assets/ee3/textures/xcf/items/spear3.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/spear3.xcf rename to resources/assets/ee3/textures/xcf/items/spear3.xcf diff --git a/resources/mods/ee3/textures/xcf/items/spear4.xcf b/resources/assets/ee3/textures/xcf/items/spear4.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/spear4.xcf rename to resources/assets/ee3/textures/xcf/items/spear4.xcf diff --git a/resources/mods/ee3/textures/xcf/items/staff1.xcf b/resources/assets/ee3/textures/xcf/items/staff1.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/staff1.xcf rename to resources/assets/ee3/textures/xcf/items/staff1.xcf diff --git a/resources/mods/ee3/textures/xcf/items/staff2.xcf b/resources/assets/ee3/textures/xcf/items/staff2.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/staff2.xcf rename to resources/assets/ee3/textures/xcf/items/staff2.xcf diff --git a/resources/mods/ee3/textures/xcf/items/staff3.xcf b/resources/assets/ee3/textures/xcf/items/staff3.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/staff3.xcf rename to resources/assets/ee3/textures/xcf/items/staff3.xcf diff --git a/resources/mods/ee3/textures/xcf/items/staff4.xcf b/resources/assets/ee3/textures/xcf/items/staff4.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/staff4.xcf rename to resources/assets/ee3/textures/xcf/items/staff4.xcf diff --git a/resources/mods/ee3/textures/xcf/items/staff5.xcf b/resources/assets/ee3/textures/xcf/items/staff5.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/staff5.xcf rename to resources/assets/ee3/textures/xcf/items/staff5.xcf diff --git a/resources/mods/ee3/textures/xcf/items/staff6.xcf b/resources/assets/ee3/textures/xcf/items/staff6.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/staff6.xcf rename to resources/assets/ee3/textures/xcf/items/staff6.xcf diff --git a/resources/mods/ee3/textures/xcf/items/stoneEffectFlame.xcf b/resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/stoneEffectFlame.xcf rename to resources/assets/ee3/textures/xcf/items/stoneEffectFlame.xcf diff --git a/resources/mods/ee3/textures/xcf/items/stoneInert.xcf b/resources/assets/ee3/textures/xcf/items/stoneInert.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/stoneInert.xcf rename to resources/assets/ee3/textures/xcf/items/stoneInert.xcf diff --git a/resources/mods/ee3/textures/xcf/items/stoneMinium.xcf b/resources/assets/ee3/textures/xcf/items/stoneMinium.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/stoneMinium.xcf rename to resources/assets/ee3/textures/xcf/items/stoneMinium.xcf diff --git a/resources/mods/ee3/textures/xcf/items/stonePhilosophers.xcf b/resources/assets/ee3/textures/xcf/items/stonePhilosophers.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/stonePhilosophers.xcf rename to resources/assets/ee3/textures/xcf/items/stonePhilosophers.xcf diff --git a/resources/mods/ee3/textures/xcf/logo/logo.xcf b/resources/assets/ee3/textures/xcf/logo/logo.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/logo/logo.xcf rename to resources/assets/ee3/textures/xcf/logo/logo.xcf diff --git a/resources/mods/ee3/textures/xcf/models/alchemicalChest.xcf b/resources/assets/ee3/textures/xcf/models/alchemicalChest.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/models/alchemicalChest.xcf rename to resources/assets/ee3/textures/xcf/models/alchemicalChest.xcf diff --git a/resources/mods/ee3/textures/xcf/models/aludel.xcf b/resources/assets/ee3/textures/xcf/models/aludel.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/models/aludel.xcf rename to resources/assets/ee3/textures/xcf/models/aludel.xcf diff --git a/resources/mods/ee3/textures/xcf/models/calcinator.xcf b/resources/assets/ee3/textures/xcf/models/calcinator.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/models/calcinator.xcf rename to resources/assets/ee3/textures/xcf/models/calcinator.xcf From 4dac7c1bde595ea75333fd17ed302840b97251f9 Mon Sep 17 00:00:00 2001 From: pahimar Date: Mon, 15 Jul 2013 19:20:27 -0400 Subject: [PATCH 04/11] Stuff! --- ee3_common/com/pahimar/ee3/emc/DynEMC.java | 5 +++++ .../com/pahimar/ee3/emc/EmcDefaultValues.java | 15 +++++++++++++++ .../pahimar/ee3/item/CustomWrappedStack.java | 17 +++++++++++++++++ ee3_common/com/pahimar/ee3/lib/Strings.java | 2 +- 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ee3_common/com/pahimar/ee3/emc/EmcDefaultValues.java diff --git a/ee3_common/com/pahimar/ee3/emc/DynEMC.java b/ee3_common/com/pahimar/ee3/emc/DynEMC.java index 0a22867b..e787c39d 100644 --- a/ee3_common/com/pahimar/ee3/emc/DynEMC.java +++ b/ee3_common/com/pahimar/ee3/emc/DynEMC.java @@ -75,6 +75,11 @@ public class DynEMC { } } } + + public List getCriticalNodes() { + + return graph.getCriticalNodes(); + } public int size() { diff --git a/ee3_common/com/pahimar/ee3/emc/EmcDefaultValues.java b/ee3_common/com/pahimar/ee3/emc/EmcDefaultValues.java new file mode 100644 index 00000000..cac65ca2 --- /dev/null +++ b/ee3_common/com/pahimar/ee3/emc/EmcDefaultValues.java @@ -0,0 +1,15 @@ +package com.pahimar.ee3.emc; + +import java.util.HashMap; +import java.util.List; + +import com.pahimar.ee3.item.CustomWrappedStack; + +public class EmcDefaultValues { + + private static HashMap> defaultEmcValues = new HashMap>(); + + public static void init() { + + } +} diff --git a/ee3_common/com/pahimar/ee3/item/CustomWrappedStack.java b/ee3_common/com/pahimar/ee3/item/CustomWrappedStack.java index 6ab5c941..32b72133 100644 --- a/ee3_common/com/pahimar/ee3/item/CustomWrappedStack.java +++ b/ee3_common/com/pahimar/ee3/item/CustomWrappedStack.java @@ -229,6 +229,23 @@ public class CustomWrappedStack { return stringBuilder.toString(); } + + public String encodeAsPropertyKey() { + + StringBuilder stringBuilder = new StringBuilder(); + + if (itemStack != null) { + stringBuilder.append(String.format("%sxitemStack[%s:%s:%s:%s]", this.stackSize, itemStack.itemID, itemStack.getItemDamage(), itemStack.getItemName(), itemStack.getItem().getClass().getCanonicalName())); + } + else if (oreStack != null) { + stringBuilder.append(String.format("%dxoreDictionary.%s", stackSize, oreStack.oreName)); + } + else if (energyStack != null) { + stringBuilder.append(String.format("%dxenergyStack.%s", stackSize, energyStack.energyName)); + } + + return stringBuilder.toString(); + } @Override public int hashCode() { diff --git a/ee3_common/com/pahimar/ee3/lib/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java index 2080f792..2ee765b5 100644 --- a/ee3_common/com/pahimar/ee3/lib/Strings.java +++ b/ee3_common/com/pahimar/ee3/lib/Strings.java @@ -14,7 +14,7 @@ public class Strings { /* General keys */ public static final String TRUE = "true"; public static final String FALSE = "false"; - public static final String TOKEN_DELIMITER = ","; + public static final String TOKEN_DELIMITER = "."; /* Fingerprint check related constants */ public static final String INVALID_FINGERPRINT_MESSAGE = "The copy of Equivalent Exchange 3 that you are running has been modified from the original, and unpredictable things may happen. Please consider re-downloading the original version of the mod."; From 09fe8c8c85fc2f455cb4a711a0d5826430624585 Mon Sep 17 00:00:00 2001 From: pahimar Date: Mon, 15 Jul 2013 20:51:54 -0400 Subject: [PATCH 05/11] Cleaning up some imports and formatting --- .../com/pahimar/ee3/EquivalentExchange3.java | 180 ++++++++++-------- .../ee3/client/audio/SoundHandler.java | 1 - .../gui/inventory/GuiAlchemicalBag.java | 74 +++---- .../gui/inventory/GuiAlchemicalChest.java | 2 - .../ee3/client/gui/inventory/GuiAludel.java | 2 - .../client/gui/inventory/GuiCalcinator.java | 2 - .../client/gui/inventory/GuiGlassBell.java | 2 - .../gui/inventory/GuiPortableCrafting.java | 2 - .../inventory/GuiPortableTransmutation.java | 3 - .../ee3/client/renderer/RenderUtils.java | 1 - .../item/ItemAlchemicalChestRenderer.java | 3 - .../renderer/item/ItemAludelRenderer.java | 3 - .../renderer/item/ItemCalcinatorRenderer.java | 2 - .../renderer/item/ItemGlassBellRenderer.java | 2 - .../TileEntityAlchemicalChestRenderer.java | 3 - .../tileentity/TileEntityAludelRenderer.java | 2 - .../TileEntityCalcinatorRenderer.java | 3 - .../TileEntityGlassBellRenderer.java | 2 - .../pahimar/ee3/command/CommandOverlay.java | 1 - .../pahimar/ee3/command/CommandParticles.java | 2 - .../pahimar/ee3/command/CommandSounds.java | 2 - 21 files changed, 135 insertions(+), 159 deletions(-) diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java index 71324277..e7cd13cf 100644 --- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -38,13 +38,7 @@ import com.pahimar.ee3.network.PacketHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.FingerprintWarning; -import cpw.mods.fml.common.Mod.IMCCallback; -import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.PostInit; -import cpw.mods.fml.common.Mod.PreInit; -import cpw.mods.fml.common.Mod.ServerStarting; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLFingerprintViolationEvent; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -72,118 +66,136 @@ import cpw.mods.fml.relauncher.Side; @NetworkMod(channels = { Reference.CHANNEL_NAME }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) public class EquivalentExchange3 { - @Instance(Reference.MOD_ID) - public static EquivalentExchange3 instance; + @Instance(Reference.MOD_ID) + public static EquivalentExchange3 instance; - @SidedProxy(clientSide = Reference.CLIENT_PROXY_CLASS, serverSide = Reference.SERVER_PROXY_CLASS) - public static CommonProxy proxy; + @SidedProxy(clientSide = Reference.CLIENT_PROXY_CLASS, serverSide = Reference.SERVER_PROXY_CLASS) + public static CommonProxy proxy; - public static CreativeTabs tabsEE3 = new CreativeTabEE3(CreativeTabs.getNextID(), Reference.MOD_ID); + public static CreativeTabs tabsEE3 = new CreativeTabEE3( + CreativeTabs.getNextID(), Reference.MOD_ID); - @EventHandler - public void invalidFingerprint(FMLFingerprintViolationEvent event) { + @EventHandler + public void invalidFingerprint(FMLFingerprintViolationEvent event) { - // Report (log) to the user that the version of Equivalent Exchange 3 they are using has been changed/tampered with - LogHelper.severe(Strings.INVALID_FINGERPRINT_MESSAGE); - } + // Report (log) to the user that the version of Equivalent Exchange 3 + // they are using has been changed/tampered with + LogHelper.severe(Strings.INVALID_FINGERPRINT_MESSAGE); + } - @EventHandler - public void serverStarting(FMLServerStartingEvent event) { + @EventHandler + public void serverStarting(FMLServerStartingEvent event) { - // Initialize the custom commands - CommandHandler.initCommands(event); - } + // Initialize the custom commands + CommandHandler.initCommands(event); + } - @EventHandler - public void preInit(FMLPreInitializationEvent event) { + @EventHandler + public void preInit(FMLPreInitializationEvent event) { - // Initialize the log helper - LogHelper.init(); + // Initialize the log helper + LogHelper.init(); - // Load the localization files into the LanguageRegistry - LocalizationHandler.loadLanguages(); + // Load the localization files into the LanguageRegistry + LocalizationHandler.loadLanguages(); - // Initialize the configuration - ConfigurationHandler.init(new File(event.getModConfigurationDirectory().getAbsolutePath() + File.separator + Reference.CHANNEL_NAME + File.separator + Reference.MOD_ID + ".cfg")); + // Initialize the configuration + ConfigurationHandler.init(new File(event.getModConfigurationDirectory() + .getAbsolutePath() + + File.separator + + Reference.CHANNEL_NAME + + File.separator + Reference.MOD_ID + ".cfg")); - // Conduct the version check and log the result - VersionHelper.execute(); + // Conduct the version check and log the result + VersionHelper.execute(); - // Initialize the Version Check Tick Handler (Client only) - TickRegistry.registerTickHandler(new VersionCheckTickHandler(), Side.CLIENT); + // Initialize the Version Check Tick Handler (Client only) + TickRegistry.registerTickHandler(new VersionCheckTickHandler(), + Side.CLIENT); - // Initialize the Render Tick Handler (Client only) - proxy.registerRenderTickHandler(); + // Initialize the Render Tick Handler (Client only) + proxy.registerRenderTickHandler(); - // Register the KeyBinding Handler (Client only) - proxy.registerKeyBindingHandler(); + // Register the KeyBinding Handler (Client only) + proxy.registerKeyBindingHandler(); - // Register the Sound Handler (Client only) - proxy.registerSoundHandler(); + // Register the Sound Handler (Client only) + proxy.registerSoundHandler(); - // Initialize mod blocks - ModBlocks.init(); + // Initialize mod blocks + ModBlocks.init(); - // Initialize mod items - ModItems.init(); - } + // Initialize mod items + ModItems.init(); + } - @EventHandler - @SuppressWarnings("unchecked") - public void load(FMLInitializationEvent event) { + @EventHandler + @SuppressWarnings("unchecked") + public void load(FMLInitializationEvent event) { - // Register the GUI Handler - NetworkRegistry.instance().registerGuiHandler(instance, proxy); + // Register the GUI Handler + NetworkRegistry.instance().registerGuiHandler(instance, proxy); - // Register the PlayerDestroyItem Handler - MinecraftForge.EVENT_BUS.register(new PlayerDestroyItemHandler()); + // Register the PlayerDestroyItem Handler + MinecraftForge.EVENT_BUS.register(new PlayerDestroyItemHandler()); - // Register the Item Pickup Handler - MinecraftForge.EVENT_BUS.register(new ItemEventHandler()); + // Register the Item Pickup Handler + MinecraftForge.EVENT_BUS.register(new ItemEventHandler()); - // Register the EntityLiving Handler - MinecraftForge.EVENT_BUS.register(new EntityLivingHandler()); + // Register the EntityLiving Handler + MinecraftForge.EVENT_BUS.register(new EntityLivingHandler()); - MinecraftForge.EVENT_BUS.register(new ActionRequestHandler()); + MinecraftForge.EVENT_BUS.register(new ActionRequestHandler()); - MinecraftForge.EVENT_BUS.register(new WorldTransmutationHandler()); + MinecraftForge.EVENT_BUS.register(new WorldTransmutationHandler()); - GameRegistry.registerCraftingHandler(new CraftingHandler()); + GameRegistry.registerCraftingHandler(new CraftingHandler()); - // Register the DrawBlockHighlight Handler - proxy.registerDrawBlockHighlightHandler(); + // Register the DrawBlockHighlight Handler + proxy.registerDrawBlockHighlightHandler(); - // Initialize mod tile entities - proxy.registerTileEntities(); + // Initialize mod tile entities + proxy.registerTileEntities(); - // Initialize custom rendering and pre-load textures (Client only) - proxy.initRenderingAndTextures(); + // Initialize custom rendering and pre-load textures (Client only) + proxy.initRenderingAndTextures(); - // Add in the ability to dye Alchemical Bags - CraftingManager.getInstance().getRecipeList().add(new RecipesAlchemicalBagDyes()); + // Add in the ability to dye Alchemical Bags + CraftingManager.getInstance().getRecipeList() + .add(new RecipesAlchemicalBagDyes()); - // Register the Fuel Handler - GameRegistry.registerFuelHandler(new FuelHandler()); + // Register the Fuel Handler + GameRegistry.registerFuelHandler(new FuelHandler()); - // Quick test to see that sending an encoded recipe to be added to the recipe registry works - FMLInterModComms.sendMessage(Reference.MOD_ID, InterModComms.ADD_RECIPE, NBTHelper.encodeRecipeAsNBT(Item.bucketWater, Arrays.asList(Item.bucketEmpty, Block.waterStill))); - FMLInterModComms.sendMessage(Reference.MOD_ID, InterModComms.ADD_RECIPE, NBTHelper.encodeRecipeAsNBT(Item.bucketLava, Arrays.asList(Item.bucketEmpty, Block.lavaStill))); - } + // Quick test to see that sending an encoded recipe to be added to the + // recipe registry works + FMLInterModComms.sendMessage( + Reference.MOD_ID, + InterModComms.ADD_RECIPE, + NBTHelper.encodeRecipeAsNBT(Item.bucketWater, + Arrays.asList(Item.bucketEmpty, Block.waterStill))); + FMLInterModComms.sendMessage( + Reference.MOD_ID, + InterModComms.ADD_RECIPE, + NBTHelper.encodeRecipeAsNBT(Item.bucketLava, + Arrays.asList(Item.bucketEmpty, Block.lavaStill))); + } - @EventHandler - public void modsLoaded(FMLPostInitializationEvent event) { + @EventHandler + public void modsLoaded(FMLPostInitializationEvent event) { - // Initialize the Addon Handler - AddonHandler.init(); + // Initialize the Addon Handler + AddonHandler.init(); - // Initialize the DynEMC system - // TODO Seems like this happens earlier than it should now, investigate where this should go - DynEMC dynEMC = DynEMC.getInstance(); - } + // Initialize the DynEMC system + // TODO Seems like this happens earlier than it should now, investigate + // where this should go + DynEMC dynEMC = DynEMC.getInstance(); + } - @EventHandler - public void handleIMCMessages(IMCEvent event) { + @EventHandler + public void handleIMCMessages(IMCEvent event) { - InterModCommsHandler.processIMCMessages(event); - } + InterModCommsHandler.processIMCMessages(event); + } } diff --git a/ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java b/ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java index e32f62b5..df51d2f0 100644 --- a/ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java +++ b/ee3_common/com/pahimar/ee3/client/audio/SoundHandler.java @@ -4,7 +4,6 @@ import net.minecraftforge.client.event.sound.SoundLoadEvent; import net.minecraftforge.event.ForgeSubscribe; import com.pahimar.ee3.core.util.LogHelper; -import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Sounds; /** diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java index 6d6f051c..afe61336 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java @@ -3,12 +3,10 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerAlchemicalBag; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; @@ -29,46 +27,52 @@ import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiAlchemicalBag extends GuiContainer { - public GuiAlchemicalBag(InventoryPlayer inventoryPlayer) { + public GuiAlchemicalBag(InventoryPlayer inventoryPlayer) { - super(new ContainerAlchemicalBag(inventoryPlayer)); - xSize = 248; - ySize = 186; - } + super(new ContainerAlchemicalBag(inventoryPlayer)); + xSize = 248; + ySize = 186; + } - @Override - protected void drawGuiContainerForegroundLayer(int x, int y) { + @Override + protected void drawGuiContainerForegroundLayer(int x, int y) { - fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_ALCHEMICAL_BAG_NAME), 8, 6, 4210752); - fontRenderer.drawString(StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY), 44, ySize - 96 + 2, 4210752); - } + fontRenderer.drawString(StatCollector + .translateToLocal(Strings.CONTAINER_ALCHEMICAL_BAG_NAME), 8, 6, + 4210752); + fontRenderer.drawString( + StatCollector.translateToLocal(Strings.CONTAINER_INVENTORY), + 44, ySize - 96 + 2, 4210752); + } - @Override - protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y) { + @Override + protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - // this.mc.getTextureManager().bindTexture(...) - this.mc.func_110434_K().func_110577_a(Textures.GUI_ALCHEMICAL_STORAGE); - - int xStart = (width - xSize) / 2; - int yStart = (height - ySize) / 2; - this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); - } + // this.mc.getTextureManager().bindTexture(...) + this.mc.func_110434_K().func_110577_a(Textures.GUI_ALCHEMICAL_STORAGE); - @Override - public void onGuiClosed() { + int xStart = (width - xSize) / 2; + int yStart = (height - ySize) / 2; + this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); + } - super.onGuiClosed(); + @Override + public void onGuiClosed() { - if (mc.thePlayer != null) { - for (ItemStack itemStack : mc.thePlayer.inventory.mainInventory) { - if (itemStack != null) { - if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) { - NBTHelper.removeTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN); - } - } - } - } - } + super.onGuiClosed(); + + if (mc.thePlayer != null) { + for (ItemStack itemStack : mc.thePlayer.inventory.mainInventory) { + if (itemStack != null) { + if (NBTHelper.hasTag(itemStack, + Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) { + NBTHelper.removeTag(itemStack, + Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN); + } + } + } + } + } } diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java index 96024542..1d242505 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java @@ -2,12 +2,10 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerAlchemicalChest; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java index 1e1f9490..91e75b79 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAludel.java @@ -2,12 +2,10 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerAludel; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java index 02728c1b..d3116d18 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java @@ -2,12 +2,10 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerCalcinator; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java index fad655c8..b689e9b9 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java @@ -2,12 +2,10 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerGlassBell; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java index ef3886ad..540623a8 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java @@ -3,13 +3,11 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.inventory.ContainerPortableCrafting; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java index ddaa4271..84e2ddbc 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableTransmutation.java @@ -3,11 +3,8 @@ package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Strings; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.nbt.NBTHelper; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java b/ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java index 6c29da57..40eca4da 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/RenderUtils.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java index e815b7b7..d4f641e1 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAlchemicalChestRenderer.java @@ -2,13 +2,10 @@ package com.pahimar.ee3.client.renderer.item; import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import com.pahimar.ee3.core.util.ResourceLocationHelper; -import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java index 1e61a6de..91b33275 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemAludelRenderer.java @@ -1,14 +1,11 @@ package com.pahimar.ee3.client.renderer.item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelAludel; -import com.pahimar.ee3.core.util.ResourceLocationHelper; -import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java index 84fa7389..2a253900 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemCalcinatorRenderer.java @@ -1,13 +1,11 @@ package com.pahimar.ee3.client.renderer.item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelCalcinator; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java index 9f3f9e10..b90f926f 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/item/ItemGlassBellRenderer.java @@ -1,13 +1,11 @@ package com.pahimar.ee3.client.renderer.item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelGlassBell; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import cpw.mods.fml.client.FMLClientHandler; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java index 2620ba51..953186d4 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemicalChestRenderer.java @@ -3,14 +3,11 @@ package com.pahimar.ee3.client.renderer.tileentity; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.pahimar.ee3.core.util.ResourceLocationHelper; -import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileAlchemicalChest; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java index d01f1413..105feffa 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAludelRenderer.java @@ -7,13 +7,11 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelAludel; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileAludel; import com.pahimar.ee3.tileentity.TileGlassBell; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java index 4a08e944..dba7b9bc 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java @@ -2,12 +2,9 @@ package com.pahimar.ee3.client.renderer.tileentity; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelCalcinator; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileCalcinator; diff --git a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java index fd6c74d0..9491daf2 100644 --- a/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityGlassBellRenderer.java @@ -7,13 +7,11 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.ForgeDirection; import org.lwjgl.opengl.GL11; import com.pahimar.ee3.client.model.ModelGlassBell; -import com.pahimar.ee3.core.util.ResourceLocationHelper; import com.pahimar.ee3.lib.Textures; import com.pahimar.ee3.tileentity.TileGlassBell; diff --git a/ee3_common/com/pahimar/ee3/command/CommandOverlay.java b/ee3_common/com/pahimar/ee3/command/CommandOverlay.java index 4be37282..564be6b1 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandOverlay.java +++ b/ee3_common/com/pahimar/ee3/command/CommandOverlay.java @@ -7,7 +7,6 @@ import net.minecraft.util.ChatMessageComponent; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; import com.pahimar.ee3.core.util.LocalizationUtil; -import com.pahimar.ee3.lib.Colours; import com.pahimar.ee3.lib.Commands; import com.pahimar.ee3.lib.Strings; diff --git a/ee3_common/com/pahimar/ee3/command/CommandParticles.java b/ee3_common/com/pahimar/ee3/command/CommandParticles.java index 08ce8350..06a2852a 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandParticles.java +++ b/ee3_common/com/pahimar/ee3/command/CommandParticles.java @@ -6,8 +6,6 @@ import net.minecraft.util.ChatMessageComponent; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; -import com.pahimar.ee3.core.util.LocalizationUtil; -import com.pahimar.ee3.lib.Colours; import com.pahimar.ee3.lib.Commands; import com.pahimar.ee3.lib.Strings; diff --git a/ee3_common/com/pahimar/ee3/command/CommandSounds.java b/ee3_common/com/pahimar/ee3/command/CommandSounds.java index 5c686b01..0c486680 100644 --- a/ee3_common/com/pahimar/ee3/command/CommandSounds.java +++ b/ee3_common/com/pahimar/ee3/command/CommandSounds.java @@ -6,8 +6,6 @@ import net.minecraft.util.ChatMessageComponent; import com.pahimar.ee3.configuration.ConfigurationHandler; import com.pahimar.ee3.configuration.ConfigurationSettings; -import com.pahimar.ee3.core.util.LocalizationUtil; -import com.pahimar.ee3.lib.Colours; import com.pahimar.ee3.lib.Commands; /** From 6145e5a0fe1a423a389a8b5fa21add47d9ac1ad2 Mon Sep 17 00:00:00 2001 From: Wliu Date: Mon, 15 Jul 2013 20:56:04 -0400 Subject: [PATCH 06/11] pt_BR update See #385 --- resources/assets/ee3/lang/pt_BR.xml | 55 ++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/resources/assets/ee3/lang/pt_BR.xml b/resources/assets/ee3/lang/pt_BR.xml index 66c1b6f0..57e331a1 100644 --- a/resources/assets/ee3/lang/pt_BR.xml +++ b/resources/assets/ee3/lang/pt_BR.xml @@ -1,31 +1,54 @@  - Brazilian Portuguese (pt_BR) Localization File - + Portuguese (pt_BR) Localization File Extra Liberar - Alternar + Alterar Carregar - Fragmento de Minium - Pedra Inerte - Pedra de Minium - Pedra Filosofal + Fragmento de Minium + Pedra Inerte + Pedra de Minium + Pedra Filosofal Cinzas Pó de Minium - Pó Verdejante - Pó Índigo + Pó Verdejantet + Pó Indigo Pó Amarantino Pó Iridescente Bolsa Alquímica - Água Vermelha (Parada) - Água Vermelha (Corrente) + Água vermelha (Parada) + Água Vermelha(Corrente) Calcinador + Sublimador + Baú Alquímico + Sino Vítreo Calcinador + Sublimador + Baú Alquímico + Bolsa Alquímica + Sino Vítreo Equivalent Exchange 3 - Inicializando checagem de versão remota contra a versão remota mestre, localizada em: - Checagem de versão remota não conseguiu ser inicializada adequadamente - Usando a versão mais recente(@REMOTE_MOD_VERSION@) de Equivalent Exchange 3 para @MINECRAFT_VERSION@ - 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 + Iniciando checagem da versão remota contra a versão remota autorítaria,localizada em + Checagem da versão remota não pode ser feita adequadamente + Atualmente usando a versão mais recente (@REMOTE_MOD_VERSION@) de Equivalent Exchange 3 para @MINECRAFT_VERSION@ + Uma nova versão de @MOD_NAME@ existe (@REMOTE_MOD_VERSION@) para @MINECRAFT_VERSION@. Consigam-na aqui: @MOD_UPDATE_LOCATION@ + Erro enquanto conectando à versão remota do arquivo autoritário; tentando novamente + Checagem de versão finalizada com erros após várias tentativas sem sucesso + Não foi possível achar a versão de @MOD_NAME@ para @MINECRAFT_VERSION@ na versão remota autoritária + Camdada do alvo de transmutação ligada + Camada do alvo de transmutação desligada + Posição da camada alvo de transmutação configurada para noroeste + Posição da camada alvo de transmutação configurada para nordeste + Posição da camada alvo de transmutação configurada para sudoeste + Posição da camada alvo de transmutação configurada para sudeste + (onde ### é um valor decimal entre 0.0 e 1.0) + Opacidade da camada alvo de transmutação configurada com sucesso + (onde ### é um valor decimal maior que 0.0) + Escala da camada alvo de transmutação configurada com sucesso + Partículas do Equivalent Exchange 3 ligadas + Partículas do Equivalent Exchange 3 desligadas + Tocando sons do Equivalent Exchange 3 para todos os jogadores + Tocando sons do Equivalent Exchange 3 para si mesmo + Sons do Equivalent Exchange 3 desabilitados \ No newline at end of file From 1ab65bcbdc43c58f3dedc272617f2d63b0123baf Mon Sep 17 00:00:00 2001 From: Zmiko Date: Tue, 16 Jul 2013 19:21:44 +0200 Subject: [PATCH 07/11] Renaming sr_RS into sr_SP. --- resources/assets/ee3/lang/{sr_RS.xml => sr_SP.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/assets/ee3/lang/{sr_RS.xml => sr_SP.xml} (100%) diff --git a/resources/assets/ee3/lang/sr_RS.xml b/resources/assets/ee3/lang/sr_SP.xml similarity index 100% rename from resources/assets/ee3/lang/sr_RS.xml rename to resources/assets/ee3/lang/sr_SP.xml From 812663606721dea5e01d04e674f520f1b70681c6 Mon Sep 17 00:00:00 2001 From: Zmiko Date: Tue, 16 Jul 2013 19:23:07 +0200 Subject: [PATCH 08/11] Update sr_SP.xml --- resources/assets/ee3/lang/sr_SP.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/ee3/lang/sr_SP.xml b/resources/assets/ee3/lang/sr_SP.xml index 6d80add5..c9139cba 100644 --- a/resources/assets/ee3/lang/sr_SP.xml +++ b/resources/assets/ee3/lang/sr_SP.xml @@ -1,7 +1,7 @@  - Serbian (sr_RS) Localization File + Serbian (sr_SP) Localization File Dodatno Oslabiti Menjati From 93804744d18b1fe12908c5d4851f7232e2ecc007 Mon Sep 17 00:00:00 2001 From: Zmiko Date: Tue, 16 Jul 2013 19:24:08 +0200 Subject: [PATCH 09/11] Rename sr_RS to sr_SP in Localizations.java. --- ee3_common/com/pahimar/ee3/lib/Localizations.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee3_common/com/pahimar/ee3/lib/Localizations.java b/ee3_common/com/pahimar/ee3/lib/Localizations.java index b397f312..33a9c87e 100644 --- a/ee3_common/com/pahimar/ee3/lib/Localizations.java +++ b/ee3_common/com/pahimar/ee3/lib/Localizations.java @@ -13,6 +13,6 @@ public class Localizations { private static final String LANG_RESOURCE_LOCATION = "/assets/ee3/lang/"; - public static String[] localeFiles = { LANG_RESOURCE_LOCATION + "cs_CZ.xml", LANG_RESOURCE_LOCATION + "cy_GB.xml", LANG_RESOURCE_LOCATION + "da_DK.xml", LANG_RESOURCE_LOCATION + "de_DE.xml", LANG_RESOURCE_LOCATION + "en_US.xml", LANG_RESOURCE_LOCATION + "es_ES.xml", LANG_RESOURCE_LOCATION + "fi_FI.xml", 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 + "nb_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 + "sk_SK.xml", LANG_RESOURCE_LOCATION + "sr_RS.xml", LANG_RESOURCE_LOCATION + "sv_SE.xml", LANG_RESOURCE_LOCATION + "tr_TR.xml", LANG_RESOURCE_LOCATION + "zh_CN.xml", LANG_RESOURCE_LOCATION + "zh_TW.xml", LANG_RESOURCE_LOCATION + "el_GR.xml" }; + public static String[] localeFiles = { LANG_RESOURCE_LOCATION + "cs_CZ.xml", LANG_RESOURCE_LOCATION + "cy_GB.xml", LANG_RESOURCE_LOCATION + "da_DK.xml", LANG_RESOURCE_LOCATION + "de_DE.xml", LANG_RESOURCE_LOCATION + "en_US.xml", LANG_RESOURCE_LOCATION + "es_ES.xml", LANG_RESOURCE_LOCATION + "fi_FI.xml", 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 + "nb_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 + "sk_SK.xml", LANG_RESOURCE_LOCATION + "sr_SP.xml", LANG_RESOURCE_LOCATION + "sv_SE.xml", LANG_RESOURCE_LOCATION + "tr_TR.xml", LANG_RESOURCE_LOCATION + "zh_CN.xml", LANG_RESOURCE_LOCATION + "zh_TW.xml", LANG_RESOURCE_LOCATION + "el_GR.xml" }; } From 87c27539ab75a54b07490e79fd56fc868d72daee Mon Sep 17 00:00:00 2001 From: Asajz Date: Tue, 16 Jul 2013 12:30:27 -0500 Subject: [PATCH 10/11] Updated to new location for 1.6 --- resources/assets/ee3/lang/es_ES.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/assets/ee3/lang/es_ES.xml b/resources/assets/ee3/lang/es_ES.xml index aaa40376..0c562161 100644 --- a/resources/assets/ee3/lang/es_ES.xml +++ b/resources/assets/ee3/lang/es_ES.xml @@ -4,7 +4,7 @@ Spanish (es_ES) Localization File Extra Lanzar - Alternar + Mueva Cargar Fragmento de Minio Piedra Inerte @@ -16,18 +16,18 @@ Polvo Azur Polvo Purpúreo Polvo Iridiscente - Bolsa de Alquimia - Agua Roja (Quieta) - Agua Roja (Fluyendo) + Bolsa Alquimico + Agua Roja (Inmovil) + Agua Roja (Corriente) Calcinador Aludel - Cofre de Alquimia + Cofre Alquimico Campana de Crystal Calcinator Aludel - Cofre de Alquimia - Bolsa de Alquimia - Campana de Crystal + Cofre Alquimico + Bolsa Alquimico + Campana Virido Equivalent Exchange 3 Inicializando chequeo de versión contra el archivo autoritario remoto, ubicado en El chequeo de versiones no se iniicalizó adecuadamente From 68c58e39ca2916bfa16fcd9ffbe3d4621b4bdee1 Mon Sep 17 00:00:00 2001 From: Lunatrius Date: Sat, 15 Jun 2013 03:55:54 +0200 Subject: [PATCH 11/11] Added sl_SI.xml --- resources/assets/ee3/lang/sl_SI.xml | 54 +++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 resources/assets/ee3/lang/sl_SI.xml diff --git a/resources/assets/ee3/lang/sl_SI.xml b/resources/assets/ee3/lang/sl_SI.xml new file mode 100644 index 00000000..a6dcc1d1 --- /dev/null +++ b/resources/assets/ee3/lang/sl_SI.xml @@ -0,0 +1,54 @@ + + + + Slovenian (sl_SI) Localization File + Dodatno + Sproži + Preklopi + Nabij + Drobec Minija + Nedejaven Kamen + Minijev Kamen + Kamen Modrosti + Pepel + Minijev Prah + Zelen Prah + Moder Prah + Vijoličen Prah + Mavrični Prah + Alkimistična Vreča + Rdeča Voda (Mirujoča) + Rdeča Voda (Pretočna) + Kalcinator + Aludel + Alkimistični Zaboj + Stekleni Zvonec + Kalcinator + Aludel + Alkimistični Zaboj + Alkimistična Vreča + Stekleni Zvonec + Equivalent Exchange 3 + Inicializiram oddaljeno preverjanje različice z različico oddaljenega strežnika, ki se nahaja na + Oddaljeno preverjanje različice se ni inicializiralo pravilno + Trenutno je v uporabi zadnja različica (@REMOTE_MOD_VERSION@) Equivalent Exchange 3 za @MINECRAFT_VERSION@ + Obstaja nova različica @MOD_NAME@ (@REMOTE_MOD_VERSION@) za @MINECRAFT_VERSION@. Dobite jo tukaj: @MOD_UPDATE_LOCATION@ + Napaka pri pridobivanju datoteke z različico z oddaljenega strežnika; poskušam znova + Preverjanje različice ustavljeno po treh neuspešnih preverjanjih + Ne morem najti različice @MOD_NAME@ za @MINECRAFT_VERSION@ na oddaljenem strežniku + Prikaz transmutacije je vključen + Prikaz transmutacije je izključen + Mesto prikaza transmutacije je bilo nastavljeno na zgoraj levo + Mesto prikaza transmutacije je bilo nastavljeno na zgoraj desno + Mesto prikaza transmutacije je bilo nastavljeno na spodaj levo + Mesto prikaza transmutacije je bilo nastavljeno na spodaj desno + (kjer je ### decimalna vrednost med 0.0 in 1.0) + Prosojnost prikaza transmutacije je bila uspešno posodobljena + (kjer je ### decimalna vrednost večja od 0.0) + Velikost prikaza transmutacije je bila uspešno posodobljena + Equivalent Exchange 3 delci so vključeni + Equivalent Exchange 3 delci so izključeni + Predvajam Equivalent Exchange 3 zvoke vseh igralcev + Predvajam Equivalent Exchange 3 zvoke samo od sebe + Predvajanje Equivalent Exchange 3 zvokov je izključeno +