maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve block names

Browse source
This commit is contained in:
modmuss50 2016-12-05 09:40:55 +00:00
parent 40835a2773
commit 2fdce5405b
46 changed files with 419 additions and 419 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/techreborn/client/ClientMultiBlocks.java
View file

@ -29,7 +29,7 @@ public class ClientMultiBlocks {
}
private static boolean isCoil(int x, int y, int z) {
reactor.addComponent(new BlockPos(x, y, z), ModBlocks.FusionCoil.getDefaultState());
reactor.addComponent(new BlockPos(x, y, z), ModBlocks.fusionCoil.getDefaultState());
return true;
}
@ -44,7 +44,7 @@ public class ClientMultiBlocks {
BlockPos pos = new BlockPos(xDir + i, yDir + j, zDir + k);
int meta = (((i == 0) && (j == 0) && (k != 0)) || ((i == 0) && (j != 0) && (k == 0))
|| ((i != 0) && (j == 0) && (k == 0)) ? 2 : 1);
frezzer.addComponent(pos, ModBlocks.MachineCasing.getStateFromMeta(meta));
frezzer.addComponent(pos, ModBlocks.machineCasing.getStateFromMeta(meta));
}
}
}

74
src/main/java/techreborn/client/gui/GuiBlastFurnace.java
View file

@ -109,47 +109,47 @@ public class GuiBlastFurnace extends GuiContainer {
{// This code here makes a basic multiblock and then sets to the
// selected one.
Multiblock multiblock = new Multiblock();
addComponent(0, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 0, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 0, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 0, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 0, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 0, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 0, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 0, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 0, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 0, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 0, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 0, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 0, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 1, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 1, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 1, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 1, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 1, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 1, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 1, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 1, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 1, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 1, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 1, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 1, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 2, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 2, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 2, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 2, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 2, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 2, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 2, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 2, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 2, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 2, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 2, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 2, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 3, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 3, 0, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(-1, 3, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 3, -1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(1, 3, 1, ModBlocks.MachineCasing.getDefaultState(), multiblock);
addComponent(0, 3, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 3, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 3, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 3, 0, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(0, 3, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 3, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(-1, 3, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 3, -1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 3, 1, ModBlocks.machineCasing.getDefaultState(), multiblock);
addComponent(1, 4, 0, ModBlocks.LesuStorage.getDefaultState(), multiblock);
addComponent(1, 4, 1, ModBlocks.Lesu.getDefaultState(), multiblock);
addComponent(1, 4, 2, ModBlocks.AlloyFurnace.getDefaultState(), multiblock);
addComponent(1, 4, 0, ModBlocks.LESUStorage.getDefaultState(), multiblock);
addComponent(1, 4, 1, ModBlocks.LESU.getDefaultState(), multiblock);
addComponent(1, 4, 2, ModBlocks.alloyFurnace.getDefaultState(), multiblock);
MultiblockSet set = new MultiblockSet(multiblock);
ClientProxy.multiblockRenderEvent.setMultiblock(set);

26
src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
View file

@ -188,26 +188,26 @@ public class TechRebornJeiPlugin extends BlankModPlugin {
VanillaRecipeCategoryUid.FUEL);
registry.addRecipeClickArea(GuiElectricFurnace.class, 78, 36, 24, 16, VanillaRecipeCategoryUid.SMELTING);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.Compressor), RecipeCategoryUids.COMPRESSOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.AlloyFurnace), RecipeCategoryUids.ALLOY_SMELTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.AlloySmelter), RecipeCategoryUids.ALLOY_SMELTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.AssemblyMachine),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.compressor), RecipeCategoryUids.COMPRESSOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.alloyFurnace), RecipeCategoryUids.ALLOY_SMELTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.alloySmelter), RecipeCategoryUids.ALLOY_SMELTER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.assemblyMachine),
RecipeCategoryUids.ASSEMBLING_MACHINE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.BlastFurnace), RecipeCategoryUids.BLAST_FURNACE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.blastFurnace), RecipeCategoryUids.BLAST_FURNACE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.centrifuge), RecipeCategoryUids.CENTRIFUGE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ChemicalReactor),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.chemicalReactor),
RecipeCategoryUids.CHEMICAL_REACTOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.Extractor), RecipeCategoryUids.EXTRACTOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.FusionControlComputer),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.extractor), RecipeCategoryUids.EXTRACTOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.fusionControlComputer),
RecipeCategoryUids.FUSION_REACTOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.Grinder), RecipeCategoryUids.GRINDER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.ImplosionCompressor),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.grinder), RecipeCategoryUids.GRINDER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.implosionCompressor),
RecipeCategoryUids.IMPLOSION_COMPRESSOR);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IndustrialElectrolyzer),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.industrialElectrolyzer),
RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.IndustrialGrinder),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.industrialGrinder),
RecipeCategoryUids.INDUSTRIAL_GRINDER);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.RollingMachine),
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.rollingMachine),
RecipeCategoryUids.ROLLING_MACHINE);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.scrapBox), RecipeCategoryUids.SCRAPBOX);

290
src/main/java/techreborn/init/ModBlocks.java
View file

@ -46,54 +46,54 @@ public class ModBlocks {
public static Block quantumChest;
public static Block digitalChest;
public static Block centrifuge;
public static Block RollingMachine;
public static Block MachineCasing;
public static Block BlastFurnace;
public static Block AlloySmelter;
public static Block IndustrialGrinder;
public static Block ImplosionCompressor;
public static Block MatterFabricator;
public static Block ChunkLoader;
public static Block Dragoneggenergysiphoner;
public static Block Magicenergeyconverter;
public static Block AssemblyMachine;
public static Block DieselGenerator;
public static Block IndustrialElectrolyzer;
public static Block MagicalAbsorber;
public static Block Semifluidgenerator;
public static Block Gasturbine;
public static Block AlloyFurnace;
public static Block ChemicalReactor;
public static Block Idsu;
public static Block Aesu;
public static Block Lesu;
public static Block LesuStorage;
public static Block Distillationtower;
public static Block ElectricCraftingTable;
public static Block VacuumFreezer;
public static Block FusionControlComputer;
public static Block FusionCoil;
public static Block LightningRod;
public static Block rollingMachine;
public static Block machineCasing;
public static Block blastFurnace;
public static Block alloySmelter;
public static Block industrialGrinder;
public static Block implosionCompressor;
public static Block matterFabricator;
public static Block chunkLoader;
public static Block dragonEggEnergySiphoner;
public static Block magicEnergeyConverter;
public static Block assemblyMachine;
public static Block dieselGenerator;
public static Block industrialElectrolyzer;
public static Block magicalAbsorber;
public static Block semiFluidGenerator;
public static Block gasTurbine;
public static Block alloyFurnace;
public static Block chemicalReactor;
public static Block IDSU;
public static Block AESU;
public static Block LESU;
public static Block LESUStorage;
public static Block distillationTower;
public static Block electricCraftingTable;
public static Block vacuumFreezer;
public static Block fusionControlComputer;
public static Block fusionCoil;
public static Block lightningRod;
public static Block heatGenerator;
public static Block industrialSawmill;
public static Block chargeBench;
public static Block playerDetector;
public static Block Grinder;
public static Block Generator;
public static Block Compressor;
public static Block Extractor;
public static Block ElectricFurnace;
public static Block grinder;
public static Block generator;
public static Block compressor;
public static Block extractor;
public static Block electricFurnace;
public static Block solarPanel;
public static Block waterMill;
public static Block windMill;
public static Block recycler;
public static Block batBox;
public static Block mfe;
public static Block mfsu;
public static Block MFE;
public static Block MFSU;
public static Block scrapboxinator;
public static Block lvt;
public static Block mvt;
public static Block hvt;
public static Block LVT;
public static Block MVT;
public static Block HVT;
public static BlockOre ore;
public static BlockOre2 ore2;
@ -138,40 +138,40 @@ public class ModBlocks {
GameRegistry.registerTileEntity(TileCentrifuge.class, "TileCentrifugeTR");
Core.proxy.registerCustomBlockStateLocation(centrifuge, "machines/tier2_machines/industrial_centrifuge");
RollingMachine = new BlockRollingMachine(Material.ROCK);
registerBlock(RollingMachine, "rollingmachine");
rollingMachine = new BlockRollingMachine(Material.ROCK);
registerBlock(rollingMachine, "rollingmachine");
GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR");
Core.proxy.registerCustomBlockStateLocation(RollingMachine, "machines/tier1_machines/rolling_machine");
Core.proxy.registerCustomBlockStateLocation(rollingMachine, "machines/tier1_machines/rolling_machine");
BlastFurnace = new BlockBlastFurnace(Material.ROCK);
registerBlock(BlastFurnace, "blastFurnace");
blastFurnace = new BlockBlastFurnace(Material.ROCK);
registerBlock(blastFurnace, "blastFurnace");
GameRegistry.registerTileEntity(TileBlastFurnace.class, "TileBlastFurnaceTR");
Core.proxy.registerCustomBlockStateLocation(BlastFurnace, "machines/tier2_machines/industrial_blast_furnace");
Core.proxy.registerCustomBlockStateLocation(blastFurnace, "machines/tier2_machines/industrial_blast_furnace");
AlloySmelter = new BlockAlloySmelter(Material.ROCK);
registerBlock(AlloySmelter, "alloySmelter");
alloySmelter = new BlockAlloySmelter(Material.ROCK);
registerBlock(alloySmelter, "alloySmelter");
GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR");
Core.proxy.registerCustomBlockStateLocation(AlloySmelter, "machines/tier1_machines/electric_alloy_smelter");
Core.proxy.registerCustomBlockStateLocation(alloySmelter, "machines/tier1_machines/electric_alloy_smelter");
IndustrialGrinder = new BlockIndustrialGrinder(Material.ROCK);
registerBlock(IndustrialGrinder, "grinder");
industrialGrinder = new BlockIndustrialGrinder(Material.ROCK);
registerBlock(industrialGrinder, "grinder");
GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR");
Core.proxy.registerCustomBlockStateLocation(IndustrialGrinder, "machines/tier2_machines/industrial_grinder");
Core.proxy.registerCustomBlockStateLocation(industrialGrinder, "machines/tier2_machines/industrial_grinder");
ImplosionCompressor = new BlockImplosionCompressor(Material.ROCK);
registerBlock(ImplosionCompressor, "implosioncompressor");
implosionCompressor = new BlockImplosionCompressor(Material.ROCK);
registerBlock(implosionCompressor, "implosioncompressor");
GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR");
Core.proxy.registerCustomBlockStateLocation(ImplosionCompressor, "machines/tier2_machines/implosion_compressor");
Core.proxy.registerCustomBlockStateLocation(implosionCompressor, "machines/tier2_machines/implosion_compressor");
MatterFabricator = new BlockMatterFabricator(Material.ROCK);
registerBlock(MatterFabricator, "matterfabricator");
matterFabricator = new BlockMatterFabricator(Material.ROCK);
registerBlock(matterFabricator, "matterfabricator");
GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR");
Core.proxy.registerCustomBlockStateLocation(MatterFabricator, "machines/tier3_machines/matter_fabricator");
Core.proxy.registerCustomBlockStateLocation(matterFabricator, "machines/tier3_machines/matter_fabricator");
ChunkLoader = new BlockChunkLoader(Material.ROCK);
registerBlock(ChunkLoader, "chunkloader");
chunkLoader = new BlockChunkLoader(Material.ROCK);
registerBlock(chunkLoader, "chunkloader");
GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR");
Core.proxy.registerCustomBlockStateLocation(ChunkLoader, "machines/tier3_machines/industrial_chunk_loader");
Core.proxy.registerCustomBlockStateLocation(chunkLoader, "machines/tier3_machines/industrial_chunk_loader");
chargeBench = new BlockChargeBench(Material.ROCK);
registerBlock(chargeBench, "chargebench");
@ -182,10 +182,10 @@ public class ModBlocks {
registerBlock(playerDetector, ItemBlockPlayerDetector.class, "playerDetector");
GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR");
MachineCasing = new BlockMachineCasing(Material.ROCK);
registerBlock(MachineCasing, ItemBlockMachineCasing.class, "machinecasing");
machineCasing = new BlockMachineCasing(Material.ROCK);
registerBlock(machineCasing, ItemBlockMachineCasing.class, "machinecasing");
GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR");
Core.proxy.registerCustomBlockStateLocation(MachineCasing, "machines/structure/machine_casing");
Core.proxy.registerCustomBlockStateLocation(machineCasing, "machines/structure/machine_casing");
ore = new BlockOre(Material.ROCK);
@ -212,105 +212,105 @@ public class ModBlocks {
Core.proxy.registerSubBlockInventoryLocation(storage2, i, "storage/storage", BlockStorage2.types[i]);
}
Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.ROCK);
registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon");
dragonEggEnergySiphoner = new BlockDragonEggSiphoner(Material.ROCK);
registerBlock(dragonEggEnergySiphoner, "dragoneggenergsiphon");
GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR");
Core.proxy.registerCustomBlockStateLocation(Dragoneggenergysiphoner, "machines/generators/dragon_egg_syphon");
Core.proxy.registerCustomBlockStateLocation(dragonEggEnergySiphoner, "machines/generators/dragon_egg_syphon");
Magicenergeyconverter = new BlockMagicEnergyConverter(Material.ROCK);
registerBlock(Magicenergeyconverter, "magicenergyconverter");
Core.proxy.registerCustomBlockStateLocation(Magicenergeyconverter, "machines/generators/magic_energy_converter");
magicEnergeyConverter = new BlockMagicEnergyConverter(Material.ROCK);
registerBlock(magicEnergeyConverter, "magicenergyconverter");
Core.proxy.registerCustomBlockStateLocation(magicEnergeyConverter, "machines/generators/magic_energy_converter");
AssemblyMachine = new BlockAssemblingMachine(Material.ROCK);
registerBlock(AssemblyMachine, "assemblymachine");
assemblyMachine = new BlockAssemblingMachine(Material.ROCK);
registerBlock(assemblyMachine, "assemblymachine");
GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR");
Core.proxy.registerCustomBlockStateLocation(AssemblyMachine, "machines/tier1_machines/assembly_machine");
Core.proxy.registerCustomBlockStateLocation(assemblyMachine, "machines/tier1_machines/assembly_machine");
DieselGenerator = new BlockDieselGenerator(Material.ROCK);
registerBlock(DieselGenerator, "dieselgenerator");
dieselGenerator = new BlockDieselGenerator(Material.ROCK);
registerBlock(dieselGenerator, "dieselgenerator");
GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR");
Core.proxy.registerCustomBlockStateLocation(DieselGenerator, "machines/generators/diesel_generator");
Core.proxy.registerCustomBlockStateLocation(dieselGenerator, "machines/generators/diesel_generator");
IndustrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.ROCK);
registerBlock(IndustrialElectrolyzer, "industrialelectrolyzer");
industrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.ROCK);
registerBlock(industrialElectrolyzer, "industrialelectrolyzer");
GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR");
Core.proxy.registerCustomBlockStateLocation(IndustrialElectrolyzer, "machines/tier1_machines/industrial_electrolyzer");
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");
magicalAbsorber = new BlockMagicEnergyAbsorber(Material.ROCK);
registerBlock(magicalAbsorber, "magicrnergyabsorber");
Core.proxy.registerCustomBlockStateLocation(magicalAbsorber, "machines/generators/magic_energy_absorber");
Semifluidgenerator = new BlockSemiFluidGenerator(Material.ROCK);
registerBlock(Semifluidgenerator, "semifluidgenerator");
semiFluidGenerator = new BlockSemiFluidGenerator(Material.ROCK);
registerBlock(semiFluidGenerator, "semifluidgenerator");
GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGeneratorTR");
Core.proxy.registerCustomBlockStateLocation(Semifluidgenerator, "machines/generators/semi_fluid_generator");
Core.proxy.registerCustomBlockStateLocation(semiFluidGenerator, "machines/generators/semi_fluid_generator");
Gasturbine = new BlockGasTurbine(Material.ROCK);
registerBlock(Gasturbine, "gasturbine");
gasTurbine = new BlockGasTurbine(Material.ROCK);
registerBlock(gasTurbine, "gasturbine");
GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbineTR");
Core.proxy.registerCustomBlockStateLocation(Gasturbine, "machines/generators/gas_turbine");
Core.proxy.registerCustomBlockStateLocation(gasTurbine, "machines/generators/gas_turbine");
AlloyFurnace = new BlockAlloyFurnace(Material.ROCK);
registerBlock(AlloyFurnace, "alloyfurnace");
alloyFurnace = new BlockAlloyFurnace(Material.ROCK);
registerBlock(alloyFurnace, "alloyfurnace");
GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnaceTR");
Core.proxy.registerCustomBlockStateLocation(AlloyFurnace, "machines/tier0_machines/alloy_furnace");
Core.proxy.registerCustomBlockStateLocation(alloyFurnace, "machines/tier0_machines/alloy_furnace");
ChemicalReactor = new BlockChemicalReactor(Material.ROCK);
registerBlock(ChemicalReactor, "chemicalreactor");
chemicalReactor = new BlockChemicalReactor(Material.ROCK);
registerBlock(chemicalReactor, "chemicalreactor");
GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR");
Core.proxy.registerCustomBlockStateLocation(ChemicalReactor, "machines/tier1_machines/chemical_reactor");
Core.proxy.registerCustomBlockStateLocation(chemicalReactor, "machines/tier1_machines/chemical_reactor");
Idsu = new BlockIDSU();
registerBlock(Idsu, "idsu");
IDSU = new BlockIDSU();
registerBlock(IDSU, "idsu");
GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR");
Aesu = new BlockAESU();
registerBlock(Aesu, ItemBlockAesu.class, "aesu");
AESU = new BlockAESU();
registerBlock(AESU, ItemBlockAesu.class, "aesu");
GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR");
Lesu = new BlockLESU();
registerBlock(Lesu, "lesu");
LESU = new BlockLESU();
registerBlock(LESU, "lesu");
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
LesuStorage = new BlockLESUStorage(Material.ROCK);
registerBlock(LesuStorage, "lesustorage");
LESUStorage = new BlockLESUStorage(Material.ROCK);
registerBlock(LESUStorage, "lesustorage");
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");
if (Core.proxy.isCTMAvailable()) {
Core.proxy.registerCustomBlockStateLocation(LesuStorage, "machines/energy/ev_multi_storage_ctm");
Core.proxy.registerCustomBlockStateLocation(LESUStorage, "machines/energy/ev_multi_storage_ctm");
} else {
Core.proxy.registerCustomBlockStateLocation(LesuStorage, "machines/energy/ev_multi_storage");
Core.proxy.registerCustomBlockStateLocation(LESUStorage, "machines/energy/ev_multi_storage");
}
Distillationtower = new BlockDistillationTower(Material.ROCK);
registerBlock(Distillationtower, "distillationtower");
Core.proxy.registerCustomBlockStateLocation(Distillationtower, "machines/tier2_machines/distillation_tower");
distillationTower = new BlockDistillationTower(Material.ROCK);
registerBlock(distillationTower, "distillationtower");
Core.proxy.registerCustomBlockStateLocation(distillationTower, "machines/tier2_machines/distillation_tower");
ElectricCraftingTable = new BlockElectricCraftingTable(Material.ROCK);
registerBlock(ElectricCraftingTable, "electriccraftingtable");
Core.proxy.registerCustomBlockStateLocation(ElectricCraftingTable, "machines/tier1_machines/electric_crafting_table");
electricCraftingTable = new BlockElectricCraftingTable(Material.ROCK);
registerBlock(electricCraftingTable, "electriccraftingtable");
Core.proxy.registerCustomBlockStateLocation(electricCraftingTable, "machines/tier1_machines/electric_crafting_table");
VacuumFreezer = new BlockVacuumFreezer(Material.ROCK);
registerBlock(VacuumFreezer, "vacuumfreezer");
vacuumFreezer = new BlockVacuumFreezer(Material.ROCK);
registerBlock(vacuumFreezer, "vacuumfreezer");
GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR");
Core.proxy.registerCustomBlockStateLocation(VacuumFreezer, "machines/tier2_machines/vacuum_freezer");
Core.proxy.registerCustomBlockStateLocation(vacuumFreezer, "machines/tier2_machines/vacuum_freezer");
FusionControlComputer = new BlockFusionControlComputer(Material.ROCK);
registerBlock(FusionControlComputer, "fusioncontrolcomputer");
fusionControlComputer = new BlockFusionControlComputer(Material.ROCK);
registerBlock(fusionControlComputer, "fusioncontrolcomputer");
GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR");
Core.proxy.registerCustomBlockStateLocation(FusionControlComputer, "machines/generators/fusion_reactor");
Core.proxy.registerCustomBlockStateLocation(fusionControlComputer, "machines/generators/fusion_reactor");
FusionCoil = new BlockFusionCoil(Material.ROCK);
registerBlock(FusionCoil, "fusioncoil");
Core.proxy.registerCustomBlockStateLocation(FusionCoil, "machines/generators/fusion_coil");
fusionCoil = new BlockFusionCoil(Material.ROCK);
registerBlock(fusionCoil, "fusioncoil");
Core.proxy.registerCustomBlockStateLocation(fusionCoil, "machines/generators/fusion_coil");
LightningRod = new BlockLightningRod(Material.ROCK);
registerBlock(LightningRod, "lightningrod");
lightningRod = new BlockLightningRod(Material.ROCK);
registerBlock(lightningRod, "lightningrod");
GameRegistry.registerTileEntity(TileLightningRod.class, "TileLightningRodTR");
Core.proxy.registerCustomBlockStateLocation(LightningRod, "machines/generators/lightning_rod");
Core.proxy.registerCustomBlockStateLocation(lightningRod, "machines/generators/lightning_rod");
heatGenerator = new BlockHeatGenerator(Material.ROCK);
registerBlock(heatGenerator, "heatgenerator");
@ -324,30 +324,30 @@ public class ModBlocks {
machineframe = new BlockMachineFrame(Material.IRON);
registerBlock(machineframe, ItemBlockMachineFrame.class, "techreborn.machineFrame");
Grinder = new BlockGrinder(Material.IRON);
registerBlock(Grinder, "techreborn.grinder");
grinder = new BlockGrinder(Material.IRON);
registerBlock(grinder, "techreborn.grinder");
GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR");
Core.proxy.registerCustomBlockStateLocation(Grinder, "machines/tier1_machines/grinder");
Core.proxy.registerCustomBlockStateLocation(grinder, "machines/tier1_machines/grinder");
Generator = new BlockGenerator();
registerBlock(Generator, "techreborn.generator");
generator = new BlockGenerator();
registerBlock(generator, "techreborn.generator");
GameRegistry.registerTileEntity(TileGenerator.class, "TileGeneratorTR");
Core.proxy.registerCustomBlockStateLocation(Generator, "machines/generators/generator");
Core.proxy.registerCustomBlockStateLocation(generator, "machines/generators/generator");
Extractor = new BlockExtractor(Material.IRON);
registerBlock(Extractor, "techreborn.extractor");
extractor = new BlockExtractor(Material.IRON);
registerBlock(extractor, "techreborn.extractor");
GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR");
Core.proxy.registerCustomBlockStateLocation(Extractor, "machines/tier1_machines/extractor");
Core.proxy.registerCustomBlockStateLocation(extractor, "machines/tier1_machines/extractor");
Compressor = new BlockCompressor(Material.IRON);
registerBlock(Compressor, "techreborn.compressor");
compressor = new BlockCompressor(Material.IRON);
registerBlock(compressor, "techreborn.compressor");
GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR");
Core.proxy.registerCustomBlockStateLocation(Compressor, "machines/tier1_machines/compressor");
Core.proxy.registerCustomBlockStateLocation(compressor, "machines/tier1_machines/compressor");
ElectricFurnace = new BlockElectricFurnace(Material.IRON);
registerBlock(ElectricFurnace, "techreborn.electricfurnace");
electricFurnace = new BlockElectricFurnace(Material.IRON);
registerBlock(electricFurnace, "techreborn.electricfurnace");
GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR");
Core.proxy.registerCustomBlockStateLocation(ElectricFurnace, "machines/tier1_machines/electric_furnace");
Core.proxy.registerCustomBlockStateLocation(electricFurnace, "machines/tier1_machines/electric_furnace");
solarPanel = new BlockSolarPanel();
registerBlock(solarPanel, "techreborn.solarpanel");
@ -393,24 +393,24 @@ public class ModBlocks {
registerBlock(batBox, "batBox");
GameRegistry.registerTileEntity(TileBatBox.class, "TileBatBox");
mfe = new BlockMFE();
registerBlock(mfe, "mfe");
MFE = new BlockMFE();
registerBlock(MFE, "MFE");
GameRegistry.registerTileEntity(TileMFE.class, "TileMFE");
mfsu = new BlockMFSU();
registerBlock(mfsu, "mfsu");
MFSU = new BlockMFSU();
registerBlock(MFSU, "MFSU");
GameRegistry.registerTileEntity(TileMFSU.class, "TileMFSU");
lvt = new BlockLVTransformer();
registerBlock(lvt, "lvt");
LVT = new BlockLVTransformer();
registerBlock(LVT, "LVT");
GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformer");
mvt = new BlockMVTransformer();
registerBlock(mvt, "mvt");
MVT = new BlockMVTransformer();
registerBlock(MVT, "MVT");
GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformer");
hvt = new BlockHVTransformer();
registerBlock(hvt, "hvt");
HVT = new BlockHVTransformer();
registerBlock(HVT, "HVT");
GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformer");
ironFurnace = new BlockIronFurnace();

246
src/main/java/techreborn/init/ModRecipes.java
View file

@ -555,27 +555,27 @@ public class ModRecipes {
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.windMill, 2), "IXI", "XGX", "IXI", 'I', "ingotIron", 'G',
ModBlocks.Generator);
ModBlocks.generator);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.waterMill), "SWS", "WGW", "SWS", 'S', Items.STICK, 'W',
"plankWood", 'G', ModBlocks.Generator);
"plankWood", 'G', ModBlocks.generator);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.hvt), "XHX", "XMX", "XHX", 'M', ModBlocks.mvt, 'H',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.HVT), "XHX", "XMX", "XHX", 'M', ModBlocks.MVT, 'H',
ItemStandaloneCables.getCableByName("insulatedhv"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.mvt), "XGX", "XMX", "XGX", 'M',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MVT), "XGX", "XMX", "XGX", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'G',
ItemStandaloneCables.getCableByName("insulatedgold"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.lvt), "PWP", "CCC", "PPP", 'P', "plankWood", 'C',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LVT), "PWP", "CCC", "PPP", 'P', "plankWood", 'C',
"ingotCopper", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "RRR", "CAC", "RRR", 'R',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 0), "RRR", "CAC", "RRR", 'R',
ItemIngots.getIngotByName("refinedIron"), 'C', "circuitBasic", 'A',
BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 1), "RRR", "CAC", "RRR", 'R',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 1), "RRR", "CAC", "RRR", 'R',
"ingotSteel", 'C', "circuitAdvanced", 'A',
BlockMachineFrame.getFrameByName("advancedMachine", 1));
@ -587,25 +587,25 @@ public class ModRecipes {
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.thermalGenerator), "III", "IRI", "CGC", 'I', "ingotInvar",
'R', ModBlocks.reinforcedglass, 'G', ModBlocks.Generator, 'C',
'R', ModBlocks.reinforcedglass, 'G', ModBlocks.generator, 'C',
"circuitBasic");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.recycler), "XEX", "DCD", "GDG", 'D', Blocks.DIRT, 'C',
ModBlocks.Compressor, 'G', Items.GLOWSTONE_DUST, 'E', "circuitBasic");
ModBlocks.compressor, 'G', Items.GLOWSTONE_DUST, 'E', "circuitBasic");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.batBox), "WCW", "BBB", "WWW", 'W', "plankWood", 'B',
batteryStack, 'C', ItemStandaloneCables.getCableByName("insulatedcopper"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.mfe), "GEG", "EME", "GEG", 'M',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MFE), "GEG", "EME", "GEG", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'E', crystalStack, 'G',
ItemStandaloneCables.getCableByName("insulatedgold"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.mfsu), "LAL", "LML", "LOL", 'A',
"circuitAdvanced", 'L', lapcrystalStack, 'M', new ItemStack(ModBlocks.mfe),
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MFSU), "LAL", "LML", "LOL", 'A',
"circuitAdvanced", 'L', lapcrystalStack, 'M', new ItemStack(ModBlocks.MFE),
'O', BlockMachineFrame.getFrameByName("advancedMachine", 1));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialElectrolyzer), "RER", "CEC", "RER", 'R',
ItemIngots.getIngotByName("refinediron"), 'E', new ItemStack(ModBlocks.Extractor), 'C',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialElectrolyzer), "RER", "CEC", "RER", 'R',
ItemIngots.getIngotByName("refinediron"), 'E', new ItemStack(ModBlocks.extractor), 'C',
"circuitAdvanced");
// Mixed Metal Ingot Recipes :P
@ -725,11 +725,11 @@ public class ModRecipes {
"ingotTungstensteel", 'B', "ingotBrass", 'T', "ingotAluminum");
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.Compressor), "SXS", "SCS", "SMS", 'C', "circuitBasic", 'M',
.addShapedOreRecipe(new ItemStack(ModBlocks.compressor), "SXS", "SCS", "SMS", 'C', "circuitBasic", 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'S', Blocks.STONE);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.ElectricFurnace), "XCX", "RFR", "XXX", 'C', "circuitBasic",
.addShapedOreRecipe(new ItemStack(ModBlocks.electricFurnace), "XCX", "RFR", "XXX", 'C', "circuitBasic",
'F', new ItemStack(ModBlocks.ironFurnace), 'R', Items.REDSTONE);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ironFurnace), "III", "IXI", "III", 'I', "ingotIron");
@ -747,13 +747,13 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.wrench), "BAB", "BBB", "ABA", 'B', "ingotBronze");
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.Extractor), "TMT", "TCT", "XXX", 'T', ModItems.treeTap, 'M',
.addShapedOreRecipe(new ItemStack(ModBlocks.extractor), "TMT", "TCT", "XXX", 'T', ModItems.treeTap, 'M',
BlockMachineFrame.getFrameByName("machine", 1), 'C',
"circuitBasic");
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "RCR", "AEA", "RCR", 'R', "ingotRefinedIron",
'E', new ItemStack(ModBlocks.Extractor), 'A', "machineBlockAdvanced", 'C', "circuitBasic");
'E', new ItemStack(ModBlocks.extractor), 'A', "machineBlockAdvanced", 'C', "circuitBasic");
CraftingHelper.addShapedOreRecipe(ItemParts.getPartByName("advancedCircuit"), "RGR", "LCL", "RGR", 'R',
Items.REDSTONE, 'G', Items.GLOWSTONE_DUST, 'L', "dyeBlue", 'C', "circuitBasic");
@ -766,7 +766,7 @@ public class ModRecipes {
.addShapedOreRecipe(new ItemStack(ModItems.lapotronCrystal), "LCL", "LEL", "LCL", 'L', "dyeBlue", 'E',
"energyCrystal", 'C', "circuitBasic");
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModBlocks.Generator), batteryStack,
CraftingHelper.addShapelessOreRecipe(new ItemStack(ModBlocks.generator), batteryStack,
BlockMachineFrame.getFrameByName("machine", 1), Blocks.FURNACE);
CraftingHelper.addShapedOreRecipe(BlockMachineFrame.getFrameByName("machine", 1), "AAA", "AXA", "AAA", 'A',
@ -848,23 +848,23 @@ public class ModRecipes {
.addShapedOreRecipe(ItemParts.getPartByName("NaKCoolantSix"), "THT", "TCT", "THT", 'T', "ingotTin", 'C',
"ingotCopper", 'H', ItemParts.getPartByName("NaKCoolantTriple"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Aesu), "LLL", "LCL", "LLL", 'L',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AESU), "LLL", "LCL", "LLL", 'L',
new ItemStack(ModItems.lapotronicOrb), 'C', new ItemStack(ModItems.energyCrystal));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Idsu), "PAP", "ACA", "PAP", 'P',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IDSU), "PAP", "ACA", "PAP", 'P',
ItemPlates.getPlateByName("iridium"), 'C', new ItemStack(Blocks.ENDER_CHEST), 'A',
new ItemStack(ModBlocks.Aesu));
new ItemStack(ModBlocks.AESU));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.FusionControlComputer), "CCC", "PTP", "CCC", 'P',
new ItemStack(ModItems.energyCrystal), 'T', new ItemStack(ModBlocks.FusionCoil), 'C',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.fusionControlComputer), "CCC", "PTP", "CCC", 'P',
new ItemStack(ModItems.energyCrystal), 'T', new ItemStack(ModBlocks.fusionCoil), 'C',
"circuitMaster");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LightningRod), "CAC", "ACA", "CAC", 'A',
new ItemStack(ModBlocks.MachineCasing, 1, 2), 'S', ItemParts.getPartByName("superConductor"), 'C',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.lightningRod), "CAC", "ACA", "CAC", 'A',
new ItemStack(ModBlocks.machineCasing, 1, 2), 'S', ItemParts.getPartByName("superConductor"), 'C',
"circuitMaster");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.FusionCoil), "CSC", "NAN", "CRC", 'A',
new ItemStack(ModBlocks.MachineCasing, 1, 2), 'N', ItemParts.getPartByName("nichromeHeatingCoil"), 'C',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.fusionCoil), "CSC", "NAN", "CRC", 'A',
new ItemStack(ModBlocks.machineCasing, 1, 2), 'N', ItemParts.getPartByName("nichromeHeatingCoil"), 'C',
"circuitMaster", 'S', ItemParts.getPartByName("superConductor"), 'R',
ItemParts.getPartByName("iridiumNeutronReflector"));
@ -897,7 +897,7 @@ public class ModRecipes {
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("Transformer"), "GGG", "WTW", "GCG", 'G',
"blockGlass", 'W', ItemStandaloneCables.getCableByName("insulatedgold"), 'C',
"circuitBasic", 'T', ModBlocks.mvt);
"circuitBasic", 'T', ModBlocks.MVT);
CraftingHelper.addShapedOreRecipe(ItemUpgrades.getUpgradeByName("EnergyStorage"), "PPP", "WBW", "PCP", 'P',
"plankWood", 'W', ItemStandaloneCables.getCableByName("insulatedcopper"), 'C',
@ -999,12 +999,12 @@ public class ModRecipes {
.addShapedOreRecipe(new ItemStack(ModBlocks.digitalChest), "PPP", "PDP", "PCP", 'P', "plateSteel", 'D',
ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloySmelter), "XCX", "FMF", "XXX", 'C',
"circuitBasic", 'F', new ItemStack(ModBlocks.ElectricFurnace), 'M',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloySmelter), "XCX", "FMF", "XXX", 'C',
"circuitBasic", 'F', new ItemStack(ModBlocks.electricFurnace), 'M',
BlockMachineFrame.getFrameByName("machine", 1));
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.LesuStorage), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C',
.addShapedOreRecipe(new ItemStack(ModBlocks.LESUStorage), "LLL", "LCL", "LLL", 'L', "blockLapis", 'C',
"circuitBasic");
TechRebornAPI
@ -1571,7 +1571,7 @@ public class ModRecipes {
ItemDusts.getDustByName("nickel", 1), null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Copper Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Copper Ore");
}
}
@ -1593,7 +1593,7 @@ public class ModRecipes {
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Tin Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Tin Ore");
}
}
@ -1623,7 +1623,7 @@ public class ModRecipes {
ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1),
ItemDusts.getDustByName("platinum", 1), new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Nickel Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Nickel Ore");
}
}
@ -1645,7 +1645,7 @@ public class ModRecipes {
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Zinc Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Zinc Ore");
}
}
@ -1670,7 +1670,7 @@ public class ModRecipes {
ItemDusts.getDustByName("silver", 3), ItemDustsSmall.getSmallDustByName("Lead", 1),
ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Silver Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Silver Ore");
}
}
@ -1695,7 +1695,7 @@ public class ModRecipes {
ItemDusts.getDustByName("lead", 2), ItemDusts.getDustByName("silver", 1),
ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Lead Ore");
}
}
@ -1713,7 +1713,7 @@ public class ModRecipes {
gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4),
new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Apatite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Apatite Ore");
}
}
@ -1727,7 +1727,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Netherrack", 2), null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Nether Quartz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Nether Quartz Ore");
}
}
@ -1745,7 +1745,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Certus Quartz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Certus Quartz Ore");
}
}
@ -1763,7 +1763,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Charged Certus Quartz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Charged Certus Quartz Ore");
}
}
@ -1782,7 +1782,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Certus Quartz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Certus Quartz Ore");
}
}
@ -1801,7 +1801,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Topaz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Topaz Ore");
}
}
@ -1820,7 +1820,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Tanzanite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Tanzanite Ore");
}
}
@ -1839,7 +1839,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Malachite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Malachite Ore");
}
}
@ -2006,54 +2006,54 @@ public class ModRecipes {
"circuitMaster", 'T', ModItems.energyCrystal, 'C', Blocks.CHEST, 'O',
ModItems.lapotronicOrb, 'A', "machineBlockAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MatterFabricator), "ETE", "AOA", "ETE", 'E',
"circuitMaster", 'T', ModBlocks.Extractor, 'A',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.matterFabricator), "ETE", "AOA", "ETE", 'E',
"circuitMaster", 'T', ModBlocks.extractor, 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'O', ModItems.lapotronicOrb);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.heatGenerator), "III", "IHI", "CGC", 'I', "plateIron", 'H',
new ItemStack(Blocks.IRON_BARS), 'C', "circuitBasic", 'G', ModBlocks.Generator);
new ItemStack(Blocks.IRON_BARS), 'C', "circuitBasic", 'G', ModBlocks.generator);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.Gasturbine), "IAI", "WGW", "IAI", 'I', "ingotInvar", 'A',
.addShapedOreRecipe(new ItemStack(ModBlocks.gasTurbine), "IAI", "WGW", "IAI", 'I', "ingotInvar", 'A',
"circuitAdvanced", 'W',
getOre("ic2Windmill"), 'G',
getOre("glassReinforced"));
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.Gasturbine), "IAI", "WGW", "IAI", 'I', "ingotAluminum", 'A',
.addShapedOreRecipe(new ItemStack(ModBlocks.gasTurbine), "IAI", "WGW", "IAI", 'I', "ingotAluminum", 'A',
"circuitAdvanced", 'W',
getOre("ic2Windmill"), 'G',
getOre("glassReinforced"));
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), "III", "IHI", "CGC", 'I', "plateIron",
.addShapedOreRecipe(new ItemStack(ModBlocks.semiFluidGenerator), "III", "IHI", "CGC", 'I', "plateIron",
'H', ModBlocks.reinforcedglass, 'C', "circuitBasic", 'G',
ModBlocks.Generator);
ModBlocks.generator);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Semifluidgenerator), "AAA", "AHA", "CGC", 'A',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.semiFluidGenerator), "AAA", "AHA", "CGC", 'A',
"plateAluminum", 'H', ModBlocks.reinforcedglass, 'C', "circuitBasic", 'G',
ModBlocks.Generator);
ModBlocks.generator);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "III", "I I", "CGC", 'I', "refinedIron",
'C', "circuitBasic", 'G', ModBlocks.Generator);
.addShapedOreRecipe(new ItemStack(ModBlocks.dieselGenerator), "III", "I I", "CGC", 'I', "refinedIron",
'C', "circuitBasic", 'G', ModBlocks.generator);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.DieselGenerator), "AAA", "A A", "CGC", 'A', "ingotAluminum",
'C', "circuitBasic", 'G', ModBlocks.Generator);
.addShapedOreRecipe(new ItemStack(ModBlocks.dieselGenerator), "AAA", "A A", "CGC", 'A', "ingotAluminum",
'C', "circuitBasic", 'G', ModBlocks.generator);
// CraftingHelper.addShapedOreRecipe(new
// ItemStack(ModBlocks.MagicalAbsorber),
// ItemStack(ModBlocks.magicalAbsorber),
// "CSC", "IBI", "CAC",
// 'C', "circuitMaster",
// 'S', "craftingSuperconductor",
// 'B', Blocks.beacon,
// 'A', ModBlocks.Magicenergeyconverter,
// 'A', ModBlocks.magicEnergeyConverter,
// 'I', "plateIridium");
//
// CraftingHelper.addShapedOreRecipe(new
// ItemStack(ModBlocks.Magicenergeyconverter),
// ItemStack(ModBlocks.magicEnergeyConverter),
// "CTC", "PBP", "CLC",
// 'C', "circuitAdvanced",
// 'P', "platePlatinum",
@ -2061,53 +2061,53 @@ public class ModRecipes {
// 'L', "lapotronCrystal",
// 'T', TechRebornAPI.recipeCompact.getItem("teleporter"));
// CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Dragoneggenergysiphoner), "CTC", "ISI", "CBC", 'I',
// CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.dragonEggEnergySiphoner), "CTC", "ISI", "CBC", 'I',
// "plateIridium", 'C', "circuitBasic",
// 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.Extractor);
// 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.extractor);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "SCS", "BEB", "SCS", 'S', "plateSteel", 'C',
"circuitAdvanced", 'B', "machineBlockAdvanced", 'E',
getOre("ic2Extractor"));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.BlastFurnace), "CHC", "HBH", "FHF", 'H',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.blastFurnace), "CHC", "HBH", "FHF", 'H',
ItemParts.getPartByName("cupronickelHeatingCoil"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', ModBlocks.ElectricFurnace);
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'F', ModBlocks.electricFurnace);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.IndustrialGrinder), "ECP", "GGG", "CBC", 'E',
ModBlocks.IndustrialElectrolyzer, 'P', ModBlocks.Extractor, 'C',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.industrialGrinder), "ECP", "GGG", "CBC", 'E',
ModBlocks.industrialElectrolyzer, 'P', ModBlocks.extractor, 'C',
"circuitAdvanced", 'B', "machineBlockAdvanced",
'G', ModBlocks.Grinder);
'G', ModBlocks.grinder);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ImplosionCompressor), "ABA", "CPC", "ABA", 'A',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.implosionCompressor), "ABA", "CPC", "ABA", 'A',
ItemIngots.getIngotByName("advancedAlloy"), 'C', "circuitAdvanced", 'B',
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', ModBlocks.Compressor);
BlockMachineFrame.getFrameByName("advancedMachine", 1), 'P', ModBlocks.compressor);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.VacuumFreezer), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C',
.addShapedOreRecipe(new ItemStack(ModBlocks.vacuumFreezer), "SPS", "CGC", "SPS", 'S', "plateSteel", 'C',
"circuitAdvanced", 'G', ModBlocks.reinforcedglass, 'P',
ModBlocks.Extractor);
ModBlocks.extractor);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Distillationtower), "CMC", "PBP", "EME", 'E',
ModBlocks.IndustrialElectrolyzer, 'M', "circuitMaster", 'B',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.distillationTower), "CMC", "PBP", "EME", 'E',
ModBlocks.industrialElectrolyzer, 'M', "circuitMaster", 'B',
"machineBlockAdvanced", 'C', ModBlocks.centrifuge, 'P',
ModBlocks.Extractor);
ModBlocks.extractor);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.AlloyFurnace), "III", "F F", "III", 'I',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.alloyFurnace), "III", "F F", "III", 'I',
ItemIngots.getIngotByName("refinediron"), 'F', new ItemStack(ModBlocks.ironFurnace));
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.ChemicalReactor), "IMI", "CPC", "IEI", 'I', "ingotInvar",
'C', "circuitAdvanced", 'M', ModBlocks.Extractor, 'P',
ModBlocks.Compressor, 'E', ModBlocks.Extractor);
.addShapedOreRecipe(new ItemStack(ModBlocks.chemicalReactor), "IMI", "CPC", "IEI", 'I', "ingotInvar",
'C', "circuitAdvanced", 'M', ModBlocks.extractor, 'P',
ModBlocks.compressor, 'E', ModBlocks.extractor);
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.RollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.PISTON,
'C', "circuitAdvanced", 'M', ModBlocks.Compressor, 'B',
.addShapedOreRecipe(new ItemStack(ModBlocks.rollingMachine), "PCP", "MBM", "PCP", 'P', Blocks.PISTON,
'C', "circuitAdvanced", 'M', ModBlocks.compressor, 'B',
BlockMachineFrame.getFrameByName("machine", 1));
// CraftingHelper.addShapedOreRecipe(new
// ItemStack(ModBlocks.ElectricCraftingTable),
// ItemStack(ModBlocks.electricCraftingTable),
// "ITI", "IBI", "ICI",
// 'I', "plateIron",
// 'C', "circuitAdvanced",
@ -2115,7 +2115,7 @@ public class ModRecipes {
// 'B', "machineBlockBasic");
// CraftingHelper.addShapedOreRecipe(new
// ItemStack(ModBlocks.ElectricCraftingTable),
// ItemStack(ModBlocks.electricCraftingTable),
// "ATA", "ABA", "ACA",
// 'A', "plateAluminum",
// 'C', "circuitAdvanced",
@ -2123,14 +2123,14 @@ public class ModRecipes {
// 'B', "machineBlockBasic");
// CraftingHelper.addShapedOreRecipe(new
// ItemStack(ModBlocks.ChunkLoader),
// ItemStack(ModBlocks.chunkLoader),
// "SCS", "CMC", "SCS",
// 'S', "plateSteel",
// 'C', "circuitMaster",
// 'M', new ItemStack(ModItems.parts, 1, 39));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Lesu), " L ", "CBC", " M ", 'L', ModBlocks.lvt, 'C',
"circuitAdvanced", 'M', ModBlocks.mvt, 'B', ModBlocks.LesuStorage);
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LESU), " L ", "CBC", " M ", 'L', ModBlocks.LVT, 'C',
"circuitAdvanced", 'M', ModBlocks.MVT, 'B', ModBlocks.LESUStorage);
CraftingHelper
.addShapedOreRecipe(BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), "CTC", "TBT", "CTC",
@ -2138,20 +2138,20 @@ public class ModRecipes {
"machineBlockAdvanced");
CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 0), "III", "CBC", "III", 'I', "plateIron",
.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 0), "III", "CBC", "III", 'I', "plateIron",
'C', "circuitBasic", 'B', "machineBlockBasic");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 1), "SSS", "CBC", "SSS", 'S',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 1), "SSS", "CBC", "SSS", 'S',
"plateSteel", 'C', "circuitAdvanced", 'B', "machineBlockAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MachineCasing, 4, 2), "HHH", "CBC", "HHH", 'H',
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.machineCasing, 4, 2), "HHH", "CBC", "HHH", 'H',
"ingotChrome", 'C', "circuitElite", 'B', BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
if (!CompatManager.isQuantumStorageLoaded) {
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.quantumChest), "DCD", "ATA", "DQD", 'D',
ItemParts.getPartByName("dataOrb"), 'C', ItemParts.getPartByName("computerMonitor"), 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1), 'Q', ModBlocks.digitalChest, 'T',
ModBlocks.Compressor);
ModBlocks.compressor);
}
@ -2393,7 +2393,7 @@ public class ModRecipes {
ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1),
ItemDusts.getDustByName("nickel", 1), null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Copper Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Copper Ore");
}
}
@ -2411,7 +2411,7 @@ public class ModRecipes {
ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1),
ItemDusts.getDustByName("zinc", 1), null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Tin Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Tin Ore");
}
}
@ -2434,7 +2434,7 @@ public class ModRecipes {
ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1),
ItemDusts.getDustByName("platinum", 1), null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Nickel Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Nickel Ore");
}
}
@ -2452,7 +2452,7 @@ public class ModRecipes {
ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1),
ItemDusts.getDustByName("iron", 1), null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Zinc Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Zinc Ore");
}
}
@ -2471,7 +2471,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Silver Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Silver Ore");
}
}
@ -2490,7 +2490,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Lead Ore");
}
}
@ -2512,7 +2512,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), uranium238Stack,
uranium235Stack, null, new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Uranium Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Uranium Ore");
}
}
@ -2534,7 +2534,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), uranium238Stack,
uranium235Stack, null, new ItemStack(Items.BUCKET), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Uranium Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Uranium Ore");
}
}
@ -2548,7 +2548,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemCells.getCellByName("empty"), 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Lead Ore");
}
}
@ -2562,7 +2562,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemCells.getCellByName("empty"), 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Ardite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Ardite Ore");
}
}
@ -2576,7 +2576,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemCells.getCellByName("empty"), 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Cobalt Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Cobalt Ore");
}
}
@ -2591,7 +2591,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Iron", 1), ItemCells.getCellByName("empty"), 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Dark Iron Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Dark Iron Ore");
}
}
@ -2605,7 +2605,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemCells.getCellByName("empty"), 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Cadmium Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Cadmium Ore");
}
}
@ -2619,7 +2619,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Indium", 1), ItemCells.getCellByName("empty"), 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Indium Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Indium Ore");
}
}
@ -2633,7 +2633,7 @@ public class ModRecipes {
gemStack, ItemDustsSmall.getSmallDustByName("Calcite", 6), null,
ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Calcite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Calcite Ore");
}
}
@ -2647,7 +2647,7 @@ public class ModRecipes {
chunkStack, ItemDustsSmall.getSmallDustByName("Magnetite", 6), null,
ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Magnetite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Magnetite Ore");
}
}
@ -2661,7 +2661,7 @@ public class ModRecipes {
chunkStack, ItemDustsSmall.getSmallDustByName("Graphite", 6), null,
ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Graphite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Graphite Ore");
}
}
@ -2675,7 +2675,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemCells.getCellByName("empty"), 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Osmium Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Osmium Ore");
}
}
@ -2691,7 +2691,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Glowstone", 1), ItemCells.getCellByName("empty"),
100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Teslatite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Teslatite Ore");
}
}
@ -2705,7 +2705,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"), 100,
120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Sulfur Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Sulfur Ore");
}
}
@ -2720,7 +2720,7 @@ public class ModRecipes {
ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemCells.getCellByName("empty"),
100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Saltpeter Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Saltpeter Ore");
}
}
@ -2735,7 +2735,7 @@ public class ModRecipes {
gemStack, gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4),
ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Apatite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Apatite Ore");
}
}
@ -2749,7 +2749,7 @@ public class ModRecipes {
dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2), ItemCells.getCellByName("empty"),
100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Nether Quartz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Nether Quartz Ore");
}
}
@ -2764,7 +2764,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Certus Quartz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Certus Quartz Ore");
}
}
@ -2779,7 +2779,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Charged Certus Quartz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Charged Certus Quartz Ore");
}
}
@ -2795,7 +2795,7 @@ public class ModRecipes {
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Certus Quartz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Certus Quartz Ore");
}
}
@ -2813,7 +2813,7 @@ public class ModRecipes {
gemStack, dustStack,
null, null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Topaz Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Topaz Ore");
}
}
@ -2831,7 +2831,7 @@ public class ModRecipes {
gemStack, dustStack,
null, null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Tanzanite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Tanzanite Ore");
}
}
@ -2850,11 +2850,11 @@ public class ModRecipes {
null, null, 100, 120));
} catch (Exception e) {
Core.logHelper.info("Failed to Load Grinder Recipe for Malachite Ore");
Core.logHelper.info("Failed to Load grinder Recipe for Malachite Ore");
}
}
// Implosion Compressor
// Implosion compressor
RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridiumAlloy"),
new ItemStack(Blocks.TNT, 8),
@ -2882,7 +2882,7 @@ public class ModRecipes {
new ItemStack(Blocks.TNT, 24),
ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("darkAshes", 12), 20, 30));
// Grinder
// grinder
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(
new ItemStack(ModBlocks.ore, 1, 0),
@ -3051,7 +3051,7 @@ public class ModRecipes {
ItemCells.getCellByName("empty"), ItemCells.getCellByName("nitrogenDioxide", 2), 1240,
30));
// IndustrialElectrolyzer
// industrialElectrolyzer
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(ItemCells.getCellByName("sulfuricAcid", 7), null,
ItemCells.getCellByName("hydrogen", 2), ItemDusts.getDustByName("sulfur"),

6
src/main/java/techreborn/init/OreDict.java
View file

@ -50,10 +50,10 @@ public class OreDict {
OreDictionary.registerOre("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold"));
OreDictionary.registerOre("fertilizer", new ItemStack(Items.DYE, 1, 15));
OreDictionary.registerOre("ic2Generator", ModBlocks.Generator);
OreDictionary.registerOre("ic2Generator", ModBlocks.generator);
OreDictionary.registerOre("ic2SolarPanel", ModBlocks.solarPanel);
OreDictionary.registerOre("ic2Macerator", ModBlocks.Grinder);
OreDictionary.registerOre("ic2Extractor", ModBlocks.Extractor);
OreDictionary.registerOre("ic2Macerator", ModBlocks.grinder);
OreDictionary.registerOre("ic2Extractor", ModBlocks.extractor);
OreDictionary.registerOre("ic2Windmill", ModBlocks.windMill);
OreDictionary.registerOre("ic2Watermill", ModBlocks.waterMill);

2
src/main/java/techreborn/itemblocks/ItemBlockAesu.java
View file

@ -63,7 +63,7 @@ public class ItemBlockAesu extends ItemBlock {
public ItemStack getDropWithNBT(double energy) {
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(ModBlocks.Aesu, 1);
ItemStack dropStack = new ItemStack(ModBlocks.AESU, 1);
writeToNBTWithoutCoords(tileEntity, energy);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

2
src/main/java/techreborn/itemblocks/ItemBlockMachineCasing.java
View file

@ -8,7 +8,7 @@ import techreborn.init.ModBlocks;
public class ItemBlockMachineCasing extends ItemMultiTexture {
public ItemBlockMachineCasing(Block block) {
super(ModBlocks.MachineCasing, ModBlocks.MachineCasing, BlockMachineCasing.types);
super(ModBlocks.machineCasing, ModBlocks.machineCasing, BlockMachineCasing.types);
}
}

44
src/main/java/techreborn/manual/GuiManual.java
View file

@ -53,42 +53,42 @@ public class GuiManual extends GuiScreen {
// POWER GENERATION
pageCollection.addPage(new GeneratingPowerPage(Reference.pageNames.GENERATINGPOWER_PAGE, pageCollection));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.Generator.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.Generator), "", Reference.pageNames.GENERATINGPOWER_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.generator.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.generator), "", Reference.pageNames.GENERATINGPOWER_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.thermalGenerator.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.thermalGenerator), "", Reference.pageNames.GENERATINGPOWER_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.solarPanel.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.solarPanel), "", Reference.pageNames.GENERATINGPOWER_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.heatGenerator.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.heatGenerator), "", Reference.pageNames.GENERATINGPOWER_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.LightningRod.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.LightningRod), "", Reference.pageNames.GENERATINGPOWER_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.lightningRod.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.lightningRod), "", Reference.pageNames.GENERATINGPOWER_PAGE));
// BASIC MACHINES
pageCollection.addPage(new BasicMachinesPage(Reference.pageNames.BASICMACHINES_PAGE, pageCollection));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.Grinder.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.Grinder), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.ElectricFurnace.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.ElectricFurnace), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.AlloySmelter.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.AlloySmelter), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.Extractor.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.Extractor), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.Compressor.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.Compressor), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.grinder.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.grinder), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.electricFurnace.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.electricFurnace), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.alloySmelter.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.alloySmelter), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.extractor.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.extractor), "", Reference.pageNames.BASICMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.compressor.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.compressor), "", Reference.pageNames.BASICMACHINES_PAGE));
// ADVANCED MACHINES
pageCollection.addPage(new AdvancedMachines(Reference.pageNames.ADVANCEDMACHINES_PAGE, pageCollection));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.BlastFurnace.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.BlastFurnace), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.blastFurnace.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.blastFurnace), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.industrialSawmill.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.industrialSawmill), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.IndustrialElectrolyzer.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.IndustrialElectrolyzer), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.IndustrialGrinder.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.IndustrialGrinder), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.ImplosionCompressor.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.ImplosionCompressor), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.industrialElectrolyzer.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.industrialElectrolyzer), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.industrialGrinder.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.industrialGrinder), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.implosionCompressor.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.implosionCompressor), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));
pageCollection.addPage(new CraftingInfoPage(ModBlocks.centrifuge.getLocalizedName(), pageCollection,
new ItemStack(ModBlocks.centrifuge), "", Reference.pageNames.ADVANCEDMACHINES_PAGE));

2
src/main/java/techreborn/manual/loader/pages/CategoriesPage.java
View file

@ -53,7 +53,7 @@ public class CategoriesPage extends TitledPage {
// new ItemStack(ModBlocks.ElectricFurnace), Reference.pageNames.BASICMACHINES_PAGE,
// ttl(Reference.BASICMACHINES_KEY)));
// buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
// new ItemStack(ModBlocks.BlastFurnace), Reference.pageNames.ADVANCEDMACHINES_PAGE,
// new ItemStack(ModBlocks.blastFurnace), Reference.pageNames.ADVANCEDMACHINES_PAGE,
// ttl(Reference.ADVANCEDMACHINES_KEY)));
// buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
// new ItemStack(ModItems.ironDrill), Reference.pageNames.TOOLS_PAGE, ttl(Reference.TOOLS_KEY)));

24
src/main/java/techreborn/manual/pages/AdvancedMachines.java
View file

@ -20,20 +20,20 @@ public class AdvancedMachines extends TitledPage {
buttonList.clear();
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 10, getYMin() + 20, 0, 46, 100, 20,
new ItemStack(ModBlocks.BlastFurnace), ModBlocks.BlastFurnace.getUnlocalizedName(),
ttl(ModBlocks.BlastFurnace.getLocalizedName())));
new ItemStack(ModBlocks.blastFurnace), ModBlocks.blastFurnace.getUnlocalizedName(),
ttl(ModBlocks.blastFurnace.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 10, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModBlocks.industrialSawmill), ModBlocks.industrialSawmill.getUnlocalizedName(),
ttl(ModBlocks.industrialSawmill.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 10, getYMin() + 60, 0, 46, 100, 20,
new ItemStack(ModBlocks.IndustrialElectrolyzer), ModBlocks.IndustrialElectrolyzer.getUnlocalizedName(),
ttl(ModBlocks.IndustrialElectrolyzer.getLocalizedName())));
new ItemStack(ModBlocks.industrialElectrolyzer), ModBlocks.industrialElectrolyzer.getUnlocalizedName(),
ttl(ModBlocks.industrialElectrolyzer.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 10, getYMin() + 80, 0, 46, 100, 20,
new ItemStack(ModBlocks.IndustrialGrinder), ModBlocks.IndustrialGrinder.getUnlocalizedName(),
ttl(ModBlocks.IndustrialGrinder.getLocalizedName())));
new ItemStack(ModBlocks.industrialGrinder), ModBlocks.industrialGrinder.getUnlocalizedName(),
ttl(ModBlocks.industrialGrinder.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 10, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModBlocks.ImplosionCompressor), ModBlocks.ImplosionCompressor.getUnlocalizedName(),
ttl(ModBlocks.ImplosionCompressor.getLocalizedName())));
new ItemStack(ModBlocks.implosionCompressor), ModBlocks.implosionCompressor.getUnlocalizedName(),
ttl(ModBlocks.implosionCompressor.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(6, getXMin() + 10, getYMin() + 120, 0, 46, 100, 20,
new ItemStack(ModBlocks.centrifuge), ModBlocks.centrifuge.getUnlocalizedName(),
ttl(ModBlocks.centrifuge.getLocalizedName())));
@ -44,15 +44,15 @@ public class AdvancedMachines extends TitledPage {
if (button.id == 0)
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
if (button.id == 1)
collection.changeActivePage(ModBlocks.BlastFurnace.getLocalizedName());
collection.changeActivePage(ModBlocks.blastFurnace.getLocalizedName());
if (button.id == 2)
collection.changeActivePage(ModBlocks.industrialSawmill.getLocalizedName());
if (button.id == 3)
collection.changeActivePage(ModBlocks.IndustrialElectrolyzer.getLocalizedName());
collection.changeActivePage(ModBlocks.industrialElectrolyzer.getLocalizedName());
if (button.id == 4)
collection.changeActivePage(ModBlocks.IndustrialGrinder.getLocalizedName());
collection.changeActivePage(ModBlocks.industrialGrinder.getLocalizedName());
if (button.id == 5)
collection.changeActivePage(ModBlocks.ImplosionCompressor.getLocalizedName());
collection.changeActivePage(ModBlocks.implosionCompressor.getLocalizedName());
if (button.id == 6)
collection.changeActivePage(ModBlocks.centrifuge.getLocalizedName());
}

30
src/main/java/techreborn/manual/pages/BasicMachinesPage.java
View file

@ -20,20 +20,20 @@ public class BasicMachinesPage extends TitledPage {
buttonList.clear();
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
new ItemStack(ModBlocks.Grinder), ModBlocks.Grinder.getUnlocalizedName(),
ttl(ModBlocks.Grinder.getLocalizedName())));
new ItemStack(ModBlocks.grinder), ModBlocks.grinder.getUnlocalizedName(),
ttl(ModBlocks.grinder.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModBlocks.ElectricFurnace), ModBlocks.ElectricFurnace.getUnlocalizedName(),
ttl(ModBlocks.ElectricFurnace.getLocalizedName())));
new ItemStack(ModBlocks.electricFurnace), ModBlocks.electricFurnace.getUnlocalizedName(),
ttl(ModBlocks.electricFurnace.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
new ItemStack(ModBlocks.AlloySmelter), ModBlocks.AlloySmelter.getUnlocalizedName(),
ttl(ModBlocks.AlloySmelter.getLocalizedName())));
new ItemStack(ModBlocks.alloySmelter), ModBlocks.alloySmelter.getUnlocalizedName(),
ttl(ModBlocks.alloySmelter.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
new ItemStack(ModBlocks.Extractor), ModBlocks.Extractor.getUnlocalizedName(),
ttl(ModBlocks.Extractor.getLocalizedName())));
new ItemStack(ModBlocks.extractor), ModBlocks.extractor.getUnlocalizedName(),
ttl(ModBlocks.extractor.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModBlocks.Compressor), ModBlocks.Compressor.getUnlocalizedName(),
ttl(ModBlocks.Compressor.getLocalizedName())));
new ItemStack(ModBlocks.compressor), ModBlocks.compressor.getUnlocalizedName(),
ttl(ModBlocks.compressor.getLocalizedName())));
}
@Override
@ -41,14 +41,14 @@ public class BasicMachinesPage extends TitledPage {
if (button.id == 0)
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
if (button.id == 1)
collection.changeActivePage(ModBlocks.Grinder.getLocalizedName());
collection.changeActivePage(ModBlocks.grinder.getLocalizedName());
if (button.id == 2)
collection.changeActivePage(ModBlocks.ElectricFurnace.getLocalizedName());
collection.changeActivePage(ModBlocks.electricFurnace.getLocalizedName());
if (button.id == 3)
collection.changeActivePage(ModBlocks.AlloySmelter.getLocalizedName());
collection.changeActivePage(ModBlocks.alloySmelter.getLocalizedName());
if (button.id == 4)
collection.changeActivePage(ModBlocks.Extractor.getLocalizedName());
collection.changeActivePage(ModBlocks.extractor.getLocalizedName());
if (button.id == 5)
collection.changeActivePage(ModBlocks.Compressor.getLocalizedName());
collection.changeActivePage(ModBlocks.compressor.getLocalizedName());
}
}

6
src/main/java/techreborn/manual/pages/ContentsPage.java
View file

@ -25,13 +25,13 @@ public class ContentsPage extends TitledPage {
ItemPlates.getPlateByName("iron"), Reference.pageNames.GETTINGSTARTED_PAGE,
ttl(Reference.GETTINGSTARTED_KEY)));
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModBlocks.Generator), Reference.pageNames.GENERATINGPOWER_PAGE,
new ItemStack(ModBlocks.generator), Reference.pageNames.GENERATINGPOWER_PAGE,
ttl(Reference.GENERATINGPOWER_KEY)));
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 60, 0, 46, 100, 20,
new ItemStack(ModBlocks.ElectricFurnace), Reference.pageNames.BASICMACHINES_PAGE,
new ItemStack(ModBlocks.electricFurnace), Reference.pageNames.BASICMACHINES_PAGE,
ttl(Reference.BASICMACHINES_KEY)));
buttonList.add(new GuiButtonItemTexture(3, getXMin() + 20, getYMin() + 80, 0, 46, 100, 20,
new ItemStack(ModBlocks.BlastFurnace), Reference.pageNames.ADVANCEDMACHINES_PAGE,
new ItemStack(ModBlocks.blastFurnace), Reference.pageNames.ADVANCEDMACHINES_PAGE,
ttl(Reference.ADVANCEDMACHINES_KEY)));
buttonList.add(new GuiButtonItemTexture(4, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModItems.ironDrill), Reference.pageNames.TOOLS_PAGE, ttl(Reference.TOOLS_KEY)));

12
src/main/java/techreborn/manual/pages/GeneratingPowerPage.java
View file

@ -20,8 +20,8 @@ public class GeneratingPowerPage extends TitledPage {
buttonList.clear();
ButtonUtil.addBackButton(0, width / 2 - 60, height / 2 + 64, buttonList);
buttonList.add(new GuiButtonItemTexture(1, getXMin() + 20, getYMin() + 20, 0, 46, 100, 20,
new ItemStack(ModBlocks.Generator), ModBlocks.Generator.getUnlocalizedName(),
ttl(ModBlocks.Generator.getLocalizedName())));
new ItemStack(ModBlocks.generator), ModBlocks.generator.getUnlocalizedName(),
ttl(ModBlocks.generator.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(2, getXMin() + 20, getYMin() + 40, 0, 46, 100, 20,
new ItemStack(ModBlocks.thermalGenerator), ModBlocks.thermalGenerator.getUnlocalizedName(),
ttl(ModBlocks.thermalGenerator.getLocalizedName())));
@ -32,8 +32,8 @@ public class GeneratingPowerPage extends TitledPage {
new ItemStack(ModBlocks.heatGenerator), ModBlocks.heatGenerator.getUnlocalizedName(),
ttl(ModBlocks.heatGenerator.getLocalizedName())));
buttonList.add(new GuiButtonItemTexture(5, getXMin() + 20, getYMin() + 100, 0, 46, 100, 20,
new ItemStack(ModBlocks.LightningRod), ModBlocks.LightningRod.getUnlocalizedName(),
ttl(ModBlocks.LightningRod.getLocalizedName())));
new ItemStack(ModBlocks.lightningRod), ModBlocks.lightningRod.getUnlocalizedName(),
ttl(ModBlocks.lightningRod.getLocalizedName())));
}
@Override
@ -41,7 +41,7 @@ public class GeneratingPowerPage extends TitledPage {
if (button.id == 0)
collection.changeActivePage(Reference.pageNames.CONTENTS_PAGE);
if (button.id == 1)
collection.changeActivePage(ModBlocks.Generator.getLocalizedName());
collection.changeActivePage(ModBlocks.generator.getLocalizedName());
if (button.id == 2)
collection.changeActivePage(ModBlocks.thermalGenerator.getLocalizedName());
if (button.id == 3)
@ -49,6 +49,6 @@ public class GeneratingPowerPage extends TitledPage {
if (button.id == 4)
collection.changeActivePage(ModBlocks.heatGenerator.getLocalizedName());
if (button.id == 5)
collection.changeActivePage(ModBlocks.LightningRod.getLocalizedName());
collection.changeActivePage(ModBlocks.lightningRod.getLocalizedName());
}
}

2
src/main/java/techreborn/multiblocks/MultiBlockCasing.java
View file

@ -313,7 +313,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase {
@Override
protected void isBlockGoodForFrame(World world, int x, int y, int z) throws MultiblockValidationException {
Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock();
if (block == ModBlocks.MachineCasing) {
if (block == ModBlocks.machineCasing) {
} else {
super.isBlockGoodForFrame(world, x, y, z);

2
src/main/java/techreborn/tiles/TileAesu.java
View file

@ -102,7 +102,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
public ItemStack getDropWithNBT() {
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(ModBlocks.Aesu, 1);
ItemStack dropStack = new ItemStack(ModBlocks.AESU, 1);
writeToNBTWithoutCoords(tileEntity);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

2
src/main/java/techreborn/tiles/TileAlloyFurnace.java
View file

@ -255,7 +255,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.AlloyFurnace, 1);
return new ItemStack(ModBlocks.alloyFurnace, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/TileAlloySmelter.java
View file

@ -66,7 +66,7 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.AlloySmelter, 1);
return new ItemStack(ModBlocks.alloySmelter, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/TileAssemblingMachine.java
View file

@ -62,7 +62,7 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.AssemblyMachine, 1);
return new ItemStack(ModBlocks.assemblyMachine, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/TileChemicalReactor.java
View file

@ -61,7 +61,7 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.ChemicalReactor, 1);
return new ItemStack(ModBlocks.chemicalReactor, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/TileChunkLoader.java
View file

@ -45,7 +45,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.ChunkLoader, 1);
return new ItemStack(ModBlocks.chunkLoader, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
View file

@ -64,7 +64,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.IndustrialElectrolyzer, 1);
return new ItemStack(ModBlocks.industrialElectrolyzer, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/TileMatterFabricator.java
View file

@ -48,7 +48,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.MatterFabricator, 1);
return new ItemStack(ModBlocks.matterFabricator, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/TileRollingMachine.java
View file

@ -140,7 +140,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.RollingMachine, 1);
return new ItemStack(ModBlocks.rollingMachine, 1);
}
@Override

2
src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java
View file

@ -131,7 +131,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
}
private boolean isCoil(int x, int y, int z) {
return world.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.FusionCoil;
return world.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.fusionCoil;
}
@Override

2
src/main/java/techreborn/tiles/generator/TileDieselGenerator.java
View file

@ -51,7 +51,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.DieselGenerator, 1);
return new ItemStack(ModBlocks.dieselGenerator, 1);
}
@Override

2
src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java
View file

@ -56,7 +56,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.Dragoneggenergysiphoner, 1);
return new ItemStack(ModBlocks.dragonEggEnergySiphoner, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/generator/TileGasTurbine.java
View file

@ -64,7 +64,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, II
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.Gasturbine, 1);
return new ItemStack(ModBlocks.gasTurbine, 1);
}
@Override

2
src/main/java/techreborn/tiles/generator/TileGenerator.java
View file

@ -134,7 +134,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@Override
public ItemStack getWrenchDrop(EntityPlayer p0) {
return new ItemStack(ModBlocks.Generator);
return new ItemStack(ModBlocks.generator);
}
@Override

2
src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java
View file

@ -70,7 +70,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.Semifluidgenerator, 1);
return new ItemStack(ModBlocks.semiFluidGenerator, 1);
}
@Override

2
src/main/java/techreborn/tiles/idsu/TileIDSU.java
View file

@ -157,7 +157,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable {
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
NBTTagCompound tileEntity = new NBTTagCompound();
ItemStack dropStack = new ItemStack(ModBlocks.Idsu, 1);
ItemStack dropStack = new ItemStack(ModBlocks.IDSU, 1);
writeToNBT(tileEntity);
dropStack.setTagCompound(new NBTTagCompound());
dropStack.getTagCompound().setTag("tileEntity", tileEntity);

2
src/main/java/techreborn/tiles/multiblock/MultiblockChecker.java
View file

@ -24,7 +24,7 @@ public class MultiblockChecker {
public boolean checkCasing(int offX, int offY, int offZ, int type) {
IBlockState block = getBlock(offX, offY, offZ);
if (block.getBlock() == ModBlocks.MachineCasing) {
if (block.getBlock() == ModBlocks.machineCasing) {
if (block.getValue(BlockMachineCasing.METADATA) == type)
return true;
}

2
src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
View file

@ -75,7 +75,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.BlastFurnace, 1);
return new ItemStack(ModBlocks.blastFurnace, 1);
}
public int getHeat() {

2
src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java
View file

@ -60,7 +60,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.ImplosionCompressor, 1);
return new ItemStack(ModBlocks.implosionCompressor, 1);
}
public boolean getMutliBlock() {

2
src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
View file

@ -77,7 +77,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.IndustrialGrinder, 1);
return new ItemStack(ModBlocks.industrialGrinder, 1);
}
public boolean getMutliBlock() {

2
src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java
View file

@ -100,7 +100,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.AlloySmelter, 1);
return new ItemStack(ModBlocks.alloySmelter, 1);
}
@Override

2
src/main/java/techreborn/tiles/storage/TileMFE.java
View file

@ -9,7 +9,7 @@ import techreborn.init.ModBlocks;
public class TileMFE extends TileEnergyStorage {
public TileMFE() {
super("MFE", 2, ModBlocks.mfe, EnumPowerTier.MEDIUM, 512, 512, 600000);
super("MFE", 2, ModBlocks.MFE, EnumPowerTier.MEDIUM, 512, 512, 600000);
}
}

2
src/main/java/techreborn/tiles/storage/TileMFSU.java
View file

@ -9,6 +9,6 @@ import techreborn.init.ModBlocks;
public class TileMFSU extends TileEnergyStorage {
public TileMFSU() {
super("MFSU", 2, ModBlocks.mfsu, EnumPowerTier.HIGH, 2048, 2048, 1000000);
super("MFSU", 2, ModBlocks.MFSU, EnumPowerTier.HIGH, 2048, 2048, 1000000);
}
}

2
src/main/java/techreborn/tiles/teir1/TileCompressor.java
View file

@ -64,7 +64,7 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.Compressor, 1);
return new ItemStack(ModBlocks.compressor, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
View file

@ -140,7 +140,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.ElectricFurnace, 1);
return new ItemStack(ModBlocks.electricFurnace, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/teir1/TileExtractor.java
View file

@ -67,7 +67,7 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable, IIn
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.Extractor, 1);
return new ItemStack(ModBlocks.extractor, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/teir1/TileGrinder.java
View file

@ -72,7 +72,7 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInve
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.Grinder, 1);
return new ItemStack(ModBlocks.grinder, 1);
}
public boolean isComplete() {

2
src/main/java/techreborn/tiles/transformers/TileHVTransformer.java
View file

@ -10,7 +10,7 @@ import techreborn.init.ModBlocks;
public class TileHVTransformer extends TileTransformer {
public TileHVTransformer() {
super("HVTransformer", ModBlocks.hvt, EnumPowerTier.EXTREME, ConfigTechReborn.HVTransformerMaxInput, ConfigTechReborn.HVTransformerMaxOutput, ConfigTechReborn.HVTransformerMaxInput * 2);
super("HVTransformer", ModBlocks.HVT, EnumPowerTier.EXTREME, ConfigTechReborn.HVTransformerMaxInput, ConfigTechReborn.HVTransformerMaxOutput, ConfigTechReborn.HVTransformerMaxInput * 2);
}
}

2
src/main/java/techreborn/tiles/transformers/TileLVTransformer.java
View file

@ -10,7 +10,7 @@ import techreborn.init.ModBlocks;
public class TileLVTransformer extends TileTransformer {
public TileLVTransformer() {
super("LVTransformer", ModBlocks.lvt, EnumPowerTier.LOW, ConfigTechReborn.LVTransformerMaxInput, ConfigTechReborn.LVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput * 2);
super("LVTransformer", ModBlocks.LVT, EnumPowerTier.LOW, ConfigTechReborn.LVTransformerMaxInput, ConfigTechReborn.LVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput * 2);
}
}

2
src/main/java/techreborn/tiles/transformers/TileMVTransformer.java
View file

@ -10,7 +10,7 @@ import techreborn.init.ModBlocks;
public class TileMVTransformer extends TileTransformer {
public TileMVTransformer() {
super("MVTransformer", ModBlocks.mvt, EnumPowerTier.HIGH, ConfigTechReborn.MVTransformerMaxInput, ConfigTechReborn.MVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput * 2);
super("MVTransformer", ModBlocks.MVT, EnumPowerTier.HIGH, ConfigTechReborn.MVTransformerMaxInput, ConfigTechReborn.MVTransformerMaxOutput, ConfigTechReborn.LVTransformerMaxInput * 2);
}
@Override

8
src/main/java/techreborn/utils/StackWIPHandler.java
View file

@ -20,11 +20,11 @@ public class StackWIPHandler {
public static ArrayList<ItemStack> devHeads = new ArrayList<>();
public StackWIPHandler() {
wipBlocks.add(ModBlocks.MagicalAbsorber);
wipBlocks.add(ModBlocks.ChunkLoader);
wipBlocks.add(ModBlocks.ElectricCraftingTable);
wipBlocks.add(ModBlocks.magicalAbsorber);
wipBlocks.add(ModBlocks.chunkLoader);
wipBlocks.add(ModBlocks.electricCraftingTable);
wipBlocks.add(ModBlocks.chargeBench);
wipBlocks.add(ModBlocks.Magicenergeyconverter);
wipBlocks.add(ModBlocks.magicEnergeyConverter);
addHead("modmuss50");
addHead("Gigabit101");