From 9f314cf51d82f8d7629a516100db1761ef7b515a Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 8 Sep 2016 17:34:54 +0200 Subject: [PATCH] fluid laser relays recipe and doc --- .../actuallyadditions/mod/booklet/InitBooklet.java | 1 + .../mod/config/values/ConfigCrafting.java | 1 + .../actuallyadditions/mod/crafting/BlockCrafting.java | 9 +++++++++ .../ellpeck/actuallyadditions/mod/util/RecipeUtil.java | 5 ++--- .../resources/assets/actuallyadditions/lang/en_US.lang | 5 ++++- 5 files changed, 17 insertions(+), 4 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 124a04313..c6df1177b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -118,6 +118,7 @@ public final class InitBooklet{ //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(); + new BookletChapter("fluidLaser", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockLaserRelayFluids), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFluidLaser).setNoText()).setSpecial(); new BookletChapter("breaker", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockBreaker), new PageCrafting(1, BlockCrafting.recipeBreaker).setPageStacksWildcard(), new PageCrafting(2, BlockCrafting.recipePlacer).setPageStacksWildcard(), new PageCrafting(3, BlockCrafting.recipeLiquidPlacer).setPageStacksWildcard(), new PageCrafting(4, BlockCrafting.recipeLiquidCollector).setPageStacksWildcard()); new BookletChapter("dropper", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockDropper), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeDropper).setNoText()); new BookletChapter("phantomfaces", ActuallyAdditionsAPI.entryFunctionalNonRF, new ItemStack(InitBlocks.blockPhantomLiquiface), new PageTextOnly(1).addTextReplacement("", TileEntityPhantomface.RANGE), new PageTextOnly(2), new PageCrafting(3, BlockCrafting.recipePhantomface), new PageCrafting(4, BlockCrafting.recipeLiquiface), new PageCrafting(5, BlockCrafting.recipeEnergyface), new PageCrafting(6, ItemCrafting.recipePhantomConnector).setNoText(), new PageCrafting(7, BlockCrafting.recipePhantomBooster)).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 63204fd3b..de0f6bb47 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 @@ -153,6 +153,7 @@ public enum ConfigCrafting{ LASER_RELAY_ITEM("Item Laser Relay", ConfigCategories.BLOCKS_CRAFTING), LASER_RELAY_ITEM_WHITELIST("Advanced Item Laser Relay", ConfigCategories.BLOCKS_CRAFTING), LASER_WRENCH("Laser Wrench", ConfigCategories.ITEMS_CRAFTING), + 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), diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java index 6946fabde..8c90493ea 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -95,6 +95,7 @@ public final class BlockCrafting{ public static IRecipe recipeShockSuppressor; public static IRecipe recipeEmpowerer; public static IRecipe[] recipesTinyTorch = new IRecipe[2]; + public static IRecipe recipeFluidLaser; public static void init(){ @@ -272,6 +273,14 @@ public final class BlockCrafting{ recipeLaserRelayItemWhitelist = RecipeUtil.lastIRecipe(); } + //Fluid Laser Relay + if(ConfigCrafting.LASER_RELAY_FLUIDS.isEnabled()){ + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockLaserRelayFluids), + new ItemStack(InitBlocks.blockLaserRelay), + new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()))); + recipeFluidLaser = RecipeUtil.lastIRecipe(); + } + //Item Interface if(ConfigCrafting.ITEM_INTERFACE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockItemViewer), diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java index df35031f9..51b63e1e7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java @@ -38,9 +38,8 @@ public final class RecipeUtil{ } public static IRecipe lastIRecipe(){ - List list = CraftingManager.getInstance().getRecipeList(); - Object recipe = list.get(list.size()-1); - return recipe instanceof IRecipe ? (IRecipe)recipe : null; + List list = CraftingManager.getInstance().getRecipeList(); + return list.get(list.size()-1); } public static EmpowererRecipe lastEmpowererRecipe(){ diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 1cece4f28..893e42ecd 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -1012,4 +1012,7 @@ booklet.actuallyadditions.chapter.empowerer.name=Empowerer booklet.actuallyadditions.chapter.empowerer.text.1=The Empowerer is a mid-tier block that can be used to empower crystals and other items. To use it, items that should be empowered can be right-clicked onto the Empowerer, and empowering items need to be placed on Display Stands that are two blocks away, like seen in the picture on the next page. To then activate the process, every Display Stand needs to be powered with a lot of RF that is then drained to empower the item on the Empowerer. booklet.actuallyadditions.chapter.empowerer.text.2=The placement of the Display Stands booklet.actuallyadditions.chapter.empowerer.text.3=Because every mod needs an Infusion Altar -booklet.actuallyadditions.chapter.empowerer.text.4=The Display Stand can also be used for other things! See the Blocks that use RF section for more info about it! \ No newline at end of file +booklet.actuallyadditions.chapter.empowerer.text.4=The Display Stand can also be used for other things! See the Blocks that use RF section for more info about it! + +booklet.actuallyadditions.chapter.fluidLaser.name=Fluid Laser Relays +booklet.actuallyadditions.chapter.fluidLaser.text.1=The Fluid Laser Relays work much in the same way that normal Laser Relays do, so if you want to know anything about them, visit the Blocks that use RF section of the manual. The thing that makes the Fluid Laser Relay different from the Energy Laser Relay, however, is that it transfers fluids from internal tanks of blocks into other blocks. \ No newline at end of file