From 3e6a18729d685706374ac2bc998decf51c359217 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 6 May 2016 16:29:49 +0200 Subject: [PATCH] Reconstructor module recipe and doc --- .../actuallyadditions/api/ActuallyAdditionsAPI.java | 3 ++- .../actuallyadditions/mod/booklet/InitBooklet.java | 7 +++++++ .../mod/config/values/ConfigCrafting.java | 1 + .../actuallyadditions/mod/crafting/ItemCrafting.java | 12 ++++++++++++ .../actuallyadditions/mod/creative/CreativeTab.java | 2 +- .../assets/actuallyadditions/lang/en_US.lang | 6 +++++- 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java index d342e758b..d777424fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java @@ -27,7 +27,7 @@ public class ActuallyAdditionsAPI{ public static final String MOD_ID = "actuallyadditions"; public static final String API_ID = MOD_ID+"api"; - public static final String API_VERSION = "10"; + public static final String API_VERSION = "11"; public static List crusherRecipes = new ArrayList(); public static List ballOfFurReturnItems = new ArrayList(); @@ -47,6 +47,7 @@ public class ActuallyAdditionsAPI{ public static IBookletEntry entryItemsNonRF; public static IBookletEntry entryItemsRF; public static IBookletEntry entryMisc; + public static IBookletEntry entryCrossover; public static IBookletEntry allAndSearch; /** 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 0c7524dba..cb4655401 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java @@ -33,6 +33,7 @@ import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.fml.common.Loader; import java.util.ArrayList; @@ -48,6 +49,7 @@ public class InitBooklet{ ActuallyAdditionsAPI.entryItemsNonRF = new BookletEntry("itemsNoRF"); ActuallyAdditionsAPI.entryItemsRF = new BookletEntry("itemsRF").setSpecial(); ActuallyAdditionsAPI.entryMisc = new BookletEntry("misc"); + ActuallyAdditionsAPI.entryCrossover = new BookletEntry("crossover"); ActuallyAdditionsAPI.allAndSearch = new BookletEntryAllSearch("allAndSearch").setSpecial(); } @@ -143,5 +145,10 @@ public class InitBooklet{ new BookletChapter("growthRing", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing)); new BookletChapter("waterRemovalRing", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemWaterRemovalRing), new PageCrafting(1, ItemCrafting.recipeWaterRing)); new BookletChapter("batteries", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemBatteryTriple), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeBattery).setNoText(), new PageCrafting(3, ItemCrafting.recipeBatteryDouble).setNoText(), new PageCrafting(4, ItemCrafting.recipeBatteryTriple).setNoText(), new PageCrafting(5, ItemCrafting.recipeBatteryQuadruple).setNoText(), new PageCrafting(6, ItemCrafting.recipeBatteryQuintuple).setNoText()); + + //Crossover + if(Loader.isModLoaded("rarmor")){ + new BookletChapter("rarmorModuleReconstructor", ActuallyAdditionsAPI.entryCrossover, new ItemStack(InitItems.itemRarmorModuleReconstructor), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeRarmorModuleReconstructor).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 b5aaa8e31..dda70f30a 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 @@ -61,6 +61,7 @@ public enum ConfigCrafting{ KNIFE("Knife", ConfigCategories.ITEMS_CRAFTING), STICK_CRAFTER("Crafting Table On A Stick", ConfigCategories.ITEMS_CRAFTING), MASHED_FOOD("Mashed Food", ConfigCategories.ITEMS_CRAFTING), + RARMOR_RECONSTRUCTOR_MODULE("Rarmor Reconstructor Module", ConfigCategories.ITEMS_CRAFTING), RING_SPEED("Speed Ring", ConfigCategories.POTION_RING_CRAFTING), RING_HASTE("Haste Ring", ConfigCategories.POTION_RING_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 9e3f733ea..27c63cff4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.mod.config.ConfigValues; import de.ellpeck.actuallyadditions.mod.config.values.ConfigCrafting; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.metalists.*; +import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import de.ellpeck.actuallyadditions.mod.util.RecipeUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.block.IGrowable; @@ -27,6 +28,7 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; @@ -81,6 +83,7 @@ public class ItemCrafting{ public static IRecipe recipeLens; public static IRecipe recipeCrateKeeper; public static IRecipe recipeEnderStar; + public static IRecipe recipeRarmorModuleReconstructor; public static void init(){ @@ -447,6 +450,15 @@ public class ItemCrafting{ new ItemStack(Items.SIGN))); } + //Rarmor Reconstructor Module + if(Loader.isModLoaded("rarmor") && ConfigCrafting.RARMOR_RECONSTRUCTOR_MODULE.isEnabled()){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemRarmorModuleReconstructor), + " G ", "GSG", " G ", + 'G', ItemUtil.getItemFromName("rarmor:ribbonCable"), + 'S', new ItemStack(InitBlocks.blockAtomicReconstructor))); + recipeRarmorModuleReconstructor = RecipeUtil.lastIRecipe(); + } + //Tiny Coal GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_COAL.ordinal()), new ItemStack(Items.COAL)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index 457e5c375..1a77d0b76 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -176,6 +176,7 @@ public class CreativeTab extends CreativeTabs{ this.add(InitItems.itemSolidifiedExperience); this.add(InitItems.itemLeafBlower); this.add(InitItems.itemLeafBlowerAdvanced); + this.add(InitItems.itemRarmorModuleReconstructor); this.add(InitItems.woodenPaxel); this.add(InitItems.stonePaxel); @@ -191,7 +192,6 @@ public class CreativeTab extends CreativeTabs{ this.add(InitItems.itemPaxelCrystalBlack); this.add(InitItems.itemPaxelCrystalGreen); this.add(InitItems.itemPaxelCrystalWhite); - this.add(InitItems.itemRarmorModuleReconstructor); InitForeignPaxels.addToCreativeTab(); this.add(InitBlocks.blockCrystal); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index c256d6045..d8885c0f1 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -559,6 +559,7 @@ booklet.actuallyadditions.shapedOreRecipe=Shaped OreDictionary Recipe #Booklet Entries booklet.actuallyadditions.indexEntry.gettingStarted.name=Getting Started booklet.actuallyadditions.indexEntry.misc.name=Miscellaneous +booklet.actuallyadditions.indexEntry.crossover.name=Mod Crossover booklet.actuallyadditions.indexEntry.functionalNoRF.name=Blocks that don't use RF booklet.actuallyadditions.indexEntry.allAndSearch.name=All Items and Search booklet.actuallyadditions.indexEntry.functionalRF.name=Blocks that use RF @@ -776,4 +777,7 @@ booklet.actuallyadditions.chapter.enderStar.name=Ender Star booklet.actuallyadditions.chapter.enderStar.text.1=The Ender Star can be obtained by both killing a wither and going to the end to collect Dragon's Breath. The latter is obtained by using a bottle on the purple particles that the dragon spits out. The Ender Star is used for multiple crafting recipes. booklet.actuallyadditions.chapter.phantomRedstoneface.name=Phantom Redstoneface -booklet.actuallyadditions.chapter.phantomRedstoneface.text.1=If you don't know what Phantomfaces are, check the Phantomfaces Entry first. The Phantom Redstoneface can be used to transmit redstone signals. This one, however, works differently to the other Phantomfaces as it only works in one direction. What this means is that the connected block has to provide redstone power for redstone next to the Redstoneface to become powered. It does not work the other way around. \ No newline at end of file +booklet.actuallyadditions.chapter.phantomRedstoneface.text.1=If you don't know what Phantomfaces are, check the Phantomfaces Entry first. The Phantom Redstoneface can be used to transmit redstone signals. This one, however, works differently to the other Phantomfaces as it only works in one direction. What this means is that the connected block has to provide redstone power for redstone next to the Redstoneface to become powered. It does not work the other way around. + +booklet.actuallyadditions.chapter.rarmorModuleReconstructor.name=Reconstruction Module +booklet.actuallyadditions.chapter.rarmorModuleReconstructor.text.1=The Reconstruction Module can be used in the Rarmor. The Rarmor is a type of configurable armor that is added by the Rarmor Mod. If you want to use this module, place it inside the Rarmor GUI that is accessed by wearing the armor and opening your inventory. The module, when the player is sneaking, will shoot out a reconstruction beam that would be created by the Atomic Reconstructor without a lens. This will cause blocks that are hit to be reconstructed. \ No newline at end of file