diff --git a/ee3_client/ee3/client/gui/GuiCalcinator.java b/ee3_client/ee3/client/gui/GuiCalcinator.java index 7b2944f4..76a860fe 100644 --- a/ee3_client/ee3/client/gui/GuiCalcinator.java +++ b/ee3_client/ee3/client/gui/GuiCalcinator.java @@ -14,7 +14,15 @@ import net.minecraft.src.InventoryPlayer; import net.minecraft.src.StatCollector; import net.minecraft.src.TileEntityFurnace; -@SideOnly(Side.CLIENT) +/** + * GuiCalcinator + * + * Calcinator Gui class + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class GuiCalcinator extends GuiContainer { private TileCalcinator calcinator; diff --git a/ee3_client/ee3/client/gui/GuiPortableCrafting.java b/ee3_client/ee3/client/gui/GuiPortableCrafting.java index 83a3ef11..45aa8cb8 100644 --- a/ee3_client/ee3/client/gui/GuiPortableCrafting.java +++ b/ee3_client/ee3/client/gui/GuiPortableCrafting.java @@ -11,7 +11,15 @@ import net.minecraft.src.GuiContainer; import net.minecraft.src.StatCollector; import net.minecraft.src.World; -@SideOnly(Side.CLIENT) +/** + * GuiPortableCrafting + * + * Portable Crafting Gui class + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class GuiPortableCrafting extends GuiContainer { public GuiPortableCrafting(EntityPlayer player, World world, int x, int y, int z) { diff --git a/ee3_client/ee3/client/render/ModelCalcinator.java b/ee3_client/ee3/client/render/ModelCalcinator.java index 0d3cec8f..02efd95f 100644 --- a/ee3_client/ee3/client/render/ModelCalcinator.java +++ b/ee3_client/ee3/client/render/ModelCalcinator.java @@ -8,6 +8,15 @@ import net.minecraft.src.ModelBase; import net.minecraft.src.ModelRenderer; import net.minecraftforge.client.ForgeHooksClient; +/** + * ModelCalcinator + * + * Model for the Calcinator + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class ModelCalcinator extends ModelBase { private static final int TEXTURE_HEIGHT = 128; diff --git a/ee3_client/ee3/client/render/RenderCalcinator.java b/ee3_client/ee3/client/render/RenderCalcinator.java index c415b2c7..30814cbc 100644 --- a/ee3_client/ee3/client/render/RenderCalcinator.java +++ b/ee3_client/ee3/client/render/RenderCalcinator.java @@ -9,6 +9,15 @@ import net.minecraft.src.ModelRenderer; import net.minecraft.src.TileEntity; import net.minecraft.src.TileEntitySpecialRenderer; +/** + * RenderCalcinator + * + * Renders the Calcinator in game as a TESR (Tile Entity Special Render) + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class RenderCalcinator extends TileEntitySpecialRenderer { static final float scale = (float) (1.0 / 16.0); diff --git a/ee3_client/ee3/client/render/RenderItemCalcinator.java b/ee3_client/ee3/client/render/RenderItemCalcinator.java index 72062a06..4f8f67e1 100644 --- a/ee3_client/ee3/client/render/RenderItemCalcinator.java +++ b/ee3_client/ee3/client/render/RenderItemCalcinator.java @@ -8,6 +8,15 @@ import net.minecraft.src.Tessellator; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; +/** + * RenderItemCalcinator + * + * Renders the Calcinator in game as an item (in hand, on the ground, and in inventory) + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class RenderItemCalcinator implements IItemRenderer { private ModelCalcinator calcinatorModel; diff --git a/ee3_client/ee3/client/render/TextureRedWaterFX.java b/ee3_client/ee3/client/render/TextureRedWaterFX.java index f0eab03d..98d4ade7 100644 --- a/ee3_client/ee3/client/render/TextureRedWaterFX.java +++ b/ee3_client/ee3/client/render/TextureRedWaterFX.java @@ -8,6 +8,15 @@ import cpw.mods.fml.client.FMLTextureFX; import ee3.common.block.ModBlocks; import ee3.common.lib.Reference; +/** + * TextureRedWaterFX + * + * TextureFX for still Red Water + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class TextureRedWaterFX extends FMLTextureFX { protected float[] red = new float[256]; diff --git a/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java b/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java index f593b240..5a70ad8e 100644 --- a/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java +++ b/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java @@ -8,6 +8,15 @@ import cpw.mods.fml.client.FMLTextureFX; import ee3.common.block.ModBlocks; import ee3.common.lib.Reference; +/** + * TextureRedWaterFlowFX + * + * TextureFX for flowing Red Water + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class TextureRedWaterFlowFX extends FMLTextureFX { protected float[] red = new float[256]; diff --git a/ee3_common/ee3/common/EquivalentExchange3.java b/ee3_common/ee3/common/EquivalentExchange3.java index 8e3c4832..d0031501 100644 --- a/ee3_common/ee3/common/EquivalentExchange3.java +++ b/ee3_common/ee3/common/EquivalentExchange3.java @@ -1,5 +1,6 @@ package ee3.common; +import net.minecraft.src.CreativeTabs; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -18,6 +19,7 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.TickRegistry; import ee3.common.block.ModBlocks; import ee3.common.core.CommonProxy; +import ee3.common.core.CreativeTabEE3; import ee3.common.core.handlers.AddonHandler; import ee3.common.core.handlers.ConfigurationHandler; import ee3.common.core.handlers.EntityLivingHandler; @@ -52,6 +54,8 @@ public class EquivalentExchange3 { @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); @PreInit public void preInit(FMLPreInitializationEvent event) { diff --git a/ee3_common/ee3/common/block/BlockCalcinator.java b/ee3_common/ee3/common/block/BlockCalcinator.java index 749c3abb..4c6ddb48 100644 --- a/ee3_common/ee3/common/block/BlockCalcinator.java +++ b/ee3_common/ee3/common/block/BlockCalcinator.java @@ -24,7 +24,6 @@ public class BlockCalcinator extends BlockEE { public BlockCalcinator(int id) { super(id, Material.rock); setHardness(5F); - setCreativeTab(CreativeTabs.tabDecorations); } @Override diff --git a/ee3_common/ee3/common/block/BlockRedWaterFlowing.java b/ee3_common/ee3/common/block/BlockRedWaterFlowing.java index ed3d1a10..af9f51f7 100644 --- a/ee3_common/ee3/common/block/BlockRedWaterFlowing.java +++ b/ee3_common/ee3/common/block/BlockRedWaterFlowing.java @@ -5,6 +5,15 @@ import net.minecraft.src.BlockFlowing; import net.minecraft.src.CreativeTabs; import net.minecraft.src.Material; +/** + * BlockRedWaterFlowing + * + * Class for the flowing version of Red Water + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class BlockRedWaterFlowing extends BlockFlowing { protected BlockRedWaterFlowing(int id, Material material) { @@ -12,7 +21,6 @@ public class BlockRedWaterFlowing extends BlockFlowing { this.blockHardness = 100F; this.setLightOpacity(3); this.setBlockName("redWaterFlowing"); - this.setCreativeTab(CreativeTabs.tabDecorations); } @Override diff --git a/ee3_common/ee3/common/block/BlockRedWaterStill.java b/ee3_common/ee3/common/block/BlockRedWaterStill.java index cf133e4f..2677f6bd 100644 --- a/ee3_common/ee3/common/block/BlockRedWaterStill.java +++ b/ee3_common/ee3/common/block/BlockRedWaterStill.java @@ -5,6 +5,15 @@ import net.minecraft.src.BlockStationary; import net.minecraft.src.CreativeTabs; import net.minecraft.src.Material; +/** + * BlockRedWaterFlowing + * + * Class for the still version of Red Water + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class BlockRedWaterStill extends BlockStationary { protected BlockRedWaterStill(int id, Material material) { @@ -14,7 +23,6 @@ public class BlockRedWaterStill extends BlockStationary { setBlockName("redWaterStill"); disableStats(); setRequiresSelfNotify(); - setCreativeTab(CreativeTabs.tabDecorations); } @Override diff --git a/ee3_common/ee3/common/block/ModBlocks.java b/ee3_common/ee3/common/block/ModBlocks.java index 57c3ba46..551a924d 100644 --- a/ee3_common/ee3/common/block/ModBlocks.java +++ b/ee3_common/ee3/common/block/ModBlocks.java @@ -2,12 +2,22 @@ package ee3.common.block; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; +import ee3.common.EquivalentExchange3; import ee3.common.lib.BlockIds; import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; import net.minecraft.src.Material; +/** + * ModBlocks + * + * Class containing all the EE3 custom blocks + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class ModBlocks { /* Block name constants */ @@ -21,9 +31,9 @@ public class ModBlocks { public static void init() { - calcinator = new BlockCalcinator(BlockIds.CALCINATOR).setBlockName(CALCINATOR_NAME); - redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL, Material.water); - redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1, Material.water); + calcinator = new BlockCalcinator(BlockIds.CALCINATOR).setBlockName(CALCINATOR_NAME).setCreativeTab(EquivalentExchange3.tabsEE3); + redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL, Material.water).setCreativeTab(EquivalentExchange3.tabsEE3); + redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1, Material.water).setCreativeTab(EquivalentExchange3.tabsEE3); GameRegistry.registerBlock(calcinator); GameRegistry.registerBlock(redWaterStill); @@ -36,13 +46,14 @@ public class ModBlocks { private static void initBlockRecipes() { // Calcinator Recipe + /* Temporarily disabled for pre-release 1, as it is not completely functional GameRegistry.addRecipe(new ItemStack(calcinator), new Object[] {"i i","iii","sfs", Character.valueOf('i'), Item.ingotIron, Character.valueOf('s'), Block.stone, Character.valueOf('f'), Item.flintAndSteel }); - + */ } } diff --git a/ee3_common/ee3/common/container/ContainerCalcinator.java b/ee3_common/ee3/common/container/ContainerCalcinator.java index 2b61e9af..c5c8b4b2 100644 --- a/ee3_common/ee3/common/container/ContainerCalcinator.java +++ b/ee3_common/ee3/common/container/ContainerCalcinator.java @@ -9,6 +9,15 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.Slot; import net.minecraft.src.TileEntityFurnace; +/** + * ContainerCalcinator + * + * The container class for the Calcinator + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class ContainerCalcinator extends Container { private TileCalcinator calcinator; diff --git a/ee3_common/ee3/common/container/ContainerPortableCrafting.java b/ee3_common/ee3/common/container/ContainerPortableCrafting.java index b50cabc2..dd3beb01 100644 --- a/ee3_common/ee3/common/container/ContainerPortableCrafting.java +++ b/ee3_common/ee3/common/container/ContainerPortableCrafting.java @@ -5,6 +5,15 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.InventoryPlayer; import net.minecraft.src.World; +/** + * ContainerPortableCrafting + * + * Container class for the portable crafting interface + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class ContainerPortableCrafting extends ContainerWorkbench { public ContainerPortableCrafting(InventoryPlayer inventoryPlayer, World world, int x, int y, int z) { diff --git a/ee3_common/ee3/common/core/CreativeTabEE3.java b/ee3_common/ee3/common/core/CreativeTabEE3.java new file mode 100644 index 00000000..f2e23225 --- /dev/null +++ b/ee3_common/ee3/common/core/CreativeTabEE3.java @@ -0,0 +1,25 @@ +package ee3.common.core; + +import cpw.mods.fml.common.Side; +import cpw.mods.fml.common.asm.SideOnly; +import ee3.common.item.ModItems; +import ee3.common.lib.ItemIds; +import net.minecraft.src.CreativeTabs; +import net.minecraft.src.Item; + +public class CreativeTabEE3 extends CreativeTabs { + + public CreativeTabEE3(int par1, String par2Str) { + super(par1, par2Str); + } + + @SideOnly(Side.CLIENT) + + /** + * the itemID for the item to be displayed on the tab + */ + public int getTabIconItemIndex() { + return ItemIds.PHILOSOPHER_STONE; + } + +} diff --git a/ee3_common/ee3/common/core/handlers/ConfigurationHandler.java b/ee3_common/ee3/common/core/handlers/ConfigurationHandler.java index b226ac97..da503daf 100644 --- a/ee3_common/ee3/common/core/handlers/ConfigurationHandler.java +++ b/ee3_common/ee3/common/core/handlers/ConfigurationHandler.java @@ -64,6 +64,9 @@ public class ConfigurationHandler { ItemIds.MINIUM_SHARD = configuration .getItem(ModItems.MINIUM_SHARD_NAME, ItemIds.MINIUM_SHARD_DEFAULT) .getInt(ItemIds.MINIUM_SHARD_DEFAULT); + ItemIds.INERT_STONE = configuration + .getItem(ModItems.INERT_STONE_NAME, ItemIds.INERT_STONE_DEFAULT) + .getInt(ItemIds.INERT_STONE_DEFAULT); ItemIds.MINIUM_STONE = configuration .getItem(ModItems.MINIUM_STONE_NAME, ItemIds.MINIUM_STONE_DEFAULT) .getInt(ItemIds.MINIUM_STONE_DEFAULT); diff --git a/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java b/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java index 261131ef..ede65e9e 100644 --- a/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java +++ b/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java @@ -11,6 +11,15 @@ import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; +/** + * EntityLivingHandler + * + * Class containing all EE3 custom event related logic for EntityLiving events + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class EntityLivingHandler { @ForgeSubscribe diff --git a/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java b/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java index e66ba9a8..cd02a3c6 100644 --- a/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java +++ b/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java @@ -5,6 +5,15 @@ import java.util.ArrayList; import ee3.common.core.helper.GeneralHelper; import net.minecraft.src.ItemStack; +/** + * EquivalencyHandler + * + * Class to handle all the equivalency relationships between items/etc + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class EquivalencyHandler { private static final EquivalencyHandler instance = new EquivalencyHandler(); @@ -139,6 +148,10 @@ public class EquivalencyHandler { int i = 0; if (list != null) { + if (list.size() == 1) { + return list.get(i); + } + while (i < list.size()) { currentStack = list.get(i); @@ -172,6 +185,10 @@ public class EquivalencyHandler { int i = 0; if (list != null) { + if (list.size() == 1) { + return list.get(i); + } + while (i < list.size()) { currentStack = list.get(i); diff --git a/ee3_common/ee3/common/core/handlers/FuelHandler.java b/ee3_common/ee3/common/core/handlers/FuelHandler.java index 5b63302d..76b46261 100644 --- a/ee3_common/ee3/common/core/handlers/FuelHandler.java +++ b/ee3_common/ee3/common/core/handlers/FuelHandler.java @@ -3,6 +3,15 @@ package ee3.common.core.handlers; import net.minecraft.src.ItemStack; import cpw.mods.fml.common.IFuelHandler; +/** + * FuelHandler + * + * Class for querying and returning fuel values for items + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class FuelHandler implements IFuelHandler { @Override diff --git a/ee3_common/ee3/common/core/handlers/PlayerDestroyItemHandler.java b/ee3_common/ee3/common/core/handlers/PlayerDestroyItemHandler.java index 584825d7..8b9f7fb2 100644 --- a/ee3_common/ee3/common/core/handlers/PlayerDestroyItemHandler.java +++ b/ee3_common/ee3/common/core/handlers/PlayerDestroyItemHandler.java @@ -3,12 +3,21 @@ package ee3.common.core.handlers; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +/** + * PlayerDestroyItemHandler + * + * Class containing all EE3 custom event related logic for PlayerDestroyItem events + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class PlayerDestroyItemHandler { @ForgeSubscribe public void onPlayerDestroyItemEvent(PlayerDestroyItemEvent event) { // TODO Come back and actually do what I want here - System.out.println(event.original.func_82833_r()); + } } diff --git a/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java b/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java index 5a12febf..3d62cc3a 100644 --- a/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java +++ b/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java @@ -10,6 +10,15 @@ import ee3.common.lib.Colours; import ee3.common.lib.ConfigurationSettings; 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 + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class VersionCheckTickHandler implements ITickHandler { private static boolean initialized = false; diff --git a/ee3_common/ee3/common/core/helper/GeneralHelper.java b/ee3_common/ee3/common/core/helper/GeneralHelper.java index 0c8533ff..b28b0ab1 100644 --- a/ee3_common/ee3/common/core/helper/GeneralHelper.java +++ b/ee3_common/ee3/common/core/helper/GeneralHelper.java @@ -6,6 +6,15 @@ import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; +/** + * GeneralHelper + * + * General helper methods for EE3 + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class GeneralHelper { public static ItemStack convertObjectToItemStack(Object obj) { diff --git a/ee3_common/ee3/common/core/helper/ItemDropHelper.java b/ee3_common/ee3/common/core/helper/ItemDropHelper.java index 2707a626..1ce88937 100644 --- a/ee3_common/ee3/common/core/helper/ItemDropHelper.java +++ b/ee3_common/ee3/common/core/helper/ItemDropHelper.java @@ -5,6 +5,15 @@ import net.minecraft.src.EntityAgeable; import net.minecraft.src.EntityLiving; import net.minecraft.src.EntityPlayer; +/** + * ItemDropHelper + * + * Helper methods for dropping items in game + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class ItemDropHelper { private static double rand; diff --git a/ee3_common/ee3/common/core/helper/LogHelper.java b/ee3_common/ee3/common/core/helper/LogHelper.java index 871eb4d0..a6432674 100644 --- a/ee3_common/ee3/common/core/helper/LogHelper.java +++ b/ee3_common/ee3/common/core/helper/LogHelper.java @@ -8,6 +8,15 @@ import cpw.mods.fml.common.FMLLog; import ee3.common.EquivalentExchange3; import ee3.common.lib.Reference; +/** + * LogHelper + * + * Helper methods for logging to the EE3 logger + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class LogHelper { private static Logger eeLogger = Logger.getLogger(Reference.MOD_NAME); @@ -17,7 +26,6 @@ public class LogHelper { } public static void log(Level logLevel, String message) { - //System.out.println(Reference.LOGGER_PREFIX + message); eeLogger.log(logLevel, message); } diff --git a/ee3_common/ee3/common/core/helper/NBTHelper.java b/ee3_common/ee3/common/core/helper/NBTHelper.java index 7f47b74c..e03c938e 100644 --- a/ee3_common/ee3/common/core/helper/NBTHelper.java +++ b/ee3_common/ee3/common/core/helper/NBTHelper.java @@ -3,6 +3,15 @@ package ee3.common.core.helper; import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; +/** + * NBTHelper + * + * Helper methods for manipulating NBT data on ItemStacks + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class NBTHelper { /** diff --git a/ee3_common/ee3/common/core/helper/QualityHelper.java b/ee3_common/ee3/common/core/helper/QualityHelper.java index b14df137..e668cc9d 100644 --- a/ee3_common/ee3/common/core/helper/QualityHelper.java +++ b/ee3_common/ee3/common/core/helper/QualityHelper.java @@ -2,20 +2,17 @@ package ee3.common.core.helper; import net.minecraft.src.ItemStack; +/** + * QualityHelper + * + * Helper methods for determining the quality tier of items + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class QualityHelper { - /* - * Legend for the dust table quality lookup, comparison is based off of quality tiers - * - * Item Quality - * |_0_|_1_|_2_|_3_|_4_|_5_| - * Fuel 0 | 0 | 0 | 0 | 1 | 1 | 1 | - * Quality 1 | 0 | 1 | 1 | 1 | 2 | 2 | - * 2 | 0 | 1 | 2 | 2 | 2 | 2 | - * 3 | 1 | 1 | 2 | 3 | 3 | 3 | - * 4 | 1 | 2 | 2 | 3 | 4 | 4 | - * 5 | 1 | 2 | 2 | 3 | 4 | 5 | - */ private static int[][] dustTable = { {0, 0, 0, 1, 1, 1}, {0, 1, 1, 1, 2, 2}, diff --git a/ee3_common/ee3/common/core/helper/RecipeHelper.java b/ee3_common/ee3/common/core/helper/RecipeHelper.java index 48321756..b4261d9d 100644 --- a/ee3_common/ee3/common/core/helper/RecipeHelper.java +++ b/ee3_common/ee3/common/core/helper/RecipeHelper.java @@ -8,6 +8,15 @@ import net.minecraft.src.Item; import net.minecraft.src.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; +/** + * RecipeHelper + * + * Helper methods for adding recipes + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class RecipeHelper { public static void addRecipe(ItemStack output, Object... input) { diff --git a/ee3_common/ee3/common/core/helper/RedWaterHelper.java b/ee3_common/ee3/common/core/helper/RedWaterHelper.java index 9e70dba7..e35a37f2 100644 --- a/ee3_common/ee3/common/core/helper/RedWaterHelper.java +++ b/ee3_common/ee3/common/core/helper/RedWaterHelper.java @@ -8,6 +8,15 @@ import net.minecraft.src.EntityLiving; import net.minecraft.src.MathHelper; import net.minecraft.src.World; +/** + * RedWaterHelper + * + * Helper methods for Red Water related effects + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class RedWaterHelper { public static boolean handleRedWaterDetection(EntityLiving entity) { diff --git a/ee3_common/ee3/common/core/helper/TransmutationHelper.java b/ee3_common/ee3/common/core/helper/TransmutationHelper.java index 910254dd..1de1667e 100644 --- a/ee3_common/ee3/common/core/helper/TransmutationHelper.java +++ b/ee3_common/ee3/common/core/helper/TransmutationHelper.java @@ -1,12 +1,27 @@ package ee3.common.core.helper; +import java.util.ArrayList; + +import ee3.common.core.handlers.EquivalencyHandler; import ee3.common.lib.Sounds; import net.minecraft.src.Block; +import net.minecraft.src.BlockSand; +import net.minecraft.src.BlockLeaves; import net.minecraft.src.EntityPlayer; +import net.minecraft.src.ItemBlock; import net.minecraft.src.ItemStack; import net.minecraft.src.Material; import net.minecraft.src.World; +/** + * TransmutationHelper + * + * Helper methods for transmutation related things + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class TransmutationHelper { public static boolean transmuteInWorld(World world, EntityPlayer player, ItemStack stack, int x, int y, int z) { @@ -14,12 +29,11 @@ public class TransmutationHelper { int id = world.getBlockId(x, y, z); int meta = world.getBlockMetadata(x, y, z); - if (world.getBlockMaterial(x, y, z) == Material.leaves) { - meta = meta % 4; + if ((world.getBlockMaterial(x, y, z) == Material.leaves) && (Block.blocksList[id] instanceof BlockLeaves)) { + meta = meta % 4; } - /* - ItemStack nextItem = EquivalencyHandler.getNextBlockInEquivalencyList(id, meta, player.isSneaking()); + ItemStack nextItem = getNextBlock(id, meta, player.isSneaking()); if (nextItem != null) { if (Block.blocksList[nextItem.itemID] != null) { @@ -28,9 +42,70 @@ public class TransmutationHelper { return true; } } - */ return false; } + + public static ItemStack getNextBlock(int id, int meta, boolean allowFalling) { + ArrayList list = EquivalencyHandler.instance().getEquivalencyList(id, meta); + + ItemStack nextStack = null; + + if (list != null) { + return getNextBlock(id, meta, id, meta, allowFalling); + } + + return nextStack; + } + + private static ItemStack getNextBlock(int id, int meta, int origId, int origMeta, boolean allowFalling) { + ArrayList list = EquivalencyHandler.instance().getEquivalencyList(id, meta); + + ItemStack nextStack = null; + + if (list != null) { + nextStack = EquivalencyHandler.instance().getNextInList(id, meta); + /* + * If the current item is the same as the original one we started with, then we have + * recursed through the entire list and not found a next block so return the original. + * This is the "base case" for the recursion. + */ + if ((nextStack.itemID == origId) && (nextStack.getItemDamage() == origMeta)) { + return nextStack; + } + else { + /* + * If we are allowing any block (including falling ones) just check to see if the + * next item is a block. If it is, return it. Otherwise continue the recursion. + */ + if (allowFalling) { + if (nextStack.getItem() instanceof ItemBlock) { + return nextStack; + } + else { + return getNextBlock(nextStack.itemID, nextStack.getItemDamage(), origId, origMeta, allowFalling); + } + } + /* + * Else we need to check to make sure the next item is both a block and not an + * instance of BlockSand (which all gravity affected blocks are a subclass of. + * If the next item is a block, and is not a subclass of BlockSand return it, + * otherwise, continue the recursion. + */ + else { + if ((nextStack.getItem() instanceof ItemBlock) && (!(Block.blocksList[nextStack.itemID] instanceof BlockSand))) { + return nextStack; + } + else { + return getNextBlock(nextStack.itemID, nextStack.getItemDamage(), origId, origMeta, allowFalling); + } + } + } + } + + // In the event the list is null, return null + return nextStack; + } + } diff --git a/ee3_common/ee3/common/emc/EMCEntry.java b/ee3_common/ee3/common/emc/EMCEntry.java index db21da1e..6a3d5fbe 100644 --- a/ee3_common/ee3/common/emc/EMCEntry.java +++ b/ee3_common/ee3/common/emc/EMCEntry.java @@ -4,6 +4,15 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; +/** + * EMCEntry + * + * Holds the breakdown of how much, and what kinds, of EMC an object has + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class EMCEntry { private float cost, recoveryPercentage; diff --git a/ee3_common/ee3/common/emc/EMCRegistry.java b/ee3_common/ee3/common/emc/EMCRegistry.java index 48387402..fc1f8892 100644 --- a/ee3_common/ee3/common/emc/EMCRegistry.java +++ b/ee3_common/ee3/common/emc/EMCRegistry.java @@ -7,6 +7,15 @@ import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; +/** + * EMCRegistry + * + * Registry containing all EMC entries for objects + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class EMCRegistry { private static final EMCRegistry emcRegistry = new EMCRegistry(); diff --git a/ee3_common/ee3/common/emc/EMCType.java b/ee3_common/ee3/common/emc/EMCType.java index 79844d02..613ab8d4 100644 --- a/ee3_common/ee3/common/emc/EMCType.java +++ b/ee3_common/ee3/common/emc/EMCType.java @@ -1,5 +1,14 @@ package ee3.common.emc; +/** + * EMCType + * + * Enum containing the different types of EMC available in the mod + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public enum EMCType { CORPOREAL, KINETIC, TEMPORAL, ESSENTIA, AMORPHOUS, VOID, OMNI } diff --git a/ee3_common/ee3/common/item/ITransmutationStone.java b/ee3_common/ee3/common/item/ITransmutationStone.java index 11614083..0d74043f 100644 --- a/ee3_common/ee3/common/item/ITransmutationStone.java +++ b/ee3_common/ee3/common/item/ITransmutationStone.java @@ -1,5 +1,14 @@ package ee3.common.item; +/** + * ITransmutationStone + * + * Transmutation Stone interface, for use amongst all different kinds of transmutation stones + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public interface ITransmutationStone { public abstract void openPortableCraftingGui(); diff --git a/ee3_common/ee3/common/item/ItemInertStone.java b/ee3_common/ee3/common/item/ItemInertStone.java index 5d965ddc..215a3888 100644 --- a/ee3_common/ee3/common/item/ItemInertStone.java +++ b/ee3_common/ee3/common/item/ItemInertStone.java @@ -1,5 +1,14 @@ package ee3.common.item; +/** + * ItemInertStone + * + * An inert stone + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class ItemInertStone extends ItemEE { public ItemInertStone(int id) { diff --git a/ee3_common/ee3/common/item/ItemMiniumStone.java b/ee3_common/ee3/common/item/ItemMiniumStone.java index c56306d1..e42dac54 100644 --- a/ee3_common/ee3/common/item/ItemMiniumStone.java +++ b/ee3_common/ee3/common/item/ItemMiniumStone.java @@ -25,7 +25,7 @@ public class ItemMiniumStone extends ItemEE { public ItemMiniumStone(int id) { super(id); - setMaxDamage(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY); + setMaxDamage(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY - 1); } @SideOnly(Side.CLIENT) diff --git a/ee3_common/ee3/common/item/ModItems.java b/ee3_common/ee3/common/item/ModItems.java index 4a54d99a..94604364 100644 --- a/ee3_common/ee3/common/item/ModItems.java +++ b/ee3_common/ee3/common/item/ModItems.java @@ -2,6 +2,7 @@ package ee3.common.item; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; +import ee3.common.EquivalentExchange3; import ee3.common.lib.ItemIds; import net.minecraft.src.Block; import net.minecraft.src.CreativeTabs; @@ -20,23 +21,23 @@ import net.minecraft.src.ItemStack; public class ModItems { /* Item name constants */ - public static final String INERT_STONE_NAME = "inertStone"; public static final String MINIUM_SHARD_NAME = "miniumShard"; + public static final String INERT_STONE_NAME = "inertStone"; public static final String MINIUM_STONE_NAME = "miniumStone"; public static final String PHILOSOPHER_STONE_NAME = "philStone"; /* Mod item instances */ - public static Item inertStone; public static Item miniumShard; + public static Item inertStone; public static Item miniumStone; public static Item philStone; public static void init() { /* Initialize each mod item individually */ - miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD).setIconCoord(0, 0).setItemName(MINIUM_SHARD_NAME).setCreativeTab(CreativeTabs.tabMisc); - inertStone = new ItemInertStone(ItemIds.INERT_STONE).setIconCoord(1, 0).setItemName(INERT_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc); - miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE).setIconCoord(1, 0).setItemName(MINIUM_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc); - philStone = new ItemPhilosopherStone(ItemIds.PHILOSOPHER_STONE).setIconCoord(2, 0).setItemName(PHILOSOPHER_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc); + miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD).setIconCoord(0, 0).setItemName(MINIUM_SHARD_NAME).setCreativeTab(EquivalentExchange3.tabsEE3); + inertStone = new ItemInertStone(ItemIds.INERT_STONE).setIconCoord(1, 0).setItemName(INERT_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3); + miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE).setIconCoord(1, 0).setItemName(MINIUM_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3); + philStone = new ItemPhilosopherStone(ItemIds.PHILOSOPHER_STONE).setIconCoord(2, 0).setItemName(PHILOSOPHER_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3); miniumStone.setContainerItem(miniumStone); philStone.setContainerItem(philStone); diff --git a/ee3_common/ee3/common/lib/Colours.java b/ee3_common/ee3/common/lib/Colours.java index ca7ec180..070979e6 100644 --- a/ee3_common/ee3/common/lib/Colours.java +++ b/ee3_common/ee3/common/lib/Colours.java @@ -1,5 +1,14 @@ package ee3.common.lib; +/** + * Colours + * + * Library containing the default colour values used in the mod + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class Colours { public static final String PURE_RED = "ff0000"; diff --git a/ee3_common/ee3/common/lib/ConfigurationSettings.java b/ee3_common/ee3/common/lib/ConfigurationSettings.java index 7efa81bf..739f8225 100644 --- a/ee3_common/ee3/common/lib/ConfigurationSettings.java +++ b/ee3_common/ee3/common/lib/ConfigurationSettings.java @@ -2,6 +2,15 @@ package ee3.common.lib; import ee3.common.item.ModItems; +/** + * ConfigurationSettings + * + * Stores the various configuration settings read in from configuration files + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class ConfigurationSettings { /* diff --git a/ee3_common/ee3/common/lib/GuiIds.java b/ee3_common/ee3/common/lib/GuiIds.java index 4308ae1a..d782b80d 100644 --- a/ee3_common/ee3/common/lib/GuiIds.java +++ b/ee3_common/ee3/common/lib/GuiIds.java @@ -1,5 +1,14 @@ package ee3.common.lib; +/** + * GuiIds + * + * Library containing the various ids for different Guis in the mod + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class GuiIds { public static final int PORTABLE_CRAFTING = 1; diff --git a/ee3_common/ee3/common/lib/PacketIds.java b/ee3_common/ee3/common/lib/PacketIds.java index c30b6505..6880064e 100644 --- a/ee3_common/ee3/common/lib/PacketIds.java +++ b/ee3_common/ee3/common/lib/PacketIds.java @@ -1,5 +1,14 @@ package ee3.common.lib; +/** + * PacketIds + * + * Library containing the various ids for different packets in the mod + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class PacketIds { public static final int KEYBINDING_PRESSED = 0; diff --git a/ee3_common/ee3/common/lib/RenderIds.java b/ee3_common/ee3/common/lib/RenderIds.java index 4e1d057c..abd291fa 100644 --- a/ee3_common/ee3/common/lib/RenderIds.java +++ b/ee3_common/ee3/common/lib/RenderIds.java @@ -1,5 +1,14 @@ package ee3.common.lib; +/** + * RenderIds + * + * Library containing the various ids for different renders in the mod + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class RenderIds { public static int calcinatorRenderId; diff --git a/ee3_common/ee3/common/network/PacketEE.java b/ee3_common/ee3/common/network/PacketEE.java index 0f0bd8e4..58563f1b 100644 --- a/ee3_common/ee3/common/network/PacketEE.java +++ b/ee3_common/ee3/common/network/PacketEE.java @@ -7,6 +7,15 @@ import java.io.IOException; import cpw.mods.fml.common.network.Player; import net.minecraft.src.INetworkManager; +/** + * PacketEE + * + * General packet for EE3 related packets + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class PacketEE { protected PacketTypeHandler packetType; diff --git a/ee3_common/ee3/common/network/PacketKeyPressed.java b/ee3_common/ee3/common/network/PacketKeyPressed.java index 8d71cdf9..8aacf441 100644 --- a/ee3_common/ee3/common/network/PacketKeyPressed.java +++ b/ee3_common/ee3/common/network/PacketKeyPressed.java @@ -15,6 +15,15 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; +/** + * PacketKeyPressed + * + * Packet specifically for notifying the server of client key pressed events + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class PacketKeyPressed extends PacketEE { public String key; diff --git a/ee3_common/ee3/common/network/PacketTileUpdate.java b/ee3_common/ee3/common/network/PacketTileUpdate.java index 4614473f..3e8a6838 100644 --- a/ee3_common/ee3/common/network/PacketTileUpdate.java +++ b/ee3_common/ee3/common/network/PacketTileUpdate.java @@ -9,6 +9,15 @@ import cpw.mods.fml.common.network.Player; import net.minecraft.src.INetworkManager; import net.minecraftforge.common.ForgeDirection; +/** + * PacketTileUpdate + * + * Packet specifically for updating/synching tile entities between client and server + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class PacketTileUpdate extends PacketEE { public int x, y, z; diff --git a/ee3_common/ee3/common/network/PacketTypeHandler.java b/ee3_common/ee3/common/network/PacketTypeHandler.java index ff612ff9..c19cfdc0 100644 --- a/ee3_common/ee3/common/network/PacketTypeHandler.java +++ b/ee3_common/ee3/common/network/PacketTypeHandler.java @@ -8,6 +8,15 @@ import ee3.common.lib.Reference; import net.minecraft.src.Packet; import net.minecraft.src.Packet250CustomPayload; +/** + * PacketTypeHandler + * + * Handler that routes packets to the appropriate destinations depending on what kind of packet they are + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public enum PacketTypeHandler { KEY(PacketKeyPressed.class), TILE(PacketTileUpdate.class); diff --git a/ee3_common/ee3/common/recipe/RecipesCalcinator.java b/ee3_common/ee3/common/recipe/RecipesCalcinator.java index 15efa825..421046c2 100644 --- a/ee3_common/ee3/common/recipe/RecipesCalcinator.java +++ b/ee3_common/ee3/common/recipe/RecipesCalcinator.java @@ -1,5 +1,14 @@ package ee3.common.recipe; +/** + * RecipesCalcinator + * + * Calcinator recipes + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class RecipesCalcinator { } diff --git a/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java b/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java index c6035571..c39e05a3 100644 --- a/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java +++ b/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java @@ -18,6 +18,15 @@ import ee3.common.core.helper.RecipeHelper; import ee3.common.item.ModItems; import ee3.common.lib.Reference; +/** + * RecipesTransmutationStone + * + * Transmutation Stone recipes + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class RecipesTransmutationStone { private static ItemStack philStone = new ItemStack(ModItems.philStone, 1, -1); diff --git a/ee3_common/ee3/common/tile/TileCalcinator.java b/ee3_common/ee3/common/tile/TileCalcinator.java index 87d26ac6..74fd6ab4 100644 --- a/ee3_common/ee3/common/tile/TileCalcinator.java +++ b/ee3_common/ee3/common/tile/TileCalcinator.java @@ -6,6 +6,15 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.NBTTagList; +/** + * TileCalcinator + * + * Calcinator tile entity, and all the logic associated with it + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class TileCalcinator extends TileEE implements IInventory { /** diff --git a/ee3_common/ee3/common/tile/TileEE.java b/ee3_common/ee3/common/tile/TileEE.java index 19cbccfe..3213f6bf 100644 --- a/ee3_common/ee3/common/tile/TileEE.java +++ b/ee3_common/ee3/common/tile/TileEE.java @@ -5,6 +5,15 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.NBTTagCompound; import net.minecraft.src.TileEntity; +/** + * TileEE + * + * General tile entity for EE3 related tile entities + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ public class TileEE extends TileEntity { private byte direction; diff --git a/resources/ee3/lang/cy_GB.xml b/resources/ee3/lang/cy_GB.xml index c58d891a..ffcaf745 100644 --- a/resources/ee3/lang/cy_GB.xml +++ b/resources/ee3/lang/cy_GB.xml @@ -2,14 +2,22 @@ Welsh Localization File + Ychwanegol + Rhyddhau + Toglo + Gwefru Darn o Finiwm + Carreg Anadweithiol Carreg Miniwm Maen Athronwyr Dŵr Coch (Llonydd) Dŵr Coch (Llifeiriol) Calchyniadwr - Heb Ymgychwyn - Cyfredol - Wedi Dyddio - Gwall Cysylltiad + Calchyniadwr + 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/sNcGl + 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 3c0e2588..15ce52bb 100644 --- a/resources/ee3/lang/de_DE.xml +++ b/resources/ee3/lang/de_DE.xml @@ -2,14 +2,23 @@ German (DE) Localization File + Extra + Freilassen + Umschalten + Aufladen Miniumscherbe + Träger Stein Miniumstein Stein der Weisen Rotes Wasser (Still) - Rotes Wasser (Fliessend) - Calcinator - Uninitialisiert - Aktuell - Veraltet - Verbindungsfehler + Rotes Wasser (Fließend) + Kalkinator + Kalkinator + Equivalent Exchange 3 + 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 es hier zu updaten - http://goo.gl/sNcGl + Fehler bei der Verbindung zur Remoteversion(ü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 c0e3eaab..d291d238 100644 --- a/resources/ee3/lang/en_US.xml +++ b/resources/ee3/lang/en_US.xml @@ -14,6 +14,7 @@ Red Water (Flowing) Calcinator Calcinator + 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 diff --git a/resources/ee3/lang/jp_JP.xml b/resources/ee3/lang/jp_JP.xml new file mode 100644 index 00000000..b59ca2f4 --- /dev/null +++ b/resources/ee3/lang/jp_JP.xml @@ -0,0 +1,24 @@ + + + + Japanese Localization File + エクストラ + 解き放つ + トグル + 充電する + ミニウムの片 + 不活発な石 + ミニウム石 + 賢者の石 + 赤い水 (動かない) + 赤い水 (流れ出る) + 煆焼の鍋 + 煆焼の鍋 + Equivalent Exchange 3 + EE3版の点検は始める。 + EE3版の点検は失敗しました。 (初期化は失敗しました。) + EE3版は通用している。 + EE3版は廃れたです。 アップデイトへ http://goo.gl/sNcGl + リモートバージョンのファイルへの接続でエラーが発生しました。 (インターネット接続を確認。) + EE3版の遠いの点検は出来なくするです、とばします。 + \ No newline at end of file diff --git a/resources/ee3/lang/pt_PT.xml b/resources/ee3/lang/pt_PT.xml index 128b7291..08fe976e 100644 --- a/resources/ee3/lang/pt_PT.xml +++ b/resources/ee3/lang/pt_PT.xml @@ -1,7 +1,7 @@  - Portuguese (PT) Post Reform Localization File + European Portuguese (pt-PT) Localization File Extra Disparar Alternar @@ -9,15 +9,25 @@ Fragmento de Mínio Pedra Inerte Pedra de Mínio - Pedra do Filósofo + Pedra Filosofal Água Vermelha (Estagnada) Água Vermelha (A fluir) Calcinatório Calcinatório +<<<<<<< HEAD A iniciar a verificação da versão em relação ao ficheiro de versões remoto, localizado em A verificação de versão não teve sucesso porque não foi iniciada correctamente Estás a usar a versão atual para a tua versão do Minecraft A tua versão está desatualizada, considera atualizar aqui - http://goo.gl/sNcGl Ocorreu um erro de ligação com o ficheiro de versões remoto (Tenta testar a tua ligação à internet?) A saltar a etapa de verificação de versões, porque esta foi desativada +======= + Equivalent Exchange 3 + 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/sNcGl + 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 +>>>>>>> upstream/master diff --git a/resources/ee3/lang/sv_SE.xml b/resources/ee3/lang/sv_SE.xml index c47c37b7..a2d93f19 100644 --- a/resources/ee3/lang/sv_SE.xml +++ b/resources/ee3/lang/sv_SE.xml @@ -3,21 +3,21 @@ Swedish (SE) Localization File Extra - Släpp + Utgivning Växla - Laddda - Fragment av Minium + Ladda + Mönjaskärva Inert Sten - Minium Sten - Filosofens Sten - Rött Vatten (Stilla) - Rött Vatten (Forsande) + Mönja Sten + De Vises Sten + Rödvatten (Stilla) + Rödvatten (Forsande) Kalcinator Kalcinator - Initierar versionskontroll mot den fjärrversions auktoritet filen, lokaliserad vid - Versionskontrollen avslutades inte framgångsrikt (Versionskontrollen initierade inte riktigt) - Du använder för närvarande den mest uppdaterade versionen för din version av Minecraft - Du använder för närvarande en utdaterad version; Fundera på att uppdatera här - http://goo.gl/sNcGl - Fel att ansluta till den fjärrversions auktoritets fil (Kolla din internetanslutning?) - Fjärrversions kontroll inaktiverad, hoppar över + 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/sNcGl + Misslyckades med att ansluta till fjärrversions auktoritetsfil (Kontrollera din internetanslutning?) + Fjärrversions versionskontroll inaktiverad, hoppar över