Cleanup and some changes...

This commit is contained in:
fewizz committed 2016-03-16 17:49:28 +03:00
1 parent a39ac3bd74
commit 7b6ec78cd7
125 files changed
+971 -955

No files matched your search

@@ -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!");
}
+13
View File
@@ -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";
}
@@ -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;
@@ -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 {
@@ -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;
@@ -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);
}
}
}
@@ -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);
@@ -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;
}
}
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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) {
@@ -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;
@@ -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 {
@@ -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 {
@@ -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;
@@ -1,4 +1,4 @@
package tombenpotter.emt.client.model;
package emt.client.model;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelBiped;
@@ -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 {
@@ -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
@@ -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;
@@ -1,4 +1,4 @@
package tombenpotter.emt.common.entity;
package emt.entity;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -1,4 +1,4 @@
package tombenpotter.emt.common.entity;
package emt.entity;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package tombenpotter.emt.common.entity;
package emt.entity;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -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() {
@@ -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 {
@@ -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 {
@@ -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;
@@ -1,4 +1,4 @@
package tombenpotter.emt.common.init;
package emt.init;
public class Registry {
public static void register() {
+286
View File
@@ -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));
}
}
}
@@ -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 {
@@ -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();
}
}
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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 {
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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);
}
@@ -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;
@@ -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 {
@@ -1,4 +1,4 @@
package tombenpotter.emt.common.item.block;
package emt.item.block;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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);
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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 {
@@ -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<PacketEMTKeys, IMessage> {
@@ -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 {
@@ -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 {
@@ -1,4 +1,4 @@
package tombenpotter.emt.common.tile;
package emt.tile;
import net.minecraft.tileentity.TileEntity;
import thaumcraft.client.fx.ParticleEngine;
@@ -1,4 +1,4 @@
package tombenpotter.emt.common.tile;
package emt.tile;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
@@ -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 {
@@ -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 {
@@ -1,4 +1,4 @@
package tombenpotter.emt.common.tile;
package emt.tile;
import thaumcraft.api.nodes.NodeModifier;
import thaumcraft.api.nodes.NodeType;
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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);
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
Loaded 100 of 125 files, more files were not shown because too many files have changed in this diff. Show more