diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index 041765fc8a..8ae3b5928c 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -136,6 +136,16 @@ + + + + + + + + + + diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index aa09ecee41..823328364c 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -2959,12 +2959,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index df530d5378..c916a9dca7 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -190,12 +190,22 @@ enderio.gas.gasTick=Gas/t enderio.itemMachinePart.name=Machine Parts enderio.machineChassi.name=Machine Chassis enderio.basicGear.name=Basic Gear +enderio.soulMachineChassi.name=Soul Machine Chassis +enderio.endSteelMachineChassi.name=End Steel Chassis enderio.pulsatingCrystal.name=Pulsating Crystal enderio.vibrantCrystal.name=Vibrant Crystal enderio.enderCrystal.name=Ender Crystal enderio.attractorCrystal.name=Enticing Crystal enderio.weatherCrystal.name=Weather Crystal enderio.darkGrindingBall.name=Dark Steel Ball +enderio.electricalGrindingBall.name=Electrical Steel Ball +enderio.energeticGrindingBall.name=Energetic Alloy Ball +enderio.vibrantGrindingBall.name=Vibrant Alloy Ball +enderio.redstoneGrindingBall.name=Redstone Alloy Ball +enderio.conductiveGrindingBall.name=Conductive Iron Ball +enderio.pulsatingGrindingBall.name=Pulsating Iron Ball +enderio.soulariumGrindingBall.name=Soularium Ball +enderio.endSteelGrindingBall.name=End Steel Ball enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball enderio.darkGrindingBall.tooltip.detailed.line2=Main Output enderio.darkGrindingBall.tooltip.detailed.line3=Bonus Output @@ -227,6 +237,9 @@ enderio.phasedIron.name=Pulsating Iron enderio.vibrantNugget.name=Vibrant Alloy Nugget enderio.darkSteel.name=Dark Steel enderio.soularium.name=Soularium +enderio.endSteel.name=End Steel +enderio.endSteelNugget.name=End Steel Nugget + tile.blockIngotStorage.name=Ingot Storage tile.enderio.electricalSteel.name=Electrical Steel Block @@ -238,6 +251,7 @@ tile.enderio.phasedIron.name=Pulsating Iron Block tile.enderio.vibrantNugget.name=Vibrant Nugget Block tile.enderio.darkSteel.name=Dark Steel Block tile.enderio.soularium.name=Soularium Block +tile.enderio.endSteel.name=End Steel Block //Powder / Ingot enderio.powderCoal.name=Coal Powder diff --git a/resources/assets/enderio/textures/blocks/endSteelBlock.png b/resources/assets/enderio/textures/blocks/endSteelBlock.png new file mode 100644 index 0000000000..93c9077646 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/endSteelBlock.png differ diff --git a/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta b/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta new file mode 100644 index 0000000000..6d482b8db9 --- /dev/null +++ b/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/conductiveGrindingBall.png b/resources/assets/enderio/textures/items/conductiveGrindingBall.png new file mode 100644 index 0000000000..ee9549401c Binary files /dev/null and b/resources/assets/enderio/textures/items/conductiveGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/electricalGrindingBall.png b/resources/assets/enderio/textures/items/electricalGrindingBall.png new file mode 100644 index 0000000000..676f9ea55c Binary files /dev/null and b/resources/assets/enderio/textures/items/electricalGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/electricalGrindingBall.png.mcmeta b/resources/assets/enderio/textures/items/electricalGrindingBall.png.mcmeta new file mode 100644 index 0000000000..2f26ac9b3b --- /dev/null +++ b/resources/assets/enderio/textures/items/electricalGrindingBall.png.mcmeta @@ -0,0 +1,27 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4 + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/endSteel.png b/resources/assets/enderio/textures/items/endSteel.png new file mode 100644 index 0000000000..51741eeea2 Binary files /dev/null and b/resources/assets/enderio/textures/items/endSteel.png differ diff --git a/resources/assets/enderio/textures/items/endSteel.png.mcmeta b/resources/assets/enderio/textures/items/endSteel.png.mcmeta new file mode 100644 index 0000000000..6d482b8db9 --- /dev/null +++ b/resources/assets/enderio/textures/items/endSteel.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/endSteelGrindingBall.png b/resources/assets/enderio/textures/items/endSteelGrindingBall.png new file mode 100644 index 0000000000..e40c575c16 Binary files /dev/null and b/resources/assets/enderio/textures/items/endSteelGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta b/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta new file mode 100644 index 0000000000..6d482b8db9 --- /dev/null +++ b/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/endSteelMachineChassi.png b/resources/assets/enderio/textures/items/endSteelMachineChassi.png new file mode 100644 index 0000000000..9b8061d591 Binary files /dev/null and b/resources/assets/enderio/textures/items/endSteelMachineChassi.png differ diff --git a/resources/assets/enderio/textures/items/endSteelNugget.png b/resources/assets/enderio/textures/items/endSteelNugget.png new file mode 100644 index 0000000000..adae68f464 Binary files /dev/null and b/resources/assets/enderio/textures/items/endSteelNugget.png differ diff --git a/resources/assets/enderio/textures/items/endSteelNugget.png.mcmeta b/resources/assets/enderio/textures/items/endSteelNugget.png.mcmeta new file mode 100644 index 0000000000..6d482b8db9 --- /dev/null +++ b/resources/assets/enderio/textures/items/endSteelNugget.png.mcmeta @@ -0,0 +1,33 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 2, + 3, + 4, + 5, + 5, + 4, + 3, + 2, + 1, + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/energeticGrindingBall.png b/resources/assets/enderio/textures/items/energeticGrindingBall.png new file mode 100644 index 0000000000..addeb91b77 Binary files /dev/null and b/resources/assets/enderio/textures/items/energeticGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/pulsatingGrindingBall.png b/resources/assets/enderio/textures/items/pulsatingGrindingBall.png new file mode 100644 index 0000000000..9fb376e4dd Binary files /dev/null and b/resources/assets/enderio/textures/items/pulsatingGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/redstoneGrindingBall.png b/resources/assets/enderio/textures/items/redstoneGrindingBall.png new file mode 100644 index 0000000000..36c0e15fdb Binary files /dev/null and b/resources/assets/enderio/textures/items/redstoneGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/soulMachineChassi.png b/resources/assets/enderio/textures/items/soulMachineChassi.png new file mode 100644 index 0000000000..cac02aa638 Binary files /dev/null and b/resources/assets/enderio/textures/items/soulMachineChassi.png differ diff --git a/resources/assets/enderio/textures/items/soulariumGrindingBall.png b/resources/assets/enderio/textures/items/soulariumGrindingBall.png new file mode 100644 index 0000000000..ef699df692 Binary files /dev/null and b/resources/assets/enderio/textures/items/soulariumGrindingBall.png differ diff --git a/resources/assets/enderio/textures/items/vibrantGrindingBall.png b/resources/assets/enderio/textures/items/vibrantGrindingBall.png new file mode 100644 index 0000000000..de3824ed61 Binary files /dev/null and b/resources/assets/enderio/textures/items/vibrantGrindingBall.png differ diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index acb5b6bbb4..24a041a50e 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -18,7 +18,9 @@ public enum Alloy { CONDUCTIVE_IRON("conductiveIron", 5.2f), PHASED_IRON("phasedIron", 7.0f, "pulsatingIron"), DARK_STEEL("darkSteel", 10.0f), - SOULARIUM("soularium", 10.0f); + SOULARIUM("soularium", 10.0f), + END_STEEL("endSteel", 10.0f); + public final String unlocalisedName; public final String iconKey; diff --git a/src/main/java/crazypants/enderio/material/MachinePart.java b/src/main/java/crazypants/enderio/material/MachinePart.java index 005d407c03..c2f8a0d92d 100644 --- a/src/main/java/crazypants/enderio/material/MachinePart.java +++ b/src/main/java/crazypants/enderio/material/MachinePart.java @@ -9,7 +9,10 @@ public enum MachinePart { MACHINE_CHASSI("machineChassi"), - BASIC_GEAR("basicGear"); + BASIC_GEAR("basicGear"), + SOUL_MACHINE_CHASSIS("soulMachineChassi"), + END_STEEL_MACHINE_CHASSIS("endSteelMachineChassi"); + public final String unlocalisedName; public final String iconKey; @@ -20,7 +23,7 @@ private MachinePart(String unlocalisedName) { this.iconKey = "enderio:" + unlocalisedName; this.oreDict = "item" + StringUtils.capitalize(unlocalisedName); } - + public static void registerOres(Item item) { for (MachinePart m : values()) { OreDictionary.registerOre(m.oreDict, new ItemStack(item, 1, m.ordinal())); diff --git a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java index e468d447fb..1d89b68043 100644 --- a/src/main/java/crazypants/enderio/material/MachinePartRenderer.java +++ b/src/main/java/crazypants/enderio/material/MachinePartRenderer.java @@ -24,7 +24,7 @@ public MachinePartRenderer() { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { - if(item != null && item.getItemDamage() == MachinePart.MACHINE_CHASSI.ordinal()) { + if(item != null && item.getItemDamage() != MachinePart.BASIC_GEAR.ordinal()) { return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY || type == ItemRenderType.EQUIPPED_FIRST_PERSON; } else { diff --git a/src/main/java/crazypants/enderio/material/Material.java b/src/main/java/crazypants/enderio/material/Material.java index 6db4e1c797..8b2132ab0e 100644 --- a/src/main/java/crazypants/enderio/material/Material.java +++ b/src/main/java/crazypants/enderio/material/Material.java @@ -20,7 +20,17 @@ public enum Material { DARK_GRINDING_BALL("darkGrindingBall"), ENDER_CRYSTAL("enderCrystal", true), ATTRACTOR_CRYSTAL("attractorCrystal", true), - WEATHER_CRYSTAL("weatherCrystal", true); + WEATHER_CRYSTAL("weatherCrystal", true), + END_STEEL_NUGGET("endSteelNugget"), + ELECTRICAL_GRINDING_BALL("electricalGrindingBall"), + ENERGETIC_GRINDING_BALL("energeticGrindingBall"), + VIBRANT_GRINDING_BALL("vibrantGrindingBall"), + REDSTONE_GRINDING_BALL("redstoneGrindingBall"), + CONDUCTIVE_GRINDING_BALL("conductiveGrindingBall"), + PULSATING_GRINDING_BALL("pulsatingGrindingBall"), + SOULARIUM_GRINDING_BALL("soulariumGrindingBall"), + END_STEEL_GRINDING_BALL("endSteelGrindingBall"); + public final String unlocalisedName; public final String iconKey; @@ -47,7 +57,7 @@ public static void registerOres(Item item) { public ItemStack getStack() { return getStack(1); } - + public ItemStack getStack(int size) { return new ItemStack(EnderIO.itemMaterial, size, ordinal()); } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index f3053ba07d..76d865a71e 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -41,7 +41,7 @@ public static void registerOresInDictionary() { OreDictionary.registerOre(powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal())); } } - + for (Alloy alloy : Alloy.values()) { boolean isPrimaryName = true; for (String oreDictName : alloy.getOreIngots()) { @@ -141,6 +141,22 @@ public static void addRecipes() { //Balls ItemStack darkBall = new ItemStack(EnderIO.itemMaterial, 5, Material.DARK_GRINDING_BALL.ordinal()); addShaped(darkBall, " s ", "sss", " s ", 's', darkSteel); + ItemStack electricalBall = new ItemStack(EnderIO.itemMaterial, 5, Material.ELECTRICAL_GRINDING_BALL.ordinal()); + addShaped(electricalBall, " s ", "sss", " s ", 's', ELECTRICAL_STEEL.getStackIngot()); + ItemStack energeticBall = new ItemStack(EnderIO.itemMaterial, 5, Material.ENERGETIC_GRINDING_BALL.ordinal()); + addShaped(energeticBall, " s ", "sss", " s ", 's', ENERGETIC_ALLOY.getStackIngot()); + ItemStack vibrantBall = new ItemStack(EnderIO.itemMaterial, 5, Material.VIBRANT_GRINDING_BALL.ordinal()); + addShaped(vibrantBall, " s ", "sss", " s ", 's', PHASED_GOLD.getStackIngot()); + ItemStack redstoneBall = new ItemStack(EnderIO.itemMaterial, 5, Material.REDSTONE_GRINDING_BALL.ordinal()); + addShaped(redstoneBall, " s ", "sss", " s ", 's', REDSTONE_ALLOY.getStackIngot()); + ItemStack conductiveBall = new ItemStack(EnderIO.itemMaterial, 5, Material.CONDUCTIVE_GRINDING_BALL.ordinal()); + addShaped(conductiveBall, " s ", "sss", " s ", 's', CONDUCTIVE_IRON.getStackIngot()); + ItemStack pulsatingBall = new ItemStack(EnderIO.itemMaterial, 5, Material.PULSATING_GRINDING_BALL.ordinal()); + addShaped(pulsatingBall, " s ", "sss", " s ", 's', PHASED_IRON.getStackIngot()); + ItemStack soulariumBall = new ItemStack(EnderIO.itemMaterial, 5, Material.SOULARIUM_GRINDING_BALL.ordinal()); + addShaped(soulariumBall, " s ", "sss", " s ", 's', SOULARIUM.getStackIngot()); + ItemStack endBall = new ItemStack(EnderIO.itemMaterial, 5, Material.END_STEEL_GRINDING_BALL.ordinal()); + addShaped(endBall, " s ", "sss", " s ", 's', END_STEEL.getStackIngot()); //Smelting ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); @@ -171,6 +187,13 @@ public static void addRecipes() { String mat = Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty() ? "ingotSteel" : "ingotIron"; addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor); + ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal()); + addShaped(soulchassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Alloy.SOULARIUM.getOreIngot(), 'c', capacitor); + + ItemStack endchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal()); + addShaped(endchassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Alloy.END_STEEL.getOreIngot(), 'c', capacitor); + + // Basic Gear ItemStack gear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone"); @@ -212,7 +235,7 @@ public static void addRecipes() { ItemStack bread = new ItemStack(Items.bread, 1, 0); GameRegistry.addSmelting(flour, bread, 0.35f); - + ItemStack enderios = EnderFood.ENDERIOS.getStack(); addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl");