Auto Format code
This commit is contained in:
parent
112b1657cf
commit
796df6c055
503 changed files with 12260 additions and 16291 deletions
|
@ -18,67 +18,66 @@ import techreborn.Core;
|
|||
*/
|
||||
public class IC2Dict {
|
||||
|
||||
public static void init() {
|
||||
try {
|
||||
CraftingItemType.circuit.getName();
|
||||
public static void init() {
|
||||
try {
|
||||
CraftingItemType.circuit.getName();
|
||||
|
||||
OreDictionary.registerOre("reBattery", ItemName.re_battery.getItemStack());
|
||||
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("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("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("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());
|
||||
|
||||
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);
|
||||
|
||||
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));
|
||||
|
||||
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:
|
||||
|
||||
//TODO:
|
||||
//OreDictionary.registerOre("insulatedGoldCableItem", BlockName.te.getItemStack(CableType.gold));
|
||||
|
||||
//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("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("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("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" +
|
||||
"Do you use incompatible IC2 version?\n" +
|
||||
"Please create issue on github and provide FULL LOG and mod list");
|
||||
} catch (Throwable error) {
|
||||
Core.logHelper.warn(
|
||||
"Exception thrown during IC2 integration init\n" +
|
||||
"Do you use incompatible IC2 version?\n" +
|
||||
"Please create issue on github and provide FULL LOG and mod list.\n" +
|
||||
"Error stack trace: ");
|
||||
error.printStackTrace();
|
||||
}
|
||||
}
|
||||
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" +
|
||||
"Do you use incompatible IC2 version?\n" +
|
||||
"Please create issue on github and provide FULL LOG and mod list");
|
||||
} catch (Throwable error) {
|
||||
Core.logHelper.warn(
|
||||
"Exception thrown during IC2 integration init\n" +
|
||||
"Do you use incompatible IC2 version?\n" +
|
||||
"Please create issue on github and provide FULL LOG and mod list.\n" +
|
||||
"Error stack trace: ");
|
||||
error.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,66 +11,17 @@ import reborncore.common.tile.TileMachineBase;
|
|||
import reborncore.common.util.StringUtils;
|
||||
import techreborn.Core;
|
||||
import techreborn.blocks.*;
|
||||
import techreborn.blocks.advanced_machine.BlockBlastFurnace;
|
||||
import techreborn.blocks.advanced_machine.BlockCentrifuge;
|
||||
import techreborn.blocks.advanced_machine.BlockDistillationTower;
|
||||
import techreborn.blocks.advanced_machine.BlockImplosionCompressor;
|
||||
import techreborn.blocks.advanced_machine.BlockIndustrialElectrolyzer;
|
||||
import techreborn.blocks.advanced_machine.BlockIndustrialGrinder;
|
||||
import techreborn.blocks.advanced_machine.BlockIndustrialSawmill;
|
||||
import techreborn.blocks.generator.BlockDieselGenerator;
|
||||
import techreborn.blocks.generator.BlockDragonEggSiphoner;
|
||||
import techreborn.blocks.generator.BlockGasTurbine;
|
||||
import techreborn.blocks.generator.BlockGenerator;
|
||||
import techreborn.blocks.generator.BlockHeatGenerator;
|
||||
import techreborn.blocks.generator.BlockLightningRod;
|
||||
import techreborn.blocks.generator.BlockMagicEnergyAbsorber;
|
||||
import techreborn.blocks.generator.BlockMagicEnergyConverter;
|
||||
import techreborn.blocks.generator.BlockPlasmaGenerator;
|
||||
import techreborn.blocks.generator.BlockSemiFluidGenerator;
|
||||
import techreborn.blocks.generator.BlockSolarPanel;
|
||||
import techreborn.blocks.generator.BlockThermalGenerator;
|
||||
import techreborn.blocks.generator.BlockWaterMill;
|
||||
import techreborn.blocks.generator.BlockWindMill;
|
||||
import techreborn.blocks.advanced_machine.*;
|
||||
import techreborn.blocks.generator.*;
|
||||
import techreborn.blocks.iron_machines.BlockAlloyFurnace;
|
||||
import techreborn.blocks.iron_machines.BlockIronFurnace;
|
||||
import techreborn.blocks.machine.BlockAssemblingMachine;
|
||||
import techreborn.blocks.machine.BlockChargeBench;
|
||||
import techreborn.blocks.machine.BlockChemicalReactor;
|
||||
import techreborn.blocks.machine.BlockChunkLoader;
|
||||
import techreborn.blocks.machine.BlockMatterFabricator;
|
||||
import techreborn.blocks.machine.BlockRollingMachine;
|
||||
import techreborn.blocks.machine.BlockScrapboxinator;
|
||||
import techreborn.blocks.machine.BlockVacuumFreezer;
|
||||
import techreborn.blocks.storage.BlockAESU;
|
||||
import techreborn.blocks.storage.BlockBatBox;
|
||||
import techreborn.blocks.storage.BlockIDSU;
|
||||
import techreborn.blocks.storage.BlockLESU;
|
||||
import techreborn.blocks.storage.BlockLESUStorage;
|
||||
import techreborn.blocks.storage.BlockMFE;
|
||||
import techreborn.blocks.storage.BlockMFSU;
|
||||
import techreborn.blocks.tier1.BlockAlloySmelter;
|
||||
import techreborn.blocks.tier1.BlockCompressor;
|
||||
import techreborn.blocks.tier1.BlockElectricFurnace;
|
||||
import techreborn.blocks.tier1.BlockExtractor;
|
||||
import techreborn.blocks.tier1.BlockGrinder;
|
||||
import techreborn.blocks.tier1.BlockRecycler;
|
||||
import techreborn.blocks.machine.*;
|
||||
import techreborn.blocks.storage.*;
|
||||
import techreborn.blocks.tier1.*;
|
||||
import techreborn.blocks.transformers.BlockHVTransformer;
|
||||
import techreborn.blocks.transformers.BlockLVTransformer;
|
||||
import techreborn.blocks.transformers.BlockMVTransformer;
|
||||
import techreborn.itemblocks.ItemBlockAesu;
|
||||
import techreborn.itemblocks.ItemBlockDigitalChest;
|
||||
import techreborn.itemblocks.ItemBlockMachineCasing;
|
||||
import techreborn.itemblocks.ItemBlockMachineFrame;
|
||||
import techreborn.itemblocks.ItemBlockOre;
|
||||
import techreborn.itemblocks.ItemBlockOre2;
|
||||
import techreborn.itemblocks.ItemBlockPlayerDetector;
|
||||
import techreborn.itemblocks.ItemBlockQuantumChest;
|
||||
import techreborn.itemblocks.ItemBlockQuantumTank;
|
||||
import techreborn.itemblocks.ItemBlockRubberSapling;
|
||||
import techreborn.itemblocks.ItemBlockStorage;
|
||||
import techreborn.itemblocks.ItemBlockStorage2;
|
||||
import techreborn.items.ItemParts;
|
||||
import techreborn.itemblocks.*;
|
||||
import techreborn.tiles.*;
|
||||
import techreborn.tiles.fusionReactor.TileEntityFusionController;
|
||||
import techreborn.tiles.generator.*;
|
||||
|
@ -78,25 +29,17 @@ import techreborn.tiles.idsu.TileIDSU;
|
|||
import techreborn.tiles.lesu.TileLesu;
|
||||
import techreborn.tiles.lesu.TileLesuStorage;
|
||||
import techreborn.tiles.multiblock.*;
|
||||
import techreborn.tiles.multiblock.TileImplosionCompressor;
|
||||
import techreborn.tiles.multiblock.TileIndustrialSawmill;
|
||||
import techreborn.tiles.multiblock.TileVacuumFreezer;
|
||||
import techreborn.tiles.storage.TileBatBox;
|
||||
import techreborn.tiles.storage.TileMFE;
|
||||
import techreborn.tiles.storage.TileMFSU;
|
||||
import techreborn.tiles.teir1.TileCompressor;
|
||||
import techreborn.tiles.teir1.TileElectricFurnace;
|
||||
import techreborn.tiles.teir1.TileExtractor;
|
||||
import techreborn.tiles.teir1.TileGrinder;
|
||||
import techreborn.tiles.teir1.TileRecycler;
|
||||
import techreborn.tiles.teir1.*;
|
||||
import techreborn.tiles.transformers.TileHVTransformer;
|
||||
import techreborn.tiles.transformers.TileLVTransformer;
|
||||
import techreborn.tiles.transformers.TileMVTransformer;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
|
||||
public class ModBlocks
|
||||
{
|
||||
public class ModBlocks {
|
||||
|
||||
public static Block thermalGenerator;
|
||||
public static Block quantumTank;
|
||||
|
@ -172,8 +115,7 @@ public class ModBlocks
|
|||
|
||||
public static Block ironFence;
|
||||
|
||||
public static void init()
|
||||
{
|
||||
public static void init() {
|
||||
thermalGenerator = new BlockThermalGenerator();
|
||||
registerBlock(thermalGenerator, "techreborn.thermalGenerator");
|
||||
GameRegistry.registerTileEntity(TileThermalGenerator.class, "TileThermalGeneratorTR");
|
||||
|
@ -441,13 +383,13 @@ public class ModBlocks
|
|||
Core.logHelper.info("TechReborns Blocks Loaded");
|
||||
}
|
||||
|
||||
public static void registerBlock(Block block, String name){
|
||||
public static void registerBlock(Block block, String name) {
|
||||
block.setRegistryName(name);
|
||||
GameRegistry.register(block);
|
||||
GameRegistry.register(new ItemBlock(block), block.getRegistryName());
|
||||
}
|
||||
|
||||
public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name){
|
||||
public static void registerBlock(Block block, Class<? extends ItemBlock> itemclass, String name) {
|
||||
block.setRegistryName(name);
|
||||
GameRegistry.register(block);
|
||||
try {
|
||||
|
@ -460,16 +402,15 @@ public class ModBlocks
|
|||
|
||||
}
|
||||
|
||||
public static void registerOreDict()
|
||||
{
|
||||
for(String ore : BlockOre.ores){
|
||||
public static void registerOreDict() {
|
||||
for (String ore : BlockOre.ores) {
|
||||
OreDictionary.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre.getOreByName(ore));
|
||||
}
|
||||
|
||||
for(String ore : BlockOre2.ores){
|
||||
for (String ore : BlockOre2.ores) {
|
||||
OreDictionary.registerOre("ore" + StringUtils.toFirstCapital(ore), BlockOre2.getOreByName(ore));
|
||||
}
|
||||
|
||||
|
||||
OreDictionary.registerOre("blockSilver", new ItemStack(storage, 1, 0));
|
||||
OreDictionary.registerOre("blockAluminum", new ItemStack(storage, 1, 1));
|
||||
OreDictionary.registerOre("blockTitanium", new ItemStack(storage, 1, 2));
|
||||
|
@ -512,7 +453,7 @@ public class ModBlocks
|
|||
OreDictionary.registerOre("leavesRubber", new ItemStack(rubberLeaves, 1, OreDictionary.WILDCARD_VALUE));
|
||||
|
||||
OreDictionary.registerOre("fenceIron", ironFence);
|
||||
|
||||
|
||||
OreDictionary.registerOre("machineBlockBasic", BlockMachineFrame.getFrameByName("machine", 1));
|
||||
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1));
|
||||
OreDictionary.registerOre("machineBlockHighlyAdvanced", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
|
||||
|
|
|
@ -10,8 +10,7 @@ import techreborn.blocks.fluid.BlockFluidTechReborn;
|
|||
import techreborn.blocks.fluid.TechRebornFluid;
|
||||
import techreborn.lib.ModInfo;
|
||||
|
||||
public class ModFluids
|
||||
{
|
||||
public class ModFluids {
|
||||
|
||||
public static Fluid fluidberylium = new TechRebornFluid("fluidberylium");
|
||||
public static BlockFluidBase BlockFluidBerylium;
|
||||
|
@ -94,10 +93,10 @@ public class ModFluids
|
|||
public static Fluid fluidSulfur = new TechRebornFluid("fluidSulfur");
|
||||
public static BlockFluidBase BlockFluidSulfur;
|
||||
|
||||
public static Fluid fluidSodiumSulfide= new TechRebornFluid("fluidsodiumSulfide");
|
||||
public static Fluid fluidSodiumSulfide = new TechRebornFluid("fluidsodiumSulfide");
|
||||
public static BlockFluidBase BlockFluidSodiumSulfide;
|
||||
|
||||
public static Fluid fluidDiesel= new TechRebornFluid("fluiddiesel");
|
||||
public static Fluid fluidDiesel = new TechRebornFluid("fluiddiesel");
|
||||
public static BlockFluidBase BlockFluidDiesel;
|
||||
|
||||
public static Fluid fluidNitroDiesel = new TechRebornFluid("fluidnitrodiesel");
|
||||
|
@ -109,174 +108,170 @@ public class ModFluids
|
|||
public static Fluid fluidSulfuricAcid = new TechRebornFluid("fluidsulfuricacid");
|
||||
public static BlockFluidBase BlockFluidSulfuricAcid;
|
||||
|
||||
|
||||
|
||||
public static void init()
|
||||
{
|
||||
public static void init() {
|
||||
FluidRegistry.registerFluid(fluidberylium);
|
||||
BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.WATER, "techreborn.berylium");
|
||||
GameRegistry.registerBlock(BlockFluidBerylium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidcalcium);
|
||||
BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.WATER, "techreborn.calcium");
|
||||
GameRegistry.registerBlock(BlockFluidCalcium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidcalciumcarbonate);
|
||||
BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.WATER,
|
||||
"techreborn.calciumcarbonate");
|
||||
"techreborn.calciumcarbonate");
|
||||
GameRegistry.registerBlock(BlockFluidCalciumCarbonate,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidChlorite);
|
||||
BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.WATER, "techreborn.chlorite");
|
||||
GameRegistry.registerBlock(BlockFluidChlorite,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidDeuterium);
|
||||
BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.WATER, "techreborn.deuterium");
|
||||
GameRegistry.registerBlock(BlockFluidDeuterium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidGlyceryl);
|
||||
BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.WATER, "techreborn.glyceryl");
|
||||
GameRegistry.registerBlock(BlockFluidGlyceryl,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidHelium);
|
||||
BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.WATER, "techreborn.helium");
|
||||
GameRegistry.registerBlock(BlockFluidHelium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidHelium3);
|
||||
BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.WATER, "techreborn.helium3");
|
||||
GameRegistry.registerBlock(BlockFluidHelium3,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidHeliumplasma);
|
||||
BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.WATER, "techreborn.heliumplasma");
|
||||
GameRegistry.registerBlock(BlockFluidHeliumplasma,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidHydrogen);
|
||||
BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.WATER, "techreborn.hydrogen");
|
||||
GameRegistry.registerBlock(BlockFluidHydrogen,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidLithium);
|
||||
BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.WATER, "techreborn.lithium");
|
||||
GameRegistry.registerBlock(BlockFluidLithium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidMercury);
|
||||
BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.WATER, "techreborn.mercury");
|
||||
GameRegistry.registerBlock(BlockFluidMercury,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidMethane);
|
||||
BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.WATER, "techreborn.methane");
|
||||
GameRegistry.registerBlock(BlockFluidMethane,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrocoalfuel);
|
||||
BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.WATER,
|
||||
"techreborn.nitrocoalfuel");
|
||||
"techreborn.nitrocoalfuel");
|
||||
GameRegistry.registerBlock(BlockFluidNitrocoalfuel,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5));
|
||||
FluidPowerManager.fluidPowerValues.put(fluidNitrocoalfuel, 48.0);
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrofuel);
|
||||
BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.WATER, "techreborn.nitrofuel");
|
||||
GameRegistry.registerBlock(BlockFluidNitrofuel,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrogen);
|
||||
BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.WATER, "techreborn.nitrogen");
|
||||
GameRegistry.registerBlock(BlockFluidNitrogen,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitrogendioxide);
|
||||
BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.WATER,
|
||||
"techreborn.nitrogendioxide");
|
||||
"techreborn.nitrogendioxide");
|
||||
GameRegistry.registerBlock(BlockFluidNitrogendioxide,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidPotassium);
|
||||
BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.WATER, "techreborn.potassium");
|
||||
GameRegistry.registerBlock(BlockFluidPotassium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSilicon);
|
||||
BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.WATER, "techreborn.silicon");
|
||||
GameRegistry.registerBlock(BlockFluidSilicon,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSodium);
|
||||
BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.WATER, "techreborn.sodium");
|
||||
GameRegistry.registerBlock(BlockFluidSodium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSodiumpersulfate);
|
||||
BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.WATER,
|
||||
"techreborn.sodiumpersulfate");
|
||||
"techreborn.sodiumpersulfate");
|
||||
GameRegistry.registerBlock(BlockFluidSodiumpersulfate,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidTritium);
|
||||
BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.WATER, "techreborn.tritium");
|
||||
GameRegistry.registerBlock(BlockFluidTritium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidWolframium);
|
||||
BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.WATER, "techreborn.wolframium");
|
||||
GameRegistry.registerBlock(BlockFluidWolframium,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidCarbon);
|
||||
BlockFluidCarbon = new BlockFluidTechReborn(fluidCarbon, Material.WATER, "techreborn.carbon");
|
||||
GameRegistry.registerBlock(BlockFluidCarbon,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCarbon.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCarbon.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidCarbonFiber);
|
||||
BlockFluidCarbonFiber = new BlockFluidTechReborn(fluidCarbonFiber, Material.WATER, "techreborn.carbonfiber");
|
||||
GameRegistry.registerBlock(BlockFluidCarbonFiber,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCarbonFiber.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidCarbonFiber.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitroCarbon);
|
||||
BlockFluidNitroCarbon= new BlockFluidTechReborn(fluidNitroCarbon, Material.WATER, "techreborn.nitrocarbon");
|
||||
BlockFluidNitroCarbon = new BlockFluidTechReborn(fluidNitroCarbon, Material.WATER, "techreborn.nitrocarbon");
|
||||
GameRegistry.registerBlock(BlockFluidNitroCarbon,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitroCarbon.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitroCarbon.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSulfur);
|
||||
BlockFluidSulfur= new BlockFluidTechReborn(fluidSulfur, Material.WATER, "techreborn.sulfur");
|
||||
BlockFluidSulfur = new BlockFluidTechReborn(fluidSulfur, Material.WATER, "techreborn.sulfur");
|
||||
GameRegistry.registerBlock(BlockFluidSulfur,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSulfur.getUnlocalizedName().substring(5));
|
||||
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSulfur.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSodiumSulfide);
|
||||
BlockFluidSodiumSulfide= new BlockFluidTechReborn(fluidSodiumSulfide, Material.WATER, "techreborn.sodiumsulfide");
|
||||
BlockFluidSodiumSulfide = new BlockFluidTechReborn(fluidSodiumSulfide, Material.WATER, "techreborn.sodiumsulfide");
|
||||
GameRegistry.registerBlock(BlockFluidSodiumSulfide,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodiumSulfide.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSodiumSulfide.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidDiesel);
|
||||
BlockFluidDiesel = new BlockFluidTechReborn(fluidDiesel, Material.WATER, "techreborn.diesel");
|
||||
GameRegistry.registerBlock(BlockFluidDiesel,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidDiesel.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidDiesel.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidNitroDiesel);
|
||||
BlockFluidNitroDiesel = new BlockFluidTechReborn(fluidNitroDiesel, Material.WATER, "techreborn.nitrodiesel");
|
||||
GameRegistry.registerBlock(BlockFluidNitroDiesel,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitroDiesel.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidNitroDiesel.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidOil);
|
||||
BlockFluidOil = new BlockFluidTechReborn(fluidOil, Material.WATER, "techreborn.oil");
|
||||
GameRegistry.registerBlock(BlockFluidOil,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidOil.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidOil.getUnlocalizedName().substring(5));
|
||||
|
||||
FluidRegistry.registerFluid(fluidSulfuricAcid);
|
||||
BlockFluidSulfuricAcid = new BlockFluidTechReborn(fluidSulfuricAcid, Material.WATER, "techreborn.sulfuricacid");
|
||||
GameRegistry.registerBlock(BlockFluidSulfuricAcid,
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSulfuricAcid.getUnlocalizedName().substring(5));
|
||||
ModInfo.MOD_ID + "_" + BlockFluidSulfuricAcid.getUnlocalizedName().substring(5));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,12 +1,9 @@
|
|||
package techreborn.init;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import reborncore.common.blocks.BlockMachineBase;
|
||||
|
@ -16,7 +13,6 @@ import techreborn.Core;
|
|||
import techreborn.api.Reference;
|
||||
import techreborn.blocks.BlockMachineFrame;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.events.OreUnifier;
|
||||
import techreborn.items.*;
|
||||
import techreborn.items.armor.ItemLapotronPack;
|
||||
import techreborn.items.armor.ItemLithiumBatpack;
|
||||
|
@ -27,8 +23,7 @@ import techreborn.items.battery.ItemLithiumBattery;
|
|||
import techreborn.items.battery.ItemReBattery;
|
||||
import techreborn.items.tools.*;
|
||||
|
||||
public class ModItems
|
||||
{
|
||||
public class ModItems {
|
||||
|
||||
public static Item gems;
|
||||
public static Item ingots;
|
||||
|
@ -123,8 +118,7 @@ public class ModItems
|
|||
|
||||
public static final String META_PLACEHOLDER = "PLACEHOLDER_ITEM";
|
||||
|
||||
public static void init() throws InstantiationException, IllegalAccessException
|
||||
{
|
||||
public static void init() throws InstantiationException, IllegalAccessException {
|
||||
gems = new ItemGems();
|
||||
registerItem(gems, "gem");
|
||||
ingots = new ItemIngots();
|
||||
|
@ -189,7 +183,7 @@ public class ModItems
|
|||
advancedJackhammer = PoweredItem.createItem(ItemAdvancedJackhammer.class);
|
||||
registerItem(advancedJackhammer, "ironjackhammer");
|
||||
|
||||
if(ConfigTechReborn.enableGemArmorAndTools){
|
||||
if (ConfigTechReborn.enableGemArmorAndTools) {
|
||||
bronzeSword = new ItemTRSword(Reference.BRONZE);
|
||||
registerItem(bronzeSword, "bronzeSword");
|
||||
bronzePickaxe = new ItemTRPickaxe(Reference.BRONZE);
|
||||
|
@ -271,7 +265,6 @@ public class ModItems
|
|||
registerItem(peridotBoots, "peridotBoots");
|
||||
}
|
||||
|
||||
|
||||
wrench = new ItemWrench();
|
||||
registerItem(wrench, "wrench");
|
||||
|
||||
|
@ -280,7 +273,7 @@ public class ModItems
|
|||
|
||||
scrapBox = new ItemScrapBox();
|
||||
registerItem(scrapBox, "scrapbox");
|
||||
|
||||
|
||||
frequencyTransmitter = new ItemFrequencyTransmitter();
|
||||
registerItem(frequencyTransmitter, "frequencyTransmitter");
|
||||
|
||||
|
@ -314,7 +307,7 @@ public class ModItems
|
|||
OreDictionary.registerOre("itemRubber", ItemParts.getPartByName("rubber"));
|
||||
}
|
||||
|
||||
public static void registerItem(Item item, String name){
|
||||
public static void registerItem(Item item, String name) {
|
||||
item.setRegistryName(name);
|
||||
GameRegistry.register(item);
|
||||
}
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
package techreborn.init;
|
||||
|
||||
|
||||
//TODO 1.9 nope
|
||||
public class ModLoot
|
||||
{
|
||||
public class ModLoot {
|
||||
//
|
||||
// public static WeightedRandomChestContent rubberSaplingLoot = new
|
||||
// WeightedRandomChestContent(new ItemStack(ModBlocks.rubberSapling), 1, 3,
|
||||
|
@ -16,8 +14,7 @@ public class ModLoot
|
|||
// public static WeightedRandomChestContent steelIngotLoot = new
|
||||
// WeightedRandomChestContent(ItemIngots.getIngotByName("steel"), 1, 3, 5);
|
||||
|
||||
public static void init()
|
||||
{
|
||||
public static void init() {
|
||||
// if(ConfigTechReborn.RubberSaplingLoot){
|
||||
// generate(rubberSaplingLoot);
|
||||
// }
|
||||
|
@ -32,17 +29,17 @@ public class ModLoot
|
|||
// }
|
||||
}
|
||||
|
||||
// public static void generate(WeightedRandomChestContent chestContent)
|
||||
// {
|
||||
// for (String category :
|
||||
// Arrays.asList(ChestGenHooks.VILLAGE_BLACKSMITH,
|
||||
// ChestGenHooks.MINESHAFT_CORRIDOR, ChestGenHooks.PYRAMID_DESERT_CHEST,
|
||||
// ChestGenHooks.PYRAMID_JUNGLE_CHEST,
|
||||
// ChestGenHooks.PYRAMID_JUNGLE_DISPENSER,
|
||||
// ChestGenHooks.STRONGHOLD_CORRIDOR, ChestGenHooks.STRONGHOLD_LIBRARY,
|
||||
// ChestGenHooks.STRONGHOLD_CROSSING, ChestGenHooks.BONUS_CHEST,
|
||||
// ChestGenHooks.DUNGEON_CHEST)) {
|
||||
// ChestGenHooks.addItem(category, chestContent);
|
||||
// }
|
||||
// }
|
||||
// public static void generate(WeightedRandomChestContent chestContent)
|
||||
// {
|
||||
// for (String category :
|
||||
// Arrays.asList(ChestGenHooks.VILLAGE_BLACKSMITH,
|
||||
// ChestGenHooks.MINESHAFT_CORRIDOR, ChestGenHooks.PYRAMID_DESERT_CHEST,
|
||||
// ChestGenHooks.PYRAMID_JUNGLE_CHEST,
|
||||
// ChestGenHooks.PYRAMID_JUNGLE_DISPENSER,
|
||||
// ChestGenHooks.STRONGHOLD_CORRIDOR, ChestGenHooks.STRONGHOLD_LIBRARY,
|
||||
// ChestGenHooks.STRONGHOLD_CROSSING, ChestGenHooks.BONUS_CHEST,
|
||||
// ChestGenHooks.DUNGEON_CHEST)) {
|
||||
// ChestGenHooks.addItem(category, chestContent);
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
|
|
@ -1,16 +1,14 @@
|
|||
package techreborn.init;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ModParts
|
||||
{
|
||||
import java.util.HashMap;
|
||||
|
||||
public class ModParts {
|
||||
|
||||
public static HashMap<Integer, ItemStack> stackCable = new HashMap<>();
|
||||
|
||||
public static void init()
|
||||
{ // TODO 1.8
|
||||
public static void init() { // TODO 1.8
|
||||
// if (Loader.isModLoaded("IC2")) {
|
||||
// for (int i = 0; i < 11; i++) {
|
||||
// CablePart part = new CablePart();
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -7,23 +7,20 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
|||
/**
|
||||
* Created by Mark on 20/03/2016.
|
||||
*/
|
||||
public class ModSounds
|
||||
{
|
||||
public class ModSounds {
|
||||
|
||||
public static SoundEvent shock;
|
||||
public static SoundEvent dismantle;
|
||||
public static SoundEvent extract;
|
||||
|
||||
public static void init()
|
||||
{
|
||||
public static void init() {
|
||||
shock = getSound("cable_shock");
|
||||
dismantle = getSound("block_dismantle");
|
||||
extract = getSound("sap_extract");
|
||||
}
|
||||
|
||||
private static SoundEvent getSound(String str)
|
||||
{
|
||||
ResourceLocation resourceLocation = new ResourceLocation("techreborn" , str);
|
||||
private static SoundEvent getSound(String str) {
|
||||
ResourceLocation resourceLocation = new ResourceLocation("techreborn", str);
|
||||
return GameRegistry.register(new SoundEvent(resourceLocation).setRegistryName(resourceLocation));
|
||||
}
|
||||
|
||||
|
|
|
@ -14,112 +14,120 @@ import techreborn.utils.OreDictUtils;
|
|||
|
||||
public class OreDict {
|
||||
|
||||
private static final ImmutableList<String> plateGenIgnores = ImmutableList.of(
|
||||
"hot", //Hot ingots
|
||||
"mixedMetal", //Mixed metal has own version of plate
|
||||
"iridiumAlloy", //Iridium alloy is plate itself
|
||||
ModItems.META_PLACEHOLDER //...
|
||||
);
|
||||
private static final ImmutableList<String> plateGenIgnores = ImmutableList.of(
|
||||
"hot", //Hot ingots
|
||||
"mixedMetal", //Mixed metal has own version of plate
|
||||
"iridiumAlloy", //Iridium alloy is plate itself
|
||||
ModItems.META_PLACEHOLDER //...
|
||||
);
|
||||
|
||||
public static void init() {
|
||||
if(Loader.isModLoaded("IC2")) {
|
||||
Core.logHelper.info("IC2 installed, enabling integration");
|
||||
IC2Dict.init();
|
||||
}
|
||||
public static void init() {
|
||||
if (Loader.isModLoaded("IC2")) {
|
||||
Core.logHelper.info("IC2 installed, enabling integration");
|
||||
IC2Dict.init();
|
||||
}
|
||||
|
||||
OreDictionary.registerOre("reBattery", ModItems.reBattery);
|
||||
OreDictionary.registerOre("reBattery", ModItems.reBattery);
|
||||
|
||||
OreDictionary.registerOre("circuitBasic", ItemParts.getPartByName("electronicCircuit"));
|
||||
OreDictionary.registerOre("circuitAdvanced", ItemParts.getPartByName("advancedCircuit"));
|
||||
OreDictionary.registerOre("circuitStorage", ItemParts.getPartByName("dataStorageCircuit"));
|
||||
OreDictionary.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit"));
|
||||
OreDictionary.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit"));
|
||||
OreDictionary.registerOre("circuitBasic", ItemParts.getPartByName("electronicCircuit"));
|
||||
OreDictionary.registerOre("circuitAdvanced", ItemParts.getPartByName("advancedCircuit"));
|
||||
OreDictionary.registerOre("circuitStorage", ItemParts.getPartByName("dataStorageCircuit"));
|
||||
OreDictionary.registerOre("circuitElite", ItemParts.getPartByName("dataControlCircuit"));
|
||||
OreDictionary.registerOre("circuitMaster", ItemParts.getPartByName("energyFlowCircuit"));
|
||||
|
||||
OreDictionary.registerOre("machineBlockBasic", BlockMachineFrame.getFrameByName("machine", 1));
|
||||
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1));
|
||||
OreDictionary.registerOre("machineBlockElite", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
|
||||
OreDictionary.registerOre("machineBlockBasic", BlockMachineFrame.getFrameByName("machine", 1));
|
||||
OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1));
|
||||
OreDictionary.registerOre("machineBlockElite", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
|
||||
|
||||
OreDictionary.registerOre("lapotronCrystal", ModItems.lapotronCrystal);
|
||||
OreDictionary.registerOre("energyCrystal", ModItems.energyCrystal);
|
||||
OreDictionary.registerOre("lapotronCrystal", ModItems.lapotronCrystal);
|
||||
OreDictionary.registerOre("energyCrystal", ModItems.energyCrystal);
|
||||
|
||||
OreDictionary.registerOre("drillBasic", ModItems.diamondDrill);
|
||||
OreDictionary.registerOre("drillDiamond", ModItems.diamondDrill);
|
||||
OreDictionary.registerOre("drillBasic", ModItems.diamondDrill);
|
||||
OreDictionary.registerOre("drillDiamond", ModItems.diamondDrill);
|
||||
|
||||
OreDictionary.registerOre("industrialTnt", Blocks.TNT);
|
||||
OreDictionary.registerOre("craftingIndustrialDiamond", Items.DIAMOND);
|
||||
OreDictionary.registerOre("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold"));
|
||||
OreDictionary.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
|
||||
OreDictionary.registerOre("industrialTnt", Blocks.TNT);
|
||||
OreDictionary.registerOre("craftingIndustrialDiamond", Items.DIAMOND);
|
||||
OreDictionary.registerOre("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold"));
|
||||
OreDictionary.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
|
||||
|
||||
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("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", nothing);
|
||||
//OreDictionary.registerOre("uran238", nothing);
|
||||
//OreDictionary.registerOre("smallUran235", nothing);
|
||||
//OreDictionary.registerOre("uran235", nothing);
|
||||
//OreDictionary.registerOre("uran238", nothing);
|
||||
//OreDictionary.registerOre("smallUran235", nothing);
|
||||
|
||||
OreDictionary.registerOre("fenceIron", ModBlocks.ironFence);
|
||||
OreDictionary.registerOre("woodRubber", ModBlocks.rubberLog);
|
||||
OreDictionary.registerOre("glassReinforced", ModBlocks.reinforcedglass);
|
||||
OreDictionary.registerOre("fenceIron", ModBlocks.ironFence);
|
||||
OreDictionary.registerOre("woodRubber", ModBlocks.rubberLog);
|
||||
OreDictionary.registerOre("glassReinforced", ModBlocks.reinforcedglass);
|
||||
|
||||
OreDictionary.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
|
||||
OreDictionary.registerOre("diamondTR", Items.DIAMOND);
|
||||
OreDictionary.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
|
||||
OreDictionary.registerOre("diamondTR", Items.DIAMOND);
|
||||
|
||||
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
|
||||
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("tungstenGrindingHead"));
|
||||
OreDictionary.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor"));
|
||||
OreDictionary.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead"));
|
||||
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
|
||||
OreDictionary.registerOre("craftingGrinder", ItemParts.getPartByName("tungstenGrindingHead"));
|
||||
OreDictionary.registerOre("craftingSuperconductor", ItemParts.getPartByName("superconductor"));
|
||||
OreDictionary.registerOre("batteryUltimate", ItemParts.getPartByName("diamondGrindingHead"));
|
||||
|
||||
OreDictionary.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
|
||||
OreDictionary.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
|
||||
OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("sawDust"));
|
||||
OreDictionary.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
|
||||
OreDictionary.registerOre("materialRubber", ItemParts.getPartByName("rubber"));
|
||||
OreDictionary.registerOre("pulpWood", ItemDusts.getDustByName("sawDust"));
|
||||
|
||||
//Gems registration
|
||||
for(String type : ItemGems.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String upper = OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre("gem" + upper, ItemGems.getGemByName(type));
|
||||
boolean ignoreIt = false;
|
||||
for(String ignore : plateGenIgnores)
|
||||
if(type.startsWith(ignore)) ignoreIt = true;
|
||||
if(!ignoreIt) ItemPlates.registerType(upper);
|
||||
}
|
||||
|
||||
//Ingots registration
|
||||
for(String type : ItemIngots.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String upperName = OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre("ingot" + upperName, ItemIngots.getIngotByName(type));
|
||||
boolean ignoreIt = false;
|
||||
for(String ignore : plateGenIgnores)
|
||||
if(type.startsWith(ignore)) ignoreIt = true;
|
||||
if(!ignoreIt) ItemPlates.registerType(type);
|
||||
}
|
||||
//Gems registration
|
||||
for (String type : ItemGems.types) {
|
||||
if (type.equals(ModItems.META_PLACEHOLDER))
|
||||
continue; //Aware of placeholders!
|
||||
String upper = OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre("gem" + upper, ItemGems.getGemByName(type));
|
||||
boolean ignoreIt = false;
|
||||
for (String ignore : plateGenIgnores)
|
||||
if (type.startsWith(ignore))
|
||||
ignoreIt = true;
|
||||
if (!ignoreIt)
|
||||
ItemPlates.registerType(upper);
|
||||
}
|
||||
|
||||
//Ingots registration
|
||||
for (String type : ItemIngots.types) {
|
||||
if (type.equals(ModItems.META_PLACEHOLDER))
|
||||
continue; //Aware of placeholders!
|
||||
String upperName = OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre("ingot" + upperName, ItemIngots.getIngotByName(type));
|
||||
boolean ignoreIt = false;
|
||||
for (String ignore : plateGenIgnores)
|
||||
if (type.startsWith(ignore))
|
||||
ignoreIt = true;
|
||||
if (!ignoreIt)
|
||||
ItemPlates.registerType(type);
|
||||
}
|
||||
|
||||
//Dusts, nuggets and plates auto-registration
|
||||
//Dusts, nuggets and plates auto-registration
|
||||
|
||||
for(String type : ItemPlates.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String oreDictName = "plate" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemPlates.getPlateByName(type));
|
||||
}
|
||||
|
||||
for(String type : ItemDusts.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String oreDictName = "dust" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type));
|
||||
}
|
||||
|
||||
for(String type : ItemNuggets.types) {
|
||||
if(type.equals(ModItems.META_PLACEHOLDER)) continue; //Aware of placeholders!
|
||||
String oreDictName = "nugget" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemNuggets.getNuggetByName(type));
|
||||
}
|
||||
|
||||
}
|
||||
for (String type : ItemPlates.types) {
|
||||
if (type.equals(ModItems.META_PLACEHOLDER))
|
||||
continue; //Aware of placeholders!
|
||||
String oreDictName = "plate" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemPlates.getPlateByName(type));
|
||||
}
|
||||
|
||||
for (String type : ItemDusts.types) {
|
||||
if (type.equals(ModItems.META_PLACEHOLDER))
|
||||
continue; //Aware of placeholders!
|
||||
String oreDictName = "dust" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemDusts.getDustByName(type));
|
||||
}
|
||||
|
||||
for (String type : ItemNuggets.types) {
|
||||
if (type.equals(ModItems.META_PLACEHOLDER))
|
||||
continue; //Aware of placeholders!
|
||||
String oreDictName = "nugget" + OreDictUtils.toFirstUpper(type);
|
||||
OreDictionary.registerOre(oreDictName, ItemNuggets.getNuggetByName(type));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -10,118 +10,118 @@ import techreborn.items.*;
|
|||
* Created by Mark on 03/04/2016.
|
||||
*/
|
||||
public class SubItemRetriever implements ISubItemRetriever {
|
||||
@Override
|
||||
public ItemStack getCellByName(String name) {
|
||||
return ItemCells.getCellByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getCellByName(String name) {
|
||||
return ItemCells.getCellByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getCellByName(String name, int count) {
|
||||
return ItemCells.getCellByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getCellByName(String name, int count) {
|
||||
return ItemCells.getCellByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getCellByName(String name, int count, boolean lookForIC2) {
|
||||
return ItemCells.getCellByName(name, count, lookForIC2);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getCellByName(String name, int count, boolean lookForIC2) {
|
||||
return ItemCells.getCellByName(name, count, lookForIC2);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getDustByName(String name) {
|
||||
return ItemDusts.getDustByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getDustByName(String name) {
|
||||
return ItemDusts.getDustByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getDustByName(String name, int count) {
|
||||
return ItemDusts.getDustByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getDustByName(String name, int count) {
|
||||
return ItemDusts.getDustByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getSmallDustByName(String name) {
|
||||
return ItemDustsSmall.getSmallDustByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getSmallDustByName(String name) {
|
||||
return ItemDustsSmall.getSmallDustByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getSmallDustByName(String name, int count) {
|
||||
return ItemDustsSmall.getSmallDustByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getSmallDustByName(String name, int count) {
|
||||
return ItemDustsSmall.getSmallDustByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getGemByName(String name) {
|
||||
return ItemGems.getGemByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getGemByName(String name) {
|
||||
return ItemGems.getGemByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getGemByName(String name, int count) {
|
||||
return ItemGems.getGemByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getGemByName(String name, int count) {
|
||||
return ItemGems.getGemByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getIngotByName(String name) {
|
||||
return ItemIngots.getIngotByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getIngotByName(String name) {
|
||||
return ItemIngots.getIngotByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getIngotByName(String name, int count) {
|
||||
return ItemIngots.getIngotByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getIngotByName(String name, int count) {
|
||||
return ItemIngots.getIngotByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getNuggetByName(String name) {
|
||||
return ItemNuggets.getNuggetByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getNuggetByName(String name) {
|
||||
return ItemNuggets.getNuggetByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getNuggetByName(String name, int count) {
|
||||
return ItemNuggets.getNuggetByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getNuggetByName(String name, int count) {
|
||||
return ItemNuggets.getNuggetByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPartByName(String name) {
|
||||
return ItemParts.getPartByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getPartByName(String name) {
|
||||
return ItemParts.getPartByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPartByName(String name, int count) {
|
||||
return ItemParts.getPartByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getPartByName(String name, int count) {
|
||||
return ItemParts.getPartByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPlateByName(String name) {
|
||||
return ItemPlates.getPlateByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getPlateByName(String name) {
|
||||
return ItemPlates.getPlateByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPlateByName(String name, int count) {
|
||||
return ItemPlates.getPlateByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getPlateByName(String name, int count) {
|
||||
return ItemPlates.getPlateByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getUpgradeByName(String name) {
|
||||
return ItemUpgrades.getUpgradeByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getUpgradeByName(String name) {
|
||||
return ItemUpgrades.getUpgradeByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getUpgradeByName(String name, int count) {
|
||||
return ItemUpgrades.getUpgradeByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getUpgradeByName(String name, int count) {
|
||||
return ItemUpgrades.getUpgradeByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getOreByName(String name) {
|
||||
return BlockOre.getOreByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getOreByName(String name) {
|
||||
return BlockOre.getOreByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getOreByName(String name, int count) {
|
||||
return BlockOre.getOreByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getOreByName(String name, int count) {
|
||||
return BlockOre.getOreByName(name, count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStorageBlockByName(String name) {
|
||||
return BlockStorage.getStorageBlockByName(name);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getStorageBlockByName(String name) {
|
||||
return BlockStorage.getStorageBlockByName(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStorageBlockByName(String name, int count) {
|
||||
return BlockStorage.getStorageBlockByName(name, count);
|
||||
}
|
||||
@Override
|
||||
public ItemStack getStorageBlockByName(String name, int count) {
|
||||
return BlockStorage.getStorageBlockByName(name, count);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue