Minor changes
This commit is contained in:
parent
fc63a8670a
commit
0e901070d7
4 changed files with 93 additions and 142 deletions
|
@ -11,18 +11,17 @@ import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.Icon;
|
import net.minecraft.util.Icon;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.Configuration;
|
|
||||||
import resonantinduction.core.Reference;
|
import resonantinduction.core.Reference;
|
||||||
import resonantinduction.core.ResonantInductionTabs;
|
import resonantinduction.core.ResonantInductionTabs;
|
||||||
import resonantinduction.core.prefab.block.BlockRI;
|
import resonantinduction.core.prefab.block.BlockRI;
|
||||||
import calclavia.lib.content.IContentInfo.IExtraBlockInfo;
|
import calclavia.lib.content.IBlockInfo;
|
||||||
|
|
||||||
import com.builtbroken.common.Pair;
|
import com.builtbroken.common.Pair;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class BlockDebug extends BlockRI implements IExtraBlockInfo
|
public class BlockDebug extends BlockRI implements IBlockInfo
|
||||||
{
|
{
|
||||||
public static float DebugWattOut, DebugWattDemand;
|
public static float DebugWattOut, DebugWattDemand;
|
||||||
|
|
||||||
|
@ -174,13 +173,6 @@ public class BlockDebug extends BlockRI implements IExtraBlockInfo
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void loadOreNames()
|
|
||||||
{
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
|
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,31 +1,22 @@
|
||||||
package resonantinduction.core.resource;
|
package resonantinduction.core.resource;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.client.renderer.texture.IconRegister;
|
import net.minecraft.client.renderer.texture.IconRegister;
|
||||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
|
||||||
import net.minecraft.util.Icon;
|
import net.minecraft.util.Icon;
|
||||||
import net.minecraft.world.World;
|
|
||||||
import net.minecraftforge.common.Configuration;
|
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
import resonantinduction.core.Reference;
|
import resonantinduction.core.Reference;
|
||||||
import resonantinduction.core.ResonantInduction;
|
import resonantinduction.core.ResonantInduction;
|
||||||
import resonantinduction.core.Settings;
|
import resonantinduction.core.Settings;
|
||||||
import calclavia.lib.content.IContentInfo.IExtraBlockInfo;
|
|
||||||
import calclavia.lib.ore.OreGenReplaceStone;
|
import calclavia.lib.ore.OreGenReplaceStone;
|
||||||
|
|
||||||
import com.builtbroken.common.Pair;
|
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class BlockOre extends Block implements IExtraBlockInfo
|
public class BlockOre extends Block
|
||||||
{
|
{
|
||||||
Icon[] icons = new Icon[EnumTierMaterial.values().length];
|
Icon[] icons = new Icon[EnumTierMaterial.values().length];
|
||||||
|
|
||||||
|
@ -41,6 +32,7 @@ public class BlockOre extends Block implements IExtraBlockInfo
|
||||||
{
|
{
|
||||||
data.stack = new ItemStack(this.blockID, 1, data.ordinal());
|
data.stack = new ItemStack(this.blockID, 1, data.ordinal());
|
||||||
}
|
}
|
||||||
|
this.loadOreNames();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -79,7 +71,6 @@ public class BlockOre extends Block implements IExtraBlockInfo
|
||||||
return Block.stone.getIcon(side, metadata);
|
return Block.stone.getIcon(side, metadata);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void loadOreNames()
|
public void loadOreNames()
|
||||||
{
|
{
|
||||||
for (OreData data : OreData.values())
|
for (OreData data : OreData.values())
|
||||||
|
@ -128,25 +119,4 @@ public class BlockOre extends Block implements IExtraBlockInfo
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public TileEntity createNewTileEntity(World world)
|
|
||||||
{
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
|
|
||||||
{
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
|
|
||||||
{
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,12 +6,10 @@ import net.minecraft.client.renderer.texture.IconRegister;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.Icon;
|
import net.minecraft.util.Icon;
|
||||||
import net.minecraftforge.common.Configuration;
|
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
import resonantinduction.core.Reference;
|
import resonantinduction.core.Reference;
|
||||||
import resonantinduction.core.Settings;
|
import resonantinduction.core.Settings;
|
||||||
import resonantinduction.core.prefab.item.ItemBase;
|
import resonantinduction.core.prefab.item.ItemBase;
|
||||||
import calclavia.lib.content.IContentInfo.IExtraItemInfo;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
@ -19,7 +17,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
* allow new crafting recipes to be created.
|
* allow new crafting recipes to be created.
|
||||||
*
|
*
|
||||||
* @author DarkGuardsman */
|
* @author DarkGuardsman */
|
||||||
public class ItemParts extends ItemBase implements IExtraItemInfo
|
public class ItemParts extends ItemBase
|
||||||
{
|
{
|
||||||
public ItemParts()
|
public ItemParts()
|
||||||
{
|
{
|
||||||
|
@ -111,7 +109,6 @@ public class ItemParts extends ItemBase implements IExtraItemInfo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void loadOreNames()
|
public void loadOreNames()
|
||||||
{
|
{
|
||||||
for (Parts part : Parts.values())
|
for (Parts part : Parts.values())
|
||||||
|
|
|
@ -10,11 +10,10 @@ import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.MovingObjectPosition;
|
import net.minecraft.util.MovingObjectPosition;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.Configuration;
|
|
||||||
import resonantinduction.core.prefab.block.BlockRI;
|
import resonantinduction.core.prefab.block.BlockRI;
|
||||||
import resonantinduction.core.render.RIBlockRenderingHandler;
|
import resonantinduction.core.render.RIBlockRenderingHandler;
|
||||||
import calclavia.components.CalclaviaLoader;
|
import calclavia.components.CalclaviaLoader;
|
||||||
import calclavia.lib.content.IContentInfo.IExtraBlockInfo;
|
import calclavia.lib.content.IBlockInfo;
|
||||||
import calclavia.lib.multiblock.fake.IBlockActivate;
|
import calclavia.lib.multiblock.fake.IBlockActivate;
|
||||||
import calclavia.lib.multiblock.fake.IMultiBlock;
|
import calclavia.lib.multiblock.fake.IMultiBlock;
|
||||||
|
|
||||||
|
@ -23,7 +22,7 @@ import com.builtbroken.common.Pair;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class BlockArmbot extends BlockRI implements IExtraBlockInfo
|
public class BlockArmbot extends BlockRI implements IBlockInfo
|
||||||
{
|
{
|
||||||
public BlockArmbot()
|
public BlockArmbot()
|
||||||
{
|
{
|
||||||
|
@ -117,11 +116,4 @@ public class BlockArmbot extends BlockRI implements IExtraBlockInfo
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void loadOreNames()
|
|
||||||
{
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue