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

Code cleanup

Browse source
This commit is contained in:
LemADEC 2016-03-20 17:48:06 +01:00
parent 6c34b45772
commit 9419d630d6
7 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/cr0s/warpdrive/WarpDrive.java
View file

@ -343,7 +343,7 @@ public class WarpDrive implements LoadingCallback {
GameRegistry.registerTileEntity(TileEntityTransporter.class, MODID + ":blockTransporter");
// IC2 REACTOR LASER MONITOR
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
blockIC2reactorLaserMonitor = new BlockIC2reactorLaserMonitor();
GameRegistry.registerBlock(blockIC2reactorLaserMonitor, "blockIC2reactorLaserMonitor");
@ -391,7 +391,7 @@ public class WarpDrive implements LoadingCallback {
}
// REACTOR LASER FOCUS
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
itemIC2reactorLaserFocus = new ItemIC2reactorLaserFocus();
GameRegistry.registerItem(itemIC2reactorLaserFocus, "itemIC2reactorLaserFocus");
}
@ -447,10 +447,10 @@ public class WarpDrive implements LoadingCallback {
if (WarpDriveConfig.RECIPES_ENABLE_DYNAMIC) {
Recipes.initDynamic();
} else {
if (WarpDriveConfig.isIndustrialCraft2loaded && WarpDriveConfig.RECIPES_ENABLE_IC2) {
if (WarpDriveConfig.isIndustrialCraft2Loaded && WarpDriveConfig.RECIPES_ENABLE_IC2) {
Recipes.initIC2();
}
if (WarpDriveConfig.isIndustrialCraft2loaded && WarpDriveConfig.RECIPES_ENABLE_HARD_IC2) {
if (WarpDriveConfig.isIndustrialCraft2Loaded && WarpDriveConfig.RECIPES_ENABLE_HARD_IC2) {
Recipes.initHardIC2();
}
if (WarpDriveConfig.RECIPES_ENABLE_VANILLA) {

6
src/main/java/cr0s/warpdrive/block/TileEntityAbstractEnergy.java
View file

@ -210,7 +210,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
}
// IndustrialCraft2
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
IC2_addToEnergyNet();
}
@ -227,7 +227,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
@Override
public void onChunkUnload() {
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
IC2_removeFromEnergyNet();
}
@ -236,7 +236,7 @@ public abstract class TileEntityAbstractEnergy extends TileEntityAbstractInterfa
@Override
public void invalidate() {
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
IC2_removeFromEnergyNet();
}

2
src/main/java/cr0s/warpdrive/config/Dictionary.java
View file

@ -383,7 +383,7 @@ public class Dictionary {
Blocks.flowing_lava.setResistance(30.0F);
// adjust IC2 Reinforced stone stats
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
Block blockReinforcedStone = (Block) Block.blockRegistry.getObject("IC2:blockAlloy");
// TODO
}

38
src/main/java/cr0s/warpdrive/config/Recipes.java
View file

@ -374,7 +374,7 @@ public class Recipes {
'i', ironPlate,
'm', advancedMachine }));
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.itemIC2reactorLaserFocus), false, new Object[] { " p ", "pdp", " p ",
'p', ironPlate,
'd', "gemDiamond" }));
@ -558,7 +558,7 @@ public class Recipes {
}
// Add Reinforced iridium plate to ore registry as applicable (it's missing in IC2 without GregTech)
if (WarpDriveConfig.isIndustrialCraft2loaded && (!OreDictionary.doesOreNameExist("plateAlloyIridium") || OreDictionary.getOres("plateAlloyIridium").isEmpty())) {
if (WarpDriveConfig.isIndustrialCraft2Loaded && (!OreDictionary.doesOreNameExist("plateAlloyIridium") || OreDictionary.getOres("plateAlloyIridium").isEmpty())) {
ItemStack iridiumAlloy = WarpDriveConfig.getModItemStack("IC2", "itemPartIridium", -1);
OreDictionary.registerOre("plateAlloyIridium", iridiumAlloy);
}
@ -574,7 +574,7 @@ public class Recipes {
@SuppressWarnings("unused")
ItemStack itemMotorEV = ItemComponent.getItemStack(ComponentType.MOTOR);
if (WarpDriveConfig.isGregTech5loaded) {
if (WarpDriveConfig.isGregTech5Loaded) {
itemMachineCasingLV = WarpDriveConfig.getModItemStack("gregtech", "gt.blockcasings", 1);
itemMachineCasingMV = WarpDriveConfig.getModItemStack("gregtech", "gt.blockcasings", 2);
itemMachineCasingHV = WarpDriveConfig.getModItemStack("gregtech", "gt.blockcasings", 3);
@ -585,7 +585,7 @@ public class Recipes {
itemMotorHV = WarpDriveConfig.getModItemStack("gregtech", "gt.metaitem.01", 32602); // HV Motor
itemMotorEV = WarpDriveConfig.getModItemStack("gregtech", "gt.metaitem.01", 32603); // EV Motor
} else if (WarpDriveConfig.isIndustrialCraft2loaded) {
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
itemMachineCasingLV = WarpDriveConfig.getModItemStack("IC2", "blockMachine", 0); // Basic machine casing
itemMachineCasingMV = WarpDriveConfig.getModItemStack("IC2", "blockMachine", 12); // Advanced machine casing
itemMachineCasingHV = new ItemStack(WarpDrive.blockHighlyAdvancedMachine);
@ -904,9 +904,9 @@ public class Recipes {
// Air generator is 1 power interface, 4 activated carbon, 1 motor, 1 MV Machine casing, 2 tanks
ItemStack itemStackCompressorOrTank = ItemComponent.getItemStack(ComponentType.GLASS_TANK);
if (WarpDriveConfig.isGregTech5loaded) {
if (WarpDriveConfig.isGregTech5Loaded) {
itemStackCompressorOrTank = WarpDriveConfig.getModItemStack("gregtech", "gt.metaitem.02", 21300); // Bronze rotor
} else if (WarpDriveConfig.isIndustrialCraft2loaded) {
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
itemStackCompressorOrTank = WarpDriveConfig.getModItemStack("IC2", "blockMachine", 5); // Compressor
} else if (WarpDriveConfig.isThermalExpansionLoaded) {
itemStackCompressorOrTank = WarpDriveConfig.getModItemStack("ThermalExpansion", "Machine", 5); // Fluid transposer
@ -933,9 +933,9 @@ public class Recipes {
// Mining laser is 2 motors, 1 diffraction grating, 1 lens, 1 computer interface, 1 MV Machine casing, 1 diamond pick, 2 glass pane
ItemStack itemStackDiamondPick = new ItemStack(Items.diamond_pickaxe);
if (WarpDriveConfig.isGregTech5loaded) {
if (WarpDriveConfig.isGregTech5Loaded) {
itemStackDiamondPick = WarpDriveConfig.getModItemStack("IC2", "itemToolMiningLaser", 1); // Mining laser
} else if (WarpDriveConfig.isIndustrialCraft2loaded) {
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
itemStackDiamondPick = WarpDriveConfig.getModItemStack("IC2", "blockMachine2", 11); // Advanced Miner
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockMiningLaser), false, "gtr", "ldm", "gtc",
@ -956,9 +956,9 @@ public class Recipes {
// Laser lift is ...
ItemStack itemStackMagnetizer = itemMachineCasingLV;
if (WarpDriveConfig.isGregTech5loaded) {
if (WarpDriveConfig.isGregTech5Loaded) {
itemStackMagnetizer = WarpDriveConfig.getModItemStack("gregtech", "gt.blockmachines", 551); // Basic polarizer
} else if (WarpDriveConfig.isIndustrialCraft2loaded) {
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
itemStackMagnetizer = WarpDriveConfig.getModItemStack("IC2", "blockMachine", 9);
} else if (WarpDriveConfig.isThermalExpansionLoaded) {
itemStackMagnetizer = WarpDriveConfig.getModItemStack("ThermalExpansion", "Plate", 3);
@ -975,13 +975,13 @@ public class Recipes {
'g', "paneGlassColorless"));
// Iridium block is just that
if (WarpDriveConfig.isGregTech5loaded) {
if (WarpDriveConfig.isGregTech5Loaded) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockIridium), "iii", "iii", "iii",
'i', "plateAlloyIridium"));
ItemStack itemStackIridiumAlloy = WarpDriveConfig.getModItemStack("IC2", "itemPartIridium", -1);
GameRegistry.addShapelessRecipe(new ItemStack(itemStackIridiumAlloy.getItem(), 9), new ItemStack(WarpDrive.blockIridium));
} else if (WarpDriveConfig.isIndustrialCraft2loaded) {
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
ItemStack itemStackIridiumAlloy = WarpDriveConfig.getModItemStack("IC2", "itemPartIridium", -1);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockIridium), "iii", "iii", "iii",
'i', itemStackIridiumAlloy));
@ -1073,11 +1073,11 @@ public class Recipes {
/**/
// IC2 needs to loaded for the following 2 recipes
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
ItemStack itemStackOverclockedHeatVent = WarpDriveConfig.getModItemStack("IC2", "reactorVentGold", 1);
ItemStack itemStackReactorCoolant1 = WarpDriveConfig.getModItemStack("IC2", "reactorCoolantSix", -1);
ItemStack itemStackReactorCoolant2 = itemStackReactorCoolant1;
if (WarpDriveConfig.isGregTech5loaded) {
if (WarpDriveConfig.isGregTech5Loaded) {
itemStackReactorCoolant1 = WarpDriveConfig.getModItemStack("gregtech", "gt.360k_Helium_Coolantcell", -1);
itemStackReactorCoolant2 = WarpDriveConfig.getModItemStack("gregtech", "gt.360k_NaK_Coolantcell", -1);
}
@ -1106,9 +1106,9 @@ public class Recipes {
// Cloaking coil is 1 Titanium plate, 4 reinforced iridium plate, 1x EV Machine casing (Ti) or 1 Beacon, 4 emerald, 4 diamond
ItemStack itemStackGoldIngotOrCoil = new ItemStack(Items.gold_ingot);
if (WarpDriveConfig.isGregTech5loaded) {
if (WarpDriveConfig.isGregTech5Loaded) {
itemStackGoldIngotOrCoil = WarpDriveConfig.getModItemStack("gregtech", "gt.blockcasings", 14); // Nichrome Coil block
} else if (WarpDriveConfig.isIndustrialCraft2loaded) {
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
itemStackGoldIngotOrCoil = WarpDriveConfig.getModItemStack("IC2", "itemRecipePart", 0); // Coil
} else if (WarpDriveConfig.isThermalExpansionLoaded) {
itemStackGoldIngotOrCoil = WarpDriveConfig.getModItemStack("ThermalExpansion", "material", 3); // Redstone conductance coil
@ -1218,7 +1218,7 @@ public class Recipes {
// Hull blocks plain
// (BlockColored.func_150031_c is converting wool metadata into dye metadata)
// Tier 1 = 5 stone + 4 iron ingots or 5 stone + 4 steel ingots or 5 reinforced stone + 4 obsidian
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
ItemStack reinforcedStone = WarpDriveConfig.getModItemStack("IC2", "blockAlloy", -1);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockHulls_plain[0], 10, 0), false, "cbc", "bcb", "cbc",
'b', "blockObsidian",
@ -1234,7 +1234,7 @@ public class Recipes {
}
// Tier 2 = 4 Tier 1 + 4 obsidian or 4x Tier 1 + 4x Carbon plates or 4x Tier 1 + 1 Gregtech 5 Tungstensteel reinforced block
for (int woolColor = 0; woolColor < 16; woolColor++) {
if (WarpDriveConfig.isGregTech5loaded) {
if (WarpDriveConfig.isGregTech5Loaded) {
ItemStack tungstensteelReinforcedBlock = WarpDriveConfig.getModItemStack("gregtech", "gt.blockreinforced", 3);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockHulls_plain[1], 4, BlockColored.func_150031_c(woolColor)), false, " b ", "bcb", " b ",
'b', new ItemStack(WarpDrive.blockHulls_plain[0], 4, BlockColored.func_150031_c(woolColor)),
@ -1243,7 +1243,7 @@ public class Recipes {
'b', "blockHull1_plain",
'c', tungstensteelReinforcedBlock,
'X', oreDyes[woolColor] ));
} else if (WarpDriveConfig.isIndustrialCraft2loaded) {
} else if (WarpDriveConfig.isIndustrialCraft2Loaded) {
ItemStack carbonPlate = WarpDriveConfig.getModItemStack("IC2", "itemPartCarbonPlate", -1);
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(WarpDrive.blockHulls_plain[1], 4, BlockColored.func_150031_c(woolColor)), false, "cbc", "b b", "cbc",
'b', new ItemStack(WarpDrive.blockHulls_plain[0], 4, BlockColored.func_150031_c(woolColor)),

14
src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
View file

@ -59,14 +59,14 @@ public class WarpDriveConfig {
public static boolean isForgeMultipartLoaded = false;
public static boolean isAdvancedSolarPanelLoaded = false;
public static boolean isAppliedEnergistics2Loaded = false;
public static boolean isICBMLoaded = false;
public static boolean isIndustrialCraft2loaded = false;
public static boolean isICBMloaded = false;
public static boolean isIndustrialCraft2Loaded = false;
public static boolean isComputerCraftLoaded = false;
public static boolean isOpenComputersLoaded = false;
public static boolean isThermalExpansionLoaded = false;
public static boolean isArsMagica2Loaded = false;
public static boolean isImmersiveEngineeringLoaded = false;
public static boolean isGregTech5loaded = false;
public static boolean isGregTech5Loaded = false;
public static boolean isEnderIOloaded = false;
public static boolean isAdvancedRepulsionSystemLoaded = false;
@ -732,8 +732,8 @@ public class WarpDriveConfig {
loadForgeMultipart();
}
isIndustrialCraft2loaded = Loader.isModLoaded("IC2");
if (isIndustrialCraft2loaded) {
isIndustrialCraft2Loaded = Loader.isModLoaded("IC2");
if (isIndustrialCraft2Loaded) {
loadIC2();
CompatIndustrialCraft2.register();
}
@ -759,10 +759,10 @@ public class WarpDriveConfig {
if (isImmersiveEngineeringLoaded) {
CompatImmersiveEngineering.register();
}
isGregTech5loaded = false;
isGregTech5Loaded = false;
if (Loader.isModLoaded("gregtech")) {
String gregTechVersion = FMLCommonHandler.instance().findContainerFor("gregtech").getVersion();
isGregTech5loaded = gregTechVersion.equalsIgnoreCase("MC1710") || gregTechVersion.startsWith("5.");
isGregTech5Loaded = gregTechVersion.equalsIgnoreCase("MC1710") || gregTechVersion.startsWith("5.");
}
isEnderIOloaded = Loader.isModLoaded("EnderIO");
if (isEnderIOloaded) {

12
src/main/java/cr0s/warpdrive/world/WorldGenSmallShip.java
View file

@ -551,7 +551,7 @@ public class WorldGenSmallShip extends WorldGenerator {
while (!isDone) {
switch (rand.nextInt(14)) {
case 0: // Mass fabricator
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
res = WarpDriveConfig.getModItemStack("IC2", "blockMachine", -1);
res.setItemDamage(14);
res.stackSize = 1; // + rand.nextInt(2);
@ -560,7 +560,7 @@ public class WorldGenSmallShip extends WorldGenerator {
break;
case 1:
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
res = WarpDriveConfig.getModItemStack("IC2", "blockNuke", -1);
res.stackSize = 1 + rand.nextInt(2);
isDone = true;
@ -575,7 +575,7 @@ public class WorldGenSmallShip extends WorldGenerator {
break;// skipped
case 6:// Glass fiber cable item
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
res = WarpDriveConfig.getModItemStack("IC2", "itemCable", -1);
res.setItemDamage(9);
res.stackSize = 2 + rand.nextInt(12);
@ -584,7 +584,7 @@ public class WorldGenSmallShip extends WorldGenerator {
break;
case 7:// UU matter cell
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
res = WarpDriveConfig.getModItemStack("IC2", "itemCellEmpty", -1);
res.setItemDamage(3);
res.stackSize = 2 + rand.nextInt(14);
@ -599,7 +599,7 @@ public class WorldGenSmallShip extends WorldGenerator {
case 9:
case 10:
case 11: // Rocket launcher platform Tier3
if (WarpDriveConfig.isICBMLoaded) {
if (WarpDriveConfig.isICBMloaded) {
// TODO: No 1.7 ICBM yet
// res = new ItemStack(WarpDriveConfig.ICBM_Machine, 1 +
// rand.nextInt(1), 2).copy();
@ -609,7 +609,7 @@ public class WorldGenSmallShip extends WorldGenerator {
case 12: // Missiles from conventional to hypersonic
if (WarpDriveConfig.isICBMLoaded) {
if (WarpDriveConfig.isICBMloaded) {
// TODO: No 1.7 ICBM yet
// res = new ItemStack(WarpDriveConfig.ICBM_Missile, 2 +
// rand.nextInt(1), rand.nextInt(10)).copy();

6
src/main/java/cr0s/warpdrive/world/WorldGenStructure.java
View file

@ -54,7 +54,7 @@ public class WorldGenStructure {
break;
case 10: // disabled since it's tier3
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
hullPlain_block = WarpDriveConfig.getModBlock("IC2", "blockAlloy");
hullPlain_metadata = 0;
hullGlass_block = WarpDriveConfig.getModBlock("IC2", "blockAlloyGlass");
@ -64,7 +64,7 @@ public class WorldGenStructure {
}
// choose a solar panel
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
if (WarpDriveConfig.isAdvancedSolarPanelLoaded) {
solarPanel_block = WarpDriveConfig.getModBlock("AdvancedSolarPanel", "BlockAdvSolarPanel");
solarPanel_metadata = rand.nextInt(2);
@ -83,7 +83,7 @@ public class WorldGenStructure {
// choose a wiring
cable_block = Blocks.air;
cable_metadata = 0;
if (WarpDriveConfig.isIndustrialCraft2loaded) {
if (WarpDriveConfig.isIndustrialCraft2Loaded) {
cable_block = WarpDriveConfig.getModBlock("IC2", "blockCable");
cable_metadata = 0;