diff --git a/ee3_common/ee3/common/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java similarity index 79% rename from ee3_common/ee3/common/EquivalentExchange3.java rename to ee3_common/com/pahimar/ee3/EquivalentExchange3.java index ec9928b3..11d4d479 100644 --- a/ee3_common/ee3/common/EquivalentExchange3.java +++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java @@ -1,4 +1,26 @@ -package ee3.common; +package com.pahimar.ee3; + +import com.pahimar.ee3.block.ModBlocks; +import com.pahimar.ee3.core.handlers.AddonHandler; +import com.pahimar.ee3.core.handlers.ConfigurationHandler; +import com.pahimar.ee3.core.handlers.EntityLivingHandler; +import com.pahimar.ee3.core.handlers.FuelHandler; +import com.pahimar.ee3.core.handlers.ItemPickupHandler; +import com.pahimar.ee3.core.handlers.LocalizationHandler; +import com.pahimar.ee3.core.handlers.ModActionHandler; +import com.pahimar.ee3.core.handlers.PacketHandler; +import com.pahimar.ee3.core.handlers.PlayerDestroyItemHandler; +import com.pahimar.ee3.core.handlers.RenderTickHandler; +import com.pahimar.ee3.core.handlers.VersionCheckTickHandler; +import com.pahimar.ee3.core.handlers.WorldTransmutationHandler; +import com.pahimar.ee3.core.helper.LogHelper; +import com.pahimar.ee3.core.helper.VersionHelper; +import com.pahimar.ee3.core.proxy.CommonProxy; +import com.pahimar.ee3.creativetab.CreativeTabEE3; +import com.pahimar.ee3.item.ModItems; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.recipe.RecipesTransmutationStone; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; @@ -17,27 +39,6 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.TickRegistry; -import ee3.client.core.handlers.RenderTickHandler; -import ee3.common.block.ModBlocks; -import ee3.common.core.CommonProxy; -import ee3.common.core.CreativeTabEE3; -import ee3.common.core.handlers.ModActionHandler; -import ee3.common.core.handlers.AddonHandler; -import ee3.common.core.handlers.ConfigurationHandler; -import ee3.common.core.handlers.EntityLivingHandler; -import ee3.common.core.handlers.FuelHandler; -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.VersionCheckTickHandler; -import ee3.common.core.handlers.WorldTransmutationHandler; -import ee3.common.core.helper.LogHelper; -import ee3.common.core.helper.VersionHelper; -import ee3.common.item.ModItems; -import ee3.common.lib.ConfigurationSettings; -import ee3.common.lib.Reference; -import ee3.common.recipe.RecipesTransmutationStone; /** * EquivalentExchange3 diff --git a/ee3_common/ee3/common/block/BlockCalcinator.java b/ee3_common/com/pahimar/ee3/block/BlockCalcinator.java similarity index 84% rename from ee3_common/ee3/common/block/BlockCalcinator.java rename to ee3_common/com/pahimar/ee3/block/BlockCalcinator.java index c77ce9cc..48388bb3 100644 --- a/ee3_common/ee3/common/block/BlockCalcinator.java +++ b/ee3_common/com/pahimar/ee3/block/BlockCalcinator.java @@ -1,70 +1,71 @@ -package ee3.common.block; - -import ee3.common.EquivalentExchange3; -import ee3.common.lib.GuiIds; -import ee3.common.lib.RenderIds; -import ee3.common.lib.Strings; -import ee3.common.tile.TileCalcinator; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -/** - * BlockCalcinator - * - * Block class for the Calcinator - * - * @author pahimar - * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) - * - */ -public class BlockCalcinator extends BlockEE { - - public BlockCalcinator(int id) { - super(id, Material.rock); - this.setBlockName(Strings.CALCINATOR_NAME); - this.setCreativeTab(EquivalentExchange3.tabsEE3); - this.setHardness(5F); - } - - @Override - public TileEntity createNewTileEntity(World var1) { - return new TileCalcinator(); - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public int getRenderType() { - return RenderIds.calcinatorRenderId; - } - - @Override - public int getBlockTextureFromSide(int par1) { - return 1; - } - - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - - if (!world.isRemote) { - TileCalcinator tileCalcinator = (TileCalcinator) world.getBlockTileEntity(x, y, z); - - if (tileCalcinator != null) { - player.openGui(EquivalentExchange3.instance, GuiIds.CALCINATOR, world, x, y, z); - } - } - - return true; - - } - -} +package com.pahimar.ee3.block; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.GuiIds; +import com.pahimar.ee3.lib.RenderIds; +import com.pahimar.ee3.lib.Strings; +import com.pahimar.ee3.tileentity.TileCalcinator; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +/** + * BlockCalcinator + * + * Block class for the Calcinator + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +public class BlockCalcinator extends BlockEE { + + public BlockCalcinator(int id) { + super(id, Material.rock); + this.setBlockName(Strings.CALCINATOR_NAME); + this.setCreativeTab(EquivalentExchange3.tabsEE3); + this.setHardness(5F); + } + + @Override + public TileEntity createNewTileEntity(World var1) { + return new TileCalcinator(); + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getRenderType() { + return RenderIds.calcinatorRenderId; + } + + @Override + public int getBlockTextureFromSide(int par1) { + return 1; + } + + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + + if (!world.isRemote) { + TileCalcinator tileCalcinator = (TileCalcinator) world.getBlockTileEntity(x, y, z); + + if (tileCalcinator != null) { + player.openGui(EquivalentExchange3.instance, GuiIds.CALCINATOR, world, x, y, z); + } + } + + return true; + + } + +} diff --git a/ee3_common/ee3/common/block/BlockEE.java b/ee3_common/com/pahimar/ee3/block/BlockEE.java similarity index 89% rename from ee3_common/ee3/common/block/BlockEE.java rename to ee3_common/com/pahimar/ee3/block/BlockEE.java index a516da3b..f3dcde27 100644 --- a/ee3_common/ee3/common/block/BlockEE.java +++ b/ee3_common/com/pahimar/ee3/block/BlockEE.java @@ -1,21 +1,21 @@ -package ee3.common.block; - -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; - -/** - * BlockEE - * - * Parent block class for Equivalent Exchange blocks - * - * @author pahimar - * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) - * - */ -public abstract class BlockEE extends BlockContainer { - - public BlockEE(int id, Material material) { - super(id, material); - } - -} +package com.pahimar.ee3.block; + +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; + +/** + * BlockEE + * + * Parent block class for Equivalent Exchange blocks + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +public abstract class BlockEE extends BlockContainer { + + public BlockEE(int id, Material material) { + super(id, material); + } + +} diff --git a/ee3_common/ee3/common/block/BlockRedWaterFlowing.java b/ee3_common/com/pahimar/ee3/block/BlockRedWaterFlowing.java similarity index 80% rename from ee3_common/ee3/common/block/BlockRedWaterFlowing.java rename to ee3_common/com/pahimar/ee3/block/BlockRedWaterFlowing.java index c8b5e8fa..26d3fb68 100644 --- a/ee3_common/ee3/common/block/BlockRedWaterFlowing.java +++ b/ee3_common/com/pahimar/ee3/block/BlockRedWaterFlowing.java @@ -1,9 +1,10 @@ -package ee3.common.block; +package com.pahimar.ee3.block; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Sprites; +import com.pahimar.ee3.lib.Strings; -import ee3.common.EquivalentExchange3; -import ee3.common.lib.Reference; -import ee3.common.lib.Sprites; -import ee3.common.lib.Strings; import net.minecraft.block.BlockFlowing; import net.minecraft.block.material.Material; diff --git a/ee3_common/ee3/common/block/BlockRedWaterStill.java b/ee3_common/com/pahimar/ee3/block/BlockRedWaterStill.java similarity index 84% rename from ee3_common/ee3/common/block/BlockRedWaterStill.java rename to ee3_common/com/pahimar/ee3/block/BlockRedWaterStill.java index 6bb708e7..ae225ee8 100644 --- a/ee3_common/ee3/common/block/BlockRedWaterStill.java +++ b/ee3_common/com/pahimar/ee3/block/BlockRedWaterStill.java @@ -1,8 +1,9 @@ -package ee3.common.block; +package com.pahimar.ee3.block; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.Sprites; +import com.pahimar.ee3.lib.Strings; -import ee3.common.EquivalentExchange3; -import ee3.common.lib.Sprites; -import ee3.common.lib.Strings; import net.minecraft.block.BlockStationary; import net.minecraft.block.material.Material; diff --git a/ee3_common/ee3/common/block/ModBlocks.java b/ee3_common/com/pahimar/ee3/block/ModBlocks.java similarity index 88% rename from ee3_common/ee3/common/block/ModBlocks.java rename to ee3_common/com/pahimar/ee3/block/ModBlocks.java index c9f5807e..4656e9a6 100644 --- a/ee3_common/ee3/common/block/ModBlocks.java +++ b/ee3_common/com/pahimar/ee3/block/ModBlocks.java @@ -1,55 +1,56 @@ -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 ee3.common.lib.Strings; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -/** - * 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 { - - /* Mod block instances */ - public static Block calcinator; - public static Block redWaterStill; - public static Block redWaterFlowing; - - public static void init() { - - calcinator = new BlockCalcinator(BlockIds.CALCINATOR); - redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL); - redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1); - - GameRegistry.registerBlock(calcinator); - GameRegistry.registerBlock(redWaterStill); - GameRegistry.registerBlock(redWaterFlowing); - - initBlockRecipes(); - - } - - 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 - }); - */ - } - -} +package com.pahimar.ee3.block; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.BlockIds; +import com.pahimar.ee3.lib.Strings; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +/** + * 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 { + + /* Mod block instances */ + public static Block calcinator; + public static Block redWaterStill; + public static Block redWaterFlowing; + + public static void init() { + + calcinator = new BlockCalcinator(BlockIds.CALCINATOR); + redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL); + redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1); + + GameRegistry.registerBlock(calcinator); + GameRegistry.registerBlock(redWaterStill); + GameRegistry.registerBlock(redWaterFlowing); + + initBlockRecipes(); + + } + + 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_client/ee3/client/gui/GuiCalcinator.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java similarity index 90% rename from ee3_client/ee3/client/gui/GuiCalcinator.java rename to ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java index 4032ab17..1a2da610 100644 --- a/ee3_client/ee3/client/gui/GuiCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java @@ -1,4 +1,4 @@ -package ee3.client.gui; +package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -6,13 +6,14 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.inventory.ContainerCalcinator; +import com.pahimar.ee3.lib.Sprites; +import com.pahimar.ee3.lib.Strings; +import com.pahimar.ee3.tileentity.TileCalcinator; + import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.registry.LanguageRegistry; -import ee3.common.container.ContainerCalcinator; -import ee3.common.lib.Sprites; -import ee3.common.lib.Strings; -import ee3.common.tile.TileCalcinator; /** * GuiCalcinator diff --git a/ee3_client/ee3/client/gui/GuiPortableCrafting.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java similarity index 93% rename from ee3_client/ee3/client/gui/GuiPortableCrafting.java rename to ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java index ab0acbb2..15f7017a 100644 --- a/ee3_client/ee3/client/gui/GuiPortableCrafting.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiPortableCrafting.java @@ -1,4 +1,4 @@ -package ee3.client.gui; +package com.pahimar.ee3.client.gui.inventory; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; @@ -7,9 +7,10 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.inventory.ContainerPortableCrafting; + import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -import ee3.common.container.ContainerPortableCrafting; /** * GuiPortableCrafting diff --git a/ee3_client/ee3/client/render/ModelCalcinator.java b/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java similarity index 98% rename from ee3_client/ee3/client/render/ModelCalcinator.java rename to ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java index 81782459..e0bf035e 100644 --- a/ee3_client/ee3/client/render/ModelCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/model/ModelCalcinator.java @@ -1,9 +1,10 @@ -package ee3.client.render; +package com.pahimar.ee3.client.model; import org.lwjgl.opengl.GL11; -import ee3.common.lib.Sprites; -import ee3.common.tile.TileCalcinator; +import com.pahimar.ee3.lib.Sprites; +import com.pahimar.ee3.tileentity.TileCalcinator; + import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraftforge.client.ForgeHooksClient; diff --git a/ee3_client/ee3/client/render/RenderItemCalcinator.java b/ee3_common/com/pahimar/ee3/client/renderer/ItemCalcinatorRenderer.java similarity index 84% rename from ee3_client/ee3/client/render/RenderItemCalcinator.java rename to ee3_common/com/pahimar/ee3/client/renderer/ItemCalcinatorRenderer.java index b83700d3..0afa2595 100644 --- a/ee3_client/ee3/client/render/RenderItemCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/ItemCalcinatorRenderer.java @@ -1,9 +1,11 @@ -package ee3.client.render; +package com.pahimar.ee3.client.renderer; import org.lwjgl.opengl.GL11; -import ee3.common.lib.Reference; -import ee3.common.lib.Sprites; +import com.pahimar.ee3.client.model.ModelCalcinator; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Sprites; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraftforge.client.ForgeHooksClient; @@ -18,11 +20,11 @@ import net.minecraftforge.client.IItemRenderer; * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ -public class RenderItemCalcinator implements IItemRenderer { +public class ItemCalcinatorRenderer implements IItemRenderer { private ModelCalcinator calcinatorModel; - public RenderItemCalcinator() { + public ItemCalcinatorRenderer() { calcinatorModel = new ModelCalcinator(1/16F); } diff --git a/ee3_client/ee3/client/render/TextureRedWaterFX.java b/ee3_common/com/pahimar/ee3/client/renderer/texturefx/TextureRedWaterFX.java similarity index 96% rename from ee3_client/ee3/client/render/TextureRedWaterFX.java rename to ee3_common/com/pahimar/ee3/client/renderer/texturefx/TextureRedWaterFX.java index 7e6a7433..70ef7425 100644 --- a/ee3_client/ee3/client/render/TextureRedWaterFX.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/texturefx/TextureRedWaterFX.java @@ -1,12 +1,13 @@ -package ee3.client.render; +package com.pahimar.ee3.client.renderer.texturefx; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.block.ModBlocks; +import com.pahimar.ee3.lib.Sprites; + import net.minecraft.client.renderer.RenderEngine; import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.FMLTextureFX; -import ee3.common.block.ModBlocks; -import ee3.common.lib.Sprites; /** * TextureRedWaterFX diff --git a/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java b/ee3_common/com/pahimar/ee3/client/renderer/texturefx/TextureRedWaterFlowFX.java similarity index 96% rename from ee3_client/ee3/client/render/TextureRedWaterFlowFX.java rename to ee3_common/com/pahimar/ee3/client/renderer/texturefx/TextureRedWaterFlowFX.java index 20a110e7..88c317f5 100644 --- a/ee3_client/ee3/client/render/TextureRedWaterFlowFX.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/texturefx/TextureRedWaterFlowFX.java @@ -1,12 +1,13 @@ -package ee3.client.render; +package com.pahimar.ee3.client.renderer.texturefx; import net.minecraft.client.renderer.RenderEngine; import org.lwjgl.opengl.GL11; +import com.pahimar.ee3.block.ModBlocks; +import com.pahimar.ee3.lib.Sprites; + import cpw.mods.fml.client.FMLTextureFX; -import ee3.common.block.ModBlocks; -import ee3.common.lib.Sprites; /** * TextureRedWaterFlowFX diff --git a/ee3_client/ee3/client/render/RenderCalcinator.java b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java similarity index 74% rename from ee3_client/ee3/client/render/RenderCalcinator.java rename to ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java index 44a1d140..f8e5e14c 100644 --- a/ee3_client/ee3/client/render/RenderCalcinator.java +++ b/ee3_common/com/pahimar/ee3/client/renderer/tileentity/TileEntityCalcinatorRenderer.java @@ -1,30 +1,31 @@ -package ee3.client.render; - -import org.lwjgl.opengl.GL11; - -import ee3.common.tile.TileCalcinator; - -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; - -/** - * 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); - - private ModelCalcinator modelCalcinator = new ModelCalcinator(scale); - - @Override - public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { - modelCalcinator.render((TileCalcinator)tileEntity, x, y, z); - } - -} +package com.pahimar.ee3.client.renderer.tileentity; + +import org.lwjgl.opengl.GL11; + +import com.pahimar.ee3.client.model.ModelCalcinator; +import com.pahimar.ee3.tileentity.TileCalcinator; + +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; + +/** + * 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 TileEntityCalcinatorRenderer extends TileEntitySpecialRenderer { + + static final float scale = (float) (1.0 / 16.0); + + private ModelCalcinator modelCalcinator = new ModelCalcinator(scale); + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) { + modelCalcinator.render((TileCalcinator)tileEntity, x, y, z); + } + +} diff --git a/ee3_common/ee3/common/core/addons/AddonRedPower2.java b/ee3_common/com/pahimar/ee3/core/addons/AddonRedPower2.java similarity index 86% rename from ee3_common/ee3/common/core/addons/AddonRedPower2.java rename to ee3_common/com/pahimar/ee3/core/addons/AddonRedPower2.java index ae82ac29..5b57e74e 100644 --- a/ee3_common/ee3/common/core/addons/AddonRedPower2.java +++ b/ee3_common/com/pahimar/ee3/core/addons/AddonRedPower2.java @@ -1,13 +1,14 @@ -package ee3.common.core.addons; +package com.pahimar.ee3.core.addons; import java.util.logging.Level; +import com.pahimar.ee3.core.helper.LogHelper; +import com.pahimar.ee3.core.helper.RecipeHelper; +import com.pahimar.ee3.recipe.RecipesTransmutationStone; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; -import ee3.common.core.helper.LogHelper; -import ee3.common.core.helper.RecipeHelper; -import ee3.common.recipe.RecipesTransmutationStone; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.src.ModLoader; diff --git a/ee3_common/ee3/common/core/handlers/AddonHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/AddonHandler.java similarity index 76% rename from ee3_common/ee3/common/core/handlers/AddonHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/AddonHandler.java index cdd97188..f3c577ed 100644 --- a/ee3_common/ee3/common/core/handlers/AddonHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/AddonHandler.java @@ -1,21 +1,21 @@ -package ee3.common.core.handlers; - -import ee3.common.core.addons.AddonRedPower2; - -/** - * AddonHandler - * - * Takes care of initializing of addons to the mod. Occurs after all mods are - * loaded - * - * @author pahimar - * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) - * - */ -public class AddonHandler { - - public static void init() { - AddonRedPower2.initWorld(); - } - -} +package com.pahimar.ee3.core.handlers; + +import com.pahimar.ee3.core.addons.AddonRedPower2; + +/** + * AddonHandler + * + * Takes care of initializing of addons to the mod. Occurs after all mods are + * loaded + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +public class AddonHandler { + + public static void init() { + AddonRedPower2.initWorld(); + } + +} diff --git a/ee3_common/ee3/common/core/handlers/ConfigurationHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/ConfigurationHandler.java similarity index 96% rename from ee3_common/ee3/common/core/handlers/ConfigurationHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/ConfigurationHandler.java index 66aaef99..25d889c4 100644 --- a/ee3_common/ee3/common/core/handlers/ConfigurationHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/ConfigurationHandler.java @@ -1,16 +1,18 @@ -package ee3.common.core.handlers; +package com.pahimar.ee3.core.handlers; import java.io.File; import java.util.logging.Level; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.block.ModBlocks; +import com.pahimar.ee3.item.ModItems; +import com.pahimar.ee3.lib.BlockIds; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.ItemIds; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Strings; + import cpw.mods.fml.common.FMLLog; -import ee3.common.EquivalentExchange3; -import ee3.common.block.ModBlocks; -import ee3.common.item.ModItems; -import ee3.common.lib.BlockIds; -import ee3.common.lib.ConfigurationSettings; -import ee3.common.lib.ItemIds; -import ee3.common.lib.Reference; -import ee3.common.lib.Strings; import net.minecraftforge.common.Configuration; import static net.minecraftforge.common.Configuration.*; diff --git a/ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java similarity index 96% rename from ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java index 6f5c00a7..006edefe 100644 --- a/ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/DrawBlockHighlightHandler.java @@ -1,12 +1,13 @@ -package ee3.client.core.handlers; +package com.pahimar.ee3.core.handlers; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import ee3.common.item.ITransmutationStone; -import ee3.common.item.IChargeable; -import ee3.common.lib.ConfigurationSettings; -import ee3.common.lib.Sprites; +import com.pahimar.ee3.item.IChargeable; +import com.pahimar.ee3.item.ITransmutationStone; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.Sprites; + import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.EnumMovingObjectType; import net.minecraftforge.client.event.DrawBlockHighlightEvent; diff --git a/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java similarity index 90% rename from ee3_common/ee3/common/core/handlers/EntityLivingHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java index a16c4b6e..36f6b6f2 100644 --- a/ee3_common/ee3/common/core/handlers/EntityLivingHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/EntityLivingHandler.java @@ -1,46 +1,47 @@ -package ee3.common.core.handlers; - -import ee3.common.core.helper.ItemDropHelper; -import ee3.common.core.helper.RedWaterHelper; -import ee3.common.lib.Reference; -import net.minecraft.entity.player.EntityPlayer; -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 - public void onEntityLivingUpdate(LivingUpdateEvent event) { - /* Disabled because of horribly inefficient code - EntityLiving entity = event.entityLiving; - - if (entity.worldObj.getWorldTime() % 4 == 0) { - - if (RedWaterHelper.handleRedWaterDetection(entity)) { - entity.addPotionEffect(new PotionEffect(Potion.weakness.id, Reference.BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER * Reference.BLOCK_RED_WATER_EFFECT_DURATION_BASE * Reference.SECOND_IN_TICKS, 0)); - entity.addPotionEffect(new PotionEffect(Potion.poison.id, Reference.BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER * Reference.BLOCK_RED_WATER_EFFECT_DURATION_BASE * Reference.SECOND_IN_TICKS, 0)); - entity.addPotionEffect(new PotionEffect(Potion.blindness.id, Reference.BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER * Reference.BLOCK_RED_WATER_EFFECT_DURATION_BASE * Reference.SECOND_IN_TICKS, 0)); - entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, Reference.BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER * Reference.BLOCK_RED_WATER_EFFECT_DURATION_BASE * Reference.SECOND_IN_TICKS, 0)); - } - } - */ - } - - @ForgeSubscribe - public void onEntityLivingDeath(LivingDeathEvent event) { - if (event.source.getDamageType().equals("player")) { - ItemDropHelper.dropMiniumShard((EntityPlayer)event.source.getSourceOfDamage(), event.entityLiving); - } - } - -} +package com.pahimar.ee3.core.handlers; + +import com.pahimar.ee3.core.helper.ItemDropHelper; +import com.pahimar.ee3.core.helper.RedWaterHelper; +import com.pahimar.ee3.lib.Reference; + +import net.minecraft.entity.player.EntityPlayer; +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 + public void onEntityLivingUpdate(LivingUpdateEvent event) { + /* Disabled because of horribly inefficient code + EntityLiving entity = event.entityLiving; + + if (entity.worldObj.getWorldTime() % 4 == 0) { + + if (RedWaterHelper.handleRedWaterDetection(entity)) { + entity.addPotionEffect(new PotionEffect(Potion.weakness.id, Reference.BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER * Reference.BLOCK_RED_WATER_EFFECT_DURATION_BASE * Reference.SECOND_IN_TICKS, 0)); + entity.addPotionEffect(new PotionEffect(Potion.poison.id, Reference.BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER * Reference.BLOCK_RED_WATER_EFFECT_DURATION_BASE * Reference.SECOND_IN_TICKS, 0)); + entity.addPotionEffect(new PotionEffect(Potion.blindness.id, Reference.BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER * Reference.BLOCK_RED_WATER_EFFECT_DURATION_BASE * Reference.SECOND_IN_TICKS, 0)); + entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, Reference.BLOCK_RED_WATER_EFFECT_DURATION_MODIFIER * Reference.BLOCK_RED_WATER_EFFECT_DURATION_BASE * Reference.SECOND_IN_TICKS, 0)); + } + } + */ + } + + @ForgeSubscribe + public void onEntityLivingDeath(LivingDeathEvent event) { + if (event.source.getDamageType().equals("player")) { + ItemDropHelper.dropMiniumShard((EntityPlayer)event.source.getSourceOfDamage(), event.entityLiving); + } + } + +} diff --git a/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java similarity index 95% rename from ee3_common/ee3/common/core/handlers/EquivalencyHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java index 2b2e777b..c7cbb8b6 100644 --- a/ee3_common/ee3/common/core/handlers/EquivalencyHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/EquivalencyHandler.java @@ -1,233 +1,234 @@ -package ee3.common.core.handlers; - -import java.util.ArrayList; - -import ee3.common.core.helper.GeneralHelper; -import net.minecraft.item.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(); - - private static ArrayList> equivalencyList = new ArrayList>(); - - public static EquivalencyHandler instance() { - - return instance; - } - - public ArrayList> getAllLists() { - - return equivalencyList; - } - - public void addObjects(Object obj1, Object obj2) { - - ItemStack stack1 = GeneralHelper.convertObjectToItemStack(obj1); - ItemStack stack2 = GeneralHelper.convertObjectToItemStack(obj2); - - ArrayList currentList = new ArrayList(); - - Integer stack1Index = getIndexInList(stack1); - Integer stack2Index = getIndexInList(stack2); - - if ((stack1Index != null) && (stack2Index != null)) { - return; - } - else if ((stack1Index != null) && (stack2Index == null)) { - currentList = equivalencyList.get(stack1Index.intValue()); - currentList.add(stack2); - equivalencyList.set(stack1Index.intValue(), currentList); - } - else if ((stack1Index == null) && (stack2Index != null)) { - currentList = equivalencyList.get(stack2Index.intValue()); - currentList.add(stack1); - equivalencyList.set(stack2Index.intValue(), currentList); - } - else if ((stack1Index == null) && (stack2Index == null)) { - currentList.add(stack1); - currentList.add(stack2); - equivalencyList.add(currentList); - } - } - - public void addObjects(Object... objList) { - - if (objList.length < 2) - return; - - for (int i = 0; i < objList.length - 1; i++) { - addObjects(objList[i], objList[i + 1]); - } - } - - public Integer getIndexInList(Object obj) { - - ItemStack checkStack = GeneralHelper.convertObjectToItemStack(obj); - ArrayList currentList; - int i = 0; - - while (i < equivalencyList.size()) { - currentList = equivalencyList.get(i); - for (ItemStack currentStack : currentList) { - if (ItemStack.areItemStacksEqual(checkStack, currentStack)) { - return new Integer(i); - } - } - ++i; - } - - return null; - } - - public Integer getIndexInList(int id, int meta) { - - ArrayList currentList; - int i = 0; - - while (i < equivalencyList.size()) { - currentList = equivalencyList.get(i); - for (ItemStack currentStack : currentList) { - if ((id == currentStack.itemID) && (meta == currentStack.getItemDamage())) { - return new Integer(i); - } - } - ++i; - } - - return null; - } - - public ArrayList getEquivalencyList(Object obj) { - - ItemStack checkStack = GeneralHelper.convertObjectToItemStack(obj); - - if (checkStack == null) - return null; - - for (ArrayList list : equivalencyList) { - for (ItemStack currentStack : list) { - if (ItemStack.areItemStacksEqual(checkStack, currentStack)) { - return list; - } - } - } - - return null; - } - - public ArrayList getEquivalencyList(int id, int meta) { - - for (ArrayList list : equivalencyList) { - for (ItemStack currentStack : list) { - if ((id == currentStack.itemID) && (meta == currentStack.getItemDamage())) { - return list; - } - } - } - - return null; - } - - public ItemStack getNextInList(Object obj) { - - ItemStack checkStack = GeneralHelper.convertObjectToItemStack(obj); - - if (checkStack != null) { - return getNextInList(checkStack.itemID, checkStack.getItemDamage()); - } - - return null; - } - - public ItemStack getNextInList(int id, int meta) { - - ArrayList list = getEquivalencyList(id, meta); - - ItemStack currentStack; - ItemStack returnStack = null; - int i = 0; - - if (list != null) { - if (list.size() == 1) { - return list.get(i); - } - - while (i < list.size()) { - currentStack = list.get(i); - - if ((id == currentStack.itemID) && (meta == currentStack.getItemDamage())) { - returnStack = list.get((i + 1) % list.size()); - break; - } - - ++i; - } - } - - return returnStack; - } - - public ItemStack getPrevInList(Object obj) { - - ItemStack checkStack = GeneralHelper.convertObjectToItemStack(obj); - - if (checkStack != null) { - return getPrevInList(checkStack.itemID, checkStack.getItemDamage()); - } - - return null; - } - - public ItemStack getPrevInList(int id, int meta) { - - ArrayList list = getEquivalencyList(id, meta); - - ItemStack currentStack; - ItemStack returnStack = null; - int i = 0; - - if (list != null) { - if (list.size() == 1) { - return list.get(i); - } - - while (i < list.size()) { - currentStack = list.get(i); - - if ((id == currentStack.itemID) && (meta == currentStack.getItemDamage())) { - int index = ((i - 1) + list.size()) % list.size(); - returnStack = list.get(index); - break; - } - - ++i; - } - } - - return returnStack; - } - - public boolean areEquivalent(Object obj1, Object obj2) { - - return (getEquivalencyList(obj1).equals(getEquivalencyList(obj2))); - } - - public void debug() { - - int i = 0; - for (ArrayList list : equivalencyList) { - System.out.println("equivalencyList[" + i + "]: " + list.toString()); - ++i; - } - } -} +package com.pahimar.ee3.core.handlers; + +import java.util.ArrayList; + +import com.pahimar.ee3.core.helper.GeneralHelper; + +import net.minecraft.item.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(); + + private static ArrayList> equivalencyList = new ArrayList>(); + + public static EquivalencyHandler instance() { + + return instance; + } + + public ArrayList> getAllLists() { + + return equivalencyList; + } + + public void addObjects(Object obj1, Object obj2) { + + ItemStack stack1 = GeneralHelper.convertObjectToItemStack(obj1); + ItemStack stack2 = GeneralHelper.convertObjectToItemStack(obj2); + + ArrayList currentList = new ArrayList(); + + Integer stack1Index = getIndexInList(stack1); + Integer stack2Index = getIndexInList(stack2); + + if ((stack1Index != null) && (stack2Index != null)) { + return; + } + else if ((stack1Index != null) && (stack2Index == null)) { + currentList = equivalencyList.get(stack1Index.intValue()); + currentList.add(stack2); + equivalencyList.set(stack1Index.intValue(), currentList); + } + else if ((stack1Index == null) && (stack2Index != null)) { + currentList = equivalencyList.get(stack2Index.intValue()); + currentList.add(stack1); + equivalencyList.set(stack2Index.intValue(), currentList); + } + else if ((stack1Index == null) && (stack2Index == null)) { + currentList.add(stack1); + currentList.add(stack2); + equivalencyList.add(currentList); + } + } + + public void addObjects(Object... objList) { + + if (objList.length < 2) + return; + + for (int i = 0; i < objList.length - 1; i++) { + addObjects(objList[i], objList[i + 1]); + } + } + + public Integer getIndexInList(Object obj) { + + ItemStack checkStack = GeneralHelper.convertObjectToItemStack(obj); + ArrayList currentList; + int i = 0; + + while (i < equivalencyList.size()) { + currentList = equivalencyList.get(i); + for (ItemStack currentStack : currentList) { + if (ItemStack.areItemStacksEqual(checkStack, currentStack)) { + return new Integer(i); + } + } + ++i; + } + + return null; + } + + public Integer getIndexInList(int id, int meta) { + + ArrayList currentList; + int i = 0; + + while (i < equivalencyList.size()) { + currentList = equivalencyList.get(i); + for (ItemStack currentStack : currentList) { + if ((id == currentStack.itemID) && (meta == currentStack.getItemDamage())) { + return new Integer(i); + } + } + ++i; + } + + return null; + } + + public ArrayList getEquivalencyList(Object obj) { + + ItemStack checkStack = GeneralHelper.convertObjectToItemStack(obj); + + if (checkStack == null) + return null; + + for (ArrayList list : equivalencyList) { + for (ItemStack currentStack : list) { + if (ItemStack.areItemStacksEqual(checkStack, currentStack)) { + return list; + } + } + } + + return null; + } + + public ArrayList getEquivalencyList(int id, int meta) { + + for (ArrayList list : equivalencyList) { + for (ItemStack currentStack : list) { + if ((id == currentStack.itemID) && (meta == currentStack.getItemDamage())) { + return list; + } + } + } + + return null; + } + + public ItemStack getNextInList(Object obj) { + + ItemStack checkStack = GeneralHelper.convertObjectToItemStack(obj); + + if (checkStack != null) { + return getNextInList(checkStack.itemID, checkStack.getItemDamage()); + } + + return null; + } + + public ItemStack getNextInList(int id, int meta) { + + ArrayList list = getEquivalencyList(id, meta); + + ItemStack currentStack; + ItemStack returnStack = null; + int i = 0; + + if (list != null) { + if (list.size() == 1) { + return list.get(i); + } + + while (i < list.size()) { + currentStack = list.get(i); + + if ((id == currentStack.itemID) && (meta == currentStack.getItemDamage())) { + returnStack = list.get((i + 1) % list.size()); + break; + } + + ++i; + } + } + + return returnStack; + } + + public ItemStack getPrevInList(Object obj) { + + ItemStack checkStack = GeneralHelper.convertObjectToItemStack(obj); + + if (checkStack != null) { + return getPrevInList(checkStack.itemID, checkStack.getItemDamage()); + } + + return null; + } + + public ItemStack getPrevInList(int id, int meta) { + + ArrayList list = getEquivalencyList(id, meta); + + ItemStack currentStack; + ItemStack returnStack = null; + int i = 0; + + if (list != null) { + if (list.size() == 1) { + return list.get(i); + } + + while (i < list.size()) { + currentStack = list.get(i); + + if ((id == currentStack.itemID) && (meta == currentStack.getItemDamage())) { + int index = ((i - 1) + list.size()) % list.size(); + returnStack = list.get(index); + break; + } + + ++i; + } + } + + return returnStack; + } + + public boolean areEquivalent(Object obj1, Object obj2) { + + return (getEquivalencyList(obj1).equals(getEquivalencyList(obj2))); + } + + public void debug() { + + int i = 0; + for (ArrayList list : equivalencyList) { + System.out.println("equivalencyList[" + i + "]: " + list.toString()); + ++i; + } + } +} diff --git a/ee3_common/ee3/common/core/handlers/FuelHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/FuelHandler.java similarity index 92% rename from ee3_common/ee3/common/core/handlers/FuelHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/FuelHandler.java index b8c5fd6e..b52cbb61 100644 --- a/ee3_common/ee3/common/core/handlers/FuelHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/FuelHandler.java @@ -1,4 +1,4 @@ -package ee3.common.core.handlers; +package com.pahimar.ee3.core.handlers; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.IFuelHandler; diff --git a/ee3_common/ee3/common/core/handlers/ItemPickupHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/ItemPickupHandler.java similarity index 92% rename from ee3_common/ee3/common/core/handlers/ItemPickupHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/ItemPickupHandler.java index 34dcb21c..bbf8ad08 100644 --- a/ee3_common/ee3/common/core/handlers/ItemPickupHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/ItemPickupHandler.java @@ -1,4 +1,4 @@ -package ee3.common.core.handlers; +package com.pahimar.ee3.core.handlers; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; diff --git a/ee3_client/ee3/client/core/handlers/KeyBindingHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java similarity index 79% rename from ee3_client/ee3/client/core/handlers/KeyBindingHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java index d4a079b9..7ae9348d 100644 --- a/ee3_client/ee3/client/core/handlers/KeyBindingHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/KeyBindingHandler.java @@ -1,8 +1,21 @@ -package ee3.client.core.handlers; +package com.pahimar.ee3.core.handlers; import java.util.EnumSet; import java.util.logging.Level; +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.core.helper.KeyBindingHelper; +import com.pahimar.ee3.core.helper.LogHelper; +import com.pahimar.ee3.item.IKeyBound; +import com.pahimar.ee3.item.ITransmutationStone; +import com.pahimar.ee3.item.ModItems; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.GuiIds; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.network.PacketTypeHandler; +import com.pahimar.ee3.network.packet.PacketEE; +import com.pahimar.ee3.network.packet.PacketKeyPressed; + import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -12,18 +25,6 @@ import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.registry.LanguageRegistry; -import ee3.client.core.helper.KeyBindingHelper; -import ee3.common.EquivalentExchange3; -import ee3.common.core.helper.LogHelper; -import ee3.common.item.IKeyBound; -import ee3.common.item.ITransmutationStone; -import ee3.common.item.ModItems; -import ee3.common.lib.ConfigurationSettings; -import ee3.common.lib.GuiIds; -import ee3.common.lib.Reference; -import ee3.common.network.PacketEE; -import ee3.common.network.PacketKeyPressed; -import ee3.common.network.PacketTypeHandler; /** * KeyBindingHandler diff --git a/ee3_common/ee3/common/core/handlers/LocalizationHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/LocalizationHandler.java similarity index 84% rename from ee3_common/ee3/common/core/handlers/LocalizationHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/LocalizationHandler.java index ca8fbe8b..6844bbf4 100644 --- a/ee3_common/ee3/common/core/handlers/LocalizationHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/LocalizationHandler.java @@ -1,8 +1,9 @@ -package ee3.common.core.handlers; +package com.pahimar.ee3.core.handlers; + +import com.pahimar.ee3.core.helper.LocalizationHelper; +import com.pahimar.ee3.lib.Localizations; import cpw.mods.fml.common.registry.LanguageRegistry; -import ee3.common.core.helper.LocalizationHelper; -import ee3.common.lib.Localizations; /** * LocalizationHandler diff --git a/ee3_common/ee3/common/core/handlers/ModActionHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/ModActionHandler.java similarity index 67% rename from ee3_common/ee3/common/core/handlers/ModActionHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/ModActionHandler.java index bb29270d..3a552f00 100644 --- a/ee3_common/ee3/common/core/handlers/ModActionHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/ModActionHandler.java @@ -1,6 +1,7 @@ -package ee3.common.core.handlers; +package com.pahimar.ee3.core.handlers; + +import com.pahimar.ee3.event.ModActionEvent; -import ee3.common.event.ModActionEvent; import net.minecraftforge.event.ForgeSubscribe; public class ModActionHandler { diff --git a/ee3_common/ee3/common/core/handlers/PacketHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/PacketHandler.java similarity index 90% rename from ee3_common/ee3/common/core/handlers/PacketHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/PacketHandler.java index b673ce29..46e71064 100644 --- a/ee3_common/ee3/common/core/handlers/PacketHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/PacketHandler.java @@ -1,15 +1,16 @@ -package ee3.common.core.handlers; +package com.pahimar.ee3.core.handlers; import java.io.ByteArrayInputStream; import java.io.DataInputStream; +import com.pahimar.ee3.network.PacketTypeHandler; +import com.pahimar.ee3.network.packet.PacketEE; + import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; -import ee3.common.network.PacketEE; -import ee3.common.network.PacketTypeHandler; /** * PacketHandler diff --git a/ee3_common/ee3/common/core/handlers/PlayerDestroyItemHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/PlayerDestroyItemHandler.java similarity index 90% rename from ee3_common/ee3/common/core/handlers/PlayerDestroyItemHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/PlayerDestroyItemHandler.java index 8b9f7fb2..733ea08e 100644 --- a/ee3_common/ee3/common/core/handlers/PlayerDestroyItemHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/PlayerDestroyItemHandler.java @@ -1,23 +1,23 @@ -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 - - } - -} +package com.pahimar.ee3.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 + + } + +} diff --git a/ee3_client/ee3/client/core/handlers/RenderTickHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/RenderTickHandler.java similarity index 92% rename from ee3_client/ee3/client/core/handlers/RenderTickHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/RenderTickHandler.java index 6e59551e..8cc659ca 100644 --- a/ee3_client/ee3/client/core/handlers/RenderTickHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/RenderTickHandler.java @@ -1,10 +1,17 @@ -package ee3.client.core.handlers; +package com.pahimar.ee3.core.handlers; import java.util.EnumSet; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.pahimar.ee3.core.helper.RenderUtils; +import com.pahimar.ee3.core.helper.TransmutationHelper; +import com.pahimar.ee3.core.helper.VersionHelper; +import com.pahimar.ee3.item.ITransmutationStone; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.Reference; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.RenderHelper; @@ -17,12 +24,6 @@ import net.minecraft.util.MovingObjectPosition; 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.TransmutationHelper; -import ee3.common.core.helper.VersionHelper; -import ee3.common.item.ITransmutationStone; -import ee3.common.lib.ConfigurationSettings; -import ee3.common.lib.Reference; public class RenderTickHandler implements ITickHandler { diff --git a/ee3_client/ee3/client/core/handlers/SoundHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/SoundHandler.java similarity index 85% rename from ee3_client/ee3/client/core/handlers/SoundHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/SoundHandler.java index 159b695a..8e9e687a 100644 --- a/ee3_client/ee3/client/core/handlers/SoundHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/SoundHandler.java @@ -1,40 +1,42 @@ -package ee3.client.core.handlers; - -import java.io.File; -import java.util.logging.Level; -import cpw.mods.fml.common.FMLCommonHandler; -import ee3.common.core.helper.LogHelper; -import ee3.common.lib.Reference; -import ee3.common.lib.Sounds; -import net.minecraftforge.client.event.sound.SoundLoadEvent; -import net.minecraftforge.event.ForgeSubscribe; - -/** - * SoundHandler - * - * Client specific handler for sound related events - * - * @author pahimar - * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) - * - */ -public class SoundHandler { - - @ForgeSubscribe - public void onSoundLoad(SoundLoadEvent event) { - - // For each custom sound file we have defined in Sounds - for (String soundFile : Sounds.soundFiles) { - // Try to add the custom sound file to the pool of sounds - try { - event.manager.soundPoolSounds.addSound(soundFile, this.getClass().getResource("/" + soundFile)); - } - // 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); - } - } - - } - -} +package com.pahimar.ee3.core.handlers; + +import java.io.File; +import java.util.logging.Level; + +import com.pahimar.ee3.core.helper.LogHelper; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Sounds; + +import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraftforge.client.event.sound.SoundLoadEvent; +import net.minecraftforge.event.ForgeSubscribe; + +/** + * SoundHandler + * + * Client specific handler for sound related events + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +public class SoundHandler { + + @ForgeSubscribe + public void onSoundLoad(SoundLoadEvent event) { + + // For each custom sound file we have defined in Sounds + for (String soundFile : Sounds.soundFiles) { + // Try to add the custom sound file to the pool of sounds + try { + event.manager.soundPoolSounds.addSound(soundFile, this.getClass().getResource("/" + soundFile)); + } + // 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_common/ee3/common/core/handlers/VersionCheckTickHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java similarity index 88% rename from ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java index ce264c86..723fa62b 100644 --- a/ee3_common/ee3/common/core/handlers/VersionCheckTickHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/VersionCheckTickHandler.java @@ -1,16 +1,17 @@ -package ee3.common.core.handlers; +package com.pahimar.ee3.core.handlers; import java.util.EnumSet; +import com.pahimar.ee3.core.helper.VersionHelper; +import com.pahimar.ee3.lib.Colours; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.Reference; + 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; -import ee3.common.lib.Reference; /** * VersionCheckTickHandler diff --git a/ee3_common/ee3/common/core/handlers/WorldTransmutationHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java similarity index 72% rename from ee3_common/ee3/common/core/handlers/WorldTransmutationHandler.java rename to ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java index 972245fa..04f80434 100644 --- a/ee3_common/ee3/common/core/handlers/WorldTransmutationHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java @@ -1,6 +1,7 @@ -package ee3.common.core.handlers; +package com.pahimar.ee3.core.handlers; + +import com.pahimar.ee3.event.WorldTransmutationEvent; -import ee3.common.event.WorldTransmutationEvent; import net.minecraftforge.event.ForgeSubscribe; diff --git a/ee3_common/ee3/common/core/helper/GeneralHelper.java b/ee3_common/com/pahimar/ee3/core/helper/GeneralHelper.java similarity index 94% rename from ee3_common/ee3/common/core/helper/GeneralHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/GeneralHelper.java index 83e8f18f..e327be66 100644 --- a/ee3_common/ee3/common/core/helper/GeneralHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/GeneralHelper.java @@ -1,55 +1,55 @@ -package ee3.common.core.helper; - -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.monster.EntityMob; -import net.minecraft.item.Item; -import net.minecraft.item.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) { - if (obj instanceof Item) { - return new ItemStack((Item) obj); - } else if (obj instanceof Block) { - return new ItemStack((Block) obj); - } else if (obj instanceof ItemStack) { - return (ItemStack) obj; - } else { - return null; - } - } - - public static Object[] convertSingleStackToPluralStacks(ItemStack stack) { - ArrayList list = new ArrayList(); - ItemStack currentStack; - - for (int i = 0; i < stack.stackSize; i++) { - currentStack = new ItemStack(stack.itemID, 1, stack.getItemDamage()); - list.add(currentStack); - } - - return list.toArray(); - } - - public static boolean isHostileEntity(EntityLiving entity) { - if (entity instanceof EntityMob) { - return true; - } - else { - return false; - } - } - -} +package com.pahimar.ee3.core.helper; + +import java.util.ArrayList; + +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.monster.EntityMob; +import net.minecraft.item.Item; +import net.minecraft.item.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) { + if (obj instanceof Item) { + return new ItemStack((Item) obj); + } else if (obj instanceof Block) { + return new ItemStack((Block) obj); + } else if (obj instanceof ItemStack) { + return (ItemStack) obj; + } else { + return null; + } + } + + public static Object[] convertSingleStackToPluralStacks(ItemStack stack) { + ArrayList list = new ArrayList(); + ItemStack currentStack; + + for (int i = 0; i < stack.stackSize; i++) { + currentStack = new ItemStack(stack.itemID, 1, stack.getItemDamage()); + list.add(currentStack); + } + + return list.toArray(); + } + + public static boolean isHostileEntity(EntityLiving entity) { + if (entity instanceof EntityMob) { + return true; + } + else { + return false; + } + } + +} diff --git a/ee3_common/ee3/common/core/helper/ItemDropHelper.java b/ee3_common/com/pahimar/ee3/core/helper/ItemDropHelper.java similarity index 88% rename from ee3_common/ee3/common/core/helper/ItemDropHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/ItemDropHelper.java index 77ecba53..349e22da 100644 --- a/ee3_common/ee3/common/core/helper/ItemDropHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/ItemDropHelper.java @@ -1,8 +1,9 @@ -package ee3.common.core.helper; +package com.pahimar.ee3.core.helper; + +import com.pahimar.ee3.item.ModItems; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; -import ee3.common.item.ModItems; /** * ItemDropHelper diff --git a/ee3_client/ee3/client/core/helper/KeyBindingHelper.java b/ee3_common/com/pahimar/ee3/core/helper/KeyBindingHelper.java similarity index 97% rename from ee3_client/ee3/client/core/helper/KeyBindingHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/KeyBindingHelper.java index 00ebfd14..a3586ff6 100644 --- a/ee3_client/ee3/client/core/helper/KeyBindingHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/KeyBindingHelper.java @@ -1,4 +1,4 @@ -package ee3.client.core.helper; +package com.pahimar.ee3.core.helper; import java.util.ArrayList; diff --git a/ee3_common/ee3/common/core/helper/LocalizationHelper.java b/ee3_common/com/pahimar/ee3/core/helper/LocalizationHelper.java similarity index 96% rename from ee3_common/ee3/common/core/helper/LocalizationHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/LocalizationHelper.java index 35e064af..53c4eeb5 100644 --- a/ee3_common/ee3/common/core/helper/LocalizationHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/LocalizationHelper.java @@ -1,4 +1,4 @@ -package ee3.common.core.helper; +package com.pahimar.ee3.core.helper; /** * LocalizationHelper diff --git a/ee3_common/ee3/common/core/helper/LogHelper.java b/ee3_common/com/pahimar/ee3/core/helper/LogHelper.java similarity index 83% rename from ee3_common/ee3/common/core/helper/LogHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/LogHelper.java index a6432674..a7c3da3b 100644 --- a/ee3_common/ee3/common/core/helper/LogHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/LogHelper.java @@ -1,12 +1,13 @@ -package ee3.common.core.helper; +package com.pahimar.ee3.core.helper; import java.util.logging.Level; import java.util.logging.Logger; +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.Reference; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; -import ee3.common.EquivalentExchange3; -import ee3.common.lib.Reference; /** * LogHelper diff --git a/ee3_common/ee3/common/core/helper/NBTHelper.java b/ee3_common/com/pahimar/ee3/core/helper/NBTHelper.java similarity index 99% rename from ee3_common/ee3/common/core/helper/NBTHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/NBTHelper.java index fc0a55b7..f0d0a5e2 100644 --- a/ee3_common/ee3/common/core/helper/NBTHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/NBTHelper.java @@ -1,4 +1,4 @@ -package ee3.common.core.helper; +package com.pahimar.ee3.core.helper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/ee3_common/ee3/common/core/helper/QualityHelper.java b/ee3_common/com/pahimar/ee3/core/helper/QualityHelper.java similarity index 96% rename from ee3_common/ee3/common/core/helper/QualityHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/QualityHelper.java index 468aae43..2cd9bb9a 100644 --- a/ee3_common/ee3/common/core/helper/QualityHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/QualityHelper.java @@ -1,4 +1,4 @@ -package ee3.common.core.helper; +package com.pahimar.ee3.core.helper; import net.minecraft.item.ItemStack; diff --git a/ee3_common/ee3/common/core/helper/RecipeHelper.java b/ee3_common/com/pahimar/ee3/core/helper/RecipeHelper.java similarity index 96% rename from ee3_common/ee3/common/core/helper/RecipeHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/RecipeHelper.java index 3e62a620..eed7165b 100644 --- a/ee3_common/ee3/common/core/helper/RecipeHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/RecipeHelper.java @@ -1,154 +1,154 @@ -package ee3.common.core.helper; - -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.Item; -import net.minecraft.item.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) { - GameRegistry.addShapelessRecipe(output, input); - } - - public static void addRecipe(ItemStack output, ItemStack transmutationStone, Object... input) { - Object[] inputs = new Object[input.length + 1]; - System.arraycopy(input, 0, inputs, 0, input.length); - inputs[input.length] = transmutationStone; - - addRecipe(output, inputs); - } - - public static void addRecipe(Block output, Object... input) { - addRecipe(new ItemStack(output), input); - } - - public static void addRecipe(Block output, int count, Object... input) { - addRecipe(new ItemStack(output, count), input); - } - - public static void addRecipe(Item output, Object... input) { - addRecipe(new ItemStack(output), input); - } - - public static void addRecipe(Item output, int count, Object... input) { - addRecipe(new ItemStack(output, count), input); - } - - public static Object[] getMetaCycle(Object input, int n) { - ArrayList list = new ArrayList(); - - ItemStack stack; - - for (int i = 0; i < n; i++) { - stack = GeneralHelper.convertObjectToItemStack(input); - stack.setItemDamage(i); - list.add(stack); - } - - return list.toArray(); - } - - public static Object[] getMetaCycle(Object input, int n, int... excludedMeta) { - ArrayList list = new ArrayList(); - - ItemStack stack; - int i = 0; - while (i < n) { - for (int j : excludedMeta) { - if (i == j) - ++i; - } - - if (!(i < n)) - break; - - stack = GeneralHelper.convertObjectToItemStack(input); - stack.setItemDamage(i); - list.add(stack); - ++i; - } - - return list.toArray(); - } - - /* - * Pass this a Block, Item or ItemStack and the maximum number of indexes, - * EXCLUDING zero - */ - protected static void addMetaCycleRecipe(Object input, ItemStack stone, int n) { - int outputI; - - /* - * Makes a single item cycle through its meta values when it's crafted - * with a PStone - */ - for (int i = 0; i < n; i++) { - outputI = (i == n - 1 ? 0 : i + 1); - - if (input instanceof Block) - GameRegistry.addShapelessRecipe(new ItemStack((Block) input, 1, outputI), stone, new ItemStack((Block) input, 1, i)); - else if (input instanceof Item) - GameRegistry.addShapelessRecipe(new ItemStack((Item) input, 1, outputI), stone, new ItemStack((Item) input, 1, i)); - else if (input instanceof ItemStack) - GameRegistry.addShapelessRecipe(new ItemStack(((ItemStack) input).itemID, 1, outputI), stone, new ItemStack(((ItemStack) input).itemID, 1, i)); - } - } - - protected static void addMetaCycleRecipe(Object input, ItemStack stone, int n, int... excludedMeta) { - int i = 0; - int outputI = 1; - while (i < n && outputI != 0) { - outputI = (i == n - 1 ? 0 : i + 1); - - for (int j : excludedMeta) { - if (outputI == j) - outputI = (outputI + 1) % 16; - } - - if (input instanceof Block) - GameRegistry.addShapelessRecipe(new ItemStack((Block) input, 1, outputI), stone, new ItemStack((Block) input, 1, i)); - else if (input instanceof Item) - GameRegistry.addShapelessRecipe(new ItemStack((Item) input, 1, outputI), stone, new ItemStack((Item) input, 1, i)); - else if (input instanceof ItemStack) - GameRegistry.addShapelessRecipe(new ItemStack(((ItemStack) input).itemID, 1, outputI), stone, new ItemStack(((ItemStack) input).itemID, 1, i)); - - i = outputI; - } - } - - public static void addSmeltingRecipe(ItemStack input, ItemStack stone, ItemStack fuel) { - ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(input); - - if (result == null) - return; - - Object[] list = new Object[9]; - list[0] = stone; - list[1] = fuel; - - for (int i = 2; i < 9; i++) { - list[i] = new ItemStack(input.getItem(), 1, input.getItemDamage()); - } - - 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); - } - } - -} +package com.pahimar.ee3.core.helper; + +import java.util.ArrayList; + +import net.minecraft.block.Block; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.Item; +import net.minecraft.item.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) { + GameRegistry.addShapelessRecipe(output, input); + } + + public static void addRecipe(ItemStack output, ItemStack transmutationStone, Object... input) { + Object[] inputs = new Object[input.length + 1]; + System.arraycopy(input, 0, inputs, 0, input.length); + inputs[input.length] = transmutationStone; + + addRecipe(output, inputs); + } + + public static void addRecipe(Block output, Object... input) { + addRecipe(new ItemStack(output), input); + } + + public static void addRecipe(Block output, int count, Object... input) { + addRecipe(new ItemStack(output, count), input); + } + + public static void addRecipe(Item output, Object... input) { + addRecipe(new ItemStack(output), input); + } + + public static void addRecipe(Item output, int count, Object... input) { + addRecipe(new ItemStack(output, count), input); + } + + public static Object[] getMetaCycle(Object input, int n) { + ArrayList list = new ArrayList(); + + ItemStack stack; + + for (int i = 0; i < n; i++) { + stack = GeneralHelper.convertObjectToItemStack(input); + stack.setItemDamage(i); + list.add(stack); + } + + return list.toArray(); + } + + public static Object[] getMetaCycle(Object input, int n, int... excludedMeta) { + ArrayList list = new ArrayList(); + + ItemStack stack; + int i = 0; + while (i < n) { + for (int j : excludedMeta) { + if (i == j) + ++i; + } + + if (!(i < n)) + break; + + stack = GeneralHelper.convertObjectToItemStack(input); + stack.setItemDamage(i); + list.add(stack); + ++i; + } + + return list.toArray(); + } + + /* + * Pass this a Block, Item or ItemStack and the maximum number of indexes, + * EXCLUDING zero + */ + protected static void addMetaCycleRecipe(Object input, ItemStack stone, int n) { + int outputI; + + /* + * Makes a single item cycle through its meta values when it's crafted + * with a PStone + */ + for (int i = 0; i < n; i++) { + outputI = (i == n - 1 ? 0 : i + 1); + + if (input instanceof Block) + GameRegistry.addShapelessRecipe(new ItemStack((Block) input, 1, outputI), stone, new ItemStack((Block) input, 1, i)); + else if (input instanceof Item) + GameRegistry.addShapelessRecipe(new ItemStack((Item) input, 1, outputI), stone, new ItemStack((Item) input, 1, i)); + else if (input instanceof ItemStack) + GameRegistry.addShapelessRecipe(new ItemStack(((ItemStack) input).itemID, 1, outputI), stone, new ItemStack(((ItemStack) input).itemID, 1, i)); + } + } + + protected static void addMetaCycleRecipe(Object input, ItemStack stone, int n, int... excludedMeta) { + int i = 0; + int outputI = 1; + while (i < n && outputI != 0) { + outputI = (i == n - 1 ? 0 : i + 1); + + for (int j : excludedMeta) { + if (outputI == j) + outputI = (outputI + 1) % 16; + } + + if (input instanceof Block) + GameRegistry.addShapelessRecipe(new ItemStack((Block) input, 1, outputI), stone, new ItemStack((Block) input, 1, i)); + else if (input instanceof Item) + GameRegistry.addShapelessRecipe(new ItemStack((Item) input, 1, outputI), stone, new ItemStack((Item) input, 1, i)); + else if (input instanceof ItemStack) + GameRegistry.addShapelessRecipe(new ItemStack(((ItemStack) input).itemID, 1, outputI), stone, new ItemStack(((ItemStack) input).itemID, 1, i)); + + i = outputI; + } + } + + public static void addSmeltingRecipe(ItemStack input, ItemStack stone, ItemStack fuel) { + ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(input); + + if (result == null) + return; + + Object[] list = new Object[9]; + list[0] = stone; + list[1] = fuel; + + for (int i = 2; i < 9; i++) { + list[i] = new ItemStack(input.getItem(), 1, input.getItemDamage()); + } + + 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/RedWaterHelper.java b/ee3_common/com/pahimar/ee3/core/helper/RedWaterHelper.java similarity index 94% rename from ee3_common/ee3/common/core/helper/RedWaterHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/RedWaterHelper.java index d7935f3b..a9e84cf7 100644 --- a/ee3_common/ee3/common/core/helper/RedWaterHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/RedWaterHelper.java @@ -1,7 +1,8 @@ -package ee3.common.core.helper; +package com.pahimar.ee3.core.helper; + +import com.pahimar.ee3.block.ModBlocks; +import com.pahimar.ee3.lib.ConfigurationSettings; -import ee3.common.block.ModBlocks; -import ee3.common.lib.ConfigurationSettings; import net.minecraft.block.Block; import net.minecraft.entity.EntityLiving; import net.minecraft.util.AxisAlignedBB; diff --git a/ee3_client/ee3/client/core/helper/RenderUtils.java b/ee3_common/com/pahimar/ee3/core/helper/RenderUtils.java similarity index 98% rename from ee3_client/ee3/client/core/helper/RenderUtils.java rename to ee3_common/com/pahimar/ee3/core/helper/RenderUtils.java index 831eb9a3..3dcfe7db 100644 --- a/ee3_client/ee3/client/core/helper/RenderUtils.java +++ b/ee3_common/com/pahimar/ee3/core/helper/RenderUtils.java @@ -1,4 +1,4 @@ -package ee3.client.core.helper; +package com.pahimar.ee3.core.helper; import org.lwjgl.opengl.GL11; diff --git a/ee3_common/ee3/common/core/helper/TransmutationHelper.java b/ee3_common/com/pahimar/ee3/core/helper/TransmutationHelper.java similarity index 94% rename from ee3_common/ee3/common/core/helper/TransmutationHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/TransmutationHelper.java index e2542555..aa006d4d 100644 --- a/ee3_common/ee3/common/core/helper/TransmutationHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/TransmutationHelper.java @@ -1,116 +1,117 @@ -package ee3.common.core.helper; - -import java.util.ArrayList; - -import ee3.common.core.handlers.EquivalencyHandler; -import ee3.common.lib.Sounds; -import net.minecraft.block.Block; -import net.minecraft.block.BlockSand; -import net.minecraft.block.BlockLeaves; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; - -/** - * 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) { - - int id = world.getBlockId(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - - if ((world.getBlockMaterial(x, y, z) == Material.leaves) && (Block.blocksList[id] instanceof BlockLeaves)) { - meta = meta % 4; - } - - ItemStack nextItem = getNextBlock(id, meta, player.isSneaking()); - - if (nextItem != null) { - if (Block.blocksList[nextItem.itemID] != null) { - world.setBlockAndMetadataWithNotify(x, y, z, nextItem.itemID, nextItem.getItemDamage()); - world.playSoundAtEntity(player, Sounds.TRANSMUTE, 0.5F, 1.0F); - 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; - } - -} +package com.pahimar.ee3.core.helper; + +import java.util.ArrayList; + +import com.pahimar.ee3.core.handlers.EquivalencyHandler; +import com.pahimar.ee3.lib.Sounds; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockSand; +import net.minecraft.block.BlockLeaves; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; + +/** + * 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) { + + int id = world.getBlockId(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + + if ((world.getBlockMaterial(x, y, z) == Material.leaves) && (Block.blocksList[id] instanceof BlockLeaves)) { + meta = meta % 4; + } + + ItemStack nextItem = getNextBlock(id, meta, player.isSneaking()); + + if (nextItem != null) { + if (Block.blocksList[nextItem.itemID] != null) { + world.setBlockAndMetadataWithNotify(x, y, z, nextItem.itemID, nextItem.getItemDamage()); + world.playSoundAtEntity(player, Sounds.TRANSMUTE, 0.5F, 1.0F); + 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/core/helper/VersionHelper.java b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java similarity index 96% rename from ee3_common/ee3/common/core/helper/VersionHelper.java rename to ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java index 37e67e00..c5f73509 100644 --- a/ee3_common/ee3/common/core/helper/VersionHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java @@ -1,4 +1,4 @@ -package ee3.common.core.helper; +package com.pahimar.ee3.core.helper; import java.io.IOException; import java.io.InputStream; @@ -6,13 +6,14 @@ import java.net.URL; import java.util.Properties; import java.util.logging.Level; +import com.pahimar.ee3.lib.Colours; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Strings; + 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 diff --git a/ee3_client/ee3/client/core/ClientProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java similarity index 78% rename from ee3_client/ee3/client/core/ClientProxy.java rename to ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java index 708f82f7..2b23f4b2 100644 --- a/ee3_client/ee3/client/core/ClientProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/ClientProxy.java @@ -1,4 +1,20 @@ -package ee3.client.core; +package com.pahimar.ee3.core.proxy; + +import com.pahimar.ee3.client.renderer.ItemCalcinatorRenderer; +import com.pahimar.ee3.client.renderer.texturefx.TextureRedWaterFX; +import com.pahimar.ee3.client.renderer.texturefx.TextureRedWaterFlowFX; +import com.pahimar.ee3.client.renderer.tileentity.TileEntityCalcinatorRenderer; +import com.pahimar.ee3.core.handlers.DrawBlockHighlightHandler; +import com.pahimar.ee3.core.handlers.KeyBindingHandler; +import com.pahimar.ee3.core.handlers.RenderTickHandler; +import com.pahimar.ee3.core.handlers.SoundHandler; +import com.pahimar.ee3.core.helper.KeyBindingHelper; +import com.pahimar.ee3.lib.BlockIds; +import com.pahimar.ee3.lib.RenderIds; +import com.pahimar.ee3.lib.Sprites; +import com.pahimar.ee3.network.PacketTypeHandler; +import com.pahimar.ee3.network.packet.PacketWorldEvent; +import com.pahimar.ee3.tileentity.TileCalcinator; import net.minecraft.item.EnumRarity; import net.minecraftforge.client.EnumHelperClient; @@ -12,23 +28,7 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.TickRegistry; -import ee3.client.core.handlers.DrawBlockHighlightHandler; -import ee3.client.core.handlers.KeyBindingHandler; -import ee3.client.core.handlers.RenderTickHandler; -import ee3.client.core.handlers.SoundHandler; -import ee3.client.core.helper.KeyBindingHelper; -import ee3.client.render.RenderCalcinator; -import ee3.client.render.RenderItemCalcinator; -import ee3.client.render.TextureRedWaterFX; -import ee3.client.render.TextureRedWaterFlowFX; -import ee3.common.core.CommonProxy; -import ee3.common.lib.BlockIds; -import ee3.common.lib.RenderIds; -import ee3.common.lib.Sprites; -import ee3.common.network.PacketTypeHandler; -import ee3.common.network.PacketWorldEvent; -import ee3.common.tile.TileCalcinator; -import static ee3.common.lib.CustomItemRarity.*; +import static com.pahimar.ee3.lib.CustomItemRarity.*; /** * ClientProxy @@ -105,7 +105,7 @@ public class ClientProxy extends CommonProxy { FMLClientHandler.instance().getClient().renderEngine.registerTextureFX(new TextureRedWaterFX()); FMLClientHandler.instance().getClient().renderEngine.registerTextureFX(new TextureRedWaterFlowFX()); - MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new RenderItemCalcinator()); + MinecraftForgeClient.registerItemRenderer(BlockIds.CALCINATOR, new ItemCalcinatorRenderer()); } @Override @@ -113,7 +113,7 @@ public class ClientProxy extends CommonProxy { super.initTileEntities(); - ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new RenderCalcinator()); + ClientRegistry.bindTileEntitySpecialRenderer(TileCalcinator.class, new TileEntityCalcinatorRenderer()); } @Override diff --git a/ee3_common/ee3/common/core/CommonProxy.java b/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java similarity index 85% rename from ee3_common/ee3/common/core/CommonProxy.java rename to ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java index 67ca0734..f9f4160f 100644 --- a/ee3_common/ee3/common/core/CommonProxy.java +++ b/ee3_common/com/pahimar/ee3/core/proxy/CommonProxy.java @@ -1,17 +1,18 @@ -package ee3.common.core; +package com.pahimar.ee3.core.proxy; + +import com.pahimar.ee3.client.gui.inventory.GuiCalcinator; +import com.pahimar.ee3.client.gui.inventory.GuiPortableCrafting; +import com.pahimar.ee3.inventory.ContainerCalcinator; +import com.pahimar.ee3.inventory.ContainerPortableCrafting; +import com.pahimar.ee3.lib.GuiIds; +import com.pahimar.ee3.lib.Strings; +import com.pahimar.ee3.tileentity.TileCalcinator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; -import ee3.client.gui.GuiCalcinator; -import ee3.client.gui.GuiPortableCrafting; -import ee3.common.container.ContainerCalcinator; -import ee3.common.container.ContainerPortableCrafting; -import ee3.common.lib.GuiIds; -import ee3.common.lib.Strings; -import ee3.common.tile.TileCalcinator; /** * CommonProxy diff --git a/ee3_common/ee3/common/core/CreativeTabEE3.java b/ee3_common/com/pahimar/ee3/creativetab/CreativeTabEE3.java similarity index 80% rename from ee3_common/ee3/common/core/CreativeTabEE3.java rename to ee3_common/com/pahimar/ee3/creativetab/CreativeTabEE3.java index 5624df26..486e4e1d 100644 --- a/ee3_common/ee3/common/core/CreativeTabEE3.java +++ b/ee3_common/com/pahimar/ee3/creativetab/CreativeTabEE3.java @@ -1,9 +1,10 @@ -package ee3.common.core; +package com.pahimar.ee3.creativetab; + +import com.pahimar.ee3.item.ModItems; +import com.pahimar.ee3.lib.ItemIds; 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.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/ee3_common/ee3/common/emc/EMCEntry.java b/ee3_common/com/pahimar/ee3/emc/EMCEntry.java similarity index 98% rename from ee3_common/ee3/common/emc/EMCEntry.java rename to ee3_common/com/pahimar/ee3/emc/EMCEntry.java index 6a3d5fbe..aa41cf99 100644 --- a/ee3_common/ee3/common/emc/EMCEntry.java +++ b/ee3_common/com/pahimar/ee3/emc/EMCEntry.java @@ -1,4 +1,4 @@ -package ee3.common.emc; +package com.pahimar.ee3.emc; import java.util.Collections; import java.util.HashMap; diff --git a/ee3_common/ee3/common/emc/EMCRegistry.java b/ee3_common/com/pahimar/ee3/emc/EMCRegistry.java similarity index 98% rename from ee3_common/ee3/common/emc/EMCRegistry.java rename to ee3_common/com/pahimar/ee3/emc/EMCRegistry.java index c6e1904a..22637736 100644 --- a/ee3_common/ee3/common/emc/EMCRegistry.java +++ b/ee3_common/com/pahimar/ee3/emc/EMCRegistry.java @@ -1,4 +1,4 @@ -package ee3.common.emc; +package com.pahimar.ee3.emc; import java.util.HashMap; import java.util.Map; diff --git a/ee3_common/ee3/common/emc/EMCType.java b/ee3_common/com/pahimar/ee3/emc/EMCType.java similarity index 90% rename from ee3_common/ee3/common/emc/EMCType.java rename to ee3_common/com/pahimar/ee3/emc/EMCType.java index 613ab8d4..851c6163 100644 --- a/ee3_common/ee3/common/emc/EMCType.java +++ b/ee3_common/com/pahimar/ee3/emc/EMCType.java @@ -1,4 +1,4 @@ -package ee3.common.emc; +package com.pahimar.ee3.emc; /** * EMCType diff --git a/ee3_common/ee3/common/event/ModActionEvent.java b/ee3_common/com/pahimar/ee3/event/ModActionEvent.java similarity index 92% rename from ee3_common/ee3/common/event/ModActionEvent.java rename to ee3_common/com/pahimar/ee3/event/ModActionEvent.java index b4ab7488..05cf9103 100644 --- a/ee3_common/ee3/common/event/ModActionEvent.java +++ b/ee3_common/com/pahimar/ee3/event/ModActionEvent.java @@ -1,7 +1,9 @@ -package ee3.common.event; +package com.pahimar.ee3.event; import static net.minecraftforge.event.Event.Result.*; -import ee3.common.lib.ModAction; + +import com.pahimar.ee3.lib.ModAction; + import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.entity.player.PlayerEvent; diff --git a/ee3_common/ee3/common/event/WorldTransmutationEvent.java b/ee3_common/com/pahimar/ee3/event/WorldTransmutationEvent.java similarity index 96% rename from ee3_common/ee3/common/event/WorldTransmutationEvent.java rename to ee3_common/com/pahimar/ee3/event/WorldTransmutationEvent.java index 259ee151..1fb363c4 100644 --- a/ee3_common/ee3/common/event/WorldTransmutationEvent.java +++ b/ee3_common/com/pahimar/ee3/event/WorldTransmutationEvent.java @@ -1,4 +1,4 @@ -package ee3.common.event; +package com.pahimar.ee3.event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/ee3_common/ee3/common/container/ContainerCalcinator.java b/ee3_common/com/pahimar/ee3/inventory/ContainerCalcinator.java similarity index 97% rename from ee3_common/ee3/common/container/ContainerCalcinator.java rename to ee3_common/com/pahimar/ee3/inventory/ContainerCalcinator.java index c317cfe6..641a7498 100644 --- a/ee3_common/ee3/common/container/ContainerCalcinator.java +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerCalcinator.java @@ -1,6 +1,7 @@ -package ee3.common.container; +package com.pahimar.ee3.inventory; + +import com.pahimar.ee3.tileentity.TileCalcinator; -import ee3.common.tile.TileCalcinator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/ee3_common/ee3/common/container/ContainerPortableCrafting.java b/ee3_common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java similarity index 96% rename from ee3_common/ee3/common/container/ContainerPortableCrafting.java rename to ee3_common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java index 2c15e53c..7b233918 100644 --- a/ee3_common/ee3/common/container/ContainerPortableCrafting.java +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerPortableCrafting.java @@ -1,4 +1,4 @@ -package ee3.common.container; +package com.pahimar.ee3.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/ee3_common/ee3/common/item/IChargeable.java b/ee3_common/com/pahimar/ee3/item/IChargeable.java similarity index 91% rename from ee3_common/ee3/common/item/IChargeable.java rename to ee3_common/com/pahimar/ee3/item/IChargeable.java index e71306ae..d5d0d3bf 100644 --- a/ee3_common/ee3/common/item/IChargeable.java +++ b/ee3_common/com/pahimar/ee3/item/IChargeable.java @@ -1,4 +1,4 @@ -package ee3.common.item; +package com.pahimar.ee3.item; import net.minecraft.item.ItemStack; diff --git a/ee3_common/ee3/common/item/IKeyBound.java b/ee3_common/com/pahimar/ee3/item/IKeyBound.java similarity index 88% rename from ee3_common/ee3/common/item/IKeyBound.java rename to ee3_common/com/pahimar/ee3/item/IKeyBound.java index a3e9f3e8..efe09947 100644 --- a/ee3_common/ee3/common/item/IKeyBound.java +++ b/ee3_common/com/pahimar/ee3/item/IKeyBound.java @@ -1,4 +1,4 @@ -package ee3.common.item; +package com.pahimar.ee3.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/ee3_common/ee3/common/item/ITransmutationStone.java b/ee3_common/com/pahimar/ee3/item/ITransmutationStone.java similarity index 93% rename from ee3_common/ee3/common/item/ITransmutationStone.java rename to ee3_common/com/pahimar/ee3/item/ITransmutationStone.java index 0e0f7b3e..7faf34b6 100644 --- a/ee3_common/ee3/common/item/ITransmutationStone.java +++ b/ee3_common/com/pahimar/ee3/item/ITransmutationStone.java @@ -1,4 +1,4 @@ -package ee3.common.item; +package com.pahimar.ee3.item; import net.minecraft.entity.player.EntityPlayer; diff --git a/ee3_common/ee3/common/item/ItemAlchemyBag.java b/ee3_common/com/pahimar/ee3/item/ItemAlchemyBag.java similarity index 96% rename from ee3_common/ee3/common/item/ItemAlchemyBag.java rename to ee3_common/com/pahimar/ee3/item/ItemAlchemyBag.java index 4b51a4f8..cd9457d9 100644 --- a/ee3_common/ee3/common/item/ItemAlchemyBag.java +++ b/ee3_common/com/pahimar/ee3/item/ItemAlchemyBag.java @@ -1,16 +1,17 @@ -package ee3.common.item; +package com.pahimar.ee3.item; import java.util.List; +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.Colours; +import com.pahimar.ee3.lib.Strings; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -import ee3.common.EquivalentExchange3; -import ee3.common.lib.Colours; -import ee3.common.lib.Strings; public class ItemAlchemyBag extends ItemEE { diff --git a/ee3_common/ee3/common/item/ItemAlchemyDust.java b/ee3_common/com/pahimar/ee3/item/ItemAlchemyDust.java similarity index 94% rename from ee3_common/ee3/common/item/ItemAlchemyDust.java rename to ee3_common/com/pahimar/ee3/item/ItemAlchemyDust.java index 7e6c8c25..1e03aca4 100644 --- a/ee3_common/ee3/common/item/ItemAlchemyDust.java +++ b/ee3_common/com/pahimar/ee3/item/ItemAlchemyDust.java @@ -1,7 +1,11 @@ -package ee3.common.item; +package com.pahimar.ee3.item; import java.util.List; +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.CustomItemRarity; +import com.pahimar.ee3.lib.Strings; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -9,9 +13,6 @@ import net.minecraft.util.MathHelper; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.registry.LanguageRegistry; -import ee3.common.EquivalentExchange3; -import ee3.common.lib.CustomItemRarity; -import ee3.common.lib.Strings; /** * ItemAlchemyDust diff --git a/ee3_common/ee3/common/item/ItemEE.java b/ee3_common/com/pahimar/ee3/item/ItemEE.java similarity index 81% rename from ee3_common/ee3/common/item/ItemEE.java rename to ee3_common/com/pahimar/ee3/item/ItemEE.java index ee47e8f8..d524c773 100644 --- a/ee3_common/ee3/common/item/ItemEE.java +++ b/ee3_common/com/pahimar/ee3/item/ItemEE.java @@ -1,7 +1,8 @@ -package ee3.common.item; +package com.pahimar.ee3.item; + +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Sprites; -import ee3.common.lib.Reference; -import ee3.common.lib.Sprites; import net.minecraft.item.Item; /** diff --git a/ee3_common/ee3/common/item/ItemInertStone.java b/ee3_common/com/pahimar/ee3/item/ItemInertStone.java similarity index 78% rename from ee3_common/ee3/common/item/ItemInertStone.java rename to ee3_common/com/pahimar/ee3/item/ItemInertStone.java index 682cb2cc..10d9f581 100644 --- a/ee3_common/ee3/common/item/ItemInertStone.java +++ b/ee3_common/com/pahimar/ee3/item/ItemInertStone.java @@ -1,7 +1,8 @@ -package ee3.common.item; +package com.pahimar.ee3.item; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.Strings; -import ee3.common.EquivalentExchange3; -import ee3.common.lib.Strings; /** * ItemInertStone diff --git a/ee3_common/ee3/common/item/ItemMiniumShard.java b/ee3_common/com/pahimar/ee3/item/ItemMiniumShard.java similarity index 80% rename from ee3_common/ee3/common/item/ItemMiniumShard.java rename to ee3_common/com/pahimar/ee3/item/ItemMiniumShard.java index 212f4547..651f0fa6 100644 --- a/ee3_common/ee3/common/item/ItemMiniumShard.java +++ b/ee3_common/com/pahimar/ee3/item/ItemMiniumShard.java @@ -1,7 +1,8 @@ -package ee3.common.item; +package com.pahimar.ee3.item; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.Strings; -import ee3.common.EquivalentExchange3; -import ee3.common.lib.Strings; /** * ItemMiniumShard diff --git a/ee3_common/ee3/common/item/ItemMiniumStone.java b/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java similarity index 84% rename from ee3_common/ee3/common/item/ItemMiniumStone.java rename to ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java index 5e1151c5..67e3a3b8 100644 --- a/ee3_common/ee3/common/item/ItemMiniumStone.java +++ b/ee3_common/com/pahimar/ee3/item/ItemMiniumStone.java @@ -1,4 +1,15 @@ -package ee3.common.item; +package com.pahimar.ee3.item; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.core.helper.TransmutationHelper; +import com.pahimar.ee3.lib.Colours; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.CustomItemRarity; +import com.pahimar.ee3.lib.GuiIds; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Strings; +import com.pahimar.ee3.network.PacketTypeHandler; +import com.pahimar.ee3.network.packet.PacketKeyPressed; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -8,16 +19,6 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.network.PacketDispatcher; -import ee3.common.EquivalentExchange3; -import ee3.common.core.helper.TransmutationHelper; -import ee3.common.lib.Colours; -import ee3.common.lib.ConfigurationSettings; -import ee3.common.lib.CustomItemRarity; -import ee3.common.lib.GuiIds; -import ee3.common.lib.Reference; -import ee3.common.lib.Strings; -import ee3.common.network.PacketKeyPressed; -import ee3.common.network.PacketTypeHandler; /** * ItemMiniumStone diff --git a/ee3_common/ee3/common/item/ItemPhilosopherStone.java b/ee3_common/com/pahimar/ee3/item/ItemPhilosopherStone.java similarity index 87% rename from ee3_common/ee3/common/item/ItemPhilosopherStone.java rename to ee3_common/com/pahimar/ee3/item/ItemPhilosopherStone.java index efac0b3f..985c770c 100644 --- a/ee3_common/ee3/common/item/ItemPhilosopherStone.java +++ b/ee3_common/com/pahimar/ee3/item/ItemPhilosopherStone.java @@ -1,21 +1,22 @@ -package ee3.common.item; +package com.pahimar.ee3.item; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.core.helper.NBTHelper; +import com.pahimar.ee3.core.helper.TransmutationHelper; +import com.pahimar.ee3.lib.ConfigurationSettings; +import com.pahimar.ee3.lib.CustomItemRarity; +import com.pahimar.ee3.lib.GuiIds; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Sounds; +import com.pahimar.ee3.lib.Strings; +import com.pahimar.ee3.lib.WorldEvents; +import com.pahimar.ee3.network.PacketTypeHandler; +import com.pahimar.ee3.network.packet.PacketKeyPressed; +import com.pahimar.ee3.network.packet.PacketWorldEvent; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -import ee3.common.EquivalentExchange3; -import ee3.common.core.helper.NBTHelper; -import ee3.common.core.helper.TransmutationHelper; -import ee3.common.lib.ConfigurationSettings; -import ee3.common.lib.CustomItemRarity; -import ee3.common.lib.GuiIds; -import ee3.common.lib.Reference; -import ee3.common.lib.Sounds; -import ee3.common.lib.Strings; -import ee3.common.lib.WorldEvents; -import ee3.common.network.PacketKeyPressed; -import ee3.common.network.PacketTypeHandler; -import ee3.common.network.PacketWorldEvent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/ee3_common/ee3/common/item/ModItems.java b/ee3_common/com/pahimar/ee3/item/ModItems.java similarity index 92% rename from ee3_common/ee3/common/item/ModItems.java rename to ee3_common/com/pahimar/ee3/item/ModItems.java index 8d0bee37..d3a313bf 100644 --- a/ee3_common/ee3/common/item/ModItems.java +++ b/ee3_common/com/pahimar/ee3/item/ModItems.java @@ -1,10 +1,11 @@ -package ee3.common.item; +package com.pahimar.ee3.item; + +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.lib.ItemIds; +import com.pahimar.ee3.lib.Strings; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -import ee3.common.EquivalentExchange3; -import ee3.common.lib.ItemIds; -import ee3.common.lib.Strings; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/ee3_common/ee3/common/lib/BlockIds.java b/ee3_common/com/pahimar/ee3/lib/BlockIds.java similarity index 94% rename from ee3_common/ee3/common/lib/BlockIds.java rename to ee3_common/com/pahimar/ee3/lib/BlockIds.java index 557eedac..1adc1040 100644 --- a/ee3_common/ee3/common/lib/BlockIds.java +++ b/ee3_common/com/pahimar/ee3/lib/BlockIds.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; /** * BlockIds diff --git a/ee3_common/ee3/common/lib/Colours.java b/ee3_common/com/pahimar/ee3/lib/Colours.java similarity index 97% rename from ee3_common/ee3/common/lib/Colours.java rename to ee3_common/com/pahimar/ee3/lib/Colours.java index 760104a3..b544d63b 100644 --- a/ee3_common/ee3/common/lib/Colours.java +++ b/ee3_common/com/pahimar/ee3/lib/Colours.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; /** * Colours diff --git a/ee3_common/ee3/common/lib/ConfigurationSettings.java b/ee3_common/com/pahimar/ee3/lib/ConfigurationSettings.java similarity index 96% rename from ee3_common/ee3/common/lib/ConfigurationSettings.java rename to ee3_common/com/pahimar/ee3/lib/ConfigurationSettings.java index acc22f37..aeb6470f 100644 --- a/ee3_common/ee3/common/lib/ConfigurationSettings.java +++ b/ee3_common/com/pahimar/ee3/lib/ConfigurationSettings.java @@ -1,112 +1,113 @@ -package ee3.common.lib; - -import net.minecraftforge.common.Configuration; -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 { - - /* - * General configuration settings - */ - // Whether or not EE3 sounds are enabled - public static boolean ENABLE_SOUNDS; - public static final String ENABLE_SOUNDS_CONFIGNAME = "sounds.enabled"; - public static final boolean ENABLE_SOUNDS_DEFAULT = true; - - // Whether or not EE3 will do a version check when loaded - public static boolean ENABLE_VERSION_CHECK; - public static final String ENABLE_VERSION_CHECK_CONFIGNAME = "version_check.enabled"; - public static final boolean ENABLE_VERSION_CHECK_DEFAULT = true; - - /* - * Graphic config settings - */ - // Whether or not EE3 particle fx are enabled - public static boolean ENABLE_PARTICLE_FX; - public static final String ENABLE_PARTICLE_FX_CONFIGNAME = "particle_fx.enabled"; - public static final boolean ENABLE_PARTICLE_FX_DEFAULT = true; - - // Whether or not the in world transmutation overlay is enabled - public static boolean ENABLE_OVERLAY_WORLD_TRANSMUTATION; - public static final String ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME = "world_transmutation_overlay.enabled"; - public static final boolean ENABLE_OVERLAY_WORLD_TRANSMUTATION_DEFAULT = true; - - /* - * Block related config settings - */ - public static int RED_WATER_DURATION_BASE; - public static String RED_WATER_DURATION_BASE_CONFIGNAME = "duration.base"; - public static final int RED_WATER_DURATION_BASE_DEFAULT = 5; - - public static int RED_WATER_DURATION_MODIFIER; - public static String RED_WATER_DURATION_MODIFIER_CONFIGNAME = "duration.modifier"; - public static final int RED_WATER_DURATION_MODIFIER_DEFAULT = 2; - - public static int RED_WATER_RANGE_BASE; - public static String RED_WATER_RANGE_BASE_CONFIGNAME = "range.base"; - public static final int RED_WATER_RANGE_BASE_DEFAULT = 1; - - public static int RED_WATER_RANGE_MODIFIER; - public static String RED_WATER_RANGE_MODIFIER_CONFIGNAME = "range.modifier"; - public static final int RED_WATER_RANGE_MODIFIER_DEFAULT = 3; - - /* - * Item related config settings - */ - // The maximum durability for the Minium Stone - public static int MINIUM_STONE_MAX_DURABILITY; - public static final String MINIUM_STONE_MAX_DURABILITY_CONFIGNAME = Strings.MINIUM_STONE_NAME; - public static final int MINIUM_STONE_MAX_DURABILITY_DEFAULT = 1521; - - // The maximum durability for the Philosophers Stone - public static int PHILOSOPHERS_STONE_MAX_DURABILITY; - public static final String PHILOSOPHERS_STONE_MAX_DURABILITY_CONFIGNAME = Strings.PHILOSOPHER_STONE_NAME; - public static final int PHILOSOPHERS_STONE_MAX_DURABILITY_DEFAULT = 10001; - - /* - * Keybinding related config settings - */ - // Extra key - public static final String KEYBINDING_EXTRA = "key.extra"; - public static final int KEYBINDING_EXTRA_DEFAULT = 46; - - // Release key - public static final String KEYBINDING_RELEASE = "key.release"; - public static final int KEYBINDING_RELEASE_DEFAULT = 19; - - // Toggle key - public static final String KEYBINDING_TOGGLE = "key.toggle"; - public static final int KEYBINDING_TOGGLE_DEFAULT = 34; - - // Charge key - public static final String KEYBINDING_CHARGE = "key.charge"; - public static final int KEYBINDING_CHARGE_DEFAULT = 47; - - /* - * Transmutation related config settings - */ - // The durability cost for each item transmutation - public static int TRANSMUTE_COST_ITEM; - public static final String TRANSMUTE_COST_ITEM_CONFIGNAME = Strings.TRANSMUTATION_COST_ITEM; - public static final int TRANSMUTE_COST_ITEM_DEFAULT = 1; - - // The durability cost for each block transmutation - public static int TRANSMUTE_COST_BLOCK; - public static final String TRANSMUTE_COST_BLOCK_CONFIGNAME = Strings.TRANSMUTATION_COST_BLOCK; - public static final int TRANSMUTE_COST_BLOCK_DEFAULT = 1; - - // The durability cost for each block transmutation - public static int TRANSMUTE_COST_MOB; - public static final String TRANSMUTE_COST_MOB_CONFIGNAME = Strings.TRANSMUTATION_COST_MOB; - public static final int TRANSMUTE_COST_MOB_DEFAULT = 1; - -} +package com.pahimar.ee3.lib; + +import com.pahimar.ee3.item.ModItems; + +import net.minecraftforge.common.Configuration; + +/** + * 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 { + + /* + * General configuration settings + */ + // Whether or not EE3 sounds are enabled + public static boolean ENABLE_SOUNDS; + public static final String ENABLE_SOUNDS_CONFIGNAME = "sounds.enabled"; + public static final boolean ENABLE_SOUNDS_DEFAULT = true; + + // Whether or not EE3 will do a version check when loaded + public static boolean ENABLE_VERSION_CHECK; + public static final String ENABLE_VERSION_CHECK_CONFIGNAME = "version_check.enabled"; + public static final boolean ENABLE_VERSION_CHECK_DEFAULT = true; + + /* + * Graphic config settings + */ + // Whether or not EE3 particle fx are enabled + public static boolean ENABLE_PARTICLE_FX; + public static final String ENABLE_PARTICLE_FX_CONFIGNAME = "particle_fx.enabled"; + public static final boolean ENABLE_PARTICLE_FX_DEFAULT = true; + + // Whether or not the in world transmutation overlay is enabled + public static boolean ENABLE_OVERLAY_WORLD_TRANSMUTATION; + public static final String ENABLE_OVERLAY_WORLD_TRANSMUTATION_CONFIGNAME = "world_transmutation_overlay.enabled"; + public static final boolean ENABLE_OVERLAY_WORLD_TRANSMUTATION_DEFAULT = true; + + /* + * Block related config settings + */ + public static int RED_WATER_DURATION_BASE; + public static String RED_WATER_DURATION_BASE_CONFIGNAME = "duration.base"; + public static final int RED_WATER_DURATION_BASE_DEFAULT = 5; + + public static int RED_WATER_DURATION_MODIFIER; + public static String RED_WATER_DURATION_MODIFIER_CONFIGNAME = "duration.modifier"; + public static final int RED_WATER_DURATION_MODIFIER_DEFAULT = 2; + + public static int RED_WATER_RANGE_BASE; + public static String RED_WATER_RANGE_BASE_CONFIGNAME = "range.base"; + public static final int RED_WATER_RANGE_BASE_DEFAULT = 1; + + public static int RED_WATER_RANGE_MODIFIER; + public static String RED_WATER_RANGE_MODIFIER_CONFIGNAME = "range.modifier"; + public static final int RED_WATER_RANGE_MODIFIER_DEFAULT = 3; + + /* + * Item related config settings + */ + // The maximum durability for the Minium Stone + public static int MINIUM_STONE_MAX_DURABILITY; + public static final String MINIUM_STONE_MAX_DURABILITY_CONFIGNAME = Strings.MINIUM_STONE_NAME; + public static final int MINIUM_STONE_MAX_DURABILITY_DEFAULT = 1521; + + // The maximum durability for the Philosophers Stone + public static int PHILOSOPHERS_STONE_MAX_DURABILITY; + public static final String PHILOSOPHERS_STONE_MAX_DURABILITY_CONFIGNAME = Strings.PHILOSOPHER_STONE_NAME; + public static final int PHILOSOPHERS_STONE_MAX_DURABILITY_DEFAULT = 10001; + + /* + * Keybinding related config settings + */ + // Extra key + public static final String KEYBINDING_EXTRA = "key.extra"; + public static final int KEYBINDING_EXTRA_DEFAULT = 46; + + // Release key + public static final String KEYBINDING_RELEASE = "key.release"; + public static final int KEYBINDING_RELEASE_DEFAULT = 19; + + // Toggle key + public static final String KEYBINDING_TOGGLE = "key.toggle"; + public static final int KEYBINDING_TOGGLE_DEFAULT = 34; + + // Charge key + public static final String KEYBINDING_CHARGE = "key.charge"; + public static final int KEYBINDING_CHARGE_DEFAULT = 47; + + /* + * Transmutation related config settings + */ + // The durability cost for each item transmutation + public static int TRANSMUTE_COST_ITEM; + public static final String TRANSMUTE_COST_ITEM_CONFIGNAME = Strings.TRANSMUTATION_COST_ITEM; + public static final int TRANSMUTE_COST_ITEM_DEFAULT = 1; + + // The durability cost for each block transmutation + public static int TRANSMUTE_COST_BLOCK; + public static final String TRANSMUTE_COST_BLOCK_CONFIGNAME = Strings.TRANSMUTATION_COST_BLOCK; + public static final int TRANSMUTE_COST_BLOCK_DEFAULT = 1; + + // The durability cost for each block transmutation + public static int TRANSMUTE_COST_MOB; + public static final String TRANSMUTE_COST_MOB_CONFIGNAME = Strings.TRANSMUTATION_COST_MOB; + public static final int TRANSMUTE_COST_MOB_DEFAULT = 1; + +} diff --git a/ee3_common/ee3/common/lib/CustomItemRarity.java b/ee3_common/com/pahimar/ee3/lib/CustomItemRarity.java similarity index 98% rename from ee3_common/ee3/common/lib/CustomItemRarity.java rename to ee3_common/com/pahimar/ee3/lib/CustomItemRarity.java index 51f0b6ae..be08f0ce 100644 --- a/ee3_common/ee3/common/lib/CustomItemRarity.java +++ b/ee3_common/com/pahimar/ee3/lib/CustomItemRarity.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; /** * CustomItemRarity diff --git a/ee3_common/ee3/common/lib/GuiIds.java b/ee3_common/com/pahimar/ee3/lib/GuiIds.java similarity index 91% rename from ee3_common/ee3/common/lib/GuiIds.java rename to ee3_common/com/pahimar/ee3/lib/GuiIds.java index d782b80d..281fc2ce 100644 --- a/ee3_common/ee3/common/lib/GuiIds.java +++ b/ee3_common/com/pahimar/ee3/lib/GuiIds.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; /** * GuiIds diff --git a/ee3_common/ee3/common/lib/ItemIds.java b/ee3_common/com/pahimar/ee3/lib/ItemIds.java similarity index 96% rename from ee3_common/ee3/common/lib/ItemIds.java rename to ee3_common/com/pahimar/ee3/lib/ItemIds.java index e4be319b..21862f9c 100644 --- a/ee3_common/ee3/common/lib/ItemIds.java +++ b/ee3_common/com/pahimar/ee3/lib/ItemIds.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; /** * ItemIds diff --git a/ee3_common/ee3/common/lib/Localizations.java b/ee3_common/com/pahimar/ee3/lib/Localizations.java similarity index 94% rename from ee3_common/ee3/common/lib/Localizations.java rename to ee3_common/com/pahimar/ee3/lib/Localizations.java index f242042f..4c20b262 100644 --- a/ee3_common/ee3/common/lib/Localizations.java +++ b/ee3_common/com/pahimar/ee3/lib/Localizations.java @@ -1,38 +1,38 @@ -package ee3.common.lib; - -/** - * Localizations - * - * Library containing all mod language related files - * - * @author pahimar - * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) - * - */ -public class Localizations { - - private static final String LANG_RESOURCE_LOCATION = "/ee3/lang/"; - - public static String[] localeFiles = { - LANG_RESOURCE_LOCATION + "cs_CZ.xml", - LANG_RESOURCE_LOCATION + "cy_GB.xml", - LANG_RESOURCE_LOCATION + "de_DE.xml", - LANG_RESOURCE_LOCATION + "en_US.xml", - LANG_RESOURCE_LOCATION + "es_ES.xml", - LANG_RESOURCE_LOCATION + "fr_FR.xml", - LANG_RESOURCE_LOCATION + "it_IT.xml", - LANG_RESOURCE_LOCATION + "ja_JP.xml", - LANG_RESOURCE_LOCATION + "la_IT.xml", - LANG_RESOURCE_LOCATION + "nl_NL.xml", - LANG_RESOURCE_LOCATION + "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", - LANG_RESOURCE_LOCATION + "sv_SE.xml", - LANG_RESOURCE_LOCATION + "zh_CN.xml", - LANG_RESOURCE_LOCATION + "zh_TW.xml" - }; - -} +package com.pahimar.ee3.lib; + +/** + * Localizations + * + * Library containing all mod language related files + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +public class Localizations { + + private static final String LANG_RESOURCE_LOCATION = "/ee3/lang/"; + + public static String[] localeFiles = { + LANG_RESOURCE_LOCATION + "cs_CZ.xml", + LANG_RESOURCE_LOCATION + "cy_GB.xml", + LANG_RESOURCE_LOCATION + "de_DE.xml", + LANG_RESOURCE_LOCATION + "en_US.xml", + LANG_RESOURCE_LOCATION + "es_ES.xml", + LANG_RESOURCE_LOCATION + "fr_FR.xml", + LANG_RESOURCE_LOCATION + "it_IT.xml", + LANG_RESOURCE_LOCATION + "ja_JP.xml", + LANG_RESOURCE_LOCATION + "la_IT.xml", + LANG_RESOURCE_LOCATION + "nl_NL.xml", + LANG_RESOURCE_LOCATION + "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", + LANG_RESOURCE_LOCATION + "sv_SE.xml", + LANG_RESOURCE_LOCATION + "zh_CN.xml", + LANG_RESOURCE_LOCATION + "zh_TW.xml" + }; + +} diff --git a/ee3_common/ee3/common/lib/ModAction.java b/ee3_common/com/pahimar/ee3/lib/ModAction.java similarity index 86% rename from ee3_common/ee3/common/lib/ModAction.java rename to ee3_common/com/pahimar/ee3/lib/ModAction.java index b55e6c4f..2e88f5c0 100644 --- a/ee3_common/ee3/common/lib/ModAction.java +++ b/ee3_common/com/pahimar/ee3/lib/ModAction.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; public enum ModAction { diff --git a/ee3_common/ee3/common/lib/PacketIds.java b/ee3_common/com/pahimar/ee3/lib/PacketIds.java similarity index 93% rename from ee3_common/ee3/common/lib/PacketIds.java rename to ee3_common/com/pahimar/ee3/lib/PacketIds.java index d81ff22e..ab01c8c2 100644 --- a/ee3_common/ee3/common/lib/PacketIds.java +++ b/ee3_common/com/pahimar/ee3/lib/PacketIds.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; /** * PacketIds diff --git a/ee3_common/ee3/common/lib/Reference.java b/ee3_common/com/pahimar/ee3/lib/Reference.java similarity index 75% rename from ee3_common/ee3/common/lib/Reference.java rename to ee3_common/com/pahimar/ee3/lib/Reference.java index 5460cef7..08eaaed2 100644 --- a/ee3_common/ee3/common/lib/Reference.java +++ b/ee3_common/com/pahimar/ee3/lib/Reference.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; /** * Reference @@ -21,7 +21,7 @@ public class Reference { public static final String CHANNEL_NAME = MOD_ID; public static final int SECOND_IN_TICKS = 20; 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"; + public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy"; + public static final String CLIENT_PROXY_CLASS = "com.pahimar.ee3.core.proxy.ClientProxy"; } diff --git a/ee3_common/ee3/common/lib/RenderIds.java b/ee3_common/com/pahimar/ee3/lib/RenderIds.java similarity index 87% rename from ee3_common/ee3/common/lib/RenderIds.java rename to ee3_common/com/pahimar/ee3/lib/RenderIds.java index abd291fa..9b5bba97 100644 --- a/ee3_common/ee3/common/lib/RenderIds.java +++ b/ee3_common/com/pahimar/ee3/lib/RenderIds.java @@ -1,16 +1,16 @@ -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; - -} +package com.pahimar.ee3.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/lib/Sounds.java b/ee3_common/com/pahimar/ee3/lib/Sounds.java similarity index 96% rename from ee3_common/ee3/common/lib/Sounds.java rename to ee3_common/com/pahimar/ee3/lib/Sounds.java index 0357bbe3..a3c822d9 100644 --- a/ee3_common/ee3/common/lib/Sounds.java +++ b/ee3_common/com/pahimar/ee3/lib/Sounds.java @@ -1,48 +1,48 @@ -package ee3.common.lib; - -/** - * Sounds - * - * Library containing all mod sound related files and references - * - * @author pahimar - * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) - * - */ -public class Sounds { - - private static final String SOUND_RESOURCE_LOCATION = "ee3/sound/"; - private static final String SOUND_PREFIX = "ee3.sound."; - - public static String[] soundFiles = { - SOUND_RESOURCE_LOCATION + "chargeDown.ogg", - SOUND_RESOURCE_LOCATION + "chargeUp.ogg", - SOUND_RESOURCE_LOCATION + "destruct.ogg", - SOUND_RESOURCE_LOCATION + "gust.ogg", - SOUND_RESOURCE_LOCATION + "heal.ogg", - SOUND_RESOURCE_LOCATION + "kinesis.ogg", - SOUND_RESOURCE_LOCATION + "launch.ogg", - SOUND_RESOURCE_LOCATION + "nova.ogg", - SOUND_RESOURCE_LOCATION + "philball.ogg", - SOUND_RESOURCE_LOCATION + "tock.ogg", - SOUND_RESOURCE_LOCATION + "transmute.ogg", - SOUND_RESOURCE_LOCATION + "wall.ogg", - SOUND_RESOURCE_LOCATION + "waterball.ogg", - SOUND_RESOURCE_LOCATION + "wind.ogg" }; - - public static final String CHARGE_DOWN = SOUND_PREFIX + "chargeDown"; - public static final String CHARGE_UP = SOUND_PREFIX + "chargeUp"; - public static final String DESTRUCTION = SOUND_PREFIX + "destruct"; - public static final String GUST = SOUND_PREFIX + "gust"; - public static final String HEAL = SOUND_PREFIX + "heal"; - public static final String KINESIS = SOUND_PREFIX + "kinesis"; - public static final String LAUNCH = SOUND_PREFIX + "launch"; - public static final String NOVA = SOUND_PREFIX + "nova"; - public static final String PHILOSOPHERS_BALL = SOUND_PREFIX + "philball"; - public static final String TOCK = SOUND_PREFIX + "tock"; - public static final String TRANSMUTE = SOUND_PREFIX + "transmute"; - public static final String WALL = SOUND_PREFIX + "wall"; - public static final String WATER_BALL = SOUND_PREFIX + "waterball"; - public static final String WIND = SOUND_PREFIX + "wind"; - +package com.pahimar.ee3.lib; + +/** + * Sounds + * + * Library containing all mod sound related files and references + * + * @author pahimar + * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) + * + */ +public class Sounds { + + private static final String SOUND_RESOURCE_LOCATION = "ee3/sound/"; + private static final String SOUND_PREFIX = "ee3.sound."; + + public static String[] soundFiles = { + SOUND_RESOURCE_LOCATION + "chargeDown.ogg", + SOUND_RESOURCE_LOCATION + "chargeUp.ogg", + SOUND_RESOURCE_LOCATION + "destruct.ogg", + SOUND_RESOURCE_LOCATION + "gust.ogg", + SOUND_RESOURCE_LOCATION + "heal.ogg", + SOUND_RESOURCE_LOCATION + "kinesis.ogg", + SOUND_RESOURCE_LOCATION + "launch.ogg", + SOUND_RESOURCE_LOCATION + "nova.ogg", + SOUND_RESOURCE_LOCATION + "philball.ogg", + SOUND_RESOURCE_LOCATION + "tock.ogg", + SOUND_RESOURCE_LOCATION + "transmute.ogg", + SOUND_RESOURCE_LOCATION + "wall.ogg", + SOUND_RESOURCE_LOCATION + "waterball.ogg", + SOUND_RESOURCE_LOCATION + "wind.ogg" }; + + public static final String CHARGE_DOWN = SOUND_PREFIX + "chargeDown"; + public static final String CHARGE_UP = SOUND_PREFIX + "chargeUp"; + public static final String DESTRUCTION = SOUND_PREFIX + "destruct"; + public static final String GUST = SOUND_PREFIX + "gust"; + public static final String HEAL = SOUND_PREFIX + "heal"; + public static final String KINESIS = SOUND_PREFIX + "kinesis"; + public static final String LAUNCH = SOUND_PREFIX + "launch"; + public static final String NOVA = SOUND_PREFIX + "nova"; + public static final String PHILOSOPHERS_BALL = SOUND_PREFIX + "philball"; + public static final String TOCK = SOUND_PREFIX + "tock"; + public static final String TRANSMUTE = SOUND_PREFIX + "transmute"; + public static final String WALL = SOUND_PREFIX + "wall"; + public static final String WATER_BALL = SOUND_PREFIX + "waterball"; + public static final String WIND = SOUND_PREFIX + "wind"; + } \ No newline at end of file diff --git a/ee3_common/ee3/common/lib/Sprites.java b/ee3_common/com/pahimar/ee3/lib/Sprites.java similarity index 94% rename from ee3_common/ee3/common/lib/Sprites.java rename to ee3_common/com/pahimar/ee3/lib/Sprites.java index fe186c50..474df5bd 100644 --- a/ee3_common/ee3/common/lib/Sprites.java +++ b/ee3_common/com/pahimar/ee3/lib/Sprites.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; public class Sprites { diff --git a/ee3_common/ee3/common/lib/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java similarity index 98% rename from ee3_common/ee3/common/lib/Strings.java rename to ee3_common/com/pahimar/ee3/lib/Strings.java index 9e289da8..ef409f74 100644 --- a/ee3_common/ee3/common/lib/Strings.java +++ b/ee3_common/com/pahimar/ee3/lib/Strings.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; public class Strings { diff --git a/ee3_common/ee3/common/lib/WorldEvents.java b/ee3_common/com/pahimar/ee3/lib/WorldEvents.java similarity index 74% rename from ee3_common/ee3/common/lib/WorldEvents.java rename to ee3_common/com/pahimar/ee3/lib/WorldEvents.java index 5bf67236..779a81a9 100644 --- a/ee3_common/ee3/common/lib/WorldEvents.java +++ b/ee3_common/com/pahimar/ee3/lib/WorldEvents.java @@ -1,4 +1,4 @@ -package ee3.common.lib; +package com.pahimar.ee3.lib; public class WorldEvents { diff --git a/ee3_common/ee3/common/network/PacketTypeHandler.java b/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java similarity index 85% rename from ee3_common/ee3/common/network/PacketTypeHandler.java rename to ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java index 01d240db..011e1d61 100644 --- a/ee3_common/ee3/common/network/PacketTypeHandler.java +++ b/ee3_common/com/pahimar/ee3/network/PacketTypeHandler.java @@ -1,12 +1,17 @@ -package ee3.common.network; +package com.pahimar.ee3.network; import java.io.ByteArrayInputStream; import java.io.DataInputStream; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.network.packet.PacketEE; +import com.pahimar.ee3.network.packet.PacketKeyPressed; +import com.pahimar.ee3.network.packet.PacketTileUpdate; +import com.pahimar.ee3.network.packet.PacketWorldEvent; + import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; -import ee3.common.lib.Reference; /** diff --git a/ee3_common/ee3/common/network/PacketEE.java b/ee3_common/com/pahimar/ee3/network/packet/PacketEE.java similarity index 88% rename from ee3_common/ee3/common/network/PacketEE.java rename to ee3_common/com/pahimar/ee3/network/packet/PacketEE.java index 4f313251..b6d470f3 100644 --- a/ee3_common/ee3/common/network/PacketEE.java +++ b/ee3_common/com/pahimar/ee3/network/packet/PacketEE.java @@ -1,10 +1,12 @@ -package ee3.common.network; +package com.pahimar.ee3.network.packet; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.pahimar.ee3.network.PacketTypeHandler; + import net.minecraft.network.INetworkManager; import cpw.mods.fml.common.network.Player; @@ -19,8 +21,8 @@ import cpw.mods.fml.common.network.Player; */ public class PacketEE { - protected PacketTypeHandler packetType; - protected boolean isChunkDataPacket; + public PacketTypeHandler packetType; + public boolean isChunkDataPacket; public PacketEE(PacketTypeHandler packetType, boolean isChunkDataPacket) { this.packetType = packetType; diff --git a/ee3_common/ee3/common/network/PacketKeyPressed.java b/ee3_common/com/pahimar/ee3/network/packet/PacketKeyPressed.java similarity index 80% rename from ee3_common/ee3/common/network/PacketKeyPressed.java rename to ee3_common/com/pahimar/ee3/network/packet/PacketKeyPressed.java index 23605f2c..b3a37356 100644 --- a/ee3_common/ee3/common/network/PacketKeyPressed.java +++ b/ee3_common/com/pahimar/ee3/network/packet/PacketKeyPressed.java @@ -1,20 +1,22 @@ -package ee3.common.network; +package com.pahimar.ee3.network.packet; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.pahimar.ee3.EquivalentExchange3; +import com.pahimar.ee3.item.IKeyBound; +import com.pahimar.ee3.item.ITransmutationStone; +import com.pahimar.ee3.lib.GuiIds; +import com.pahimar.ee3.lib.ItemIds; +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.network.PacketTypeHandler; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetworkManager; import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.registry.LanguageRegistry; -import ee3.common.EquivalentExchange3; -import ee3.common.item.IKeyBound; -import ee3.common.item.ITransmutationStone; -import ee3.common.lib.GuiIds; -import ee3.common.lib.ItemIds; -import ee3.common.lib.Reference; /** * PacketKeyPressed diff --git a/ee3_common/ee3/common/network/PacketTileUpdate.java b/ee3_common/com/pahimar/ee3/network/packet/PacketTileUpdate.java similarity index 94% rename from ee3_common/ee3/common/network/PacketTileUpdate.java rename to ee3_common/com/pahimar/ee3/network/packet/PacketTileUpdate.java index 99baefc7..0b26fd22 100644 --- a/ee3_common/ee3/common/network/PacketTileUpdate.java +++ b/ee3_common/com/pahimar/ee3/network/packet/PacketTileUpdate.java @@ -1,9 +1,11 @@ -package ee3.common.network; +package com.pahimar.ee3.network.packet; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.pahimar.ee3.network.PacketTypeHandler; + import cpw.mods.fml.common.network.Player; import net.minecraft.network.INetworkManager; diff --git a/ee3_common/ee3/common/network/PacketWorldEvent.java b/ee3_common/com/pahimar/ee3/network/packet/PacketWorldEvent.java similarity index 93% rename from ee3_common/ee3/common/network/PacketWorldEvent.java rename to ee3_common/com/pahimar/ee3/network/packet/PacketWorldEvent.java index 20f64964..eae7207e 100644 --- a/ee3_common/ee3/common/network/PacketWorldEvent.java +++ b/ee3_common/com/pahimar/ee3/network/packet/PacketWorldEvent.java @@ -1,9 +1,15 @@ -package ee3.common.network; +package com.pahimar.ee3.network.packet; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; +import com.pahimar.ee3.event.ModActionEvent; +import com.pahimar.ee3.event.WorldTransmutationEvent; +import com.pahimar.ee3.lib.ModAction; +import com.pahimar.ee3.lib.WorldEvents; +import com.pahimar.ee3.network.PacketTypeHandler; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetworkManager; import net.minecraft.world.World; @@ -12,10 +18,6 @@ import net.minecraftforge.event.Event; import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import cpw.mods.fml.common.network.Player; -import ee3.common.event.ModActionEvent; -import ee3.common.event.WorldTransmutationEvent; -import ee3.common.lib.ModAction; -import ee3.common.lib.WorldEvents; public class PacketWorldEvent extends PacketEE { diff --git a/ee3_common/ee3/common/recipe/RecipesCalcinator.java b/ee3_common/com/pahimar/ee3/recipe/RecipesCalcinator.java similarity index 86% rename from ee3_common/ee3/common/recipe/RecipesCalcinator.java rename to ee3_common/com/pahimar/ee3/recipe/RecipesCalcinator.java index 421046c2..2bf0ace5 100644 --- a/ee3_common/ee3/common/recipe/RecipesCalcinator.java +++ b/ee3_common/com/pahimar/ee3/recipe/RecipesCalcinator.java @@ -1,4 +1,4 @@ -package ee3.common.recipe; +package com.pahimar.ee3.recipe; /** * RecipesCalcinator diff --git a/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java b/ee3_common/com/pahimar/ee3/recipe/RecipesTransmutationStone.java similarity index 97% rename from ee3_common/ee3/common/recipe/RecipesTransmutationStone.java rename to ee3_common/com/pahimar/ee3/recipe/RecipesTransmutationStone.java index 9e16a0a2..3c17b1e1 100644 --- a/ee3_common/ee3/common/recipe/RecipesTransmutationStone.java +++ b/ee3_common/com/pahimar/ee3/recipe/RecipesTransmutationStone.java @@ -1,4 +1,4 @@ -package ee3.common.recipe; +package com.pahimar.ee3.recipe; import java.util.ArrayList; import java.util.Arrays; @@ -6,17 +6,18 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import com.pahimar.ee3.core.handlers.EquivalencyHandler; +import com.pahimar.ee3.core.helper.GeneralHelper; +import com.pahimar.ee3.core.helper.RecipeHelper; +import com.pahimar.ee3.item.ModItems; +import com.pahimar.ee3.lib.Reference; + import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import ee3.common.core.handlers.EquivalencyHandler; -import ee3.common.core.helper.GeneralHelper; -import ee3.common.core.helper.RecipeHelper; -import ee3.common.item.ModItems; -import ee3.common.lib.Reference; /** * RecipesTransmutationStone diff --git a/ee3_common/ee3/common/tile/TileCalcinator.java b/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java similarity index 93% rename from ee3_common/ee3/common/tile/TileCalcinator.java rename to ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java index 2347f75e..d4d2aaea 100644 --- a/ee3_common/ee3/common/tile/TileCalcinator.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileCalcinator.java @@ -1,99 +1,100 @@ -package ee3.common.tile; - -import ee3.common.block.ModBlocks; -import ee3.common.lib.Strings; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.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 { - - /** - * The ItemStacks that hold the items currently being used in the Calcinator - */ - private ItemStack[] calcinatorItemStacks = new ItemStack[3]; - - public void readFromNBT(NBTTagCompound nbtTagCompound) { - super.readFromNBT(nbtTagCompound); - - // Read in the ItemStacks in the inventory from NBT - NBTTagList tagList = nbtTagCompound.getTagList("Items"); - this.calcinatorItemStacks = new ItemStack[this.getSizeInventory()]; - for (int i = 0; i < tagList.tagCount(); ++i) { - NBTTagCompound tagCompound = (NBTTagCompound)tagList.tagAt(i); - byte slot = tagCompound.getByte("Slot"); - if (slot >= 0 && slot < this.calcinatorItemStacks.length) { - this.calcinatorItemStacks[slot] = ItemStack.loadItemStackFromNBT(tagCompound); - } - } - - } - - public void writeToNBT(NBTTagCompound nbtTagCompound) { - super.writeToNBT(nbtTagCompound); - - // Write the ItemStacks in the inventory to NBT - NBTTagList tagList = new NBTTagList(); - for (int currentIndex = 0; currentIndex < this.calcinatorItemStacks.length; ++currentIndex) { - if (this.calcinatorItemStacks[currentIndex] != null) { - NBTTagCompound tagCompound = new NBTTagCompound(); - tagCompound.setByte("Slot", (byte)currentIndex); - this.calcinatorItemStacks[currentIndex].writeToNBT(tagCompound); - tagList.appendTag(tagCompound); - } - } - nbtTagCompound.setTag("Items", tagList); - - } - - /** - * Returns the number of slots in the inventory. - */ - public int getSizeInventory() { - return this.calcinatorItemStacks.length; - } - - /** - * Returns the stack in slot i - */ - public ItemStack getStackInSlot(int i) { - return this.calcinatorItemStacks[i]; - } - - public ItemStack decrStackSize(int i, int j) { - // TODO Auto-generated method stub - return null; - } - - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - @Override - public void setInventorySlotContents(int var1, ItemStack var2) { - // TODO Auto-generated method stub - - } - - public String getInvName() { - return "container." + Strings.CALCINATOR_NAME; - } - - public int getInventoryStackLimit() { - return 64; - } - - public void openChest() { } - public void closeChest() { } - -} +package com.pahimar.ee3.tileentity; + +import com.pahimar.ee3.block.ModBlocks; +import com.pahimar.ee3.lib.Strings; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.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 { + + /** + * The ItemStacks that hold the items currently being used in the Calcinator + */ + private ItemStack[] calcinatorItemStacks = new ItemStack[3]; + + public void readFromNBT(NBTTagCompound nbtTagCompound) { + super.readFromNBT(nbtTagCompound); + + // Read in the ItemStacks in the inventory from NBT + NBTTagList tagList = nbtTagCompound.getTagList("Items"); + this.calcinatorItemStacks = new ItemStack[this.getSizeInventory()]; + for (int i = 0; i < tagList.tagCount(); ++i) { + NBTTagCompound tagCompound = (NBTTagCompound)tagList.tagAt(i); + byte slot = tagCompound.getByte("Slot"); + if (slot >= 0 && slot < this.calcinatorItemStacks.length) { + this.calcinatorItemStacks[slot] = ItemStack.loadItemStackFromNBT(tagCompound); + } + } + + } + + public void writeToNBT(NBTTagCompound nbtTagCompound) { + super.writeToNBT(nbtTagCompound); + + // Write the ItemStacks in the inventory to NBT + NBTTagList tagList = new NBTTagList(); + for (int currentIndex = 0; currentIndex < this.calcinatorItemStacks.length; ++currentIndex) { + if (this.calcinatorItemStacks[currentIndex] != null) { + NBTTagCompound tagCompound = new NBTTagCompound(); + tagCompound.setByte("Slot", (byte)currentIndex); + this.calcinatorItemStacks[currentIndex].writeToNBT(tagCompound); + tagList.appendTag(tagCompound); + } + } + nbtTagCompound.setTag("Items", tagList); + + } + + /** + * Returns the number of slots in the inventory. + */ + public int getSizeInventory() { + return this.calcinatorItemStacks.length; + } + + /** + * Returns the stack in slot i + */ + public ItemStack getStackInSlot(int i) { + return this.calcinatorItemStacks[i]; + } + + public ItemStack decrStackSize(int i, int j) { + // TODO Auto-generated method stub + return null; + } + + public ItemStack getStackInSlotOnClosing(int i) { + return null; + } + + @Override + public void setInventorySlotContents(int var1, ItemStack var2) { + // TODO Auto-generated method stub + + } + + public String getInvName() { + return "container." + Strings.CALCINATOR_NAME; + } + + public int getInventoryStackLimit() { + return 64; + } + + public void openChest() { } + public void closeChest() { } + +} diff --git a/ee3_common/ee3/common/tile/TileEE.java b/ee3_common/com/pahimar/ee3/tileentity/TileEE.java similarity index 90% rename from ee3_common/ee3/common/tile/TileEE.java rename to ee3_common/com/pahimar/ee3/tileentity/TileEE.java index 53279cc8..a73e4027 100644 --- a/ee3_common/ee3/common/tile/TileEE.java +++ b/ee3_common/com/pahimar/ee3/tileentity/TileEE.java @@ -1,70 +1,71 @@ -package ee3.common.tile; - -import ee3.common.lib.Reference; -import ee3.common.lib.Strings; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.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; - private short state; - private String owner; - - public byte getDirection() { - return direction; - } - - public void setDirection(byte direction) { - this.direction = direction; - } - - public short getState() { - return state; - } - - public void setState(short state) { - this.state = state; - } - - public String getOwner() { - return owner; - } - - public void setOwner(String owner) { - this.owner = owner; - } - - public boolean isUseableByPlayer(EntityPlayer player) { - return owner.equals(player.username); - } - - public void readFromNBT(NBTTagCompound nbtTagCompound) { - super.readFromNBT(nbtTagCompound); - - direction = nbtTagCompound.getByte(Strings.NBT_TE_DIRECTION_KEY); - state = nbtTagCompound.getShort(Strings.NBT_TE_STATE_KEY); - owner = nbtTagCompound.getString(Strings.NBT_TE_OWNER_KEY); - } - - public void writeToNBT(NBTTagCompound nbtTagCompound) { - super.writeToNBT(nbtTagCompound); - - nbtTagCompound.setByte(Strings.NBT_TE_DIRECTION_KEY, direction); - nbtTagCompound.setShort(Strings.NBT_TE_STATE_KEY, state); - if(owner != null && owner != "") { - nbtTagCompound.setString(Strings.NBT_TE_OWNER_KEY, owner); - } - } - -} +package com.pahimar.ee3.tileentity; + +import com.pahimar.ee3.lib.Reference; +import com.pahimar.ee3.lib.Strings; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.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; + private short state; + private String owner; + + public byte getDirection() { + return direction; + } + + public void setDirection(byte direction) { + this.direction = direction; + } + + public short getState() { + return state; + } + + public void setState(short state) { + this.state = state; + } + + public String getOwner() { + return owner; + } + + public void setOwner(String owner) { + this.owner = owner; + } + + public boolean isUseableByPlayer(EntityPlayer player) { + return owner.equals(player.username); + } + + public void readFromNBT(NBTTagCompound nbtTagCompound) { + super.readFromNBT(nbtTagCompound); + + direction = nbtTagCompound.getByte(Strings.NBT_TE_DIRECTION_KEY); + state = nbtTagCompound.getShort(Strings.NBT_TE_STATE_KEY); + owner = nbtTagCompound.getString(Strings.NBT_TE_OWNER_KEY); + } + + public void writeToNBT(NBTTagCompound nbtTagCompound) { + super.writeToNBT(nbtTagCompound); + + nbtTagCompound.setByte(Strings.NBT_TE_DIRECTION_KEY, direction); + nbtTagCompound.setShort(Strings.NBT_TE_STATE_KEY, state); + if(owner != null && owner != "") { + nbtTagCompound.setString(Strings.NBT_TE_OWNER_KEY, owner); + } + } + +} diff --git a/resources/ee3/lang/de_DE.xml b/resources/ee3/lang/de_DE.xml index f8d20960..cdbb5020 100644 --- a/resources/ee3/lang/de_DE.xml +++ b/resources/ee3/lang/de_DE.xml @@ -1,4 +1,4 @@ - + German (DE) Localization File @@ -31,7 +31,7 @@ Brauner Alchemiebeutel Grüner Alchemiebeutel Roter Alchemiebeutel - Schwarzer Alchemiebeutel + Schwarzer Alchemiebeutel Rotes Wasser (Still) Rotes Wasser (Fließend) Kalzinierer