Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-17 03:04:31 +02:00
Code Issues Projects Releases Wiki Activity

Moved recipe getting to recipeUtil

Browse source
This commit is contained in:
Ellpeck 2016-03-18 18:41:37 +01:00
parent dc8ad581ad
commit 54c0884b03
10 changed files with 219 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting;
import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.Util;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
@ -90,7 +91,7 @@ public class BlockCrafting{
'G', new ItemStack(Items.gunpowder), 'G', new ItemStack(Items.gunpowder),
'S', new ItemStack(Items.stick), 'S', new ItemStack(Items.stick),
'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal())));
recipeFireworkBox = Util.GetRecipes.lastIRecipe(); recipeFireworkBox = RecipeUtil.lastIRecipe();
} }
//Miner //Miner
@ -101,7 +102,7 @@ public class BlockCrafting{
'I', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'I', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'C', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()), 'C', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()),
'D', new ItemStack(InitItems.itemDrill, 1, Util.WILDCARD))); 'D', new ItemStack(InitItems.itemDrill, 1, Util.WILDCARD)));
recipeMiner = Util.GetRecipes.lastIRecipe(); recipeMiner = RecipeUtil.lastIRecipe();
} }
//Quartz //Quartz
@ -166,7 +167,7 @@ public class BlockCrafting{
'R', "dustRedstone", 'R', "dustRedstone",
'I', "ingotIron", 'I', "ingotIron",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal())));
recipeAtomicReconstructor = Util.GetRecipes.lastIRecipe(); recipeAtomicReconstructor = RecipeUtil.lastIRecipe();
} }
//Laser Relay //Laser Relay
@ -177,7 +178,7 @@ public class BlockCrafting{
'O', new ItemStack(Blocks.obsidian), 'O', new ItemStack(Blocks.obsidian),
'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeLaserRelay = Util.GetRecipes.lastIRecipe(); recipeLaserRelay = RecipeUtil.lastIRecipe();
} }
//Ranged Collector //Ranged Collector
@ -188,7 +189,7 @@ public class BlockCrafting{
'H', new ItemStack(Blocks.hopper), 'H', new ItemStack(Blocks.hopper),
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'A', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()))); 'A', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal())));
recipeRangedCollector = Util.GetRecipes.lastIRecipe(); recipeRangedCollector = RecipeUtil.lastIRecipe();
} }
//Directional Breaker //Directional Breaker
@ -197,7 +198,7 @@ public class BlockCrafting{
"BBB", " C ", "BBB", " C ",
'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()),
'B', new ItemStack(InitBlocks.blockBreaker))); 'B', new ItemStack(InitBlocks.blockBreaker)));
recipeDirectionalBreaker = Util.GetRecipes.lastIRecipe(); recipeDirectionalBreaker = RecipeUtil.lastIRecipe();
} }
//Smiley Cloud //Smiley Cloud
@ -206,7 +207,7 @@ public class BlockCrafting{
" W ", "WXW", " W ", " W ", "WXW", " W ",
'W', new ItemStack(Blocks.wool, 1, Util.WILDCARD), 'W', new ItemStack(Blocks.wool, 1, Util.WILDCARD),
'X', new ItemStack(InitItems.itemSolidifiedExperience))); 'X', new ItemStack(InitItems.itemSolidifiedExperience)));
recipeSmileyCloud = Util.GetRecipes.lastIRecipe(); recipeSmileyCloud = RecipeUtil.lastIRecipe();
} }
//Compost //Compost
@ -215,7 +216,7 @@ public class BlockCrafting{
"W W", "W W", "WCW", "W W", "W W", "WCW",
'W', "plankWood", 'W', "plankWood",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()))); 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal())));
recipeCompost = Util.GetRecipes.lastIRecipe(); recipeCompost = RecipeUtil.lastIRecipe();
} }
//XP Solidifier //XP Solidifier
@ -225,14 +226,14 @@ public class BlockCrafting{
'X', new ItemStack(InitItems.itemSolidifiedExperience), 'X', new ItemStack(InitItems.itemSolidifiedExperience),
'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeSolidifier = Util.GetRecipes.lastIRecipe(); recipeSolidifier = RecipeUtil.lastIRecipe();
} }
//Charcoal Block //Charcoal Block
GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()), GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()),
"CCC", "CCC", "CCC", "CCC", "CCC", "CCC",
'C', new ItemStack(Items.coal, 1, 1)); 'C', new ItemStack(Items.coal, 1, 1));
recipeBlockChar = Util.GetRecipes.lastIRecipe(); recipeBlockChar = RecipeUtil.lastIRecipe();
GameRegistry.addShapelessRecipe(new ItemStack(Items.coal, 9, 1), GameRegistry.addShapelessRecipe(new ItemStack(Items.coal, 9, 1),
new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal())); new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()));
@ -243,7 +244,7 @@ public class BlockCrafting{
'W', "plankWood", 'W', "plankWood",
'R', "logWood", 'R', "logWood",
'S', "stickWood")); 'S', "stickWood"));
recipeCase = Util.GetRecipes.lastIRecipe(); recipeCase = RecipeUtil.lastIRecipe();
} }
//Iron Casing //Iron Casing
@ -253,7 +254,7 @@ public class BlockCrafting{
'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
'W', "ingotIron", 'W', "ingotIron",
'S', "stickWood")); 'S', "stickWood"));
recipeIronCase = Util.GetRecipes.lastIRecipe(); recipeIronCase = RecipeUtil.lastIRecipe();
} }
//Ender Casing //Ender Casing
@ -263,7 +264,7 @@ public class BlockCrafting{
'W', new ItemStack(Items.ender_pearl), 'W', new ItemStack(Items.ender_pearl),
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()), 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()),
'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()))); 'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal())));
recipeEnderCase = Util.GetRecipes.lastIRecipe(); recipeEnderCase = RecipeUtil.lastIRecipe();
} }
//Phantom Booster //Phantom Booster
@ -273,7 +274,7 @@ public class BlockCrafting{
'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
recipePhantomBooster = Util.GetRecipes.lastIRecipe(); recipePhantomBooster = RecipeUtil.lastIRecipe();
} }
//Coffee Machine //Coffee Machine
@ -284,7 +285,7 @@ public class BlockCrafting{
'C', InitItems.itemCoffeeBean, 'C', InitItems.itemCoffeeBean,
'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); 'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal())));
recipeCoffeeMachine = Util.GetRecipes.lastIRecipe(); recipeCoffeeMachine = RecipeUtil.lastIRecipe();
} }
//Energizer //Energizer
@ -294,7 +295,7 @@ public class BlockCrafting{
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal())));
recipeEnergizer = Util.GetRecipes.lastIRecipe(); recipeEnergizer = RecipeUtil.lastIRecipe();
} }
//Enervator //Enervator
@ -304,7 +305,7 @@ public class BlockCrafting{
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal())));
recipeEnervator = Util.GetRecipes.lastIRecipe(); recipeEnervator = RecipeUtil.lastIRecipe();
} }
//Lava Factory //Lava Factory
@ -315,7 +316,7 @@ public class BlockCrafting{
'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()),
'L', Items.lava_bucket)); 'L', Items.lava_bucket));
recipeLavaFactory = Util.GetRecipes.lastIRecipe(); recipeLavaFactory = RecipeUtil.lastIRecipe();
} }
//Casing //Casing
@ -324,7 +325,7 @@ public class BlockCrafting{
"ICI", "ICI",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()))); 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal())));
recipeCasing = Util.GetRecipes.lastIRecipe(); recipeCasing = RecipeUtil.lastIRecipe();
} }
//Canola Press //Canola Press
@ -335,7 +336,7 @@ public class BlockCrafting{
'H', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'H', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
recipeCanolaPress = Util.GetRecipes.lastIRecipe(); recipeCanolaPress = RecipeUtil.lastIRecipe();
} }
//Fermenting Barrel //Fermenting Barrel
@ -346,7 +347,7 @@ public class BlockCrafting{
'H', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'H', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
recipeFermentingBarrel = Util.GetRecipes.lastIRecipe(); recipeFermentingBarrel = RecipeUtil.lastIRecipe();
} }
//Phantomface //Phantomface
@ -357,7 +358,7 @@ public class BlockCrafting{
'C', Blocks.chest, 'C', Blocks.chest,
'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()))); 'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal())));
recipePhantomface = Util.GetRecipes.lastIRecipe(); recipePhantomface = RecipeUtil.lastIRecipe();
} }
//Phantom Placer //Phantom Placer
@ -365,7 +366,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockPhantomPlacer), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockPhantomPlacer),
InitBlocks.blockPlacer, InitBlocks.blockPlacer,
InitBlocks.blockPhantomface)); InitBlocks.blockPhantomface));
recipePhantomPlacer = Util.GetRecipes.lastIRecipe(); recipePhantomPlacer = RecipeUtil.lastIRecipe();
} }
//Phantom Breaker //Phantom Breaker
@ -373,7 +374,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockPhantomBreaker), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockPhantomBreaker),
InitBlocks.blockBreaker, InitBlocks.blockBreaker,
InitBlocks.blockPhantomface)); InitBlocks.blockPhantomface));
recipePhantomBreaker = Util.GetRecipes.lastIRecipe(); recipePhantomBreaker = RecipeUtil.lastIRecipe();
} }
//Phantom Energyface //Phantom Energyface
@ -382,7 +383,7 @@ public class BlockCrafting{
" R ", "RFR", " R ", " R ", "RFR", " R ",
'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'F', InitBlocks.blockPhantomface)); 'F', InitBlocks.blockPhantomface));
recipeEnergyface = Util.GetRecipes.lastIRecipe(); recipeEnergyface = RecipeUtil.lastIRecipe();
} }
//Phantom Liquiface //Phantom Liquiface
@ -391,7 +392,7 @@ public class BlockCrafting{
"RFR", "RFR",
'R', Items.bucket, 'R', Items.bucket,
'F', InitBlocks.blockPhantomface)); 'F', InitBlocks.blockPhantomface));
recipeLiquiface = Util.GetRecipes.lastIRecipe(); recipeLiquiface = RecipeUtil.lastIRecipe();
} }
//Liquid Placer //Liquid Placer
@ -400,7 +401,7 @@ public class BlockCrafting{
"RFR", "RFR",
'R', Items.bucket, 'R', Items.bucket,
'F', InitBlocks.blockPlacer)); 'F', InitBlocks.blockPlacer));
recipeLiquidPlacer = Util.GetRecipes.lastIRecipe(); recipeLiquidPlacer = RecipeUtil.lastIRecipe();
} }
//Liquid Breaker //Liquid Breaker
@ -409,7 +410,7 @@ public class BlockCrafting{
"RFR", "RFR",
'R', Items.bucket, 'R', Items.bucket,
'F', InitBlocks.blockBreaker)); 'F', InitBlocks.blockBreaker));
recipeLiquidCollector = Util.GetRecipes.lastIRecipe(); recipeLiquidCollector = RecipeUtil.lastIRecipe();
} }
//Oil Generator //Oil Generator
@ -419,7 +420,7 @@ public class BlockCrafting{
'C', "cobblestone", 'C', "cobblestone",
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); 'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
recipeOilGen = Util.GetRecipes.lastIRecipe(); recipeOilGen = RecipeUtil.lastIRecipe();
} }
//Coal Generator //Coal Generator
@ -429,7 +430,7 @@ public class BlockCrafting{
'C', "cobblestone", 'C', "cobblestone",
'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'R', new ItemStack(Items.coal, 1, Util.WILDCARD))); 'R', new ItemStack(Items.coal, 1, Util.WILDCARD)));
recipeCoalGen = Util.GetRecipes.lastIRecipe(); recipeCoalGen = RecipeUtil.lastIRecipe();
} }
//Leaf Generator //Leaf Generator
@ -441,14 +442,14 @@ public class BlockCrafting{
'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'L', "treeLeaves", 'L', "treeLeaves",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeLeafGen = Util.GetRecipes.lastIRecipe(); recipeLeafGen = RecipeUtil.lastIRecipe();
} }
//Enderpearl Block //Enderpearl Block
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()),
"EE", "EE", "EE", "EE",
'E', Items.ender_pearl)); 'E', Items.ender_pearl));
recipeEnderPearlBlock = Util.GetRecipes.lastIRecipe(); recipeEnderPearlBlock = RecipeUtil.lastIRecipe();
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.ender_pearl, 4), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.ender_pearl, 4),
new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()))); new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal())));
@ -456,7 +457,7 @@ public class BlockCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()),
"QQ", "QQ", "QQ", "QQ",
'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
recipeQuartzBlock = Util.GetRecipes.lastIRecipe(); recipeQuartzBlock = RecipeUtil.lastIRecipe();
//Fishing Net //Fishing Net
if(ConfigCrafting.FISHING_NET.isEnabled()){ if(ConfigCrafting.FISHING_NET.isEnabled()){
@ -464,7 +465,7 @@ public class BlockCrafting{
"SSS", "SDS", "SSS", "SSS", "SDS", "SSS",
'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'S', Items.string)); 'S', Items.string));
recipeFisher = Util.GetRecipes.lastIRecipe(); recipeFisher = RecipeUtil.lastIRecipe();
} }
//Repairer //Repairer
@ -475,7 +476,7 @@ public class BlockCrafting{
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
recipeRepairer = Util.GetRecipes.lastIRecipe(); recipeRepairer = RecipeUtil.lastIRecipe();
} }
//Solar Panel //Solar Panel
@ -487,7 +488,7 @@ public class BlockCrafting{
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'B', new ItemStack(Blocks.iron_bars))); 'B', new ItemStack(Blocks.iron_bars)));
recipeSolar = Util.GetRecipes.lastIRecipe(); recipeSolar = RecipeUtil.lastIRecipe();
} }
//Heat Collector //Heat Collector
@ -500,20 +501,20 @@ public class BlockCrafting{
'L', new ItemStack(Items.lava_bucket), 'L', new ItemStack(Items.lava_bucket),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'B', new ItemStack(Blocks.iron_bars))); 'B', new ItemStack(Blocks.iron_bars)));
recipeHeatCollector = Util.GetRecipes.lastIRecipe(); recipeHeatCollector = RecipeUtil.lastIRecipe();
} }
//Quartz Pillar //Quartz Pillar
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_PILLAR.ordinal()), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_PILLAR.ordinal()),
"Q", "Q", "Q", "Q",
'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
recipeQuartzPillar = Util.GetRecipes.lastIRecipe(); recipeQuartzPillar = RecipeUtil.lastIRecipe();
//Chiseled Quartz //Chiseled Quartz
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 2, TheMiscBlocks.QUARTZ_CHISELED.ordinal()), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 2, TheMiscBlocks.QUARTZ_CHISELED.ordinal()),
"Q", "Q", "Q", "Q",
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()))); 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal())));
recipeQuartzChiseled = Util.GetRecipes.lastIRecipe(); recipeQuartzChiseled = RecipeUtil.lastIRecipe();
//Inputter //Inputter
if(ConfigCrafting.INPUTTER.isEnabled()){ if(ConfigCrafting.INPUTTER.isEnabled()){
@ -522,14 +523,14 @@ public class BlockCrafting{
'W', "plankWood", 'W', "plankWood",
'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
'H', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); 'H', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal())));
recipeESD = Util.GetRecipes.lastIRecipe(); recipeESD = RecipeUtil.lastIRecipe();
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockInputterAdvanced), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockInputterAdvanced),
InitBlocks.blockInputter, InitBlocks.blockInputter,
new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()))); new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal())));
recipeAdvancedESD = Util.GetRecipes.lastIRecipe(); recipeAdvancedESD = RecipeUtil.lastIRecipe();
} }
//Crusher //Crusher
@ -542,7 +543,7 @@ public class BlockCrafting{
'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'P', new ItemStack(Blocks.piston), 'P', new ItemStack(Blocks.piston),
'F', new ItemStack(Items.flint))); 'F', new ItemStack(Items.flint)));
recipeCrusher = Util.GetRecipes.lastIRecipe(); recipeCrusher = RecipeUtil.lastIRecipe();
} }
//Double Crusher //Double Crusher
@ -554,7 +555,7 @@ public class BlockCrafting{
'R', InitBlocks.blockGrinder, 'R', InitBlocks.blockGrinder,
'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'P', new ItemStack(Blocks.piston))); 'P', new ItemStack(Blocks.piston)));
recipeDoubleCrusher = Util.GetRecipes.lastIRecipe(); recipeDoubleCrusher = RecipeUtil.lastIRecipe();
} }
//Double Furnace //Double Furnace
@ -566,7 +567,7 @@ public class BlockCrafting{
'R', new ItemStack(Blocks.furnace), 'R', new ItemStack(Blocks.furnace),
'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()),
'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); 'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal())));
recipeFurnace = Util.GetRecipes.lastIRecipe(); recipeFurnace = RecipeUtil.lastIRecipe();
} }
//Feeder //Feeder
@ -577,7 +578,7 @@ public class BlockCrafting{
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'C', new ItemStack(Items.golden_carrot), 'C', new ItemStack(Items.golden_carrot),
'H', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()))); 'H', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal())));
recipeFeeder = Util.GetRecipes.lastIRecipe(); recipeFeeder = RecipeUtil.lastIRecipe();
} }
//Giant Chest //Giant Chest
@ -587,7 +588,7 @@ public class BlockCrafting{
'C', new ItemStack(Blocks.chest), 'C', new ItemStack(Blocks.chest),
'D', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), 'D', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
'W', "plankWood")); 'W', "plankWood"));
recipeCrate = Util.GetRecipes.lastIRecipe(); recipeCrate = RecipeUtil.lastIRecipe();
} }
//Greenhouse Glass //Greenhouse Glass
@ -597,7 +598,7 @@ public class BlockCrafting{
'G', "blockGlass", 'G', "blockGlass",
'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()), 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()),
'S', "treeSapling")); 'S', "treeSapling"));
recipeGlass = Util.GetRecipes.lastIRecipe(); recipeGlass = RecipeUtil.lastIRecipe();
} }
//Placer //Placer
@ -607,7 +608,7 @@ public class BlockCrafting{
'C', "cobblestone", 'C', "cobblestone",
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()))); 'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal())));
recipePlacer = Util.GetRecipes.lastIRecipe(); recipePlacer = RecipeUtil.lastIRecipe();
} }
//Breaker //Breaker
@ -617,7 +618,7 @@ public class BlockCrafting{
'C', "cobblestone", 'C', "cobblestone",
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()))); 'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal())));
recipeBreaker = Util.GetRecipes.lastIRecipe(); recipeBreaker = RecipeUtil.lastIRecipe();
} }
//Dropper //Dropper
@ -628,7 +629,7 @@ public class BlockCrafting{
'C', "cobblestone", 'C', "cobblestone",
'D', Blocks.dropper, 'D', Blocks.dropper,
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeDropper = Util.GetRecipes.lastIRecipe(); recipeDropper = RecipeUtil.lastIRecipe();
} }
if(ConfigCrafting.LAMPS.isEnabled()){ if(ConfigCrafting.LAMPS.isEnabled()){
@ -639,14 +640,14 @@ public class BlockCrafting{
'G', "glowstone", 'G', "glowstone",
'D', "dye"+BlockColoredLamp.allLampTypes[i].name, 'D', "dye"+BlockColoredLamp.allLampTypes[i].name,
'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
recipesLamps[i] = Util.GetRecipes.lastIRecipe(); recipesLamps[i] = RecipeUtil.lastIRecipe();
} }
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLampPowerer, 4), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLampPowerer, 4),
"XXX", "XLX", "XXX", "XXX", "XLX", "XXX",
'X', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'X', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'L', new ItemStack(InitBlocks.blockColoredLamp, 1, Util.WILDCARD))); 'L', new ItemStack(InitBlocks.blockColoredLamp, 1, Util.WILDCARD)));
recipePowerer = Util.GetRecipes.lastIRecipe(); recipePowerer = RecipeUtil.lastIRecipe();
} }
} }

44
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/CrusherCrafting.java
View file

@ -17,7 +17,7 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods;
import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry;
import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
import net.minecraft.init.Blocks; 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;
@ -35,38 +35,38 @@ public class CrusherCrafting{
ModUtil.LOGGER.info("Initializing Crusher Recipes..."); ModUtil.LOGGER.info("Initializing Crusher Recipes...");
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.bone), new ItemStack(Items.dye, 6, 15)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.bone), new ItemStack(Items.dye, 6, 15));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.reeds), new ItemStack(Items.sugar, 3)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.reeds), new ItemStack(Items.sugar, 3));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.yellow_flower), new ItemStack(Items.dye, 3, 11)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.yellow_flower), new ItemStack(Items.dye, 3, 11));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 0), new ItemStack(Items.dye, 3, 1)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 0), new ItemStack(Items.dye, 3, 1));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Items.dye, 3, 12)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Items.dye, 3, 12));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 2), new ItemStack(Items.dye, 3, 13)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 2), new ItemStack(Items.dye, 3, 13));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 3), new ItemStack(Items.dye, 3, 7)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 3), new ItemStack(Items.dye, 3, 7));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 4), new ItemStack(Items.dye, 3, 1)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 4), new ItemStack(Items.dye, 3, 1));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 5), new ItemStack(Items.dye, 3, 14)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 5), new ItemStack(Items.dye, 3, 14));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 6), new ItemStack(Items.dye, 3, 7)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 6), new ItemStack(Items.dye, 3, 7));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 7), new ItemStack(Items.dye, 3, 9)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 7), new ItemStack(Items.dye, 3, 9));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 8), new ItemStack(Items.dye, 3, 7)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.red_flower, 1, 8), new ItemStack(Items.dye, 3, 7));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 0), new ItemStack(Items.dye, 4, 11)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 0), new ItemStack(Items.dye, 4, 11));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 1), new ItemStack(Items.dye, 4, 13)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 1), new ItemStack(Items.dye, 4, 13));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 4), new ItemStack(Items.dye, 4, 1)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 4), new ItemStack(Items.dye, 4, 1));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 5), new ItemStack(Items.dye, 4, 9)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.double_plant, 1, 5), new ItemStack(Items.dye, 4, 9));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe("oreRedstone", "dustRedstone", 10); ActuallyAdditionsAPI.addCrusherRecipe("oreRedstone", "dustRedstone", 10);
ActuallyAdditionsAPI.addCrusherRecipe("oreLapis", "gemLapis", 12); ActuallyAdditionsAPI.addCrusherRecipe("oreLapis", "gemLapis", 12);
@ -79,23 +79,23 @@ public class CrusherCrafting{
ActuallyAdditionsAPI.addCrusherRecipe("stone", "cobblestone", 1); ActuallyAdditionsAPI.addCrusherRecipe("stone", "cobblestone", 1);
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(Items.sugar, 2)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(Items.sugar, 2));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4)); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4));
miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); miscRecipes.add(RecipeUtil.lastCrusherRecipe());
ActuallyAdditionsAPI.addCrusherRecipe("oreNickel", "dustNickel", 2, "dustPlatinum", 1, 15); ActuallyAdditionsAPI.addCrusherRecipe("oreNickel", "dustNickel", 2, "dustPlatinum", 1, 15);
ActuallyAdditionsAPI.addCrusherRecipe("oreIron", "dustIron", 2, "dustGold", 1, 20); ActuallyAdditionsAPI.addCrusherRecipe("oreIron", "dustIron", 2, "dustGold", 1, 20);
if(ConfigCrafting.HORSE_ARMORS.isEnabled()){ if(ConfigCrafting.HORSE_ARMORS.isEnabled()){
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.iron_horse_armor), "dustIron", 8); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.iron_horse_armor), "dustIron", 8);
recipeIronHorseArmor = Util.GetRecipes.lastCrusherRecipe(); recipeIronHorseArmor = RecipeUtil.lastCrusherRecipe();
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.golden_horse_armor), "dustGold", 8); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.golden_horse_armor), "dustGold", 8);
recipeGoldHorseArmor = Util.GetRecipes.lastCrusherRecipe(); recipeGoldHorseArmor = RecipeUtil.lastCrusherRecipe();
ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.diamond_horse_armor), "dustDiamond", 8); ActuallyAdditionsAPI.addCrusherRecipe(new ItemStack(Items.diamond_horse_armor), "dustDiamond", 8);
recipeDiamondHorseArmor = Util.GetRecipes.lastCrusherRecipe(); recipeDiamondHorseArmor = RecipeUtil.lastCrusherRecipe();
} }
CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("oreNether", 6)); CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("oreNether", 6));

35
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/FoodCrafting.java
View file

@ -14,6 +14,7 @@ import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting;
import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.Util;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
@ -57,7 +58,7 @@ public class FoodCrafting{
if(ConfigCrafting.BACON.isEnabled()){ if(ConfigCrafting.BACON.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 3, TheFoods.BACON.ordinal()), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 3, TheFoods.BACON.ordinal()),
knifeStack.copy(), new ItemStack(Items.cooked_porkchop))); knifeStack.copy(), new ItemStack(Items.cooked_porkchop)));
recipeBacon = Util.GetRecipes.lastIRecipe(); recipeBacon = RecipeUtil.lastIRecipe();
} }
//Baguette //Baguette
@ -76,7 +77,7 @@ public class FoodCrafting{
'F', new ItemStack(Items.cooked_fish, 1, Util.WILDCARD), 'F', new ItemStack(Items.cooked_fish, 1, Util.WILDCARD),
'K', knifeStack.copy(), 'K', knifeStack.copy(),
'H', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()))); 'H', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal())));
recipePizza = Util.GetRecipes.lastIRecipe(); recipePizza = RecipeUtil.lastIRecipe();
} }
//Hamburger //Hamburger
@ -87,7 +88,7 @@ public class FoodCrafting{
'C', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()), 'C', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()),
'K', knifeStack.copy(), 'K', knifeStack.copy(),
'B', new ItemStack(Items.cooked_beef))); 'B', new ItemStack(Items.cooked_beef)));
recipeHamburger = Util.GetRecipes.lastIRecipe(); recipeHamburger = RecipeUtil.lastIRecipe();
} }
//Big Cookie //Big Cookie
@ -96,7 +97,7 @@ public class FoodCrafting{
"DCD", "CDC", "DCD", "DCD", "CDC", "DCD",
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()),
'C', new ItemStack(Items.dye, 1, 3))); 'C', new ItemStack(Items.dye, 1, 3)));
recipeBigCookie = Util.GetRecipes.lastIRecipe(); recipeBigCookie = RecipeUtil.lastIRecipe();
} }
//Sub Sandwich //Sub Sandwich
@ -108,7 +109,7 @@ public class FoodCrafting{
'F', new ItemStack(Items.cooked_fish, 1, Util.WILDCARD), 'F', new ItemStack(Items.cooked_fish, 1, Util.WILDCARD),
'B', new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()), 'B', new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()),
'K', knifeStack.copy())); 'K', knifeStack.copy()));
recipeSubSandwich = Util.GetRecipes.lastIRecipe(); recipeSubSandwich = RecipeUtil.lastIRecipe();
} }
//French Fry //French Fry
@ -116,7 +117,7 @@ public class FoodCrafting{
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 2, TheFoods.FRENCH_FRY.ordinal()), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 2, TheFoods.FRENCH_FRY.ordinal()),
new ItemStack(Items.baked_potato), new ItemStack(Items.baked_potato),
knifeStack.copy())); knifeStack.copy()));
recipeFrenchFry = Util.GetRecipes.lastIRecipe(); recipeFrenchFry = RecipeUtil.lastIRecipe();
} }
//French Fries //French Fries
@ -125,7 +126,7 @@ public class FoodCrafting{
"FFF", " P ", "FFF", " P ",
'P', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()), 'P', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()),
'F', new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal()))); 'F', new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal())));
recipeFrenchFries = Util.GetRecipes.lastIRecipe(); recipeFrenchFries = RecipeUtil.lastIRecipe();
} }
//Fish N Chips //Fish N Chips
@ -135,14 +136,14 @@ public class FoodCrafting{
'I', new ItemStack(Items.cooked_fish, 1, Util.WILDCARD), 'I', new ItemStack(Items.cooked_fish, 1, Util.WILDCARD),
'P', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()), 'P', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()),
'F', new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal()))); 'F', new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal())));
recipeFishNChips = Util.GetRecipes.lastIRecipe(); recipeFishNChips = RecipeUtil.lastIRecipe();
} }
//Cheese //Cheese
if(ConfigCrafting.CHEESE.isEnabled()){ if(ConfigCrafting.CHEESE.isEnabled()){
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()), GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()),
new ItemStack(Items.milk_bucket)); new ItemStack(Items.milk_bucket));
recipeCheese = Util.GetRecipes.lastIRecipe(); recipeCheese = RecipeUtil.lastIRecipe();
} }
//Pumpkin Stew //Pumpkin Stew
@ -151,14 +152,14 @@ public class FoodCrafting{
"P", "B", "P", "B",
'P', new ItemStack(Blocks.pumpkin), 'P', new ItemStack(Blocks.pumpkin),
'B', new ItemStack(Items.bowl)); 'B', new ItemStack(Items.bowl));
recipePumpkinStew = Util.GetRecipes.lastIRecipe(); recipePumpkinStew = RecipeUtil.lastIRecipe();
} }
//Carrot Juice //Carrot Juice
if(ConfigCrafting.CARROT_JUICE.isEnabled()){ if(ConfigCrafting.CARROT_JUICE.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CARROT_JUICE.ordinal()), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CARROT_JUICE.ordinal()),
new ItemStack(Items.glass_bottle), "cropCarrot", knifeStack.copy())); new ItemStack(Items.glass_bottle), "cropCarrot", knifeStack.copy()));
recipeCarrotJuice = Util.GetRecipes.lastIRecipe(); recipeCarrotJuice = RecipeUtil.lastIRecipe();
} }
//Spaghetti //Spaghetti
@ -167,14 +168,14 @@ public class FoodCrafting{
"NNN", " B ", "NNN", " B ",
'N', new ItemStack(InitItems.itemFoods, 1, TheFoods.NOODLE.ordinal()), 'N', new ItemStack(InitItems.itemFoods, 1, TheFoods.NOODLE.ordinal()),
'B', new ItemStack(Items.bowl))); 'B', new ItemStack(Items.bowl)));
recipeSpaghetti = Util.GetRecipes.lastIRecipe(); recipeSpaghetti = RecipeUtil.lastIRecipe();
} }
//Noodle //Noodle
if(ConfigCrafting.NOODLE.isEnabled()){ if(ConfigCrafting.NOODLE.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.NOODLE.ordinal()), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.NOODLE.ordinal()),
"cropWheat", knifeStack.copy())); "cropWheat", knifeStack.copy()));
recipeNoodle = Util.GetRecipes.lastIRecipe(); recipeNoodle = RecipeUtil.lastIRecipe();
} }
//Chocolate //Chocolate
@ -183,7 +184,7 @@ public class FoodCrafting{
"C C", "CMC", "C C", "C C", "CMC", "C C",
'C', new ItemStack(Items.dye, 1, 3), 'C', new ItemStack(Items.dye, 1, 3),
'M', new ItemStack(Items.milk_bucket)); 'M', new ItemStack(Items.milk_bucket));
recipeChocolate = Util.GetRecipes.lastIRecipe(); recipeChocolate = RecipeUtil.lastIRecipe();
} }
//Chocolate Cake //Chocolate Cake
@ -195,20 +196,20 @@ public class FoodCrafting{
'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()),
'S', new ItemStack(Items.sugar), 'S', new ItemStack(Items.sugar),
'C', new ItemStack(Items.dye, 1, 3))); 'C', new ItemStack(Items.dye, 1, 3)));
recipeChocolateCake = Util.GetRecipes.lastIRecipe(); recipeChocolateCake = RecipeUtil.lastIRecipe();
} }
//Toast //Toast
if(ConfigCrafting.TOAST.isEnabled()){ if(ConfigCrafting.TOAST.isEnabled()){
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 2, TheFoods.TOAST.ordinal()), GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 2, TheFoods.TOAST.ordinal()),
new ItemStack(Items.bread)); new ItemStack(Items.bread));
recipeToast = Util.GetRecipes.lastIRecipe(); recipeToast = RecipeUtil.lastIRecipe();
} }
//Chocolate Toast //Chocolate Toast
if(ConfigCrafting.CHOCOLATE_TOAST.isEnabled()){ if(ConfigCrafting.CHOCOLATE_TOAST.isEnabled()){
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE_TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE.ordinal())); GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE_TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.TOAST.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.CHOCOLATE.ordinal()));
recipeChocolateToast = Util.GetRecipes.lastIRecipe(); recipeChocolateToast = RecipeUtil.lastIRecipe();
} }
} }

83
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java
View file

@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting;
import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.items.metalists.*; import de.ellpeck.actuallyadditions.mod.items.metalists.*;
import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.Util;
import net.minecraft.block.IGrowable; import net.minecraft.block.IGrowable;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
@ -87,15 +88,15 @@ public class ItemCrafting{
"GGG", "GBG", "GGG", "GGG", "GBG", "GGG",
'G', "blockGlass", 'G', "blockGlass",
'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); 'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
recipeLens = Util.GetRecipes.lastIRecipe(); recipeLens = RecipeUtil.lastIRecipe();
//Black Dye //Black Dye
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.BLACK_DYE.ordinal()), new ItemStack(InitBlocks.blockBlackLotus))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.BLACK_DYE.ordinal()), new ItemStack(InitBlocks.blockBlackLotus)));
recipeBlackDye = Util.GetRecipes.lastIRecipe(); recipeBlackDye = RecipeUtil.lastIRecipe();
//Booklet //Booklet
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemBooklet), new ItemStack(InitItems.itemCanolaSeed), new ItemStack(Items.paper))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemBooklet), new ItemStack(InitItems.itemCanolaSeed), new ItemStack(Items.paper)));
recipeBook = Util.GetRecipes.lastIRecipe(); recipeBook = RecipeUtil.lastIRecipe();
//Clearing NBT Storage //Clearing NBT Storage
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemLaserWrench), new ItemStack(InitItems.itemLaserWrench)); GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemLaserWrench), new ItemStack(InitItems.itemLaserWrench));
@ -107,7 +108,7 @@ public class ItemCrafting{
"CWC", "WWW", "CWC", "CWC", "WWW", "CWC",
'C', new ItemStack(Blocks.chest), 'C', new ItemStack(Blocks.chest),
'W', "plankWood")); 'W', "plankWood"));
recipeChestToCrateUpgrade = Util.GetRecipes.lastIRecipe(); recipeChestToCrateUpgrade = RecipeUtil.lastIRecipe();
} }
//Crate Keeper //Crate Keeper
@ -117,7 +118,7 @@ public class ItemCrafting{
'I', "ingotIron", 'I', "ingotIron",
'W', "plankWood", 'W', "plankWood",
'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
recipeCrateKeeper = Util.GetRecipes.lastIRecipe(); recipeCrateKeeper = RecipeUtil.lastIRecipe();
} }
//Laser Wrench //Laser Wrench
@ -126,7 +127,7 @@ public class ItemCrafting{
"C ", " S ", " S", "C ", " S ", " S",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); 'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal())));
recipeLaserWrench = Util.GetRecipes.lastIRecipe(); recipeLaserWrench = RecipeUtil.lastIRecipe();
} }
//Rice Stuff //Rice Stuff
@ -152,7 +153,7 @@ public class ItemCrafting{
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'P', new ItemStack(Blocks.piston), 'P', new ItemStack(Blocks.piston),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeLeafBlower = Util.GetRecipes.lastIRecipe(); recipeLeafBlower = RecipeUtil.lastIRecipe();
} }
//Drill //Drill
@ -164,12 +165,12 @@ public class ItemCrafting{
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()),
'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()))); 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal())));
recipeDrill = Util.GetRecipes.lastIRecipe(); recipeDrill = RecipeUtil.lastIRecipe();
for(int i = 0; i < 16; i++){ for(int i = 0; i < 16; i++){
if(i != TheColoredLampColors.LIGHT_BLUE.ordinal()){ if(i != TheColoredLampColors.LIGHT_BLUE.ordinal()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemDrill, 1, i), lightBlueDrill.copy(), "dye"+TheColoredLampColors.values()[i].name)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemDrill, 1, i), lightBlueDrill.copy(), "dye"+TheColoredLampColors.values()[i].name));
recipesDrillColoring.add(Util.GetRecipes.lastIRecipe()); recipesDrillColoring.add(RecipeUtil.lastIRecipe());
} }
} }
} }
@ -181,7 +182,7 @@ public class ItemCrafting{
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()))); 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal())));
recipeDrillCore = Util.GetRecipes.lastIRecipe(); recipeDrillCore = RecipeUtil.lastIRecipe();
} }
//Tele Staff //Tele Staff
@ -192,7 +193,7 @@ public class ItemCrafting{
'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()),
'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()), 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()),
'B', new ItemStack(InitItems.itemBattery, 1, Util.WILDCARD))); 'B', new ItemStack(InitItems.itemBattery, 1, Util.WILDCARD)));
recipeStaff = Util.GetRecipes.lastIRecipe(); recipeStaff = RecipeUtil.lastIRecipe();
} }
//Drill Speed //Drill Speed
@ -202,21 +203,21 @@ public class ItemCrafting{
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'S', Items.sugar, 'S', Items.sugar,
'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()))); 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal())));
recipeDrillSpeedI = Util.GetRecipes.lastIRecipe(); recipeDrillSpeedI = RecipeUtil.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedII), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedII),
"ISI", "SCS", "ISI", "ISI", "SCS", "ISI",
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'S', Items.sugar, 'S', Items.sugar,
'C', Items.cake)); 'C', Items.cake));
recipeDrillSpeedII = Util.GetRecipes.lastIRecipe(); recipeDrillSpeedII = RecipeUtil.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedIII), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedIII),
"ISI", "SFS", "ISI", "ISI", "SFS", "ISI",
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'S', Items.sugar, 'S', Items.sugar,
'F', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()))); 'F', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal())));
recipeDrillSpeedIII = Util.GetRecipes.lastIRecipe(); recipeDrillSpeedIII = RecipeUtil.lastIRecipe();
} }
//Drill Fortune //Drill Fortune
@ -226,14 +227,14 @@ public class ItemCrafting{
'I', Blocks.glowstone, 'I', Blocks.glowstone,
'S', Items.redstone, 'S', Items.redstone,
'R', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()))); 'R', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal())));
recipeDrillFortuneI = Util.GetRecipes.lastIRecipe(); recipeDrillFortuneI = RecipeUtil.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFortuneII), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFortuneII),
"ISI", "SRS", "ISI", "ISI", "SRS", "ISI",
'I', Blocks.glowstone, 'I', Blocks.glowstone,
'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
recipeDrillFortuneII = Util.GetRecipes.lastIRecipe(); recipeDrillFortuneII = RecipeUtil.lastIRecipe();
} }
//Drill Size //Drill Size
@ -243,14 +244,14 @@ public class ItemCrafting{
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal())));
recipeDrillThree = Util.GetRecipes.lastIRecipe(); recipeDrillThree = RecipeUtil.lastIRecipe();
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFiveByFive), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFiveByFive),
"DID", "ICI", "DID", "DID", "ICI", "DID",
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeDrillFive = Util.GetRecipes.lastIRecipe(); recipeDrillFive = RecipeUtil.lastIRecipe();
} }
//Drill Silk Touch //Drill Silk Touch
@ -260,7 +261,7 @@ public class ItemCrafting{
'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()),
'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeDrillSilk = Util.GetRecipes.lastIRecipe(); recipeDrillSilk = RecipeUtil.lastIRecipe();
} }
//Drill Placing //Drill Placing
@ -271,7 +272,7 @@ public class ItemCrafting{
'E', Items.paper, 'E', Items.paper,
'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal())));
recipeDrillPlacing = Util.GetRecipes.lastIRecipe(); recipeDrillPlacing = RecipeUtil.lastIRecipe();
} }
//Battery //Battery
@ -281,7 +282,7 @@ public class ItemCrafting{
'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()),
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBattery = Util.GetRecipes.lastIRecipe(); recipeBattery = RecipeUtil.lastIRecipe();
} }
//Double Battery //Double Battery
@ -291,7 +292,7 @@ public class ItemCrafting{
'R', new ItemStack(InitItems.itemBattery), 'R', new ItemStack(InitItems.itemBattery),
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBatteryDouble = Util.GetRecipes.lastIRecipe(); recipeBatteryDouble = RecipeUtil.lastIRecipe();
} }
//Magnet Ring //Magnet Ring
@ -302,7 +303,7 @@ public class ItemCrafting{
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'B', new ItemStack(Items.dye, 1, 4), 'B', new ItemStack(Items.dye, 1, 4),
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())));
recipeMagnetRing = Util.GetRecipes.lastIRecipe(); recipeMagnetRing = RecipeUtil.lastIRecipe();
} }
//Growth Ring //Growth Ring
@ -312,7 +313,7 @@ public class ItemCrafting{
'S', new ItemStack(Items.wheat_seeds), 'S', new ItemStack(Items.wheat_seeds),
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())));
recipeGrowthRing = Util.GetRecipes.lastIRecipe(); recipeGrowthRing = RecipeUtil.lastIRecipe();
} }
//Water Ring //Water Ring
@ -322,7 +323,7 @@ public class ItemCrafting{
'B', new ItemStack(Items.water_bucket), 'B', new ItemStack(Items.water_bucket),
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())));
recipeWaterRing = Util.GetRecipes.lastIRecipe(); recipeWaterRing = RecipeUtil.lastIRecipe();
} }
//Triple Battery //Triple Battery
@ -332,7 +333,7 @@ public class ItemCrafting{
'R', new ItemStack(InitItems.itemBatteryDouble), 'R', new ItemStack(InitItems.itemBatteryDouble),
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBatteryTriple = Util.GetRecipes.lastIRecipe(); recipeBatteryTriple = RecipeUtil.lastIRecipe();
} }
//Quadruple Battery //Quadruple Battery
@ -342,7 +343,7 @@ public class ItemCrafting{
'R', new ItemStack(InitItems.itemBatteryTriple), 'R', new ItemStack(InitItems.itemBatteryTriple),
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBatteryQuadruple = Util.GetRecipes.lastIRecipe(); recipeBatteryQuadruple = RecipeUtil.lastIRecipe();
} }
//Quintuple Battery //Quintuple Battery
@ -352,7 +353,7 @@ public class ItemCrafting{
'R', new ItemStack(InitItems.itemBatteryQuadruple), 'R', new ItemStack(InitItems.itemBatteryQuadruple),
'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeBatteryQuintuple = Util.GetRecipes.lastIRecipe(); recipeBatteryQuintuple = RecipeUtil.lastIRecipe();
} }
//Bat Wings //Bat Wings
@ -362,7 +363,7 @@ public class ItemCrafting{
'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()),
'N', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'N', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'D', new ItemStack(Items.nether_star))); 'D', new ItemStack(Items.nether_star)));
recipeWings = Util.GetRecipes.lastIRecipe(); recipeWings = RecipeUtil.lastIRecipe();
} }
//Quartz //Quartz
@ -378,7 +379,7 @@ public class ItemCrafting{
" R ", "RIR", " R ", " R ", "RIR", " R ",
'I', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), 'I', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()))); 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal())));
recipeCoil = Util.GetRecipes.lastIRecipe(); recipeCoil = RecipeUtil.lastIRecipe();
} }
//Cup //Cup
@ -387,7 +388,7 @@ public class ItemCrafting{
"S S", "SCS", "SSS", "S S", "SCS", "SSS",
'S', "stone", 'S', "stone",
'C', InitItems.itemCoffeeBean)); 'C', InitItems.itemCoffeeBean));
recipeCup = Util.GetRecipes.lastIRecipe(); recipeCup = RecipeUtil.lastIRecipe();
} }
//Resonant Rice //Resonant Rice
@ -402,7 +403,7 @@ public class ItemCrafting{
" G ", "GCG", " G ", " G ", "GCG", " G ",
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
'G', "ingotGold")); 'G', "ingotGold"));
recipeCoilAdvanced = Util.GetRecipes.lastIRecipe(); recipeCoilAdvanced = RecipeUtil.lastIRecipe();
} }
//Advanced Leaf Blower //Advanced Leaf Blower
@ -413,7 +414,7 @@ public class ItemCrafting{
'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()),
'P', new ItemStack(Blocks.piston), 'P', new ItemStack(Blocks.piston),
'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
recipeLeafBlowerAdvanced = Util.GetRecipes.lastIRecipe(); recipeLeafBlowerAdvanced = RecipeUtil.lastIRecipe();
} }
//Phantom Connector //Phantom Connector
@ -423,7 +424,7 @@ public class ItemCrafting{
'Y', Items.ender_eye, 'Y', Items.ender_eye,
'E', Items.ender_pearl, 'E', Items.ender_pearl,
'S', "stickWood")); 'S', "stickWood"));
recipePhantomConnector = Util.GetRecipes.lastIRecipe(); recipePhantomConnector = RecipeUtil.lastIRecipe();
} }
//Quartz //Quartz
@ -435,7 +436,7 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemKnife), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemKnife),
new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()),
new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_HANDLE.ordinal()))); new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_HANDLE.ordinal())));
recipeKnife = Util.GetRecipes.lastIRecipe(); recipeKnife = RecipeUtil.lastIRecipe();
} }
//Crafter on a Stick //Crafter on a Stick
@ -448,10 +449,10 @@ public class ItemCrafting{
//Tiny Coal //Tiny Coal
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_COAL.ordinal()), GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_COAL.ordinal()),
new ItemStack(Items.coal)); new ItemStack(Items.coal));
recipeTinyCoal = Util.GetRecipes.lastIRecipe(); recipeTinyCoal = RecipeUtil.lastIRecipe();
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_CHAR.ordinal()), GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_CHAR.ordinal()),
new ItemStack(Items.coal, 1, 1)); new ItemStack(Items.coal, 1, 1));
recipeTinyChar = Util.GetRecipes.lastIRecipe(); recipeTinyChar = RecipeUtil.lastIRecipe();
//Rice Seeds //Rice Seeds
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemRiceSeed), GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemRiceSeed),
@ -490,7 +491,7 @@ public class ItemCrafting{
'G', "ingotGold", 'G', "ingotGold",
'I', "ingotIron", 'I', "ingotIron",
'D', "dustGlowstone")); 'D', "dustGlowstone"));
recipeRing = Util.GetRecipes.lastIRecipe(); recipeRing = RecipeUtil.lastIRecipe();
if(ConfigCrafting.RING_SPEED.isEnabled()){ if(ConfigCrafting.RING_SPEED.isEnabled()){
addRingRecipeWithStack(ThePotionRings.SPEED.craftingItem, ThePotionRings.SPEED.ordinal()); addRingRecipeWithStack(ThePotionRings.SPEED.craftingItem, ThePotionRings.SPEED.ordinal());
@ -526,9 +527,9 @@ public class ItemCrafting{
public static void addRingRecipeWithStack(ItemStack mainStack, int meta){ public static void addRingRecipeWithStack(ItemStack mainStack, int meta){
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRing, 1, meta), mainStack, mainStack, mainStack, mainStack, new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), new ItemStack(Items.nether_wart), new ItemStack(Items.potionitem), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal())); GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRing, 1, meta), mainStack, mainStack, mainStack, mainStack, new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), new ItemStack(Items.nether_wart), new ItemStack(Items.potionitem), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()));
recipesPotionRings.add(Util.GetRecipes.lastIRecipe()); recipesPotionRings.add(RecipeUtil.lastIRecipe());
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRingAdvanced, 1, meta), new ItemStack(InitItems.itemPotionRing, 1, meta), new ItemStack(Items.nether_star), new ItemStack(Items.nether_star)); GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRingAdvanced, 1, meta), new ItemStack(InitItems.itemPotionRing, 1, meta), new ItemStack(Items.nether_star), new ItemStack(Items.nether_star));
recipesPotionRings.add(Util.GetRecipes.lastIRecipe()); recipesPotionRings.add(RecipeUtil.lastIRecipe());
} }
public static void initMashedFoodRecipes(){ public static void initMashedFoodRecipes(){
@ -538,7 +539,7 @@ public class ItemCrafting{
if(!isBlacklisted(item)){ if(!isBlacklisted(item)){
ItemStack ingredient = new ItemStack(item, 1, Util.WILDCARD); ItemStack ingredient = new ItemStack(item, 1, Util.WILDCARD);
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.MASHED_FOOD.ordinal()), ingredient, ingredient, ingredient, ingredient, new ItemStack(InitItems.itemKnife, 1, Util.WILDCARD)); GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.MASHED_FOOD.ordinal()), ingredient, ingredient, ingredient, ingredient, new ItemStack(InitItems.itemKnife, 1, Util.WILDCARD));
recipesMashedFood.add(Util.GetRecipes.lastIRecipe()); recipesMashedFood.add(RecipeUtil.lastIRecipe());
} }
} }
} }

14
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java
View file

@ -16,7 +16,7 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
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;
@ -36,23 +36,23 @@ public class MiscCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCrystal, 1, i), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCrystal, 1, i),
"XXX", "XXX", "XXX", "XXX", "XXX", "XXX",
'X', new ItemStack(InitItems.itemCrystal, 1, i))); 'X', new ItemStack(InitItems.itemCrystal, 1, i)));
recipesCrystalBlocks[i] = Util.GetRecipes.lastIRecipe(); recipesCrystalBlocks[i] = RecipeUtil.lastIRecipe();
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemCrystal, 9, i), new ItemStack(InitBlocks.blockCrystal, 1, i))); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemCrystal, 9, i), new ItemStack(InitBlocks.blockCrystal, 1, i)));
recipesCrystals[i] = Util.GetRecipes.lastIRecipe(); recipesCrystals[i] = RecipeUtil.lastIRecipe();
} }
//Dough //Dough
if(ConfigCrafting.DOUGH.isEnabled()){ if(ConfigCrafting.DOUGH.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.DOUGH.ordinal()), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.DOUGH.ordinal()),
"cropWheat", "cropWheat")); "cropWheat", "cropWheat"));
ItemCrafting.recipeDough = Util.GetRecipes.lastIRecipe(); ItemCrafting.recipeDough = RecipeUtil.lastIRecipe();
} }
//Rice Dough //Rice Dough
if(ConfigCrafting.RICE_DOUGH.isEnabled()){ if(ConfigCrafting.RICE_DOUGH.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.RICE_DOUGH.ordinal()), 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()))); 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.GetRecipes.lastIRecipe(); ItemCrafting.recipeRiceDough = RecipeUtil.lastIRecipe();
} }
//Paper Cone //Paper Cone
@ -67,7 +67,7 @@ public class MiscCrafting{
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_HANDLE.ordinal()), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_HANDLE.ordinal()),
"stickWood", "stickWood",
new ItemStack(Items.leather))); new ItemStack(Items.leather)));
ItemCrafting.recipeKnifeHandle = Util.GetRecipes.lastIRecipe(); ItemCrafting.recipeKnifeHandle = RecipeUtil.lastIRecipe();
} }
//Knife Blade //Knife Blade
@ -76,7 +76,7 @@ public class MiscCrafting{
"K", "K", "F", "K", "K", "F",
'K', "ingotIron", 'K', "ingotIron",
'F', new ItemStack(Items.flint))); 'F', new ItemStack(Items.flint)));
ItemCrafting.recipeKnifeBlade = Util.GetRecipes.lastIRecipe(); ItemCrafting.recipeKnifeBlade = RecipeUtil.lastIRecipe();
} }
} }

30
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ToolCrafting.java
View file

@ -14,7 +14,7 @@ import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting;
import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -61,56 +61,56 @@ public class ToolCrafting{
new ItemStack(Items.wooden_shovel), new ItemStack(Items.wooden_shovel),
new ItemStack(Items.wooden_sword), new ItemStack(Items.wooden_sword),
new ItemStack(Items.wooden_hoe))); new ItemStack(Items.wooden_hoe)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.stonePaxel), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.stonePaxel),
new ItemStack(Items.stone_axe), new ItemStack(Items.stone_axe),
new ItemStack(Items.stone_pickaxe), new ItemStack(Items.stone_pickaxe),
new ItemStack(Items.stone_shovel), new ItemStack(Items.stone_shovel),
new ItemStack(Items.stone_sword), new ItemStack(Items.stone_sword),
new ItemStack(Items.stone_hoe))); new ItemStack(Items.stone_hoe)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.ironPaxel), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.ironPaxel),
new ItemStack(Items.iron_axe), new ItemStack(Items.iron_axe),
new ItemStack(Items.iron_pickaxe), new ItemStack(Items.iron_pickaxe),
new ItemStack(Items.iron_shovel), new ItemStack(Items.iron_shovel),
new ItemStack(Items.iron_sword), new ItemStack(Items.iron_sword),
new ItemStack(Items.iron_hoe))); new ItemStack(Items.iron_hoe)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.goldPaxel), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.goldPaxel),
new ItemStack(Items.golden_axe), new ItemStack(Items.golden_axe),
new ItemStack(Items.golden_pickaxe), new ItemStack(Items.golden_pickaxe),
new ItemStack(Items.golden_shovel), new ItemStack(Items.golden_shovel),
new ItemStack(Items.golden_sword), new ItemStack(Items.golden_sword),
new ItemStack(Items.golden_hoe))); new ItemStack(Items.golden_hoe)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.diamondPaxel), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.diamondPaxel),
new ItemStack(Items.diamond_axe), new ItemStack(Items.diamond_axe),
new ItemStack(Items.diamond_pickaxe), new ItemStack(Items.diamond_pickaxe),
new ItemStack(Items.diamond_shovel), new ItemStack(Items.diamond_shovel),
new ItemStack(Items.diamond_sword), new ItemStack(Items.diamond_sword),
new ItemStack(Items.diamond_hoe))); new ItemStack(Items.diamond_hoe)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.emeraldPaxel), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.emeraldPaxel),
new ItemStack(InitItems.itemAxeEmerald), new ItemStack(InitItems.itemAxeEmerald),
new ItemStack(InitItems.itemPickaxeEmerald), new ItemStack(InitItems.itemPickaxeEmerald),
new ItemStack(InitItems.itemSwordEmerald), new ItemStack(InitItems.itemSwordEmerald),
new ItemStack(InitItems.itemShovelEmerald), new ItemStack(InitItems.itemShovelEmerald),
new ItemStack(InitItems.itemHoeEmerald))); new ItemStack(InitItems.itemHoeEmerald)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.obsidianPaxel), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.obsidianPaxel),
new ItemStack(InitItems.itemAxeObsidian), new ItemStack(InitItems.itemAxeObsidian),
new ItemStack(InitItems.itemPickaxeObsidian), new ItemStack(InitItems.itemPickaxeObsidian),
new ItemStack(InitItems.itemSwordObsidian), new ItemStack(InitItems.itemSwordObsidian),
new ItemStack(InitItems.itemShovelObsidian), new ItemStack(InitItems.itemShovelObsidian),
new ItemStack(InitItems.itemHoeObsidian))); new ItemStack(InitItems.itemHoeObsidian)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.quartzPaxel), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.quartzPaxel),
new ItemStack(InitItems.itemAxeQuartz), new ItemStack(InitItems.itemAxeQuartz),
new ItemStack(InitItems.itemPickaxeQuartz), new ItemStack(InitItems.itemPickaxeQuartz),
new ItemStack(InitItems.itemSwordQuartz), new ItemStack(InitItems.itemSwordQuartz),
new ItemStack(InitItems.itemShovelQuartz), new ItemStack(InitItems.itemShovelQuartz),
new ItemStack(InitItems.itemHoeQuartz))); new ItemStack(InitItems.itemHoeQuartz)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalRed), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalRed),
new ItemStack(InitItems.itemAxeCrystalRed), new ItemStack(InitItems.itemAxeCrystalRed),
@ -118,42 +118,42 @@ public class ToolCrafting{
new ItemStack(InitItems.itemSwordCrystalRed), new ItemStack(InitItems.itemSwordCrystalRed),
new ItemStack(InitItems.itemShovelCrystalRed), new ItemStack(InitItems.itemShovelCrystalRed),
new ItemStack(InitItems.itemHoeCrystalRed))); new ItemStack(InitItems.itemHoeCrystalRed)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalGreen), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalGreen),
new ItemStack(InitItems.itemAxeCrystalGreen), new ItemStack(InitItems.itemAxeCrystalGreen),
new ItemStack(InitItems.itemPickaxeCrystalGreen), new ItemStack(InitItems.itemPickaxeCrystalGreen),
new ItemStack(InitItems.itemSwordCrystalGreen), new ItemStack(InitItems.itemSwordCrystalGreen),
new ItemStack(InitItems.itemShovelCrystalGreen), new ItemStack(InitItems.itemShovelCrystalGreen),
new ItemStack(InitItems.itemHoeCrystalGreen))); new ItemStack(InitItems.itemHoeCrystalGreen)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalBlue), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalBlue),
new ItemStack(InitItems.itemAxeCrystalBlue), new ItemStack(InitItems.itemAxeCrystalBlue),
new ItemStack(InitItems.itemPickaxeCrystalBlue), new ItemStack(InitItems.itemPickaxeCrystalBlue),
new ItemStack(InitItems.itemSwordCrystalBlue), new ItemStack(InitItems.itemSwordCrystalBlue),
new ItemStack(InitItems.itemShovelCrystalBlue), new ItemStack(InitItems.itemShovelCrystalBlue),
new ItemStack(InitItems.itemHoeCrystalBlue))); new ItemStack(InitItems.itemHoeCrystalBlue)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalLightBlue), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalLightBlue),
new ItemStack(InitItems.itemAxeCrystalLightBlue), new ItemStack(InitItems.itemAxeCrystalLightBlue),
new ItemStack(InitItems.itemPickaxeCrystalLightBlue), new ItemStack(InitItems.itemPickaxeCrystalLightBlue),
new ItemStack(InitItems.itemSwordCrystalLightBlue), new ItemStack(InitItems.itemSwordCrystalLightBlue),
new ItemStack(InitItems.itemShovelCrystalLightBlue), new ItemStack(InitItems.itemShovelCrystalLightBlue),
new ItemStack(InitItems.itemHoeCrystalLightBlue))); new ItemStack(InitItems.itemHoeCrystalLightBlue)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalBlack), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalBlack),
new ItemStack(InitItems.itemAxeCrystalBlack), new ItemStack(InitItems.itemAxeCrystalBlack),
new ItemStack(InitItems.itemPickaxeCrystalBlack), new ItemStack(InitItems.itemPickaxeCrystalBlack),
new ItemStack(InitItems.itemSwordCrystalBlack), new ItemStack(InitItems.itemSwordCrystalBlack),
new ItemStack(InitItems.itemShovelCrystalBlack), new ItemStack(InitItems.itemShovelCrystalBlack),
new ItemStack(InitItems.itemHoeCrystalBlack))); new ItemStack(InitItems.itemHoeCrystalBlack)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalWhite), GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemPaxelCrystalWhite),
new ItemStack(InitItems.itemAxeCrystalWhite), new ItemStack(InitItems.itemAxeCrystalWhite),
new ItemStack(InitItems.itemPickaxeCrystalWhite), new ItemStack(InitItems.itemPickaxeCrystalWhite),
new ItemStack(InitItems.itemSwordCrystalWhite), new ItemStack(InitItems.itemSwordCrystalWhite),
new ItemStack(InitItems.itemShovelCrystalWhite), new ItemStack(InitItems.itemShovelCrystalWhite),
new ItemStack(InitItems.itemHoeCrystalWhite))); new ItemStack(InitItems.itemHoeCrystalWhite)));
recipesPaxels.add(Util.GetRecipes.lastIRecipe()); recipesPaxels.add(RecipeUtil.lastIRecipe());
} }
} }

8
src/main/java/de/ellpeck/actuallyadditions/mod/items/InitForeignPaxels.java
View file

@ -17,7 +17,7 @@ import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
import de.ellpeck.actuallyadditions.mod.items.base.ItemAllToolAA; import de.ellpeck.actuallyadditions.mod.items.base.ItemAllToolAA;
import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemTool; import net.minecraft.item.ItemTool;
@ -64,7 +64,7 @@ public class InitForeignPaxels{
if(ConfigCrafting.PAXELS.isEnabled()){ if(ConfigCrafting.PAXELS.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(soPaxels[i], axe, pickaxe, hoe, sword, shovel)); GameRegistry.addRecipe(new ShapelessOreRecipe(soPaxels[i], axe, pickaxe, hoe, sword, shovel));
ToolCrafting.recipesPaxels.add(Util.GetRecipes.lastIRecipe()); ToolCrafting.recipesPaxels.add(RecipeUtil.lastIRecipe());
} }
} }
} }
@ -92,7 +92,7 @@ public class InitForeignPaxels{
if(ConfigCrafting.PAXELS.isEnabled()){ if(ConfigCrafting.PAXELS.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(mtPaxels[i], axe, pickaxe, hoe, sword, shovel)); GameRegistry.addRecipe(new ShapelessOreRecipe(mtPaxels[i], axe, pickaxe, hoe, sword, shovel));
ToolCrafting.recipesPaxels.add(Util.GetRecipes.lastIRecipe()); ToolCrafting.recipesPaxels.add(RecipeUtil.lastIRecipe());
} }
} }
} }
@ -120,7 +120,7 @@ public class InitForeignPaxels{
if(ConfigCrafting.PAXELS.isEnabled()){ if(ConfigCrafting.PAXELS.isEnabled()){
GameRegistry.addRecipe(new ShapelessOreRecipe(tfPaxels[i], axe, pickaxe, hoe, sword, shovel)); GameRegistry.addRecipe(new ShapelessOreRecipe(tfPaxels[i], axe, pickaxe, hoe, sword, shovel));
ToolCrafting.recipesPaxels.add(Util.GetRecipes.lastIRecipe()); ToolCrafting.recipesPaxels.add(RecipeUtil.lastIRecipe());
} }
} }
} }

40
src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensNoneRecipeHandler.java
View file

@ -18,7 +18,7 @@ import de.ellpeck.actuallyadditions.mod.items.InitItems;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals; import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
import net.minecraft.init.Blocks; 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;
@ -40,62 +40,62 @@ public class LensNoneRecipeHandler{
public static void init(){ public static void init(){
//Crystal Blocks //Crystal Blocks
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.redstone_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.REDSTONE.ordinal()), 400); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.redstone_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.REDSTONE.ordinal()), 400);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.lapis_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()), 400); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.lapis_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()), 400);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.diamond_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 600); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.diamond_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 600);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.emerald_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.EMERALD.ordinal()), 1000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.emerald_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.EMERALD.ordinal()), 1000);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.coal_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()), 600); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.coal_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()), 600);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.iron_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()), 800); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.iron_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()), 800);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
//Crystal Items //Crystal Items
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.redstone), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 40); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.redstone), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 40);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.dye, 1, 4), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 40); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.dye, 1, 4), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 40);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.diamond), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 60); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.diamond), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 60);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.emerald), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), 100); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.emerald), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), 100);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.coal), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), 60); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.coal), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), 60);
mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe()); mainPageRecipes.add(RecipeUtil.lastReconstructorRecipe());
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.iron_ingot), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 80); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.iron_ingot), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 80);
//Lenses //Lenses
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), new ItemStack(InitItems.itemColorLens), 5000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), new ItemStack(InitItems.itemColorLens), 5000);
recipeColorLens = Util.GetRecipes.lastReconstructorRecipe(); recipeColorLens = RecipeUtil.lastReconstructorRecipe();
if(ConfigCrafting.RECONSTRUCTOR_EXPLOSION_LENS.isEnabled()){ if(ConfigCrafting.RECONSTRUCTOR_EXPLOSION_LENS.isEnabled()){
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemExplosionLens), 5000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemExplosionLens), 5000);
recipeExplosionLens = Util.GetRecipes.lastReconstructorRecipe(); recipeExplosionLens = RecipeUtil.lastReconstructorRecipe();
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemExplosionLens), new ItemStack(InitItems.itemDamageLens), 5000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemExplosionLens), new ItemStack(InitItems.itemDamageLens), 5000);
} }
else{ else{
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemDamageLens), 5000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemDamageLens), 5000);
} }
recipeDamageLens = Util.GetRecipes.lastReconstructorRecipe(); recipeDamageLens = RecipeUtil.lastReconstructorRecipe();
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemDamageLens), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), 5000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(InitItems.itemDamageLens), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), 5000);
//Misc //Misc
if(ConfigCrafting.RECONSTRUCTOR_MISC.isEnabled()){ if(ConfigCrafting.RECONSTRUCTOR_MISC.isEnabled()){
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.soul_sand), 20000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.soul_sand), 20000);
recipeSoulSand = Util.GetRecipes.lastReconstructorRecipe(); recipeSoulSand = RecipeUtil.lastReconstructorRecipe();
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.rotten_flesh), new ItemStack(Items.leather), 8000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Items.rotten_flesh), new ItemStack(Items.leather), 8000);
recipeLeather = Util.GetRecipes.lastReconstructorRecipe(); recipeLeather = RecipeUtil.lastReconstructorRecipe();
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.red_mushroom), new ItemStack(Items.nether_wart), 150000); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.red_mushroom), new ItemStack(Items.nether_wart), 150000);
recipeNetherWart = Util.GetRecipes.lastReconstructorRecipe(); recipeNetherWart = RecipeUtil.lastReconstructorRecipe();
} }
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.quartz_block), new ItemStack(InitBlocks.blockTestifiBucksWhiteWall), 10); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.quartz_block), new ItemStack(InitBlocks.blockTestifiBucksWhiteWall), 10);
recipeWhiteWall = Util.GetRecipes.lastReconstructorRecipe(); recipeWhiteWall = RecipeUtil.lastReconstructorRecipe();
ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.quartz_block, 1, 1), new ItemStack(InitBlocks.blockTestifiBucksGreenWall), 10); ActuallyAdditionsAPI.addReconstructorLensNoneRecipe(new ItemStack(Blocks.quartz_block, 1, 1), new ItemStack(InitBlocks.blockTestifiBucksGreenWall), 10);
recipeGreenWall = Util.GetRecipes.lastReconstructorRecipe(); recipeGreenWall = RecipeUtil.lastReconstructorRecipe();
} }
public static ArrayList<LensNoneRecipe> getRecipesFor(ItemStack input){ public static ArrayList<LensNoneRecipe> getRecipesFor(ItemStack input){

38
src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java Normal file
View file

@ -0,0 +1,38 @@
/*
* This file ("RecipeUtil.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense/
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.util;
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import java.util.List;
public class RecipeUtil{
public static LensNoneRecipe lastReconstructorRecipe(){
List<LensNoneRecipe> list = ActuallyAdditionsAPI.reconstructorLensNoneRecipes;
return list.get(list.size()-1);
}
public static CrusherRecipe lastCrusherRecipe(){
List<CrusherRecipe> list = ActuallyAdditionsAPI.crusherRecipes;
return list.get(list.size()-1);
}
public static IRecipe lastIRecipe(){
List list = CraftingManager.getInstance().getRecipeList();
Object recipe = list.get(list.size()-1);
return recipe instanceof IRecipe ? (IRecipe)recipe : null;
}
}

24
src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java
View file

@ -10,21 +10,15 @@
package de.ellpeck.actuallyadditions.mod.util; package de.ellpeck.actuallyadditions.mod.util;
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe;
import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockDispenser;
import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import java.util.List;
import java.util.Random; import java.util.Random;
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -74,22 +68,4 @@ public class Util{
return -1; return -1;
} }
public static class GetRecipes{
public static LensNoneRecipe lastReconstructorRecipe(){
List<LensNoneRecipe> list = ActuallyAdditionsAPI.reconstructorLensNoneRecipes;
return list.get(list.size()-1);
}
public static CrusherRecipe lastCrusherRecipe(){
List<CrusherRecipe> list = ActuallyAdditionsAPI.crusherRecipes;
return list.get(list.size()-1);
}
public static IRecipe lastIRecipe(){
List list = CraftingManager.getInstance().getRecipeList();
Object recipe = list.get(list.size()-1);
return recipe instanceof IRecipe ? (IRecipe)recipe : null;
}
}
} }