Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9

This commit is contained in:
modmuss50 2016-03-16 17:09:34 +00:00
commit e319398bc9
17 changed files with 272 additions and 11 deletions

View file

@ -16,6 +16,9 @@ import techreborn.blocks.iron_machines.BlockIronFurnace;
import techreborn.blocks.machine.*;
import techreborn.blocks.storage.*;
import techreborn.blocks.tier1.*;
import techreborn.blocks.transformers.BlockHVTransformer;
import techreborn.blocks.transformers.BlockLVTransformer;
import techreborn.blocks.transformers.BlockMVTransformer;
import techreborn.itemblocks.*;
import techreborn.tiles.*;
import techreborn.tiles.fusionReactor.TileEntityFusionController;
@ -27,6 +30,9 @@ import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.teir1.*;
import techreborn.tiles.transformers.TileHVTransformer;
import techreborn.tiles.transformers.TileLVTransformer;
import techreborn.tiles.transformers.TileMVTransformer;
public class ModBlocks {
@ -84,6 +90,9 @@ public class ModBlocks {
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 BlockOre ore;
public static BlockOre2 ore2;
@ -338,6 +347,18 @@ public class ModBlocks {
mfsu = new BlockMFSU();
GameRegistry.registerBlock(mfsu, "mfsu");
GameRegistry.registerTileEntity(TileMFSU.class, "TileMFSU");
lvt = new BlockLVTransformer();
GameRegistry.registerBlock(lvt, "lvt");
GameRegistry.registerTileEntity(TileLVTransformer.class, "TileLVTransformer");
mvt = new BlockMVTransformer();
GameRegistry.registerBlock(mvt, "mvt");
GameRegistry.registerTileEntity(TileMVTransformer.class, "TileMVTransformer");
hvt = new BlockHVTransformer();
GameRegistry.registerBlock(hvt, "hvt");
GameRegistry.registerTileEntity(TileHVTransformer.class, "TileHVTransformer");
ironFurnace = new BlockIronFurnace();
GameRegistry.registerBlock(ironFurnace, "ironfurnace");

View file

@ -57,9 +57,9 @@ public class RecipeCompact implements IRecipeCompact {
recipes.put("pump", ItemParts.getPartByName("pump"));
recipes.put("teleporter", ItemParts.getPartByName("teleporter"));
recipes.put("advancedAlloy", ItemParts.getPartByName("advancedAlloy"));
recipes.put("lvTransformer", ItemParts.getPartByName("lvTransformer"));
recipes.put("mvTransformer", ItemParts.getPartByName("mvTransformer"));
recipes.put("hvTransformer", ItemParts.getPartByName("hvTransformer"));
recipes.put("lvTransformer", new ItemStack(ModBlocks.lvt));
recipes.put("mvTransformer", new ItemStack(ModBlocks.mvt));
recipes.put("hvTransformer", new ItemStack(ModBlocks.hvt));
recipes.put("windMill", new ItemStack(ModBlocks.windMill));
recipes.put("energyCrystal", new ItemStack(ModItems.energyCrystal));
// recipes.put("lapotronCrystal", new ItemStack(ModItems.lapotronCrystal));