dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

storage block recipes!

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-01-31 18:14:34 +01:00
parent cff3538041
commit 5239b5f6ee
3 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/storagecraft/jei/PluginStorageCraft.java
View File

@@ -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

12
src/main/java/storagecraft/proxy/ClientProxy.java
View File

@@ -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());
}
}

42
src/main/java/storagecraft/proxy/CommonProxy.java
View File

@@ -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)