Color Conversion, Lens Textures, Localization & Documentation

src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java

@@ -56,7 +56,7 @@ public class InitBooklet{
         //Getting Started
         chapterIntro = new BookletChapter("intro", entryGettingStarted, new ItemStack(InitItems.itemLexicon), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3));
         new BookletChapter("bookTutorial", entryGettingStarted, new ItemStack(InitItems.itemLexicon), new PageTextOnly(1), new PageTextOnly(2), new PageCrafting(3, ItemCrafting.recipeBook));
-        new BookletChapterReconstructor("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("<power>", ConfigIntValues.RECONSTRUCTOR_BASE_ENERGY_USE.getValue()), new PageTextOnly(2), new PagePicture(3, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(4), new PageCrafting(5, BlockCrafting.recipeAtomicReconstructor).setNoText()).setSpecial();
+        new BookletChapterReconstructor("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("<rf>", ConfigIntValues.RECONSTRUCTOR_BASE_ENERGY_USE.getValue()), new PageTextOnly(2), new PagePicture(3, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(4), new PageCrafting(5, BlockCrafting.recipeAtomicReconstructor).setNoText(), new PageCrafting(6, ItemCrafting.recipeLens).setNoText(), new PageReconstructor(7, new ItemStack(InitItems.itemColorLens)).setNoText()).setSpecial();
         new BookletChapter("coalGen", entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("<rf>", 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();
 

src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java

@@ -77,9 +77,17 @@ public class ItemCrafting{
     public static IRecipe recipeLaserWrench;
     public static IRecipe recipeDrillCore;
     public static IRecipe recipeBlackDye;
+    public static IRecipe recipeLens;
 
     public static void init(){
 
+        //Lens
+        GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()),
+                "GGG", "GBG", "GGG",
+                'G', "blockGlass",
+                'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
+        recipeLens = Util.GetRecipes.lastIRecipe();
+
             //Black Dye
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.BLACK_DYE.ordinal()), new ItemStack(InitBlocks.blockBlackLotus)));
         recipeBlackDye = Util.GetRecipes.lastIRecipe();

src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java

@@ -31,7 +31,8 @@ public enum TheMiscItems{
     CUP("Cup", EnumRarity.uncommon),
     BAT_WING("BatWing", EnumRarity.rare),
     DRILL_CORE("DrillCore", EnumRarity.uncommon),
-    BLACK_DYE("BlackDye", EnumRarity.epic);
+    BLACK_DYE("BlackDye", EnumRarity.epic),
+    LENS("Lens", EnumRarity.uncommon);
 
     public final String name;
     public final EnumRarity rarity;

src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java

@@ -108,6 +108,9 @@ public class InitOreDict{
 
         addOre(InitBlocks.blockTestifiBucksWhiteWall, "blockWhiteBrick");
         addOre(InitBlocks.blockTestifiBucksGreenWall, "blockGreenBrick");
+
+        addOre(InitItems.itemColorLens, "itemColorLens");
+        addOre(InitItems.itemMisc, TheMiscItems.LENS.ordinal(), "itemLens");
     }
 
     private static void addOre(ItemStack stack, String name){

src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java

@@ -10,6 +10,7 @@
 
 package ellpeck.actuallyadditions.recipe;
 
+import ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors;
 import ellpeck.actuallyadditions.config.values.ConfigCrafting;
 import ellpeck.actuallyadditions.util.AssetUtil;
 import ellpeck.actuallyadditions.util.Util;
@@ -26,6 +27,7 @@ public class ReconstructorRecipeHandler{
     public static final int RECIPES_FOR_BOOKLET_PAGE = 12;
 
     public static void init(){
+        //Crystal Blocks
         addRecipe("blockRedstone", "blockCrystalRed", 400);
         addRecipe("blockLapis", "blockCrystalBlue", 400);
         addRecipe("blockDiamond", "blockCrystalLightBlue", 6000);
@@ -33,6 +35,7 @@ public class ReconstructorRecipeHandler{
         addRecipe("blockCoal", "blockCrystalBlack", 600);
         addRecipe("blockIron", "blockCrystalWhite", 800);
 
+        //Crystal Items
         addRecipe("dustRedstone", "crystalRed", 40);
         addRecipe("gemLapis", "crystalBlue", 40);
         addRecipe("gemDiamond", "crystalLightBlue", 600);
@@ -40,10 +43,21 @@ public class ReconstructorRecipeHandler{
         addRecipe("coal", "crystalBlack", 60);
         addRecipe("ingotIron", "crystalWhite", 80);
 
+        //Lenses
+        addRecipe("itemLens", "itemColorLens", 5000);
+        addRecipe("itemColorLens", "itemLens", 5000);
+
+        //Misc
         if(ConfigCrafting.RECONSTRUCTOR_MISC.isEnabled()){
             addRecipe("sand", "soulSand", 20000);
             addRecipe("blockQuartz", "blockWhiteBrick", 10);
             addRecipe("blockQuartz", "blockGreenBrick", 10, LensType.COLOR);
+
+            //Colors
+            for(int i = 0; i < TheColoredLampColors.values().length-1; i++){
+                addRecipe("dye"+TheColoredLampColors.values()[i].name, "dye"+TheColoredLampColors.values()[i+1].name, 2000);
+            }
+            addRecipe("dye"+TheColoredLampColors.values()[15].name, "dye"+TheColoredLampColors.values()[0].name, 2000);
         }
     }
 

src/main/resources/assets/actuallyadditions/lang/en_US.lang

@@ -305,6 +305,8 @@ item.actuallyadditions.itemCrystalLightBlue.name=Diamatine Crystal
 item.actuallyadditions.itemCrystalGreen.name=Emeradic Crystal
 item.actuallyadditions.itemCrystalBlack.name=Void Crystal
 item.actuallyadditions.itemCrystalWhite.name=Enori Crystal
+item.actuallyadditions.itemMiscLens.name=Lens
+item.actuallyadditions.itemColorLens.name=Lens: Color
 
 #Tooltips
 tooltip.actuallyadditions.onSuffix.desc=On
@@ -596,8 +598,8 @@ booklet.actuallyadditions.chapter.blackLotus.text.1=Think of this: <n>You need t
 booklet.actuallyadditions.chapter.blackLotus.text.2=<i>No, not that one, Vaz
 
 booklet.actuallyadditions.chapter.crystals.name=Crystals and Reconstructor
-booklet.actuallyadditions.chapter.crystals.text.1=For many Crafting Operations in <imp>Actually Additions<r>, you will need <item>Crystals<r> or <item>Crystal Blocks<r>. <n>These can be made using an <item>Atomic Reconstructor<r>. Just place one down facing in any direction and it will <imp>shoot out a red laser<r>. When placing some of the blocks shown on the following pages in front of the laser, they will be <imp>converted into Crystals<r>. <n>During the shooting of a laser and one conversion, it uses at least <imp><power> RF<r>, but the rate varies depending on the converted block.
-booklet.actuallyadditions.chapter.crystals.text.2=When hitting a block with the Laser, it will <imp>convert the other blocks around it<r>, too. This includes <imp>items on the ground<r>. <n>When trying to power the Reconstructor, you will notice that <imp>many generators require crystals<r>. Not to worry, though, as you can <imp>use<r> <item>Coal Generators<r> to create your first couple of crystals before you can <imp>upgrade to better sources<r>. <n><n>For additional Reconstructor Recipes, see the <imp>"Useful Reconstructor Recipes"<r> Entry.
+booklet.actuallyadditions.chapter.crystals.text.1=The <item>Atomic Reconstructor<r> is used to craft <item>Crystals<r>, which are the main crafting ingredient in most items from <imp>Actually Additions<r>. <n>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. <n>When shooting a laser, it uses <imp><rf> RF<r>, but additional rates vary depending on the conversion.
+booklet.actuallyadditions.chapter.crystals.text.2=The Reconstructor can be <imp>upgraded<r>, however, by the use of <item>Lenses<r>. They can be applied to the Reconstructor by <imp>right-clicking with one in hand<r>, and taken out again when right-clicking with an empty hand. <n>When looking at Recipes, the Lens needed for the operation will also be shown. <n>The Crafting Recipes for the Lenses can also be found on the following pages.
 booklet.actuallyadditions.chapter.crystals.text.4=When you have crafted a couple of items, you might want to find a way to <imp>automate this<r>. <n>There is a very simple way to do accomplish this: <n>Place the <item>Atomic Reconstructor<r> down facing into a <item>Precision Dropper<r> (to find it, look it up in the <imp>All Items and Search<r> Entry!). <n>Next, place a <item>Ranged Collector<r> in the area that has the converted items set as a whitelist. <n>Now you can just chuck your raw materials into the Dropper to convert them!
 
 booklet.actuallyadditions.chapter.bookTutorial.name=Intro to the Manual