From 15c8fcc2442fe814fb87a88b204e2d5a116c2748 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 5 Jul 2016 18:32:22 +0200 Subject: [PATCH] Shock Suppressor texture, recipe and doc --- .../mod/blocks/BlockShockSuppressor.java | 2 +- .../actuallyadditions/mod/booklet/InitBooklet.java | 1 + .../mod/config/values/ConfigCrafting.java | 1 + .../mod/crafting/BlockCrafting.java | 10 ++++++++++ .../blockstates/blockShockSuppressor.json | 14 ++++++++++++++ .../assets/actuallyadditions/lang/en_US.lang | 6 +++++- 6 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockShockSuppressor.json diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java index 8b7c110f8..ced0857cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockShockSuppressor.java @@ -98,7 +98,7 @@ public class BlockShockSuppressor extends BlockContainerBase{ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.RARE; + return EnumRarity.EPIC; } @Override 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 c4f02ba6e..271ec86d1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -119,6 +119,7 @@ public final class InitBooklet{ new BookletChapter("longRangeBreaker", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockDirectionalBreaker), new PageTextOnly(1).addTextReplacement("", TileEntityDirectionalBreaker.ENERGY_USE).addTextReplacement("", TileEntityDirectionalBreaker.RANGE), new PageCrafting(2, BlockCrafting.recipeDirectionalBreaker).setPageStacksWildcard()); new BookletChapter("playerInterface", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockPlayerInterface), new PageTextOnly(1).addTextReplacement("", TileEntityPlayerInterface.DEFAULT_RANGE), new PageCrafting(2, BlockCrafting.recipePlayerInterface).setNoText()).setSpecial(); new BookletChapter("displayStand", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockDisplayStand), new PageTextOnly(1), new PageTextOnly(2), new PageCrafting(3, BlockCrafting.recipeDisplayStand).setNoText()).setSpecial(); + new BookletChapter("shockSuppressor", ActuallyAdditionsAPI.entryFunctionalRF, new ItemStack(InitBlocks.blockShockSuppressor), new PageTextOnly(1).addTextReplacement("", TileEntityShockSuppressor.RANGE).addTextReplacement("", TileEntityShockSuppressor.USE_PER), new PageCrafting(2, BlockCrafting.recipeShockSuppressor).setNoText()); //RF Generating Blocks new BookletChapter("solarPanel", ActuallyAdditionsAPI.entryGeneratingRF, new ItemStack(InitBlocks.blockFurnaceSolar), new PageTextOnly(1).addTextReplacement("", TileEntityFurnaceSolar.PRODUCE), new PageCrafting(2, BlockCrafting.recipeSolar).setNoText()); 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 e10f087b1..610eeb5cc 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 @@ -159,6 +159,7 @@ public enum ConfigCrafting{ ATOMIC_RECONSTRUCTOR("Atomic Reconstructor", ConfigCategories.BLOCKS_CRAFTING), MINER("Miner", ConfigCategories.BLOCKS_CRAFTING), FIREWORK_BOX("Firework Box", ConfigCategories.BLOCKS_CRAFTING), + SHOCK_SUPPRESSOR("Shock Absorber", ConfigCategories.BLOCKS_CRAFTING), ENDER_STAR("Ender Star", ConfigCategories.ITEMS_CRAFTING), SPAWNER_CHANGER("Spawner Changer", ConfigCategories.ITEMS_CRAFTING), ITEM_INTERFACE("Item Interface", ConfigCategories.BLOCKS_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 8b918ca82..f38bd8298 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -90,6 +90,7 @@ public final class BlockCrafting{ public static IRecipe recipeBookStand; public static IRecipe recipePlayerInterface; public static IRecipe recipeDisplayStand; + public static IRecipe recipeShockSuppressor; public static void init(){ @@ -107,6 +108,15 @@ public final class BlockCrafting{ recipeFireworkBox = RecipeUtil.lastIRecipe(); } + //Shock Suppressor + if(ConfigCrafting.SHOCK_SUPPRESSOR.isEnabled()){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockShockSuppressor), + "OOO", "OCO", "OOO", + 'O', new ItemStack(Blocks.OBSIDIAN), + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); + recipeShockSuppressor = RecipeUtil.lastIRecipe(); + } + //Display Stand if(ConfigCrafting.DISPLAY_STAND.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockDisplayStand), diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockShockSuppressor.json b/src/main/resources/assets/actuallyadditions/blockstates/blockShockSuppressor.json new file mode 100644 index 000000000..8de206d19 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockShockSuppressor.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockShockAbsorber" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 476ac608d..b379223f5 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -212,6 +212,7 @@ tile.actuallyadditions.blockItemViewer.name=Item Interface tile.actuallyadditions.blockImpureIron.name=Impure Iron tile.actuallyadditions.blockBookletStand.name=Wall-Mount Manual tile.actuallyadditions.blockDisplayStand.name=Display Stand +tile.actuallyadditions.blockShockSuppressor.name=Shock Absorber #ESD tile.actuallyadditions.blockInputter.name=ESD @@ -918,4 +919,7 @@ booklet.actuallyadditions.chapter.itemFilter.text.1=The Item Filter can booklet.actuallyadditions.chapter.videoGuide.name=A Video Guide booklet.actuallyadditions.chapter.videoGuide.text.1=If you are a bit confused as to what is going on or just want to get a glimpse of what Actually Additions has to offer, there is this brilliant video by a guy called Booty Toast (yes, that is a weird name), that shows off what is possible in a really enjoyable way. Just click the button to have the video opened on YouTube! Give it a watch! -booklet.actuallyadditions.chapter.videoGuide.page.1.button=Watch Video \ No newline at end of file +booklet.actuallyadditions.chapter.videoGuide.page.1.button=Watch Video + +booklet.actuallyadditions.chapter.shockSuppressor.name=Shock Absorber +booklet.actuallyadditions.chapter.shockSuppressor.text.1=The Shock Absorber is a block that, when supplied with RF, it will protect an area of up to blocks around it from any type of Explosion, be it ghasts, TNT or creepers. Every block that is protected will result in a loss of RF. \ No newline at end of file