Remove old redundantt blocks, you should be able to safely ingore the warning when loading 1.10.2 worlds(Still have a backup).

This commit is contained in:
modmuss50 2016-11-28 13:01:30 +00:00
parent cf9f2def43
commit 1dbc56f739
2 changed files with 6 additions and 37 deletions

View file

@ -67,14 +67,11 @@ public class ModBlocks {
public static Block Idsu; public static Block Idsu;
public static Block Aesu; public static Block Aesu;
public static Block Lesu; public static Block Lesu;
public static Block Supercondensator;
public static Block LesuStorage; public static Block LesuStorage;
public static Block Distillationtower; public static Block Distillationtower;
public static Block ElectricCraftingTable; public static Block ElectricCraftingTable;
public static Block VacuumFreezer; public static Block VacuumFreezer;
public static Block PlasmaGenerator;
public static Block FusionControlComputer; public static Block FusionControlComputer;
public static Block ComputerCube;
public static Block FusionCoil; public static Block FusionCoil;
public static Block LightningRod; public static Block LightningRod;
public static Block heatGenerator; public static Block heatGenerator;
@ -97,7 +94,6 @@ public class ModBlocks {
public static Block lvt; public static Block lvt;
public static Block mvt; public static Block mvt;
public static Block hvt; public static Block hvt;
public static Block pump;
public static BlockOre ore; public static BlockOre ore;
public static BlockOre2 ore2; public static BlockOre2 ore2;
@ -279,9 +275,6 @@ public class ModBlocks {
registerBlock(Lesu, "lesu"); registerBlock(Lesu, "lesu");
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR"); GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
Supercondensator = new BlockSupercondensator(Material.ROCK);
registerBlock(Supercondensator, "supercondensator");
LesuStorage = new BlockLESUStorage(Material.ROCK); LesuStorage = new BlockLESUStorage(Material.ROCK);
registerBlock(LesuStorage, "lesustorage"); registerBlock(LesuStorage, "lesustorage");
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");
@ -304,13 +297,6 @@ public class ModBlocks {
GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR"); GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR");
Core.proxy.registerCustomBlockStateLocation(VacuumFreezer, "machines/tier2_machines/vacuum_freezer"); Core.proxy.registerCustomBlockStateLocation(VacuumFreezer, "machines/tier2_machines/vacuum_freezer");
PlasmaGenerator = new BlockPlasmaGenerator(Material.ROCK);
registerBlock(PlasmaGenerator, "plasmagenerator");
ComputerCube = new BlockComputerCube(Material.ROCK);
registerBlock(ComputerCube, "computercube");
Core.proxy.registerCustomBlockStateLocation(ComputerCube, "machines/machines/tier2_machines/computer_cube");
FusionControlComputer = new BlockFusionControlComputer(Material.ROCK); FusionControlComputer = new BlockFusionControlComputer(Material.ROCK);
registerBlock(FusionControlComputer, "fusioncontrolcomputer"); registerBlock(FusionControlComputer, "fusioncontrolcomputer");
GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR"); GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR");
@ -427,10 +413,6 @@ public class ModBlocks {
registerBlock(hvt, "hvt"); registerBlock(hvt, "hvt");
GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformer"); GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformer");
pump = new BlockPump();
registerBlock(pump, "pump");
GameRegistry.registerTileEntity(TilePump.class, "TilePump");
ironFurnace = new BlockIronFurnace(); ironFurnace = new BlockIronFurnace();
registerBlock(ironFurnace, "ironfurnace"); registerBlock(ironFurnace, "ironfurnace");
GameRegistry.registerTileEntity(TileIronFurnace.class, "TileIronFurnaceTR"); GameRegistry.registerTileEntity(TileIronFurnace.class, "TileIronFurnaceTR");

View file

@ -788,11 +788,6 @@ public class ModRecipes {
.addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 15), "AAA", "AMA", "AAA", 'A', "ingotAluminium", .addShapedOreRecipe(new ItemStack(ModItems.parts, 1, 15), "AAA", "AMA", "AAA", 'A', "ingotAluminium",
'M', new ItemStack(ModItems.parts, 1, 13)); 'M', new ItemStack(ModItems.parts, 1, 13));
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.Supercondensator), "EOE", "SAS", "EOE", 'E',
"circuitMaster", 'O', ModItems.lapotronicOrb, 'S',
ItemParts.getPartByName("superconductor"), 'A',
BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1));
CraftingHelper CraftingHelper
.addShapedOreRecipe(ItemParts.getPartByName("diamondSawBlade"), "DSD", "S S", "DSD", 'S', "plateSteel", .addShapedOreRecipe(ItemParts.getPartByName("diamondSawBlade"), "DSD", "S S", "DSD", 'S', "plateSteel",
'D', "dustDiamond"); 'D', "dustDiamond");
@ -854,14 +849,14 @@ public class ModRecipes {
"ingotCopper", 'H', ItemParts.getPartByName("NaKCoolantTriple")); "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(ModBlocks.ComputerCube)); 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', 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', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.FusionControlComputer), "CCC", "PTP", "CCC", 'P',
new ItemStack(ModBlocks.ComputerCube), 'T', new ItemStack(ModBlocks.FusionCoil), 'C', new ItemStack(ModItems.energyCrystal), 'T', new ItemStack(ModBlocks.FusionCoil), 'C',
"circuitMaster"); "circuitMaster");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LightningRod), "CAC", "ACA", "CAC", 'A', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.LightningRod), "CAC", "ACA", "CAC", 'A',
@ -2006,13 +2001,9 @@ public class ModRecipes {
'S', ItemParts.getPartByName("diamondSawBlade"), 'C', 'S', ItemParts.getPartByName("diamondSawBlade"), 'C',
"machineBlockAdvanced"); "machineBlockAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.ComputerCube), "DME", "MAM", "EMD", 'E',
"circuitMaster", 'D', ItemParts.getPartByName("dataOrb"), 'M',
ItemParts.getPartByName("computerMonitor"), 'A',
"machineBlockAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.chargeBench), "ETE", "COC", "EAD", 'E', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.chargeBench), "ETE", "COC", "EAD", 'E',
"circuitMaster", 'T', ModBlocks.ComputerCube, 'C', Blocks.CHEST, 'O', "circuitMaster", 'T', ModItems.energyCrystal, 'C', Blocks.CHEST, 'O',
ModItems.lapotronicOrb, 'A', "machineBlockAdvanced"); ModItems.lapotronicOrb, 'A', "machineBlockAdvanced");
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MatterFabricator), "ETE", "AOA", "ETE", 'E', CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.MatterFabricator), "ETE", "AOA", "ETE", 'E',
@ -2070,9 +2061,9 @@ public class ModRecipes {
// 'L', "lapotronCrystal", // 'L', "lapotronCrystal",
// 'T', TechRebornAPI.recipeCompact.getItem("teleporter")); // '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", // "plateIridium", 'C', "circuitBasic",
'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.Extractor); // 'B', ModItems.lithiumBattery, 'S', ModBlocks.Supercondensator, 'T', ModBlocks.Extractor);
CraftingHelper CraftingHelper
.addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "SCS", "BEB", "SCS", 'S', "plateSteel", 'C', .addShapedOreRecipe(new ItemStack(ModBlocks.centrifuge), "SCS", "BEB", "SCS", 'S', "plateSteel", 'C',
@ -2163,10 +2154,6 @@ public class ModRecipes {
ModBlocks.Compressor); ModBlocks.Compressor);
} }
CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.PlasmaGenerator), "PPP", "PTP", "CGC", 'P',
ItemPlates.getPlateByName("tungstensteel"), 'T', getOre("hvTransformer"),
'G', "ic2Generator", 'C',
"circuitMaster");
// Smetling // Smetling
CraftingHelper CraftingHelper