From e323f960c5470fefd81c0d0bf3370a87b5acfb7d Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 3 Aug 2016 17:59:27 +0200 Subject: [PATCH] changed and added recipes + empowerer texture --- .../api/ActuallyAdditionsAPI.java | 4 +- .../api/recipe/EmpowererRecipe.java | 4 +- .../mod/crafting/BlockCrafting.java | 41 +++++++++--------- .../mod/crafting/ItemCrafting.java | 32 +++++++------- .../mod/crafting/MiscCrafting.java | 10 +++++ .../mod/recipe/EmpowererHandler.java | 4 +- .../mod/tile/TileEntityEmpowerer.java | 7 ++- .../textures/blocks/blockEmpowerer.png | Bin 0 -> 6352 bytes .../textures/blocks/blockEmpowerer.png.mcmeta | 6 +++ .../textures/blocks/blockEmpowererSide.png | Bin 0 -> 3086 bytes 10 files changed, 63 insertions(+), 45 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png.mcmeta create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowererSide.png diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java index ec389a9d3..f818633c8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java @@ -182,8 +182,8 @@ public final class ActuallyAdditionsAPI{ TREASURE_CHEST_LOOT.add(new TreasureChestLoot(stack, chance, minAmount, maxAmount)); } - public static void addEmpowererRecipe(ItemStack input, ItemStack output, ItemStack modifier1, ItemStack modifier2, ItemStack modifier3, ItemStack modifier4, int energyPerStand, float[] particleColor){ - EMPOWERER_RECIPES.add(new EmpowererRecipe(input, output, modifier1, modifier2, modifier3, modifier4, energyPerStand, particleColor)); + public static void addEmpowererRecipe(ItemStack input, ItemStack output, ItemStack modifier1, ItemStack modifier2, ItemStack modifier3, ItemStack modifier4, int energyPerStand, int time, float[] particleColor){ + EMPOWERER_RECIPES.add(new EmpowererRecipe(input, output, modifier1, modifier2, modifier3, modifier4, energyPerStand, time, particleColor)); } /** diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/EmpowererRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/EmpowererRecipe.java index c4ca2e5b2..9eecbe946 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/EmpowererRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/EmpowererRecipe.java @@ -24,8 +24,9 @@ public class EmpowererRecipe{ public int energyPerStand; public float[] particleColor; + public int time; - public EmpowererRecipe(ItemStack input, ItemStack output, ItemStack modifier1, ItemStack modifier2, ItemStack modifier3, ItemStack modifier4, int energyPerStand, float[] particleColor){ + public EmpowererRecipe(ItemStack input, ItemStack output, ItemStack modifier1, ItemStack modifier2, ItemStack modifier3, ItemStack modifier4, int energyPerStand, int time, float[] particleColor){ this.input = input; this.output = output; this.modifier1 = modifier1; @@ -34,5 +35,6 @@ public class EmpowererRecipe{ this.modifier4 = modifier4; this.energyPerStand = energyPerStand; this.particleColor = particleColor; + this.time = time; } } 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 f5f542967..32ab1162c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/BlockCrafting.java @@ -124,7 +124,8 @@ public final class BlockCrafting{ //Shock Suppressor if(ConfigCrafting.SHOCK_SUPPRESSOR.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockShockSuppressor), - "OOO", "OCO", "OOO", + "OAO", "ACA", "OAO", + 'A', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.COAL.ordinal()), 'O', new ItemStack(Blocks.OBSIDIAN), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeShockSuppressor = RecipeUtil.lastIRecipe(); @@ -146,7 +147,7 @@ public final class BlockCrafting{ "IRI", "RCR", "IDI", 'R', "blockRedstone", 'I', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), - 'C', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()), + 'C', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.COAL.ordinal()), 'D', new ItemStack(InitItems.itemDrill, 1, Util.WILDCARD))); recipeMiner = RecipeUtil.lastIRecipe(); } @@ -228,14 +229,14 @@ public final class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLaserRelayAdvanced), " I ", "XRX", " I ", - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'R', new ItemStack(InitBlocks.blockLaserRelay), 'X', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()))); recipeLaserRelayAdvanced = RecipeUtil.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLaserRelayExtreme), " I ", "XRX", " I ", - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'R', new ItemStack(InitBlocks.blockLaserRelayAdvanced), 'X', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()))); recipeLaserRelayExtreme = RecipeUtil.lastIRecipe(); @@ -255,7 +256,7 @@ public final class BlockCrafting{ new ItemStack(InitBlocks.blockLaserRelayItem), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), - new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()))); + new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()))); recipeLaserRelayItemWhitelist = RecipeUtil.lastIRecipe(); } @@ -313,7 +314,7 @@ public final class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockXPSolidifier), "XXX", "DCD", "XXX", 'X', new ItemStack(InitItems.itemSolidifiedExperience), - 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'D', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeSolidifier = RecipeUtil.lastIRecipe(); } @@ -354,7 +355,7 @@ public final class BlockCrafting{ "WSW", "SRS", "WSW", 'W', ConfigBoolValues.SUPER_DUPER_HARD_MODE.isEnabled() ? new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()) : new ItemStack(Items.ENDER_PEARL), 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()), - 'S', ConfigBoolValues.SUPER_DUPER_HARD_MODE.isEnabled() ? new ItemStack(Blocks.DIAMOND_BLOCK) : new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()))); + 'S', ConfigBoolValues.SUPER_DUPER_HARD_MODE.isEnabled() ? new ItemStack(Blocks.DIAMOND_BLOCK) : new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()))); recipeEnderCase = RecipeUtil.lastIRecipe(); } @@ -362,7 +363,7 @@ public final class BlockCrafting{ if(ConfigCrafting.PHANTOM_BOOSTER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomBooster), "RDR", "DCD", "RDR", - 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), + 'R', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); recipePhantomBooster = RecipeUtil.lastIRecipe(); @@ -405,7 +406,7 @@ public final class BlockCrafting{ "SCS", "ISI", "LLL", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), - 'I', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'L', Items.LAVA_BUCKET)); recipeLavaFactory = RecipeUtil.lastIRecipe(); } @@ -445,7 +446,7 @@ public final class BlockCrafting{ if(ConfigCrafting.PHANTOMFACE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomface), " C ", "EBE", " S ", - 'E', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'E', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'C', Blocks.CHEST, 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()))); @@ -456,7 +457,7 @@ public final class BlockCrafting{ if(ConfigCrafting.PLAYER_INTERFACE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPlayerInterface), "BCB", "EBE", "BSB", - 'E', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'E', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(Items.SKULL, 1, 1), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); @@ -483,7 +484,7 @@ public final class BlockCrafting{ if(ConfigCrafting.PHANTOM_ENERGYFACE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomEnergyface), " R ", "RFR", " R ", - 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), + 'R', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'F', InitBlocks.blockPhantomface)); recipeEnergyface = RecipeUtil.lastIRecipe(); } @@ -492,7 +493,7 @@ public final class BlockCrafting{ if(ConfigCrafting.PHANTOM_REDSTONEFACE.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomRedstoneface), "SRS", "RFR", "SRS", - 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), + 'R', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'S', new ItemStack(Items.REDSTONE), 'F', InitBlocks.blockPhantomface)); recipePhantomRedstoneface = RecipeUtil.lastIRecipe(); @@ -550,7 +551,7 @@ public final class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLeafGenerator), "IEI", "GLG", "ICI", 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), - 'G', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), + 'G', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()), 'L', "treeLeaves", 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); @@ -575,7 +576,7 @@ public final class BlockCrafting{ if(ConfigCrafting.FISHING_NET.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFishingNet), "SSS", "SDS", "SSS", - 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'D', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.EMERALD.ordinal()), 'S', Items.STRING)); recipeFisher = RecipeUtil.lastIRecipe(); } @@ -584,8 +585,8 @@ public final class BlockCrafting{ if(ConfigCrafting.REPAIRER.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockItemRepairer), "DID", "OCO", "DID", - 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'D', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); recipeRepairer = RecipeUtil.lastIRecipe(); @@ -596,7 +597,7 @@ public final class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceSolar), "IQI", "CDC", "IBI", 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.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))); @@ -711,7 +712,7 @@ public final class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGiantChestLarge), "CWC", "WDW", "CWC", - 'C', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()), + 'C', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.COAL.ordinal()), 'D', new ItemStack(InitBlocks.blockGiantChestMedium), 'W', "plankWood")); recipeCrateLarge = RecipeUtil.lastIRecipe(); @@ -722,7 +723,7 @@ public final class BlockCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGreenhouseGlass, 3), "GSG", "SDS", "GSG", 'G', "blockGlass", - 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()), + 'D', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.LAPIS.ordinal()), 'S', "treeSapling")); recipeGlass = RecipeUtil.lastIRecipe(); } 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 f21846878..a423d0e32 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java @@ -142,7 +142,7 @@ public final class ItemCrafting{ //Disenchanting Lens if(ConfigCrafting.DISENCHANTING_LENS.isEnabled()){ - ItemStack crystal = new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()); + ItemStack crystal = new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemDisenchantingLens), new ItemStack(Blocks.ENCHANTING_TABLE), crystal.copy(), @@ -181,7 +181,7 @@ public final class ItemCrafting{ "MSM", "SDS", "MSM", 'M', new ItemStack(Items.MAGMA_CREAM), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.SPAWNER_SHARD.ordinal()), - 'D', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()))); + 'D', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()))); recipeSpawnerChanger = RecipeUtil.lastIRecipe(); } @@ -245,7 +245,7 @@ public final class ItemCrafting{ if(ConfigCrafting.TELE_STAFF.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemTeleStaff), " FE", " S ", "SB ", - 'F', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'F', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'E', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()), 'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()), 'B', new ItemStack(InitItems.itemBattery, 1, Util.WILDCARD))); @@ -270,9 +270,9 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSpeedIII), "ISI", "SFS", "ISI", - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'S', Items.SUGAR, - 'F', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()))); + 'F', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()))); recipeDrillSpeedIII = RecipeUtil.lastIRecipe(); } @@ -282,13 +282,13 @@ public final class ItemCrafting{ "ISI", "SRS", "ISI", 'I', Blocks.GLOWSTONE, 'S', Items.REDSTONE, - 'R', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()))); + 'R', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()))); recipeDrillFortuneI = RecipeUtil.lastIRecipe(); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFortuneII), "ISI", "SRS", "ISI", 'I', Blocks.GLOWSTONE, - 'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), + 'S', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()))); recipeDrillFortuneII = RecipeUtil.lastIRecipe(); } @@ -304,7 +304,7 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFiveByFive), "DID", "ICI", "DID", - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeDrillFive = RecipeUtil.lastIRecipe(); @@ -314,7 +314,7 @@ public final class ItemCrafting{ if(ConfigCrafting.DRILL_SILK_TOUCH.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeSilkTouch), "DSD", "SCS", "DSD", - 'D', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), + 'D', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.EMERALD.ordinal()), 'S', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeDrillSilk = RecipeUtil.lastIRecipe(); @@ -367,7 +367,7 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemGrowthRing), "SIS", "IOI", "SIS", 'S', new ItemStack(Items.WHEAT_SEEDS), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); recipeGrowthRing = RecipeUtil.lastIRecipe(); } @@ -377,7 +377,7 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWaterRemovalRing), "BIB", "IOI", "BIB", 'B', new ItemStack(Items.WATER_BUCKET), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RING.ordinal()))); recipeWaterRing = RecipeUtil.lastIRecipe(); } @@ -387,7 +387,7 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryTriple), " R ", "ICI", "III", 'R', new ItemStack(InitItems.itemBatteryDouble), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeBatteryTriple = RecipeUtil.lastIRecipe(); } @@ -397,7 +397,7 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuadruple), " R ", "ICI", "III", 'R', new ItemStack(InitItems.itemBatteryTriple), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.IRON.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeBatteryQuadruple = RecipeUtil.lastIRecipe(); } @@ -407,7 +407,7 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemBatteryQuintuple), " R ", "ICI", "III", 'R', new ItemStack(InitItems.itemBatteryQuadruple), - 'I', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), + 'I', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()))); recipeBatteryQuintuple = RecipeUtil.lastIRecipe(); } @@ -417,7 +417,7 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats), "WNW", "WDW", "WNW", 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), - 'N', new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), + 'N', new ItemStack(InitBlocks.blockCrystalEmpowered, 1, TheCrystals.DIAMOND.ordinal()), 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.ENDER_STAR.ordinal()))); recipeWings = RecipeUtil.lastIRecipe(); } @@ -488,7 +488,7 @@ public final class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemPlayerProbe), "A A", "AIA", "RHR", 'A', new ItemStack(Blocks.IRON_BARS), - 'R', new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), + 'R', new ItemStack(InitItems.itemCrystalEmpowered, 1, TheCrystals.REDSTONE.ordinal()), 'H', new ItemStack(Items.SKULL, 1, 1), 'I', new ItemStack(Items.IRON_HELMET))); recipePlayerProbe = RecipeUtil.lastIRecipe(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java index 5bbad51cd..df384c250 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java @@ -29,6 +29,9 @@ public final class MiscCrafting{ public static final IRecipe[] RECIPES_CRYSTALS = new IRecipe[TheCrystals.values().length]; public static final IRecipe[] RECIPES_CRYSTAL_BLOCKS = new IRecipe[TheCrystals.values().length]; + public static final IRecipe[] RECIPES_EMPOWERED_CRYSTALS = new IRecipe[TheCrystals.values().length]; + public static final IRecipe[] RECIPES_EMPOWERED_CRYSTAL_BLOCKS = new IRecipe[TheCrystals.values().length]; + public static void init(){ //Bio Coal @@ -43,6 +46,13 @@ public final class MiscCrafting{ RECIPES_CRYSTAL_BLOCKS[i] = RecipeUtil.lastIRecipe(); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemCrystal, 9, i), new ItemStack(InitBlocks.blockCrystal, 1, i))); RECIPES_CRYSTALS[i] = RecipeUtil.lastIRecipe(); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCrystalEmpowered, 1, i), + "XXX", "XXX", "XXX", + 'X', new ItemStack(InitItems.itemCrystalEmpowered, 1, i))); + RECIPES_EMPOWERED_CRYSTAL_BLOCKS[i] = RecipeUtil.lastIRecipe(); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemCrystalEmpowered, 9, i), new ItemStack(InitBlocks.blockCrystalEmpowered, 1, i))); + RECIPES_EMPOWERED_CRYSTALS[i] = RecipeUtil.lastIRecipe(); } //Dough diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java index eadef8c4b..957ac084f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/recipe/EmpowererHandler.java @@ -23,8 +23,8 @@ public final class EmpowererHandler{ ItemStack m = new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()); for(int i = 0; i < TheCrystals.values().length; i++){ float[] color = TheCrystals.values()[i].conversionColorParticles; - ActuallyAdditionsAPI.addEmpowererRecipe(new ItemStack(InitItems.itemCrystal, 1, i), new ItemStack(InitItems.itemCrystalEmpowered, 1, i), m, m, m, m, 50000, color); - ActuallyAdditionsAPI.addEmpowererRecipe(new ItemStack(InitBlocks.blockCrystal, 1, i), new ItemStack(InitBlocks.blockCrystalEmpowered, 1, i), m, m, m, m, 500000, color); + ActuallyAdditionsAPI.addEmpowererRecipe(new ItemStack(InitItems.itemCrystal, 1, i), new ItemStack(InitItems.itemCrystalEmpowered, 1, i), m, m, m, m, 50000, 200, color); + ActuallyAdditionsAPI.addEmpowererRecipe(new ItemStack(InitBlocks.blockCrystal, 1, i), new ItemStack(InitBlocks.blockCrystalEmpowered, 1, i), m, m, m, m, 500000, 2000, color); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java index 8876c44fc..baee92eab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java @@ -40,15 +40,14 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{ if(!this.worldObj.isRemote){ EmpowererRecipe recipe = getRecipeForInput(this.slots[0]); if(recipe != null){ - int processTimeGoal = 200; - TileEntityDisplayStand[] modifierStands = this.getFittingModifiers(recipe, processTimeGoal); + TileEntityDisplayStand[] modifierStands = this.getFittingModifiers(recipe, recipe.time); if(modifierStands != null){ //Meaning the display stands around match all the criteria this.processTime++; - boolean done = this.processTime >= processTimeGoal; + boolean done = this.processTime >= recipe.time; for(TileEntityDisplayStand stand : modifierStands){ - stand.storage.extractEnergy(recipe.energyPerStand/processTimeGoal, false); + stand.storage.extractEnergy(recipe.energyPerStand/recipe.time, false); if(done){ stand.decrStackSize(0, 1); diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png new file mode 100644 index 0000000000000000000000000000000000000000..20e335a65516e2ff9714a089798f2d438d595434 GIT binary patch literal 6352 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 literal 0 HcmV?d00001