From f0710eaa8b8d679cbd010d2653f529d61615e3ae Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 16 Dec 2015 15:45:01 +0100 Subject: [PATCH] Crate Keeper recipe, loc and doc --- .../actuallyadditions/booklet/InitBooklet.java | 2 +- .../config/values/ConfigCrafting.java | 1 + .../actuallyadditions/crafting/ItemCrafting.java | 11 +++++++++++ .../actuallyadditions/creative/CreativeTab.java | 1 + .../assets/actuallyadditions/lang/en_US.lang | 6 ++++-- .../textures/items/itemCrateKeeper.png | Bin 0 -> 479 bytes 6 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemCrateKeeper.png diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index 3764b3803..d4b522014 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -96,7 +96,7 @@ public class InitBooklet{ new BookletChapter("fishingNet", entryFunctionalNonRF, new ItemStack(InitBlocks.blockFishingNet), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFisher).setNoText()); new BookletChapter("feeder", entryFunctionalNonRF, new ItemStack(InitBlocks.blockFeeder), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeFeeder).setNoText()); new BookletChapter("compost", entryFunctionalNonRF, new ItemStack(InitBlocks.blockCompost), new PageTextOnly(1).setStack(new ItemStack(InitItems.itemFertilizer)).addTextReplacement("", TileEntityCompost.AMOUNT), new PageCrafting(2, BlockCrafting.recipeCompost).setNoText(), new PageCrafting(3, ItemCrafting.recipesMashedFood)); - new BookletChapter("crate", entryFunctionalNonRF, new ItemStack(InitBlocks.blockGiantChest), new PageCrafting(1, BlockCrafting.recipeCrate), new PageCrafting(2, ItemCrafting.recipeChestToCrateUpgrade)); + new BookletChapter("crate", entryFunctionalNonRF, new ItemStack(InitBlocks.blockGiantChest), new PageCrafting(1, BlockCrafting.recipeCrate), new PageCrafting(2, ItemCrafting.recipeCrateKeeper), new PageCrafting(3, ItemCrafting.recipeChestToCrateUpgrade)); new BookletChapter("rangedCollector", entryFunctionalNonRF, new ItemStack(InitBlocks.blockRangedCollector), new PageTextOnly(1).addTextReplacement("", TileEntityRangedCollector.RANGE), new PageCrafting(2, BlockCrafting.recipeRangedCollector).setNoText()); //RF Using Blocks diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 8a27a50aa..2fe7b2d58 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -148,6 +148,7 @@ public enum ConfigCrafting{ LASER_WRENCH("Laser Wrench", ConfigCategories.ITEMS_CRAFTING), CHEST_TO_CRATE_UPGRADE("Chest To Crate Upgrade", ConfigCategories.ITEMS_CRAFTING), + CRATE_KEEPER("Crate Keeper", ConfigCategories.ITEMS_CRAFTING), DRILL_CORE("Drill Core", ConfigCategories.ITEMS_CRAFTING), ATOMIC_RECONSTRUCTOR("Atomic Reconstructor", ConfigCategories.BLOCKS_CRAFTING), MINER("Miner", ConfigCategories.BLOCKS_CRAFTING), diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index ca34fd4bc..09f6e8a3e 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -78,6 +78,7 @@ public class ItemCrafting{ public static IRecipe recipeDrillCore; public static IRecipe recipeBlackDye; public static IRecipe recipeLens; + public static IRecipe recipeCrateKeeper; public static void init(){ @@ -109,6 +110,16 @@ public class ItemCrafting{ recipeChestToCrateUpgrade = Util.GetRecipes.lastIRecipe(); } + //Crate Keeper + if(ConfigCrafting.CRATE_KEEPER.isEnabled()){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemCrateKeeper), + "WIW", "IQI", "WIW", + 'I', "ingotIron", + 'W', "plankWood", + 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()))); + recipeCrateKeeper = Util.GetRecipes.lastIRecipe(); + } + //Laser Wrench if(ConfigCrafting.LASER_WRENCH.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemLaserWrench), diff --git a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java index ba3e5ae37..7865f63f8 100644 --- a/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java +++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -116,6 +116,7 @@ public class CreativeTab extends CreativeTabs{ add(InitItems.itemExplosionLens); add(InitItems.itemDamageLens); add(InitItems.itemLaserWrench); + add(InitItems.itemCrateKeeper); add(InitItems.itemChestToCrateUpgrade); add(InitItems.itemDrill); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 400f5a9f8..53faa37f8 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -315,6 +315,7 @@ item.actuallyadditions.itemMiscLens.name=Lens item.actuallyadditions.itemColorLens.name=Lens of Color item.actuallyadditions.itemExplosionLens.name=Lens of Detonation item.actuallyadditions.itemDamageLens.name=Lens of Certain Death +item.actuallyadditions.itemCrateKeeper.name=Storage Crate Keeper #Tooltips tooltip.actuallyadditions.onSuffix.desc=On @@ -535,8 +536,9 @@ booklet.actuallyadditions.chapter.compost.text.1=The Compost is used to booklet.actuallyadditions.chapter.compost.text.3=Mashed Food can be crafted from any type of food or plantable item. booklet.actuallyadditions.chapter.crate.name=Storage Crates -booklet.actuallyadditions.chapter.crate.text.1=Storage Crates are big. Really big. They hold tons of items, more than 4 chests worth of them. "F-in' gigantic" -Some Magazine -booklet.actuallyadditions.chapter.crate.text.2=The Chest To Storage Crate Upgrade allows you to convert any chest into a Storage Crate, retaining its items! Just shift-right-click onto the chest to apply it. +booklet.actuallyadditions.chapter.crate.text.1=Storage Crates are big. Really big. They hold tons of items, more than 4 chests worth of them. +booklet.actuallyadditions.chapter.crate.text.2=Placing a Storage Crate Keeper inside the Storage Crate before breaking it will cause it to keep all of its items, however the Keeper will be destroyed upon placing the Crate back down. +booklet.actuallyadditions.chapter.crate.text.3=The Chest To Storage Crate Upgrade allows you to convert any chest into a Storage Crate, retaining its items! Just shift-right-click onto the chest to apply it. booklet.actuallyadditions.chapter.coffeeMachine.name=Coffee Machine booklet.actuallyadditions.chapter.coffeeMachine.text.1=The Coffee Machine is a block used to make Coffee, a potion-like item that gives the user several buffs. To use the coffee machine, you need a Empty Cup, Coffee Beans, which can be found in the wild, harvested and planted on farmland again, RF/t and mB of Water per cup brewed. On the coffee machine recipe pages at the back, to see what the item does, just hover over the Cup of Coffee. diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemCrateKeeper.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrateKeeper.png new file mode 100644 index 0000000000000000000000000000000000000000..14cb9578e37b3c4431d9ab538638e2eb58ccd6cb GIT binary patch literal 479 zcmV<50U-W~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;js(W8VM(0Z>UqK~z{r?UF%C!(b4Fa}rl7cmVfZ>jB)0 z1(CYZjkst+$=jSoI(!}PtckiwhQ&urBMpY<1O zRKjQ7r84rh-;BEFns{`fIVw^2T;tEW#2WDs6^RJ!&I)4VxmO@EoWOWRfcakT5j<0$ zh(K;Ukrn9cpKEGGast+fcRcZD0gUPIZ3zn`77D+%$xCN${$HdWSYlG=U`MgAyYak#ca(y8IIn+c*;Qne%j1PB+ zlY?zyetk-K1#*2Mfjabf!Y%OrJSSf6&I!Cc(U&mS*SUax)>;68h%V}y$}sXTFt`BH zmq>OP8C(Ft53Di|?qOtb0R#oW8j0%c9sAD002ovPDHLkV1mkO$)o@P literal 0 HcmV?d00001