Auto format code.

This commit is contained in:
modmuss50 2016-12-05 10:48:21 +00:00
parent a96c094267
commit 72f85d5243
33 changed files with 15 additions and 66 deletions

View file

@ -184,13 +184,12 @@ public class ModBlocks {
machineCasing = new BlockMachineCasing(Material.ROCK);
registerBlock(machineCasing, ItemBlockMachineCasing.class, "machinecasing");
GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR");
if(Core.proxy.isCTMAvailable()){
if (Core.proxy.isCTMAvailable()) {
Core.proxy.registerCustomBlockStateLocation(machineCasing, "machines/structure/machine_casing_ctm");
} else {
Core.proxy.registerCustomBlockStateLocation(machineCasing, "machines/structure/machine_casing");
}
ore = new BlockOre(Material.ROCK);
registerBlock(ore, ItemBlockOre.class, "techreborn.ore");
for (int i = 0; i < BlockOre.ores.length; i++) {
@ -224,7 +223,6 @@ public class ModBlocks {
registerBlock(magicEnergeyConverter, "magicenergyconverter");
Core.proxy.registerCustomBlockStateLocation(magicEnergeyConverter, "machines/generators/magic_energy_converter");
assemblyMachine = new BlockAssemblingMachine(Material.ROCK);
registerBlock(assemblyMachine, "assemblymachine");
GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR");
@ -235,13 +233,11 @@ public class ModBlocks {
GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR");
Core.proxy.registerCustomBlockStateLocation(dieselGenerator, "machines/generators/diesel_generator");
industrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.ROCK);
registerBlock(industrialElectrolyzer, "industrialelectrolyzer");
GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR");
Core.proxy.registerCustomBlockStateLocation(industrialElectrolyzer, "machines/tier1_machines/industrial_electrolyzer");
magicalAbsorber = new BlockMagicEnergyAbsorber(Material.ROCK);
registerBlock(magicalAbsorber, "magicrnergyabsorber");
Core.proxy.registerCustomBlockStateLocation(magicalAbsorber, "machines/generators/magic_energy_absorber");
@ -301,7 +297,6 @@ public class ModBlocks {
GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR");
Core.proxy.registerCustomBlockStateLocation(fusionControlComputer, "machines/generators/fusion_reactor");
fusionCoil = new BlockFusionCoil(Material.ROCK);
registerBlock(fusionCoil, "fusioncoil");
Core.proxy.registerCustomBlockStateLocation(fusionCoil, "machines/generators/fusion_coil");

View file

@ -2001,7 +2001,6 @@ public class ModRecipes {
'S', ItemParts.getPartByName("diamondSawBlade"), 'C',
"machineBlockAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.chargeBench), "ETE", "COC", "EAD", 'E',
"circuitMaster", 'T', ModItems.energyCrystal, 'C', Blocks.CHEST, 'O',
ModItems.lapotronicOrb, 'A', "machineBlockAdvanced");
@ -2061,9 +2060,9 @@ public class ModRecipes {
// 'L', "lapotronCrystal",
// 'T', TechRebornAPI.recipeCompact.getItem("teleporter"));
// CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.dragonEggEnergySiphoner), "CTC", "ISI", "CBC", 'I',
// "plateIridium", 'C', "circuitBasic",
// 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.extractor);
// CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.dragonEggEnergySiphoner), "CTC", "ISI", "CBC", 'I',
// "plateIridium", 'C', "circuitBasic",
// 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.extractor);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "SCS", "BEB", "SCS", 'S', "plateSteel", 'C',
@ -2154,7 +2153,6 @@ public class ModRecipes {
ModBlocks.compressor);
}
// Smetling
CraftingHelper
.addSmelting(ItemDusts.getDustByName("copper", 1), getOre("ingotCopper"),