From 6b27b651aeb50daf6814712000011cb2c6fae1a8 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 22 Nov 2015 22:31:09 +0100 Subject: [PATCH] Added Cycle Recipes for wool, stained clay and glass --- .../ellpeck/actuallyadditions/creative/CreativeTab.java | 1 + .../java/ellpeck/actuallyadditions/ore/InitOreDict.java | 7 +++++++ .../recipe/ReconstructorRecipeHandler.java | 6 ++++++ .../resources/assets/actuallyadditions/lang/en_US.lang | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java index c06638922..7ba835e29 100644 --- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -109,6 +109,7 @@ public class CreativeTab extends CreativeTabs{ add(InitBlocks.blockBlackLotus); + add(InitItems.itemColorLens); add(InitItems.itemLaserWrench); add(InitItems.itemChestToCrateUpgrade); diff --git a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java index 9f7fc4714..2357996bd 100644 --- a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java +++ b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java @@ -11,6 +11,7 @@ package ellpeck.actuallyadditions.ore; import ellpeck.actuallyadditions.blocks.InitBlocks; +import ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; import ellpeck.actuallyadditions.items.InitItems; import ellpeck.actuallyadditions.items.metalists.*; @@ -57,6 +58,12 @@ public class InitOreDict{ addOre(Blocks.double_plant, 4, "flowerRoseBush"); addOre(Blocks.double_plant, 5, "flowerPeony"); + //Wool + Clay + for(int i = 0; i < TheColoredLampColors.values().length; i++){ + addOre(Blocks.wool, i, "wool"+TheColoredLampColors.values()[i].name); + addOre(Blocks.stained_hardened_clay, i, "clay"+TheColoredLampColors.values()[i].name); + } + //Ores addOre(InitItems.itemDust, TheDusts.IRON.ordinal(), "dustIron"); addOre(InitItems.itemDust, TheDusts.GOLD.ordinal(), "dustGold"); diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java index 86f6151cc..c5c36c58b 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java @@ -57,8 +57,14 @@ public class ReconstructorRecipeHandler{ //Colors for(int i = 0; i < TheColoredLampColors.values().length-1; i++){ addRecipe("dye"+TheColoredLampColors.values()[i].name, "dye"+TheColoredLampColors.values()[i+1].name, 2000, LensType.COLOR); + addRecipe("wool"+TheColoredLampColors.values()[i].name, "wool"+TheColoredLampColors.values()[i+1].name, 2000, LensType.COLOR); + addRecipe("clay"+TheColoredLampColors.values()[i].name, "clay"+TheColoredLampColors.values()[i+1].name, 2000, LensType.COLOR); + addRecipe("blockGlass"+TheColoredLampColors.values()[i].name, "blockGlass"+TheColoredLampColors.values()[i+1].name, 2000, LensType.COLOR); } addRecipe("dye"+TheColoredLampColors.values()[15].name, "dye"+TheColoredLampColors.values()[0].name, 2000, LensType.COLOR); + addRecipe("wool"+TheColoredLampColors.values()[15].name, "wool"+TheColoredLampColors.values()[0].name, 2000, LensType.COLOR); + addRecipe("clay"+TheColoredLampColors.values()[15].name, "clay"+TheColoredLampColors.values()[0].name, 2000, LensType.COLOR); + addRecipe("blockGlass"+TheColoredLampColors.values()[15].name, "blockGlass"+TheColoredLampColors.values()[0].name, 2000, LensType.COLOR); } } diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index bc64e3238..375e37777 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -600,7 +600,7 @@ booklet.actuallyadditions.chapter.blackLotus.text.2=No, not that one, Vaz booklet.actuallyadditions.chapter.crystals.name=Crystals and Reconstructor booklet.actuallyadditions.chapter.crystals.text.1=The Atomic Reconstructor is used to craft Crystals, which are the main crafting ingredient in most items from Actually Additions. Upon being supplied with power, it shoots out a Laser. When the Laser hits a block, it will convert all surrounding items and blocks, provided they can be converted. When shooting a laser, it uses RF, but additional rates vary depending on the conversion. -booklet.actuallyadditions.chapter.crystals.text.2=The Reconstructor can be upgraded, however, by the use of Lenses. They can be applied to the Reconstructor by right-clicking with one in hand, and taken out again when right-clicking with an empty hand. When looking at Recipes, the Lens needed for the operation will also be shown. The Crafting Recipes for the Lenses can also be found on the following pages. +booklet.actuallyadditions.chapter.crystals.text.2=The Reconstructor can be upgraded, however, by the use of Lenses. They can be applied to the Reconstructor by right-clicking with one in hand, and taken out again when right-clicking with an empty hand. When looking at Recipes, the Lens needed for the operation will also be shown. The Crafting Recipes for the Lenses can also be found on the following pages. More Recipes can also be found in the Useful Reconstructor Recipes Chapter in the Miscellaneous Entry. booklet.actuallyadditions.chapter.crystals.text.4=When you have crafted a couple of items, you might want to find a way to automate this. There is a very simple way to do accomplish this: Place the Atomic Reconstructor down facing into a Precision Dropper (to find it, look it up in the All Items and Search Entry!). Next, place a Ranged Collector in the area that has the converted items set as a whitelist. Now you can just chuck your raw materials into the Dropper to convert them! booklet.actuallyadditions.chapter.bookTutorial.name=Intro to the Manual @@ -609,5 +609,5 @@ booklet.actuallyadditions.chapter.bookTutorial.text.2=The Buttons at the to booklet.actuallyadditions.chapter.bookTutorial.text.3=If you, for some reason, want to craft this book again, just take a piece of paper and a canola seed which you can find randomly generated and craft them together! booklet.actuallyadditions.chapter.miscReconstructor.name=Useful Reconstructor Recipes -booklet.actuallyadditions.chapter.miscReconstructor.text.1=There are some additional recipes for the Atomic Reconstructor that could be very useful to you. These include decor blocks and items as well as some useful conversions. Flip through the following pages to see them all. +booklet.actuallyadditions.chapter.miscReconstructor.text.1=There are some additional recipes for the Atomic Reconstructor that could be very useful to you. These include decor blocks and items as well as some useful conversions. Flip through the following pages to see them all. For example, by firing at Wool, Stained Clay, Stained Glass and Dye with a Lens: Color multiple times, you can cycle through all of their colors. booklet.actuallyadditions.chapter.miscReconstructor.text.3=The Ethetic Quartz Blocks are Quartz Blocks spruced up. They can be crafted into stairs, slabs and walls with the same recipes as cobblestone has. No, not misspelled \ No newline at end of file