Auto update mappings

This commit is contained in:
modmuss50 2016-05-06 22:13:24 +01:00
parent 595c9575b1
commit 4095a0b52d
79 changed files with 704 additions and 644 deletions

View file

@ -236,35 +236,35 @@ public class ModBlocks
GameRegistry.registerBlock(centrifuge, "techreborn.centrifuge");
GameRegistry.registerTileEntity(TileCentrifuge.class, "TileCentrifugeTR");
RollingMachine = new BlockRollingMachine(Material.rock);
RollingMachine = new BlockRollingMachine(Material.ROCK);
GameRegistry.registerBlock(RollingMachine, "rollingmachine");
GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR");
BlastFurnace = new BlockBlastFurnace(Material.rock);
BlastFurnace = new BlockBlastFurnace(Material.ROCK);
GameRegistry.registerBlock(BlastFurnace, "blastFurnace");
GameRegistry.registerTileEntity(TileBlastFurnace.class, "TileBlastFurnaceTR");
AlloySmelter = new BlockAlloySmelter(Material.rock);
AlloySmelter = new BlockAlloySmelter(Material.ROCK);
GameRegistry.registerBlock(AlloySmelter, "alloySmelter");
GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR");
IndustrialGrinder = new BlockIndustrialGrinder(Material.rock);
IndustrialGrinder = new BlockIndustrialGrinder(Material.ROCK);
GameRegistry.registerBlock(IndustrialGrinder, "grinder");
GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR");
ImplosionCompressor = new BlockImplosionCompressor(Material.rock);
ImplosionCompressor = new BlockImplosionCompressor(Material.ROCK);
GameRegistry.registerBlock(ImplosionCompressor, "implosioncompressor");
GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR");
MatterFabricator = new BlockMatterFabricator(Material.rock);
MatterFabricator = new BlockMatterFabricator(Material.ROCK);
GameRegistry.registerBlock(MatterFabricator, "matterfabricator");
GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR");
ChunkLoader = new BlockChunkLoader(Material.rock);
ChunkLoader = new BlockChunkLoader(Material.ROCK);
GameRegistry.registerBlock(ChunkLoader, "chunkloader");
GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR");
chargeBench = new BlockChargeBench(Material.rock);
chargeBench = new BlockChargeBench(Material.ROCK);
GameRegistry.registerBlock(chargeBench, "chargebench");
GameRegistry.registerTileEntity(TileChargeBench.class, "TileChargeBench");
@ -272,57 +272,57 @@ public class ModBlocks
GameRegistry.registerBlock(playerDetector, ItemBlockPlayerDetector.class, "playerDetector");
GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR");
MachineCasing = new BlockMachineCasing(Material.rock);
MachineCasing = new BlockMachineCasing(Material.ROCK);
GameRegistry.registerBlock(MachineCasing, ItemBlockMachineCasing.class, "machinecasing");
GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR");
ore = new BlockOre(Material.rock);
ore = new BlockOre(Material.ROCK);
GameRegistry.registerBlock(ore, ItemBlockOre.class, "techreborn.ore");
ore2 = new BlockOre2(Material.rock);
ore2 = new BlockOre2(Material.ROCK);
GameRegistry.registerBlock(ore2, ItemBlockOre2.class, "techreborn.ore2");
storage = new BlockStorage(Material.iron);
storage = new BlockStorage(Material.IRON);
GameRegistry.registerBlock(storage, ItemBlockStorage.class, "techreborn.storage");
storage2 = new BlockStorage2(Material.iron);
storage2 = new BlockStorage2(Material.IRON);
GameRegistry.registerBlock(storage2, ItemBlockStorage2.class, "techreborn.storage2");
Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.rock);
Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.ROCK);
GameRegistry.registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon");
GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR");
Magicenergeyconverter = new BlockMagicEnergyConverter(Material.rock);
Magicenergeyconverter = new BlockMagicEnergyConverter(Material.ROCK);
GameRegistry.registerBlock(Magicenergeyconverter, "magicenergyconverter");
AssemblyMachine = new BlockAssemblingMachine(Material.rock);
AssemblyMachine = new BlockAssemblingMachine(Material.ROCK);
GameRegistry.registerBlock(AssemblyMachine, "assemblymachine");
GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR");
DieselGenerator = new BlockDieselGenerator(Material.rock);
DieselGenerator = new BlockDieselGenerator(Material.ROCK);
GameRegistry.registerBlock(DieselGenerator, "dieselgenerator");
GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR");
IndustrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.rock);
IndustrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.ROCK);
GameRegistry.registerBlock(IndustrialElectrolyzer, "industrialelectrolyzer");
GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR");
MagicalAbsorber = new BlockMagicEnergyAbsorber(Material.rock);
MagicalAbsorber = new BlockMagicEnergyAbsorber(Material.ROCK);
GameRegistry.registerBlock(MagicalAbsorber, "magicrnergyabsorber");
Semifluidgenerator = new BlockSemiFluidGenerator(Material.rock);
Semifluidgenerator = new BlockSemiFluidGenerator(Material.ROCK);
GameRegistry.registerBlock(Semifluidgenerator, "semifluidgenerator");
GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGeneratorTR");
Gasturbine = new BlockGasTurbine(Material.rock);
Gasturbine = new BlockGasTurbine(Material.ROCK);
GameRegistry.registerBlock(Gasturbine, "gasturbine");
GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbineTR");
AlloyFurnace = new BlockAlloyFurnace(Material.rock);
AlloyFurnace = new BlockAlloyFurnace(Material.ROCK);
GameRegistry.registerBlock(AlloyFurnace, "alloyfurnace");
GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnaceTR");
ChemicalReactor = new BlockChemicalReactor(Material.rock);
ChemicalReactor = new BlockChemicalReactor(Material.ROCK);
GameRegistry.registerBlock(ChemicalReactor, "chemicalreactor");
GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR");
@ -338,51 +338,51 @@ public class ModBlocks
GameRegistry.registerBlock(Lesu, "lesu");
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
Supercondensator = new BlockSupercondensator(Material.rock);
Supercondensator = new BlockSupercondensator(Material.ROCK);
GameRegistry.registerBlock(Supercondensator, "supercondensator");
LesuStorage = new BlockLESUStorage(Material.rock);
LesuStorage = new BlockLESUStorage(Material.ROCK);
GameRegistry.registerBlock(LesuStorage, "lesustorage");
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");
Distillationtower = new BlockDistillationTower(Material.rock);
Distillationtower = new BlockDistillationTower(Material.ROCK);
GameRegistry.registerBlock(Distillationtower, "distillationtower");
ElectricCraftingTable = new BlockElectricCraftingTable(Material.rock);
ElectricCraftingTable = new BlockElectricCraftingTable(Material.ROCK);
GameRegistry.registerBlock(ElectricCraftingTable, "electriccraftingtable");
VacuumFreezer = new BlockVacuumFreezer(Material.rock);
VacuumFreezer = new BlockVacuumFreezer(Material.ROCK);
GameRegistry.registerBlock(VacuumFreezer, "vacuumfreezer");
GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR");
PlasmaGenerator = new BlockPlasmaGenerator(Material.rock);
PlasmaGenerator = new BlockPlasmaGenerator(Material.ROCK);
GameRegistry.registerBlock(PlasmaGenerator, "plasmagenerator");
ComputerCube = new BlockComputerCube(Material.rock);
ComputerCube = new BlockComputerCube(Material.ROCK);
GameRegistry.registerBlock(ComputerCube, "computercube");
FusionControlComputer = new BlockFusionControlComputer(Material.rock);
FusionControlComputer = new BlockFusionControlComputer(Material.ROCK);
GameRegistry.registerBlock(FusionControlComputer, "fusioncontrolcomputer");
GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR");
FusionCoil = new BlockFusionCoil(Material.rock);
FusionCoil = new BlockFusionCoil(Material.ROCK);
GameRegistry.registerBlock(FusionCoil, "fusioncoil");
LightningRod = new BlockLightningRod(Material.rock);
LightningRod = new BlockLightningRod(Material.ROCK);
GameRegistry.registerBlock(LightningRod, "lightningrod");
heatGenerator = new BlockHeatGenerator(Material.rock);
heatGenerator = new BlockHeatGenerator(Material.ROCK);
GameRegistry.registerBlock(heatGenerator, "heatgenerator");
GameRegistry.registerTileEntity(TileHeatGenerator.class, "TileHeatGeneratorTR");
industrialSawmill = new BlockIndustrialSawmill(Material.rock);
industrialSawmill = new BlockIndustrialSawmill(Material.ROCK);
GameRegistry.registerBlock(industrialSawmill, "industrialSawmill");
GameRegistry.registerTileEntity(TileIndustrialSawmill.class, "TileIndustrialSawmillTR");
machineframe = new BlockMachineFrame(Material.iron);
machineframe = new BlockMachineFrame(Material.IRON);
GameRegistry.registerBlock(machineframe, ItemBlockMachineFrame.class, "techreborn.machineFrame");
Grinder = new BlockGrinder(Material.iron);
Grinder = new BlockGrinder(Material.IRON);
GameRegistry.registerBlock(Grinder, "techreborn.grinder");
GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR");
@ -390,15 +390,15 @@ public class ModBlocks
GameRegistry.registerBlock(Generator, "techreborn.generator");
GameRegistry.registerTileEntity(TileGenerator.class, "TileGeneratorTR");
Extractor = new BlockExtractor(Material.iron);
Extractor = new BlockExtractor(Material.IRON);
GameRegistry.registerBlock(Extractor, "techreborn.extractor");
GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR");
Compressor = new BlockCompressor(Material.iron);
Compressor = new BlockCompressor(Material.IRON);
GameRegistry.registerBlock(Compressor, "techreborn.compressor");
GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR");
ElectricFurnace = new BlockElectricFurnace(Material.iron);
ElectricFurnace = new BlockElectricFurnace(Material.IRON);
GameRegistry.registerBlock(ElectricFurnace, "techreborn.electricfurnace");
GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR");
@ -431,10 +431,10 @@ public class ModBlocks
ironFence = new BlockIronFence();
GameRegistry.registerBlock(ironFence, "ironFence");
reinforcedglass = new BlockReinforcedGlass(Material.glass);
reinforcedglass = new BlockReinforcedGlass(Material.GLASS);
GameRegistry.registerBlock(reinforcedglass, "reinforcedglass");
recycler = new BlockRecycler(Material.iron);
recycler = new BlockRecycler(Material.IRON);
GameRegistry.registerBlock(recycler, "recycler");
GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR");
@ -469,7 +469,7 @@ public class ModBlocks
nuke = new BlockNuke();
GameRegistry.registerBlock(nuke, "nuke");
scrapboxinator = new BlockScrapboxinator(Material.iron);
scrapboxinator = new BlockScrapboxinator(Material.IRON);
GameRegistry.registerBlock(scrapboxinator, "scrapboxinator");
GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR");
@ -526,9 +526,9 @@ public class ModBlocks
OreDictionary.registerOre("blockYellowGarnet", new ItemStack(storage2, 1, 8));
OreDictionary.registerOre("blockRedGarnet", new ItemStack(storage2, 1, 9));
OreDictionary.registerOre("craftingPiston", Blocks.piston);
OreDictionary.registerOre("craftingPiston", Blocks.sticky_piston);
OreDictionary.registerOre("crafterWood", Blocks.crafting_table);
OreDictionary.registerOre("craftingPiston", Blocks.PISTON);
OreDictionary.registerOre("craftingPiston", Blocks.STICKY_PISTON);
OreDictionary.registerOre("crafterWood", Blocks.CRAFTING_TABLE);
OreDictionary.registerOre("machineBasic", new ItemStack(machineframe, 1));
OreDictionary.registerOre("treeSapling", rubberSapling);

View file

@ -85,86 +85,86 @@ public class ModFluids
public static void init()
{
FluidRegistry.registerFluid(fluidberylium);
BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.water, "techreborn.berylium");
BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.WATER, "techreborn.berylium");
GameRegistry.registerBlock(BlockFluidBerylium,
ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5));
fluidberylium.setUnlocalizedName(BlockFluidBerylium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidcalcium);
BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.water, "techreborn.calcium");
BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.WATER, "techreborn.calcium");
GameRegistry.registerBlock(BlockFluidCalcium,
ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5));
fluidcalcium.setUnlocalizedName(BlockFluidCalcium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidcalciumcarbonate);
BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.water,
BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.WATER,
"techreborn.calciumcarbonate");
GameRegistry.registerBlock(BlockFluidCalciumCarbonate,
ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5));
fluidcalcium.setUnlocalizedName(BlockFluidCalciumCarbonate.getUnlocalizedName());
FluidRegistry.registerFluid(fluidChlorite);
BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.water, "techreborn.chlorite");
BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.WATER, "techreborn.chlorite");
GameRegistry.registerBlock(BlockFluidChlorite,
ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5));
fluidChlorite.setUnlocalizedName(BlockFluidChlorite.getUnlocalizedName());
FluidRegistry.registerFluid(fluidDeuterium);
BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.water, "techreborn.deuterium");
BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.WATER, "techreborn.deuterium");
GameRegistry.registerBlock(BlockFluidDeuterium,
ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5));
fluidDeuterium.setUnlocalizedName(BlockFluidDeuterium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidGlyceryl);
BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.water, "techreborn.glyceryl");
BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.WATER, "techreborn.glyceryl");
GameRegistry.registerBlock(BlockFluidGlyceryl,
ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5));
fluidGlyceryl.setUnlocalizedName(BlockFluidGlyceryl.getUnlocalizedName());
FluidRegistry.registerFluid(fluidHelium);
BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.water, "techreborn.helium");
BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.WATER, "techreborn.helium");
GameRegistry.registerBlock(BlockFluidHelium,
ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5));
fluidHelium.setUnlocalizedName(BlockFluidHelium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidHelium3);
BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.water, "techreborn.helium3");
BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.WATER, "techreborn.helium3");
GameRegistry.registerBlock(BlockFluidHelium3,
ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5));
fluidHelium3.setUnlocalizedName(BlockFluidHelium3.getUnlocalizedName());
FluidRegistry.registerFluid(fluidHeliumplasma);
BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.water, "techreborn.heliumplasma");
BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.WATER, "techreborn.heliumplasma");
GameRegistry.registerBlock(BlockFluidHeliumplasma,
ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5));
fluidHeliumplasma.setUnlocalizedName(fluidHeliumplasma.getUnlocalizedName());
FluidRegistry.registerFluid(fluidHydrogen);
BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.water, "techreborn.hydrogen");
BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.WATER, "techreborn.hydrogen");
GameRegistry.registerBlock(BlockFluidHydrogen,
ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5));
fluidHydrogen.setUnlocalizedName(fluidHydrogen.getUnlocalizedName());
FluidRegistry.registerFluid(fluidLithium);
BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.water, "techreborn.lithium");
BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.WATER, "techreborn.lithium");
GameRegistry.registerBlock(BlockFluidLithium,
ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5));
fluidLithium.setUnlocalizedName(fluidLithium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidMercury);
BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.water, "techreborn.mercury");
BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.WATER, "techreborn.mercury");
GameRegistry.registerBlock(BlockFluidMercury,
ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5));
fluidMercury.setUnlocalizedName(fluidMercury.getUnlocalizedName());
FluidRegistry.registerFluid(fluidMethane);
BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.water, "techreborn.methane");
BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.WATER, "techreborn.methane");
GameRegistry.registerBlock(BlockFluidMethane,
ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5));
fluidMethane.setUnlocalizedName(fluidMethane.getUnlocalizedName());
FluidRegistry.registerFluid(fluidNitrocoalfuel);
BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.water,
BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.WATER,
"techreborn.nitrocoalfuel");
GameRegistry.registerBlock(BlockFluidNitrocoalfuel,
ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5));
@ -172,57 +172,57 @@ public class ModFluids
FluidPowerManager.fluidPowerValues.put(fluidNitrocoalfuel, 48.0);
FluidRegistry.registerFluid(fluidNitrofuel);
BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.water, "techreborn.nitrofuel");
BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.WATER, "techreborn.nitrofuel");
GameRegistry.registerBlock(BlockFluidNitrofuel,
ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5));
fluidNitrofuel.setUnlocalizedName(fluidNitrofuel.getUnlocalizedName());
FluidRegistry.registerFluid(fluidNitrogen);
BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.water, "techreborn.nitrogen");
BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.WATER, "techreborn.nitrogen");
GameRegistry.registerBlock(BlockFluidNitrogen,
ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5));
fluidNitrogen.setUnlocalizedName(fluidNitrogen.getUnlocalizedName());
FluidRegistry.registerFluid(fluidNitrogendioxide);
BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.water,
BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.WATER,
"techreborn.nitrogendioxide");
GameRegistry.registerBlock(BlockFluidNitrogendioxide,
ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5));
fluidNitrogendioxide.setUnlocalizedName(fluidNitrogendioxide.getUnlocalizedName());
FluidRegistry.registerFluid(fluidPotassium);
BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.water, "techreborn.potassium");
BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.WATER, "techreborn.potassium");
GameRegistry.registerBlock(BlockFluidPotassium,
ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5));
fluidPotassium.setUnlocalizedName(fluidPotassium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidSilicon);
BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.water, "techreborn.silicon");
BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.WATER, "techreborn.silicon");
GameRegistry.registerBlock(BlockFluidSilicon,
ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5));
fluidSilicon.setUnlocalizedName(fluidSilicon.getUnlocalizedName());
FluidRegistry.registerFluid(fluidSodium);
BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.water, "techreborn.sodium");
BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.WATER, "techreborn.sodium");
GameRegistry.registerBlock(BlockFluidSodium,
ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5));
fluidSodium.setUnlocalizedName(fluidSodium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidSodiumpersulfate);
BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.water,
BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.WATER,
"techreborn.sodiumpersulfate");
GameRegistry.registerBlock(BlockFluidSodiumpersulfate,
ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5));
fluidSodiumpersulfate.setUnlocalizedName(fluidSodiumpersulfate.getUnlocalizedName());
FluidRegistry.registerFluid(fluidTritium);
BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.water, "techreborn.tritium");
BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.WATER, "techreborn.tritium");
GameRegistry.registerBlock(BlockFluidTritium,
ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5));
fluidTritium.setUnlocalizedName(fluidTritium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidWolframium);
BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.water, "techreborn.wolframium");
BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.WATER, "techreborn.wolframium");
GameRegistry.registerBlock(BlockFluidWolframium,
ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5));
fluidWolframium.setUnlocalizedName(fluidWolframium.getUnlocalizedName());

View file

@ -331,190 +331,190 @@ public class ModItems
// buckets
bucketBerylium = new ItemFluidbucket(ModFluids.BlockFluidBerylium);
bucketBerylium.setUnlocalizedName("bucketberylium").setContainerItem(Items.bucket);
bucketBerylium.setUnlocalizedName("bucketberylium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketBerylium, "bucketberylium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidberylium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketBerylium), new ItemStack(Items.bucket));
new ItemStack(bucketBerylium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium.getFluid(), bucketBerylium);
bucketcalcium = new ItemFluidbucket(ModFluids.BlockFluidCalcium);
bucketcalcium.setUnlocalizedName("bucketcalcium").setContainerItem(Items.bucket);
bucketcalcium.setUnlocalizedName("bucketcalcium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketcalcium, "bucketcalcium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidcalcium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketcalcium), new ItemStack(Items.bucket));
new ItemStack(bucketcalcium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalcium.getFluid(), bucketcalcium);
bucketcalciumcarbonate = new ItemFluidbucket(ModFluids.BlockFluidCalciumCarbonate);
bucketcalciumcarbonate.setUnlocalizedName("bucketcalciumcarbonate").setContainerItem(Items.bucket);
bucketcalciumcarbonate.setUnlocalizedName("bucketcalciumcarbonate").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketcalciumcarbonate, "bucketcalciumcarbonate");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidcalciumcarbonate", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket));
new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalciumCarbonate.getFluid(),
bucketcalciumcarbonate);
bucketChlorite = new ItemFluidbucket(ModFluids.BlockFluidChlorite);
bucketChlorite.setUnlocalizedName("bucketchlorite").setContainerItem(Items.bucket);
bucketChlorite.setUnlocalizedName("bucketchlorite").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketChlorite, "bucketcalchlorite");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidchlorite", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket));
new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidChlorite.getFluid(), bucketChlorite);
bucketDeuterium = new ItemFluidbucket(ModFluids.BlockFluidDeuterium);
bucketDeuterium.setUnlocalizedName("bucketdeuterium").setContainerItem(Items.bucket);
bucketDeuterium.setUnlocalizedName("bucketdeuterium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketDeuterium, "bucketdeuterium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluiddeuterium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketDeuterium), new ItemStack(Items.bucket));
new ItemStack(bucketDeuterium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidDeuterium.getFluid(), bucketDeuterium);
bucketGlyceryl = new ItemFluidbucket(ModFluids.BlockFluidGlyceryl);
bucketGlyceryl.setUnlocalizedName("bucketglyceryl").setContainerItem(Items.bucket);
bucketGlyceryl.setUnlocalizedName("bucketglyceryl").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketGlyceryl, "bucketglyceryl");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidglyceryl", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketGlyceryl), new ItemStack(Items.bucket));
new ItemStack(bucketGlyceryl), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidGlyceryl.getFluid(), bucketGlyceryl);
bucketHelium = new ItemFluidbucket(ModFluids.BlockFluidHelium);
bucketHelium.setUnlocalizedName("buckethelium").setContainerItem(Items.bucket);
bucketHelium.setUnlocalizedName("buckethelium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketHelium, "buckethelium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidhelium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketHelium), new ItemStack(Items.bucket));
new ItemStack(bucketHelium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium.getFluid(), bucketHelium);
bucketHelium3 = new ItemFluidbucket(ModFluids.BlockFluidHelium3);
bucketHelium3.setUnlocalizedName("buckethelium3").setContainerItem(Items.bucket);
bucketHelium3.setUnlocalizedName("buckethelium3").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketHelium3, "buckethelium3");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidhelium3", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketHelium3), new ItemStack(Items.bucket));
new ItemStack(bucketHelium3), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium3.getFluid(), bucketHelium3);
bucketHeliumplasma = new ItemFluidbucket(ModFluids.BlockFluidHeliumplasma);
bucketHeliumplasma.setUnlocalizedName("bucketheliumplasma").setContainerItem(Items.bucket);
bucketHeliumplasma.setUnlocalizedName("bucketheliumplasma").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketHeliumplasma, "bucketheliumplasma");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidheliumplasma", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketHeliumplasma), new ItemStack(Items.bucket));
new ItemStack(bucketHeliumplasma), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHeliumplasma.getFluid(), bucketHeliumplasma);
bucketHydrogen = new ItemFluidbucket(ModFluids.BlockFluidHydrogen);
bucketHydrogen.setUnlocalizedName("buckethydrogen").setContainerItem(Items.bucket);
bucketHydrogen.setUnlocalizedName("buckethydrogen").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketHydrogen, "buckethydrogen");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidhydrogen", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketHydrogen), new ItemStack(Items.bucket));
new ItemStack(bucketHydrogen), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHydrogen.getFluid(), bucketHydrogen);
bucketLithium = new ItemFluidbucket(ModFluids.BlockFluidLithium);
bucketLithium.setUnlocalizedName("bucketlithium").setContainerItem(Items.bucket);
bucketLithium.setUnlocalizedName("bucketlithium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketLithium, "bucketlithium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidlithium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketLithium), new ItemStack(Items.bucket));
new ItemStack(bucketLithium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidLithium.getFluid(), bucketLithium);
bucketMercury = new ItemFluidbucket(ModFluids.BlockFluidMercury);
bucketMercury.setUnlocalizedName("bucketmercury").setContainerItem(Items.bucket);
bucketMercury.setUnlocalizedName("bucketmercury").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketMercury, "bucketmercury");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidmercury", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketMercury), new ItemStack(Items.bucket));
new ItemStack(bucketMercury), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMercury.getFluid(), bucketMercury);
bucketMethane = new ItemFluidbucket(ModFluids.BlockFluidMethane);
bucketMethane.setUnlocalizedName("bucketmethane").setContainerItem(Items.bucket);
bucketMethane.setUnlocalizedName("bucketmethane").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketMethane, "bucketmethane");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidmethane", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketMethane), new ItemStack(Items.bucket));
new ItemStack(bucketMethane), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMethane.getFluid(), bucketMethane);
bucketNitrocoalfuel = new ItemFluidbucket(ModFluids.BlockFluidNitrocoalfuel);
bucketNitrocoalfuel.setUnlocalizedName("bucketnitrocoalfuel").setContainerItem(Items.bucket);
bucketNitrocoalfuel.setUnlocalizedName("bucketnitrocoalfuel").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketNitrocoalfuel, "bucketnitrocoalfuel");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidnitrocoalfuel", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketNitrocoalfuel), new ItemStack(Items.bucket));
new ItemStack(bucketNitrocoalfuel), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrocoalfuel.getFluid(), bucketNitrocoalfuel);
bucketNitrofuel = new ItemFluidbucket(ModFluids.BlockFluidNitrofuel);
bucketNitrofuel.setUnlocalizedName("bucketnitrofuel").setContainerItem(Items.bucket);
bucketNitrofuel.setUnlocalizedName("bucketnitrofuel").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketNitrofuel, "bucketnitrofuel");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidnitrofuel", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketNitrofuel), new ItemStack(Items.bucket));
new ItemStack(bucketNitrofuel), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrofuel.getFluid(), bucketNitrofuel);
bucketNitrogen = new ItemFluidbucket(ModFluids.BlockFluidNitrogen);
bucketNitrogen.setUnlocalizedName("bucketnitrogen").setContainerItem(Items.bucket);
bucketNitrogen.setUnlocalizedName("bucketnitrogen").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketNitrogen, "bucketnitrogen");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidnitrogen", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketNitrogen), new ItemStack(Items.bucket));
new ItemStack(bucketNitrogen), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogen.getFluid(), bucketNitrogen);
bucketNitrogendioxide = new ItemFluidbucket(ModFluids.BlockFluidNitrogendioxide);
bucketNitrogendioxide.setUnlocalizedName("bucketnitrogendioxide").setContainerItem(Items.bucket);
bucketNitrogendioxide.setUnlocalizedName("bucketnitrogendioxide").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketNitrogendioxide, "bucketnitrogendioxide");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidnitrogendioxide", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketNitrogendioxide), new ItemStack(Items.bucket));
new ItemStack(bucketNitrogendioxide), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogendioxide.getFluid(),
bucketNitrogendioxide);
bucketPotassium = new ItemFluidbucket(ModFluids.BlockFluidPotassium);
bucketPotassium.setUnlocalizedName("bucketpotassium").setContainerItem(Items.bucket);
bucketPotassium.setUnlocalizedName("bucketpotassium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketPotassium, "bucketpotassium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidpotassium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketPotassium), new ItemStack(Items.bucket));
new ItemStack(bucketPotassium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidPotassium.getFluid(), bucketPotassium);
bucketSilicon = new ItemFluidbucket(ModFluids.BlockFluidSilicon);
bucketSilicon.setUnlocalizedName("bucketsilicon").setContainerItem(Items.bucket);
bucketSilicon.setUnlocalizedName("bucketsilicon").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketSilicon, "bucketsilicon");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidsilicon", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketSilicon), new ItemStack(Items.bucket));
new ItemStack(bucketSilicon), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSilicon.getFluid(), bucketSilicon);
bucketSodium = new ItemFluidbucket(ModFluids.BlockFluidSodium);
bucketSodium.setUnlocalizedName("bucketsodium").setContainerItem(Items.bucket);
bucketSodium.setUnlocalizedName("bucketsodium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketSodium, "bucketsodium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidsodium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketSodium), new ItemStack(Items.bucket));
new ItemStack(bucketSodium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodium.getFluid(), bucketSodium);
bucketSodiumpersulfate = new ItemFluidbucket(ModFluids.BlockFluidSodiumpersulfate);
bucketSodiumpersulfate.setUnlocalizedName("bucketsodiumpersulfate").setContainerItem(Items.bucket);
bucketSodiumpersulfate.setUnlocalizedName("bucketsodiumpersulfate").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketSodiumpersulfate, "bucketsodiumpersulfate");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidsodiumpersulfate", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketSodiumpersulfate), new ItemStack(Items.bucket));
new ItemStack(bucketSodiumpersulfate), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodiumpersulfate.getFluid(),
bucketSodiumpersulfate);
bucketTritium = new ItemFluidbucket(ModFluids.BlockFluidTritium);
bucketTritium.setUnlocalizedName("buckettritium").setContainerItem(Items.bucket);
bucketTritium.setUnlocalizedName("buckettritium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketTritium, "buckettritium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidtritium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketTritium), new ItemStack(Items.bucket));
new ItemStack(bucketTritium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidTritium.getFluid(), bucketTritium);
bucketWolframium = new ItemFluidbucket(ModFluids.BlockFluidWolframium);
bucketWolframium.setUnlocalizedName("bucketwolframium").setContainerItem(Items.bucket);
bucketWolframium.setUnlocalizedName("bucketwolframium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketWolframium, "bucketwolframium");
FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidwolframium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketWolframium), new ItemStack(Items.bucket));
new ItemStack(bucketWolframium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidWolframium.getFluid(), bucketWolframium);
missingRecipe = new ItemMissingRecipe().setUnlocalizedName("missingRecipe");
@ -761,7 +761,7 @@ public class ModItems
OreUnifier.registerOre("plateZinc", ItemPlates.getPlateByName("zinc"));
OreUnifier.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
OreUnifier.registerOre("diamondTR", Items.diamond);
OreUnifier.registerOre("diamondTR", Items.DIAMOND);
OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("wolframiumGrindingHead"));
@ -772,7 +772,7 @@ public class ModItems
OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk"));
OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water"));
OreUnifier.registerOre("containerWater", Items.water_bucket);
OreUnifier.registerOre("containerWater", Items.WATER_BUCKET);
OreUnifier.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
OreUnifier.registerOre("materialRubber", ItemParts.getPartByName("rubber"));

File diff suppressed because it is too large Load diff

View file

@ -18,7 +18,7 @@ public class ModSounds
private static SoundEvent getSound(String str)
{
SoundEvent soundEvent = SoundEvent.soundEventRegistry.getObject(new ResourceLocation("techreborn" + str));
SoundEvent soundEvent = SoundEvent.REGISTRY.getObject(new ResourceLocation("techreborn" + str));
return soundEvent;
}

View file

@ -26,8 +26,8 @@ public class RecipeCompact implements IRecipeCompact
public void init()
{
recipes.put("industrialDiamond", new ItemStack(Items.diamond));
recipes.put("industrialTnt", new ItemStack(Blocks.tnt));
recipes.put("industrialDiamond", new ItemStack(Items.DIAMOND));
recipes.put("industrialTnt", new ItemStack(Blocks.TNT));
recipes.put("copperIngot", ItemIngots.getIngotByName("copper"));
recipes.put("tinIngot", ItemIngots.getIngotByName("tin"));
recipes.put("bronzeIngot", ItemIngots.getIngotByName("bronze"));
@ -66,7 +66,7 @@ public class RecipeCompact implements IRecipeCompact
recipes.put("reinforcedGlass", new ItemStack(ModBlocks.reinforcedglass));
recipes.put("compressor", new ItemStack(ModBlocks.Compressor));
recipes.put("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold"));
recipes.put("fertilizer", new ItemStack(Items.dye));
recipes.put("fertilizer", new ItemStack(Items.DYE));
inited = false;
}