Upload my Code Changes/Format/imports

This commit is contained in:
Alexander committed 2014-02-16 14:23:50 -05:00
1 parent 5bcdb7ca46
commit 5d4e38c0cb
264 files changed
+4014 -3972

No files matched your search

@@ -2,9 +2,10 @@ package tconstruct.plugins;
/**
* Interface for TiC compat plugins.
*
* Do not include mod API usage directly in this file except for IMC! This must be constructable even
* when the target mod isn't available due to Java not allowing static abstracts.
*
* Do not include mod API usage directly in this file except for IMC! This must
* be constructable even when the target mod isn't available due to Java not
* allowing static abstracts.
*/
public interface ICompatPlugin
{
@@ -42,11 +42,14 @@ public class PluginController
/**
* Register a plugin with the controller.
*
* Warning: Make sure your plugin class imports no APIs directly! Any API interaction should be done by handlers called in pre/init/post so
* merely creating an instance to check the mod ID isn't a hazard to the controller.
*
* @param plugin Plugin to register
*
* Warning: Make sure your plugin class imports no APIs directly! Any API
* interaction should be done by handlers called in pre/init/post so merely
* creating an instance to check the mod ID isn't a hazard to the
* controller.
*
* @param plugin
* Plugin to register
*/
public void registerPlugin (ICompatPlugin plugin)
{
@@ -58,7 +61,8 @@ public class PluginController
loadPlugin(plugin);
}
// This does the actual plugin loading if mod is present; needed to allow force-enabling.
// This does the actual plugin loading if mod is present; needed to allow
// force-enabling.
private void loadPlugin (ICompatPlugin plugin)
{
if (!Loader.isModLoaded(plugin.getModId()))
@@ -117,10 +121,10 @@ public class PluginController
registerPlugin(new AppEng());
registerPlugin(new BuildcraftTransport());
//registerPlugin(new ForgeMultiPart());
// registerPlugin(new ForgeMultiPart());
registerPlugin(new IC2());
// registerPlugin(new MineFactoryReloaded());
//registerPlugin(new NotEnoughItems());
// registerPlugin(new NotEnoughItems());
registerPlugin(new Thaumcraft());
// registerPlugin(new Waila());
}
+27 -17
View File
@@ -38,35 +38,45 @@ public class IC2 implements ICompatPlugin
return;
// Useful stuff
//ItemStack ingotCast = new ItemStack(TRepo.metalPattern, 1, 0);
//ItemStack gemCast = new ItemStack(TRepo.metalPattern, 1, 26);
//FluidStack fluidStack = new FluidStack(fluidUUM, 1);
// ItemStack ingotCast = new ItemStack(TRepo.metalPattern, 1, 0);
// ItemStack gemCast = new ItemStack(TRepo.metalPattern, 1, 26);
// FluidStack fluidStack = new FluidStack(fluidUUM, 1);
FluidStack fluidStackBlock = new FluidStack(fluidUUM, 4500);
//LiquidCasting tableCasting = TConstructRegistry.getTableCasting();
// LiquidCasting tableCasting = TConstructRegistry.getTableCasting();
LiquidCasting basinCasting = TConstructRegistry.getBasinCasting();
// Table casting
//tableCasting.addCastingRecipe(new ItemStack(Item.ingotIron), fluidStack, ingotCast, 20);
//tableCasting.addCastingRecipe(new ItemStack(Item.emerald), fluidStack, gemCast, 20);
// tableCasting.addCastingRecipe(new ItemStack(Item.ingotIron),
// fluidStack, ingotCast, 20);
// tableCasting.addCastingRecipe(new ItemStack(Item.emerald),
// fluidStack, gemCast, 20);
// Block casting
//basinCasting.addCastingRecipe(new ItemStack(Block.blockIron), fluidStackBlock, null, true, 50); // Iron convenience
// basinCasting.addCastingRecipe(new ItemStack(Block.blockIron),
// fluidStackBlock, null, true, 50); // Iron convenience
// Dirt <-> Diamonds
//basinCasting.addCastingRecipe(new ItemStack(Block.dirt), new FluidStack(fluidUUM, 500), new ItemStack(Block.blockDiamond), true, 50);
// basinCasting.addCastingRecipe(new ItemStack(Block.dirt), new
// FluidStack(fluidUUM, 500), new ItemStack(Block.blockDiamond), true,
// 50);
basinCasting.addCastingRecipe(new ItemStack(Blocks.diamond_block), fluidStackBlock, new ItemStack(Blocks.dirt), true, 50);
// RS cycle
//basinCasting.addCastingRecipe(new ItemStack(Block.blockRedstone), fluidStack, new ItemStack(Item.redstone), true, 50);
//basinCasting.addCastingRecipe(new ItemStack(Block.hardenedClay, 14, 1), fluidStack, new ItemStack(Block.blockRedstone), true, 50);
//basinCasting.addCastingRecipe(new ItemStack(Item.dyePowder, 1, 1), fluidStack, new ItemStack(Block.hardenedClay, 14, 1), true, 50);
//basinCasting.addCastingRecipe(new ItemStack(Block.blockRedstone), fluidStack, new ItemStack(Item.dyePowder, 1, 1), true, 50);
// basinCasting.addCastingRecipe(new ItemStack(Block.blockRedstone),
// fluidStack, new ItemStack(Item.redstone), true, 50);
// basinCasting.addCastingRecipe(new ItemStack(Block.hardenedClay, 14,
// 1), fluidStack, new ItemStack(Block.blockRedstone), true, 50);
// basinCasting.addCastingRecipe(new ItemStack(Item.dyePowder, 1, 1),
// fluidStack, new ItemStack(Block.hardenedClay, 14, 1), true, 50);
// basinCasting.addCastingRecipe(new ItemStack(Block.blockRedstone),
// fluidStack, new ItemStack(Item.dyePowder, 1, 1), true, 50);
// Alloy Mixing
// 1mB Anything + 1mB UU = 2mB UU
/* Maybe a bit *too* trolly
for (Map.Entry<String, Fluid> ent : FluidRegistry.getRegisteredFluids().entrySet()) {
if (ent.getValue() != fluidUUM)
Smeltery.addAlloyMixing(new FluidStack(fluidUUM, 2), new FluidStack(fluidUUM, 1), new FluidStack(ent.getValue(), 1));
}*/
/*
* Maybe a bit *too* trolly for (Map.Entry<String, Fluid> ent :
* FluidRegistry.getRegisteredFluids().entrySet()) { if (ent.getValue()
* != fluidUUM) Smeltery.addAlloyMixing(new FluidStack(fluidUUM, 2), new
* FluidStack(fluidUUM, 1), new FluidStack(ent.getValue(), 1)); }
*/
}
@Override