Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Minor changes

Browse source
This commit is contained in:
DarkGuardsman 2014-01-19 21:54:11 -05:00
parent fc63a8670a
commit 0e901070d7
4 changed files with 93 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/resonantinduction/core/debug/BlockDebug.java
View file

@ -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)
{ {

206
src/main/java/resonantinduction/core/resource/BlockOre.java
View file

@ -1,152 +1,122 @@
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];
public BlockOre() public BlockOre()
{ {
super(Settings.CONFIGURATION.getBlock("Ore", Settings.getNextBlockID()).getInt(), Material.rock); super(Settings.CONFIGURATION.getBlock("Ore", Settings.getNextBlockID()).getInt(), Material.rock);
this.setCreativeTab(CreativeTabs.tabBlock); this.setCreativeTab(CreativeTabs.tabBlock);
this.setUnlocalizedName(Reference.PREFIX + "Ore"); this.setUnlocalizedName(Reference.PREFIX + "Ore");
this.setHardness(2.5f); this.setHardness(2.5f);
this.setResistance(5.0f); this.setResistance(5.0f);
for (OreData data : OreData.values()) for (OreData data : OreData.values())
{ {
data.stack = new ItemStack(this.blockID, 1, data.ordinal()); data.stack = new ItemStack(this.blockID, 1, data.ordinal());
} }
} this.loadOreNames();
}
@Override @Override
public int damageDropped(int par1) public int damageDropped(int par1)
{ {
return par1; return par1;
} }
@Override @Override
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{ {
for (OreData data : OreData.values()) for (OreData data : OreData.values())
{ {
par3List.add(data.stack); par3List.add(data.stack);
} }
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void registerIcons(IconRegister par1IconRegister) public void registerIcons(IconRegister par1IconRegister)
{ {
for (OreData data : OreData.values()) for (OreData data : OreData.values())
{ {
data.oreIcon = par1IconRegister.registerIcon(Reference.PREFIX + data.name + "Ore"); data.oreIcon = par1IconRegister.registerIcon(Reference.PREFIX + data.name + "Ore");
} }
} }
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public Icon getIcon(int side, int metadata) public Icon getIcon(int side, int metadata)
{ {
if (metadata < OreData.values().length) if (metadata < OreData.values().length)
{ {
return OreData.values()[metadata].oreIcon; return OreData.values()[metadata].oreIcon;
} }
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()) {
{ OreDictionary.registerOre(data.oreName, data.stack);
OreDictionary.registerOre(data.oreName, data.stack); }
} }
}
public static enum OreData public static enum OreData
{ {
TIN(EnumTierMaterial.TIN, "tin", "oreTin", 20, 8, 128), TIN(EnumTierMaterial.TIN, "tin", "oreTin", 20, 8, 128),
COPPER(EnumTierMaterial.COPPER, "copper", "copperOre", 20, 8, 128), COPPER(EnumTierMaterial.COPPER, "copper", "copperOre", 20, 8, 128),
SILVER(EnumTierMaterial.SILVER, "silver", "silverOre", 3, 8, 45), SILVER(EnumTierMaterial.SILVER, "silver", "silverOre", 3, 8, 45),
LEAD(EnumTierMaterial.LEAD, "lead", "leadOre", 1, 6, 30), LEAD(EnumTierMaterial.LEAD, "lead", "leadOre", 1, 6, 30),
Bauxite(EnumTierMaterial.ALUMINIUM, "bauxite", "bauxiteOre", 4, 6, 128); Bauxite(EnumTierMaterial.ALUMINIUM, "bauxite", "bauxiteOre", 4, 6, 128);
public String name, oreName; public String name, oreName;
public ItemStack stack; public ItemStack stack;
public EnumTierMaterial mat; public EnumTierMaterial mat;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public Icon oreIcon; public Icon oreIcon;
/* ORE GENERATOR OPTIONS */ /* ORE GENERATOR OPTIONS */
public boolean doWorldGen = true; public boolean doWorldGen = true;
public int ammount, branch, maxY; public int ammount, branch, maxY;
private OreData(EnumTierMaterial mat, String name, String oreName, int ammount, int branch, int maxY) private OreData(EnumTierMaterial mat, String name, String oreName, int ammount, int branch, int maxY)
{ {
this.name = name; this.name = name;
this.oreName = oreName; this.oreName = oreName;
this.mat = mat; this.mat = mat;
this.maxY = maxY; this.maxY = maxY;
this.ammount = ammount; this.ammount = ammount;
this.branch = branch; this.branch = branch;
} }
public OreGenReplaceStone getGeneratorSettings() public OreGenReplaceStone getGeneratorSettings()
{ {
if (this.doWorldGen) if (this.doWorldGen)
{ {
ItemStack stack = new ItemStack(ResonantInduction.blockOre, 1, this.ordinal()); ItemStack stack = new ItemStack(ResonantInduction.blockOre, 1, this.ordinal());
return (OreGenReplaceStone) new OreGenReplaceStone(this.name, this.name + "Ore", stack, this.maxY, this.ammount, this.branch).enable(Settings.CONFIGURATION); return (OreGenReplaceStone) new OreGenReplaceStone(this.name, this.name + "Ore", stack, this.maxY, this.ammount, this.branch).enable(Settings.CONFIGURATION);
} }
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
}
} }

5
src/main/java/resonantinduction/core/resource/item/ItemParts.java
View file

@ -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())

12
src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java
View file

@ -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
}
} }