Rewrite tile registry + rename all tiles. Worlds should upgrade fine using datafixers
This commit is contained in:
parent
4d74c8d69b
commit
6bc73adc35
3 changed files with 161 additions and 80 deletions
|
@ -29,8 +29,10 @@ import net.minecraft.item.crafting.IRecipe;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraft.world.gen.structure.MapGenStructureIO;
|
import net.minecraft.world.gen.structure.MapGenStructureIO;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
|
import net.minecraftforge.common.util.ModFixs;
|
||||||
import net.minecraftforge.event.RegistryEvent;
|
import net.minecraftforge.event.RegistryEvent;
|
||||||
import net.minecraftforge.fluids.FluidRegistry;
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
|
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||||
import net.minecraftforge.fml.common.Loader;
|
import net.minecraftforge.fml.common.Loader;
|
||||||
import net.minecraftforge.fml.common.Mod;
|
import net.minecraftforge.fml.common.Mod;
|
||||||
import net.minecraftforge.fml.common.SidedProxy;
|
import net.minecraftforge.fml.common.SidedProxy;
|
||||||
|
@ -106,6 +108,8 @@ public class Core {
|
||||||
TechRebornAPI.subItemRetriever = new SubItemRetriever();
|
TechRebornAPI.subItemRetriever = new SubItemRetriever();
|
||||||
// Register ModBlocks
|
// Register ModBlocks
|
||||||
ModBlocks.init();
|
ModBlocks.init();
|
||||||
|
//Register Tile's
|
||||||
|
ModTileEntities.init();
|
||||||
// Register Fluids
|
// Register Fluids
|
||||||
ModFluids.init();
|
ModFluids.init();
|
||||||
// Register ModItems
|
// Register ModItems
|
||||||
|
@ -113,6 +117,9 @@ public class Core {
|
||||||
// Entitys
|
// Entitys
|
||||||
EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true);
|
EntityRegistry.registerModEntity(new ResourceLocation("techreborn", "nuke"), EntityNukePrimed.class, "nuke", 0, INSTANCE, 160, 5, true);
|
||||||
|
|
||||||
|
ModFixs dataFixes = FMLCommonHandler.instance().getDataFixer().init(ModInfo.MOD_ID, 1);
|
||||||
|
ModTileEntities.initDataFixer(dataFixes);
|
||||||
|
|
||||||
CompatManager.isIC2Loaded = Loader.isModLoaded("ic2");
|
CompatManager.isIC2Loaded = Loader.isModLoaded("ic2");
|
||||||
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
for (ICompatModule compatModule : CompatManager.INSTANCE.compatModules) {
|
||||||
compatModule.preInit(event);
|
compatModule.preInit(event);
|
||||||
|
|
|
@ -29,10 +29,8 @@ import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.item.ItemBlock;
|
import net.minecraft.item.ItemBlock;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
import reborncore.RebornRegistry;
|
import reborncore.RebornRegistry;
|
||||||
import reborncore.common.tile.TileLegacyMachineBase;
|
|
||||||
import reborncore.common.util.OreUtil;
|
import reborncore.common.util.OreUtil;
|
||||||
import reborncore.common.util.StringUtils;
|
import reborncore.common.util.StringUtils;
|
||||||
import techreborn.Core;
|
import techreborn.Core;
|
||||||
|
@ -42,7 +40,8 @@ import techreborn.blocks.generator.*;
|
||||||
import techreborn.blocks.generator.solarpanel.BlockSolarPanel;
|
import techreborn.blocks.generator.solarpanel.BlockSolarPanel;
|
||||||
import techreborn.blocks.lighting.BlockLamp;
|
import techreborn.blocks.lighting.BlockLamp;
|
||||||
import techreborn.blocks.storage.*;
|
import techreborn.blocks.storage.*;
|
||||||
import techreborn.blocks.tier0.*;
|
import techreborn.blocks.tier0.BlockIronAlloyFurnace;
|
||||||
|
import techreborn.blocks.tier0.BlockIronFurnace;
|
||||||
import techreborn.blocks.tier1.*;
|
import techreborn.blocks.tier1.*;
|
||||||
import techreborn.blocks.tier2.*;
|
import techreborn.blocks.tier2.*;
|
||||||
import techreborn.blocks.tier3.*;
|
import techreborn.blocks.tier3.*;
|
||||||
|
@ -51,24 +50,6 @@ import techreborn.blocks.transformers.BlockLVTransformer;
|
||||||
import techreborn.blocks.transformers.BlockMVTransformer;
|
import techreborn.blocks.transformers.BlockMVTransformer;
|
||||||
import techreborn.itemblocks.*;
|
import techreborn.itemblocks.*;
|
||||||
import techreborn.lib.ModInfo;
|
import techreborn.lib.ModInfo;
|
||||||
import techreborn.tiles.*;
|
|
||||||
import techreborn.tiles.cable.TileCable;
|
|
||||||
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
|
||||||
import techreborn.tiles.generator.*;
|
|
||||||
import techreborn.tiles.idsu.TileInterdimensionalSU;
|
|
||||||
import techreborn.tiles.lesu.TileLSUStorage;
|
|
||||||
import techreborn.tiles.lesu.TileLapotronicSU;
|
|
||||||
import techreborn.tiles.lighting.TileLamp;
|
|
||||||
import techreborn.tiles.multiblock.*;
|
|
||||||
import techreborn.tiles.storage.TileAdjustableSU;
|
|
||||||
import techreborn.tiles.storage.TileHighVoltageSU;
|
|
||||||
import techreborn.tiles.storage.TileLowVoltageSU;
|
|
||||||
import techreborn.tiles.storage.TileMediumVoltageSU;
|
|
||||||
import techreborn.tiles.tier0.*;
|
|
||||||
import techreborn.tiles.tier1.*;
|
|
||||||
import techreborn.tiles.transformers.TileHVTransformer;
|
|
||||||
import techreborn.tiles.transformers.TileLVTransformer;
|
|
||||||
import techreborn.tiles.transformers.TileMVTransformer;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers all TR blocks
|
* Registers all TR blocks
|
||||||
|
@ -161,67 +142,51 @@ public class ModBlocks {
|
||||||
public static void init() {
|
public static void init() {
|
||||||
THERMAL_GENERATOR = new BlockThermalGenerator();
|
THERMAL_GENERATOR = new BlockThermalGenerator();
|
||||||
registerBlock(THERMAL_GENERATOR, "thermal_generator");
|
registerBlock(THERMAL_GENERATOR, "thermal_generator");
|
||||||
GameRegistry.registerTileEntity(TileThermalGenerator.class, "TileThermalGeneratorTR");
|
|
||||||
|
|
||||||
QUANTUM_TANK = new BlockQuantumTank();
|
QUANTUM_TANK = new BlockQuantumTank();
|
||||||
registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank");
|
registerBlock(QUANTUM_TANK, ItemBlockQuantumTank.class, "quantum_tank");
|
||||||
GameRegistry.registerTileEntity(TileQuantumTank.class, "TileQuantumTankTR");
|
|
||||||
|
|
||||||
QUANTUM_CHEST = new BlockQuantumChest();
|
QUANTUM_CHEST = new BlockQuantumChest();
|
||||||
registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest");
|
registerBlock(QUANTUM_CHEST, ItemBlockQuantumChest.class, "quantum_chest");
|
||||||
GameRegistry.registerTileEntity(TileQuantumChest.class, "TileQuantumChestTR");
|
|
||||||
|
|
||||||
DIGITAL_CHEST = new BlockDigitalChest();
|
DIGITAL_CHEST = new BlockDigitalChest();
|
||||||
registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest");
|
registerBlock(DIGITAL_CHEST, ItemBlockDigitalChest.class, "digital_chest");
|
||||||
GameRegistry.registerTileEntity(TileDigitalChest.class, "TileDigitalChestTR");
|
|
||||||
|
|
||||||
INDUSTRIAL_CENTRIFUGE = new BlockIndustrialCentrifuge();
|
INDUSTRIAL_CENTRIFUGE = new BlockIndustrialCentrifuge();
|
||||||
registerBlock(INDUSTRIAL_CENTRIFUGE, "industrial_centrifuge");
|
registerBlock(INDUSTRIAL_CENTRIFUGE, "industrial_centrifuge");
|
||||||
GameRegistry.registerTileEntity(TileIndustrialCentrifuge.class, "TileIndustrialCentrifugeTR");
|
|
||||||
|
|
||||||
ROLLING_MACHINE = new BlockRollingMachine();
|
ROLLING_MACHINE = new BlockRollingMachine();
|
||||||
registerBlock(ROLLING_MACHINE, "rolling_machine");
|
registerBlock(ROLLING_MACHINE, "rolling_machine");
|
||||||
GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR");
|
|
||||||
|
|
||||||
INDUSTRIAL_BLAST_FURNACE = new BlockIndustrialBlastFurnace();
|
INDUSTRIAL_BLAST_FURNACE = new BlockIndustrialBlastFurnace();
|
||||||
registerBlock(INDUSTRIAL_BLAST_FURNACE, "industrial_blast_furnace");
|
registerBlock(INDUSTRIAL_BLAST_FURNACE, "industrial_blast_furnace");
|
||||||
GameRegistry.registerTileEntity(TileIndustrialBlastFurnace.class, "TileIndustrialBlastFurnaceTR");
|
|
||||||
|
|
||||||
ALLOY_SMELTER = new BlockAlloySmelter();
|
ALLOY_SMELTER = new BlockAlloySmelter();
|
||||||
registerBlock(ALLOY_SMELTER, "alloy_smelter");
|
registerBlock(ALLOY_SMELTER, "alloy_smelter");
|
||||||
GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR");
|
|
||||||
|
|
||||||
INDUSTRIAL_GRINDER = new BlockIndustrialGrinder();
|
INDUSTRIAL_GRINDER = new BlockIndustrialGrinder();
|
||||||
registerBlock(INDUSTRIAL_GRINDER, "industrial_grinder");
|
registerBlock(INDUSTRIAL_GRINDER, "industrial_grinder");
|
||||||
GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR");
|
|
||||||
|
|
||||||
IMPLOSION_COMPRESSOR = new BlockImplosionCompressor();
|
IMPLOSION_COMPRESSOR = new BlockImplosionCompressor();
|
||||||
registerBlock(IMPLOSION_COMPRESSOR, "implosion_compressor");
|
registerBlock(IMPLOSION_COMPRESSOR, "implosion_compressor");
|
||||||
GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR");
|
|
||||||
|
|
||||||
MATTER_FABRICATOR = new BlockMatterFabricator();
|
MATTER_FABRICATOR = new BlockMatterFabricator();
|
||||||
registerBlock(MATTER_FABRICATOR, "matter_fabricator");
|
registerBlock(MATTER_FABRICATOR, "matter_fabricator");
|
||||||
GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR");
|
|
||||||
|
|
||||||
CHUNK_LOADER = new BlockChunkLoader();
|
CHUNK_LOADER = new BlockChunkLoader();
|
||||||
registerBlock(CHUNK_LOADER, "chunk_loader");
|
registerBlock(CHUNK_LOADER, "chunk_loader");
|
||||||
GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR");
|
|
||||||
|
|
||||||
CHARGE_O_MAT = new BlockChargeOMat();
|
CHARGE_O_MAT = new BlockChargeOMat();
|
||||||
registerBlock(CHARGE_O_MAT, "charge_o_mat");
|
registerBlock(CHARGE_O_MAT, "charge_o_mat");
|
||||||
GameRegistry.registerTileEntity(TileChargeOMat.class, "TileChargeOMatTR");
|
|
||||||
|
|
||||||
PLAYER_DETECTOR = new BlockPlayerDetector();
|
PLAYER_DETECTOR = new BlockPlayerDetector();
|
||||||
registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "player_detector");
|
registerBlock(PLAYER_DETECTOR, ItemBlockPlayerDetector.class, "player_detector");
|
||||||
GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR");
|
|
||||||
|
|
||||||
CABLE = new BlockCable();
|
CABLE = new BlockCable();
|
||||||
registerBlock(CABLE, ItemBlockCable.class, "cable");
|
registerBlock(CABLE, ItemBlockCable.class, "cable");
|
||||||
GameRegistry.registerTileEntity(TileCable.class, "TileCableTR");
|
|
||||||
|
|
||||||
MACHINE_CASINGS = new BlockMachineCasing();
|
MACHINE_CASINGS = new BlockMachineCasing();
|
||||||
registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machine_casing");
|
registerBlock(MACHINE_CASINGS, ItemBlockMachineCasing.class, "machine_casing");
|
||||||
GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR");
|
|
||||||
|
|
||||||
ORE = new BlockOre();
|
ORE = new BlockOre();
|
||||||
registerBlock(ORE, ItemBlockOre.class, "ore");
|
registerBlock(ORE, ItemBlockOre.class, "ore");
|
||||||
|
@ -237,121 +202,93 @@ public class ModBlocks {
|
||||||
|
|
||||||
DRAGON_EGG_SYPHON = new BlockDragonEggSyphon();
|
DRAGON_EGG_SYPHON = new BlockDragonEggSyphon();
|
||||||
registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon");
|
registerBlock(DRAGON_EGG_SYPHON, "dragon_egg_syphon");
|
||||||
GameRegistry.registerTileEntity(TileDragonEggSyphon.class, "TileDragonEggSyphonTR");
|
|
||||||
|
|
||||||
MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter();
|
MAGIC_ENERGY_CONVERTER = new BlockMagicEnergyConverter();
|
||||||
registerBlock(MAGIC_ENERGY_CONVERTER, "magic_energy_converter");
|
registerBlock(MAGIC_ENERGY_CONVERTER, "magic_energy_converter");
|
||||||
|
|
||||||
ASSEMBLY_MACHINE = new BlockAssemblingMachine();
|
ASSEMBLY_MACHINE = new BlockAssemblingMachine();
|
||||||
registerBlock(ASSEMBLY_MACHINE, "assembly_machine");
|
registerBlock(ASSEMBLY_MACHINE, "assembly_machine");
|
||||||
GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR");
|
|
||||||
|
|
||||||
DIESEL_GENERATOR = new BlockDieselGenerator();
|
DIESEL_GENERATOR = new BlockDieselGenerator();
|
||||||
registerBlock(DIESEL_GENERATOR, "diesel_generator");
|
registerBlock(DIESEL_GENERATOR, "diesel_generator");
|
||||||
GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR");
|
|
||||||
|
|
||||||
INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer();
|
INDUSTRIAL_ELECTROLYZER = new BlockIndustrialElectrolyzer();
|
||||||
registerBlock(INDUSTRIAL_ELECTROLYZER, "industrial_electrolyzer");
|
registerBlock(INDUSTRIAL_ELECTROLYZER, "industrial_electrolyzer");
|
||||||
GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR");
|
|
||||||
|
|
||||||
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber();
|
MAGICAL_ABSORBER = new BlockMagicEnergyAbsorber();
|
||||||
registerBlock(MAGICAL_ABSORBER, "magic_energy_absorber");
|
registerBlock(MAGICAL_ABSORBER, "magic_energy_absorber");
|
||||||
|
|
||||||
SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator();
|
SEMI_FLUID_GENERATOR = new BlockSemiFluidGenerator();
|
||||||
registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator");
|
registerBlock(SEMI_FLUID_GENERATOR, "semi_fluid_generator");
|
||||||
GameRegistry.registerTileEntity(TileSemiFluidGenerator.class, "TileSemiFluidGeneratorTR");
|
|
||||||
|
|
||||||
GAS_TURBINE = new BlockGasTurbine();
|
GAS_TURBINE = new BlockGasTurbine();
|
||||||
registerBlock(GAS_TURBINE, "gas_turbine");
|
registerBlock(GAS_TURBINE, "gas_turbine");
|
||||||
GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGasTurbineTR");
|
|
||||||
|
|
||||||
IRON_ALLOY_FURNACE = new BlockIronAlloyFurnace();
|
IRON_ALLOY_FURNACE = new BlockIronAlloyFurnace();
|
||||||
registerBlock(IRON_ALLOY_FURNACE, "iron_alloy_furnace");
|
registerBlock(IRON_ALLOY_FURNACE, "iron_alloy_furnace");
|
||||||
GameRegistry.registerTileEntity(TileIronAlloyFurnace.class, "TileIronAlloyFurnaceTR");
|
|
||||||
|
|
||||||
CHEMICAL_REACTOR = new BlockChemicalReactor();
|
CHEMICAL_REACTOR = new BlockChemicalReactor();
|
||||||
registerBlock(CHEMICAL_REACTOR, "chemical_reactor");
|
registerBlock(CHEMICAL_REACTOR, "chemical_reactor");
|
||||||
GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR");
|
|
||||||
|
|
||||||
INTERDIMENSIONAL_SU = new BlockInterdimensionalSU();
|
INTERDIMENSIONAL_SU = new BlockInterdimensionalSU();
|
||||||
registerBlock(INTERDIMENSIONAL_SU, "interdimensional_su");
|
registerBlock(INTERDIMENSIONAL_SU, "interdimensional_su");
|
||||||
GameRegistry.registerTileEntity(TileInterdimensionalSU.class, "TileInterdimensionalSUTR");
|
|
||||||
|
|
||||||
ADJUSTABLE_SU = new BlockAdjustableSU();
|
ADJUSTABLE_SU = new BlockAdjustableSU();
|
||||||
registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su");
|
registerBlock(ADJUSTABLE_SU, ItemBlockAdjustableSU.class, "adjustable_su");
|
||||||
GameRegistry.registerTileEntity(TileAdjustableSU.class, "TileAdjustableSUTR");
|
|
||||||
|
|
||||||
LAPOTRONIC_SU = new BlockLapotronicSU();
|
LAPOTRONIC_SU = new BlockLapotronicSU();
|
||||||
registerBlock(LAPOTRONIC_SU, "lapotronic_su");
|
registerBlock(LAPOTRONIC_SU, "lapotronic_su");
|
||||||
GameRegistry.registerTileEntity(TileLapotronicSU.class, "TileLapotronicSUTR");
|
|
||||||
|
|
||||||
LSU_STORAGE = new BlockLSUStorage();
|
LSU_STORAGE = new BlockLSUStorage();
|
||||||
registerBlock(LSU_STORAGE, "lsu_storage");
|
registerBlock(LSU_STORAGE, "lsu_storage");
|
||||||
GameRegistry.registerTileEntity(TileLSUStorage.class, "TileLSUStorageTR");
|
|
||||||
|
|
||||||
DISTILLATION_TOWER = new BlockDistillationTower();
|
DISTILLATION_TOWER = new BlockDistillationTower();
|
||||||
registerBlock(DISTILLATION_TOWER, "distillation_tower");
|
registerBlock(DISTILLATION_TOWER, "distillation_tower");
|
||||||
GameRegistry.registerTileEntity(TileDistillationTower.class, "TileDistillationTowerTR");
|
|
||||||
|
|
||||||
VACUUM_FREEZER = new BlockVacuumFreezer();
|
VACUUM_FREEZER = new BlockVacuumFreezer();
|
||||||
registerBlock(VACUUM_FREEZER, "vacuum_freezer");
|
registerBlock(VACUUM_FREEZER, "vacuum_freezer");
|
||||||
GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR");
|
|
||||||
|
|
||||||
FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer();
|
FUSION_CONTROL_COMPUTER = new BlockFusionControlComputer();
|
||||||
registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer");
|
registerBlock(FUSION_CONTROL_COMPUTER, "fusion_control_computer");
|
||||||
GameRegistry.registerTileEntity(TileFusionControlComputer.class, "TileFusionControlComputerTR");
|
|
||||||
|
|
||||||
FUSION_COIL = new BlockFusionCoil();
|
FUSION_COIL = new BlockFusionCoil();
|
||||||
registerBlock(FUSION_COIL, "fusion_coil");
|
registerBlock(FUSION_COIL, "fusion_coil");
|
||||||
|
|
||||||
LIGHTNING_ROD = new BlockLightningRod();
|
LIGHTNING_ROD = new BlockLightningRod();
|
||||||
registerBlock(LIGHTNING_ROD, "lightning_rod");
|
registerBlock(LIGHTNING_ROD, "lightning_rod");
|
||||||
GameRegistry.registerTileEntity(TileLightningRod.class, "TileLightningRodTR");
|
|
||||||
|
|
||||||
INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill();
|
INDUSTRIAL_SAWMILL = new BlockIndustrialSawmill();
|
||||||
registerBlock(INDUSTRIAL_SAWMILL, "industrial_sawmill");
|
registerBlock(INDUSTRIAL_SAWMILL, "industrial_sawmill");
|
||||||
GameRegistry.registerTileEntity(TileIndustrialSawmill.class, "TileIndustrialSawmillTR");
|
|
||||||
|
|
||||||
MACHINE_FRAMES = new BlockMachineFrames();
|
MACHINE_FRAMES = new BlockMachineFrames();
|
||||||
registerBlock(MACHINE_FRAMES, ItemBlockMachineFrames.class, "machine_frame");
|
registerBlock(MACHINE_FRAMES, ItemBlockMachineFrames.class, "machine_frame");
|
||||||
|
|
||||||
GRINDER = new BlockGrinder();
|
GRINDER = new BlockGrinder();
|
||||||
registerBlock(GRINDER, "grinder");
|
registerBlock(GRINDER, "grinder");
|
||||||
GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR");
|
|
||||||
|
|
||||||
SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator();
|
SOLID_FUEL_GENEREATOR = new BlockSolidFuelGenerator();
|
||||||
registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator");
|
registerBlock(SOLID_FUEL_GENEREATOR, "solid_fuel_generator");
|
||||||
GameRegistry.registerTileEntity(TileSolidFuelGenerator.class, "TileSolidFuelGeneratorTR");
|
|
||||||
|
|
||||||
EXTRACTOR = new BlockExtractor();
|
EXTRACTOR = new BlockExtractor();
|
||||||
registerBlock(EXTRACTOR, "extractor");
|
registerBlock(EXTRACTOR, "extractor");
|
||||||
GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR");
|
|
||||||
|
|
||||||
COMPRESSOR = new BlockCompressor();
|
COMPRESSOR = new BlockCompressor();
|
||||||
registerBlock(COMPRESSOR, "compressor");
|
registerBlock(COMPRESSOR, "compressor");
|
||||||
GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR");
|
|
||||||
|
|
||||||
ELECTRIC_FURNACE = new BlockElectricFurnace();
|
ELECTRIC_FURNACE = new BlockElectricFurnace();
|
||||||
registerBlock(ELECTRIC_FURNACE, "electric_furnace");
|
registerBlock(ELECTRIC_FURNACE, "electric_furnace");
|
||||||
GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR");
|
|
||||||
|
|
||||||
SOLAR_PANEL = new BlockSolarPanel();
|
SOLAR_PANEL = new BlockSolarPanel();
|
||||||
registerBlock(SOLAR_PANEL, ItemBlockSolarPanel.class, "solar_panel");
|
registerBlock(SOLAR_PANEL, ItemBlockSolarPanel.class, "solar_panel");
|
||||||
GameRegistry.registerTileEntity(TileSolarPanel.class, "TileSolarPanelTR");
|
|
||||||
|
|
||||||
CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel();
|
CREATIVE_SOLAR_PANEL = new BlockCreativeSolarPanel();
|
||||||
registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel");
|
registerBlock(CREATIVE_SOLAR_PANEL, "creative_solar_panel");
|
||||||
GameRegistry.registerTileEntity(TileCreativeSolarPanel.class, "TileCreativeSolarPanelTR");
|
|
||||||
|
|
||||||
WATER_MILL = new BlockWaterMill();
|
WATER_MILL = new BlockWaterMill();
|
||||||
registerBlock(WATER_MILL, "water_mill");
|
registerBlock(WATER_MILL, "water_mill");
|
||||||
GameRegistry.registerTileEntity(TileWaterMill.class, "TileWaterMillTR");
|
|
||||||
|
|
||||||
WIND_MILL = new BlockWindMill();
|
WIND_MILL = new BlockWindMill();
|
||||||
registerBlock(WIND_MILL, "wind_mill");
|
registerBlock(WIND_MILL, "wind_mill");
|
||||||
GameRegistry.registerTileEntity(TileWindMill.class, "TileWindMillTR");
|
|
||||||
|
|
||||||
GameRegistry.registerTileEntity(TileLegacyMachineBase.class, "TileMachineBaseTR");
|
|
||||||
|
|
||||||
RUBBER_LOG = new BlockRubberLog();
|
RUBBER_LOG = new BlockRubberLog();
|
||||||
registerBlock(RUBBER_LOG, "rubber_log");
|
registerBlock(RUBBER_LOG, "rubber_log");
|
||||||
|
@ -373,53 +310,42 @@ public class ModBlocks {
|
||||||
|
|
||||||
RECYCLER = new BlockRecycler();
|
RECYCLER = new BlockRecycler();
|
||||||
registerBlock(RECYCLER, "recycler");
|
registerBlock(RECYCLER, "recycler");
|
||||||
GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR");
|
|
||||||
|
|
||||||
LOW_VOLTAGE_SU = new BlockLowVoltageSU();
|
LOW_VOLTAGE_SU = new BlockLowVoltageSU();
|
||||||
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
|
registerBlock(LOW_VOLTAGE_SU, "low_voltage_su");
|
||||||
GameRegistry.registerTileEntity(TileLowVoltageSU.class, "TileLowVoltageSUTR");
|
|
||||||
|
|
||||||
MEDIUM_VOLTAGE_SU = new BlockMediumVoltageSU();
|
MEDIUM_VOLTAGE_SU = new BlockMediumVoltageSU();
|
||||||
registerBlock(MEDIUM_VOLTAGE_SU, "medium_voltage_su");
|
registerBlock(MEDIUM_VOLTAGE_SU, "medium_voltage_su");
|
||||||
GameRegistry.registerTileEntity(TileMediumVoltageSU.class, "TileMediumVoltageSUTR");
|
|
||||||
|
|
||||||
HIGH_VOLTAGE_SU = new BlockHighVoltageSU();
|
HIGH_VOLTAGE_SU = new BlockHighVoltageSU();
|
||||||
registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su");
|
registerBlock(HIGH_VOLTAGE_SU, "high_voltage_su");
|
||||||
GameRegistry.registerTileEntity(TileHighVoltageSU.class, "TileHighVoltageSUTR");
|
|
||||||
|
|
||||||
LV_TRANSFORMER = new BlockLVTransformer();
|
LV_TRANSFORMER = new BlockLVTransformer();
|
||||||
registerBlock(LV_TRANSFORMER, "lv_transformer");
|
registerBlock(LV_TRANSFORMER, "lv_transformer");
|
||||||
GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformerTR");
|
|
||||||
|
|
||||||
MV_TRANSFORMER = new BlockMVTransformer();
|
MV_TRANSFORMER = new BlockMVTransformer();
|
||||||
registerBlock(MV_TRANSFORMER, "mv_transformer");
|
registerBlock(MV_TRANSFORMER, "mv_transformer");
|
||||||
GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformerTR");
|
|
||||||
|
|
||||||
HV_TRANSFORMER = new BlockHVTransformer();
|
HV_TRANSFORMER = new BlockHVTransformer();
|
||||||
registerBlock(HV_TRANSFORMER, "hv_transformer");
|
registerBlock(HV_TRANSFORMER, "hv_transformer");
|
||||||
GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformerTR");
|
|
||||||
|
|
||||||
AUTO_CRAFTING_TABLE = new BlockAutoCraftingTable();
|
AUTO_CRAFTING_TABLE = new BlockAutoCraftingTable();
|
||||||
registerBlock(AUTO_CRAFTING_TABLE, "auto_crafting_table");
|
registerBlock(AUTO_CRAFTING_TABLE, "auto_crafting_table");
|
||||||
GameRegistry.registerTileEntity(TileAutoCraftingTable.class, "TileAutoCraftingTableTR");
|
|
||||||
|
|
||||||
IRON_FURNACE = new BlockIronFurnace();
|
IRON_FURNACE = new BlockIronFurnace();
|
||||||
registerBlock(IRON_FURNACE, "iron_furnace");
|
registerBlock(IRON_FURNACE, "iron_furnace");
|
||||||
GameRegistry.registerTileEntity(TileIronFurnace.class, "TileIronFurnaceTR");
|
|
||||||
|
|
||||||
NUKE = new BlockNuke();
|
NUKE = new BlockNuke();
|
||||||
registerBlock(NUKE, "nuke");
|
registerBlock(NUKE, "nuke");
|
||||||
|
|
||||||
SCRAPBOXINATOR = new BlockScrapboxinator();
|
SCRAPBOXINATOR = new BlockScrapboxinator();
|
||||||
registerBlock(SCRAPBOXINATOR, "scrapboxinator");
|
registerBlock(SCRAPBOXINATOR, "scrapboxinator");
|
||||||
GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR");
|
|
||||||
|
|
||||||
COMPUTER_CUBE = new BlockComputerCube();
|
COMPUTER_CUBE = new BlockComputerCube();
|
||||||
registerBlock(COMPUTER_CUBE, "computer_cube");
|
registerBlock(COMPUTER_CUBE, "computer_cube");
|
||||||
|
|
||||||
PLASMA_GENERATOR = new BlockPlasmaGenerator();
|
PLASMA_GENERATOR = new BlockPlasmaGenerator();
|
||||||
registerBlock(PLASMA_GENERATOR, "plasma_generator");
|
registerBlock(PLASMA_GENERATOR, "plasma_generator");
|
||||||
GameRegistry.registerTileEntity(TilePlasmaGenerator.class, "TilePlasmalGeneratorTR");
|
|
||||||
|
|
||||||
LAMP_INCANDESCENT = new BlockLamp( 14, 4, 0.625, 0.25);
|
LAMP_INCANDESCENT = new BlockLamp( 14, 4, 0.625, 0.25);
|
||||||
registerBlock(LAMP_INCANDESCENT, "lamp_incandescent");
|
registerBlock(LAMP_INCANDESCENT, "lamp_incandescent");
|
||||||
|
@ -427,15 +353,11 @@ public class ModBlocks {
|
||||||
LAMP_LED = new BlockLamp( 15, 1, 0.0625, 0.125);
|
LAMP_LED = new BlockLamp( 15, 1, 0.0625, 0.125);
|
||||||
registerBlock(LAMP_LED, "lamp_led");
|
registerBlock(LAMP_LED, "lamp_led");
|
||||||
|
|
||||||
GameRegistry.registerTileEntity(TileLamp.class, "TileLampTR");
|
|
||||||
|
|
||||||
ALARM = new BlockAlarm();
|
ALARM = new BlockAlarm();
|
||||||
registerBlock(ALARM, "alarm");
|
registerBlock(ALARM, "alarm");
|
||||||
GameRegistry.registerTileEntity(TileAlarm.class, "TileAlarmTR");
|
|
||||||
|
|
||||||
FLUID_REPLICATOR = new BlockFluidReplicator();
|
FLUID_REPLICATOR = new BlockFluidReplicator();
|
||||||
registerBlock(FLUID_REPLICATOR, "fluid_replicator");
|
registerBlock(FLUID_REPLICATOR, "fluid_replicator");
|
||||||
GameRegistry.registerTileEntity(TileFluidReplicator.class, "TileFluidReplicatorTR");
|
|
||||||
|
|
||||||
//TODO enable when done
|
//TODO enable when done
|
||||||
// flare = new BlockFlare();
|
// flare = new BlockFlare();
|
||||||
|
|
152
src/main/java/techreborn/init/ModTileEntities.java
Normal file
152
src/main/java/techreborn/init/ModTileEntities.java
Normal file
|
@ -0,0 +1,152 @@
|
||||||
|
package techreborn.init;
|
||||||
|
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
import net.minecraft.util.datafix.FixTypes;
|
||||||
|
import net.minecraft.util.datafix.IFixableData;
|
||||||
|
import net.minecraftforge.common.util.ModFixs;
|
||||||
|
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||||
|
import reborncore.common.tile.TileLegacyMachineBase;
|
||||||
|
import techreborn.lib.ModInfo;
|
||||||
|
import techreborn.tiles.*;
|
||||||
|
import techreborn.tiles.cable.TileCable;
|
||||||
|
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
|
||||||
|
import techreborn.tiles.generator.*;
|
||||||
|
import techreborn.tiles.idsu.TileInterdimensionalSU;
|
||||||
|
import techreborn.tiles.lesu.TileLSUStorage;
|
||||||
|
import techreborn.tiles.lesu.TileLapotronicSU;
|
||||||
|
import techreborn.tiles.lighting.TileLamp;
|
||||||
|
import techreborn.tiles.multiblock.*;
|
||||||
|
import techreborn.tiles.storage.TileAdjustableSU;
|
||||||
|
import techreborn.tiles.storage.TileHighVoltageSU;
|
||||||
|
import techreborn.tiles.storage.TileLowVoltageSU;
|
||||||
|
import techreborn.tiles.storage.TileMediumVoltageSU;
|
||||||
|
import techreborn.tiles.tier0.TileIronAlloyFurnace;
|
||||||
|
import techreborn.tiles.tier0.TileIronFurnace;
|
||||||
|
import techreborn.tiles.tier1.*;
|
||||||
|
import techreborn.tiles.transformers.TileHVTransformer;
|
||||||
|
import techreborn.tiles.transformers.TileLVTransformer;
|
||||||
|
import techreborn.tiles.transformers.TileMVTransformer;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
public enum ModTileEntities {
|
||||||
|
|
||||||
|
THERMAL_GEN(TileThermalGenerator.class, "thermal_generator", "TileThermalGeneratorTR"),
|
||||||
|
QUANTUM_TANK(TileQuantumTank.class, "quantum_tank", "TileQuantumTankTR"),
|
||||||
|
QUANTUM_CHEST(TileQuantumChest.class, "quantum_chest", "TileQuantumChestTR"),
|
||||||
|
DIGITAL_CHEST(TileDigitalChest.class, "digital_chest", "TileDigitalChestTR"),
|
||||||
|
INDUSTRIAL_CENTRIFUGE(TileIndustrialCentrifuge.class, "industrial_centrifuge", "TileIndustrialCentrifugeTR"),
|
||||||
|
ROLLING_MACHINE(TileRollingMachine.class, "rolling_machine", "TileRollingMachineTR"),
|
||||||
|
INDUSTRIAL_BLAST_FURNACE(TileIndustrialBlastFurnace.class, "industrial_blast_furnace", "TileIndustrialBlastFurnaceTR"),
|
||||||
|
ALLOY_SMELTER(TileAlloySmelter.class, "alloy_smelter", "TileAlloySmalterTR"),
|
||||||
|
INDUSTRIAL_GRINDER(TileIndustrialGrinder.class, "industrial_grinder", "TileIndustrialGrinderTR"),
|
||||||
|
IMPLOSION_COMPRESSOR(TileImplosionCompressor.class, "implosion_compressor", "TileImplosionCompressorTR"),
|
||||||
|
MATTER_FABRICATOR(TileMatterFabricator.class, "matter_fabricator", "TileMatterFabricatorTR"),
|
||||||
|
CHUNK_LOADER(TileChunkLoader.class, "chunk_loader", "TileChunkLoaderTR"),
|
||||||
|
CHARGE_O_MAT(TileChargeOMat.class, "charge_o_mat", "TileChargeOMatTR"),
|
||||||
|
PLAYER_DETECTOR(TilePlayerDectector.class, "player_detector", "TilePlayerDectectorTR"),
|
||||||
|
CABLE(TileCable.class, "cable", "TileCableTR"),
|
||||||
|
MACHINE_CASINGS(TileMachineCasing.class, "machine_casing", "TileMachineCasingTR"),
|
||||||
|
DRAGON_EGG_SYPHON(TileDragonEggSyphon.class, "dragon_egg_syphon", "TileDragonEggSyphonTR"),
|
||||||
|
ASSEMBLY_MACHINE(TileAssemblingMachine.class, "assembly_machine", "TileAssemblyMachineTR"),
|
||||||
|
DIESEL_GENERATOR(TileDieselGenerator.class, "diesel_generator", "TileDieselGeneratorTR"),
|
||||||
|
INDUSTRIAL_ELECTROLYZER(TileIndustrialElectrolyzer.class, "industrial_electrolyzer", "TileIndustrialElectrolyzerTR"),
|
||||||
|
SEMI_FLUID_GENERATOR(TileSemiFluidGenerator.class, "semi_fluid_generator", "TileSemiFluidGeneratorTR"),
|
||||||
|
GAS_TURBINE(TileGasTurbine.class, "gas_turbine", "TileGasTurbineTR"),
|
||||||
|
IRON_ALLOY_FURNACE(TileIronAlloyFurnace.class, "iron_alloy_furnace", "TileIronAlloyFurnaceTR"),
|
||||||
|
CHEMICAL_REACTOR(TileChemicalReactor.class, "chemical_reactor", "TileChemicalReactorTR"),
|
||||||
|
INTERDIMENSIONAL_SU(TileInterdimensionalSU.class, "interdimensional_su", "TileInterdimensionalSUTR"),
|
||||||
|
ADJUSTABLE_SU(TileAdjustableSU.class, "adjustable_su", "TileAdjustableSUTR"),
|
||||||
|
LAPOTRONIC_SU(TileLapotronicSU.class, "lapotronic_su", "TileLapotronicSUTR"),
|
||||||
|
LSU_STORAGE(TileLSUStorage.class, "lsu_storage", "TileLSUStorageTR"),
|
||||||
|
DISTILLATION_TOWER(TileDistillationTower.class, "distillation_tower", "TileDistillationTowerTR"),
|
||||||
|
VACUUM_FREEZER(TileVacuumFreezer.class, "vacuum_freezer", "TileVacuumFreezerTR"),
|
||||||
|
FUSION_CONTROL_COMPUTER(TileFusionControlComputer.class, "fusion_control_computer", "TileFusionControlComputerTR"),
|
||||||
|
LIGHTNING_ROD(TileLightningRod.class, "lightning_rod", "TileLightningRodTR"),
|
||||||
|
INDUSTRIAL_SAWMILL(TileIndustrialSawmill.class, "industrial_sawmill", "TileIndustrialSawmillTR"),
|
||||||
|
GRINDER(TileGrinder.class, "grinder", "TileGrinderTR"),
|
||||||
|
SOLID_FUEL_GENEREATOR(TileSolidFuelGenerator.class, "solid_fuel_generator", "TileSolidFuelGeneratorTR"),
|
||||||
|
EXTRACTOR(TileExtractor.class, "extractor", "TileExtractorTR"),
|
||||||
|
COMPRESSOR(TileCompressor.class, "compressor", "TileCompressorTR"),
|
||||||
|
ELECTRIC_FURNACE(TileElectricFurnace.class, "electric_furnace", "TileElectricFurnaceTR"),
|
||||||
|
SOLAR_PANEL(TileSolarPanel.class, "solar_panel", "TileSolarPanelTR"),
|
||||||
|
CREATIVE_SOLAR_PANEL(TileCreativeSolarPanel.class, "creative_solar_panel", "TileCreativeSolarPanelTR"),
|
||||||
|
WATER_MILL(TileWaterMill.class, "water_mill", "TileWaterMillTR"),
|
||||||
|
WIND_MILL(TileWindMill.class, "wind_mill", "TileWindMillTR"),
|
||||||
|
MACHINE_BASE(TileLegacyMachineBase.class, "machine_base", "TileMachineBaseTR"),
|
||||||
|
RECYCLER(TileRecycler.class, "recycler", "TileRecyclerTR"),
|
||||||
|
LOW_VOLTAGE_SU(TileLowVoltageSU.class, "low_voltage_su", "TileLowVoltageSUTR"),
|
||||||
|
MEDIUM_VOLTAGE_SU(TileMediumVoltageSU.class, "medium_voltage_su", "TileMediumVoltageSUTR"),
|
||||||
|
HIGH_VOLTAGE_SU(TileHighVoltageSU.class, "high_voltage_su", "TileHighVoltageSUTR"),
|
||||||
|
LV_TRANSFORMER(TileLVTransformer.class, "lv_transformer", "TileLVTransformerTR"),
|
||||||
|
MV_TRANSFORMER(TileMVTransformer.class, "mv_transformer", "TileMVTransformerTR"),
|
||||||
|
HV_TRANSFORMER(TileHVTransformer.class, "hv_transformer", "TileHVTransformerTR"),
|
||||||
|
AUTO_CRAFTING_TABLE(TileAutoCraftingTable.class, "auto_crafting_table", "TileAutoCraftingTableTR"),
|
||||||
|
IRON_FURNACE(TileIronFurnace.class, "iron_furnace", "TileIronFurnaceTR"),
|
||||||
|
SCRAPBOXINATOR(TileScrapboxinator.class, "scrapboxinator", "TileScrapboxinatorTR"),
|
||||||
|
PLASMA_GENERATOR(TilePlasmaGenerator.class, "plasma_generator", "TilePlasmalGeneratorTR"),
|
||||||
|
LAMP(TileLamp.class, "lamp", "TileLampTR"),
|
||||||
|
ALARM(TileAlarm.class, "alarm", "TileAlarmTR"),
|
||||||
|
FLUID_REPLICATOR(TileFluidReplicator.class, "fluid_replicator", "TileFluidReplicatorTR");
|
||||||
|
|
||||||
|
public Class<? extends TileEntity> tileClass;
|
||||||
|
public ResourceLocation name;
|
||||||
|
public Optional<String> oldName;
|
||||||
|
|
||||||
|
ModTileEntities(Class<? extends TileEntity> tileClass, ResourceLocation name, String oldName) {
|
||||||
|
this.tileClass = tileClass;
|
||||||
|
this.name = name;
|
||||||
|
this.oldName = Optional.of(oldName);
|
||||||
|
}
|
||||||
|
|
||||||
|
ModTileEntities(Class<? extends TileEntity> tileClass, ResourceLocation name) {
|
||||||
|
this.tileClass = tileClass;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
ModTileEntities(Class<? extends TileEntity> tileClass, String name, String oldName) {
|
||||||
|
this(tileClass, new ResourceLocation(ModInfo.MOD_ID, name), oldName);
|
||||||
|
}
|
||||||
|
|
||||||
|
ModTileEntities(Class<? extends TileEntity> tileClass, String name) {
|
||||||
|
this(tileClass, new ResourceLocation(ModInfo.MOD_ID, name));
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasUpgradePath(){
|
||||||
|
return oldName.isPresent();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void init(){
|
||||||
|
Arrays.stream(ModTileEntities.values())
|
||||||
|
.forEach(modTileEntities -> GameRegistry.registerTileEntity(modTileEntities.tileClass, modTileEntities.name.toString()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Optional<ModTileEntities> getFromOldName(String name){
|
||||||
|
for(ModTileEntities entry : ModTileEntities.values()){
|
||||||
|
if(entry.oldName.isPresent() && entry.oldName.get().equalsIgnoreCase(name)){
|
||||||
|
return Optional.of(entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Optional.empty();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void initDataFixer(ModFixs dataFixes){
|
||||||
|
dataFixes.registerFix(FixTypes.BLOCK_ENTITY, new IFixableData() {
|
||||||
|
@Override
|
||||||
|
public int getFixVersion() {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
|
||||||
|
ResourceLocation tileEntityLocation = new ResourceLocation(compound.getString("id"));
|
||||||
|
Optional<ModTileEntities> tileData = getFromOldName(tileEntityLocation.getResourcePath());
|
||||||
|
tileData.ifPresent(modTileEntities -> compound.setString("id", modTileEntities.name.toString()));
|
||||||
|
return compound;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue