tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Follow Mekanism naming standards

Browse source
This commit is contained in:
Aidan C. Brady 2013-11-16 11:05:04 -05:00
parent 53323279c7
commit ed637e4eed
45 changed files with 203 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/induction/client/fx/FXElectricBolt.java → common/mekanism/induction/client/FXElectricBolt.java
View file

@ -1,4 +1,4 @@
package mekanism.induction.client.fx;
package mekanism.induction.client;
import static org.lwjgl.opengl.GL11.GL_BLEND;
import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;

11
common/mekanism/induction/client/InductionClientProxy.java
View file

@ -1,6 +1,5 @@
package mekanism.induction.client;
import mekanism.induction.client.fx.FXElectricBolt;
import mekanism.induction.client.gui.GuiBattery;
import mekanism.induction.client.gui.GuiMultimeter;
import mekanism.induction.client.render.BlockRenderingHandler;
@ -10,11 +9,11 @@ import mekanism.induction.client.render.RenderMultimeter;
import mekanism.induction.client.render.RenderTesla;
import mekanism.induction.client.render.RenderWire;
import mekanism.induction.common.InductionCommonProxy;
import mekanism.induction.common.battery.TileEntityBattery;
import mekanism.induction.common.contractor.TileEntityEMContractor;
import mekanism.induction.common.multimeter.TileEntityMultimeter;
import mekanism.induction.common.tesla.TileEntityTesla;
import mekanism.induction.common.wire.TileEntityWire;
import mekanism.induction.common.tileentity.TileEntityBattery;
import mekanism.induction.common.tileentity.TileEntityEMContractor;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
import mekanism.induction.common.tileentity.TileEntityTesla;
import mekanism.induction.common.tileentity.TileEntityWire;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;

4
common/mekanism/induction/client/gui/GuiBattery.java
View file

@ -1,8 +1,8 @@
package mekanism.induction.client.gui;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.battery.ContainerBattery;
import mekanism.induction.common.battery.TileEntityBattery;
import mekanism.induction.common.inventory.container.ContainerBattery;
import mekanism.induction.common.tileentity.TileEntityBattery;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;

4
common/mekanism/induction/client/gui/GuiMultimeter.java
View file

@ -10,8 +10,8 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTileEntity;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.multimeter.ContainerMultimeter;
import mekanism.induction.common.multimeter.TileEntityMultimeter;
import mekanism.induction.common.inventory.container.ContainerMultimeter;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.inventory.GuiContainer;

8
common/mekanism/induction/client/render/BlockRenderingHandler.java
View file

@ -3,10 +3,10 @@
*/
package mekanism.induction.client.render;
import mekanism.induction.common.battery.BlockBattery;
import mekanism.induction.common.contractor.BlockEMContractor;
import mekanism.induction.common.multimeter.BlockMultimeter;
import mekanism.induction.common.tesla.BlockTesla;
import mekanism.induction.common.block.BlockBattery;
import mekanism.induction.common.block.BlockEMContractor;
import mekanism.induction.common.block.BlockMultimeter;
import mekanism.induction.common.block.BlockTesla;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.IBlockAccess;

4
common/mekanism/induction/client/render/RenderBattery.java
View file

@ -7,7 +7,7 @@ import java.util.Random;
import mekanism.induction.client.model.ModelBattery;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.battery.TileEntityBattery;
import mekanism.induction.common.tileentity.TileEntityBattery;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
@ -71,7 +71,7 @@ public class RenderBattery extends TileEntitySpecialRenderer
{
if (this.fakeBattery == null)
{
this.fakeBattery = new EntityItem(t.worldObj, 0, 0, 0, new ItemStack(MekanismInduction.itemCapacitor));
this.fakeBattery = new EntityItem(t.worldObj, 0, 0, 0, new ItemStack(MekanismInduction.Capacitor));
this.fakeBattery.age = 10;
}

2
common/mekanism/induction/client/render/RenderEMContractor.java
View file

@ -2,7 +2,7 @@ package mekanism.induction.client.render;
import mekanism.induction.client.model.ModelEMContractor;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.contractor.TileEntityEMContractor;
import mekanism.induction.common.tileentity.TileEntityEMContractor;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;

2
common/mekanism/induction/client/render/RenderMultimeter.java
View file

@ -2,7 +2,7 @@ package mekanism.induction.client.render;
import mekanism.induction.client.model.ModelMultimeter;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.multimeter.TileEntityMultimeter;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;

2
common/mekanism/induction/client/render/RenderWire.java
View file

@ -3,8 +3,8 @@ package mekanism.induction.client.render;
import mekanism.induction.client.model.ModelInsulation;
import mekanism.induction.client.model.ModelWire;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.tileentity.TileEntityWire;
import mekanism.induction.common.wire.EnumWireMaterial;
import mekanism.induction.common.wire.TileEntityWire;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;

2
common/mekanism/induction/common/battery/BatteryManager.java → common/mekanism/induction/common/BatteryManager.java
View file

@ -1,4 +1,4 @@
package mekanism.induction.common.battery;
package mekanism.induction.common;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;

4
common/mekanism/induction/common/battery/BatteryUpdateProtocol.java → common/mekanism/induction/common/BatteryUpdateProtocol.java
View file

@ -1,11 +1,11 @@
package mekanism.induction.common.battery;
package mekanism.induction.common;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import mekanism.induction.common.base.ListUtil;
import mekanism.induction.common.tileentity.TileEntityBattery;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;

8
common/mekanism/induction/common/InductionCommonProxy.java
View file

@ -3,10 +3,10 @@
*/
package mekanism.induction.common;
import mekanism.induction.common.battery.ContainerBattery;
import mekanism.induction.common.battery.TileEntityBattery;
import mekanism.induction.common.multimeter.ContainerMultimeter;
import mekanism.induction.common.multimeter.TileEntityMultimeter;
import mekanism.induction.common.inventory.container.ContainerBattery;
import mekanism.induction.common.inventory.container.ContainerMultimeter;
import mekanism.induction.common.tileentity.TileEntityBattery;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;

2
common/mekanism/induction/common/base/InventoryUtil.java → common/mekanism/induction/common/InventoryUtil.java
View file

@ -1,4 +1,4 @@
package mekanism.induction.common.base;
package mekanism.induction.common;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;

2
common/mekanism/induction/common/base/ListUtil.java → common/mekanism/induction/common/ListUtil.java
View file

@ -1,4 +1,4 @@
package mekanism.induction.common.base;
package mekanism.induction.common;
import java.util.ArrayList;
import java.util.Arrays;

102
common/mekanism/induction/common/MekanismInduction.java
View file

@ -7,25 +7,27 @@ import java.util.Map;
import java.util.logging.Logger;
import mekanism.common.IModule;
import mekanism.common.Mekanism;
import mekanism.common.Version;
import mekanism.induction.common.battery.BlockBattery;
import mekanism.induction.common.battery.ItemCapacitor;
import mekanism.induction.common.battery.ItemInfiniteCapacitor;
import mekanism.induction.common.battery.TileEntityBattery;
import mekanism.induction.common.contractor.BlockEMContractor;
import mekanism.induction.common.contractor.ItemBlockContractor;
import mekanism.induction.common.contractor.TileEntityEMContractor;
import mekanism.induction.common.entangler.ItemLinker;
import mekanism.induction.common.multimeter.BlockMultimeter;
import mekanism.induction.common.multimeter.ItemBlockMultimeter;
import mekanism.induction.common.multimeter.MultimeterEventHandler;
import mekanism.induction.common.multimeter.TileEntityMultimeter;
import mekanism.induction.common.tesla.BlockTesla;
import mekanism.induction.common.tesla.TileEntityTesla;
import mekanism.induction.common.wire.BlockWire;
import mekanism.induction.common.block.BlockAdvancedFurnace;
import mekanism.induction.common.block.BlockBattery;
import mekanism.induction.common.block.BlockEMContractor;
import mekanism.induction.common.block.BlockMultimeter;
import mekanism.induction.common.block.BlockTesla;
import mekanism.induction.common.block.BlockWire;
import mekanism.induction.common.item.ItemBlockContractor;
import mekanism.induction.common.item.ItemBlockMultimeter;
import mekanism.induction.common.item.ItemBlockWire;
import mekanism.induction.common.item.ItemCapacitor;
import mekanism.induction.common.item.ItemInfiniteCapacitor;
import mekanism.induction.common.item.ItemLinker;
import mekanism.induction.common.tileentity.TileEntityAdvancedFurnace;
import mekanism.induction.common.tileentity.TileEntityBattery;
import mekanism.induction.common.tileentity.TileEntityEMContractor;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
import mekanism.induction.common.tileentity.TileEntityTesla;
import mekanism.induction.common.tileentity.TileEntityWire;
import mekanism.induction.common.wire.EnumWireMaterial;
import mekanism.induction.common.wire.ItemBlockWire;
import mekanism.induction.common.wire.TileEntityWire;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -122,17 +124,17 @@ public class MekanismInduction implements IModule
}
// Items
public static Item itemCapacitor;
public static Item itemInfiniteCapacitor;
public static Item itemLinker;
public static Item Capacitor;
public static Item InfiniteCapacitor;
public static Item Linker;
/** With Forge Multipart; Use EnumWireMaterial reference. **/
private static Item itemPartWire;
// Blocks
public static Block blockTesla;
public static Block blockMultimeter;
public static Block blockEMContractor;
public static Block blockBattery;
public static Block Tesla;
public static Block Multimeter;
public static Block ElectromagneticContractor;
public static Block Battery;
/** Without Forge Multipart **/
private static Block blockWire;
public static Block blockAdvancedFurnaceIdle, blockAdvancedFurnaceBurning;
@ -161,9 +163,9 @@ public class MekanismInduction implements IModule
TileEntityEMContractor.PUSH_DELAY = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Item Push Delay", TileEntityEMContractor.PUSH_DELAY).getInt(TileEntityEMContractor.PUSH_DELAY);
// Items
itemCapacitor = new ItemCapacitor(getNextItemID());
itemLinker = new ItemLinker(getNextItemID());
itemInfiniteCapacitor = new ItemInfiniteCapacitor(getNextItemID());
Capacitor = new ItemCapacitor(MekanismInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "Capacitor", getNextItemID()).getInt()).setUnlocalizedName("Capacitor");
Linker = new ItemLinker(MekanismInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "Linker", getNextItemID()).getInt()).setUnlocalizedName("Linker");
InfiniteCapacitor = new ItemInfiniteCapacitor(MekanismInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "InfiniteCapacitor", getNextItemID()).getInt()).setUnlocalizedName("InfiniteCapacitor");
if (Loader.isModLoaded("ForgeMultipart"))
{
@ -178,10 +180,10 @@ public class MekanismInduction implements IModule
}
// Blocks
blockTesla = new BlockTesla(getNextBlockID());
blockMultimeter = new BlockMultimeter(getNextBlockID());
blockEMContractor = new BlockEMContractor(getNextBlockID());
blockBattery = new BlockBattery(getNextBlockID());
Tesla = new BlockTesla(Mekanism.configuration.getBlock("Tesla", getNextBlockID()).getInt()).setUnlocalizedName("Tesla");
Multimeter = new BlockMultimeter(Mekanism.configuration.getBlock("Multimeter", getNextBlockID()).getInt()).setUnlocalizedName("Multimeter");
ElectromagneticContractor = new BlockEMContractor(Mekanism.configuration.getBlock("ElectromagneticContractor", getNextBlockID()).getInt()).setUnlocalizedName("ElectromagneticContractor");
Battery = new BlockBattery(Mekanism.configuration.getBlock("Battery", getNextBlockID()).getInt()).setUnlocalizedName("Battery");
if (itemPartWire == null)
{
@ -192,21 +194,23 @@ public class MekanismInduction implements IModule
{
blockAdvancedFurnaceIdle = BlockAdvancedFurnace.createNew(false);
blockAdvancedFurnaceBurning = BlockAdvancedFurnace.createNew(true);
GameRegistry.registerBlock(blockAdvancedFurnaceIdle, "ri_" + blockAdvancedFurnaceIdle.getUnlocalizedName());
GameRegistry.registerBlock(blockAdvancedFurnaceBurning, "ri_" + blockAdvancedFurnaceBurning.getUnlocalizedName() + "2");
GameRegistry.registerTileEntity(TileEntityAdvancedFurnace.class, blockAdvancedFurnaceIdle.getUnlocalizedName());
}
CONFIGURATION.save();
GameRegistry.registerItem(itemCapacitor, itemCapacitor.getUnlocalizedName());
GameRegistry.registerItem(itemInfiniteCapacitor, itemInfiniteCapacitor.getUnlocalizedName());
GameRegistry.registerItem(itemLinker, itemLinker.getUnlocalizedName());
GameRegistry.registerItem(Capacitor, "Capacitor");
GameRegistry.registerItem(InfiniteCapacitor, "InfiniteCapacitor");
GameRegistry.registerItem(Linker, "Linker");
GameRegistry.registerBlock(blockTesla, blockTesla.getUnlocalizedName());
GameRegistry.registerBlock(blockMultimeter, ItemBlockMultimeter.class, blockMultimeter.getUnlocalizedName());
GameRegistry.registerBlock(blockEMContractor, ItemBlockContractor.class, blockEMContractor.getUnlocalizedName());
GameRegistry.registerBlock(blockBattery, blockBattery.getUnlocalizedName());
GameRegistry.registerBlock(Tesla, "Tesla");
GameRegistry.registerBlock(Multimeter, ItemBlockMultimeter.class, "Multimeter");
GameRegistry.registerBlock(ElectromagneticContractor, ItemBlockContractor.class, "ElectromagneticContractor");
GameRegistry.registerBlock(Battery, "Battery");
if (blockWire != null)
{
@ -214,10 +218,10 @@ public class MekanismInduction implements IModule
}
// Tiles
GameRegistry.registerTileEntity(TileEntityTesla.class, blockTesla.getUnlocalizedName());
GameRegistry.registerTileEntity(TileEntityMultimeter.class, blockMultimeter.getUnlocalizedName());
GameRegistry.registerTileEntity(TileEntityEMContractor.class, blockEMContractor.getUnlocalizedName());
GameRegistry.registerTileEntity(TileEntityBattery.class, blockBattery.getUnlocalizedName());
GameRegistry.registerTileEntity(TileEntityTesla.class, "Tesla");
GameRegistry.registerTileEntity(TileEntityMultimeter.class, "Multimeter");
GameRegistry.registerTileEntity(TileEntityEMContractor.class, "ElectromagneticContractor");
GameRegistry.registerTileEntity(TileEntityBattery.class, "Battery");
if (blockWire != null)
{
@ -267,8 +271,8 @@ public class MekanismInduction implements IModule
/**
* Recipes
*/
ItemStack emptyCapacitor = new ItemStack(itemCapacitor);
((IItemElectric) itemCapacitor).setElectricity(emptyCapacitor, 0);
ItemStack emptyCapacitor = new ItemStack(Capacitor);
((IItemElectric) Capacitor).setElectricity(emptyCapacitor, 0);
final ItemStack defaultWire = EnumWireMaterial.IRON.getWire();
@ -276,19 +280,19 @@ public class MekanismInduction implements IModule
GameRegistry.addRecipe(new ShapedOreRecipe(emptyCapacitor, "RRR", "RIR", "RRR", 'R', Item.redstone, 'I', UniversalRecipes.PRIMARY_METAL));
/** Linker **/
GameRegistry.addRecipe(new ShapedOreRecipe(itemLinker, " E ", "GCG", " E ", 'E', Item.eyeOfEnder, 'C', emptyCapacitor, 'G', UniversalRecipes.SECONDARY_METAL));
GameRegistry.addRecipe(new ShapedOreRecipe(Linker, " E ", "GCG", " E ", 'E', Item.eyeOfEnder, 'C', emptyCapacitor, 'G', UniversalRecipes.SECONDARY_METAL));
/** Tesla - by Jyzarc */
GameRegistry.addRecipe(new ShapedOreRecipe(blockTesla, "WEW", " C ", " I ", 'W', defaultWire, 'E', Item.eyeOfEnder, 'C', emptyCapacitor, 'I', UniversalRecipes.PRIMARY_PLATE));
GameRegistry.addRecipe(new ShapedOreRecipe(Tesla, "WEW", " C ", " I ", 'W', defaultWire, 'E', Item.eyeOfEnder, 'C', emptyCapacitor, 'I', UniversalRecipes.PRIMARY_PLATE));
/** Multimeter */
GameRegistry.addRecipe(new ShapedOreRecipe(blockMultimeter, "WWW", "ICI", 'W', defaultWire, 'C', emptyCapacitor, 'I', UniversalRecipes.PRIMARY_METAL));
GameRegistry.addRecipe(new ShapedOreRecipe(Multimeter, "WWW", "ICI", 'W', defaultWire, 'C', emptyCapacitor, 'I', UniversalRecipes.PRIMARY_METAL));
/** Multimeter */
GameRegistry.addRecipe(new ShapedOreRecipe(blockBattery, "III", "IRI", "III", 'R', Block.blockRedstone, 'I', UniversalRecipes.PRIMARY_METAL));
GameRegistry.addRecipe(new ShapedOreRecipe(Battery, "III", "IRI", "III", 'R', Block.blockRedstone, 'I', UniversalRecipes.PRIMARY_METAL));
/** EM Contractor */
GameRegistry.addRecipe(new ShapedOreRecipe(blockEMContractor, " I ", "GCG", "WWW", 'W', UniversalRecipes.PRIMARY_METAL, 'C', emptyCapacitor, 'G', UniversalRecipes.SECONDARY_METAL, 'I', UniversalRecipes.PRIMARY_METAL));
GameRegistry.addRecipe(new ShapedOreRecipe(ElectromagneticContractor, " I ", "GCG", "WWW", 'W', UniversalRecipes.PRIMARY_METAL, 'C', emptyCapacitor, 'G', UniversalRecipes.SECONDARY_METAL, 'I', UniversalRecipes.PRIMARY_METAL));
/** Wires **/
GameRegistry.addRecipe(new ShapedOreRecipe(EnumWireMaterial.COPPER.getWire(3), "MMM", 'M', "ingotCopper"));

2
common/mekanism/induction/common/multimeter/MultimeterEventHandler.java → common/mekanism/induction/common/MultimeterEventHandler.java
View file

@ -1,4 +1,4 @@
package mekanism.induction.common.multimeter;
package mekanism.induction.common;
import java.util.HashMap;

3
common/mekanism/induction/common/contractor/PathfinderEMContractor.java → common/mekanism/induction/common/PathfinderEMContractor.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package mekanism.induction.common.contractor;
package mekanism.induction.common;
import java.util.ArrayList;
import java.util.HashMap;
@ -9,6 +9,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import mekanism.induction.common.tileentity.TileEntityEMContractor;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;

4
common/mekanism/induction/common/battery/SynchronizedBatteryData.java → common/mekanism/induction/common/SynchronizedBatteryData.java
View file

@ -1,11 +1,11 @@
package mekanism.induction.common.battery;
package mekanism.induction.common;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import mekanism.induction.common.base.ListUtil;
import mekanism.induction.common.tileentity.TileEntityBattery;
import net.minecraft.item.ItemStack;
import universalelectricity.core.item.IItemElectric;
import universalelectricity.core.vector.Vector3;

2
common/mekanism/induction/common/tesla/TeslaGrid.java → common/mekanism/induction/common/TeslaGrid.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package mekanism.induction.common.tesla;
package mekanism.induction.common;
import java.util.HashSet;
import java.util.Iterator;

2
common/mekanism/induction/common/contractor/ThreadEMPathfinding.java → common/mekanism/induction/common/ThreadEMPathfinding.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package mekanism.induction.common.contractor;
package mekanism.induction.common;
import universalelectricity.core.vector.Vector3;

26
common/mekanism/induction/common/base/BlockBase.java
View file

@ -1,26 +0,0 @@
/**
*
*/
package mekanism.induction.common.base;
import mekanism.common.Mekanism;
import mekanism.induction.common.MekanismInduction;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
/**
* @author Calclavia
*
*/
public class BlockBase extends Block
{
public BlockBase(String name, int id)
{
super(MekanismInduction.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), Material.piston);
this.setCreativeTab(Mekanism.tabMekanism);
this.setUnlocalizedName(MekanismInduction.PREFIX + name);
this.setTextureName(MekanismInduction.PREFIX + name);
this.setHardness(1f);
}
}

22
common/mekanism/induction/common/base/ItemBase.java
View file

@ -1,22 +0,0 @@
package mekanism.induction.common.base;
import mekanism.common.Mekanism;
import mekanism.induction.common.MekanismInduction;
import net.minecraft.item.Item;
import net.minecraftforge.common.Configuration;
/**
*
* @author AidanBrady
*
*/
public class ItemBase extends Item
{
public ItemBase(String name, int id)
{
super(MekanismInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, name, id).getInt(id));
this.setCreativeTab(Mekanism.tabMekanism);
this.setUnlocalizedName(MekanismInduction.PREFIX + name);
this.setTextureName(MekanismInduction.PREFIX + name);
}
}

3
common/mekanism/induction/common/BlockAdvancedFurnace.java → common/mekanism/induction/common/block/BlockAdvancedFurnace.java
View file

@ -1,5 +1,6 @@
package mekanism.induction.common;
package mekanism.induction.common.block;
import mekanism.induction.common.tileentity.TileEntityAdvancedFurnace;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFurnace;
import net.minecraft.creativetab.CreativeTabs;

21
common/mekanism/induction/common/battery/BlockBattery.java → common/mekanism/induction/common/block/BlockBattery.java
View file

@ -1,14 +1,18 @@
/**
*
*/
package mekanism.induction.common.battery;
package mekanism.induction.common.block;
import mekanism.api.induction.ICapacitor;
import mekanism.common.Mekanism;
import mekanism.induction.client.render.BlockRenderingHandler;
import mekanism.induction.common.ListUtil;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.base.BlockBase;
import mekanism.induction.common.base.ListUtil;
import mekanism.induction.common.tileentity.TileEntityBattery;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@ -25,12 +29,15 @@ import cpw.mods.fml.relauncher.SideOnly;
* @author Calclavia
*
*/
public class BlockBattery extends BlockBase implements ITileEntityProvider
public class BlockBattery extends Block implements ITileEntityProvider
{
public BlockBattery(int id)
{
super("battery", id);
this.setTextureName(MekanismInduction.PREFIX + "machine");
super(id, Material.piston);
this.setCreativeTab(Mekanism.tabMekanism);
this.setTextureName("mekanism:machine");
setHardness(5F);
setResistance(10F);
}
@Override
@ -91,7 +98,7 @@ public class BlockBattery extends BlockBase implements ITileEntityProvider
if (!world.isRemote)
{
if(entityPlayer.getCurrentEquippedItem() != null && entityPlayer.getCurrentEquippedItem().itemID == MekanismInduction.blockBattery.blockID)
if(entityPlayer.getCurrentEquippedItem() != null && entityPlayer.getCurrentEquippedItem().itemID == MekanismInduction.Battery.blockID)
{
if(!tileEntity.structure.isMultiblock)
{

19
common/mekanism/induction/common/contractor/BlockEMContractor.java → common/mekanism/induction/common/block/BlockEMContractor.java
View file

@ -1,10 +1,14 @@
package mekanism.induction.common.contractor;
package mekanism.induction.common.block;
import mekanism.common.Mekanism;
import mekanism.induction.client.render.BlockRenderingHandler;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.base.BlockBase;
import mekanism.induction.common.entangler.ItemCoordLink;
import mekanism.induction.common.item.ItemCoordLink;
import mekanism.induction.common.tileentity.TileEntityEMContractor;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
@ -15,12 +19,15 @@ import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockEMContractor extends BlockBase implements ITileEntityProvider
public class BlockEMContractor extends Block implements ITileEntityProvider
{
public BlockEMContractor(int id)
{
super("contractor", id);
this.setTextureName(MekanismInduction.PREFIX + "machine");
super(id, Material.piston);
this.setCreativeTab(Mekanism.tabMekanism);
this.setTextureName("mekanism:machine");
setHardness(5F);
setResistance(10F);
}
@SideOnly(Side.CLIENT)

16
common/mekanism/induction/common/multimeter/BlockMultimeter.java → common/mekanism/induction/common/block/BlockMultimeter.java
View file

@ -1,12 +1,15 @@
/**
*
*/
package mekanism.induction.common.multimeter;
package mekanism.induction.common.block;
import mekanism.common.Mekanism;
import mekanism.induction.client.render.BlockRenderingHandler;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.base.BlockBase;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
@ -24,12 +27,15 @@ import cpw.mods.fml.relauncher.SideOnly;
* @author Calclavia
*
*/
public class BlockMultimeter extends BlockBase implements ITileEntityProvider
public class BlockMultimeter extends Block implements ITileEntityProvider
{
public BlockMultimeter(int id)
{
super("multimeter", id);
this.setTextureName(MekanismInduction.PREFIX + "machine");
super(id, Material.piston);
this.setTextureName("mekanism:machine");
this.setCreativeTab(Mekanism.tabMekanism);
setHardness(5F);
setResistance(10F);
}
@Override

19
common/mekanism/induction/common/tesla/BlockTesla.java → common/mekanism/induction/common/block/BlockTesla.java
View file

@ -1,13 +1,15 @@
/**
*
*/
package mekanism.induction.common.tesla;
package mekanism.induction.common.block;
import mekanism.common.Mekanism;
import mekanism.induction.client.render.BlockRenderingHandler;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.base.BlockBase;
import mekanism.induction.common.entangler.ItemCoordLink;
import mekanism.induction.common.item.ItemCoordLink;
import mekanism.induction.common.tileentity.TileEntityTesla;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.server.MinecraftServer;
@ -21,12 +23,15 @@ import cpw.mods.fml.relauncher.SideOnly;
* @author Calclavia
*
*/
public class BlockTesla extends BlockBase implements ITileEntityProvider
public class BlockTesla extends Block implements ITileEntityProvider
{
public BlockTesla(int id)
{
super("tesla", id);
this.setTextureName(MekanismInduction.PREFIX + "machine");
super(id, Material.piston);
this.setCreativeTab(Mekanism.tabMekanism);
this.setTextureName("mekanism:machine");
setHardness(5F);
setResistance(10F);
}
@Override

4
common/mekanism/induction/common/wire/BlockWire.java → common/mekanism/induction/common/block/BlockWire.java
View file

@ -1,9 +1,11 @@
package mekanism.induction.common.wire;
package mekanism.induction.common.block;
import java.util.List;
import mekanism.common.Mekanism;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.tileentity.TileEntityWire;
import mekanism.induction.common.wire.EnumWireMaterial;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.block.material.Material;

8
common/mekanism/induction/common/battery/ContainerBattery.java → common/mekanism/induction/common/inventory/container/ContainerBattery.java
View file

@ -1,7 +1,9 @@
package mekanism.induction.common.battery;
package mekanism.induction.common.inventory.container;
import mekanism.induction.common.battery.BatteryManager.SlotBattery;
import mekanism.induction.common.battery.BatteryManager.SlotOut;
import mekanism.induction.common.BatteryManager;
import mekanism.induction.common.BatteryManager.SlotBattery;
import mekanism.induction.common.BatteryManager.SlotOut;
import mekanism.induction.common.tileentity.TileEntityBattery;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ICrafting;

3
common/mekanism/induction/common/multimeter/ContainerMultimeter.java → common/mekanism/induction/common/inventory/container/ContainerMultimeter.java
View file

@ -1,8 +1,9 @@
/**
*
*/
package mekanism.induction.common.multimeter;
package mekanism.induction.common.inventory.container;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

3
common/mekanism/induction/common/contractor/ItemBlockContractor.java → common/mekanism/induction/common/item/ItemBlockContractor.java
View file

@ -1,5 +1,6 @@
package mekanism.induction.common.contractor;
package mekanism.induction.common.item;
import mekanism.induction.common.tileentity.TileEntityEMContractor;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemBlock;

3
common/mekanism/induction/common/multimeter/ItemBlockMultimeter.java → common/mekanism/induction/common/item/ItemBlockMultimeter.java
View file

@ -1,10 +1,11 @@
/**
*
*/
package mekanism.induction.common.multimeter;
package mekanism.induction.common.item;
import java.util.List;
import mekanism.induction.common.tileentity.TileEntityMultimeter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;

3
common/mekanism/induction/common/wire/ItemBlockWire.java → common/mekanism/induction/common/item/ItemBlockWire.java
View file

@ -1,7 +1,8 @@
package mekanism.induction.common.wire;
package mekanism.induction.common.item;
import java.util.List;
import mekanism.induction.common.wire.EnumWireMaterial;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;

7
common/mekanism/induction/common/battery/ItemCapacitor.java → common/mekanism/induction/common/item/ItemCapacitor.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package mekanism.induction.common.battery;
package mekanism.induction.common.item;
import mekanism.api.induction.ICapacitor;
import mekanism.common.Mekanism;
@ -20,10 +20,9 @@ public class ItemCapacitor extends ItemUniversalElectric implements ICapacitor
{
public ItemCapacitor(int id)
{
super(MekanismInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "capacitor", id).getInt(id));
super(id);
this.setCreativeTab(Mekanism.tabMekanism);
this.setUnlocalizedName(MekanismInduction.PREFIX + "capacitor");
this.setTextureName(MekanismInduction.PREFIX + "capacitor");
this.setTextureName("mekanism:Capacitor");
this.setMaxStackSize(1);
this.setMaxDamage(100);
}

9
common/mekanism/induction/common/entangler/ItemCoordLink.java → common/mekanism/induction/common/item/ItemCoordLink.java
View file

@ -1,11 +1,12 @@
/**
*
*/
package mekanism.induction.common.entangler;
package mekanism.induction.common.item;
import java.util.List;
import mekanism.induction.common.base.ItemBase;
import mekanism.common.Mekanism;
import mekanism.common.item.ItemMekanism;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -17,11 +18,11 @@ import cpw.mods.fml.relauncher.SideOnly;
* @author Calclavia
*
*/
public abstract class ItemCoordLink extends ItemBase
public abstract class ItemCoordLink extends ItemMekanism
{
public ItemCoordLink(String name, int id)
{
super(name, id);
super(id);
this.setMaxStackSize(1);
}

14
common/mekanism/induction/common/battery/ItemInfiniteCapacitor.java → common/mekanism/induction/common/item/ItemInfiniteCapacitor.java
View file

@ -1,12 +1,13 @@
/**
*
*/
package mekanism.induction.common.battery;
package mekanism.induction.common.item;
import java.util.List;
import mekanism.common.Mekanism;
import mekanism.induction.common.MekanismInduction;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -23,13 +24,18 @@ public class ItemInfiniteCapacitor extends ItemUniversalElectric
{
public ItemInfiniteCapacitor(int id)
{
super(MekanismInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "infiniteCapacitor", id).getInt(id));
super(id);
this.setCreativeTab(Mekanism.tabMekanism);
this.setUnlocalizedName(MekanismInduction.PREFIX + "infiniteCapacitor");
this.setTextureName(MekanismInduction.PREFIX + "capacitor");
this.setTextureName("mekanism:Capacitor");
this.setMaxStackSize(1);
this.setMaxDamage(100);
}
@Override
public void registerIcons(IconRegister register)
{
itemIcon = register.registerIcon("mekanism:Capacitor");
}
@Override
public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List list, boolean par4)

2
common/mekanism/induction/common/entangler/ItemLinker.java → common/mekanism/induction/common/item/ItemLinker.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package mekanism.induction.common.entangler;
package mekanism.induction.common.item;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

3
common/mekanism/induction/common/TileEntityAdvancedFurnace.java → common/mekanism/induction/common/tileentity/TileEntityAdvancedFurnace.java
View file

@ -1,5 +1,6 @@
package mekanism.induction.common;
package mekanism.induction.common.tileentity;
import mekanism.induction.common.MekanismInduction;
import net.minecraft.block.BlockFurnace;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;

6
common/mekanism/induction/common/battery/TileEntityBattery.java → common/mekanism/induction/common/tileentity/TileEntityBattery.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package mekanism.induction.common.battery;
package mekanism.induction.common.tileentity;
import java.util.ArrayList;
import java.util.EnumSet;
@ -17,7 +17,9 @@ import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketDataRequest;
import mekanism.common.network.PacketTileEntity;
import mekanism.induction.common.base.ListUtil;
import mekanism.induction.common.BatteryUpdateProtocol;
import mekanism.induction.common.ListUtil;
import mekanism.induction.common.SynchronizedBatteryData;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;

7
common/mekanism/induction/common/contractor/TileEntityEMContractor.java → common/mekanism/induction/common/tileentity/TileEntityEMContractor.java
View file

@ -1,4 +1,4 @@
package mekanism.induction.common.contractor;
package mekanism.induction.common.tileentity;
import java.util.ArrayList;
import java.util.HashSet;
@ -10,9 +10,10 @@ import mekanism.common.ITileNetwork;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketDataRequest;
import mekanism.induction.common.InventoryUtil;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.base.InventoryUtil;
import mekanism.induction.common.tesla.TileEntityTesla;
import mekanism.induction.common.PathfinderEMContractor;
import mekanism.induction.common.ThreadEMPathfinding;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFluid;
import net.minecraft.block.BlockLadder;

5
common/mekanism/induction/common/multimeter/TileEntityMultimeter.java → common/mekanism/induction/common/tileentity/TileEntityMultimeter.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package mekanism.induction.common.multimeter;
package mekanism.induction.common.tileentity;
import ic2.api.tile.IEnergyStorage;
@ -16,6 +16,7 @@ import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketDataRequest;
import mekanism.common.network.PacketTileEntity;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.MultimeterEventHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@ -102,7 +103,7 @@ public class TileEntityMultimeter extends TileEntityAdvanced implements ITileNet
if (outputRedstone != this.redstoneOn)
{
this.redstoneOn = outputRedstone;
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, MekanismInduction.blockMultimeter.blockID);
this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, MekanismInduction.Multimeter.blockID);
}
if (prevDetectedEnergy != this.detectedEnergy)

3
common/mekanism/induction/common/tesla/TileEntityTesla.java → common/mekanism/induction/common/tileentity/TileEntityTesla.java
View file

@ -1,7 +1,7 @@
/**
*
*/
package mekanism.induction.common.tesla;
package mekanism.induction.common.tileentity;
import java.util.ArrayList;
import java.util.Collections;
@ -19,6 +19,7 @@ import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketDataRequest;
import mekanism.common.network.PacketTileEntity;
import mekanism.induction.common.MekanismInduction;
import mekanism.induction.common.TeslaGrid;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.MinecraftServer;

6
common/mekanism/induction/common/wire/TileEntityWire.java → common/mekanism/induction/common/tileentity/TileEntityWire.java
View file

@ -1,8 +1,12 @@
package mekanism.induction.common.wire;
package mekanism.induction.common.tileentity;
import java.util.ArrayList;
import mekanism.common.ITileNetwork;
import mekanism.induction.common.wire.EnumWireMaterial;
import mekanism.induction.common.wire.IInsulatedMaterial;
import mekanism.induction.common.wire.IInsulation;
import mekanism.induction.common.wire.IWireMaterial;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/induction/common/wire/multipart/javatraits/TEnergySink.java → common/mekanism/induction/common/wire/multipart/TEnergySink.java
View file

@ -1,4 +1,4 @@
package mekanism.induction.common.wire.multipart.javatraits;
package mekanism.induction.common.wire.multipart;
import ic2.api.energy.tile.IEnergySink;

14
resources/assets/mekanism/lang/en_US.lang
View file

@ -217,10 +217,10 @@ item.SteelBoots.name=Steel Boots
//*****//
//Blocks
tile.mekanism:tesla.name=Tesla Coil
tile.mekanism:multimeter.name=Multimeter
tile.mekanism:contractor.name=Electromagnetic Contractor
tile.mekanism:battery.name=Modular Battery
tile.Tesla.name=Tesla Coil
tile.Multimeter.name=Multimeter
tile.ElectromagneticContractor.name=Electromagnetic Contractor
tile.Battery.name=Modular Battery
tile.mekanism:wire.copper.name=Copper Wire
tile.mekanism:wire.tin.name=Tin Wire
@ -230,6 +230,6 @@ tile.mekanism:wire.silver.name=Silver Wire
tile.mekanism:wire.superconductor.name=Superconductor Wire
//Items
item.mekanism:capacitor.name=Capacitor Cell
item.mekanism:infiniteCapacitor.name=Infinite Capacitor Cell
item.mekanism:linker.name=Electrostatic Linker
item.Capacitor.name=Capacitor Cell
item.InfiniteCapacitor.name=Infinite Capacitor Cell
item.Linker.name=Electrostatic Linker