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

updated power system check

Browse source
This commit is contained in:
Robert Seifert 2013-05-08 03:12:08 -04:00
parent 16ce63aadd
commit 0850129263
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -47,6 +47,8 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import dark.library.DarkMain;
import dark.library.PowerSystems;
@Mod(modid = AssemblyLine.CHANNEL, name = AssemblyLine.MOD_NAME, version = AssemblyLine.VERSION, dependencies = "after:BasicComponents; after:IC2", useMetadata = true)
@NetworkMod(channels = { AssemblyLine.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
@ -111,7 +113,6 @@ public class AssemblyLine
public static final int ITEM_ID_PREFIX = 13030;
public static Item itemImprint;
public static Item itemDisk;
public static ItemStack ic2Wrench = null;
public static Logger FMLog = Logger.getLogger(AssemblyLine.MOD_NAME);
@ -143,7 +144,7 @@ public class AssemblyLine
itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", ITEM_ID_PREFIX).getInt());
itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", ITEM_ID_PREFIX + 1).getInt());
REQUIRE_NO_POWER = DEBUG || !CONFIGURATION.get("general", "requirePower", true).getBoolean(true);
REQUIRE_NO_POWER = DEBUG || !CONFIGURATION.get("general", "requirePower", true).getBoolean(true) || PowerSystems.runPowerLess(PowerSystems.INDUSTRIALCRAFT, PowerSystems.BUILDCRAFT, PowerSystems.MEKANISM);
CONFIGURATION.save();
NetworkRegistry.instance().registerGuiHandler(this, this.proxy);
@ -160,8 +161,6 @@ public class AssemblyLine
GameRegistry.registerBlock(blockCraneFrame, "Crane Frame");
TabAssemblyLine.itemStack = new ItemStack(AssemblyLine.blockConveyorBelt);
// TODO // UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION,
// "http://calclavia.com/downloads/al/recommendedversion.txt");
proxy.preInit();
}
@ -187,23 +186,13 @@ public class AssemblyLine
meta.credits = "Please see the website.";
meta.autogenerated = false;
boolean ic2 = Loader.isModLoaded("IC2");
boolean ue = Loader.isModLoaded("BasicComponents");
createStandardRecipes();
if (ic2)
this.createStandardRecipes();
this.createUERecipes();
if (PowerSystems.isPowerSystemLoaded(PowerSystems.INDUSTRIALCRAFT))
{
createIC2Recipes();
ic2Wrench = Items.getItem("wrench");
}
if (ue)
{
createUERecipes();
}
if (!ic2 && !ue)
{
createVanillaRecipes();
REQUIRE_NO_POWER = true;
}
}
private void createVanillaRecipes()
@ -229,6 +218,7 @@ public class AssemblyLine
private void createUERecipes()
{
DarkMain.forceLoadBCItems(this, AssemblyLine.CHANNEL);
System.out.println("BasicComponents Found...adding UE recipes for Assembly Line.");
// Armbot
GameRegistry.addRecipe(new ShapedOreRecipe(blockArmbot, new Object[] { "II ", "SIS", "MCM", 'S', "plateSteel", 'C', "advancedCircuit", 'I', "ingotSteel", 'M', "motor" }));

2
src/minecraft/assemblyline/common/machine/TileEntityAssemblyNetwork.java
View file

@ -95,7 +95,7 @@ public abstract class TileEntityAssemblyNetwork extends TIC2Runnable
protected int getMaxTransferRange()
{
return 20;
return 30;
}
@Override