From 9d595e2192d626c2b5df8b03dca047147eca144f Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 1 Dec 2015 23:41:33 +0100 Subject: [PATCH] Fix some stuff, whooops --- .../crafting/BlockCrafting.java | 22 +++++++++---------- .../crafting/CrusherCrafting.java | 4 ++++ .../crafting/ItemCrafting.java | 10 ++++----- .../nei/NEIReconstructorRecipe.java | 14 +++++++++--- 4 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index 68450451c..7bb31d634 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -174,7 +174,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockXPSolidifier), "XXX", "DCD", "XXX", 'X', new ItemStack(InitItems.itemSpecialDrop, 1, TheSpecialDrops.SOLIDIFIED_EXPERIENCE.ordinal()), - 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeSolidifier = Util.GetRecipes.lastIRecipe(); } @@ -264,7 +264,7 @@ public class BlockCrafting{ "SCS", "ISI", "LLL", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()), 'L', Items.lava_bucket)); recipeLavaFactory = Util.GetRecipes.lastIRecipe(); } @@ -274,7 +274,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 32, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), "ICI", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); + 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()))); recipeCasing = Util.GetRecipes.lastIRecipe(); } @@ -432,7 +432,7 @@ public class BlockCrafting{ if(ConfigCrafting.REPAIRER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockItemRepairer), "DID", "OCO", "DID", - 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); @@ -443,7 +443,7 @@ public class BlockCrafting{ if(ConfigCrafting.SOLAR_PANEL.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceSolar), "IQI", "CDC", "IBI", - 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), @@ -556,7 +556,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass, 3), "GSG", "SDS", "GSG", 'G', "blockGlass", - 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), + 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()), 'S', "treeSapling")); recipeGlass = Util.GetRecipes.lastIRecipe(); } @@ -567,7 +567,7 @@ public class BlockCrafting{ "CCC", "CRP", "CCC", 'C', "cobblestone", 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), - 'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()))); + 'P', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()))); recipePlacer = Util.GetRecipes.lastIRecipe(); } @@ -577,7 +577,7 @@ public class BlockCrafting{ "CCC", "CRP", "CCC", 'C', "cobblestone", 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), - 'P', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()))); + 'P', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()))); recipeBreaker = Util.GetRecipes.lastIRecipe(); } @@ -585,7 +585,7 @@ public class BlockCrafting{ if(ConfigCrafting.DROPPER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDropper), "CBC", "CDR", "CBC", - 'B', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'B', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 'C', "cobblestone", 'D', Blocks.dropper, 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); @@ -596,7 +596,7 @@ public class BlockCrafting{ for(int i = 0; i < BlockColoredLamp.allLampTypes.length; i++){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockColoredLamp, 6, i), "GCG", "DQD", "GCG", - 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'C', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 'G', "glowstone", 'D', "dye"+BlockColoredLamp.allLampTypes[i].name, 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); @@ -612,4 +612,4 @@ public class BlockCrafting{ } -} +} \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java index b1b54524d..36a4382be 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/CrusherCrafting.java @@ -13,6 +13,7 @@ package ellpeck.actuallyadditions.crafting; import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.metalists.TheFoods; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.Util; @@ -79,6 +80,9 @@ public class CrusherCrafting{ CrusherRecipeRegistry.addRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(Items.sugar, 1, 2)); miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.tallgrass, 1, Util.WILDCARD), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.GREEN_DYE.ordinal())); + miscRecipes.add(Util.GetRecipes.lastCrusherRecipe()); + CrusherRecipeRegistry.addRecipe("oreNickel", "dustNickel", 2, "dustPlatinum", 1, 15); CrusherRecipeRegistry.addRecipe("oreIron", "dustIron", 2, "dustGold", 1, 20); diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 9c5aa314b..7616058cb 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -152,7 +152,7 @@ public class ItemCrafting{ 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); + 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()))); recipeDrill = Util.GetRecipes.lastIRecipe(); for(int i = 0; i < 16; i++){ @@ -169,7 +169,7 @@ public class ItemCrafting{ "ICI", "CRC", "ICI", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()))); + 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()))); recipeDrillCore = Util.GetRecipes.lastIRecipe(); } @@ -214,7 +214,7 @@ public class ItemCrafting{ "ISI", "SRS", "ISI", 'I', Blocks.glowstone, 'S', Items.redstone, - 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()))); + 'R', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()))); recipeDrillFortuneI = Util.GetRecipes.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFortuneII), @@ -349,7 +349,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats), "WNW", "WDW", "WNW", 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), - 'N', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'N', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'D', new ItemStack(Items.nether_star))); recipeWings = Util.GetRecipes.lastIRecipe(); } @@ -552,4 +552,4 @@ public class ItemCrafting{ } return false; } -} +} \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java b/src/main/java/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java index 8b9e712ee..2e6612ba4 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/NEIReconstructorRecipe.java @@ -29,6 +29,7 @@ import org.lwjgl.opengl.GL11; import java.awt.*; import java.util.ArrayList; import java.util.Collections; +import java.util.List; public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INEIRecipeHandler{ @@ -140,12 +141,19 @@ public class NEIReconstructorRecipe extends TemplateRecipeHandler implements INE @Override public PositionedStack getResult(){ - return result; + return null; } @Override - public PositionedStack getIngredient(){ - return input; + public List getIngredients(){ + return this.getCycledIngredients(cycleticks/48, Collections.singletonList(this.input)); + } + + @Override + public java.util.List getOtherStacks(){ + ArrayList list = new ArrayList(); + list.addAll(this.getCycledIngredients(cycleticks/48, Collections.singletonList(this.result))); + return list; } } } \ No newline at end of file