diff --git a/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java index a458783..ea96d41 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ModuleRegistry.java @@ -4,6 +4,7 @@ import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.common.modules.base.BaseRecipeRegistry; import tombenpotter.emt.common.modules.base.blocks.BaseBlockRegistry; import tombenpotter.emt.common.modules.base.items.BaseItemRegistry; +import tombenpotter.emt.common.modules.base.tile.BaseTileRegistry; import tombenpotter.emt.common.modules.ic2.IC2RecipeRegistry; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.modules.ic2.items.IC2ItemRegistry; @@ -21,6 +22,7 @@ public class ModuleRegistry { BaseBlockRegistry.registerBaseBlocks(); BaseItemRegistry.registerItems(); + BaseTileRegistry.registerBaseTiles(); BaseRecipeRegistry.registerRecipes(); if (ConfigHandler.enableIC2Module) { diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BaseBlockRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BaseBlockRegistry.java index 895c797..717b103 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BaseBlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BaseBlockRegistry.java @@ -1,8 +1,19 @@ package tombenpotter.emt.common.modules.base.blocks; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import tombenpotter.emt.ModInformation; + public class BaseBlockRegistry { - public static void registerBaseBlocks() { + public static Block portableNode; + public static Block toolRefiller; - } + public static void registerBaseBlocks() { + portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode"); + GameRegistry.registerBlock(portableNode, "PortableNode"); + toolRefiller = new BlockToolRefiller("toolRefiller", Material.iron, "tool_refiller", Block.soundTypeMetal, 4.0F); + GameRegistry.registerBlock(toolRefiller, "ToolRefiller"); + } } diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBase.java b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBase.java index 050b3a1..d36a860 100644 --- a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBase.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBase.java @@ -5,24 +5,24 @@ import net.minecraft.block.material.Material; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; -public class BlockBase extends Block { +public abstract class BlockBase extends Block { - public BlockBase(String unlocName, Material material, String textureName, SoundType soundType, float hardness) { - super(material); + public BlockBase(String unlocName, Material material, String textureName, SoundType soundType, float hardness) { + super(material); - setBlockName(ModInformation.modid + ".module.base." + unlocName); - setBlockTextureName(ModInformation.texturePath + ":" + textureName); - setCreativeTab(ElectroMagicTools.tabEMT); - setStepSound(soundType); - setHardness(hardness); - } + setBlockName(ModInformation.modid + ".module.base." + unlocName); + setBlockTextureName(ModInformation.texturePath + ":" + textureName); + setCreativeTab(ElectroMagicTools.tabEMT); + setStepSound(soundType); + setHardness(hardness); + } - public BlockBase(String unlocName, Material material, SoundType soundType, float hardness) { - super(material); + public BlockBase(String unlocName, Material material, SoundType soundType, float hardness) { + super(material); - setBlockName(ModInformation.modid + ".module.base." + unlocName); - setCreativeTab(ElectroMagicTools.tabEMT); - setStepSound(soundType); - setHardness(hardness); - } + setBlockName(ModInformation.modid + ".module.base." + unlocName); + setCreativeTab(ElectroMagicTools.tabEMT); + setStepSound(soundType); + setHardness(hardness); + } } \ No newline at end of file diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBaseContainer.java b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBaseContainer.java new file mode 100644 index 0000000..de107a7 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockBaseContainer.java @@ -0,0 +1,92 @@ +package tombenpotter.emt.common.modules.base.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +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.modules.base.tile.TileEntityEMT; + +public abstract class BlockBaseContainer extends BlockContainer { + + public IIcon[] top = new IIcon[16]; + public IIcon[] bottom = new IIcon[16]; + public IIcon[] side = new IIcon[16]; + public IIcon[] frontOff = new IIcon[16]; + public IIcon[] frontOn = new IIcon[16]; + + public BlockBaseContainer(String unlocName, Material material, SoundType soundType, float hardness) { + super(material); + + setBlockName(ModInformation.modid + ".module.base." + unlocName); + setCreativeTab(ElectroMagicTools.tabEMT); + setStepSound(soundType); + setHardness(hardness); + } + + @Override + public TileEntity createNewTileEntity(World var1, int var2) { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(IBlockAccess access, int x, int y, int z, int side) { + TileEntityEMT tile = (TileEntityEMT) access.getTileEntity(x, y, z); + int i = access.getBlockMetadata(x, y, z); + + if (side == 0) { + return this.bottom[i]; + } else if (side == 1) { + return this.top[i]; + } else if (side != tile.facing) { + return this.side[i]; + } else if (tile.isOn) { + return this.frontOn[i]; + } else { + return this.frontOff[i]; + } + } + + @Override + public IIcon getIcon(int side, int meta) { + if (side < 1) { + return this.bottom[meta]; + } + if (side == 1) { + return this.top[meta]; + } + if (side == 3) { + return this.frontOff[meta]; + } + return this.side[meta]; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { + int facing = MathHelper.floor_double(entity.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + TileEntityEMT tile = (TileEntityEMT) world.getTileEntity(x, y, z); + + if (facing == 0) + tile.facing = 2; + else if (facing == 1) + tile.facing = 5; + else if (facing == 2) + tile.facing = 3; + else if (facing == 3) + tile.facing = 4; + } + + @Override + public int damageDropped(int meta) { + return meta; + } +} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockToolRefiller.java b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockToolRefiller.java new file mode 100644 index 0000000..c5f1604 --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/modules/base/blocks/BlockToolRefiller.java @@ -0,0 +1,17 @@ +package tombenpotter.emt.common.modules.base.blocks; + +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class BlockToolRefiller extends BlockBaseContainer { + + public BlockToolRefiller(String unlocName, Material material, SoundType soundType, float hardness) { + super(unlocName, material, soundType, hardness); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return null; + } +} diff --git a/src/main/java/tombenpotter/emt/common/modules/base/tile/BaseTileRegistry.java b/src/main/java/tombenpotter/emt/common/modules/base/tile/BaseTileRegistry.java new file mode 100644 index 0000000..b0b037b --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/modules/base/tile/BaseTileRegistry.java @@ -0,0 +1,10 @@ +package tombenpotter.emt.common.modules.base.tile; + +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseTileRegistry { + + public static void registerBaseTiles() { + GameRegistry.registerTileEntity(TileEntityPortableNode.class, "tileentityportablenode"); + } +} diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEMT.java b/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityEMT.java similarity index 91% rename from src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEMT.java rename to src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityEMT.java index 62b5a4d..f168dc6 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEMT.java +++ b/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityEMT.java @@ -1,4 +1,4 @@ -package tombenpotter.emt.common.modules.ic2.tile; +package tombenpotter.emt.common.modules.base.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -43,10 +43,10 @@ public abstract class TileEntityEMT extends TileEntity { @Override public void markDirty() { - super.markDirty(); // Mark dirty for gamesave + super.markDirty(); if (worldObj.isRemote) { return; } - this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); // Update block + TE via Network + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityToolRefiller.java b/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityToolRefiller.java new file mode 100644 index 0000000..d70532e --- /dev/null +++ b/src/main/java/tombenpotter/emt/common/modules/base/tile/TileEntityToolRefiller.java @@ -0,0 +1,4 @@ +package tombenpotter.emt.common.modules.base.tile; + +public class TileEntityToolRefiller extends TileEntityEMT { +} diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java index 6e2f5bd..90e3db8 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMT.java @@ -11,10 +11,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityEMT; +import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; public abstract class BlockEMT extends BlockContainer { - public IIcon[] top = new IIcon[16]; public IIcon[] bottom = new IIcon[16]; public IIcon[] side = new IIcon[16]; @@ -35,7 +34,6 @@ public abstract class BlockEMT extends BlockContainer { public IIcon getIcon(IBlockAccess access, int x, int y, int z, int side) { TileEntityEMT tile = (TileEntityEMT) access.getTileEntity(x, y, z); int i = access.getBlockMetadata(x, y, z); - if (side == 0) { return this.bottom[i]; } else if (side == 1) { @@ -67,7 +65,6 @@ public abstract class BlockEMT extends BlockContainer { public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entity, ItemStack itemStack) { int facing = MathHelper.floor_double(entity.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; TileEntityEMT tile = (TileEntityEMT) world.getTileEntity(x, y, z); - if (facing == 0) tile.facing = 2; else if (facing == 1) diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java index f921029..089ce40 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTMachines.java @@ -38,8 +38,6 @@ public class BlockEMTMachines extends BlockEMT { public BlockEMTMachines() { super(Material.iron); - this.setCreativeTab(ElectroMagicTools.tabEMT); - this.setHardness(4.0F); } @Override diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java index 0939333..b888575 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars.java @@ -24,6 +24,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.modules.base.blocks.BlockBaseContainer; import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityAirSolar; import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityCompressedSolar; import tombenpotter.emt.common.modules.ic2.tile.solars.compressed.TileEntityDoubleCompressedSolar; @@ -43,7 +44,7 @@ import tombenpotter.emt.common.modules.ic2.tile.solars.water.TileEntityWaterSola import java.util.List; -public class BlockEMTSolars extends BlockEMT { +public class BlockEMTSolars extends BlockBaseContainer { public BlockEMTSolars() { super(Material.iron); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java index 7f33b9d..0731737 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEMTSolars2.java @@ -24,6 +24,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.modules.base.blocks.BlockBaseContainer; import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityDoubleAirSolar; import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityTripleAirSolar; import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityDoubleEarthSolar; @@ -32,7 +33,7 @@ import tombenpotter.emt.common.modules.ic2.tile.solars.earth.TileEntityTripleEar import java.util.List; -public class BlockEMTSolars2 extends BlockEMT { +public class BlockEMTSolars2 extends BlockBaseContainer { public BlockEMTSolars2() { super(Material.iron); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java index af1f924..45bdd6b 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerator.java @@ -11,9 +11,10 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.modules.base.blocks.BlockBaseContainer; import tombenpotter.emt.common.modules.ic2.tile.generators.TileEntityEssentiaGenerator; -public class BlockEssentiaGenerator extends BlockEMT { +public class BlockEssentiaGenerator extends BlockBaseContainer { public BlockEssentiaGenerator() { super(Material.iron); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java index dc9b317..8a705db 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/BlockEssentiaGenerators.java @@ -23,12 +23,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tombenpotter.emt.ElectroMagicTools; import tombenpotter.emt.ModInformation; +import tombenpotter.emt.common.modules.base.blocks.BlockBaseContainer; import tombenpotter.emt.common.modules.ic2.tile.generators.*; import java.util.List; import java.util.Random; -public class BlockEssentiaGenerators extends BlockEMT { +public class BlockEssentiaGenerators extends BlockBaseContainer { public BlockEssentiaGenerators() { super(Material.iron); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java index 42fd011..2c56429 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/blocks/IC2BlockRegistry.java @@ -16,7 +16,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import tombenpotter.emt.ModInformation; import tombenpotter.emt.common.modules.ic2.items.blocks.*; -import tombenpotter.emt.common.modules.base.blocks.BlockPortableNode; public class IC2BlockRegistry { @@ -25,16 +24,12 @@ public class IC2BlockRegistry { public static Block emtSolars; public static Block emtMachines; public static Block emtSolars2; - public static Block portableNode; public static Block essentiaGenerator; public static void registerBlocks() { shield = new BlockShield().setBlockName(ModInformation.modid + ".shield"); GameRegistry.registerBlock(shield, "ShieldBlock"); - portableNode = new BlockPortableNode().setBlockName(ModInformation.modid + ".portablenode"); - GameRegistry.registerBlock(portableNode, "PortableNode"); - emtSolars = new BlockEMTSolars().setBlockName(ModInformation.modid + ".emtsolars"); GameRegistry.registerBlock(emtSolars, ItemBlockEMTSolars.class, "EMTSolars"); diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java index 51a6e8d..ffc0ad8 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/IC2TileRegistry.java @@ -13,7 +13,6 @@ package tombenpotter.emt.common.modules.ic2.tile; import cpw.mods.fml.common.registry.GameRegistry; -import tombenpotter.emt.common.modules.base.tile.TileEntityPortableNode; import tombenpotter.emt.common.modules.ic2.tile.generators.*; import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityAirSolar; import tombenpotter.emt.common.modules.ic2.tile.solars.air.TileEntityDoubleAirSolar; @@ -69,7 +68,6 @@ public class IC2TileRegistry { GameRegistry.registerTileEntity(TileEntityEarthSolar.class, "tileentityearthsolar"); GameRegistry.registerTileEntity(TileEntityDoubleEarthSolar.class, "tileentitydoubleearthsolar"); GameRegistry.registerTileEntity(TileEntityTripleEarthSolar.class, "tileentitytripleearthsolar"); - GameRegistry.registerTileEntity(TileEntityPortableNode.class, "tileentityportablenode"); GameRegistry.registerTileEntity(TileEntityEssentiaGenerator.class, "tileentityessentiagenerator"); } } diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java index ca79530..22f7d1e 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityEtherealMacerator.java @@ -25,6 +25,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.ConfigItems; +import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; import tombenpotter.emt.common.modules.ic2.blocks.IC2BlockRegistry; import tombenpotter.emt.common.util.ConfigHandler; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java index a16e501..6c436c5 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/TileEntityIndustrialWandRecharge.java @@ -20,6 +20,7 @@ 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.modules.base.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory { diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java index 840d546..52b192d 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityBaseGenerator.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityEMT; +import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; public abstract class TileEntityBaseGenerator extends TileEntityEMT { diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java index 9adb4cd..604d0a2 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/generators/TileEntityEssentiaGenerator.java @@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.lib.events.EssentiaHandler; -import tombenpotter.emt.common.modules.ic2.tile.TileEntityEMT; +import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; import tombenpotter.emt.common.util.ConfigHandler; import tombenpotter.emt.common.util.EssentiasOutputs; diff --git a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java index 2254951..0d2ef1e 100644 --- a/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java +++ b/src/main/java/tombenpotter/emt/common/modules/ic2/tile/solars/TileEntitySolarBase.java @@ -4,7 +4,7 @@ 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.modules.ic2.tile.TileEntityEMT; +import tombenpotter.emt.common.modules.base.tile.TileEntityEMT; import java.util.Random;