diff --git a/build.properties b/build.properties index 12df6f7..cf9e457 100644 --- a/build.properties +++ b/build.properties @@ -1,6 +1,6 @@ # #Wed Feb 24 14:31:53 PDT 2015 -package_group=com.tombenpotter.emt +package_group=emt mc_version=1.7.10 forge_version=10.13.4.1566 mod_version=1.2.6 diff --git a/src/main/java/tombenpotter/emt/ElectroMagicTools.java b/src/main/java/emt/ElectroMagicTools.java similarity index 79% rename from src/main/java/tombenpotter/emt/ElectroMagicTools.java rename to src/main/java/emt/ElectroMagicTools.java index 7951216..84b686e 100644 --- a/src/main/java/tombenpotter/emt/ElectroMagicTools.java +++ b/src/main/java/emt/ElectroMagicTools.java @@ -1,4 +1,4 @@ -package tombenpotter.emt; +package emt; import ic2.core.Ic2Items; import cpw.mods.fml.common.FMLCommonHandler; @@ -13,6 +13,13 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import emt.command.CommandOutputs; +import emt.init.EntityRegistry; +import emt.init.Registry; +import emt.init.Researches; +import emt.network.PacketEMTKeys; +import emt.proxy.CommonProxy; +import emt.util.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; @@ -20,23 +27,21 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import tombenpotter.emt.common.command.CommandOutputs; -import tombenpotter.emt.common.init.EntityRegistry; -import tombenpotter.emt.common.init.Registry; -import tombenpotter.emt.common.network.PacketEMTKeys; -import tombenpotter.emt.common.util.*; -import tombenpotter.emt.proxy.CommonProxy; - -@Mod(modid = ModInformation.modid, name = ModInformation.name, version = ModInformation.version, guiFactory = ModInformation.guiFactory, dependencies = ModInformation.depend) +@Mod( + modid = ModInformation.modid, + name = ModInformation.name, + version = ModInformation.version, + guiFactory = ModInformation.guiFactory, + dependencies = ModInformation.depend) public class ElectroMagicTools { - public static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("EMT"); - - @SidedProxy(clientSide = ModInformation.clientProxy, serverSide = ModInformation.commonProxy) + @SidedProxy( + clientSide = ModInformation.clientProxy, + serverSide = ModInformation.commonProxy) public static CommonProxy proxy; - public static CreativeTabs tabEMT = new EMTCreativeTab(ModInformation.modid + ".creativeTab"); public static Logger logger = LogManager.getLogger(ModInformation.name); + public static SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel("EMT"); @Instance(ModInformation.modid) public static ElectroMagicTools instance; @@ -44,43 +49,36 @@ public class ElectroMagicTools { @EventHandler public void preInit(FMLPreInitializationEvent event) { ElectroMagicTools.logger.info("Starting planning the world domination"); - EMTConfigHandler.init(event.getSuggestedConfigurationFile()); FMLCommonHandler.instance().bus().register(new EMTEventHandler()); Registry.register(); EMTEssentiasOutputs.addPrimalOutputs(); EMTEssentiasOutputs.addOutputs(); registerPackets(); - ElectroMagicTools.logger.info("Planning complete"); } @EventHandler public void load(FMLInitializationEvent event) { ElectroMagicTools.logger.info("Gathering allies"); - ElectroMagicTools.logger.info("Loading the proxies"); proxy.load(); ElectroMagicTools.logger.info("Making mobs drop additional items"); MinecraftForge.EVENT_BUS.register(new EMTEventHandler()); ElectroMagicTools.logger.info("Adding dungeon loot"); EMTDungeonChestGenerator.generateLoot(); - ElectroMagicTools.logger.info("Registering entities"); EntityRegistry.registerEMTEntities(); ElectroMagicTools.logger.info("Registering the GUI Handler"); NetworkRegistry.INSTANCE.registerGuiHandler(this, proxy); - ElectroMagicTools.logger.info("Allies gathered."); } @EventHandler public void postInit(FMLPostInitializationEvent event) { ElectroMagicTools.logger.info("Starting the world takeover"); - Registry.registerLate(); - EMTResearch.register(); - + Researches.register(); ElectroMagicTools.logger.info("World takeover complete. Enjoy!"); } diff --git a/src/main/java/emt/ModInformation.java b/src/main/java/emt/ModInformation.java new file mode 100644 index 0000000..2d64472 --- /dev/null +++ b/src/main/java/emt/ModInformation.java @@ -0,0 +1,13 @@ +package emt; + +public class ModInformation { + public static final String name = "Electro-Magic Tools"; + public static final String modid = "EMT"; + public static final String version = "1.2.6"; + public static final String texturePath = "electromagictools"; + public static final String guiFactory = "emt.client.gui.config.EMTGuiFactory"; + public static final String clientProxy = "emt.proxy.ClientProxy"; + public static final String commonProxy = "emt.proxy.CommonProxy"; + public static final String channel = "ElectroMagicTools"; + public static final String depend = "required-after:Thaumcraft ; required-after:IC2"; +} diff --git a/src/main/java/tombenpotter/emt/common/block/BlockBase.java b/src/main/java/emt/block/BlockBase.java similarity index 85% rename from src/main/java/tombenpotter/emt/common/block/BlockBase.java rename to src/main/java/emt/block/BlockBase.java index 5bcefeb..50b0c7b 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockBase.java +++ b/src/main/java/emt/block/BlockBase.java @@ -1,13 +1,13 @@ -package tombenpotter.emt.common.block; +package emt.block; +import emt.ElectroMagicTools; +import emt.ModInformation; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; public abstract class BlockBase extends Block { public final String name; - + public BlockBase(String unlocName, Material material, String textureName, SoundType soundType, float hardness) { super(material); name = unlocName; diff --git a/src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java b/src/main/java/emt/block/BlockBaseContainer.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java rename to src/main/java/emt/block/BlockBaseContainer.java index 55481ef..d0da599 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockBaseContainer.java +++ b/src/main/java/emt/block/BlockBaseContainer.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.block; +package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.tile.TileEntityEMT; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -11,9 +14,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.TileEntityEMT; public abstract class BlockBaseContainer extends BlockContainer { diff --git a/src/main/java/tombenpotter/emt/common/block/BlockElectricCloud.java b/src/main/java/emt/block/BlockElectricCloud.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/block/BlockElectricCloud.java rename to src/main/java/emt/block/BlockElectricCloud.java index f76565e..9c7ff2b 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockElectricCloud.java +++ b/src/main/java/emt/block/BlockElectricCloud.java @@ -1,8 +1,10 @@ -package tombenpotter.emt.common.block; +package emt.block; import java.util.List; import java.util.Random; +import emt.ModInformation; +import emt.tile.TileElectricCloud; import net.minecraft.block.material.Material; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,14 +23,12 @@ import thaumcraft.client.fx.particles.FXWisp; import thaumcraft.common.Thaumcraft; import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; import thaumcraft.common.tiles.TileNitor; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.TileElectricCloud; public class BlockElectricCloud extends BlockBase { public IIcon icon; - + public BlockElectricCloud(String unlocName) { - super(unlocName, Material.cloth, soundTypeCloth, 1); + super(unlocName, Material.cloth, soundTypeCloth, 0.1f); setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f); } @@ -43,27 +43,26 @@ public class BlockElectricCloud extends BlockBase { public TileEntity createTileEntity(World world, int metadata) { return new TileElectricCloud(); } - + @Override public String getUnlocalizedName() { return "tile.EMT." + super.getUnlocalizedName().substring(15); } - + @Override public void registerBlockIcons(IIconRegister ir) { icon = ir.registerIcon(ModInformation.texturePath + ":empty"); } - + @Override public IIcon getIcon(int side, int meta) { return icon; } - - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) - { - return null; - } - + + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + return null; + } + @Override public int getLightValue() { return 15; diff --git a/src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java b/src/main/java/emt/block/BlockEssentiaGenerators.java similarity index 73% rename from src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java rename to src/main/java/emt/block/BlockEssentiaGenerators.java index 7db4413..5f5fca7 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockEssentiaGenerators.java +++ b/src/main/java/emt/block/BlockEssentiaGenerators.java @@ -1,7 +1,9 @@ -package tombenpotter.emt.common.block; +package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ModInformation; +import emt.tile.generator.*; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntitySmokeFX; @@ -11,8 +13,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.generator.*; import java.util.List; import java.util.Random; @@ -61,32 +61,32 @@ public class BlockEssentiaGenerators extends BlockBaseContainer { @Override public TileEntity createTileEntity(World world, int meta) { switch (meta) { - case 0: - return new TileEntityPotentiaGenerator(); - case 1: - return new TileEntityIgnisGenerator(); - case 2: - return new TileEntityAuramGenerator(); - case 3: - return new TileEntityArborGenerator(); - case 4: - return new TileEntityAerGenerator(); + case 0: + return new TileEntityPotentiaGenerator(); + case 1: + return new TileEntityIgnisGenerator(); + case 2: + return new TileEntityAuramGenerator(); + case 3: + return new TileEntityArborGenerator(); + case 4: + return new TileEntityAerGenerator(); } return super.createTileEntity(world, meta); } @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random random) { - TileEntityBaseGenerator te = (TileEntityBaseGenerator)world.getTileEntity(x, y, z); - if(te.isActive){ + TileEntityBaseGenerator te = (TileEntityBaseGenerator) world.getTileEntity(x, y, z); + if (te.isActive) { int color = te.aspect.getColor(); - float r = (float)(color >> 16 & 0xff) / 255F; - float g = (float)(color >> 8 & 0xff) / 255F; - float b = (float)(color & 0xff) / 255F; - - EntitySmokeFX fx = new EntitySmokeFX(world, x + 0.5f, y + 1.1, z + 0.5f, 0, 0.1, 0, 3); - fx.setRBGColorF(r, g, b); - Minecraft.getMinecraft().effectRenderer.addEffect(fx); + float r = (float) (color >> 16 & 0xff) / 255F; + float g = (float) (color >> 8 & 0xff) / 255F; + float b = (float) (color & 0xff) / 255F; + + EntitySmokeFX fx = new EntitySmokeFX(world, x + 0.5f, y + 1.1, z + 0.5f, 0, 0.1, 0, 3); + fx.setRBGColorF(r, g, b); + Minecraft.getMinecraft().effectRenderer.addEffect(fx); } } } diff --git a/src/main/java/tombenpotter/emt/common/block/BlockMachines.java b/src/main/java/emt/block/BlockMachines.java similarity index 92% rename from src/main/java/tombenpotter/emt/common/block/BlockMachines.java rename to src/main/java/emt/block/BlockMachines.java index 49d4fd0..4c8864a 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockMachines.java +++ b/src/main/java/emt/block/BlockMachines.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.block; +package emt.block; import ic2.api.item.IC2Items; @@ -17,12 +17,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.tile.TileEntityEtherealMacerator; +import emt.tile.TileEntityIndustrialWandRecharge; public class BlockMachines extends BlockBaseContainer { @@ -79,12 +79,12 @@ public class BlockMachines extends BlockBaseContainer { return true; } - @Override - public Item getItemDropped(int meta, Random random, int fortune){ - return IC2Items.getItem("machine").getItem(); - } + @Override + public Item getItemDropped(int meta, Random random, int fortune) { + return IC2Items.getItem("machine").getItem(); + } - @Override + @Override public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { dropItems(world, x, y, z); world.removeTileEntity(x, y, z); diff --git a/src/main/java/emt/block/BlockPortableNode.java b/src/main/java/emt/block/BlockPortableNode.java new file mode 100644 index 0000000..b5eb525 --- /dev/null +++ b/src/main/java/emt/block/BlockPortableNode.java @@ -0,0 +1,89 @@ +package emt.block; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.tile.TileEntityPortableNode; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.Explosion; +import net.minecraft.world.World; +import thaumcraft.common.blocks.BlockAiry; + +import java.util.List; +import java.util.Random; + +public class BlockPortableNode extends BlockAiry { + + public IIcon texture; + + public BlockPortableNode(String name) { + this.setCreativeTab(ElectroMagicTools.tabEMT); + setBlockName(ModInformation.modid + "." + name); + setBlockUnbreakable(); + } + + @Override + public TileEntity createTileEntity(World world, int meta) { + return new TileEntityPortableNode(); + } + + @Override + public int quantityDropped(Random par1Random) { + return 0; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + protected boolean canSilkHarvest() { + return false; + } + + public boolean canEntityDestroy(World world, int x, int y, int z, Entity entity) { + return false; + } + + public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { + } + + @SideOnly(Side.CLIENT) + @Override + public void registerBlockIcons(IIconRegister ri) { + texture = ri.registerIcon(ModInformation.texturePath + ":portablenode"); + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return texture; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { + if (!world.isRemote && player.isSneaking() && player.getHeldItem() == null) { + world.setBlockToAir(x, y, z); + world.removeTileEntity(x, y, z); + } + return true; + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return null; + } +} diff --git a/src/main/java/tombenpotter/emt/common/block/BlockShield.java b/src/main/java/emt/block/BlockShield.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/block/BlockShield.java rename to src/main/java/emt/block/BlockShield.java index 761ee02..e228a19 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockShield.java +++ b/src/main/java/emt/block/BlockShield.java @@ -1,7 +1,9 @@ -package tombenpotter.emt.common.block; +package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,8 +12,6 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/block/BlockSolars.java b/src/main/java/emt/block/BlockSolars.java similarity index 85% rename from src/main/java/tombenpotter/emt/common/block/BlockSolars.java rename to src/main/java/emt/block/BlockSolars.java index 2493e0e..a2e3ab2 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockSolars.java +++ b/src/main/java/emt/block/BlockSolars.java @@ -1,7 +1,24 @@ -package tombenpotter.emt.common.block; +package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ModInformation; +import emt.tile.solar.air.TileEntityAirSolar; +import emt.tile.solar.compressed.TileEntityCompressedSolar; +import emt.tile.solar.compressed.TileEntityDoubleCompressedSolar; +import emt.tile.solar.compressed.TileEntityTripleCompressedSolar; +import emt.tile.solar.dark.TileEntityDarkSolar; +import emt.tile.solar.dark.TileEntityDoubleDarkSolar; +import emt.tile.solar.dark.TileEntityTripleDarkSolar; +import emt.tile.solar.fire.TileEntityDoubleFireSolar; +import emt.tile.solar.fire.TileEntityFireSolar; +import emt.tile.solar.fire.TileEntityTripleFireSolar; +import emt.tile.solar.order.TileEntityDoubleOrderSolar; +import emt.tile.solar.order.TileEntityOrderSolar; +import emt.tile.solar.order.TileEntityTripleOrderSolar; +import emt.tile.solar.water.TileEntityDoubleWaterSolar; +import emt.tile.solar.water.TileEntityTripleWaterSolar; +import emt.tile.solar.water.TileEntityWaterSolar; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,23 +27,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.solar.air.TileEntityAirSolar; -import tombenpotter.emt.common.tile.solar.compressed.TileEntityCompressedSolar; -import tombenpotter.emt.common.tile.solar.compressed.TileEntityDoubleCompressedSolar; -import tombenpotter.emt.common.tile.solar.compressed.TileEntityTripleCompressedSolar; -import tombenpotter.emt.common.tile.solar.dark.TileEntityDarkSolar; -import tombenpotter.emt.common.tile.solar.dark.TileEntityDoubleDarkSolar; -import tombenpotter.emt.common.tile.solar.dark.TileEntityTripleDarkSolar; -import tombenpotter.emt.common.tile.solar.fire.TileEntityDoubleFireSolar; -import tombenpotter.emt.common.tile.solar.fire.TileEntityFireSolar; -import tombenpotter.emt.common.tile.solar.fire.TileEntityTripleFireSolar; -import tombenpotter.emt.common.tile.solar.order.TileEntityDoubleOrderSolar; -import tombenpotter.emt.common.tile.solar.order.TileEntityOrderSolar; -import tombenpotter.emt.common.tile.solar.order.TileEntityTripleOrderSolar; -import tombenpotter.emt.common.tile.solar.water.TileEntityDoubleWaterSolar; -import tombenpotter.emt.common.tile.solar.water.TileEntityTripleWaterSolar; -import tombenpotter.emt.common.tile.solar.water.TileEntityWaterSolar; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/block/BlockSolars2.java b/src/main/java/emt/block/BlockSolars2.java similarity index 87% rename from src/main/java/tombenpotter/emt/common/block/BlockSolars2.java rename to src/main/java/emt/block/BlockSolars2.java index d2b3a1b..48914d9 100644 --- a/src/main/java/tombenpotter/emt/common/block/BlockSolars2.java +++ b/src/main/java/emt/block/BlockSolars2.java @@ -1,7 +1,13 @@ -package tombenpotter.emt.common.block; +package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ModInformation; +import emt.tile.solar.air.TileEntityDoubleAirSolar; +import emt.tile.solar.air.TileEntityTripleAirSolar; +import emt.tile.solar.earth.TileEntityDoubleEarthSolar; +import emt.tile.solar.earth.TileEntityEarthSolar; +import emt.tile.solar.earth.TileEntityTripleEarthSolar; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,12 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.solar.air.TileEntityDoubleAirSolar; -import tombenpotter.emt.common.tile.solar.air.TileEntityTripleAirSolar; -import tombenpotter.emt.common.tile.solar.earth.TileEntityDoubleEarthSolar; -import tombenpotter.emt.common.tile.solar.earth.TileEntityEarthSolar; -import tombenpotter.emt.common.tile.solar.earth.TileEntityTripleEarthSolar; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/client/EMTKeys.java b/src/main/java/emt/client/EMTKeys.java similarity index 85% rename from src/main/java/tombenpotter/emt/client/EMTKeys.java rename to src/main/java/emt/client/EMTKeys.java index 0223c23..762745a 100644 --- a/src/main/java/tombenpotter/emt/client/EMTKeys.java +++ b/src/main/java/emt/client/EMTKeys.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.client; +package emt.client; import java.util.HashMap; import java.util.HashSet; @@ -8,8 +8,8 @@ import java.util.Set; import org.lwjgl.input.Keyboard; -import tombenpotter.emt.common.util.EMTTextHelper; import cpw.mods.fml.client.registry.ClientRegistry; +import emt.util.EMTTextHelper; import net.minecraft.client.settings.KeyBinding; public class EMTKeys { diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/emt/client/gui/GuiEtherealMacerator.java similarity index 81% rename from src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java rename to src/main/java/emt/client/gui/GuiEtherealMacerator.java index fd7359a..314b03e 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiEtherealMacerator.java +++ b/src/main/java/emt/client/gui/GuiEtherealMacerator.java @@ -1,14 +1,15 @@ -package tombenpotter.emt.client.gui; +package emt.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.client.gui.container.ContainerEtheralMacerator; -import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.util.EMTTextHelper; + +import emt.ModInformation; +import emt.client.gui.container.ContainerEtheralMacerator; +import emt.tile.TileEntityEtherealMacerator; +import emt.util.EMTTextHelper; public class GuiEtherealMacerator extends GuiContainer { diff --git a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java similarity index 80% rename from src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java rename to src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java index 97c8089..99c72d1 100644 --- a/src/main/java/tombenpotter/emt/client/gui/GuiIndustrialWandRecharger.java +++ b/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java @@ -1,14 +1,15 @@ -package tombenpotter.emt.client.gui; +package emt.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.client.gui.container.ContainerIndustrialWandRecharge; -import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; -import tombenpotter.emt.common.util.EMTTextHelper; + +import emt.ModInformation; +import emt.client.gui.container.ContainerIndustrialWandRecharge; +import emt.tile.TileEntityIndustrialWandRecharge; +import emt.util.EMTTextHelper; public class GuiIndustrialWandRecharger extends GuiContainer { diff --git a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java b/src/main/java/emt/client/gui/config/EMTGuiConfig.java similarity index 89% rename from src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java rename to src/main/java/emt/client/gui/config/EMTGuiConfig.java index 0461523..6a787d1 100644 --- a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiConfig.java +++ b/src/main/java/emt/client/gui/config/EMTGuiConfig.java @@ -1,19 +1,19 @@ -package tombenpotter.emt.client.gui.config; +package emt.client.gui.config; import cpw.mods.fml.client.config.GuiConfig; import cpw.mods.fml.client.config.IConfigElement; +import emt.ModInformation; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; -import tombenpotter.emt.ModInformation; + +import static emt.util.EMTConfigHandler.*; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static tombenpotter.emt.common.util.EMTConfigHandler.*; - public class EMTGuiConfig extends GuiConfig { public EMTGuiConfig(GuiScreen parentScreen) { diff --git a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiFactory.java b/src/main/java/emt/client/gui/config/EMTGuiFactory.java similarity index 93% rename from src/main/java/tombenpotter/emt/client/gui/config/EMTGuiFactory.java rename to src/main/java/emt/client/gui/config/EMTGuiFactory.java index ba527be..5ef75c6 100644 --- a/src/main/java/tombenpotter/emt/client/gui/config/EMTGuiFactory.java +++ b/src/main/java/emt/client/gui/config/EMTGuiFactory.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.client.gui.config; +package emt.client.gui.config; import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java b/src/main/java/emt/client/gui/container/ContainerEtheralMacerator.java similarity index 95% rename from src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java rename to src/main/java/emt/client/gui/container/ContainerEtheralMacerator.java index 08564c3..46d85e7 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerEtheralMacerator.java +++ b/src/main/java/emt/client/gui/container/ContainerEtheralMacerator.java @@ -1,5 +1,6 @@ -package tombenpotter.emt.client.gui.container; +package emt.client.gui.container; +import emt.tile.TileEntityEtherealMacerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -8,7 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntity; import thaumcraft.common.container.SlotOutput; -import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; public class ContainerEtheralMacerator extends Container { diff --git a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java similarity index 93% rename from src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java rename to src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java index 3e64a35..cb7d8db 100644 --- a/src/main/java/tombenpotter/emt/client/gui/container/ContainerIndustrialWandRecharge.java +++ b/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java @@ -1,12 +1,12 @@ -package tombenpotter.emt.client.gui.container; +package emt.client.gui.container; +import emt.tile.TileEntityIndustrialWandRecharge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; -import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; public class ContainerIndustrialWandRecharge extends Container { diff --git a/src/main/java/tombenpotter/emt/client/model/ModelSpecialArmor.java b/src/main/java/emt/client/model/ModelSpecialArmor.java similarity index 99% rename from src/main/java/tombenpotter/emt/client/model/ModelSpecialArmor.java rename to src/main/java/emt/client/model/ModelSpecialArmor.java index bdfde48..6a380f3 100644 --- a/src/main/java/tombenpotter/emt/client/model/ModelSpecialArmor.java +++ b/src/main/java/emt/client/model/ModelSpecialArmor.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.client.model; +package emt.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/client/model/ModelWings.java b/src/main/java/emt/client/model/ModelWings.java similarity index 98% rename from src/main/java/tombenpotter/emt/client/model/ModelWings.java rename to src/main/java/emt/client/model/ModelWings.java index 5ba6d8e..913d637 100644 --- a/src/main/java/tombenpotter/emt/client/model/ModelWings.java +++ b/src/main/java/emt/client/model/ModelWings.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.client.model; +package emt.client.model; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java b/src/main/java/emt/client/renderer/RenderLaser.java similarity index 94% rename from src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java rename to src/main/java/emt/client/renderer/RenderLaser.java index 0878fb4..2edc47d 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderLaser.java +++ b/src/main/java/emt/client/renderer/RenderLaser.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.client.renderer; +package emt.client.renderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -6,8 +6,9 @@ import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.entity.EntityLaser; + +import emt.ModInformation; +import emt.entity.EntityLaser; public class RenderLaser extends Render { diff --git a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java b/src/main/java/emt/client/renderer/RenderShield.java similarity index 80% rename from src/main/java/tombenpotter/emt/client/renderer/RenderShield.java rename to src/main/java/emt/client/renderer/RenderShield.java index 1235c21..c138c2a 100644 --- a/src/main/java/tombenpotter/emt/client/renderer/RenderShield.java +++ b/src/main/java/emt/client/renderer/RenderShield.java @@ -1,8 +1,11 @@ -package tombenpotter.emt.client.renderer; +package emt.client.renderer; -import org.lwjgl.opengl.GL11; +import static org.lwjgl.opengl.GL11.*; import org.lwjgl.opengl.GL12; +import emt.ModInformation; +import emt.entity.EntityLaser; +import emt.entity.EntityShield; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; @@ -10,9 +13,6 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.entity.EntityLaser; -import tombenpotter.emt.common.entity.EntityShield; public class RenderShield extends Render { private static final ResourceLocation shieldTexture = new ResourceLocation(ModInformation.texturePath, "textures/models/shield.png"); @@ -74,27 +74,34 @@ public class RenderShield extends Render { public void doRender(Entity entityShield, double x, double y, double z, float par8, float par9) { this.bindEntityTexture(entityShield); - GL11.glPushMatrix(); Tessellator tessellator = Tessellator.instance; - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GL11.glPushAttrib(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_LIGHTING); + + glEnable(GL_ALPHA_TEST); + glAlphaFunc(GL_GREATER, 0); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glPushAttrib(GL_LIGHTING); + glDisable(GL_LIGHTING); + glDisable(GL_CULL_FACE); + glDisable(GL_DEPTH_TEST); + + glPushMatrix(); if(((EntityShield)entityShield).owner != null && !Minecraft.getMinecraft().thePlayer.getDisplayName().equals(((EntityShield)entityShield).owner.getDisplayName() )) - GL11.glTranslated(x, y, z); + glTranslated(x, y, z); + tessellator.startDrawingQuads(); for (int v = 0; v < values.length; v += 12) { - tessellator.startDrawingQuads(); tessellator.addVertexWithUV(values[v] , values[v + 1] , values[v + 2] , 1, 1); tessellator.addVertexWithUV(values[v + 3] , values[v + 4] , values[v + 5] , 1, 0); tessellator.addVertexWithUV(values[v + 6] , values[v + 7] , values[v + 8] , 0, 0); tessellator.addVertexWithUV(values[v + 9] , values[v + 10], values[v + 11], 0, 1); - tessellator.draw(); } + tessellator.draw(); - GL11.glPopAttrib(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); + glPopMatrix(); + glPopAttrib(); + glDisable(GL12.GL_RESCALE_NORMAL); + glEnable(GL_DEPTH_TEST); } @Override diff --git a/src/main/java/tombenpotter/emt/common/command/CommandOutputs.java b/src/main/java/emt/command/CommandOutputs.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/command/CommandOutputs.java rename to src/main/java/emt/command/CommandOutputs.java index 75c8bb2..0b02bc2 100644 --- a/src/main/java/tombenpotter/emt/common/command/CommandOutputs.java +++ b/src/main/java/emt/command/CommandOutputs.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.command; +package emt.command; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; @@ -9,12 +9,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.EMTEssentiasOutputs; -import tombenpotter.emt.common.util.EMTTextHelper; import java.util.Collection; import java.util.List; +import emt.util.EMTEssentiasOutputs; +import emt.util.EMTTextHelper; + public class CommandOutputs extends CommandBase { public String text; diff --git a/src/main/java/tombenpotter/emt/common/entity/EntityArcher.java b/src/main/java/emt/entity/EntityArcher.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/entity/EntityArcher.java rename to src/main/java/emt/entity/EntityArcher.java index 33dcfc4..1404690 100644 --- a/src/main/java/tombenpotter/emt/common/entity/EntityArcher.java +++ b/src/main/java/emt/entity/EntityArcher.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.entity; +package emt.entity; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/src/main/java/tombenpotter/emt/common/entity/EntityLaser.java b/src/main/java/emt/entity/EntityLaser.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/entity/EntityLaser.java rename to src/main/java/emt/entity/EntityLaser.java index 1e66724..621b48d 100644 --- a/src/main/java/tombenpotter/emt/common/entity/EntityLaser.java +++ b/src/main/java/emt/entity/EntityLaser.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.entity; +package emt.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tombenpotter/emt/common/entity/EntityShield.java b/src/main/java/emt/entity/EntityShield.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/entity/EntityShield.java rename to src/main/java/emt/entity/EntityShield.java index e90124e..e06ec3d 100644 --- a/src/main/java/tombenpotter/emt/common/entity/EntityShield.java +++ b/src/main/java/emt/entity/EntityShield.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.entity; +package emt.entity; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java b/src/main/java/emt/init/BlockRegistry.java similarity index 78% rename from src/main/java/tombenpotter/emt/common/init/BlockRegistry.java rename to src/main/java/emt/init/BlockRegistry.java index fa5a027..2294399 100644 --- a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java +++ b/src/main/java/emt/init/BlockRegistry.java @@ -1,6 +1,20 @@ -package tombenpotter.emt.common.init; +package emt.init; import cpw.mods.fml.common.registry.GameRegistry; +import emt.ModInformation; +import emt.block.BlockElectricCloud; +import emt.block.BlockEssentiaGenerators; +import emt.block.BlockMachines; +import emt.block.BlockPortableNode; +import emt.block.BlockShield; +import emt.block.BlockSolars; +import emt.block.BlockSolars2; +import emt.item.block.ItemBlockElectricCloud; +import emt.item.block.ItemBlockEssentiaGenerator; +import emt.item.block.ItemBlockEssentiaGenerators; +import emt.item.block.ItemBlockMachines; +import emt.item.block.ItemBlockSolars; +import emt.item.block.ItemBlockSolars2; import ic2.api.item.IC2Items; import net.minecraft.block.Block; import net.minecraft.block.Block.SoundType; @@ -10,24 +24,10 @@ import net.minecraft.item.ItemStack; import static thaumcraft.api.ThaumcraftApi.*; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.block.BlockMachines; -import tombenpotter.emt.common.block.BlockSolars; -import tombenpotter.emt.common.block.BlockSolars2; -import tombenpotter.emt.common.block.BlockElectricCloud; -import tombenpotter.emt.common.block.BlockEssentiaGenerators; -import tombenpotter.emt.common.block.BlockPortableNode; -import tombenpotter.emt.common.block.BlockShield; -import tombenpotter.emt.common.item.block.ItemBlockMachines; -import tombenpotter.emt.common.item.block.ItemBlockSolars; -import tombenpotter.emt.common.item.block.ItemBlockSolars2; -import tombenpotter.emt.common.item.block.ItemBlockElectricCloud; -import tombenpotter.emt.common.item.block.ItemBlockEssentiaGenerator; -import tombenpotter.emt.common.item.block.ItemBlockEssentiaGenerators; public class BlockRegistry { - public static Block portableNode, essentiaGens, shield, emtSolars, emtMachines, emtSolars2, electrum; + public static Block portableNode, essentiaGens, shield, emtSolars, emtMachines, emtSolars2, electricCloud; public static void registerBlocks() { portableNode = new BlockPortableNode("portablenode"); @@ -48,8 +48,8 @@ public class BlockRegistry { essentiaGens = new BlockEssentiaGenerators("essentia"); GameRegistry.registerBlock(essentiaGens, ItemBlockEssentiaGenerators.class, "EssentiaGenerators"); - electrum = new BlockElectricCloud("electricCloud"); - GameRegistry.registerBlock(electrum, ItemBlockElectricCloud.class, "electricCloud"); + electricCloud = new BlockElectricCloud("electricCloud"); + GameRegistry.registerBlock(electricCloud, ItemBlockElectricCloud.class, "electricCloud"); } public static void addAspects() { diff --git a/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java b/src/main/java/emt/init/EntityRegistry.java similarity index 84% rename from src/main/java/tombenpotter/emt/common/init/EntityRegistry.java rename to src/main/java/emt/init/EntityRegistry.java index a7476bc..4054c46 100644 --- a/src/main/java/tombenpotter/emt/common/init/EntityRegistry.java +++ b/src/main/java/emt/init/EntityRegistry.java @@ -1,13 +1,13 @@ -package tombenpotter.emt.common.init; +package emt.init; +import emt.ElectroMagicTools; +import emt.entity.EntityArcher; +import emt.entity.EntityLaser; +import emt.entity.EntityShield; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList.EntityEggInfo; import net.minecraft.entity.EntityLiving; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.entity.EntityArcher; -import tombenpotter.emt.common.entity.EntityLaser; -import tombenpotter.emt.common.entity.EntityShield; public class EntityRegistry { diff --git a/src/main/java/tombenpotter/emt/common/init/ItemRegistry.java b/src/main/java/emt/init/ItemRegistry.java similarity index 77% rename from src/main/java/tombenpotter/emt/common/init/ItemRegistry.java rename to src/main/java/emt/init/ItemRegistry.java index fe8e35c..3d81c70 100644 --- a/src/main/java/tombenpotter/emt/common/init/ItemRegistry.java +++ b/src/main/java/emt/init/ItemRegistry.java @@ -1,7 +1,41 @@ -package tombenpotter.emt.common.init; +package emt.init; import ic2.core.init.InternalName; import cpw.mods.fml.common.registry.GameRegistry; +import emt.ModInformation; +import emt.item.ItemElectricScribingTools; +import emt.item.ItemIC2Baubles; +import emt.item.ItemMaterials; +import emt.item.ItemOneRing; +import emt.item.armor.boots.ItemElectricBootsTraveller; +import emt.item.armor.boots.ItemNanoBootsTraveller; +import emt.item.armor.boots.ItemQuantumBootsTraveller; +import emt.item.armor.chestplate.ItemInfusedQuantumChestplate; +import emt.item.armor.goggles.ItemElectricGoggles; +import emt.item.armor.goggles.ItemNanoGoggles; +import emt.item.armor.goggles.ItemQuantumGoggles; +import emt.item.armor.goggles.ItemSolarHelmetRevealing; +import emt.item.armor.wings.ItemFeatherWing; +import emt.item.armor.wings.ItemNanoWing; +import emt.item.armor.wings.ItemQuantumWing; +import emt.item.armor.wings.ItemThaumiumReinforcedWing; +import emt.item.focus.ItemChargeFocus; +import emt.item.focus.ItemChristmasFocus; +import emt.item.focus.ItemExplosionFocus; +import emt.item.focus.ItemShieldFocus; +import emt.item.focus.ItemWandChargingFocus; +import emt.item.tool.ItemElectricHoeGrowth; +import emt.item.tool.ItemElectricThorHammer; +import emt.item.tool.ItemThorHammer; +import emt.item.tool.ItemThorHammerBroken; +import emt.item.tool.chainsaw.ItemDiamondChainsaw; +import emt.item.tool.chainsaw.ItemStreamChainsaw; +import emt.item.tool.chainsaw.ItemThaumiumChainsaw; +import emt.item.tool.drill.ItemRockbreakerDrill; +import emt.item.tool.drill.ItemThaumiumDrill; +import emt.item.tool.omnitool.ItemOmnitoolDiamond; +import emt.item.tool.omnitool.ItemOmnitoolIron; +import emt.item.tool.omnitool.ItemOmnitoolThaumium; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -10,40 +44,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApi; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.item.ItemElectricScribingTools; -import tombenpotter.emt.common.item.ItemIC2Baubles; -import tombenpotter.emt.common.item.ItemMaterials; -import tombenpotter.emt.common.item.ItemOneRing; -import tombenpotter.emt.common.item.armor.boots.ItemElectricBootsTraveller; -import tombenpotter.emt.common.item.armor.boots.ItemNanoBootsTraveller; -import tombenpotter.emt.common.item.armor.boots.ItemQuantumBootsTraveller; -import tombenpotter.emt.common.item.armor.chestplate.ItemInfusedQuantumChestplate; -import tombenpotter.emt.common.item.armor.goggles.ItemElectricGoggles; -import tombenpotter.emt.common.item.armor.goggles.ItemNanoGoggles; -import tombenpotter.emt.common.item.armor.goggles.ItemQuantumGoggles; -import tombenpotter.emt.common.item.armor.goggles.ItemSolarHelmetRevealing; -import tombenpotter.emt.common.item.armor.wings.ItemFeatherWing; -import tombenpotter.emt.common.item.armor.wings.ItemNanoWing; -import tombenpotter.emt.common.item.armor.wings.ItemQuantumWing; -import tombenpotter.emt.common.item.armor.wings.ItemThaumiumReinforcedWing; -import tombenpotter.emt.common.item.focus.ItemChargeFocus; -import tombenpotter.emt.common.item.focus.ItemChristmasFocus; -import tombenpotter.emt.common.item.focus.ItemExplosionFocus; -import tombenpotter.emt.common.item.focus.ItemShieldFocus; -import tombenpotter.emt.common.item.focus.ItemWandChargingFocus; -import tombenpotter.emt.common.item.tool.ItemElectricHoeGrowth; -import tombenpotter.emt.common.item.tool.ItemElectricThorHammer; -import tombenpotter.emt.common.item.tool.ItemThorHammer; -import tombenpotter.emt.common.item.tool.ItemThorHammerBroken; -import tombenpotter.emt.common.item.tool.chainsaw.ItemDiamondChainsaw; -import tombenpotter.emt.common.item.tool.chainsaw.ItemStreamChainsaw; -import tombenpotter.emt.common.item.tool.chainsaw.ItemThaumiumChainsaw; -import tombenpotter.emt.common.item.tool.drill.ItemRockbreakerDrill; -import tombenpotter.emt.common.item.tool.drill.ItemThaumiumDrill; -import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolDiamond; -import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolIron; -import tombenpotter.emt.common.item.tool.omnitool.ItemOmnitoolThaumium; public class ItemRegistry { diff --git a/src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java b/src/main/java/emt/init/RecipeRegistry.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java rename to src/main/java/emt/init/RecipeRegistry.java index 2008377..c485339 100644 --- a/src/main/java/tombenpotter/emt/common/init/RecipeRegistry.java +++ b/src/main/java/emt/init/RecipeRegistry.java @@ -1,7 +1,11 @@ -package tombenpotter.emt.common.init; +package emt.init; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import emt.ElectroMagicTools; +import emt.util.EMTConfigHandler; +import emt.util.EMTCraftingAspects; +import emt.util.EMTRandomHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IC2Items; import ic2.api.recipe.IRecipeInput; @@ -30,10 +34,6 @@ import thaumcraft.common.blocks.ItemJarFilled; import thaumcraft.common.blocks.ItemJarNode; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTCraftingAspects; -import tombenpotter.emt.common.util.EMTRandomHelper; import java.util.Iterator; diff --git a/src/main/java/tombenpotter/emt/common/init/Registry.java b/src/main/java/emt/init/Registry.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/init/Registry.java rename to src/main/java/emt/init/Registry.java index 79ae984..308db43 100644 --- a/src/main/java/tombenpotter/emt/common/init/Registry.java +++ b/src/main/java/emt/init/Registry.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.init; +package emt.init; public class Registry { public static void register() { diff --git a/src/main/java/emt/init/Researches.java b/src/main/java/emt/init/Researches.java new file mode 100644 index 0000000..ceede49 --- /dev/null +++ b/src/main/java/emt/init/Researches.java @@ -0,0 +1,286 @@ +package emt.init; + +import emt.ModInformation; +import emt.client.EMTKeys; +import emt.util.EMTConfigHandler; +import emt.util.EMTResearchAspects; +import emt.util.EMTResearchItem; +import ic2.api.item.IC2Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; + +public class Researches { + public static void register() { + addResearchTab(); + addResearch(); + } + + public static void addResearchTab() { + ResourceLocation background = new ResourceLocation(ModInformation.texturePath, "textures/misc/background.png"); + ResearchCategories.registerCategory("EMT", new ResourceLocation("electromagictools:textures/misc/emt.png"), background); + } + + public static void addResearch() { + /** Research that can't be disabled **/ + new EMTResearchItem("Electric Magic Tools", 0, 0, 0, new ResourceLocation("electromagictools:textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("Diamond Chainsaw", 5, -6, 0, new ItemStack(ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.diamondChainsaw)); + new EMTResearchItem("Thaumium Plate", 6, -6, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumPlate)); + new EMTResearchItem("Macerating Native Ore Clusters", 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("The Legend", 5, -5, 0, new ItemStack(ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("Lightning Summoner", 6, -5, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("The One Ring", 6, -7, 0, new ItemStack(ItemRegistry.onering)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("")); + new EMTResearchItem("Electric Cloud", 4, -7, 0, new ItemStack(BlockRegistry.electricCloud)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage("2")); + new EMTResearchItem("Feather Wings", 0, 2, 0, new ItemStack(ItemRegistry.featherWing)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(RecipeRegistry.cardboard), new ResearchPage(RecipeRegistry.featherWing), new ResearchPage(RecipeRegistry.featherWings)); + + /** Research that can be disabled **/ + if (!EMTConfigHandler.thaumiumDrillResearch) { + new EMTResearchItem("Thaumium Drill", EMTResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumDrill)); + } + + if (!EMTConfigHandler.thaumiumChainsawResearch) { + new EMTResearchItem("Thaumium Chainsaw", EMTResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumChainsaw)); + } + + if (!EMTConfigHandler.electricGooglesResearch) { + new EMTResearchItem("Electric Goggles", EMTResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.electricGoggles)); + } + + if (!EMTConfigHandler.electricGooglesResearch) { + if (!EMTConfigHandler.nanoGooglesResearch) { + ; + new EMTResearchItem("Nanosuit Goggles of Revealing", EMTResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumicNanoHelmet)); + } + } + + if (!EMTConfigHandler.electricGooglesResearch) { + if (!EMTConfigHandler.nanoGooglesResearch) { + if (!EMTConfigHandler.quantumGooglesResearch) { + new EMTResearchItem("Quantum Goggles of Revealing", EMTResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumicQuantumHelmet)); + } + } + } + + if (!EMTConfigHandler.ironOmnitoolResearch) { + new EMTResearchItem("Iron Omnitool", -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.ironOmnitool)); + } + + if (!EMTConfigHandler.ironOmnitoolResearch) { + if (!EMTConfigHandler.diamondOmnitoolResearch) { + new EMTResearchItem("Diamond Omnitool", EMTResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Iron Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.diamondOmnitool), new ResearchPage(RecipeRegistry.ironOmnitoolToDiamond)); + } + } + + if (!EMTConfigHandler.thaumiumDrillResearch && !EMTConfigHandler.thaumiumChainsawResearch) { + if (!EMTConfigHandler.thaumiumOmnitoolResearch) { + new EMTResearchItem("Thaumium Omnitool", EMTResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumOmnitool), + new ResearchPage(RecipeRegistry.diamondOmnitoolToThaumium)); + } + } + + if (!EMTConfigHandler.explosionFocusResearch) { + new EMTResearchItem("Explosion Focus", EMTResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.explosionFocus)); + } + + if (!EMTConfigHandler.christmasFocusResearch) { + new EMTResearchItem("Kris-tmas Focus", EMTResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.christmasFocus)); + } + + if (!EMTConfigHandler.shieldFocusResearch) { + new EMTResearchItem("Shield Focus", EMTResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.shieldFocus)); + } + + if (!EMTConfigHandler.shieldFocusResearch) { + if (!EMTConfigHandler.shieldBlockResearch) { + new EMTResearchItem("Shield Block", EMTResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.shieldBlock)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + new EMTResearchItem("Potentia Generator", EMTResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.potentiaGenerator)); + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.ignisGeneratorResearch) { + new EMTResearchItem("Ignis Generator", EMTResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.ignisGenerator)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.auramGeneratorResearch) { + new EMTResearchItem("Auram Generator", EMTResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.auramGenerator)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.arborGeneratorResearch) { + new EMTResearchItem("Arbor Generator", EMTResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.arborGenerator)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.aerGeneratorResearch) { + new EMTResearchItem("Aer Generator", EMTResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.aerGenerator)); + } + } + + if (!EMTConfigHandler.potentiaGeneratorResearch) { + if (!EMTConfigHandler.wandChargingSationResearch) { + new EMTResearchItem("Industrial Wand Charging Station", EMTResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.wandRecharger)); + } + } + + if (!EMTConfigHandler.thaumiumChainsawResearch) { + if (!EMTConfigHandler.streamChainsawResearch) { + new EMTResearchItem("Chainsaw of the Stream", EMTResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.streamChainsaw)); + } + } + + if (!EMTConfigHandler.thaumiumDrillResearch) { + if (!EMTConfigHandler.rockbreakerDrillResearch) { + new EMTResearchItem("Drill of the Rockbreaker", EMTResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.rockbreakerDrill)); + } + } + + if (!EMTConfigHandler.tinyUraniumResearch) { + new EMTResearchItem("Tiny Uranium", EMTResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.tinyUranium)); + } + + if (!EMTConfigHandler.thorHammerResearch) { + new EMTResearchItem("Mjolnir", EMTResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thorHammer)); + } + + if (!EMTConfigHandler.thorHammerResearch) { + if (!EMTConfigHandler.superchargedThorHammerResearch) { + new EMTResearchItem("Supercharged Mjolnir", EMTResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.superchargedThorHammer)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + new EMTResearchItem("Compressed Solars", EMTResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.compressedSolar), new ResearchPage(RecipeRegistry.doubleCompressedSolar), + new ResearchPage(RecipeRegistry.tripleCompressedSolar)); + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.solarHelmetResearch) { + new EMTResearchItem("Solar Helmet of Revealing", EMTResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.solarHelmetRevealing)); + } + } + + if (!EMTConfigHandler.electricBootsResearch) { + new EMTResearchItem("Electric Boots of the Traveller", EMTResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.electricBootsTravel)); + } + + if (!EMTConfigHandler.electricBootsResearch) { + if (!EMTConfigHandler.nanoBootsResearch) { + new EMTResearchItem("Nano Boots of the Traveller", EMTResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.nanoBootsTravel)); + } + } + + if (!EMTConfigHandler.electricBootsResearch) { + if (!EMTConfigHandler.nanoBootsResearch) { + if (!EMTConfigHandler.quantumBootsResearch) { + new EMTResearchItem("Quantum Boots of the Traveller", EMTResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.quantumBootsTravel)); + } + } + } + + if (!EMTConfigHandler.electricScribingToolsResearch) { + new EMTResearchItem("Electric Scribing Tools", EMTResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.electricScribingTools)); + } + + if (!EMTConfigHandler.etherealProcessorResearch) { + new EMTResearchItem("Etheral Processor", EMTResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.etheralProcessor)); + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.waterSolarsResearch) { + new EMTResearchItem("Water Infused Solar Panels", EMTResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.waterSolar), new ResearchPage(RecipeRegistry.doubleWaterSolar), + new ResearchPage(RecipeRegistry.tripleWaterSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.darkSolarsResearch) { + new EMTResearchItem("Entropy Infused Solar Panels", EMTResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.darkSolar), new ResearchPage(RecipeRegistry.doubleDarkSolar), + new ResearchPage(RecipeRegistry.tripleDarkSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.orderSolarsResearch) { + new EMTResearchItem("Order Infused Solar Panels", EMTResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.orderSolar), new ResearchPage(RecipeRegistry.doubleOrderSolar), + new ResearchPage(RecipeRegistry.tripleOrderSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.fireSolarsResearch) { + new EMTResearchItem("Fire Infused Solar Panels", EMTResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.fireSolar), new ResearchPage(RecipeRegistry.doubleFireSolar), + new ResearchPage(RecipeRegistry.tripleFireSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.airSolarsResearch) { + new EMTResearchItem("Air Infused Solar Panels", EMTResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.airSolar), new ResearchPage(RecipeRegistry.doubleAirSolar), new ResearchPage(RecipeRegistry.tripleAirSolar)); + } + } + + if (!EMTConfigHandler.compressedSolarsResearch) { + if (!EMTConfigHandler.earthSolarsResearch) { + new EMTResearchItem("Earth Infused Solar Panels", EMTResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.earthSolar), new ResearchPage(RecipeRegistry.doubleEarthSolar), + new ResearchPage(RecipeRegistry.tripleEarthSolar)); + } + } + + if (!EMTConfigHandler.uuMInfusionResearch) { + new EMTResearchItem("UU-Matter Infusion", EMTResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.uuMCrystal), new ResearchPage(RecipeRegistry.charcoalToCoal), + new ResearchPage(RecipeRegistry.glowstoneDustToBlock), new ResearchPage(RecipeRegistry.stoneBricksToIronOre), new ResearchPage(RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(RecipeRegistry.amberBlockToLeadOre), new ResearchPage(RecipeRegistry.amberBricksToUraniumOre), + new ResearchPage(RecipeRegistry.shardToResin), new ResearchPage(RecipeRegistry.shardToRedstone), new ResearchPage(RecipeRegistry.shardToLapis), new ResearchPage(RecipeRegistry.ironToGold), new ResearchPage(RecipeRegistry.goldToDiamond), new ResearchPage(RecipeRegistry.diamondToUranium), new ResearchPage(RecipeRegistry.uraniumToIridium)); + } + + if (!EMTConfigHandler.portableNodeResarch) { + new EMTResearchItem("Portable Node", EMTResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.portableNode)); + } + + if (!EMTConfigHandler.electricHoeGrowthResearch) { + new EMTResearchItem("Electric Hoe of Growth", EMTResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.electricHoeGrowth)); + } + + if (!EMTConfigHandler.chargeFocusResearch) { + new EMTResearchItem("Wand Focus: Charging", EMTResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.chargeFocus)); + } + + if (!EMTConfigHandler.wandChargeFocusResearch) { + new EMTResearchItem("Wand Focus: Wand Charging", EMTResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.wandChargeFocus)); + } + + if (!EMTConfigHandler.inventoryChargingRing) { + new EMTResearchItem("Inventory Charging Ring", EMTResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.inventoryChargingRing)); + } + + if (!EMTConfigHandler.armorChargingRing) { + new EMTResearchItem("Armor Charging Ring", EMTResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.armorChargingRing)); + } + + if (!EMTConfigHandler.thaumiumWingResearch) { + new EMTResearchItem("Thaumium Reinforced Wings", EMTResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.thaumiumWing), new ResearchPage(RecipeRegistry.thaumiumWings)); + } + + if (!EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.thaumiumWingResearch) { + new EMTResearchItem("Nanosuit Wings", EMTResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.nanoWings)); + } + + if (!EMTConfigHandler.quantumWingsResearch && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch) { + new EMTResearchItem("Quantum Wings", EMTResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.quantumWings)); + } + + if (!EMTConfigHandler.infusedQuantumChestplate && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.quantumWingsResearch) { + new EMTResearchItem("Infused Quantum Armor", EMTResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem().setPages(new ResearchPage(""), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); + } + } +} diff --git a/src/main/java/tombenpotter/emt/common/init/TileRegistry.java b/src/main/java/emt/init/TileRegistry.java similarity index 57% rename from src/main/java/tombenpotter/emt/common/init/TileRegistry.java rename to src/main/java/emt/init/TileRegistry.java index fd8b789..ca49fc3 100644 --- a/src/main/java/tombenpotter/emt/common/init/TileRegistry.java +++ b/src/main/java/emt/init/TileRegistry.java @@ -1,36 +1,36 @@ -package tombenpotter.emt.common.init; +package emt.init; -import tombenpotter.emt.common.tile.TileElectricCloud; -import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; -import tombenpotter.emt.common.tile.TileEntityPortableNode; -import tombenpotter.emt.common.tile.generator.TileEntityAerGenerator; -import tombenpotter.emt.common.tile.generator.TileEntityArborGenerator; -import tombenpotter.emt.common.tile.generator.TileEntityAuramGenerator; -import tombenpotter.emt.common.tile.generator.TileEntityIgnisGenerator; -import tombenpotter.emt.common.tile.generator.TileEntityPotentiaGenerator; -import tombenpotter.emt.common.tile.solar.air.TileEntityAirSolar; -import tombenpotter.emt.common.tile.solar.air.TileEntityDoubleAirSolar; -import tombenpotter.emt.common.tile.solar.air.TileEntityTripleAirSolar; -import tombenpotter.emt.common.tile.solar.compressed.TileEntityCompressedSolar; -import tombenpotter.emt.common.tile.solar.compressed.TileEntityDoubleCompressedSolar; -import tombenpotter.emt.common.tile.solar.compressed.TileEntityTripleCompressedSolar; -import tombenpotter.emt.common.tile.solar.dark.TileEntityDarkSolar; -import tombenpotter.emt.common.tile.solar.dark.TileEntityDoubleDarkSolar; -import tombenpotter.emt.common.tile.solar.dark.TileEntityTripleDarkSolar; -import tombenpotter.emt.common.tile.solar.earth.TileEntityDoubleEarthSolar; -import tombenpotter.emt.common.tile.solar.earth.TileEntityEarthSolar; -import tombenpotter.emt.common.tile.solar.earth.TileEntityTripleEarthSolar; -import tombenpotter.emt.common.tile.solar.fire.TileEntityDoubleFireSolar; -import tombenpotter.emt.common.tile.solar.fire.TileEntityFireSolar; -import tombenpotter.emt.common.tile.solar.fire.TileEntityTripleFireSolar; -import tombenpotter.emt.common.tile.solar.order.TileEntityDoubleOrderSolar; -import tombenpotter.emt.common.tile.solar.order.TileEntityOrderSolar; -import tombenpotter.emt.common.tile.solar.order.TileEntityTripleOrderSolar; -import tombenpotter.emt.common.tile.solar.water.TileEntityDoubleWaterSolar; -import tombenpotter.emt.common.tile.solar.water.TileEntityTripleWaterSolar; -import tombenpotter.emt.common.tile.solar.water.TileEntityWaterSolar; import cpw.mods.fml.common.registry.GameRegistry; +import emt.tile.TileElectricCloud; +import emt.tile.TileEntityEtherealMacerator; +import emt.tile.TileEntityIndustrialWandRecharge; +import emt.tile.TileEntityPortableNode; +import emt.tile.generator.TileEntityAerGenerator; +import emt.tile.generator.TileEntityArborGenerator; +import emt.tile.generator.TileEntityAuramGenerator; +import emt.tile.generator.TileEntityIgnisGenerator; +import emt.tile.generator.TileEntityPotentiaGenerator; +import emt.tile.solar.air.TileEntityAirSolar; +import emt.tile.solar.air.TileEntityDoubleAirSolar; +import emt.tile.solar.air.TileEntityTripleAirSolar; +import emt.tile.solar.compressed.TileEntityCompressedSolar; +import emt.tile.solar.compressed.TileEntityDoubleCompressedSolar; +import emt.tile.solar.compressed.TileEntityTripleCompressedSolar; +import emt.tile.solar.dark.TileEntityDarkSolar; +import emt.tile.solar.dark.TileEntityDoubleDarkSolar; +import emt.tile.solar.dark.TileEntityTripleDarkSolar; +import emt.tile.solar.earth.TileEntityDoubleEarthSolar; +import emt.tile.solar.earth.TileEntityEarthSolar; +import emt.tile.solar.earth.TileEntityTripleEarthSolar; +import emt.tile.solar.fire.TileEntityDoubleFireSolar; +import emt.tile.solar.fire.TileEntityFireSolar; +import emt.tile.solar.fire.TileEntityTripleFireSolar; +import emt.tile.solar.order.TileEntityDoubleOrderSolar; +import emt.tile.solar.order.TileEntityOrderSolar; +import emt.tile.solar.order.TileEntityTripleOrderSolar; +import emt.tile.solar.water.TileEntityDoubleWaterSolar; +import emt.tile.solar.water.TileEntityTripleWaterSolar; +import emt.tile.solar.water.TileEntityWaterSolar; public class TileRegistry { diff --git a/src/main/java/tombenpotter/emt/common/item/ItemBase.java b/src/main/java/emt/item/ItemBase.java similarity index 59% rename from src/main/java/tombenpotter/emt/common/item/ItemBase.java rename to src/main/java/emt/item/ItemBase.java index d36a742..13e1d7b 100644 --- a/src/main/java/tombenpotter/emt/common/item/ItemBase.java +++ b/src/main/java/emt/item/ItemBase.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.item; +package emt.item; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTTextHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTTextHelper; public class ItemBase extends Item { @@ -21,8 +21,8 @@ public class ItemBase extends Item { setUnlocalizedName(ModInformation.modid + ".item." + unlocName); setCreativeTab(ElectroMagicTools.tabEMT); } - - public String getItemStackDisplayName(ItemStack stack){ - return (EMTTextHelper.GREEN + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim(); - } + + public String getItemStackDisplayName(ItemStack stack) { + return (EMTTextHelper.GREEN + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim(); + } } diff --git a/src/main/java/tombenpotter/emt/common/item/ItemElectricScribingTools.java b/src/main/java/emt/item/ItemElectricScribingTools.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/item/ItemElectricScribingTools.java rename to src/main/java/emt/item/ItemElectricScribingTools.java index 4012e5e..2a47804 100644 --- a/src/main/java/tombenpotter/emt/common/item/ItemElectricScribingTools.java +++ b/src/main/java/emt/item/ItemElectricScribingTools.java @@ -1,7 +1,8 @@ -package tombenpotter.emt.common.item; +package emt.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.creativetab.CreativeTabs; @@ -9,7 +10,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import thaumcraft.api.IScribeTools; import thaumcraft.common.items.ItemInkwell; -import tombenpotter.emt.ElectroMagicTools; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/ItemIC2Baubles.java b/src/main/java/emt/item/ItemIC2Baubles.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/item/ItemIC2Baubles.java rename to src/main/java/emt/item/ItemIC2Baubles.java index 4edd6db..8f17d00 100644 --- a/src/main/java/tombenpotter/emt/common/item/ItemIC2Baubles.java +++ b/src/main/java/emt/item/ItemIC2Baubles.java @@ -1,9 +1,11 @@ -package tombenpotter.emt.common.item; +package emt.item; import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,8 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.List; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/item/ItemMaterials.java b/src/main/java/emt/item/ItemMaterials.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/item/ItemMaterials.java rename to src/main/java/emt/item/ItemMaterials.java index 8cacc48..4d90105 100644 --- a/src/main/java/tombenpotter/emt/common/item/ItemMaterials.java +++ b/src/main/java/emt/item/ItemMaterials.java @@ -1,7 +1,9 @@ -package tombenpotter.emt.common.item; +package emt.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -24,8 +26,6 @@ import net.minecraftforge.event.entity.player.ArrowNockEvent; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.Config; import thaumcraft.common.lib.utils.InventoryUtils; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/ItemOneRing.java b/src/main/java/emt/item/ItemOneRing.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/item/ItemOneRing.java rename to src/main/java/emt/item/ItemOneRing.java index 1386d2a..77939d2 100644 --- a/src/main/java/tombenpotter/emt/common/item/ItemOneRing.java +++ b/src/main/java/emt/item/ItemOneRing.java @@ -1,9 +1,11 @@ -package tombenpotter.emt.common.item; +package emt.item; import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ModInformation; +import emt.util.EMTTextHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -16,8 +18,6 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; import java.util.Random; diff --git a/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/item/armor/boots/ItemElectricBootsTraveller.java rename to src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index f4da14d..bdea318 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -1,8 +1,12 @@ -package tombenpotter.emt.common.item.armor.boots; +package emt.item.armor.boots; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; @@ -24,10 +28,6 @@ import net.minecraftforge.event.entity.living.LivingFallEvent; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.Thaumcraft; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemNanoBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java similarity index 86% rename from src/main/java/tombenpotter/emt/common/item/armor/boots/ItemNanoBootsTraveller.java rename to src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java index 82bcc45..982f747 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemNanoBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemNanoBootsTraveller.java @@ -1,12 +1,12 @@ -package tombenpotter.emt.common.item.armor.boots; +package emt.item.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemNanoBootsTraveller extends ItemElectricBootsTraveller { diff --git a/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemQuantumBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java similarity index 86% rename from src/main/java/tombenpotter/emt/common/item/armor/boots/ItemQuantumBootsTraveller.java rename to src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java index c269081..6bc84b3 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/boots/ItemQuantumBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemQuantumBootsTraveller.java @@ -1,12 +1,12 @@ -package tombenpotter.emt.common.item.armor.boots; +package emt.item.armor.boots; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemQuantumBootsTraveller extends ItemElectricBootsTraveller { diff --git a/src/main/java/tombenpotter/emt/common/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/item/armor/chestplate/ItemInfusedQuantumChestplate.java rename to src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 5c6f952..7cea71b 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -1,9 +1,19 @@ -package tombenpotter.emt.common.item.armor.chestplate; +package emt.item.armor.chestplate; import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.client.model.ModelSpecialArmor; +import emt.client.model.ModelWings; +import emt.init.ItemRegistry; +import emt.item.armor.wings.ItemNanoWing; +import emt.item.armor.wings.ItemQuantumWing; +import emt.util.EMTConfigHandler; +import emt.util.EMTRandomHelper; +import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IC2Items; import ic2.api.item.IElectricItemManager; @@ -30,16 +40,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.client.model.ModelSpecialArmor; -import tombenpotter.emt.client.model.ModelWings; -import tombenpotter.emt.common.init.ItemRegistry; -import tombenpotter.emt.common.item.armor.wings.ItemNanoWing; -import tombenpotter.emt.common.item.armor.wings.ItemQuantumWing; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTRandomHelper; -import tombenpotter.emt.common.util.EMTTextHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemElectricGoggles.java rename to src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index 443e98d..a9d141b 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -1,7 +1,11 @@ -package tombenpotter.emt.common.item.armor.goggles; +package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; @@ -20,10 +24,6 @@ import thaumcraft.api.IGoggles; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.nodes.IRevealer; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemNanoGoggles.java b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemNanoGoggles.java rename to src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java index 7349e78..650205f 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.armor.goggles; +package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -11,9 +14,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemNanoGoggles extends ItemElectricGoggles { diff --git a/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemQuantumGoggles.java b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemQuantumGoggles.java rename to src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java index f47f40e..e90687c 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.armor.goggles; +package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -12,9 +15,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemSolarHelmetRevealing.java rename to src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java index 2b0de06..b11b656 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.armor.goggles; +package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,9 +16,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/item/armor/wings/ItemFeatherWing.java rename to src/main/java/emt/item/armor/wings/ItemFeatherWing.java index fdf78f4..3306fa5 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.item.armor.wings; +package emt.item.armor.wings; import java.util.Random; @@ -7,6 +7,10 @@ import ic2.core.IC2; import ic2.core.util.StackUtil; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.client.model.ModelWings; +import emt.util.EMTConfigHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,10 +21,6 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.client.model.ModelWings; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemFeatherWing extends ItemArmor { diff --git a/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/item/armor/wings/ItemNanoWing.java rename to src/main/java/emt/item/armor/wings/ItemNanoWing.java index 07c9fab..7d7b709 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -1,7 +1,11 @@ -package tombenpotter.emt.common.item.armor.wings; +package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.item.armor.wings.ItemThaumiumReinforcedWing; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; @@ -16,10 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.item.armor.wings.ItemThaumiumReinforcedWing; -import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/item/armor/wings/ItemQuantumWing.java rename to src/main/java/emt/item/armor/wings/ItemQuantumWing.java index 5e8ad85..deea884 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -1,16 +1,16 @@ -package tombenpotter.emt.common.item.armor.wings; +package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemQuantumWing extends ItemNanoWing { public static int maxCharge = 1000000; diff --git a/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/item/armor/wings/ItemThaumiumReinforcedWing.java rename to src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index 24dcd87..ae9d0f6 100644 --- a/src/main/java/tombenpotter/emt/common/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -1,7 +1,11 @@ -package tombenpotter.emt.common.item.armor.wings; +package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -12,10 +16,6 @@ import net.minecraft.world.World; import thaumcraft.api.IRepairable; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTTextHelper; import ic2.core.IC2; import ic2.core.util.StackUtil; diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockElectricCloud.java b/src/main/java/emt/item/block/ItemBlockElectricCloud.java similarity index 85% rename from src/main/java/tombenpotter/emt/common/item/block/ItemBlockElectricCloud.java rename to src/main/java/emt/item/block/ItemBlockElectricCloud.java index 74e96eb..f0de427 100644 --- a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockElectricCloud.java +++ b/src/main/java/emt/item/block/ItemBlockElectricCloud.java @@ -1,5 +1,7 @@ -package tombenpotter.emt.common.item.block; +package emt.item.block; +import emt.ModInformation; +import emt.util.EMTTextHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; @@ -7,12 +9,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTTextHelper; public class ItemBlockElectricCloud extends ItemBlock{ public IIcon icon; + public ItemBlockElectricCloud(Block block) { super(block); } diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerator.java b/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java similarity index 87% rename from src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerator.java rename to src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java index 700f155..3f33021 100644 --- a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerator.java +++ b/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.item.block; +package emt.item.block; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerators.java b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java similarity index 63% rename from src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerators.java rename to src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java index 16a0709..c1fb5fd 100644 --- a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockEssentiaGenerators.java +++ b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.item.block; +package emt.item.block; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; @@ -7,12 +7,12 @@ import net.minecraft.item.ItemStack; import java.util.List; -import tombenpotter.emt.common.tile.generator.TileEntityAerGenerator; -import tombenpotter.emt.common.tile.generator.TileEntityArborGenerator; -import tombenpotter.emt.common.tile.generator.TileEntityAuramGenerator; -import tombenpotter.emt.common.tile.generator.TileEntityIgnisGenerator; -import tombenpotter.emt.common.tile.generator.TileEntityPotentiaGenerator; -import tombenpotter.emt.common.util.EMTConfigHandler; +import emt.tile.generator.TileEntityAerGenerator; +import emt.tile.generator.TileEntityArborGenerator; +import emt.tile.generator.TileEntityAuramGenerator; +import emt.tile.generator.TileEntityIgnisGenerator; +import emt.tile.generator.TileEntityPotentiaGenerator; +import emt.util.EMTConfigHandler; public class ItemBlockEssentiaGenerators extends ItemBlock { diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockMachines.java b/src/main/java/emt/item/block/ItemBlockMachines.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/item/block/ItemBlockMachines.java rename to src/main/java/emt/item/block/ItemBlockMachines.java index c229cea..f1387fd 100644 --- a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockMachines.java +++ b/src/main/java/emt/item/block/ItemBlockMachines.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.item.block; +package emt.item.block; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars.java b/src/main/java/emt/item/block/ItemBlockSolars.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars.java rename to src/main/java/emt/item/block/ItemBlockSolars.java index 2563832..1f9bc94 100644 --- a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars.java +++ b/src/main/java/emt/item/block/ItemBlockSolars.java @@ -1,15 +1,16 @@ -package tombenpotter.emt.common.item.block; +package emt.item.block; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTTextHelper; + +import static emt.util.EMTTextHelper.localize; import java.util.List; -import static tombenpotter.emt.common.util.EMTTextHelper.localize; +import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; public class ItemBlockSolars extends ItemBlock { diff --git a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars2.java b/src/main/java/emt/item/block/ItemBlockSolars2.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars2.java rename to src/main/java/emt/item/block/ItemBlockSolars2.java index 9d9c63b..096e4c2 100644 --- a/src/main/java/tombenpotter/emt/common/item/block/ItemBlockSolars2.java +++ b/src/main/java/emt/item/block/ItemBlockSolars2.java @@ -1,15 +1,16 @@ -package tombenpotter.emt.common.item.block; +package emt.item.block; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTTextHelper; + +import static emt.util.EMTTextHelper.localize; import java.util.List; -import static tombenpotter.emt.common.util.EMTTextHelper.localize; +import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; public class ItemBlockSolars2 extends ItemBlock { diff --git a/src/main/java/tombenpotter/emt/common/item/focus/ItemBaseFocus.java b/src/main/java/emt/item/focus/ItemBaseFocus.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/item/focus/ItemBaseFocus.java rename to src/main/java/emt/item/focus/ItemBaseFocus.java index a080ab0..2db8177 100644 --- a/src/main/java/tombenpotter/emt/common/item/focus/ItemBaseFocus.java +++ b/src/main/java/emt/item/focus/ItemBaseFocus.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.item.focus; +package emt.item.focus; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -13,13 +13,13 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.IWandFocus; import thaumcraft.api.wands.ItemFocusBasic; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; public abstract class ItemBaseFocus extends ItemFocusBasic { diff --git a/src/main/java/tombenpotter/emt/common/item/focus/ItemChargeFocus.java b/src/main/java/emt/item/focus/ItemChargeFocus.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/item/focus/ItemChargeFocus.java rename to src/main/java/emt/item/focus/ItemChargeFocus.java index 490c3e8..197445e 100644 --- a/src/main/java/tombenpotter/emt/common/item/focus/ItemChargeFocus.java +++ b/src/main/java/emt/item/focus/ItemChargeFocus.java @@ -1,10 +1,11 @@ -package tombenpotter.emt.common.item.focus; +package emt.item.focus; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import java.util.Map.Entry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; @@ -13,7 +14,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemChargeFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/item/focus/ItemChristmasFocus.java b/src/main/java/emt/item/focus/ItemChristmasFocus.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/item/focus/ItemChristmasFocus.java rename to src/main/java/emt/item/focus/ItemChristmasFocus.java index dc2db43..0d8a10f 100644 --- a/src/main/java/tombenpotter/emt/common/item/focus/ItemChristmasFocus.java +++ b/src/main/java/emt/item/focus/ItemChristmasFocus.java @@ -1,7 +1,9 @@ -package tombenpotter.emt.common.item.focus; +package emt.item.focus; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.player.EntityPlayer; @@ -13,8 +15,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; public class ItemChristmasFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/item/focus/ItemExplosionFocus.java b/src/main/java/emt/item/focus/ItemExplosionFocus.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/item/focus/ItemExplosionFocus.java rename to src/main/java/emt/item/focus/ItemExplosionFocus.java index d5aa1a7..14ce1c0 100644 --- a/src/main/java/tombenpotter/emt/common/item/focus/ItemExplosionFocus.java +++ b/src/main/java/emt/item/focus/ItemExplosionFocus.java @@ -1,5 +1,6 @@ -package tombenpotter.emt.common.item.focus; +package emt.item.focus; +import emt.entity.EntityLaser; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; @@ -10,7 +11,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.entity.EntityLaser; public class ItemExplosionFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/item/focus/ItemShieldFocus.java b/src/main/java/emt/item/focus/ItemShieldFocus.java similarity index 92% rename from src/main/java/tombenpotter/emt/common/item/focus/ItemShieldFocus.java rename to src/main/java/emt/item/focus/ItemShieldFocus.java index 3d69071..7131e5f 100644 --- a/src/main/java/tombenpotter/emt/common/item/focus/ItemShieldFocus.java +++ b/src/main/java/emt/item/focus/ItemShieldFocus.java @@ -1,10 +1,13 @@ -package tombenpotter.emt.common.item.focus; +package emt.item.focus; import java.util.ArrayList; import java.util.LinkedList; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import emt.ElectroMagicTools; +import emt.entity.EntityShield; +import emt.init.BlockRegistry; import ic2.core.IC2; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -19,9 +22,6 @@ import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.common.entity.EntityShield; -import tombenpotter.emt.common.init.BlockRegistry; public class ItemShieldFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5); diff --git a/src/main/java/tombenpotter/emt/common/item/focus/ItemWandChargingFocus.java b/src/main/java/emt/item/focus/ItemWandChargingFocus.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/item/focus/ItemWandChargingFocus.java rename to src/main/java/emt/item/focus/ItemWandChargingFocus.java index 080c795..9b92d42 100644 --- a/src/main/java/tombenpotter/emt/common/item/focus/ItemWandChargingFocus.java +++ b/src/main/java/emt/item/focus/ItemWandChargingFocus.java @@ -1,7 +1,9 @@ -package tombenpotter.emt.common.item.focus; +package emt.item.focus; import java.util.Map.Entry; +import emt.item.focus.ItemBaseFocus; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,8 +11,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.item.focus.ItemBaseFocus; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemWandChargingFocus extends ItemBaseFocus { diff --git a/src/main/java/tombenpotter/emt/common/item/tool/ItemElectricHoeGrowth.java b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/item/tool/ItemElectricHoeGrowth.java rename to src/main/java/emt/item/tool/ItemElectricHoeGrowth.java index 75e0dd6..a7a1c72 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/ItemElectricHoeGrowth.java +++ b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java @@ -1,7 +1,9 @@ -package tombenpotter.emt.common.item.tool; +package emt.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.block.Block; @@ -19,8 +21,6 @@ import thaumcraft.common.blocks.BlockCustomPlant; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.items.equipment.ItemElementalHoe; import thaumcraft.common.lib.utils.Utils; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/ItemElectricThorHammer.java b/src/main/java/emt/item/tool/ItemElectricThorHammer.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/item/tool/ItemElectricThorHammer.java rename to src/main/java/emt/item/tool/ItemElectricThorHammer.java index f389c9d..3be0df8 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/ItemElectricThorHammer.java +++ b/src/main/java/emt/item/tool/ItemElectricThorHammer.java @@ -1,7 +1,12 @@ -package tombenpotter.emt.common.item.tool; +package emt.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.entity.EntityArcher; +import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,11 +21,6 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.entity.EntityArcher; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammer.java b/src/main/java/emt/item/tool/ItemThorHammer.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammer.java rename to src/main/java/emt/item/tool/ItemThorHammer.java index 8cbd91f..6607c4b 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammer.java +++ b/src/main/java/emt/item/tool/ItemThorHammer.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.tool; +package emt.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTTextHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -16,9 +19,6 @@ import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.Vec3; import net.minecraft.world.World; import thaumcraft.api.IRepairable; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammerBroken.java b/src/main/java/emt/item/tool/ItemThorHammerBroken.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammerBroken.java rename to src/main/java/emt/item/tool/ItemThorHammerBroken.java index 4e70e9c..0794caa 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/ItemThorHammerBroken.java +++ b/src/main/java/emt/item/tool/ItemThorHammerBroken.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.tool; +package emt.item.tool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTTextHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -15,9 +18,6 @@ import org.lwjgl.input.Keyboard; import thaumcraft.api.IRepairable; import thaumcraft.common.entities.projectile.EntityAlumentum; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTTextHelper; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemDiamondChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemDiamondChainsaw.java rename to src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java index 6708043..b3e717e 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemDiamondChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.tool.chainsaw; +package emt.item.tool.chainsaw; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.core.IC2; @@ -22,9 +25,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.List; import java.util.Locale; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemStreamChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemStreamChainsaw.java rename to src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java index af604dc..10623cf 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemStreamChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java @@ -1,8 +1,10 @@ -package tombenpotter.emt.common.item.tool.chainsaw; +package emt.item.tool.chainsaw; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; import ic2.api.item.ElectricItem; import ic2.core.IC2; import ic2.core.audio.AudioSource; @@ -19,8 +21,6 @@ import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.fx.PacketFXBlockBubble; import thaumcraft.common.lib.utils.BlockUtils; import thaumcraft.common.lib.utils.Utils; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; import java.awt.*; import java.util.ArrayList; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemThaumiumChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemThaumiumChainsaw.java rename to src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java index ad21021..e12a4b0 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/chainsaw/ItemThaumiumChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java @@ -1,7 +1,9 @@ -package tombenpotter.emt.common.item.tool.chainsaw; +package emt.item.tool.chainsaw; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; import ic2.api.item.ElectricItem; import ic2.core.IC2; import ic2.core.audio.AudioSource; @@ -14,8 +16,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; public class ItemThaumiumChainsaw extends ItemDiamondChainsaw { public static AudioSource audio; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/drill/ItemRockbreakerDrill.java b/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/item/tool/drill/ItemRockbreakerDrill.java rename to src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java index 4c2e409..f4e0259 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/drill/ItemRockbreakerDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemRockbreakerDrill.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.tool.drill; +package emt.item.tool.drill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -24,9 +27,6 @@ import net.minecraftforge.event.ForgeEventFactory; import thaumcraft.common.Thaumcraft; import thaumcraft.common.entities.EntityFollowingItem; import thaumcraft.common.lib.utils.BlockUtils; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; import javax.swing.*; import java.util.ArrayList; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/drill/ItemThaumiumDrill.java b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java similarity index 94% rename from src/main/java/tombenpotter/emt/common/item/tool/drill/ItemThaumiumDrill.java rename to src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java index ecc6f0a..a474a2f 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/drill/ItemThaumiumDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java @@ -1,7 +1,11 @@ -package tombenpotter.emt.common.item.tool.drill; +package emt.item.tool.drill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; +import emt.util.EMTRandomHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.block.Block; @@ -14,10 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTRandomHelper; import java.util.List; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolDiamond.java b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolDiamond.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolDiamond.java rename to src/main/java/emt/item/tool/omnitool/ItemOmnitoolDiamond.java index a43e967..2009234 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolDiamond.java +++ b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolDiamond.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.tool.omnitool; +package emt.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,9 +13,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemOmnitoolDiamond extends ItemOmnitoolIron { diff --git a/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolIron.java b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java similarity index 96% rename from src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolIron.java rename to src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java index a204367..05a14bd 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolIron.java +++ b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolIron.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.tool.omnitool; +package emt.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.block.Block; @@ -17,9 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; import java.util.List; import java.util.Locale; diff --git a/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolThaumium.java b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolThaumium.java similarity index 90% rename from src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolThaumium.java rename to src/main/java/emt/item/tool/omnitool/ItemOmnitoolThaumium.java index 2bff697..05d38ae 100644 --- a/src/main/java/tombenpotter/emt/common/item/tool/omnitool/ItemOmnitoolThaumium.java +++ b/src/main/java/emt/item/tool/omnitool/ItemOmnitoolThaumium.java @@ -1,7 +1,10 @@ -package tombenpotter.emt.common.item.tool.omnitool; +package emt.item.tool.omnitool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,9 +13,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.util.EMTConfigHandler; public class ItemOmnitoolThaumium extends ItemOmnitoolDiamond { diff --git a/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java b/src/main/java/emt/network/PacketEMTKeys.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java rename to src/main/java/emt/network/PacketEMTKeys.java index d5ff59e..7a263c9 100644 --- a/src/main/java/tombenpotter/emt/common/network/PacketEMTKeys.java +++ b/src/main/java/emt/network/PacketEMTKeys.java @@ -1,12 +1,12 @@ -package tombenpotter.emt.common.network; +package emt.network; -import tombenpotter.emt.common.init.ItemRegistry; import io.netty.buffer.ByteBuf; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import emt.init.ItemRegistry; public class PacketEMTKeys implements IMessage, IMessageHandler { diff --git a/src/main/java/tombenpotter/emt/proxy/ClientProxy.java b/src/main/java/emt/proxy/ClientProxy.java similarity index 67% rename from src/main/java/tombenpotter/emt/proxy/ClientProxy.java rename to src/main/java/emt/proxy/ClientProxy.java index 20c6aa6..510729a 100644 --- a/src/main/java/tombenpotter/emt/proxy/ClientProxy.java +++ b/src/main/java/emt/proxy/ClientProxy.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.proxy; +package emt.proxy; import org.lwjgl.input.Keyboard; @@ -6,12 +6,12 @@ import net.minecraft.client.renderer.entity.RenderSnowMan; import net.minecraft.client.settings.KeyBinding; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import tombenpotter.emt.client.EMTKeys; -import tombenpotter.emt.client.renderer.RenderLaser; -import tombenpotter.emt.client.renderer.RenderShield; -import tombenpotter.emt.common.entity.EntityArcher; -import tombenpotter.emt.common.entity.EntityLaser; -import tombenpotter.emt.common.entity.EntityShield; +import emt.client.EMTKeys; +import emt.client.renderer.RenderLaser; +import emt.client.renderer.RenderShield; +import emt.entity.EntityArcher; +import emt.entity.EntityLaser; +import emt.entity.EntityShield; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/tombenpotter/emt/proxy/CommonProxy.java b/src/main/java/emt/proxy/CommonProxy.java similarity index 77% rename from src/main/java/tombenpotter/emt/proxy/CommonProxy.java rename to src/main/java/emt/proxy/CommonProxy.java index f289e39..6b5a5f0 100644 --- a/src/main/java/tombenpotter/emt/proxy/CommonProxy.java +++ b/src/main/java/emt/proxy/CommonProxy.java @@ -1,15 +1,15 @@ -package tombenpotter.emt.proxy; +package emt.proxy; import cpw.mods.fml.common.network.IGuiHandler; +import emt.client.gui.GuiEtherealMacerator; +import emt.client.gui.GuiIndustrialWandRecharger; +import emt.client.gui.container.ContainerEtheralMacerator; +import emt.client.gui.container.ContainerIndustrialWandRecharge; +import emt.tile.TileEntityEtherealMacerator; +import emt.tile.TileEntityIndustrialWandRecharge; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tombenpotter.emt.client.gui.GuiEtherealMacerator; -import tombenpotter.emt.client.gui.GuiIndustrialWandRecharger; -import tombenpotter.emt.client.gui.container.ContainerEtheralMacerator; -import tombenpotter.emt.client.gui.container.ContainerIndustrialWandRecharge; -import tombenpotter.emt.common.tile.TileEntityEtherealMacerator; -import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge; public class CommonProxy implements IGuiHandler { diff --git a/src/main/java/tombenpotter/emt/common/tile/TileElectricCloud.java b/src/main/java/emt/tile/TileElectricCloud.java similarity index 98% rename from src/main/java/tombenpotter/emt/common/tile/TileElectricCloud.java rename to src/main/java/emt/tile/TileElectricCloud.java index 4b1d098..036a1f0 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileElectricCloud.java +++ b/src/main/java/emt/tile/TileElectricCloud.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.tile; +package emt.tile; import net.minecraft.tileentity.TileEntity; import thaumcraft.client.fx.ParticleEngine; diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityEMT.java b/src/main/java/emt/tile/TileEntityEMT.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/tile/TileEntityEMT.java rename to src/main/java/emt/tile/TileEntityEMT.java index ac83780..e10d48a 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityEMT.java +++ b/src/main/java/emt/tile/TileEntityEMT.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.tile; +package emt.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java b/src/main/java/emt/tile/TileEntityEtherealMacerator.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java rename to src/main/java/emt/tile/TileEntityEtherealMacerator.java index adb5fd5..af20cb4 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/emt/tile/TileEntityEtherealMacerator.java @@ -1,5 +1,8 @@ -package tombenpotter.emt.common.tile; +package emt.tile; +import emt.init.BlockRegistry; +import emt.tile.TileEntityEMT; +import emt.util.EMTConfigHandler; import ic2.api.item.IC2Items; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; @@ -13,9 +16,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.TileEntityEMT; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityEtherealMacerator extends TileEntityEMT implements ISidedInventory, IWrenchable { diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java rename to src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java index 953332f..67582e3 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/emt/tile/TileEntityIndustrialWandRecharge.java @@ -1,5 +1,7 @@ -package tombenpotter.emt.common.tile; +package emt.tile; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSink; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +11,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.items.wands.ItemWandCasting; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory, IWrenchable { diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java b/src/main/java/emt/tile/TileEntityPortableNode.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java rename to src/main/java/emt/tile/TileEntityPortableNode.java index cdf82f1..c5f9a9f 100644 --- a/src/main/java/tombenpotter/emt/common/tile/TileEntityPortableNode.java +++ b/src/main/java/emt/tile/TileEntityPortableNode.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.tile; +package emt.tile; import thaumcraft.api.nodes.NodeModifier; import thaumcraft.api.nodes.NodeType; diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAerGenerator.java b/src/main/java/emt/tile/generator/TileEntityAerGenerator.java similarity index 59% rename from src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAerGenerator.java rename to src/main/java/emt/tile/generator/TileEntityAerGenerator.java index 93c79a9..d23dd7a 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAerGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityAerGenerator.java @@ -1,8 +1,8 @@ -package tombenpotter.emt.common.tile.generator; +package emt.tile.generator; +import emt.util.EMTConfigHandler; +import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTEssentiasOutputs; public class TileEntityAerGenerator extends TileEntityBaseGenerator { diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityArborGenerator.java b/src/main/java/emt/tile/generator/TileEntityArborGenerator.java similarity index 60% rename from src/main/java/tombenpotter/emt/common/tile/generator/TileEntityArborGenerator.java rename to src/main/java/emt/tile/generator/TileEntityArborGenerator.java index e72cf4a..8a37c53 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityArborGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityArborGenerator.java @@ -1,8 +1,8 @@ -package tombenpotter.emt.common.tile.generator; +package emt.tile.generator; +import emt.util.EMTConfigHandler; +import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTEssentiasOutputs; public class TileEntityArborGenerator extends TileEntityBaseGenerator { diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAuramGenerator.java b/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java similarity index 60% rename from src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAuramGenerator.java rename to src/main/java/emt/tile/generator/TileEntityAuramGenerator.java index 5f2e15f..5fff2d8 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityAuramGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java @@ -1,8 +1,8 @@ -package tombenpotter.emt.common.tile.generator; +package emt.tile.generator; +import emt.util.EMTConfigHandler; +import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTEssentiasOutputs; public class TileEntityAuramGenerator extends TileEntityBaseGenerator { diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityBaseGenerator.java b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java similarity index 93% rename from src/main/java/tombenpotter/emt/common/tile/generator/TileEntityBaseGenerator.java rename to src/main/java/emt/tile/generator/TileEntityBaseGenerator.java index ecec278..0610d06 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityBaseGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java @@ -1,7 +1,9 @@ -package tombenpotter.emt.common.tile.generator; +package emt.tile.generator; import java.util.Random; +import emt.tile.TileEntityEMT; +import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.nbt.NBTTagCompound; @@ -12,8 +14,6 @@ import thaumcraft.api.aspects.IAspectSource; import thaumcraft.common.lib.events.EssentiaHandler; import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource; -import tombenpotter.emt.common.tile.TileEntityEMT; -import tombenpotter.emt.common.util.EMTConfigHandler; public abstract class TileEntityBaseGenerator extends TileEntityEMT { diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityIgnisGenerator.java b/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java similarity index 60% rename from src/main/java/tombenpotter/emt/common/tile/generator/TileEntityIgnisGenerator.java rename to src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java index 03fbda7..471e465 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityIgnisGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java @@ -1,8 +1,8 @@ -package tombenpotter.emt.common.tile.generator; +package emt.tile.generator; +import emt.util.EMTConfigHandler; +import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTEssentiasOutputs; public class TileEntityIgnisGenerator extends TileEntityBaseGenerator { diff --git a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityPotentiaGenerator.java b/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java similarity index 64% rename from src/main/java/tombenpotter/emt/common/tile/generator/TileEntityPotentiaGenerator.java rename to src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java index 9b1d474..18acbba 100644 --- a/src/main/java/tombenpotter/emt/common/tile/generator/TileEntityPotentiaGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.generator; +package emt.tile.generator; +import emt.util.EMTConfigHandler; +import emt.util.EMTEssentiasOutputs; import ic2.api.energy.prefab.BasicSource; import thaumcraft.api.aspects.Aspect; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTEssentiasOutputs; public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/TileEntitySolarBase.java b/src/main/java/emt/tile/solar/TileEntitySolarBase.java similarity index 95% rename from src/main/java/tombenpotter/emt/common/tile/solar/TileEntitySolarBase.java rename to src/main/java/emt/tile/solar/TileEntitySolarBase.java index 7e96937..b477fef 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/TileEntitySolarBase.java +++ b/src/main/java/emt/tile/solar/TileEntitySolarBase.java @@ -1,13 +1,14 @@ -package tombenpotter.emt.common.tile.solar; +package emt.tile.solar; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import tombenpotter.emt.common.tile.TileEntityEMT; import java.util.Random; +import emt.tile.TileEntityEMT; + public abstract class TileEntitySolarBase extends TileEntityEMT implements IWrenchable { public BasicSource energySource = new BasicSource(this, 10000, 4); diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityAirSolar.java b/src/main/java/emt/tile/solar/air/TileEntityAirSolar.java similarity index 74% rename from src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityAirSolar.java rename to src/main/java/emt/tile/solar/air/TileEntityAirSolar.java index 0b0195b..1387847 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityAirSolar.java +++ b/src/main/java/emt/tile/solar/air/TileEntityAirSolar.java @@ -1,11 +1,11 @@ -package tombenpotter.emt.common.tile.solar.air; +package emt.tile.solar.air; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityAirSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityDoubleAirSolar.java b/src/main/java/emt/tile/solar/air/TileEntityDoubleAirSolar.java similarity index 73% rename from src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityDoubleAirSolar.java rename to src/main/java/emt/tile/solar/air/TileEntityDoubleAirSolar.java index 94d30e6..dac3b1d 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityDoubleAirSolar.java +++ b/src/main/java/emt/tile/solar/air/TileEntityDoubleAirSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.air; +package emt.tile.solar.air; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleAirSolar extends TileEntityAirSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityTripleAirSolar.java b/src/main/java/emt/tile/solar/air/TileEntityTripleAirSolar.java similarity index 73% rename from src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityTripleAirSolar.java rename to src/main/java/emt/tile/solar/air/TileEntityTripleAirSolar.java index a4f8c22..23710c4 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/air/TileEntityTripleAirSolar.java +++ b/src/main/java/emt/tile/solar/air/TileEntityTripleAirSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.air; +package emt.tile.solar.air; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleAirSolar extends TileEntityAirSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityCompressedSolar.java b/src/main/java/emt/tile/solar/compressed/TileEntityCompressedSolar.java similarity index 63% rename from src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityCompressedSolar.java rename to src/main/java/emt/tile/solar/compressed/TileEntityCompressedSolar.java index 9889f41..95608cf 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityCompressedSolar.java +++ b/src/main/java/emt/tile/solar/compressed/TileEntityCompressedSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.compressed; +package emt.tile.solar.compressed; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityCompressedSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityDoubleCompressedSolar.java b/src/main/java/emt/tile/solar/compressed/TileEntityDoubleCompressedSolar.java similarity index 64% rename from src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityDoubleCompressedSolar.java rename to src/main/java/emt/tile/solar/compressed/TileEntityDoubleCompressedSolar.java index 514ce5c..9d8a220 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityDoubleCompressedSolar.java +++ b/src/main/java/emt/tile/solar/compressed/TileEntityDoubleCompressedSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.compressed; +package emt.tile.solar.compressed; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleCompressedSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityTripleCompressedSolar.java b/src/main/java/emt/tile/solar/compressed/TileEntityTripleCompressedSolar.java similarity index 64% rename from src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityTripleCompressedSolar.java rename to src/main/java/emt/tile/solar/compressed/TileEntityTripleCompressedSolar.java index 64c95be..e32653f 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/compressed/TileEntityTripleCompressedSolar.java +++ b/src/main/java/emt/tile/solar/compressed/TileEntityTripleCompressedSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.compressed; +package emt.tile.solar.compressed; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleCompressedSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDarkSolar.java b/src/main/java/emt/tile/solar/dark/TileEntityDarkSolar.java similarity index 73% rename from src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDarkSolar.java rename to src/main/java/emt/tile/solar/dark/TileEntityDarkSolar.java index a6475b8..cac88b1 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDarkSolar.java +++ b/src/main/java/emt/tile/solar/dark/TileEntityDarkSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.dark; +package emt.tile.solar.dark; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDarkSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDoubleDarkSolar.java b/src/main/java/emt/tile/solar/dark/TileEntityDoubleDarkSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDoubleDarkSolar.java rename to src/main/java/emt/tile/solar/dark/TileEntityDoubleDarkSolar.java index b8ad565..896a624 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityDoubleDarkSolar.java +++ b/src/main/java/emt/tile/solar/dark/TileEntityDoubleDarkSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.dark; +package emt.tile.solar.dark; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleDarkSolar extends TileEntityDarkSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityTripleDarkSolar.java b/src/main/java/emt/tile/solar/dark/TileEntityTripleDarkSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityTripleDarkSolar.java rename to src/main/java/emt/tile/solar/dark/TileEntityTripleDarkSolar.java index 24253e7..590c214 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/dark/TileEntityTripleDarkSolar.java +++ b/src/main/java/emt/tile/solar/dark/TileEntityTripleDarkSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.dark; +package emt.tile.solar.dark; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleDarkSolar extends TileEntityDarkSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityDoubleEarthSolar.java b/src/main/java/emt/tile/solar/earth/TileEntityDoubleEarthSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityDoubleEarthSolar.java rename to src/main/java/emt/tile/solar/earth/TileEntityDoubleEarthSolar.java index b754360..4554ea4 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityDoubleEarthSolar.java +++ b/src/main/java/emt/tile/solar/earth/TileEntityDoubleEarthSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.earth; +package emt.tile.solar.earth; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleEarthSolar extends TileEntityEarthSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityEarthSolar.java b/src/main/java/emt/tile/solar/earth/TileEntityEarthSolar.java similarity index 72% rename from src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityEarthSolar.java rename to src/main/java/emt/tile/solar/earth/TileEntityEarthSolar.java index efcd518..0c90661 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityEarthSolar.java +++ b/src/main/java/emt/tile/solar/earth/TileEntityEarthSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.earth; +package emt.tile.solar.earth; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityEarthSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityTripleEarthSolar.java b/src/main/java/emt/tile/solar/earth/TileEntityTripleEarthSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityTripleEarthSolar.java rename to src/main/java/emt/tile/solar/earth/TileEntityTripleEarthSolar.java index 32e90d9..3f23743 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/earth/TileEntityTripleEarthSolar.java +++ b/src/main/java/emt/tile/solar/earth/TileEntityTripleEarthSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.earth; +package emt.tile.solar.earth; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleEarthSolar extends TileEntityEarthSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityDoubleFireSolar.java b/src/main/java/emt/tile/solar/fire/TileEntityDoubleFireSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityDoubleFireSolar.java rename to src/main/java/emt/tile/solar/fire/TileEntityDoubleFireSolar.java index 3762246..cace617 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityDoubleFireSolar.java +++ b/src/main/java/emt/tile/solar/fire/TileEntityDoubleFireSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.fire; +package emt.tile.solar.fire; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleFireSolar extends TileEntityFireSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityFireSolar.java b/src/main/java/emt/tile/solar/fire/TileEntityFireSolar.java similarity index 77% rename from src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityFireSolar.java rename to src/main/java/emt/tile/solar/fire/TileEntityFireSolar.java index 2596c1e..ab85703 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityFireSolar.java +++ b/src/main/java/emt/tile/solar/fire/TileEntityFireSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.fire; +package emt.tile.solar.fire; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityFireSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityTripleFireSolar.java b/src/main/java/emt/tile/solar/fire/TileEntityTripleFireSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityTripleFireSolar.java rename to src/main/java/emt/tile/solar/fire/TileEntityTripleFireSolar.java index 77b1d84..1a2fad3 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/fire/TileEntityTripleFireSolar.java +++ b/src/main/java/emt/tile/solar/fire/TileEntityTripleFireSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.fire; +package emt.tile.solar.fire; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleFireSolar extends TileEntityFireSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityDoubleOrderSolar.java b/src/main/java/emt/tile/solar/order/TileEntityDoubleOrderSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityDoubleOrderSolar.java rename to src/main/java/emt/tile/solar/order/TileEntityDoubleOrderSolar.java index 5c3baf8..71f9ff8 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityDoubleOrderSolar.java +++ b/src/main/java/emt/tile/solar/order/TileEntityDoubleOrderSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.order; +package emt.tile.solar.order; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleOrderSolar extends TileEntityOrderSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityOrderSolar.java b/src/main/java/emt/tile/solar/order/TileEntityOrderSolar.java similarity index 69% rename from src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityOrderSolar.java rename to src/main/java/emt/tile/solar/order/TileEntityOrderSolar.java index 1d3dc26..4e054d5 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityOrderSolar.java +++ b/src/main/java/emt/tile/solar/order/TileEntityOrderSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.order; +package emt.tile.solar.order; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityOrderSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityTripleOrderSolar.java b/src/main/java/emt/tile/solar/order/TileEntityTripleOrderSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityTripleOrderSolar.java rename to src/main/java/emt/tile/solar/order/TileEntityTripleOrderSolar.java index 1f09750..64a6c9e 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/order/TileEntityTripleOrderSolar.java +++ b/src/main/java/emt/tile/solar/order/TileEntityTripleOrderSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.order; +package emt.tile.solar.order; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleOrderSolar extends TileEntityOrderSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityDoubleWaterSolar.java b/src/main/java/emt/tile/solar/water/TileEntityDoubleWaterSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityDoubleWaterSolar.java rename to src/main/java/emt/tile/solar/water/TileEntityDoubleWaterSolar.java index 3b23f63..679f24b 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityDoubleWaterSolar.java +++ b/src/main/java/emt/tile/solar/water/TileEntityDoubleWaterSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.water; +package emt.tile.solar.water; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityDoubleWaterSolar extends TileEntityWaterSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityTripleWaterSolar.java b/src/main/java/emt/tile/solar/water/TileEntityTripleWaterSolar.java similarity index 71% rename from src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityTripleWaterSolar.java rename to src/main/java/emt/tile/solar/water/TileEntityTripleWaterSolar.java index 583cb88..23ba6de 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityTripleWaterSolar.java +++ b/src/main/java/emt/tile/solar/water/TileEntityTripleWaterSolar.java @@ -1,9 +1,9 @@ -package tombenpotter.emt.common.tile.solar.water; +package emt.tile.solar.water; +import emt.init.BlockRegistry; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityTripleWaterSolar extends TileEntityWaterSolar { diff --git a/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityWaterSolar.java b/src/main/java/emt/tile/solar/water/TileEntityWaterSolar.java similarity index 74% rename from src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityWaterSolar.java rename to src/main/java/emt/tile/solar/water/TileEntityWaterSolar.java index 68e44d3..4f23fbc 100644 --- a/src/main/java/tombenpotter/emt/common/tile/solar/water/TileEntityWaterSolar.java +++ b/src/main/java/emt/tile/solar/water/TileEntityWaterSolar.java @@ -1,10 +1,10 @@ -package tombenpotter.emt.common.tile.solar.water; +package emt.tile.solar.water; +import emt.init.BlockRegistry; +import emt.tile.solar.TileEntitySolarBase; +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.tile.solar.TileEntitySolarBase; -import tombenpotter.emt.common.util.EMTConfigHandler; public class TileEntityWaterSolar extends TileEntitySolarBase { diff --git a/src/main/java/tombenpotter/emt/common/util/EMTConfigHandler.java b/src/main/java/emt/util/EMTConfigHandler.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/util/EMTConfigHandler.java rename to src/main/java/emt/util/EMTConfigHandler.java index ed92227..57f383e 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTConfigHandler.java +++ b/src/main/java/emt/util/EMTConfigHandler.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.util; +package emt.util; import net.minecraftforge.common.config.Configuration; diff --git a/src/main/java/tombenpotter/emt/common/util/EMTCraftingAspects.java b/src/main/java/emt/util/EMTCraftingAspects.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/util/EMTCraftingAspects.java rename to src/main/java/emt/util/EMTCraftingAspects.java index d3b7645..364142f 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTCraftingAspects.java +++ b/src/main/java/emt/util/EMTCraftingAspects.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.util; +package emt.util; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/tombenpotter/emt/common/util/EMTCreativeTab.java b/src/main/java/emt/util/EMTCreativeTab.java similarity index 86% rename from src/main/java/tombenpotter/emt/common/util/EMTCreativeTab.java rename to src/main/java/emt/util/EMTCreativeTab.java index 3d962c5..58e6a53 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTCreativeTab.java +++ b/src/main/java/emt/util/EMTCreativeTab.java @@ -1,6 +1,6 @@ -package tombenpotter.emt.common.util; +package emt.util; -import tombenpotter.emt.common.init.ItemRegistry; +import emt.init.ItemRegistry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tombenpotter/emt/common/util/EMTDungeonChestGenerator.java b/src/main/java/emt/util/EMTDungeonChestGenerator.java similarity index 88% rename from src/main/java/tombenpotter/emt/common/util/EMTDungeonChestGenerator.java rename to src/main/java/emt/util/EMTDungeonChestGenerator.java index c9e15b8..95a1dfb 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTDungeonChestGenerator.java +++ b/src/main/java/emt/util/EMTDungeonChestGenerator.java @@ -1,6 +1,6 @@ -package tombenpotter.emt.common.util; +package emt.util; -import tombenpotter.emt.common.init.ItemRegistry; +import emt.init.ItemRegistry; import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; diff --git a/src/main/java/tombenpotter/emt/common/util/EMTEssentiasOutputs.java b/src/main/java/emt/util/EMTEssentiasOutputs.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/util/EMTEssentiasOutputs.java rename to src/main/java/emt/util/EMTEssentiasOutputs.java index eefa51f..41ce1e7 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTEssentiasOutputs.java +++ b/src/main/java/emt/util/EMTEssentiasOutputs.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.util; +package emt.util; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/tombenpotter/emt/common/util/EMTEventHandler.java b/src/main/java/emt/util/EMTEventHandler.java similarity index 83% rename from src/main/java/tombenpotter/emt/common/util/EMTEventHandler.java rename to src/main/java/emt/util/EMTEventHandler.java index bd9ffcb..669f87c 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTEventHandler.java +++ b/src/main/java/emt/util/EMTEventHandler.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.util; +package emt.util; import java.util.Random; @@ -7,18 +7,18 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; +import emt.ElectroMagicTools; +import emt.ModInformation; +import emt.client.EMTKeys; +import emt.init.ItemRegistry; +import emt.network.PacketEMTKeys; +import emt.proxy.ClientProxy; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.event.entity.living.LivingDropsEvent; import thaumcraft.common.entities.monster.EntityTaintChicken; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.client.EMTKeys; -import tombenpotter.emt.common.init.ItemRegistry; -import tombenpotter.emt.common.network.PacketEMTKeys; -import tombenpotter.emt.proxy.ClientProxy; public class EMTEventHandler { Random rnd = new Random(); diff --git a/src/main/java/tombenpotter/emt/common/util/EMTRandomHelper.java b/src/main/java/emt/util/EMTRandomHelper.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/util/EMTRandomHelper.java rename to src/main/java/emt/util/EMTRandomHelper.java index ed1e0ab..6b77d87 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTRandomHelper.java +++ b/src/main/java/emt/util/EMTRandomHelper.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.util; +package emt.util; import ic2.api.item.ElectricItem; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearchAspects.java b/src/main/java/emt/util/EMTResearchAspects.java similarity index 99% rename from src/main/java/tombenpotter/emt/common/util/EMTResearchAspects.java rename to src/main/java/emt/util/EMTResearchAspects.java index bc3a890..0143041 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearchAspects.java +++ b/src/main/java/emt/util/EMTResearchAspects.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.util; +package emt.util; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java b/src/main/java/emt/util/EMTResearchItem.java similarity index 54% rename from src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java rename to src/main/java/emt/util/EMTResearchItem.java index 3152a06..250324b 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearchItem.java +++ b/src/main/java/emt/util/EMTResearchItem.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.util; +package emt.util; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -12,15 +12,23 @@ import thaumcraft.api.research.ResearchPage.PageType; public class EMTResearchItem extends ResearchItem { public EMTResearchItem(String par1, String par2) { - super(par1, par2); + super(par1, "EMT"); } - public EMTResearchItem(String par1, String par2, AspectList tags, int par3, int par4, int par5, ItemStack icon) { - super(par1, par2, tags, par3, par4, par5, icon); + public EMTResearchItem(String rsName, AspectList tags, int x, int y, int z, ItemStack icon) { + super(rsName, "EMT", tags, x, y, z, icon); + } + + public EMTResearchItem(String rsName, int x, int y, int z, ItemStack icon) { + super(rsName, "EMT", new AspectList(), x, y, z, icon); } - public EMTResearchItem(String par1, String par2, AspectList tags, int par3, int par4, int par5, ResourceLocation icon) { - super(par1, par2, tags, par3, par4, par5, icon); + public EMTResearchItem(String rsName, AspectList tags, int x, int y, int z, ResourceLocation icon) { + super(rsName, "EMT", tags, x, y, z, icon); + } + + public EMTResearchItem(String rsName, int x, int y, int z, ResourceLocation icon) { + super(rsName, "EMT", new AspectList(), x, y, z, icon); } @Override @@ -36,10 +44,11 @@ public class EMTResearchItem extends ResearchItem { } @Override - public ResearchItem setPages(ResearchPage... rp) { - for (ResearchPage page : rp) { + public ResearchItem setPages(ResearchPage... pages) { + for (ResearchPage page : pages) { + if (page.type == PageType.TEXT) - page.text = "emt.text." + key; + page.text = "emt.text." + key + "." + page.text; if (page.type == PageType.INFUSION_CRAFTING) { if (parentsHidden == null || parentsHidden.length == 0) @@ -47,13 +56,13 @@ public class EMTResearchItem extends ResearchItem { else { String[] newParents = new String[parentsHidden.length + 1]; newParents[0] = "INFUSION"; - for (int i = 0; i < parentsHidden.length; i++) - newParents[i + 1] = parentsHidden[i]; + for (int i2 = 0; i2 < parentsHidden.length; i2++) + newParents[i2 + 1] = parentsHidden[i2]; parentsHidden = newParents; } } } - return super.setPages(rp); + return super.setPages(pages); } } diff --git a/src/main/java/tombenpotter/emt/common/util/EMTTextHelper.java b/src/main/java/emt/util/EMTTextHelper.java similarity index 97% rename from src/main/java/tombenpotter/emt/common/util/EMTTextHelper.java rename to src/main/java/emt/util/EMTTextHelper.java index f36fce1..f95c887 100644 --- a/src/main/java/tombenpotter/emt/common/util/EMTTextHelper.java +++ b/src/main/java/emt/util/EMTTextHelper.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.util; +package emt.util; import net.minecraft.util.StatCollector; diff --git a/src/main/java/tombenpotter/emt/ModInformation.java b/src/main/java/tombenpotter/emt/ModInformation.java deleted file mode 100644 index 4d8115e..0000000 --- a/src/main/java/tombenpotter/emt/ModInformation.java +++ /dev/null @@ -1,14 +0,0 @@ -package tombenpotter.emt; - -public class ModInformation { - - public static final String name = "Electro-Magic Tools"; - public static final String modid = "EMT"; - public static final String version = "1.2.6"; - public static final String texturePath = "electromagictools"; - public static final String guiFactory = "tombenpotter.emt.client.gui.config.EMTGuiFactory"; - public static final String clientProxy = "tombenpotter.emt.proxy.ClientProxy"; - public static final String commonProxy = "tombenpotter.emt.proxy.CommonProxy"; - public static final String channel = "ElectroMagicTools"; - public static final String depend = "required-after:Thaumcraft ; required-after:IC2"; -} diff --git a/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java b/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java deleted file mode 100644 index 8c5dde2..0000000 --- a/src/main/java/tombenpotter/emt/common/block/BlockPortableNode.java +++ /dev/null @@ -1,89 +0,0 @@ -package tombenpotter.emt.common.block; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.Explosion; -import net.minecraft.world.World; -import thaumcraft.common.blocks.BlockAiry; -import tombenpotter.emt.ElectroMagicTools; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.common.tile.TileEntityPortableNode; - -import java.util.List; -import java.util.Random; - -public class BlockPortableNode extends BlockAiry { - - public IIcon texture; - - public BlockPortableNode(String name) { - this.setCreativeTab(ElectroMagicTools.tabEMT); - setBlockName(ModInformation.modid + "." + name); - setBlockUnbreakable(); - } - - @Override - public TileEntity createTileEntity(World world, int meta) { - return new TileEntityPortableNode(); - } - - @Override - public int quantityDropped(Random par1Random) { - return 0; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - protected boolean canSilkHarvest() { - return false; - } - - public boolean canEntityDestroy(World world, int x, int y, int z, Entity entity) { - return false; - } - - public void onBlockExploded(World world, int x, int y, int z, Explosion explosion) { - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister ri) { - texture = ri.registerIcon(ModInformation.texturePath + ":portablenode"); - } - - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) { - return texture; - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { - if (!world.isRemote && player.isSneaking() && player.getHeldItem() == null) { - world.setBlockToAir(x, y, z); - world.removeTileEntity(x, y, z); - } - return true; - } - - @Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return null; - } -} diff --git a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java b/src/main/java/tombenpotter/emt/common/util/EMTResearch.java deleted file mode 100644 index e15af8b..0000000 --- a/src/main/java/tombenpotter/emt/common/util/EMTResearch.java +++ /dev/null @@ -1,295 +0,0 @@ -package tombenpotter.emt.common.util; - -import ic2.api.item.IC2Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchItem; -import thaumcraft.api.research.ResearchPage; -import tombenpotter.emt.ModInformation; -import tombenpotter.emt.client.EMTKeys; -import tombenpotter.emt.common.init.BlockRegistry; -import tombenpotter.emt.common.init.ItemRegistry; -import tombenpotter.emt.common.init.RecipeRegistry; -import tombenpotter.emt.common.util.EMTConfigHandler; -import tombenpotter.emt.common.util.EMTResearchItem; -import tombenpotter.emt.common.util.EMTResearchAspects; - -public class EMTResearch { - public static void register() { - addResearchTab(); - addResearch(); - } - - public static void addResearchTab() { - ResourceLocation background = new ResourceLocation(ModInformation.texturePath, "textures/misc/background.png"); - ResearchCategories.registerCategory("EMT", new ResourceLocation("electromagictools:textures/misc/emt.png"), background); - } - - public static void addResearch() { - /** Research that can't be disabled **/ - new EMTResearchItem("Electric Magic Tools", "EMT", new AspectList(), 0, 0, 0, new ResourceLocation("electromagictools:textures/misc/emt.png")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1")); - - new EMTResearchItem("Diamond Chainsaw", "EMT", new AspectList(), 5, -6, 0, new ItemStack(ItemRegistry.diamondChainsaw)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.diamondChainsaw)); - - new EMTResearchItem("Thaumium Plate", "EMT", new AspectList(), 6, -6, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 5)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumPlate)); - - new EMTResearchItem("Macerating Native Ore Clusters", "EMT", new AspectList(), 5, -7, 0, IC2Items.getItem("smallGoldDust")).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1")); - - new EMTResearchItem("The Legend", "EMT", new AspectList(), 5, -5, 0, new ItemStack(ItemRegistry.taintedThorHammer)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1")); - - new EMTResearchItem("Lightning Summoner", "EMT", new AspectList(), 6, -5, 0, new ItemStack(ItemRegistry.itemEMTItems, 1, 6)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1")); - - new EMTResearchItem("The One Ring", "EMT", new AspectList(), 6, -7, 0, new ItemStack(ItemRegistry.onering)).setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1")); - - new EMTResearchItem("Feather Wings", "EMT", new AspectList(), 0, 2, 0, new ItemStack(ItemRegistry.featherWing)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage(RecipeRegistry.cardboard), new ResearchPage(RecipeRegistry.featherWing), new ResearchPage(RecipeRegistry.featherWings)); - - /** Research that can be disabled **/ - if (!EMTConfigHandler.thaumiumDrillResearch) { - new EMTResearchItem("Thaumium Drill", "EMT", EMTResearchAspects.thaumiumDrillResearch, -1, -2, 1, new ItemStack(ItemRegistry.thaumiumDrill)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumDrill)); - } - - if (!EMTConfigHandler.thaumiumChainsawResearch) { - new EMTResearchItem("Thaumium Chainsaw", "EMT", EMTResearchAspects.thaumiumChainsawResearch, -2, -2, 1, new ItemStack(ItemRegistry.thaumiumChainsaw)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumChainsaw)); - } - - if (!EMTConfigHandler.electricGooglesResearch) { - new EMTResearchItem("Electric Goggles", "EMT", EMTResearchAspects.electricGogglesResearch, 1, -2, 1, new ItemStack(ItemRegistry.electricGoggles)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricGoggles)); - } - - if (!EMTConfigHandler.electricGooglesResearch) { - if (!EMTConfigHandler.nanoGooglesResearch) { - ; - new EMTResearchItem("Nanosuit Goggles of Revealing", "EMT", EMTResearchAspects.thaumicNanoHelmet, 2, -2, 2, new ItemStack(ItemRegistry.nanoThaumicHelmet)).setParents("Electric Goggles").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumicNanoHelmet)); - } - } - - if (!EMTConfigHandler.electricGooglesResearch) { - if (!EMTConfigHandler.nanoGooglesResearch) { - if (!EMTConfigHandler.quantumGooglesResearch) { - new EMTResearchItem("Quantum Goggles of Revealing", "EMT", EMTResearchAspects.thaumicQuantumHelmet, 3, -2, 3, new ItemStack(ItemRegistry.quantumThaumicHelmet)).setParents("Nanosuit Goggles of Revealing").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumicQuantumHelmet)); - } - } - } - - if (!EMTConfigHandler.ironOmnitoolResearch) { - new EMTResearchItem("Iron Omnitool", "EMT", new AspectList(), -2, 0, 0, new ItemStack(ItemRegistry.ironOmnitool)).setParents("Electric Magic Tools").setRound().setAutoUnlock().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.ironOmnitool)); - } - - if (!EMTConfigHandler.ironOmnitoolResearch) { - if (!EMTConfigHandler.diamondOmnitoolResearch) { - new EMTResearchItem("Diamond Omnitool", "EMT", EMTResearchAspects.diamondOmnitoolResearch, -4, 0, 1, new ItemStack(ItemRegistry.diamondOmnitool)).setSecondary().setParents("Iron Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.diamondOmnitool), new ResearchPage(RecipeRegistry.ironOmnitoolToDiamond)); - } - } - - if (!EMTConfigHandler.thaumiumDrillResearch && !EMTConfigHandler.thaumiumChainsawResearch) { - if (!EMTConfigHandler.thaumiumOmnitoolResearch) { - new EMTResearchItem("Thaumium Omnitool", "EMT", EMTResearchAspects.thaumiumOmnitoolResearch, -6, 0, 2, new ItemStack(ItemRegistry.thaumiumOmnitool)).setParentsHidden("Thaumium Drill", "Thaumium Chainsaw").setParents("Diamond Omnitool").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumOmnitool), - new ResearchPage(RecipeRegistry.diamondOmnitoolToThaumium)); - } - } - - if (!EMTConfigHandler.explosionFocusResearch) { - new EMTResearchItem("Explosion Focus", "EMT", EMTResearchAspects.laserFocusResearch, 2, 3, 2, new ItemStack(ItemRegistry.explosionFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.explosionFocus)); - } - - if (!EMTConfigHandler.christmasFocusResearch) { - new EMTResearchItem("Kris-tmas Focus", "EMT", EMTResearchAspects.christmasFocusResearch, 3, 3, 1, new ItemStack(ItemRegistry.christmasFocus)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.christmasFocus)); - } - - if (!EMTConfigHandler.shieldFocusResearch) { - new EMTResearchItem("Shield Focus", "EMT", EMTResearchAspects.shieldFocusResearch, 4, 3, 2, new ItemStack(ItemRegistry.shieldFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.shieldFocus)); - } - - if (!EMTConfigHandler.shieldFocusResearch) { - if (!EMTConfigHandler.shieldBlockResearch) { - new EMTResearchItem("Shield Block", "EMT", EMTResearchAspects.shieldBlockResearch, 4, 5, 1, new ItemStack(BlockRegistry.shield)).setSecondary().setParents("Shield Focus").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.shieldBlock)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - new EMTResearchItem("Potentia Generator", "EMT", EMTResearchAspects.potentiaGeneratorResearch, -2, 3, 3, new ItemStack(BlockRegistry.essentiaGens, 1, 0)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.potentiaGenerator)); - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.ignisGeneratorResearch) { - new EMTResearchItem("Ignis Generator", "EMT", EMTResearchAspects.ignisGeneratorResearch, -3, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 1)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.ignisGenerator)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.auramGeneratorResearch) { - new EMTResearchItem("Auram Generator", "EMT", EMTResearchAspects.auramGeneratorResearch, -1, 4, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 2)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.auramGenerator)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.arborGeneratorResearch) { - new EMTResearchItem("Arbor Generator", "EMT", EMTResearchAspects.arborGeneratorResearch, -2, 5, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 3)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.arborGenerator)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.aerGeneratorResearch) { - new EMTResearchItem("Aer Generator", "EMT", EMTResearchAspects.aerGenerator, -2, 6, 1, new ItemStack(BlockRegistry.essentiaGens, 1, 4)).setSecondary().setParents("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.aerGenerator)); - } - } - - if (!EMTConfigHandler.potentiaGeneratorResearch) { - if (!EMTConfigHandler.wandChargingSationResearch) { - new EMTResearchItem("Industrial Wand Charging Station", "EMT", EMTResearchAspects.wandCharger, -4, 2, 3, new ItemStack(BlockRegistry.emtMachines, 1, 0)).setParents("Potentia Generator").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.wandRecharger)); - } - } - - if (!EMTConfigHandler.thaumiumChainsawResearch) { - if (!EMTConfigHandler.streamChainsawResearch) { - new EMTResearchItem("Chainsaw of the Stream", "EMT", EMTResearchAspects.streamChainsawResearch, -3, -4, 3, new ItemStack(ItemRegistry.streamChainsaw)).setParents("Thaumium Chainsaw").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.streamChainsaw)); - } - } - - if (!EMTConfigHandler.thaumiumDrillResearch) { - if (!EMTConfigHandler.rockbreakerDrillResearch) { - new EMTResearchItem("Drill of the Rockbreaker", "EMT", EMTResearchAspects.rockbreakerDrillResearch, 0, -4, 3, new ItemStack(ItemRegistry.rockbreakerDrill)).setParents("Thaumium Drill").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.rockbreakerDrill)); - } - } - - if (!EMTConfigHandler.tinyUraniumResearch) { - new EMTResearchItem("Tiny Uranium", "EMT", EMTResearchAspects.tinyUraniumResearch, -5, -5, 1, IC2Items.getItem("Uran238")).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.tinyUranium)); - } - - if (!EMTConfigHandler.thorHammerResearch) { - new EMTResearchItem("Mjolnir", "EMT", EMTResearchAspects.thorHammerResearch, -5, 5, 3, new ItemStack(ItemRegistry.thorHammer)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thorHammer)); - } - - if (!EMTConfigHandler.thorHammerResearch) { - if (!EMTConfigHandler.superchargedThorHammerResearch) { - new EMTResearchItem("Supercharged Mjolnir", "EMT", EMTResearchAspects.superchargedThorHammerResearch, -6, 6, 3, new ItemStack(ItemRegistry.electricThorHammer)).setParents("Mjolnir").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.superchargedThorHammer)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - new EMTResearchItem("Compressed Solars", "EMT", EMTResearchAspects.compressedSolars, -4, -5, 2, new ItemStack(BlockRegistry.emtSolars)).setParentsHidden("Potentia Generator").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.compressedSolar), new ResearchPage(RecipeRegistry.doubleCompressedSolar), - new ResearchPage(RecipeRegistry.tripleCompressedSolar)); - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.solarHelmetResearch) { - new EMTResearchItem("Solar Helmet of Revealing", "EMT", EMTResearchAspects.solarHelmetRevealing, -2, -5, 1, new ItemStack(ItemRegistry.solarHelmetRevealing)).setSecondary().setParents("Compressed Solars").setParentsHidden("Quantum Goggles of Revealing").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.solarHelmetRevealing)); - } - } - - if (!EMTConfigHandler.electricBootsResearch) { - new EMTResearchItem("Electric Boots of the Traveller", "EMT", EMTResearchAspects.electricBootsTravel, 2, 0, 1, new ItemStack(ItemRegistry.electricBootsTraveller)).setSecondary().setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricBootsTravel)); - } - - if (!EMTConfigHandler.electricBootsResearch) { - if (!EMTConfigHandler.nanoBootsResearch) { - new EMTResearchItem("Nano Boots of the Traveller", "EMT", EMTResearchAspects.nanoBootsTravel, 4, 0, 2, new ItemStack(ItemRegistry.nanoBootsTraveller)).setParents("Electric Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.nanoBootsTravel)); - } - } - - if (!EMTConfigHandler.electricBootsResearch) { - if (!EMTConfigHandler.nanoBootsResearch) { - if (!EMTConfigHandler.quantumBootsResearch) { - new EMTResearchItem("Quantum Boots of the Traveller", "EMT", EMTResearchAspects.quantumBootsTravel, 6, 0, 3, new ItemStack(ItemRegistry.quantumBootsTraveller)).setParents("Nano Boots of the Traveller").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.quantumBootsTravel)); - } - } - } - - if (!EMTConfigHandler.electricScribingToolsResearch) { - new EMTResearchItem("Electric Scribing Tools", "EMT", EMTResearchAspects.electricScribingTools, -6, -5, 1, new ItemStack(ItemRegistry.electricScribingTools)).setSecondary().setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricScribingTools)); - } - - if (!EMTConfigHandler.etherealProcessorResearch) { - new EMTResearchItem("Etheral Processor", "EMT", EMTResearchAspects.etherealProcessor, -1, 2, 2, new ItemStack(BlockRegistry.emtMachines, 1, 1)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.etheralProcessor)); - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.waterSolarsResearch) { - new EMTResearchItem("Water Infused Solar Panels", "EMT", EMTResearchAspects.waterSolars, -7, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 3)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.waterSolar), new ResearchPage(RecipeRegistry.doubleWaterSolar), - new ResearchPage(RecipeRegistry.tripleWaterSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.darkSolarsResearch) { - new EMTResearchItem("Entropy Infused Solar Panels", "EMT", EMTResearchAspects.darkSolars, -8, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 6)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.darkSolar), new ResearchPage(RecipeRegistry.doubleDarkSolar), - new ResearchPage(RecipeRegistry.tripleDarkSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.orderSolarsResearch) { - new EMTResearchItem("Order Infused Solar Panels", "EMT", EMTResearchAspects.orderSolars, -6, -8, 1, new ItemStack(BlockRegistry.emtSolars, 1, 9)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.orderSolar), new ResearchPage(RecipeRegistry.doubleOrderSolar), - new ResearchPage(RecipeRegistry.tripleOrderSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.fireSolarsResearch) { - new EMTResearchItem("Fire Infused Solar Panels", "EMT", EMTResearchAspects.fireSolars, -5, -7, 1, new ItemStack(BlockRegistry.emtSolars, 1, 12)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.fireSolar), new ResearchPage(RecipeRegistry.doubleFireSolar), - new ResearchPage(RecipeRegistry.tripleFireSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.airSolarsResearch) { - new EMTResearchItem("Air Infused Solar Panels", "EMT", EMTResearchAspects.airSolars, -4, -6, 1, new ItemStack(BlockRegistry.emtSolars, 1, 15)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.airSolar), new ResearchPage(RecipeRegistry.doubleAirSolar), new ResearchPage(RecipeRegistry.tripleAirSolar)); - } - } - - if (!EMTConfigHandler.compressedSolarsResearch) { - if (!EMTConfigHandler.earthSolarsResearch) { - new EMTResearchItem("Earth Infused Solar Panels", "EMT", EMTResearchAspects.earthSolars, -6, -7, 1, new ItemStack(BlockRegistry.emtSolars2, 1, 2)).setSecondary().setParents("Compressed Solars").registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.earthSolar), new ResearchPage(RecipeRegistry.doubleEarthSolar), - new ResearchPage(RecipeRegistry.tripleEarthSolar)); - } - } - - if (!EMTConfigHandler.uuMInfusionResearch) { - new EMTResearchItem("UU-Matter Infusion", "EMT", EMTResearchAspects.uuMInfusion, 5, 5, 3, new ItemStack(ItemRegistry.itemEMTItems, 1, 15)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.uuMCrystal), new ResearchPage(RecipeRegistry.charcoalToCoal), - new ResearchPage(RecipeRegistry.glowstoneDustToBlock), new ResearchPage(RecipeRegistry.stoneBricksToIronOre), new ResearchPage(RecipeRegistry.arcaneStoneToCopperOre), new ResearchPage(RecipeRegistry.arcaneStoneBricksToTinOre), new ResearchPage(RecipeRegistry.amberBlockToLeadOre), new ResearchPage(RecipeRegistry.amberBricksToUraniumOre), - new ResearchPage(RecipeRegistry.shardToResin), new ResearchPage(RecipeRegistry.shardToRedstone), new ResearchPage(RecipeRegistry.shardToLapis), new ResearchPage(RecipeRegistry.ironToGold), new ResearchPage(RecipeRegistry.goldToDiamond), new ResearchPage(RecipeRegistry.diamondToUranium), new ResearchPage(RecipeRegistry.uraniumToIridium)); - } - - if (!EMTConfigHandler.portableNodeResarch) { - new EMTResearchItem("Portable Node", "EMT", EMTResearchAspects.portableNode, 2, 5, 3, new ItemStack(BlockRegistry.portableNode)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.portableNode)); - } - - if (!EMTConfigHandler.electricHoeGrowthResearch) { - new EMTResearchItem("Electric Hoe of Growth", "EMT", EMTResearchAspects.electricHoeGrowth, -1, -4, 2, new ItemStack(ItemRegistry.electricHoeGrowth)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.electricHoeGrowth)); - } - - if (!EMTConfigHandler.chargeFocusResearch) { - new EMTResearchItem("Wand Focus: Charging", "EMT", EMTResearchAspects.chargeFocus, 5, 3, 2, new ItemStack(ItemRegistry.chargeFocus)).setParents("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.chargeFocus)); - } - - if (!EMTConfigHandler.wandChargeFocusResearch) { - new EMTResearchItem("Wand Focus: Wand Charging", "EMT", EMTResearchAspects.wandChargeFocus, 7, 3, 3, new ItemStack(ItemRegistry.wandChargeFocus)).setParents("Wand Focus: Charging").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.wandChargeFocus)); - } - - if (!EMTConfigHandler.inventoryChargingRing) { - new EMTResearchItem("Inventory Charging Ring", "EMT", EMTResearchAspects.inventoryChargingRing, 0, -5, 3, new ItemStack(ItemRegistry.emtBauble, 1, 1)).setParentsHidden("Electric Magic Tools").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.inventoryChargingRing)); - } - - if (!EMTConfigHandler.armorChargingRing) { - new EMTResearchItem("Armor Charging Ring", "EMT", EMTResearchAspects.armorChargingRing, 0, -7, 3, new ItemStack(ItemRegistry.emtBauble, 1, 0)).setSecondary().setParents("Inventory Charging Ring").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.armorChargingRing)); - } - - if (!EMTConfigHandler.thaumiumWingResearch) { - new EMTResearchItem("Thaumium Reinforced Wings", "EMT", EMTResearchAspects.thaumiumWing, 0, 4, 0, new ItemStack(ItemRegistry.thaumiumWing)).setSecondary().setParents("Feather Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.thaumiumWing), new ResearchPage(RecipeRegistry.thaumiumWings)); - } - - if (!EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.thaumiumWingResearch) { - new EMTResearchItem("Nanosuit Wings", "EMT", EMTResearchAspects.nanoWing, 0, 6, 2, new ItemStack(ItemRegistry.nanoWing)).setParents("Thaumium Reinforced Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.nanoWings)); - } - - if (!EMTConfigHandler.quantumWingsResearch && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch) { - new EMTResearchItem("Quantum Wings", "EMT", EMTResearchAspects.quantumWing, 0, 8, 3, new ItemStack(ItemRegistry.quantumWing)).setParents("Nanosuit Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.quantumWings)); - } - - if (!EMTConfigHandler.infusedQuantumChestplate && !EMTConfigHandler.thaumiumWingResearch && !EMTConfigHandler.nanoWingResearch && !EMTConfigHandler.quantumWingsResearch) { - new EMTResearchItem("Infused Quantum Armor", "EMT", EMTResearchAspects.quantumWing, 0, 10, 4, new ItemStack(ItemRegistry.quantumArmor)).setParents("Quantum Wings").setConcealed().registerResearchItem().setPages(new ResearchPage("1"), new ResearchPage(RecipeRegistry.infusedQuantumArmor)); - } - } -} diff --git a/src/main/resources/assets/electromagictools/lang/ru_RU.lang b/src/main/resources/assets/electromagictools/lang/ru_RU.lang index 33586c5..4d955b0 100644 --- a/src/main/resources/assets/electromagictools/lang/ru_RU.lang +++ b/src/main/resources/assets/electromagictools/lang/ru_RU.lang @@ -94,7 +94,7 @@ item.EMT.focus.charge.name=Набалдашник: Зарядка item.EMT.focus.charge.wand.name=Набалдашник: Зарядка жезла #=============Block Names============= -tile.EMT.electricCloud.name=Электронное облако +tile.EMT.electricCloud.name=Наэлектризованное облако tile.EMT.shield.name=Щит-блок tile.EMT.portablenode.name=Переносной узел tile.EMT.essentia.potentia.name=Potentia генератор @@ -127,6 +127,11 @@ tile.EMT.solar2.doubleearth.name=Наполненная землёй, дважд tile.EMT.solar2.tripleearth.name=Наполненная землёй, трижды сжатая солнечная панель #=============Thaumonomicon============= +emt.rsname.Electric Cloud=Наэлектризованное облако +emt.tag.Electric Cloud=Всё тот же Нитор +emt.text.Electric Cloud.1=Наверное, каждому Тауматургу нравится пламя, которое ещё называют Нитором. Вы, решив сделать его более "живым", сумели наэлектролизвать его.

Теперь, это всё тот же Нитор, но от него ещё и исходят электрические искровые разряды. +emt.text.Electric Cloud.2=Just nothing ATM + emt.rsname.Electric Magic Tools=Electric Magic Tools emt.tag.Electric Magic Tools=Кто сказал что магия и технология не дружат вместе? emt.text.Electric Magic Tools=Кто сказал, что магия не может дружить с технологией? Наши исследователи сотрудничали с лучшими магами школы тауматургов, чтобы приподнести Вам эффективность магии, в сочетании с удобством электроинструментов.