From 508ae87bdfa956d8eac94d8e0b008c25b0c6eb49 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 31 Oct 2016 16:56:04 +0100 Subject: [PATCH] Mining lens recipe and doc --- .../mod/booklet/InitBooklet.java | 7 ++++++- .../mod/config/values/ConfigCrafting.java | 1 + .../mod/crafting/ItemCrafting.java | 17 +++++++++++++++++ .../mod/items/lens/LensMining.java | 4 ++-- .../assets/actuallyadditions/lang/en_US.lang | 3 +++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java index 32db34a94..88eec21b2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -29,6 +29,7 @@ import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.gen.OreGen; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.lens.LensDisenchanting; +import de.ellpeck.actuallyadditions.mod.items.lens.LensMining; import de.ellpeck.actuallyadditions.mod.items.lens.LensRecipeHandler; import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods; import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; @@ -64,6 +65,7 @@ public final class InitBooklet{ public static void postInit(){ initChapters(); + int totalCount = 0; int count = 0; for(IBookletEntry entry : ActuallyAdditionsAPI.BOOKLET_ENTRIES){ for(IBookletChapter chapter : entry.getChapters()){ @@ -77,11 +79,13 @@ public final class InitBooklet{ count++; } } + + totalCount++; } } } - ModUtil.LOGGER.info("Registered "+count+" booklet pages as containing information about items or fluids!"); + ModUtil.LOGGER.info("Registered "+count+" out of "+totalCount+" booklet pages as containing information about items or fluids!"); } private static void initChapters(){ @@ -141,6 +145,7 @@ public final class InitBooklet{ new BookletChapter("lensDeath", ActuallyAdditionsAPI.entryReconstruction, new ItemStack(InitItems.itemDamageLens), new PageTextOnly(1), new PageReconstructor(2, LensRecipeHandler.recipeDamageLens).setNoText()); new BookletChapter("lensDetonation", ActuallyAdditionsAPI.entryReconstruction, new ItemStack(InitItems.itemExplosionLens), new PageTextOnly(1), new PageReconstructor(2, LensRecipeHandler.recipeExplosionLens).setNoText()); new BookletChapter("lensDisenchanting", ActuallyAdditionsAPI.entryReconstruction, new ItemStack(InitItems.itemDisenchantingLens), new PageTextOnly(1).addTextReplacement("", LensDisenchanting.ENERGY_USE), new PageCrafting(2, ItemCrafting.recipeDisenchantingLens).setNoText()).setSpecial(); + new BookletChapter("lensMining", ActuallyAdditionsAPI.entryReconstruction, new ItemStack(InitItems.itemMiningLens), new PageTextOnly(1).addTextReplacement("", LensMining.ENERGY_USE), new PageCrafting(2, ItemCrafting.recipeMiningLens).setNoText()).setImportant(); //No RF Using Blocks new BookletChapter("itemStorage", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockLaserRelayItemWhitelist), new PageTextOnly(1), new PageTextOnly(2), new PagePicture(3, "pageItemLaserRelayBasic", 78), new PagePicture(4, "pageItemLaserRelayFail", 84), new PagePicture(5, "pageItemLaserRelayTransfer", 78), new PagePicture(6, "pageItemLaserRelayWhitelistChest", 76), new PagePicture(7, "pageItemLaserRelayWhitelistInterface", 75), new PagePicture(8, "pageItemLaserRelaySystem", 75), new PageTextOnly(9), new PageCrafting(10, BlockCrafting.recipeLaserRelayItem).setNoText().setPageStacksWildcard(), new PageCrafting(11, BlockCrafting.recipeLaserRelayItemWhitelist).setNoText().setPageStacksWildcard(), new PageCrafting(12, BlockCrafting.recipeItemInterface).setNoText()).setImportant(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java index 0314a6435..64039dae4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigCrafting.java @@ -138,6 +138,7 @@ public enum ConfigCrafting{ LASER_RELAY_FLUIDS("Fluid Laser Relay", ConfigCategories.BLOCKS_CRAFTING), CHEST_TO_CRATE_UPGRADE("Chest To Crate Upgrade", ConfigCategories.ITEMS_CRAFTING), DISENCHANTING_LENS("Disenchanting Lens", ConfigCategories.ITEMS_CRAFTING), + MINING_LENS("Mining Lens", ConfigCategories.ITEMS_CRAFTING), CRATE_KEEPER("Crate Keeper", ConfigCategories.ITEMS_CRAFTING), DRILL_CORE("Drill Core", ConfigCategories.ITEMS_CRAFTING), ATOMIC_RECONSTRUCTOR("Atomic Reconstructor", ConfigCategories.BLOCKS_CRAFTING), diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java index 3c63010a4..fde4017cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -88,6 +88,7 @@ public final class ItemCrafting{ public static IRecipe recipeFilter; public static IRecipe recipePlayerProbe; public static IRecipe recipeDisenchantingLens; + public static IRecipe recipeMiningLens; public static IRecipe recipeBag; public static IRecipe recipeVoidBag; @@ -171,6 +172,22 @@ public final class ItemCrafting{ recipeDisenchantingLens = RecipeUtil.lastIRecipe(); } + //Mining Lens + if(ConfigCrafting.MINING_LENS.isEnabled()){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMiningLens), + "DGI", "CLB", "QPE", + 'D', "gemDiamond", + 'G', "ingotGold", + 'I', "ingotIron", + 'C', "coal", + 'L', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), + 'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), + 'Q', "gemQuartz", + 'P', "gemLapis", + 'E', "gemEmerald")); + recipeMiningLens = RecipeUtil.lastIRecipe(); + } + //Filter if(ConfigCrafting.FILTER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemFilter), diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java index 11096917d..ce77d71f7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java @@ -28,7 +28,7 @@ import java.util.List; public class LensMining extends Lens{ - public static final int ENERGY_USE = 30000; + public static final int ENERGY_USE = 60000; private static final List STONE_ORES = new ArrayList(); private static final List NETHERRACK_ORES = new ArrayList(); @@ -102,7 +102,7 @@ public class LensMining extends Lens{ if(stacks != null && !stacks.isEmpty()){ for(ItemStack aStack : stacks){ if(aStack != null && aStack.getItem() instanceof ItemBlock){ - adaptedUse += (totalWeight-ore.itemWeight)%10000; + adaptedUse += (totalWeight-ore.itemWeight)%40000; stack = aStack; found = true; diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 0dc2a81a7..0cecf47bf 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -944,6 +944,9 @@ booklet.actuallyadditions.chapter.lensDetonation.text.1=The Lens of Detona booklet.actuallyadditions.chapter.lensDisenchanting.name=Lens of Disenchanting booklet.actuallyadditions.chapter.lensDisenchanting.text.1=The Lens of Disenchanting can be used to tranfer a single enchantment from an enchanted item to either a Book or an already Enchanted Book. This can be achieved by throwing the two items in front of the laser, but they have to be together in one blockspace. When they are hit by the laser, the topmost enchantment from the non-book item is removed and added onto the book. However, this uses RF. +booklet.actuallyadditions.chapter.lensMining.name=Lens of the Miner +booklet.actuallyadditions.chapter.lensMining.text.1=The Lens of the Miner can create ores out of blocks in its sight. When the laser hits a block of stone, it will convert it into different overworld ores, whereas a block of netherrack will be converted into nether ores. Each operation uses RF, however each operation requires additional power depending on the rarity of the ore that is generated. + booklet.actuallyadditions.chapter.miscDecorStuffsAndThings.name=Some Decor booklet.actuallyadditions.chapter.miscDecorStuffsAndThings.text.1=Sometimes, when you build, you notice there is just not enough decor blocks. Well, we present to you: Ethetic Blocks! These are some quartz-like decor blocks with lovely patterns that can also be converted into Stairs, Slabs and Walls using the usual, well-known recipe patterns.