diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 9ee422d5..194372fc 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -4,6 +4,8 @@ Version 2.1.8 Changes - Added text labels to Travel Anchors and improved rendering and selection +- Added new item 'Ender Resonator', made in Slice'N'Splice, used to make wireless chargers and dim. trans. + 'Easy' recipe config option added to use old, cheaper recipe - Old transceiver now hidden in NEI / creative tab. Will be removed soon, convert existing blocks to new version by placing in the crafting grid - #1167 Improved NEI handlers (Tonius) diff --git a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml index 5883aba0..39e2bce2 100644 --- a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml +++ b/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml @@ -43,6 +43,20 @@ + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index affc8fd1..4ffb84b5 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -489,8 +489,9 @@ item.itemXpTransfer.tooltip.detailed.line3=Shift-R-Click to transfer levels to item.itemXpTransfer.tooltip.detailed.line4=the tank skullZombieElectrode.name=Zombie Electrode -skullZombieController.name=Zombie Controller +skullZombieController.name=Z-Logic Controller skullZombieFrankenstien.name=Frank'N'Zombie +skullEnderResonator.name=Ender Resonator item.itemSpawnEggEnderIO.name=Spawn diff --git a/resources/assets/enderio/textures/items/skullEnderResonator.png b/resources/assets/enderio/textures/items/skullEnderResonator.png new file mode 100644 index 00000000..50ec3066 Binary files /dev/null and b/resources/assets/enderio/textures/items/skullEnderResonator.png differ diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index d810ab42..04d684d0 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -81,12 +81,10 @@ public final class Config { public static int numConduitsPerRecipe = 8; public static double transceiverEnergyLoss = 0.1; - public static int transceiverUpkeepCostRF = 10; - public static int transceiverBucketTransmissionCostRF = 100; - public static int transceiverMaxIoRF = 20480; + public static boolean transceiverUseEasyRecipe = false; public static File configDirectory; @@ -445,12 +443,12 @@ public final class Config { allowTileEntitiesAsPaintSource = config.get(sectionRecipe.name, "allowTileEntitiesAsPaintSource", allowTileEntitiesAsPaintSource, "When enabled blocks with tile entities (e.g. machines) can be used as paint targets.") .getBoolean(allowTileEntitiesAsPaintSource); - useSteelInChassi = config.get(sectionRecipe.name, "useSteelInChassi", useSteelInChassi, "When enabled machine chassis will require steel instead of iron.") .getBoolean(useSteelInChassi); - numConduitsPerRecipe = config.get(sectionRecipe.name, "numConduitsPerRecipe", numConduitsPerRecipe, "The number of conduits crafted per recipe.").getInt(numConduitsPerRecipe); + transceiverUseEasyRecipe= config.get(sectionRecipe.name, "transceiverUseEasyRecipe", transceiverUseEasyRecipe, "When enabled the dim trans. will use a cheaper recipe") + .getBoolean(useHardRecipes); enchanterBaseLevelCost = config.get(sectionRecipe.name, "enchanterBaseLevelCost", enchanterBaseLevelCost, "Base level cost added to all recipes in the enchanter.").getInt(enchanterBaseLevelCost); diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 82410c9a..a5da32c9 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -34,17 +34,21 @@ public class MachineRecipes { ItemStack silicon = new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal()); ItemStack pulCry = new ItemStack(EnderIO.itemMaterial, 1, Material.PULSATING_CYSTAL.ordinal()); ItemStack vibCry = new ItemStack(EnderIO.itemMaterial, 1, Material.VIBRANT_CYSTAL.ordinal()); + ItemStack endCry = new ItemStack(EnderIO.itemMaterial, 1, Material.ENDER_CRYSTAL.ordinal()); ItemStack electricSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ELECTRICAL_STEEL.ordinal()); ItemStack darkSteel = new ItemStack(EnderIO.itemAlloy, 1, Alloy.DARK_STEEL.ordinal()); ItemStack phasedGold = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_GOLD.ordinal()); ItemStack phasedIron = new ItemStack(EnderIO.itemAlloy, 1, Alloy.PHASED_IRON.ordinal()); ItemStack energeticAlloy = new ItemStack(EnderIO.itemAlloy, 1, Alloy.ENERGETIC_ALLOY.ordinal()); ItemStack fusedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 0); + ItemStack clearGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, 1); ItemStack enlightedQuartz = new ItemStack(EnderIO.blockFusedQuartz, 1, 2); ItemStack fusedGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, 1); ItemStack soularium = new ItemStack(EnderIO.itemAlloy, 1, Alloy.SOULARIUM.ordinal()); ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); ItemStack frankenZombie = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.FRANKEN_ZOMBIE.ordinal()); + ItemStack enderRes = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ENDER_RESONATOR.ordinal()); + ItemStack obsidian = new ItemStack(Blocks.obsidian); //stirling gen ItemStack stirlingGen = new ItemStack(EnderIO.blockStirlingGenerator, 1, 0); @@ -65,7 +69,8 @@ public class MachineRecipes { //Wireless charger ItemStack wirelessCharger = new ItemStack(EnderIO.blockWirelessCharger); - GameRegistry.addShapedRecipe(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c', capacitor3, 'v', vibCry); + //GameRegistry.addShapedRecipe(wirelessCharger, "svs", "imi", "scs", 's', electricSteel, 'i', silicon, 'm', machineChassi, 'c', capacitor3, 'v', vibCry); + GameRegistry.addShapedRecipe(wirelessCharger, "sss", "ses", "scs", 's', electricSteel, 'c', capacitor3, 'e', enderRes); //Crafter ItemStack crafter = new ItemStack(EnderIO.blockCrafter, 1, 0); @@ -155,13 +160,16 @@ public class MachineRecipes { GameRegistry.addShapedRecipe(farm, "ehe", "eme", "pzp", 'h', Items.diamond_hoe, 'm', machineChassi, 'e', electricSteel, 'z', zombieController, 'p', pulCry); //transceiver - //ItemStack transceiver = new ItemStack(EnderIO.blockHyperCube, 1, 0); - ItemStack transceiver = new ItemStack(EnderIO.blockTransceiver, 1, 0); - ItemStack obsidian = new ItemStack(Blocks.obsidian); - GameRegistry - .addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', Items.diamond); - GameRegistry.addShapelessRecipe(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0)); - + ItemStack transceiver = new ItemStack(EnderIO.blockTransceiver, 1, 0); + if(Config.transceiverUseEasyRecipe) { + GameRegistry + .addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', Items.diamond); + } else { + GameRegistry + .addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', electricSteel, 'e', enderRes, 'c', enderCapacitor, 'p', fusedQuartz, 'd', endCry); + GameRegistry.addShapelessRecipe(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0)); + } + //solar panel if(Config.photovoltaicCellEnabled) { @@ -235,7 +243,7 @@ public class MachineRecipes { ClearConfigRecipe inst = new ClearConfigRecipe(); MinecraftForge.EVENT_BUS.register(inst); GameRegistry.addRecipe(inst); - + } public static void addOreDictionaryRecipes() { diff --git a/src/main/java/crazypants/enderio/material/FrankenSkull.java b/src/main/java/crazypants/enderio/material/FrankenSkull.java index e99ce025..e37b446d 100644 --- a/src/main/java/crazypants/enderio/material/FrankenSkull.java +++ b/src/main/java/crazypants/enderio/material/FrankenSkull.java @@ -4,7 +4,8 @@ public enum FrankenSkull { ZOMBIE_ELECTRODE("skullZombieElectrode", false), ZOMBIE_CONTROLLER("skullZombieController", false), - FRANKEN_ZOMBIE("skullZombieFrankenstien", "enderio:skullZombieController", true); + FRANKEN_ZOMBIE("skullZombieFrankenstien", "enderio:skullZombieController", true), + ENDER_RESONATOR("skullEnderResonator", "enderio:skullEnderResonator", false); public final String unlocalisedName; public final String iconKey;