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

Changes for IContentInfo

Browse source
This commit is contained in:
DarkGuardsman 2014-01-19 21:44:12 -05:00
parent 11e7035c95
commit fc63a8670a
6 changed files with 106 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/resonantinduction/core/ResonantInduction.java
View file

@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import org.modstats.ModstatInfo;
import org.modstats.Modstats;
import resonantinduction.core.debug.BlockDebug;
import resonantinduction.core.handler.FluidEventHandler;
import resonantinduction.core.handler.LinkEventHandler;
import resonantinduction.core.prefab.part.PacketMultiPart;
@ -17,8 +18,10 @@ import resonantinduction.core.resource.ResourceGenerator;
import resonantinduction.core.resource.fluid.BlockFluidMixture;
import resonantinduction.core.resource.fluid.TileFluidMixture;
import resonantinduction.core.resource.item.ItemOreResource;
import calclavia.lib.content.ContentRegistry;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.network.PacketTile;
import calclavia.lib.prefab.item.ItemBlockHolder;
import calclavia.lib.utility.LanguageUtility;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Mod;
@ -69,8 +72,11 @@ public class ResonantInduction
public static ItemOreResource itemRefinedDust;
public static Block blockFluidMixture;
public static Block blockGas;
public static Block blockDebug;
public static Fluid MIXTURE = null;
public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, ID);
@EventHandler
public void preInit(FMLPreInitializationEvent evt)
@ -101,6 +107,8 @@ public class ResonantInduction
GameRegistry.registerBlock(blockFluidMixture, blockFluidMixture.getUnlocalizedName());
GameRegistry.registerTileEntity(TileFluidMixture.class, blockFluidMixture.getUnlocalizedName());
blockDebug = contentRegistry.createBlock(BlockDebug.class, ItemBlockHolder.class);
Settings.save();
proxy.preInit();
}

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

@ -15,7 +15,7 @@ import net.minecraftforge.common.Configuration;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInductionTabs;
import resonantinduction.core.prefab.block.BlockRI;
import calclavia.lib.content.IExtraInfo.IExtraBlockInfo;
import calclavia.lib.content.IContentInfo.IExtraBlockInfo;
import com.builtbroken.common.Pair;
@ -115,16 +115,6 @@ public class BlockDebug extends BlockRI implements IExtraBlockInfo
}
}
@Override
public void loadExtraConfigs(Configuration config)
{
for (DebugBlocks block : DebugBlocks.values())
{
block.enabled = config.get("Blocks", "Enable" + block.name + "Block", true).getBoolean(true);
}
}
@Override
public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ)
{
@ -184,13 +174,6 @@ public class BlockDebug extends BlockRI implements IExtraBlockInfo
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void loadOreNames()
{

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

@ -17,7 +17,7 @@ import net.minecraftforge.oredict.OreDictionary;
import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings;
import calclavia.lib.content.IExtraInfo.IExtraBlockInfo;
import calclavia.lib.content.IContentInfo.IExtraBlockInfo;
import calclavia.lib.ore.OreGenReplaceStone;
import com.builtbroken.common.Pair;
@ -129,20 +129,6 @@ public class BlockOre extends Block implements IExtraBlockInfo
}
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void loadExtraConfigs(Configuration config)
{
// TODO Auto-generated method stub
}
@Override
public TileEntity createNewTileEntity(World world)
{

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

@ -11,120 +11,113 @@ import net.minecraftforge.oredict.OreDictionary;
import resonantinduction.core.Reference;
import resonantinduction.core.Settings;
import resonantinduction.core.prefab.item.ItemBase;
import calclavia.lib.content.IExtraInfo.IExtraItemInfo;
import calclavia.lib.content.IContentInfo.IExtraItemInfo;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* A meta data item containing parts of various crafting recipes. These parts do not do anything but
/** A meta data item containing parts of various crafting recipes. These parts do not do anything but
* allow new crafting recipes to be created.
*
* @author DarkGuardsman
*/
* @author DarkGuardsman */
public class ItemParts extends ItemBase implements IExtraItemInfo
{
public ItemParts()
{
super("DMParts", Settings.getNextItemID());
this.setHasSubtypes(true);
this.setMaxDamage(0);
this.setMaxStackSize(64);
this.setCreativeTab(CreativeTabs.tabMaterials);
}
public ItemParts()
{
super("DMParts", Settings.getNextItemID());
this.setHasSubtypes(true);
this.setMaxDamage(0);
this.setMaxStackSize(64);
this.setCreativeTab(CreativeTabs.tabMaterials);
}
@Override
public String getUnlocalizedName(ItemStack itemStack)
{
if (itemStack != null && itemStack.getItemDamage() < Parts.values().length)
{
return "item." + Parts.values()[itemStack.getItemDamage()].name;
}
return super.getUnlocalizedName();
}
@Override
public String getUnlocalizedName(ItemStack itemStack)
{
if (itemStack != null && itemStack.getItemDamage() < Parts.values().length)
{
return "item." + Parts.values()[itemStack.getItemDamage()].name;
}
return super.getUnlocalizedName();
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIconFromDamage(int meta)
{
if (meta < Parts.values().length)
{
return Parts.values()[meta].icon;
}
return this.itemIcon;
}
@Override
@SideOnly(Side.CLIENT)
public Icon getIconFromDamage(int meta)
{
if (meta < Parts.values().length)
{
return Parts.values()[meta].icon;
}
return this.itemIcon;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
super.registerIcons(iconRegister);
for (Parts part : Parts.values())
{
part.icon = iconRegister.registerIcon(Reference.PREFIX + "part." + part.name);
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
super.registerIcons(iconRegister);
for (Parts part : Parts.values())
{
part.icon = iconRegister.registerIcon(Reference.PREFIX + "part." + part.name);
}
}
@Override
public int getMetadata(int meta)
{
return meta;
}
@Override
public int getMetadata(int meta)
{
return meta;
}
@Override
public void getSubItems(int blockID, CreativeTabs tab, List itemStackList)
{
for (Parts part : Parts.values())
{
if (part.show)
{
itemStackList.add(new ItemStack(this, 1, part.ordinal()));
}
}
}
@Override
public void getSubItems(int blockID, CreativeTabs tab, List itemStackList)
{
for (Parts part : Parts.values())
{
if (part.show)
{
itemStackList.add(new ItemStack(this, 1, part.ordinal()));
}
}
}
public static enum Parts
{
Seal("leatherSeal"), GasSeal("gasSeal"), Tank("unfinishedTank"), Valve("valvePart"),
MiningIcon("miningIcon", false), CircuitBasic("circuitBasic"),
CircuitAdvanced("circuitAdvanced"), CircuitElite("circuitElite"), Motor("motor"),
IC("ic_chip"), COIL("coilCopper"), LASER("diodeLaser");
public static enum Parts
{
Seal("leatherSeal"),
GasSeal("gasSeal"),
Tank("unfinishedTank"),
Valve("valvePart"),
MiningIcon("miningIcon", false),
CircuitBasic("circuitBasic"),
CircuitAdvanced("circuitAdvanced"),
CircuitElite("circuitElite"),
Motor("motor"),
IC("ic_chip"),
COIL("coilCopper"),
LASER("diodeLaser");
public String name;
public Icon icon;
boolean show = true;
public String name;
public Icon icon;
boolean show = true;
private Parts(String name)
{
this.name = name;
}
private Parts(String name)
{
this.name = name;
}
private Parts(String name, boolean show)
{
this(name);
this.show = show;
}
}
private Parts(String name, boolean show)
{
this(name);
this.show = show;
}
}
@Override
public boolean hasExtraConfigs()
{
return false;
}
@Override
public void loadOreNames()
{
for (Parts part : Parts.values())
{
OreDictionary.registerOre(part.name, new ItemStack(this, 1, part.ordinal()));
}
@Override
public void loadExtraConfigs(Configuration config)
{
// TODO Auto-generated method stub
}
@Override
public void loadOreNames()
{
for (Parts part : Parts.values())
{
OreDictionary.registerOre(part.name, new ItemStack(this, 1, part.ordinal()));
}
}
}
}

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

@ -14,7 +14,7 @@ import net.minecraftforge.common.Configuration;
import resonantinduction.core.prefab.block.BlockRI;
import resonantinduction.core.render.RIBlockRenderingHandler;
import calclavia.components.CalclaviaLoader;
import calclavia.lib.content.IExtraInfo.IExtraBlockInfo;
import calclavia.lib.content.IContentInfo.IExtraBlockInfo;
import calclavia.lib.multiblock.fake.IBlockActivate;
import calclavia.lib.multiblock.fake.IMultiBlock;
@ -118,20 +118,6 @@ public class BlockArmbot extends BlockRI implements IExtraBlockInfo
return false;
}
@Override
public boolean hasExtraConfigs()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void loadExtraConfigs(Configuration config)
{
// TODO Auto-generated method stub
}
@Override
public void loadOreNames()
{

8
src/main/java/resonantinduction/electrical/encoder/TileEncoder.java
View file

@ -27,10 +27,10 @@ public class TileEncoder extends TileExternalInventory implements ISidedInventor
{
private ItemStack disk;
private IInventoryWatcher watcher;
public static final int PROGRAM_PACKET_ID = Electrical.contentRegistry.getNextPacketID();
public static final int PROGRAM_CHANGE_PACKET_ID = Electrical.contentRegistry.getNextPacketID();
public static final int REMOVE_TASK_PACKET_ID = Electrical.contentRegistry.getNextPacketID();
public static final int NEW_TASK_PACKET_ID = Electrical.contentRegistry.getNextPacketID();
public static final int PROGRAM_PACKET_ID = 0;
public static final int PROGRAM_CHANGE_PACKET_ID = 1;
public static final int REMOVE_TASK_PACKET_ID = 2;
public static final int NEW_TASK_PACKET_ID = 3;
protected IProgram program;