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