From 4c6d76d82e8e19b97852304c8c094696804421cc Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 29 Oct 2015 20:54:10 +0100 Subject: [PATCH] Added Iron Casing & Drill Core --- .../actuallyadditions/blocks/BlockMisc.java | 16 ++++++--- .../blocks/metalists/TheMiscBlocks.java | 3 +- .../booklet/InitBooklet.java | 4 +-- .../booklet/page/PageCrafting.java | 2 +- .../config/values/ConfigCrafting.java | 4 ++- .../config/values/ConfigIntValues.java | 2 +- .../crafting/BlockCrafting.java | 34 ++++++++++++------ .../crafting/ItemCrafting.java | 13 ++++++- .../items/metalists/TheMiscItems.java | 3 +- .../assets/actuallyadditions/lang/en_US.lang | 2 ++ ...temDrillCore.png => itemMiscDrillCore.png} | Bin update/changelog.md | 3 +- 12 files changed, 62 insertions(+), 24 deletions(-) rename src/main/resources/assets/actuallyadditions/textures/items/{itemDrillCore.png => itemMiscDrillCore.png} (100%) diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index 9074dc03e..665560f3c 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -35,9 +35,11 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ public IIcon[] textures; @SideOnly(Side.CLIENT) - private IIcon stoneCasingSeasonalTop; + private IIcon casingSeasonalTop; @SideOnly(Side.CLIENT) private IIcon stoneCasingSeasonal; + @SideOnly(Side.CLIENT) + private IIcon ironCasingSeasonal; public BlockMisc(){ super(Material.rock); @@ -49,8 +51,13 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata){ - if(ClientProxy.jingleAllTheWay && metadata == TheMiscBlocks.STONE_CASING.ordinal() && side != 0){ - return side == 1 ? this.stoneCasingSeasonalTop : this.stoneCasingSeasonal; + if(ClientProxy.jingleAllTheWay && side != 0){ + if(metadata == TheMiscBlocks.STONE_CASING.ordinal()){ + return side == 1 ? this.casingSeasonalTop : this.stoneCasingSeasonal; + } + else if(metadata == TheMiscBlocks.IRON_CASING.ordinal()){ + return side == 1 ? this.casingSeasonalTop : this.ironCasingSeasonal; + } } return metadata >= textures.length ? null : textures[metadata]; } @@ -76,8 +83,9 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscBlocks[i].name); } - this.stoneCasingSeasonalTop = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnowTop"); + this.casingSeasonalTop = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnowTop"); this.stoneCasingSeasonal = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnow"); + this.ironCasingSeasonal = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscIronCasingSnow"); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java index 1b244afd4..4a1031e0d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java @@ -23,7 +23,8 @@ public enum TheMiscBlocks{ CHARCOAL_BLOCK("Charcoal", EnumRarity.common), ENDERPEARL_BLOCK("Enderpearl", EnumRarity.rare), LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.uncommon), - ENDER_CASING("EnderCasing", EnumRarity.epic); + ENDER_CASING("EnderCasing", EnumRarity.epic), + IRON_CASING("IronCasing", EnumRarity.rare); public final String name; public final EnumRarity rarity; diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index e3cfe2fc8..228ed371c 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -47,7 +47,7 @@ public class InitBooklet{ //Miscellaneous BookletPage pageStoneCase = new PageCrafting(5, BlockCrafting.recipeStoneCase); - new BookletChapter("craftingIngs", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), ClientProxy.jingleAllTheWay ? pageStoneCase : pageStoneCase.setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(7, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(8, ItemCrafting.recipeRing).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(11, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(12, ItemCrafting.recipeDough).setNoText(), new PageCrafting(13, ItemCrafting.recipeRiceDough).setNoText()).setImportant(); + new BookletChapter("craftingIngs", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), ClientProxy.jingleAllTheWay ? pageStoneCase : pageStoneCase.setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(7, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(8, ItemCrafting.recipeRing).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(11, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(12, ItemCrafting.recipeDough).setNoText(), new PageCrafting(13, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(14, BlockCrafting.recipeIronCase).setNoText()).setImportant(); new BookletChapter("quartz", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("", ConfigIntValues.BLACK_QUARTZ_MIN_HEIGHT.getValue()).addTextReplacement("", ConfigIntValues.BLACK_QUARTZ_MAX_HEIGHT.getValue()), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText()); new BookletChapter("cloud", entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial(); new BookletChapter("coalStuff", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText()); @@ -115,7 +115,7 @@ public class InitBooklet{ new BookletChapter("potionRings", entryItemsNonRF, new ItemStack(InitItems.itemPotionRing), potionRingPages.toArray(new BookletPage[potionRingPages.size()])); //RF Using Items - new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill).setNoText(), new PageCrafting(3, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(4, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial(); + new BookletChapter("drill", entryItemsRF, new ItemStack(InitItems.itemDrill), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeDrill).setNoText(), new PageCrafting(3, ItemCrafting.recipeDrillCore).setNoText(), new PageCrafting(4, ItemCrafting.recipeDrillSpeedI).setNoText(), new PageCrafting(5, ItemCrafting.recipeDrillSpeedII).setNoText(), new PageCrafting(6, ItemCrafting.recipeDrillSpeedIII).setNoText(), new PageCrafting(7, ItemCrafting.recipeDrillFortuneI).setNoText(), new PageCrafting(8, ItemCrafting.recipeDrillFortuneII).setNoText(), new PageCrafting(9, ItemCrafting.recipeDrillSilk).setNoText(), new PageCrafting(10, ItemCrafting.recipeDrillThree).setNoText(), new PageCrafting(11, ItemCrafting.recipeDrillFive).setNoText(), new PageCrafting(12, ItemCrafting.recipeDrillPlacing).setNoText()).setSpecial(); new BookletChapter("staff", entryItemsRF, new ItemStack(InitItems.itemTeleStaff), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeStaff).setNoText()).setImportant(); new BookletChapter("magnetRing", entryItemsRF, new ItemStack(InitItems.itemMagnetRing), new PageCrafting(1, ItemCrafting.recipeMagnetRing)); new BookletChapter("growthRing", entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing)); diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java index 4cf0025f1..5d0ba5660 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/page/PageCrafting.java @@ -153,7 +153,7 @@ public class PageCrafting extends BookletPage{ @Override public ItemStack[] getItemStacksForPage(){ - if(this.recipes != null && this.recipes.length > 0){ + if(this.recipes != null && this.recipes.length > 0 && this.recipes[0] != null){ return new ItemStack[]{this.recipes[0].getRecipeOutput()}; } return null; diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 10d447ee9..508fbc43f 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -18,6 +18,7 @@ public enum ConfigCrafting{ CLOUD("Smiley Cloud", ConfigCategories.BLOCKS_CRAFTING), XP_SOLIDIFIER("Experience Solidifier", ConfigCategories.BLOCKS_CRAFTING), WOOD_CASING("Wood Casing", ConfigCategories.BLOCKS_CRAFTING), + IRON_CASING("Iron Casing", ConfigCategories.BLOCKS_CRAFTING), STONE_CASING("Stone Casing", ConfigCategories.BLOCKS_CRAFTING), FISHING_NET("Fishing Net", ConfigCategories.BLOCKS_CRAFTING), REPAIRER("Repairer", ConfigCategories.BLOCKS_CRAFTING), @@ -156,7 +157,8 @@ public enum ConfigCrafting{ LASER_RELAY("Laser Relay", ConfigCategories.BLOCKS_CRAFTING), LASER_WRENCH("Laser Wrench", ConfigCategories.ITEMS_CRAFTING), - CHEST_TO_CRATE_UPGRADE("Chest To Crate Upgrade", ConfigCategories.ITEMS_CRAFTING); + CHEST_TO_CRATE_UPGRADE("Chest To Crate Upgrade", ConfigCategories.ITEMS_CRAFTING), + DRILL_CORE("Drill Core", ConfigCategories.ITEMS_CRAFTING); public final String name; public final String category; diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java index be7ebf943..e519505a3 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java @@ -174,7 +174,7 @@ public enum ConfigIntValues{ RANGED_COLLECTOR_RANGE("Ranged Collector: Range", ConfigCategories.MACHINE_VALUES, 6, 1, 30, "The range of the Ranged Collector"), LASER_RELAY_LOSS("Laser Relay: Loss", ConfigCategories.MACHINE_VALUES, 5, 0, 80, "The Energy Loss of the Laser Relay per Transfer in Percent"), - LASER_RELAY_MAX_DISTANCE("Laser Relay: Max Distance", ConfigCategories.MACHINE_VALUES, 10, 3, 80, "The max distance between two connected Laser Relays"); + LASER_RELAY_MAX_DISTANCE("Laser Relay: Max Distance", ConfigCategories.MACHINE_VALUES, 15, 3, 80, "The max distance between two connected Laser Relays"); public final String name; public final String category; diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index 405b1fb02..2466d52ad 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -39,6 +39,7 @@ public class BlockCrafting{ public static IRecipe recipeLiquidPlacer; public static IRecipe recipeLiquidCollector; public static IRecipe recipeCase; + public static IRecipe recipeIronCase; public static IRecipe recipeStoneCase; public static IRecipe recipeEnderCase; public static IRecipe recipeEnderPearlBlock; @@ -83,8 +84,9 @@ public class BlockCrafting{ //Laser Relay if(ConfigCrafting.LASER_RELAY.isEnabled()){ - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLaserRelay), - "ORO", "RCR", "ORO", + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLaserRelay, 2), + "OBO", "RCR", "OBO", + 'B', new ItemStack(Blocks.redstone_block), 'O', new ItemStack(Blocks.obsidian), 'R', new ItemStack(Items.redstone), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); @@ -155,6 +157,16 @@ public class BlockCrafting{ recipeCase = Util.GetRecipes.lastIRecipe(); } + //Iron Casing + if(ConfigCrafting.IRON_CASING.isEnabled()){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), + "WSW", "SQS", "WSW", + 'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), + 'W', "ingotIron", + 'S', "stickWood")); + recipeIronCase = Util.GetRecipes.lastIRecipe(); + } + //Ender Casing if(ConfigCrafting.ENDER_CASING.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()), @@ -191,7 +203,7 @@ public class BlockCrafting{ "I I", "CAC", "I I", 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), - 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()))); + 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); recipeEnergizer = Util.GetRecipes.lastIRecipe(); } @@ -201,7 +213,7 @@ public class BlockCrafting{ " I ", "CAC", " I ", 'I', "ingotIron", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), - 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()))); + 'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); recipeEnervator = Util.GetRecipes.lastIRecipe(); } @@ -209,7 +221,7 @@ public class BlockCrafting{ if(ConfigCrafting.LAVA_FACTORY.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLavaFactoryController), "SCS", "ISI", "LLL", - 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'I', "blockIron", 'L', Items.lava_bucket)); @@ -220,7 +232,7 @@ public class BlockCrafting{ if(ConfigCrafting.CASING.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 32, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), "ICI", - 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'I', "blockIron")); recipeCasing = Util.GetRecipes.lastIRecipe(); } @@ -241,7 +253,7 @@ public class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockOreMagnet), "SSS", "CBC", "ISI", 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), - 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'B', new ItemStack(InitItems.itemBatteryDouble), 'I', new ItemStack(Blocks.iron_block))); recipeMiner = Util.GetRecipes.lastIRecipe(); @@ -347,7 +359,7 @@ public class BlockCrafting{ "IEI", "GLG", "ICI", 'I', "ingotIron", 'G', "ingotGold", - 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'L', "treeLeaves", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeLeafGen = Util.GetRecipes.lastIRecipe(); @@ -403,7 +415,7 @@ public class BlockCrafting{ "IQI", "CDC", "IBI", 'D', "blockDiamond", 'I', "ingotIron", - 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'B', new ItemStack(Blocks.iron_bars))); recipeSolar = Util.GetRecipes.lastIRecipe(); @@ -413,9 +425,9 @@ public class BlockCrafting{ if(ConfigCrafting.HEAT_COLLECTOR.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockHeatCollector), "BRB", "CDC", "BQB", - 'D', "gemDiamond", + 'D', "ingotIron", 'R', new ItemStack(Items.repeater), - 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), + 'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'L', new ItemStack(Items.lava_bucket), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'B', new ItemStack(Blocks.iron_bars))); diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 410d1cc48..0836fa0d5 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -73,6 +73,7 @@ public class ItemCrafting{ public static ArrayList recipesPotionRings = new ArrayList(); public static IRecipe recipeChestToCrateUpgrade; public static IRecipe recipeLaserWrench; + public static IRecipe recipeDrillCore; public static void init(){ @@ -134,11 +135,21 @@ public class ItemCrafting{ "DDD", "CRC", "III", 'D', "gemDiamond", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), - 'R', "dustRedstone", + 'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), 'I', "blockIron")); recipeDrill = Util.GetRecipes.lastIRecipe(); } + //Drill Core + if(ConfigCrafting.DRILL_CORE.isEnabled()){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DRILL_CORE.ordinal()), + "ICI", "CRC", "ICI", + 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), + 'R', "dustRedstone", + 'I', "blockIron")); + recipeDrillCore = Util.GetRecipes.lastIRecipe(); + } + //Tele Staff if(ConfigCrafting.TELE_STAFF.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemTeleStaff), diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java index 2a99be29b..4c82c69de 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java @@ -29,7 +29,8 @@ public enum TheMiscItems{ RICE_SLIME("RiceSlime", EnumRarity.uncommon), CANOLA("Canola", EnumRarity.uncommon), CUP("Cup", EnumRarity.uncommon), - BAT_WING("BatWing", EnumRarity.rare); + BAT_WING("BatWing", EnumRarity.rare), + DRILL_CORE("DrillCore", EnumRarity.uncommon); public final String name; public final EnumRarity rarity; diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 7dda404bf..224aaf142 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -106,6 +106,7 @@ tile.actuallyadditions.blockLeafGenerator.name=Leaf-Eating Generator tile.actuallyadditions.blockDirectionalBreaker.name=Long-Range Breaker tile.actuallyadditions.blockRangedCollector.name=Ranged Collector tile.actuallyadditions.blockLaserRelay.name=Laser Relay +tile.actuallyadditions.blockMiscIronCasing.name=Iron Casing #ESD tile.actuallyadditions.blockInputter.name=ESD @@ -279,6 +280,7 @@ item.actuallyadditions.itemBootsQuartz.name=Black Quartz Boots item.actuallyadditions.itemBooklet.name=Actually Additions Manual item.actuallyadditions.itemLaserWrench.name=Laser Wrench item.actuallyadditions.itemChestToCrateUpgrade.name=Chest To Storage Crate Upgrade +item.actuallyadditions.itemMiscDrillCore.name=Drill Core #Tooltips tooltip.actuallyadditions.onSuffix.desc=On diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillCore.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscDrillCore.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrillCore.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemMiscDrillCore.png diff --git a/update/changelog.md b/update/changelog.md index 53f363a9a..a2766afd0 100644 --- a/update/changelog.md +++ b/update/changelog.md @@ -9,4 +9,5 @@ - Chocolate Toast (canitzp) - New AIOT Textures - AIOT Integration for SimpleOres 2 -- Changed Ball Of Hair Name to "Ball Of Fur", addedBooklet Page \ No newline at end of file +- Changed Ball Of Hair Name to "Ball Of Fur", addedBooklet Page +- Added Iron Casing & Drill Core \ No newline at end of file