From 4dc241c401361d2d2b0ec4c74fe0a71e2f47dbed Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 9 Sep 2015 23:44:53 +0200 Subject: [PATCH] Added almost all of the remaining chapters. To do: Localizing! --- .../actuallyadditions/booklet/GuiBooklet.java | 4 +- .../booklet/InitBooklet.java | 19 +++++-- .../crafting/BlockCrafting.java | 4 ++ .../crafting/ItemCrafting.java | 50 +++++++++++++++++++ .../crafting/MiscCrafting.java | 5 ++ 5 files changed, 77 insertions(+), 5 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java index 5ae512e55..d46adbab5 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java @@ -363,7 +363,7 @@ public class GuiBooklet extends GuiScreen{ if(page != null) this.currentPage = page; } else{ - this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex+1, true); + this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex+1, !(this.currentIndexEntry instanceof BookletEntryAllSearch)); } } } @@ -374,7 +374,7 @@ public class GuiBooklet extends GuiScreen{ if(page != null) this.currentPage = page; } else{ - this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex-1, true); + this.openIndexEntry(this.currentIndexEntry, this.pageOpenInIndex-1, !(this.currentIndexEntry instanceof BookletEntryAllSearch)); } } } diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index c1dffdb76..ee575ffb1 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -37,17 +37,20 @@ public class InitBooklet{ public static BookletIndexEntry entryFunctionalNonRF = new BookletIndexEntry("functionalNoRF"); public static BookletIndexEntry entryFunctionalRF = new BookletIndexEntry("functionalRF"); public static BookletIndexEntry entryGeneratingRF = new BookletIndexEntry("generatingRF"); + public static BookletIndexEntry entryItemsNonRF = new BookletIndexEntry("itemsNoRF"); + public static BookletIndexEntry entryItemsRF = new BookletIndexEntry("itemsRF"); public static BookletIndexEntry entryMisc = new BookletIndexEntry("misc"); public static BookletIndexEntry allAndSearch = new BookletEntryAllSearch("allAndSearch"); static{ chapterIntro = new BookletChapter("intro", entryMisc, new PageText(1), new PageText(2), new PageCrafting(3, ItemCrafting.recipeBook)); - new BookletChapter("craftingIngs", entryMisc, new PageText(1), new PageCrafting(2, ItemCrafting.recipeCoil), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced), new PageCrafting(4, BlockCrafting.recipeCase), new PageCrafting(5, BlockCrafting.recipeStoneCase), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock), new PageCrafting(7, BlockCrafting.recipeEnderCase)); + new BookletChapter("craftingIngs", entryMisc, new PageText(1), new PageCrafting(2, ItemCrafting.recipeCoil), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced), new PageCrafting(4, BlockCrafting.recipeCase), new PageCrafting(5, BlockCrafting.recipeStoneCase), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock), new PageCrafting(7, BlockCrafting.recipeEnderCase), new PageCrafting(8, ItemCrafting.recipeRing), new PageCrafting(9, ItemCrafting.recipeKnifeHandle), new PageCrafting(10, ItemCrafting.recipeKnifeBlade), new PageCrafting(11, ItemCrafting.recipeKnife), new PageCrafting(12, ItemCrafting.recipeDough), new PageCrafting(13, ItemCrafting.recipeRiceDough)); new BookletChapter("quartz", entryMisc, new PageText(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())), new PageText(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock), new PageCrafting(4, BlockCrafting.recipeQuartzPillar), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled)); new BookletChapter("cloud", entryMisc, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud)); - new BookletChapter("foods", entryMisc, new PageCrafting(1, FoodCrafting.recipePizza), new PageFurnace(2, new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal())), new PageCrafting(3, FoodCrafting.recipeHamburger), new PageCrafting(4, FoodCrafting.recipeBigCookie), new PageCrafting(5, FoodCrafting.recipeSubSandwich), new PageCrafting(6, FoodCrafting.recipeFrenchFry), new PageCrafting(7, FoodCrafting.recipeFrenchFries), new PageCrafting(8, FoodCrafting.recipeFishNChips), new PageCrafting(9, FoodCrafting.recipeCheese), new PageCrafting(10, FoodCrafting.recipePumpkinStew), new PageCrafting(11, FoodCrafting.recipeCarrotJuice), new PageCrafting(12, FoodCrafting.recipeSpaghetti), new PageCrafting(13, FoodCrafting.recipeNoodle), new PageCrafting(14, FoodCrafting.recipeChocolate), new PageCrafting(15, FoodCrafting.recipeChocolateCake), new PageCrafting(16, FoodCrafting.recipeToast), new PageFurnace(17, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()))); new BookletChapter("coalStuff", entryMisc, new PageCrafting(1, ItemCrafting.recipeTinyCoal), new PageCrafting(2, ItemCrafting.recipeTinyChar), new PageCrafting(3, BlockCrafting.recipeBlockChar)); + new BookletChapter("lamps", entryMisc, new PageText(1), new PageCrafting(2, BlockCrafting.recipePowerer), new PageCrafting(3, BlockCrafting.recipesLamps[0]), new PageCrafting(4, BlockCrafting.recipesLamps[1]), new PageCrafting(5, BlockCrafting.recipesLamps[2]), new PageCrafting(6, BlockCrafting.recipesLamps[3]), new PageCrafting(7, BlockCrafting.recipesLamps[4]), new PageCrafting(8, BlockCrafting.recipesLamps[5]), new PageCrafting(9, BlockCrafting.recipesLamps[6]), new PageCrafting(10, BlockCrafting.recipesLamps[7]), new PageCrafting(11, BlockCrafting.recipesLamps[8]), new PageCrafting(12, BlockCrafting.recipesLamps[9]), new PageCrafting(13, BlockCrafting.recipesLamps[10]), new PageCrafting(14, BlockCrafting.recipesLamps[11]), new PageCrafting(15, BlockCrafting.recipesLamps[12]), new PageCrafting(16, BlockCrafting.recipesLamps[13]), new PageCrafting(17, BlockCrafting.recipesLamps[14]), new PageCrafting(18, BlockCrafting.recipesLamps[15])); + new BookletChapter("treasureChest", entryMisc, new PageText(1).setStack(new ItemStack(InitBlocks.blockTreasureChest))); new BookletChapter("breaker", entryFunctionalNonRF, new PageCrafting(1, BlockCrafting.recipeBreaker), new PageCrafting(2, BlockCrafting.recipePlacer), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer), new PageCrafting(4, BlockCrafting.recipeLiquidCollector)); new BookletChapter("phantomfaces", entryFunctionalNonRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipePhantomface), new PageCrafting(3, BlockCrafting.recipeLiquiface), new PageCrafting(4, BlockCrafting.recipeEnergyface), new PageCrafting(5, ItemCrafting.recipePhantomConnector), new PageCrafting(6, BlockCrafting.recipePhantomBooster)); @@ -60,7 +63,7 @@ public class InitBooklet{ new BookletChapter("compost", entryFunctionalNonRF, new PageText(1).setStack(new ItemStack(InitItems.itemFertilizer)), new PageCrafting(2, BlockCrafting.recipeCompost), new PageCrafting(3, ItemCrafting.recipeMashedFood)); new BookletChapter("crate", entryFunctionalNonRF, new PageCrafting(1, BlockCrafting.recipeCrate)); - new BookletChapter("coffeeMachine", entryFunctionalRF, new PageText(1), new PageText(2), new PageText(3), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine)); + new BookletChapter("coffeeMachine", entryFunctionalRF, new PageText(1), new PageText(2), new PageText(3), new PageCrafting(4, BlockCrafting.recipeCoffeeMachine), new PageCrafting(5, ItemCrafting.recipeCup)); new BookletChapterCrusher("crusher", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeCrusher), new PageCrafting(3, BlockCrafting.recipeDoubleCrusher)); new BookletChapterFurnace("furnaceDouble", entryFunctionalRF, new PageCrafting(1, BlockCrafting.recipeFurnace)); new BookletChapter("miner", entryFunctionalRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeMiner), new PageCrafting(3, BlockCrafting.recipeCasing)); @@ -72,5 +75,15 @@ public class InitBooklet{ new BookletChapter("solarPanel", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeSolar)); new BookletChapter("heatCollector", entryGeneratingRF, new PageText(1), new PageCrafting(2, BlockCrafting.recipeHeatCollector)); new BookletChapter("canola", entryGeneratingRF, new PageText(1), new PageText(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())), new PageCrafting(3, BlockCrafting.recipeCanolaPress), new PageCrafting(4, BlockCrafting.recipeFermentingBarrel), new PageCrafting(5, BlockCrafting.recipeOilGen)); + + new BookletChapter("wings", entryItemsNonRF, new PageText(1).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal())), new PageCrafting(2, ItemCrafting.recipeWings)); + new BookletChapter("foods", entryItemsNonRF, new PageCrafting(1, FoodCrafting.recipePizza), new PageFurnace(2, new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE_BREAD.ordinal())), new PageCrafting(3, FoodCrafting.recipeHamburger), new PageCrafting(4, FoodCrafting.recipeBigCookie), new PageCrafting(5, FoodCrafting.recipeSubSandwich), new PageCrafting(6, FoodCrafting.recipeFrenchFry), new PageCrafting(7, FoodCrafting.recipeFrenchFries), new PageCrafting(8, FoodCrafting.recipeFishNChips), new PageCrafting(9, FoodCrafting.recipeCheese), new PageCrafting(10, FoodCrafting.recipePumpkinStew), new PageCrafting(11, FoodCrafting.recipeCarrotJuice), new PageCrafting(12, FoodCrafting.recipeSpaghetti), new PageCrafting(13, FoodCrafting.recipeNoodle), new PageCrafting(14, FoodCrafting.recipeChocolate), new PageCrafting(15, FoodCrafting.recipeChocolateCake), new PageCrafting(16, FoodCrafting.recipeToast), new PageFurnace(17, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()))); + + new BookletChapter("drill", entryItemsRF, new PageText(1), new PageCrafting(2, ItemCrafting.recipeDrill), new PageCrafting(3, ItemCrafting.recipeDrillSpeedI), new PageCrafting(4, ItemCrafting.recipeDrillSpeedII), new PageCrafting(5, ItemCrafting.recipeDrillSpeedIII), new PageCrafting(6, ItemCrafting.recipeDrillFortuneI), new PageCrafting(7, ItemCrafting.recipeDrillFortuneII), new PageCrafting(8, ItemCrafting.recipeDrillSilk), new PageCrafting(9, ItemCrafting.recipeDrillThree), new PageCrafting(10, ItemCrafting.recipeDrillFive), new PageCrafting(11, ItemCrafting.recipeDrillPlacing)); + new BookletChapter("staff", entryItemsRF, new PageText(1), new PageCrafting(2, ItemCrafting.recipeStaff)); + new BookletChapter("magnetRing", entryItemsRF, new PageCrafting(1, ItemCrafting.recipeMagnetRing)); + new BookletChapter("growthRing", entryItemsRF, new PageCrafting(1, ItemCrafting.recipeGrowthRing)); + new BookletChapter("waterRemovalRing", entryItemsRF, new PageCrafting(1, ItemCrafting.recipeWaterRing)); + new BookletChapter("batteries", entryItemsRF, new PageText(1), new PageCrafting(2, ItemCrafting.recipeBattery), new PageCrafting(3, ItemCrafting.recipeBatteryDouble), new PageCrafting(4, ItemCrafting.recipeBatteryTriple), new PageCrafting(5, ItemCrafting.recipeBatteryQuadruple), new PageCrafting(6, ItemCrafting.recipeBatteryQuintuple)); } } diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index 1a9c70e41..caf56a90d 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -71,6 +71,8 @@ public class BlockCrafting{ public static IRecipe recipeCrate; public static IRecipe recipeFermentingBarrel; public static IRecipe recipeCanolaPress; + public static IRecipe[] recipesLamps = new IRecipe[BlockColoredLamp.allLampTypes.length]; + public static IRecipe recipePowerer; public static void init(){ @@ -507,12 +509,14 @@ public class BlockCrafting{ 'G', "glowstone", 'D', "dye"+BlockColoredLamp.allLampTypes[i].name, 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); + recipesLamps[i] = Util.lastIRecipe(); } GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLampPowerer, 4), "XXX", "XLX", "XXX", 'X', "dustRedstone", 'L', new ItemStack(InitBlocks.blockColoredLamp, 1, Util.WILDCARD))); + recipePowerer = Util.lastIRecipe(); } } diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 9acab369b..c8d3a864d 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -39,6 +39,33 @@ public class ItemCrafting{ public static IRecipe recipeTinyCoal; public static IRecipe recipeTinyChar; public static IRecipe recipeMashedFood; + public static IRecipe recipeDrill; + public static IRecipe recipeDrillSpeedI; + public static IRecipe recipeDrillSpeedII; + public static IRecipe recipeDrillSpeedIII; + public static IRecipe recipeDrillFortuneI; + public static IRecipe recipeDrillFortuneII; + public static IRecipe recipeDrillSilk; + public static IRecipe recipeDrillPlacing; + public static IRecipe recipeDrillThree; + public static IRecipe recipeDrillFive; + public static IRecipe recipeBattery; + public static IRecipe recipeBatteryDouble; + public static IRecipe recipeBatteryTriple; + public static IRecipe recipeBatteryQuadruple; + public static IRecipe recipeBatteryQuintuple; + public static IRecipe recipeStaff; + public static IRecipe recipeGrowthRing; + public static IRecipe recipeMagnetRing; + public static IRecipe recipeWaterRing; + public static IRecipe recipeWings; + public static IRecipe recipeCup; + public static IRecipe recipeKnifeHandle; + public static IRecipe recipeKnifeBlade; + public static IRecipe recipeKnife; + public static IRecipe recipeRing; + public static IRecipe recipeDough; + public static IRecipe recipeRiceDough; public static void init(){ @@ -79,6 +106,7 @@ public class ItemCrafting{ 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'R', "dustRedstone", 'I', "blockIron")); + recipeDrill = Util.lastIRecipe(); } //Tele Staff @@ -88,6 +116,7 @@ public class ItemCrafting{ 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()), 'B', new ItemStack(InitItems.itemBattery, 1, Util.WILDCARD))); + recipeStaff = Util.lastIRecipe(); } //Drill Speed @@ -97,18 +126,21 @@ public class ItemCrafting{ 'I', "ingotIron", 'S', Items.sugar, 'R', "dustRedstone")); + recipeDrillSpeedI = Util.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedII), "ISI", "SCS", "ISI", 'I', "ingotIron", 'S', Items.sugar, 'C', Items.cake)); + recipeDrillSpeedII = Util.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedIII), "ISI", "SFS", "ISI", 'I', "ingotIron", 'S', Items.sugar, 'F', "gemDiamond")); + recipeDrillSpeedIII = Util.lastIRecipe(); } //Drill Fortune @@ -118,12 +150,14 @@ public class ItemCrafting{ 'I', Blocks.glowstone, 'S', Items.redstone, 'R', Blocks.diamond_block)); + recipeDrillFortuneI = Util.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFortuneII), "ISI", "SRS", "ISI", 'I', Blocks.glowstone, 'S', Items.redstone, 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); + recipeDrillFortuneII = Util.lastIRecipe(); } //Drill Size @@ -133,12 +167,14 @@ public class ItemCrafting{ 'I', "ingotIron", 'D', "gemDiamond", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); + recipeDrillThree = Util.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFiveByFive), "DID", "ICI", "DID", 'I', "ingotIron", 'D', "gemDiamond", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + recipeDrillFive = Util.lastIRecipe(); } //Drill Silk Touch @@ -148,6 +184,7 @@ public class ItemCrafting{ 'D', "gemEmerald", 'S', "gemDiamond", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + recipeDrillSilk = Util.lastIRecipe(); } //Drill Placing @@ -158,6 +195,7 @@ public class ItemCrafting{ 'E', Items.ender_pearl, 'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'R', "ingotIron")); + recipeDrillPlacing = Util.lastIRecipe(); } //Battery @@ -167,6 +205,7 @@ public class ItemCrafting{ 'R', "dustRedstone", 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + recipeBattery = Util.lastIRecipe(); } //Double Battery @@ -176,6 +215,7 @@ public class ItemCrafting{ 'R', new ItemStack(InitItems.itemBattery), 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + recipeBatteryDouble = Util.lastIRecipe(); } //Magnet Ring @@ -186,6 +226,7 @@ public class ItemCrafting{ 'I', "ingotIron", 'B', new ItemStack(Items.dye, 1, 4), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); + recipeMagnetRing = Util.lastIRecipe(); } //Growth Ring @@ -195,6 +236,7 @@ public class ItemCrafting{ 'S', new ItemStack(Items.wheat_seeds), 'I', "ingotIron", 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); + recipeGrowthRing = Util.lastIRecipe(); } //Water Ring @@ -204,6 +246,7 @@ public class ItemCrafting{ 'B', new ItemStack(Items.water_bucket), 'I', "ingotIron", 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); + recipeWaterRing = Util.lastIRecipe(); } //Triple Battery @@ -213,6 +256,7 @@ public class ItemCrafting{ 'R', new ItemStack(InitItems.itemBatteryDouble), 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + recipeBatteryTriple = Util.lastIRecipe(); } //Quadruple Battery @@ -222,6 +266,7 @@ public class ItemCrafting{ 'R', new ItemStack(InitItems.itemBatteryTriple), 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + recipeBatteryQuadruple = Util.lastIRecipe(); } //Quintuple Battery @@ -231,6 +276,7 @@ public class ItemCrafting{ 'R', new ItemStack(InitItems.itemBatteryQuadruple), 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + recipeBatteryQuintuple = Util.lastIRecipe(); } //Bat Wings @@ -240,6 +286,7 @@ public class ItemCrafting{ 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), 'N', "blockDiamond", 'D', new ItemStack(Items.nether_star))); + recipeWings = Util.lastIRecipe(); } //Quartz @@ -264,6 +311,7 @@ public class ItemCrafting{ "S S", "SCS", "SSS", 'S', "stone", 'C', InitItems.itemCoffeeBean)); + recipeCup = Util.lastIRecipe(); } //Resonant Rice @@ -320,6 +368,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemKnife), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_HANDLE.ordinal()))); + recipeKnife = Util.lastIRecipe(); } //Crafter on a Stick @@ -374,6 +423,7 @@ public class ItemCrafting{ 'G', "ingotGold", 'I', "ingotIron", 'D', "dustGlowstone")); + recipeRing = Util.lastIRecipe(); if(ConfigCrafting.RING_SPEED.isEnabled()){ addRingRecipeWithStack(ThePotionRings.SPEED.craftingItem, ThePotionRings.SPEED.ordinal()); diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java index a9d543091..a2a84caa6 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java @@ -15,6 +15,7 @@ import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.metalists.TheFoods; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -28,12 +29,14 @@ public class MiscCrafting{ if(ConfigCrafting.DOUGH.isEnabled()){ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.DOUGH.ordinal()), "cropWheat", "cropWheat")); + ItemCrafting.recipeDough = Util.lastIRecipe(); } //Rice Dough if(ConfigCrafting.RICE_DOUGH.isEnabled()){ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.RICE_DOUGH.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()))); + ItemCrafting.recipeRiceDough = Util.lastIRecipe(); } //Paper Cone @@ -48,6 +51,7 @@ public class MiscCrafting{ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_HANDLE.ordinal()), "stickWood", new ItemStack(Items.leather))); + ItemCrafting.recipeKnifeHandle = Util.lastIRecipe(); } //Knife Blade @@ -56,6 +60,7 @@ public class MiscCrafting{ "K", "K", "F", 'K', "ingotIron", 'F', new ItemStack(Items.flint))); + ItemCrafting.recipeKnifeBlade = Util.lastIRecipe(); } }