From 5239b5f6ee4ba4773260c1fdc0e18401deb83790 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 31 Jan 2016 18:14:34 +0100 Subject: [PATCH] storage block recipes! --- .../storagecraft/jei/PluginStorageCraft.java | 4 ++ .../java/storagecraft/proxy/ClientProxy.java | 12 ------ .../java/storagecraft/proxy/CommonProxy.java | 42 +++++++++++++++++++ 3 files changed, 46 insertions(+), 12 deletions(-) diff --git a/src/main/java/storagecraft/jei/PluginStorageCraft.java b/src/main/java/storagecraft/jei/PluginStorageCraft.java index c591f9cc2..f427b6358 100644 --- a/src/main/java/storagecraft/jei/PluginStorageCraft.java +++ b/src/main/java/storagecraft/jei/PluginStorageCraft.java @@ -6,8 +6,11 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.IRecipeRegistry; import mezz.jei.api.JEIPlugin; +import net.minecraft.item.Item; +import storagecraft.StorageCraftBlocks; import storagecraft.StorageCraftItems; import storagecraft.storage.CellStorage; +import storagecraft.tile.TileStorage; @JEIPlugin public class PluginStorageCraft implements IModPlugin @@ -37,6 +40,7 @@ public class PluginStorageCraft implements IModPlugin registry.addRecipes(SoldererRecipeMaker.getRecipes()); jeiHelpers.getNbtIgnoreList().ignoreNbtTagNames(StorageCraftItems.STORAGE_CELL, CellStorage.NBT_ITEMS, CellStorage.NBT_STORED); + jeiHelpers.getNbtIgnoreList().ignoreNbtTagNames(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), TileStorage.NBT_STORAGE); } @Override diff --git a/src/main/java/storagecraft/proxy/ClientProxy.java b/src/main/java/storagecraft/proxy/ClientProxy.java index 7cd0735da..a669403e1 100644 --- a/src/main/java/storagecraft/proxy/ClientProxy.java +++ b/src/main/java/storagecraft/proxy/ClientProxy.java @@ -3,7 +3,6 @@ package storagecraft.proxy; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.ItemModelMesher; -import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; @@ -16,8 +15,6 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import storagecraft.StorageCraftBlocks; import storagecraft.StorageCraftItems; -import storagecraft.block.BlockBase; -import storagecraft.block.BlockMachine; import storagecraft.block.EnumControllerType; import storagecraft.block.EnumGridType; import storagecraft.block.EnumStorageType; @@ -67,13 +64,6 @@ public class ClientProxy extends CommonProxy new ResourceLocation("storagecraft:wireless_grid_disconnected") ); - ModelBakery.registerItemVariants(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), - new ResourceLocation("storagecraft:storage"), - new ResourceLocation("storagecraft:storage"), - new ResourceLocation("storagecraft:storage"), - new ResourceLocation("storagecraft:storage") - ); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(StorageCraftBlocks.CABLE), 0, TileCable.class); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(StorageCraftBlocks.CABLE), 0, new ModelResourceLocation("storagecraft:cable", "inventory")); @@ -145,7 +135,5 @@ public class ClientProxy extends CommonProxy mesher.register(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("storagecraft:storage")); mesher.register(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("storagecraft:storage")); mesher.register(Item.getItemFromBlock(StorageCraftBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("storagecraft:storage")); - - ModelLoader.setCustomStateMapper(StorageCraftBlocks.STORAGE, new StateMap.Builder().ignore(BlockMachine.CONNECTED).ignore(BlockBase.DIRECTION).build()); } } diff --git a/src/main/java/storagecraft/proxy/CommonProxy.java b/src/main/java/storagecraft/proxy/CommonProxy.java index 87d680ec7..65e13611c 100644 --- a/src/main/java/storagecraft/proxy/CommonProxy.java +++ b/src/main/java/storagecraft/proxy/CommonProxy.java @@ -14,6 +14,7 @@ import storagecraft.StorageCraftBlocks; import storagecraft.StorageCraftItems; import storagecraft.block.EnumControllerType; import storagecraft.block.EnumGridType; +import storagecraft.block.EnumStorageType; import storagecraft.gui.GuiHandler; import storagecraft.item.*; import storagecraft.network.*; @@ -337,6 +338,47 @@ public class CommonProxy 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON) ); + + // Storage Blocks + GameRegistry.addRecipe(ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, EnumStorageType.TYPE_1K.getId())), + "EPE", + "RMR", + "EEE", + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), + 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), + 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING) + ); + + GameRegistry.addRecipe(ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, EnumStorageType.TYPE_4K.getId())), + "EPE", + "RMR", + "EEE", + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), + 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), + 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING) + ); + + GameRegistry.addRecipe(ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, EnumStorageType.TYPE_16K.getId())), + "EPE", + "RMR", + "EEE", + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), + 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), + 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING) + ); + + GameRegistry.addRecipe(ItemBlockStorage.initNBT(new ItemStack(StorageCraftBlocks.STORAGE, 1, EnumStorageType.TYPE_64K.getId())), + "EPE", + "RMR", + "EEE", + 'R', new ItemStack(Items.redstone), + 'P', new ItemStack(StorageCraftItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), + 'E', new ItemStack(StorageCraftItems.QUARTZ_ENRICHED_IRON), + 'M', new ItemStack(StorageCraftBlocks.MACHINE_CASING) + ); } public void init(FMLInitializationEvent e)