Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from drpepper240/patch-2

Browse source 
Explosives deploying restriction
This commit is contained in:
ZLOFENIX 2014-07-20 21:20:49 +04:00
commit 81332822e9
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cr0s/WarpDrive/WarpDriveConfig.java
View file

@ -23,7 +23,7 @@ public class WarpDriveConfig
public boolean isGregLoaded = false, isAELoaded = false, isAEExtraLoaded = false, isAdvSolPanelLoaded = false, isASLoaded = false, isICBMLoaded = false, isMFFSLoaded = false, isGraviSuiteLoaded = false;
//
public int[] IC2_Air;
public int CC_Computer = 0, CC_peripheral = 0, CCT_Turtle = 0, CCT_Upgraded = 0, CCT_Advanced = 0, GT_Ores = 0, GT_Granite = 0, GT_Machine = 0, ASP = 0, AS_Turbine = 0, ICBM_Machine = 0, ICBM_Missile = 0, MFFS_Field = 0;
public int CC_Computer = 0, CC_peripheral = 0, CCT_Turtle = 0, CCT_Upgraded = 0, CCT_Advanced = 0, GT_Ores = 0, GT_Granite = 0, GT_Machine = 0, ASP = 0, AS_Turbine = 0, ICBM_Machine = 0, ICBM_Missile = 0, ICBM_Explosive = 0, MFFS_Field = 0;
public Set<Integer> SpaceHelmets, Jetpacks, MinerOres, scannerIgnoreBlocks;
private Class<?> AEBlocks;
private Class<?> AEMaterials;
@ -279,7 +279,7 @@ public class WarpDriveConfig
scannerIgnoreBlocks.add(Items.getItem("cesuUnit").itemID);
scannerIgnoreBlocks.add(Items.getItem("batBox").itemID);
// Do not scan ores and valuables
// Do not deploy ores and valuables
for (int[] t : CommonWorldGenOres) // each element of this set is pair [id, meta]
scannerIgnoreBlocks.add(t[0]); // we adding ID only
@ -314,6 +314,10 @@ public class WarpDriveConfig
CCT_Turtle = z.getField("turtleBlockID").getInt(null);
CCT_Upgraded = z.getField("turtleUpgradedBlockID").getInt(null);
CCT_Advanced = z.getField("turtleAdvancedBlockID").getInt(null);
scannerIgnoreBlocks.add(CC_Computer);
scannerIgnoreBlocks.add(CCT_Turtle);
scannerIgnoreBlocks.add(CCT_Upgraded);
scannerIgnoreBlocks.add(CCT_Advanced);
}
catch (Exception e)
{
@ -422,6 +426,8 @@ public class WarpDriveConfig
z = Class.forName("icbm.explosion.ICBMExplosion");
ICBM_Machine = ((Block)z.getField("blockMachine").get(null)).blockID;
ICBM_Missile = ((Item)z.getField("itemMissile").get(null)).itemID;
ICBM_Explosive = ((Item)z.getField("blockExplosive").get(null)).itemID;
scannerIgnoreBlocks.add(ICBM_Explosive);
}
catch (Exception e)
{