Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

Fixes #988

Browse source
This commit is contained in:
Shadows_of_Fire 2018-01-15 17:15:29 -05:00
parent bf451dceb1
commit 4e30e7bb3b
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java
View file

@ -25,6 +25,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
public final class BlockCrafting{ public final class BlockCrafting{
@ -98,6 +99,22 @@ public final class BlockCrafting{
public static IRecipe recipeFarmer; public static IRecipe recipeFarmer;
public static IRecipe recipeBatteryBox; public static IRecipe recipeBatteryBox;
private static class FireworkIngredient extends Ingredient {
ItemStack firework = new ItemStack(Items.FIREWORKS);
ItemStack[] fireworks = new ItemStack[] {firework};
@Override
public ItemStack[] getMatchingStacks() {
return fireworks;
}
@Override
public boolean apply(ItemStack stack) {
return stack.getItem() == Items.FIREWORKS;
}
}
public static void init(){ public static void init(){
RecipeHandler.addShapelessOreDictRecipe(new ItemStack(InitBlocks.blockOilGenerator), new ItemStack(InitBlocks.blockOilGenerator)); RecipeHandler.addShapelessOreDictRecipe(new ItemStack(InitBlocks.blockOilGenerator), new ItemStack(InitBlocks.blockOilGenerator));
@ -141,14 +158,14 @@ public final class BlockCrafting{
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_CHAR.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_CHAR.ordinal()),
'W', "stickWood"); 'W', "stickWood");
recipesTinyTorch[1] = RecipeUtil.lastIRecipe(); recipesTinyTorch[1] = RecipeUtil.lastIRecipe();
//Firework Box //Firework Box
RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockFireworkBox), RecipeHandler.addOreDictRecipe(new ItemStack(InitBlocks.blockFireworkBox),
"GFG", "SAS", "CCC", "GFG", "SAS", "CCC",
'G', new ItemStack(Items.GUNPOWDER), 'G', new ItemStack(Items.GUNPOWDER),
'S', new ItemStack(Items.STICK), 'S', new ItemStack(Items.STICK),
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'F', new ItemStack(Items.FIREWORKS, 1, Util.WILDCARD), 'F', new FireworkIngredient(),
'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal())); 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()));
recipeFireworkBox = RecipeUtil.lastIRecipe(); recipeFireworkBox = RecipeUtil.lastIRecipe();