tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Refactored EM Levitator

Browse source
This commit is contained in:
Calclavia 2014-01-04 23:38:19 +08:00
parent c55ef8eebd
commit cce4db4a9c
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/resonantinduction/ResonantInduction.java
View file

@ -28,7 +28,7 @@ import resonantinduction.multimeter.ItemMultimeter;
import resonantinduction.transport.battery.BlockBattery;
import resonantinduction.transport.battery.ItemBlockBattery;
import resonantinduction.transport.battery.TileBattery;
import resonantinduction.transport.levitator.BlockEMContractor;
import resonantinduction.transport.levitator.BlockLevitator;
import resonantinduction.transport.levitator.ItemBlockContractor;
import resonantinduction.transport.levitator.ItemLinker;
import resonantinduction.transport.levitator.TileEMLevitator;
@ -190,7 +190,7 @@ public class ResonantInduction
// Blocks
blockTesla = new BlockTesla(getNextBlockID());
blockEMContractor = new BlockEMContractor(getNextBlockID());
blockEMContractor = new BlockLevitator(getNextBlockID());
blockBattery = new BlockBattery(getNextBlockID());
blockMachinePart = new BlockMachinePart(getNextBlockID());

3
src/main/java/resonantinduction/core/base/BlockBase.java
View file

@ -7,6 +7,7 @@ import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration;
import resonantinduction.ResonantInduction;
import resonantinduction.TabRI;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockAdvanced;
/**
@ -17,7 +18,7 @@ public class BlockBase extends BlockAdvanced
{
public BlockBase(String name, int id)
{
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), Material.piston);
super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_BLOCK, name, id).getInt(id), UniversalElectricity.machine);
this.setCreativeTab(TabRI.INSTANCE);
this.setUnlocalizedName(ResonantInduction.PREFIX + name);
this.setTextureName(ResonantInduction.PREFIX + name);

4
src/main/java/resonantinduction/core/render/BlockRenderingHandler.java
View file

@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.transport.battery.BlockBattery;
import resonantinduction.transport.battery.RenderBattery;
import resonantinduction.transport.levitator.BlockEMContractor;
import resonantinduction.transport.levitator.BlockLevitator;
import resonantinduction.transport.levitator.RenderLevitator;
import resonantinduction.transport.tesla.BlockTesla;
import resonantinduction.transport.tesla.RenderTesla;
@ -43,7 +43,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
RenderTesla.MODEL_BOTTOM.render(0.0625f);
GL11.glPopMatrix();
}
else if (block instanceof BlockEMContractor)
else if (block instanceof BlockLevitator)
{
GL11.glPushMatrix();
GL11.glTranslated(0.5, 1.5, 0.5);

4
src/main/java/resonantinduction/transport/levitator/BlockEMContractor.java → src/main/java/resonantinduction/transport/levitator/BlockLevitator.java
View file

@ -15,9 +15,9 @@ import universalelectricity.api.vector.Vector3;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockEMContractor extends BlockBase implements ITileEntityProvider
public class BlockLevitator extends BlockBase implements ITileEntityProvider
{
public BlockEMContractor(int id)
public BlockLevitator(int id)
{
super("contractor", id);
this.setTextureName(ResonantInduction.PREFIX + "machine");