From 2902f5d8a5a474618628430e49b96bf32083bac7 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 15 Nov 2015 17:50:31 +0100 Subject: [PATCH] Many recipes now use Crystals, fixed Reconstructor Page & Chapter, moved pages around --- .../booklet/InitBooklet.java | 4 +- .../chapter/BookletChapterReconstructor.java | 15 ++++ .../booklet/page/PageReconstructor.java | 2 +- .../config/values/ConfigIntValues.java | 2 +- .../crafting/BlockCrafting.java | 82 ++++++++++-------- .../crafting/ItemCrafting.java | 75 ++++++++-------- .../crafting/MiscCrafting.java | 16 ++++ .../items/metalists/TheCrystals.java | 3 +- .../nei/NeiScreenEvents.java | 1 + .../actuallyadditions/ore/InitOreDict.java | 2 + .../AtomicReconstructorRecipeHandler.java | 2 + .../assets/actuallyadditions/lang/en_US.lang | 6 +- .../textures/blocks/blockCrystal.png | Bin 264 -> 384 bytes 13 files changed, 128 insertions(+), 82 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index 5705d0811..c264fc30b 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -54,7 +54,8 @@ public class InitBooklet{ private static void initChapters(){ //Getting Started chapterIntro = new BookletChapter("intro", entryGettingStarted, new ItemStack(InitItems.itemLexicon), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3), new PageCrafting(4, ItemCrafting.recipeBook)).setImportant(); - new BookletChapterReconstructor("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1), new PageTextOnly(2).addTextReplacement("", ConfigIntValues.RECONSTRUCTOR_USE_PER_BLOCK.getValue()), new PagePicture(3, "pageAtomicReconstructor", 0).setNoText(), new PageCrafting(4, BlockCrafting.recipeAtomicReconstructor).setNoText()).setSpecial(); + new BookletChapterReconstructor("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("", ConfigIntValues.RECONSTRUCTOR_USE_PER_BLOCK.getValue()), new PageTextOnly(2), new PagePicture(3, "pageAtomicReconstructor", 0).setNoText(), new PageCrafting(4, BlockCrafting.recipeAtomicReconstructor).setNoText()).setSpecial(); + new BookletChapter("coalGen", entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("", ConfigIntValues.COAL_GEN_ENERGY_PRODUCED.getValue())); new BookletChapter("craftingIngs", entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeStoneCase).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(7, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(8, ItemCrafting.recipeRing).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(11, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(12, ItemCrafting.recipeDough).setNoText(), new PageCrafting(13, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(14, BlockCrafting.recipeIronCase).setNoText()).setImportant(); //Miscellaneous @@ -98,7 +99,6 @@ public class InitBooklet{ new BookletChapter("longRangeBreaker", entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("", ConfigIntValues.DIRECTIONAL_BREAKER_RF_PER_BLOCK.getValue()).addTextReplacement("", ConfigIntValues.DIRECTIONAL_BREAKER_RANGE.getValue()), new PageCrafting(2, BlockCrafting.recipeDirectionalBreaker)); //RF Generating Blocks - new BookletChapter("coalGen", entryGeneratingRF, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("", ConfigIntValues.COAL_GEN_ENERGY_PRODUCED.getValue())); new BookletChapter("solarPanel", entryGeneratingRF, new ItemStack(InitBlocks.blockFurnaceSolar), new PageTextOnly(1).addTextReplacement("", ConfigIntValues.FURNACE_SOLAR_ENERGY_PRODUCED.getValue()), new PageCrafting(2, BlockCrafting.recipeSolar).setNoText()); new BookletChapter("heatCollector", entryGeneratingRF, new ItemStack(InitBlocks.blockHeatCollector), new PageTextOnly(1).addTextReplacement("", ConfigIntValues.HEAT_COLLECTOR_ENERGY_PRODUCED.getValue()).addTextReplacement("", ConfigIntValues.HEAT_COLLECTOR_BLOCKS.getValue()), new PageCrafting(2, BlockCrafting.recipeHeatCollector).setNoText()); new BookletChapter("canola", entryGeneratingRF, new ItemStack(InitBlocks.blockFermentingBarrel), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())).addTextReplacement("", ConfigIntValues.PRESS_ENERGY_USED.getValue()).addTextReplacement("", ConfigIntValues.PRESS_MB_PRODUCED.getValue()).addTextReplacement("", ConfigIntValues.OIL_GEN_ENERGY_PRODUCED.getValue()), new PageCrafting(2, BlockCrafting.recipeCanolaPress).setNoText(), new PageCrafting(3, BlockCrafting.recipeFermentingBarrel).setNoText(), new PageCrafting(4, BlockCrafting.recipeOilGen).setNoText()); diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java b/src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java index b58c439c1..c37244739 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java @@ -12,7 +12,9 @@ package ellpeck.actuallyadditions.booklet.chapter; import ellpeck.actuallyadditions.booklet.entry.BookletEntry; import ellpeck.actuallyadditions.booklet.page.BookletPage; +import ellpeck.actuallyadditions.booklet.page.PageCrafting; import ellpeck.actuallyadditions.booklet.page.PageReconstructor; +import ellpeck.actuallyadditions.crafting.MiscCrafting; import ellpeck.actuallyadditions.recipe.AtomicReconstructorRecipeHandler; import net.minecraft.item.ItemStack; @@ -30,6 +32,19 @@ public class BookletChapterReconstructor extends BookletChapter{ ArrayList allPages = new ArrayList(); allPages.addAll(Arrays.asList(pages)); + allPages.add(new PageCrafting(allPages.size()+1, MiscCrafting.recipesCrystals){ + @Override + public ItemStack[] getItemStacksForPage(){ + return new ItemStack[0]; + } + }.setNoText()); + allPages.add(new PageCrafting(allPages.size()+1, MiscCrafting.recipesCrystalBlocks){ + @Override + public ItemStack[] getItemStacksForPage(){ + return new ItemStack[0]; + } + }.setNoText()); + for(AtomicReconstructorRecipeHandler.Recipe recipe : AtomicReconstructorRecipeHandler.recipes){ BookletPage page = new PageReconstructor(allPages.size()+1, recipe.getFirstOutput()).setNoText(); allPages.add(page); diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java index bf128195e..db24be64a 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageReconstructor.java @@ -65,6 +65,7 @@ public class PageReconstructor extends BookletPage{ } if(input != null){ + renderItem(gui, new ItemStack(InitBlocks.blockAtomicReconstructor), gui.guiLeft+37+22, gui.guiTop+20+21, 1.0F); for(int i = 0; i < 2; i++){ for(int x = 0; x < 2; x++){ ItemStack stack = x == 0 ? input : this.result; @@ -85,7 +86,6 @@ public class PageReconstructor extends BookletPage{ } } } - renderItem(gui, new ItemStack(InitBlocks.blockAtomicReconstructor), gui.guiLeft+37+22, gui.guiTop+20+21, 1.0F); } } diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java index 002adfdee..8e34b65a6 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java @@ -180,7 +180,7 @@ public enum ConfigIntValues{ RECONSTRUCTOR_DISTANCE("Atomic Reconstructor: Distance", ConfigCategories.MACHINE_VALUES, 10, 1, 50, "The max distance the Reconstructor goes forward to find blocks to convert"), RECONSTRCUTOR_RANGE("Atomic Reconstructor: Range", ConfigCategories.MACHINE_VALUES, 2, 1, 10, "The range of Converting blocks or items into other blocks or items"), - RECONSTRUCTOR_USE_PER_BLOCK("Atomic Reconstructor: Energy Use per Block", ConfigCategories.MACHINE_VALUES, 1000, 0, 100000, "The amount of Energy the Reconstructor uses per Block converted"), + RECONSTRUCTOR_USE_PER_BLOCK("Atomic Reconstructor: Energy Use per Block", ConfigCategories.MACHINE_VALUES, 800, 0, 100000, "The amount of Energy the Reconstructor uses per Block converted"), RECONSTRUCTOR_COOLDOWN_TIMER("Atomic Reconstrucor: Cooldown Timer", ConfigCategories.MACHINE_VALUES, 100, 0, 10000, "The amount of time the Reconstructor waits between shooting lasers"); public final String name; diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index 0f593b3ba..2a535bbc8 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -98,7 +98,7 @@ public class BlockCrafting{ "OBO", "RCR", "OBO", 'B', new ItemStack(Blocks.redstone_block), 'O', new ItemStack(Blocks.obsidian), - 'R', "dustRedstone", + 'R', "crystalRed", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeLaserRelay = Util.GetRecipes.lastIRecipe(); } @@ -106,17 +106,19 @@ public class BlockCrafting{ //Ranged Collector if(ConfigCrafting.RANGED_COLLECTOR.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockRangedCollector), - "EHE", " C ", + " A ", "EHE", " C ", 'E', new ItemStack(Items.ender_pearl), 'H', new ItemStack(Blocks.hopper), - 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()))); + 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'A', "crystalBlack")); recipeRangedCollector = Util.GetRecipes.lastIRecipe(); } //Directional Breaker if(ConfigCrafting.DIRECTIONAL_BREAKER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDirectionalBreaker), - "BBB", + "BBB", " C ", + 'C', "crystalBlack", 'B', new ItemStack(InitBlocks.blockBreaker))); recipeDirectionalBreaker = Util.GetRecipes.lastIRecipe(); } @@ -144,7 +146,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', "blockDiamond", + 'D', "blockCrystalLightBlue", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeSolidifier = Util.GetRecipes.lastIRecipe(); } @@ -183,7 +185,7 @@ public class BlockCrafting{ "WSW", "SRS", "WSW", 'W', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()), - 'S', Blocks.obsidian)); + 'S', "crystalLightBlue")); recipeEnderCase = Util.GetRecipes.lastIRecipe(); } @@ -191,8 +193,8 @@ public class BlockCrafting{ if(ConfigCrafting.PHANTOM_BOOSTER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomBooster), "RDR", "DCD", "RDR", - 'R', "dustRedstone", - 'D', "gemDiamond", + 'R', "crystalRed", + 'D', "crystalLightBlue", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); recipePhantomBooster = Util.GetRecipes.lastIRecipe(); } @@ -200,7 +202,8 @@ public class BlockCrafting{ //Coffee Machine if(ConfigCrafting.COFFEE_MACHINE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCoffeeMachine), - " C ", " S ", "A A", + " C ", " S ", "AMA", + 'M', "crystalBlack", 'C', InitItems.itemCoffeeBean, 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), 'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); @@ -211,7 +214,7 @@ public class BlockCrafting{ if(ConfigCrafting.ENERGIZER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnergizer), "I I", "CAC", "I I", - 'I', "ingotIron", + 'I', "crystalRed", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); recipeEnergizer = Util.GetRecipes.lastIRecipe(); @@ -221,7 +224,7 @@ public class BlockCrafting{ if(ConfigCrafting.ENERVATOR.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnervator), " I ", "CAC", " I ", - 'I', "ingotIron", + 'I', "crystalRed", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); recipeEnervator = Util.GetRecipes.lastIRecipe(); @@ -233,7 +236,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', "blockIron", + 'I', "blockCrystalWhite", 'L', Items.lava_bucket)); recipeLavaFactory = Util.GetRecipes.lastIRecipe(); } @@ -243,7 +246,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', "blockIron")); + 'I', "blockCrystalWhite")); recipeCasing = Util.GetRecipes.lastIRecipe(); } @@ -252,7 +255,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCanolaPress), "CHC", "CDC", "CRC", 'C', "cobblestone", - 'H', Blocks.hopper, + 'H', "crystalWhite", 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); recipeCanolaPress = Util.GetRecipes.lastIRecipe(); @@ -263,7 +266,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFermentingBarrel), "CHC", "CDC", "CRC", 'C', "logWood", - 'H', Blocks.hopper, + 'H', "crystalWhite", 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal()))); recipeFermentingBarrel = Util.GetRecipes.lastIRecipe(); @@ -273,7 +276,7 @@ public class BlockCrafting{ if(ConfigCrafting.PHANTOMFACE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomface), " C ", "EBE", " S ", - 'E', Items.ender_eye, + 'E', "crystalLightBlue", 'C', Blocks.chest, 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()))); @@ -300,7 +303,7 @@ public class BlockCrafting{ if(ConfigCrafting.PHANTOM_ENERGYFACE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomEnergyface), " R ", "RFR", " R ", - 'R', "dustRedstone", + 'R', "crystalRed", 'F', InitBlocks.blockPhantomface)); recipeEnergyface = Util.GetRecipes.lastIRecipe(); } @@ -356,8 +359,8 @@ public class BlockCrafting{ if(ConfigCrafting.LEAF_GENERATOR.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLeafGenerator), "IEI", "GLG", "ICI", - 'I', "ingotIron", - 'G', "ingotGold", + 'I', "crystalWhite", + 'G', "crystalRed", 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'L', "treeLeaves", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); @@ -392,7 +395,7 @@ public class BlockCrafting{ if(ConfigCrafting.FISHING_NET.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFishingNet), "SSS", "SDS", "SSS", - 'D', "gemDiamond", + 'D', "crystalLightBlue", 'S', Items.string)); recipeFisher = Util.GetRecipes.lastIRecipe(); } @@ -401,8 +404,8 @@ public class BlockCrafting{ if(ConfigCrafting.REPAIRER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockItemRepairer), "DID", "OCO", "DID", - 'D', "gemDiamond", - 'I', "ingotIron", + 'D', "blockCrystalLightBlue", + 'I', "crystalWhite", 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); recipeRepairer = Util.GetRecipes.lastIRecipe(); @@ -412,8 +415,8 @@ public class BlockCrafting{ if(ConfigCrafting.SOLAR_PANEL.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceSolar), "IQI", "CDC", "IBI", - 'D', "blockDiamond", - 'I', "ingotIron", + 'D', "blockCrystalLightBlue", + 'I', "crystalWhite", 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'B', new ItemStack(Blocks.iron_bars))); @@ -424,7 +427,7 @@ public class BlockCrafting{ if(ConfigCrafting.HEAT_COLLECTOR.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockHeatCollector), "BRB", "CDC", "BQB", - 'D', "ingotIron", + 'D', "crystalWhite", 'R', new ItemStack(Items.repeater), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'L', new ItemStack(Items.lava_bucket), @@ -451,21 +454,22 @@ public class BlockCrafting{ "WWW", "CHC", "WWW", 'W', "plankWood", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()), - 'H', new ItemStack(Blocks.hopper))); + 'H', "crystalWhite")); recipeESD = Util.GetRecipes.lastIRecipe(); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockInputterAdvanced), InitBlocks.blockInputter, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), - "dustRedstone")); + "crystalRed")); recipeAdvancedESD = Util.GetRecipes.lastIRecipe(); } //Crusher if(ConfigCrafting.CRUSHER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGrinder), - "CFC", "DQD", "CFC", + "MFC", "DQD", "CFM", + 'M', "crystalRed", 'C', "cobblestone", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), @@ -487,19 +491,19 @@ public class BlockCrafting{ } //Double Furnace - if(ConfigCrafting.COMPOST.isEnabled()){ + if(ConfigCrafting.DOUBLE_FURNACE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceDouble), - "CDC", "RFR", "CDC", + "PDC", "RFR", "CDP", 'C', "cobblestone", 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'R', new ItemStack(Blocks.furnace), 'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), - 'P', "ingotBrick")); + 'P', "crystalWhite")); recipeFurnace = Util.GetRecipes.lastIRecipe(); } //Feeder - if(ConfigCrafting.DOUBLE_FURNACE.isEnabled()){ + if(ConfigCrafting.FEEDER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFeeder), "WCW", "DHD", "WCW", 'W', "plankWood", @@ -524,7 +528,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass, 3), "GSG", "SDS", "GSG", 'G', "blockGlass", - 'D', Blocks.obsidian, + 'D', "blockCrystalBlue", 'S', "treeSapling")); recipeGlass = Util.GetRecipes.lastIRecipe(); } @@ -535,7 +539,7 @@ public class BlockCrafting{ "CCC", "CRP", "CCC", 'C', "cobblestone", 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), - 'P', Blocks.piston)); + 'P', "blockCrystalBlue")); recipePlacer = Util.GetRecipes.lastIRecipe(); } @@ -545,14 +549,15 @@ public class BlockCrafting{ "CCC", "CRP", "CCC", 'C', "cobblestone", 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), - 'P', Items.iron_pickaxe)); + 'P', "blockCrystalBlack")); recipeBreaker = Util.GetRecipes.lastIRecipe(); } //Dropper if(ConfigCrafting.DROPPER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDropper), - "CCC", "CDR", "CCC", + "CBC", "CDR", "CBC", + 'B', "crystalBlue", 'C', "cobblestone", 'D', Blocks.dropper, 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); @@ -562,7 +567,8 @@ public class BlockCrafting{ if(ConfigCrafting.LAMPS.isEnabled()){ for(int i = 0; i < BlockColoredLamp.allLampTypes.length; i++){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockColoredLamp, 6, i), - "GGG", "DQD", "GGG", + "GCG", "DQD", "GCG", + 'C', "crystalBlue", 'G', "glowstone", 'D', "dye"+BlockColoredLamp.allLampTypes[i].name, 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); @@ -571,7 +577,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLampPowerer, 4), "XXX", "XLX", "XXX", - 'X', "dustRedstone", + 'X', "crystalRed", 'L', new ItemStack(InitBlocks.blockColoredLamp, 1, Util.WILDCARD))); recipePowerer = Util.GetRecipes.lastIRecipe(); } diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 13fe527c4..515454761 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -105,7 +105,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLaserWrench), "C ", " S ", " S", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), - 'S', "ingotIron")); + 'S', "crystalWhite")); recipeLaserWrench = Util.GetRecipes.lastIRecipe(); } @@ -129,7 +129,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLeafBlower), " F", "IP", "IC", 'F', new ItemStack(Items.flint), - 'I', "ingotIron", + 'I', "crystalWhite", 'P', new ItemStack(Blocks.piston), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeLeafBlower = Util.GetRecipes.lastIRecipe(); @@ -139,18 +139,18 @@ public class ItemCrafting{ if(ConfigCrafting.DRILL.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill), "DDD", "CRC", "III", - 'D', "gemDiamond", + 'D', "crystalLightBlue", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), - 'I', "blockIron")); + 'I', "blockCrystalWhite")); recipeDrill = Util.GetRecipes.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill, 1, 1), "DDD", "CRC", "III", - 'D', "gemEmerald", + 'D', "crystalGreen", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), - 'I', "blockIron")); + 'I', "blockCrystalWhite")); recipeDrillEmerald = Util.GetRecipes.lastIRecipe(); } @@ -159,15 +159,16 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), "ICI", "CRC", "ICI", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), - 'R', "dustRedstone", - 'I', "blockIron")); + 'R', "crystalRed", + 'I', "blockCrystalWhite")); recipeDrillCore = Util.GetRecipes.lastIRecipe(); } //Tele Staff if(ConfigCrafting.TELE_STAFF.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemTeleStaff), - " E", " S ", "SB ", + " FE", " S ", "SB ", + 'F', "crystalLightBlue", 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()), 'B', new ItemStack(InitItems.itemBattery, 1, Util.WILDCARD))); @@ -178,23 +179,23 @@ public class ItemCrafting{ if(ConfigCrafting.DRILL_SPEED.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeed), "ISI", "SRS", "ISI", - 'I', "ingotIron", + 'I', "crystalWhite", 'S', Items.sugar, - 'R', "dustRedstone")); + 'R', "crystalRed")); recipeDrillSpeedI = Util.GetRecipes.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedII), "ISI", "SCS", "ISI", - 'I', "ingotIron", + 'I', "crystalWhite", 'S', Items.sugar, 'C', Items.cake)); recipeDrillSpeedII = Util.GetRecipes.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedIII), "ISI", "SFS", "ISI", - 'I', "ingotIron", + 'I', "crystalWhite", 'S', Items.sugar, - 'F', "gemDiamond")); + 'F', "crystalLightBlue")); recipeDrillSpeedIII = Util.GetRecipes.lastIRecipe(); } @@ -204,13 +205,13 @@ public class ItemCrafting{ "ISI", "SRS", "ISI", 'I', Blocks.glowstone, 'S', Items.redstone, - 'R', Blocks.diamond_block)); + 'R', "blockCrystalLightBlue")); recipeDrillFortuneI = Util.GetRecipes.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFortuneII), "ISI", "SRS", "ISI", 'I', Blocks.glowstone, - 'S', Items.redstone, + 'S', "crystalRed", 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); recipeDrillFortuneII = Util.GetRecipes.lastIRecipe(); } @@ -219,15 +220,15 @@ public class ItemCrafting{ if(ConfigCrafting.DRILL_SIZE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeThreeByThree), "DID", "ICI", "DID", - 'I', "ingotIron", - 'D', "gemDiamond", + 'I', "crystalWhite", + 'D', "crystalLightBlue", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); recipeDrillThree = Util.GetRecipes.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFiveByFive), "DID", "ICI", "DID", - 'I', "ingotIron", - 'D', "gemDiamond", + 'I', "crystalWhite", + 'D', "crystalLightBlue", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeDrillFive = Util.GetRecipes.lastIRecipe(); } @@ -236,8 +237,8 @@ public class ItemCrafting{ if(ConfigCrafting.DRILL_SILK_TOUCH.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSilkTouch), "DSD", "SCS", "DSD", - 'D', "gemEmerald", - 'S', "gemDiamond", + 'D', "crystalGreen", + 'S', "crystalLightBlue", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeDrillSilk = Util.GetRecipes.lastIRecipe(); } @@ -249,7 +250,7 @@ public class ItemCrafting{ 'C', "cobblestone", 'E', Items.paper, 'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), - 'R', "ingotIron")); + 'R', "crystalWhite")); recipeDrillPlacing = Util.GetRecipes.lastIRecipe(); } @@ -257,8 +258,8 @@ public class ItemCrafting{ if(ConfigCrafting.BATTERY.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBattery), " R ", "ICI", "III", - 'R', "dustRedstone", - 'I', "ingotIron", + 'R', "crystalRed", + 'I', "crystalWhite", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeBattery = Util.GetRecipes.lastIRecipe(); } @@ -268,7 +269,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryDouble), " R ", "ICI", "III", 'R', new ItemStack(InitItems.itemBattery), - 'I', "ingotIron", + 'I', "crystalWhite", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeBatteryDouble = Util.GetRecipes.lastIRecipe(); } @@ -277,8 +278,8 @@ public class ItemCrafting{ if(ConfigCrafting.MAGNET_RING.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMagnetRing), "RIB", "IOI", "BIR", - 'R', "dustRedstone", - 'I', "ingotIron", + 'R', "crystalRed", + 'I', "crystalWhite", 'B', new ItemStack(Items.dye, 1, 4), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); recipeMagnetRing = Util.GetRecipes.lastIRecipe(); @@ -289,7 +290,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGrowthRing), "SIS", "IOI", "SIS", 'S', new ItemStack(Items.wheat_seeds), - 'I', "ingotIron", + 'I', "crystalWhite", 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); recipeGrowthRing = Util.GetRecipes.lastIRecipe(); } @@ -299,7 +300,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWaterRemovalRing), "BIB", "IOI", "BIB", 'B', new ItemStack(Items.water_bucket), - 'I', "ingotIron", + 'I', "crystalWhite", 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); recipeWaterRing = Util.GetRecipes.lastIRecipe(); } @@ -309,7 +310,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryTriple), " R ", "ICI", "III", 'R', new ItemStack(InitItems.itemBatteryDouble), - 'I', "ingotIron", + 'I', "crystalWhite", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeBatteryTriple = Util.GetRecipes.lastIRecipe(); } @@ -319,7 +320,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuadruple), " R ", "ICI", "III", 'R', new ItemStack(InitItems.itemBatteryTriple), - 'I', "ingotIron", + 'I', "crystalWhite", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeBatteryQuadruple = Util.GetRecipes.lastIRecipe(); } @@ -329,7 +330,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuintuple), " R ", "ICI", "III", 'R', new ItemStack(InitItems.itemBatteryQuadruple), - 'I', "ingotIron", + 'I', "crystalWhite", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeBatteryQuintuple = Util.GetRecipes.lastIRecipe(); } @@ -339,7 +340,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', "blockDiamond", + 'N', "blockCrystalLightBlue", 'D', new ItemStack(Items.nether_star))); recipeWings = Util.GetRecipes.lastIRecipe(); } @@ -356,7 +357,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), " R ", "RIR", " R ", 'I', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), - 'R', "dustRedstone")); + 'R', "crystalRed")); recipeCoil = Util.GetRecipes.lastIRecipe(); } @@ -399,7 +400,7 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLeafBlowerAdvanced), " F", "DP", "DC", 'F', new ItemStack(Items.flint), - 'D', "gemDiamond", + 'D', "crystalLightBlue", 'P', new ItemStack(Blocks.piston), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeLeafBlowerAdvanced = Util.GetRecipes.lastIRecipe(); @@ -514,7 +515,7 @@ public class ItemCrafting{ } public static void addRingRecipeWithStack(ItemStack mainStack, int meta){ - GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemPotionRing, 1, meta), mainStack, mainStack, mainStack, mainStack, new ItemStack(Blocks.diamond_block), 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()); 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()); diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java index 31dfd10f3..187989019 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java @@ -11,20 +11,36 @@ package ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; +import ellpeck.actuallyadditions.blocks.InitBlocks; import ellpeck.actuallyadditions.config.values.ConfigCrafting; import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheCrystals; import ellpeck.actuallyadditions.items.metalists.TheFoods; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; public class MiscCrafting{ + public static IRecipe[] recipesCrystals = new IRecipe[TheCrystals.values().length]; + public static IRecipe[] recipesCrystalBlocks = new IRecipe[TheCrystals.values().length]; + public static void init(){ + //Crystals + for(int i = 0; i < TheCrystals.values().length; i++){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCrystal, 1, i), + "XXX", "XXX", "XXX", + 'X', new ItemStack(InitItems.itemCrystal, 1, i))); + recipesCrystalBlocks[i] = Util.GetRecipes.lastIRecipe(); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemCrystal, 9, i), new ItemStack(InitBlocks.blockCrystal, 1, i))); + recipesCrystals[i] = Util.GetRecipes.lastIRecipe(); + } + //Dough if(ConfigCrafting.DOUGH.isEnabled()){ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.DOUGH.ordinal()), diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheCrystals.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheCrystals.java index e3d41c195..d047d0fa4 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheCrystals.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheCrystals.java @@ -18,7 +18,8 @@ public enum TheCrystals{ LAPIS("Blue", EnumRarity.uncommon, 131437), DIAMOND("LightBlue", EnumRarity.epic, 9211636), COAL("Black", EnumRarity.uncommon, 986895), - EMERALD("Green", EnumRarity.epic, 382466); + EMERALD("Green", EnumRarity.epic, 382466), + IRON("White", EnumRarity.rare, 11053224); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java b/src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java index 6a68ea51d..78f9a3eee 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/NeiScreenEvents.java @@ -72,6 +72,7 @@ public class NeiScreenEvents{ Minecraft.getMinecraft().displayGuiScreen(book); BookletUtils.openIndexEntry(book, page.getChapter().entry, InitBooklet.entries.indexOf(page.getChapter().entry)/GuiBooklet.CHAPTER_BUTTONS_AMOUNT+1, true); BookletUtils.openChapter(book, page.getChapter(), page); + break; } } } diff --git a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java index 8ee5cb099..129dd552f 100644 --- a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java +++ b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java @@ -72,12 +72,14 @@ public class InitOreDict{ addOre(InitItems.itemCrystal, TheCrystals.DIAMOND.ordinal(), "crystalLightBlue"); addOre(InitItems.itemCrystal, TheCrystals.EMERALD.ordinal(), "crystalGreen"); addOre(InitItems.itemCrystal, TheCrystals.COAL.ordinal(), "crystalBlack"); + addOre(InitItems.itemCrystal, TheCrystals.IRON.ordinal(), "crystalWhite"); addOre(InitBlocks.blockCrystal, TheCrystals.REDSTONE.ordinal(), "blockCrystalRed"); addOre(InitBlocks.blockCrystal, TheCrystals.LAPIS.ordinal(), "blockCrystalBlue"); addOre(InitBlocks.blockCrystal, TheCrystals.DIAMOND.ordinal(), "blockCrystalLightBlue"); addOre(InitBlocks.blockCrystal, TheCrystals.EMERALD.ordinal(), "blockCrystalGreen"); addOre(InitBlocks.blockCrystal, TheCrystals.COAL.ordinal(), "blockCrystalBlack"); + addOre(InitBlocks.blockCrystal, TheCrystals.IRON.ordinal(), "blockCrystalWhite"); addOre(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), "oreQuartzBlack"); diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/AtomicReconstructorRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/recipe/AtomicReconstructorRecipeHandler.java index 657f5b992..45636c3ff 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/AtomicReconstructorRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/AtomicReconstructorRecipeHandler.java @@ -26,12 +26,14 @@ public class AtomicReconstructorRecipeHandler{ addRecipe("blockDiamond", "blockCrystalLightBlue"); addRecipe("blockEmerald", "blockCrystalGreen"); addRecipe("blockCoal", "blockCrystalBlack"); + addRecipe("blockIron", "blockCrystalWhite"); addRecipe("dustRedstone", "crystalRed"); addRecipe("gemLapis", "crystalBlue"); addRecipe("gemDiamond", "crystalLightBlue"); addRecipe("gemEmerald", "crystalGreen"); addRecipe("coal", "crystalBlack"); + addRecipe("ingotIron", "crystalWhite"); } public static void addRecipe(String input, String output){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 815111506..03a577313 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -120,6 +120,7 @@ tile.actuallyadditions.blockCrystalBlue.name=Palis Crystal Block tile.actuallyadditions.blockCrystalLightBlue.name=Diamatine Crystal Block tile.actuallyadditions.blockCrystalGreen.name=Emeradic Crystal Block tile.actuallyadditions.blockCrystalBlack.name=Void Crystal Block +tile.actuallyadditions.blockCrystalWhite.name=Enori Crystal Block #ESD tile.actuallyadditions.blockInputter.name=ESD @@ -300,6 +301,7 @@ item.actuallyadditions.itemCrystalBlue.name=Palis Crystal item.actuallyadditions.itemCrystalLightBlue.name=Diamatine Crystal item.actuallyadditions.itemCrystalGreen.name=Emeradic Crystal item.actuallyadditions.itemCrystalBlack.name=Void Crystal +item.actuallyadditions.itemCrystalWhite.name=Enori Crystal #Tooltips tooltip.actuallyadditions.onSuffix.desc=On @@ -592,5 +594,5 @@ booklet.actuallyadditions.chapter.blackLotus.text.1=Think of this: You need t booklet.actuallyadditions.chapter.blackLotus.text.2=No, not that one, Vaz booklet.actuallyadditions.chapter.crystals.name=Crystals & At. Reconstructor -booklet.actuallyadditions.chapter.crystals.text.1=For many Crafting Operations in Actually Additions, you will need Crystals or Crystal Blocks. These can be made using an Atomic Reconstructor. Just place one down facing in any direction and it will shoot out a red laser. When placing some of the blocks shown on the following pages in front of the laser, they will be converted into Crystals. -booklet.actuallyadditions.chapter.crystals.text.2=The way this works is that the laser searches for a block, and when it finds one, it converts all blocks and items on the ground in that area into their Crystal forms (if they have one!). During each conversion, it uses RF. \ No newline at end of file +booklet.actuallyadditions.chapter.crystals.text.1=For many Crafting Operations in Actually Additions, you will need Crystals or Crystal Blocks. These can be made using an Atomic Reconstructor. Just place one down facing in any direction and it will shoot out a red laser. When placing some of the blocks shown on the following pages in front of the laser, they will be converted into Crystals. During each conversion, it uses RF. +booklet.actuallyadditions.chapter.crystals.text.2=The way this works is that the laser searches for a block, and when it finds one, it converts all blocks and items on the ground in that area into their Crystal forms (if they have one!). When trying to power the Reconstructor, at first you will notice that many power sources require crystals to be crafted. Not to worry, though, as you can use Coal Generators to create your first couple of crystals before you can upgrade to better sources. \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystal.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCrystal.png index 91c61cbf61bb4e8c6cd2533edd10f9b8944020cb..3c7a30a1e8019640d933bb35bf802ec4d5f31d28 100644 GIT binary patch delta 357 zcmV-r0h<1Z0)PXMB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XT z000XT0n*)m`~Uy|2XskIMF-yt0~0zaGorzn0000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@O{ETDY0002qNklAtpe#!o$B~()iI!z?7>3~%93G&u@8uJ? z0Ah7rM{V0)==~Kzyrs+EcE&v6Is?jQ1K{T*B z3i8uv1@LPgc$nTOZ~=_3jHU)^0G?oU649-QVi6yBi3gww484B*6z5ywEsq8@U98VX= z5R21qCmQk{P~dQ_mo9&F>aS&cy1_(ki`1glU0ZLN`F5wZdFKnUZ}-fbR!aYATF-Ik>il-rG&bYvmKl`(AE6pEvvIFl%WaaB2QO8mvv4FO#nSLPM`n)