Auto format

This commit is contained in:
modmuss50 2016-11-25 13:25:51 +00:00
parent aceeb7a037
commit e16c3eba02
55 changed files with 128 additions and 182 deletions

View file

@ -1,6 +1,5 @@
package techreborn.init;
import techreborn.Core;
/**
@ -11,52 +10,52 @@ public class IC2Dict {
//TODO IC2
public static void init() {
try {
// CraftingItemType.circuit.getName();
//
// OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack());
//
// OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit));
// OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit));
//
// OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine));
// OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine));
//
// OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack());
// OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack());
//
// OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack());
// OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack());
// OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack());
//
// ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt);
// industrialTnt.setItemDamage(1);
// OreDictionary.registerOre("industrialTnt", industrialTnt);
//
// OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond));
// OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff));
// OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer));
//
// //TODO:
//
// //OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold));
//
// //OreDictionary.registerOre("ic2Generator", ModBlocks.Generator);
// //OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel);
// //OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder);
// //OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor);
// //OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
// //OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);
//
// OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235));
// OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238));
// OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238));
// OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235));
//
// OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron));
// OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack());
// OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced));
//
// OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore));
// CraftingItemType.circuit.getName();
//
// OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack());
//
// OreDictionary.registerOre("circuitBasic", ItemName.crafting.getItemStack(CraftingItemType.circuit));
// OreDictionary.registerOre("circuitAdvanced", ItemName.crafting.getItemStack(CraftingItemType.advanced_circuit));
//
// OreDictionary.registerOre("machineBlockBasic", BlockName.resource.getItemStack(ResourceBlock.machine));
// OreDictionary.registerOre("machineBlockAdvanced", BlockName.resource.getItemStack(ResourceBlock.advanced_machine));
//
// OreDictionary.registerOre("lapotronCrystal", ItemName.lapotron_crystal.getItemStack());
// OreDictionary.registerOre("energyCrystal", ItemName.lapotron_crystal.getItemStack());
//
// OreDictionary.registerOre("drillBasic", ItemName.drill.getItemStack());
// OreDictionary.registerOre("drillDiamond", ItemName.diamond_drill.getItemStack());
// OreDictionary.registerOre("drillAdvanced", ItemName.iridium_drill.getItemStack());
//
// ItemStack industrialTnt = BlockName.te.getItemStack(TeBlock.itnt);
// industrialTnt.setItemDamage(1);
// OreDictionary.registerOre("industrialTnt", industrialTnt);
//
// OreDictionary.registerOre("craftingIndustrialDiamond", ItemName.crafting.getItemStack(CraftingItemType.industrial_diamond));
// OreDictionary.registerOre("fertilizer", ItemName.crafting.getItemStack(CraftingItemType.bio_chaff));
// OreDictionary.registerOre("hvTransformer", BlockName.te.getItemStack(TeBlock.hv_transformer));
//
// //TODO:
//
// //OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold));
//
// //OreDictionary.registerOre("ic2Generator", ModBlocks.Generator);
// //OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel);
// //OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder);
// //OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor);
// //OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
// //OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);
//
// OreDictionary.registerOre("uran235", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_235));
// OreDictionary.registerOre("uran238", ItemName.nuclear.getItemStack(NuclearResourceType.uranium_238));
// OreDictionary.registerOre("smallUran238", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_238));
// OreDictionary.registerOre("smallUran235", ItemName.nuclear.getItemStack(NuclearResourceType.small_uranium_235));
//
// OreDictionary.registerOre("fenceIron", BlockName.fence.getItemStack(BlockIC2Fence.IC2FenceType.iron));
// OreDictionary.registerOre("rubberWood", BlockName.rubber_wood.getItemStack());
// OreDictionary.registerOre("glassReinforced", BlockName.glass.getItemStack(BlockTexGlass.GlassType.reinforced));
//
// OreDictionary.registerOre("oreIridium", ItemName.misc_resource.getItemStack(MiscResourceType.iridium_ore));
} catch (NoClassDefFoundError notFound) {
Core.logHelper.warn(
"Can't enable integration: IC2 installed but cannot be hooked\n" +

View file

@ -1,11 +1,9 @@
package techreborn.init;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.block.material.Material;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemColored;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
@ -23,7 +21,6 @@ import techreborn.blocks.tier1.*;
import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer;
import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.itemblocks.*;
import techreborn.tiles.*;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
@ -384,13 +381,13 @@ public class ModBlocks {
GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR");
//TODO enable when done
// flare = new BlockFlare();
// registerBlock(flare, "flare");
// ItemBlock itemBlock = new ItemColored(flare, true);
// itemBlock.setRegistryName("flareItemBlock");
// itemBlock.setCreativeTab(TechRebornCreativeTabMisc.instance);
// GameRegistry.register(itemBlock);
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
// flare = new BlockFlare();
// registerBlock(flare, "flare");
// ItemBlock itemBlock = new ItemColored(flare, true);
// itemBlock.setRegistryName("flareItemBlock");
// itemBlock.setCreativeTab(TechRebornCreativeTabMisc.instance);
// GameRegistry.register(itemBlock);
// GameRegistry.registerTileEntity(TileEntityFlare.class, "TileEntityFlareTR");
registerOreDict();
Core.logHelper.info("TechReborns Blocks Loaded");

View file

@ -453,7 +453,7 @@ public class ModRecipes {
continue;
}
dust = dust.copy();
if(ore){
if (ore) {
dust.setCount(2);
}
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22));
@ -1013,7 +1013,7 @@ public class ModRecipes {
"circuitBasic");
TechRebornAPI
.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil",3), "NCN", "C C", "NCN",
.addRollingOreMachinceRecipe(ItemParts.getPartByName("cupronickelHeatingCoil", 3), "NCN", "C C", "NCN",
'N', "ingotNickel", 'C', "ingotCopper");
RecipeHandler.addRecipe(new VacuumFreezerRecipe(ItemIngots.getIngotByName("hotTungstensteel"),
@ -2080,8 +2080,8 @@ public class ModRecipes {
getOre("ic2Extractor"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.BlastFurnace), "CHC", "HBH", "FHF", 'H',
ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', ModBlocks.ElectricFurnace);
ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', ModBlocks.ElectricFurnace);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialGrinder), "ECP", "GGG", "CBC", 'E',
ModBlocks.IndustrialElectrolyzer, 'P', ModBlocks.Extractor, 'C',