diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java index 448cbeba4e0..f196f630b31 100644 --- a/src/main/java/gregtech/common/items/MetaItem1.java +++ b/src/main/java/gregtech/common/items/MetaItem1.java @@ -521,6 +521,11 @@ public void registerSubItems() { BATTERY_HULL_LV = addItem(717, "battery.hull.lv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount))); BATTERY_HULL_MV = addItem(718, "battery.hull.mv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount * 3L))); BATTERY_HULL_HV = addItem(719, "battery.hull.hv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BatteryAlloy, OrePrefix.plate.materialAmount * 9L))); + BATTERY_HULL_SMALL_VANADIUM = addItem(720, "battery.hull.ev").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.BlueSteel, GTValues.M * 2))); + BATTERY_HULL_MEDIUM_VANADIUM = addItem(721, "battery.hull.iv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.RoseGold, GTValues.M * 6))); + BATTERY_HULL_LARGE_VANADIUM = addItem(722, "battery.hull.luv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.RedSteel, GTValues.M * 18))); + BATTERY_HULL_MEDIUM_NAQUADRIA = addItem(723, "battery.hull.zpm").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Europium, GTValues.M * 6))); + BATTERY_HULL_LARGE_NAQUADRIA = addItem(724, "battery.hull.uv").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Americium, GTValues.M * 18))); // Batteries: 731-775 BATTERY_ULV_TANTALUM = addItem(731, "battery.re.ulv.tantalum").addComponents(ElectricStats.createRechargeableBattery(1000, GTValues.ULV)).setUnificationData(OrePrefix.battery, Tier.Primitive); @@ -540,13 +545,20 @@ public void registerSubItems() { ENERGY_CRYSTAL = addItem(741, "energy_crystal").addComponents(ElectricStats.createRechargeableBattery(4000000L, GTValues.HV)).setUnificationData(OrePrefix.battery, Tier.Advanced).setModelAmount(8).setMaxStackSize(1); LAPOTRON_CRYSTAL = addItem(742, "lapotron_crystal").addComponents(ElectricStats.createRechargeableBattery(10000000L, GTValues.EV)).setUnificationData(OrePrefix.battery, Tier.Extreme).setModelAmount(8).setMaxStackSize(1); - ENERGY_LAPOTRONIC_ORB = addItem(743, "energy.lapotronicorb").addComponents(ElectricStats.createRechargeableBattery(100000000, GTValues.IV)).setUnificationData(OrePrefix.battery, Tier.Elite).setModelAmount(8); - ENERGY_LAPOTRONIC_ORB2 = addItem(744, "energy.lapotronicorb2").addComponents(ElectricStats.createRechargeableBattery(1000000000, GTValues.LuV)).setUnificationData(OrePrefix.battery, Tier.Master).setModelAmount(8); + BATTERY_EV_VANADIUM = addItem(743, "battery.ev.vanadium").addComponents(ElectricStats.createRechargeableBattery(10240000L, GTValues.EV)).setUnificationData(OrePrefix.battery, Tier.Extreme).setModelAmount(8); + BATTERY_IV_VANADIUM = addItem(744, "battery.iv.vanadium").addComponents(ElectricStats.createRechargeableBattery(40960000L, GTValues.IV)).setUnificationData(OrePrefix.battery, Tier.Elite).setModelAmount(8); + BATTERY_LUV_VANADIUM = addItem(745, "battery.luv.vanadium").addComponents(ElectricStats.createRechargeableBattery(163840000L, GTValues.LuV)).setUnificationData(OrePrefix.battery, Tier.Master).setModelAmount(8); - ENERGY_LAPOTRONIC_MODULE = addItem(745, "energy.module").addComponents(new IItemComponent[]{ElectricStats.createRechargeableBattery(10000000000L, GTValues.ZPM)}).setUnificationData(OrePrefix.battery, Tier.Ultimate).setModelAmount(8); - ENERGY_LAPOTRONIC_CLUSTER = addItem(746, "energy.cluster").addComponents(new IItemComponent[]{ElectricStats.createRechargeableBattery(100000000000L, GTValues.UV)}).setUnificationData(OrePrefix.battery, Tier.Superconductor).setModelAmount(8); + BATTERY_ZPM_NAQUADRIA = addItem(746, "battery.zpm.naquadria").addComponents(ElectricStats.createRechargeableBattery(655360000L, GTValues.ZPM)).setUnificationData(OrePrefix.battery, Tier.Ultimate).setModelAmount(8); + BATTERY_UV_NAQUADRIA = addItem(747, "battery.uv.naquadria").addComponents(ElectricStats.createRechargeableBattery(2621440000L, GTValues.UV)).setUnificationData(OrePrefix.battery, Tier.Superconductor).setModelAmount(8); - ZERO_POINT_MODULE = addItem(747, "zpm").addComponents(ElectricStats.createBattery(2000000000000L, GTValues.ZPM, false)).setModelAmount(8); - ULTIMATE_BATTERY = addItem(748, "max.battery").addComponents(ElectricStats.createRechargeableBattery(Long.MAX_VALUE, GTValues.MAX)).setUnificationData(OrePrefix.battery, Tier.Maximum).setModelAmount(8); + ENERGY_LAPOTRONIC_ORB = addItem(748, "energy.lapotronicorb").addComponents(ElectricStats.createRechargeableBattery(100000000L, GTValues.IV)).setUnificationData(OrePrefix.battery, Tier.Elite).setModelAmount(8); + ENERGY_LAPOTRONIC_ORB2 = addItem(749, "energy.lapotronicorb2").addComponents(ElectricStats.createRechargeableBattery(1000000000L, GTValues.LuV)).setUnificationData(OrePrefix.battery, Tier.Master).setModelAmount(8); + + ENERGY_LAPOTRONIC_MODULE = addItem(750, "energy.module").addComponents(new IItemComponent[]{ElectricStats.createRechargeableBattery(10000000000L, GTValues.ZPM)}).setUnificationData(OrePrefix.battery, Tier.Ultimate).setModelAmount(8); + ENERGY_LAPOTRONIC_CLUSTER = addItem(751, "energy.cluster").addComponents(new IItemComponent[]{ElectricStats.createRechargeableBattery(100000000000L, GTValues.UV)}).setUnificationData(OrePrefix.battery, Tier.Superconductor).setModelAmount(8); + + ZERO_POINT_MODULE = addItem(752, "zpm").addComponents(ElectricStats.createBattery(2000000000000L, GTValues.ZPM, false)).setModelAmount(8); + ULTIMATE_BATTERY = addItem(753, "max.battery").addComponents(ElectricStats.createRechargeableBattery(Long.MAX_VALUE, GTValues.MAX)).setUnificationData(OrePrefix.battery, Tier.Maximum).setModelAmount(8); } } diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java index 80a5d746691..c9802420d40 100644 --- a/src/main/java/gregtech/common/items/MetaItems.java +++ b/src/main/java/gregtech/common/items/MetaItems.java @@ -130,6 +130,11 @@ private MetaItems() { public static MetaItem.MetaValueItem BATTERY_HULL_LV; public static MetaItem.MetaValueItem BATTERY_HULL_MV; public static MetaItem.MetaValueItem BATTERY_HULL_HV; + public static MetaItem.MetaValueItem BATTERY_HULL_SMALL_VANADIUM; + public static MetaItem.MetaValueItem BATTERY_HULL_MEDIUM_VANADIUM; + public static MetaItem.MetaValueItem BATTERY_HULL_LARGE_VANADIUM; + public static MetaItem.MetaValueItem BATTERY_HULL_MEDIUM_NAQUADRIA; + public static MetaItem.MetaValueItem BATTERY_HULL_LARGE_NAQUADRIA; public static MetaItem.MetaValueItem BATTERY_ULV_TANTALUM; public static MetaItem.MetaValueItem BATTERY_LV_CADMIUM; @@ -144,6 +149,12 @@ private MetaItems() { public static MetaItem.MetaValueItem ENERGY_CRYSTAL; public static MetaItem.MetaValueItem LAPOTRON_CRYSTAL; + public static MetaItem.MetaValueItem BATTERY_EV_VANADIUM; + public static MetaItem.MetaValueItem BATTERY_IV_VANADIUM; + public static MetaItem.MetaValueItem BATTERY_LUV_VANADIUM; + public static MetaItem.MetaValueItem BATTERY_ZPM_NAQUADRIA; + public static MetaItem.MetaValueItem BATTERY_UV_NAQUADRIA; + public static MetaItem.MetaValueItem ENERGY_LAPOTRONIC_ORB; public static MetaItem.MetaValueItem ENERGY_LAPOTRONIC_ORB2; public static MetaItem.MetaValueItem ZERO_POINT_MODULE; diff --git a/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java b/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java index a5d3708a7f6..26319b62d90 100644 --- a/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java +++ b/src/main/java/gregtech/integration/jei/recipe/GTRecipeWrapper.java @@ -129,7 +129,7 @@ public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHe if (!recipe.hasProperty(PrimitiveProperty.getInstance())) { minecraft.fontRenderer.drawString(I18n.format("gregtech.recipe.total", Math.abs((long) recipe.getEUt()) * recipe.getDuration()), 0, yPosition, 0x111111); minecraft.fontRenderer.drawString(I18n.format(recipe.getEUt() >= 0 ? "gregtech.recipe.eu" : "gregtech.recipe.eu_inverted", Math.abs(recipe.getEUt()), JEIHelpers.getMinTierForVoltage(recipe.getEUt())), 0, yPosition += LINE_HEIGHT, 0x111111); - } + } else yPosition -= LINE_HEIGHT * 2; minecraft.fontRenderer.drawString(I18n.format("gregtech.recipe.duration", recipe.getDuration() / 20f), 0, yPosition += LINE_HEIGHT, 0x111111); for (Map.Entry, Object> propertyEntry : recipe.getPropertyValues()) { if (!propertyEntry.getKey().isHidden()) { diff --git a/src/main/java/gregtech/loaders/recipe/BatteryRecipes.java b/src/main/java/gregtech/loaders/recipe/BatteryRecipes.java index f6785e88c5e..10968f4b861 100644 --- a/src/main/java/gregtech/loaders/recipe/BatteryRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/BatteryRecipes.java @@ -1,130 +1,221 @@ package gregtech.loaders.recipe; -import gregtech.api.recipes.RecipeMaps; -import gregtech.api.unification.material.Materials; -import gregtech.api.unification.ore.OrePrefix; -import gregtech.common.items.MetaItems; +import gregtech.api.recipes.ModHandler; +import gregtech.api.unification.stack.UnificationEntry; +import static gregtech.api.recipes.RecipeMaps.*; +import static gregtech.api.unification.material.Materials.*; +import static gregtech.api.unification.ore.OrePrefix.*; import static gregtech.common.items.MetaItems.*; public class BatteryRecipes { public static void init() { + // Tantalum Battery (since it doesn't fit elsewhere) + ASSEMBLER_RECIPES.recipeBuilder().duration(30).EUt(4) + .input(dust, Tantalum) + .input(foil, Manganese) + .fluidInputs(Polyethylene.getFluid(144)) + .outputs(BATTERY_ULV_TANTALUM.getStackForm(8)) + .buildAndRegister(); + + // Battery Hull Recipes + + // LV + ModHandler.addShapedRecipe("battery_hull_lv", BATTERY_HULL_LV.getStackForm(), + "C", "P", "P", + 'C', new UnificationEntry(cableGtSingle, Tin), + 'P', new UnificationEntry(plate, BatteryAlloy)); + + ASSEMBLER_RECIPES.recipeBuilder().duration(400).EUt(1) + .input(cableGtSingle, Tin) + .input(plate, BatteryAlloy) + .fluidInputs(Polyethylene.getFluid(144)) + .output(BATTERY_HULL_LV) + .buildAndRegister(); - RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(30).EUt(4) - .input(OrePrefix.dust, Materials.Tantalum) - .input(OrePrefix.foil, Materials.Manganese) - .fluidInputs(Materials.Polyethylene.getFluid(144)) - .outputs(MetaItems.BATTERY_ULV_TANTALUM.getStackForm(8)) + // MV + ModHandler.addShapedRecipe("battery_hull_mv", BATTERY_HULL_MV.getStackForm(), + "C C", "PPP", "PPP", + 'C', new UnificationEntry(cableGtSingle, Copper), + 'P', new UnificationEntry(plate, BatteryAlloy)); + + ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(2) + .input(cableGtSingle, Copper, 2) + .input(plate, BatteryAlloy, 3) + .fluidInputs(Polyethylene.getFluid(432)) + .output(BATTERY_HULL_MV) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_LV_CADMIUM.getStackForm()) - .outputs(BATTERY_HULL_LV.getStackForm()) + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(2) + .input(cableGtSingle, AnnealedCopper, 2) + .input(plate, BatteryAlloy, 3) + .fluidInputs(Polyethylene.getFluid(432)) + .output(BATTERY_HULL_MV) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_LV_LITHIUM.getStackForm()) - .outputs(BATTERY_HULL_LV.getStackForm()) + // HV + ASSEMBLER_RECIPES.recipeBuilder().duration(300).EUt(4) + .input(cableGtSingle, Gold, 4) + .input(plate, BatteryAlloy, 9) + .fluidInputs(Polyethylene.getFluid(1296)) + .output(BATTERY_HULL_HV) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_LV_SODIUM.getStackForm()) - .outputs(BATTERY_HULL_LV.getStackForm()) + // EV + ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(480) + .input(cableGtSingle, Aluminium, 2) + .input(plate, BlueSteel, 2) + .fluidInputs(Polytetrafluoroethylene.getFluid(144)) + .output(BATTERY_HULL_SMALL_VANADIUM) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_MV_CADMIUM.getStackForm()) - .outputs(BATTERY_HULL_MV.getStackForm()) + // IV + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(1920) + .input(cableGtSingle, Platinum, 2) + .input(plate, RoseGold, 6) + .fluidInputs(Polytetrafluoroethylene.getFluid(288)) + .output(BATTERY_HULL_MEDIUM_VANADIUM) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_MV_LITHIUM.getStackForm()) - .outputs(BATTERY_HULL_MV.getStackForm()) + // LuV + ASSEMBLER_RECIPES.recipeBuilder().duration(300).EUt(7680) + .input(cableGtSingle, NiobiumTitanium, 2) + .input(plate, RedSteel, 18) + .fluidInputs(Polybenzimidazole.getFluid(144)) + .output(BATTERY_HULL_LARGE_VANADIUM) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_MV_SODIUM.getStackForm()) - .outputs(BATTERY_HULL_MV.getStackForm()) + // ZPM + ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(30720) + .input(cableGtSingle, Naquadah, 2) + .input(plate, Europium, 6) + .fluidInputs(Polybenzimidazole.getFluid(288)) + .output(BATTERY_HULL_MEDIUM_NAQUADRIA) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_HV_CADMIUM.getStackForm()) - .outputs(BATTERY_HULL_HV.getStackForm()) + // UV + ASSEMBLER_RECIPES.recipeBuilder().duration(300).EUt(122880) + .input(cableGtSingle, NaquadahAlloy, 2) + .input(plate, Americium, 18) + .fluidInputs(Polybenzimidazole.getFluid(576)) + .output(BATTERY_HULL_LARGE_NAQUADRIA) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_HV_LITHIUM.getStackForm()) - .outputs(BATTERY_HULL_HV.getStackForm()) + // Battery Filling Recipes + + // LV + CANNER_RECIPES.recipeBuilder().duration(100).EUt(2) + .input(BATTERY_HULL_LV) + .input(dust, Cadmium, 2) + .output(BATTERY_LV_CADMIUM) .buildAndRegister(); - RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder() - .inputs(BATTERY_HV_SODIUM.getStackForm()) - .outputs(BATTERY_HULL_HV.getStackForm()) + CANNER_RECIPES.recipeBuilder().duration(100).EUt(2) + .input(BATTERY_HULL_LV) + .input(dust, Lithium, 2) + .output(BATTERY_LV_LITHIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_LV.getStackForm()) - .input(OrePrefix.dust, Materials.Cadmium, 2) - .outputs(BATTERY_LV_CADMIUM.getStackForm()) - .duration(100).EUt(2) + CANNER_RECIPES.recipeBuilder().duration(100).EUt(2) + .input(BATTERY_HULL_LV) + .input(dust, Sodium, 2) + .output(BATTERY_LV_SODIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_LV.getStackForm()) - .input(OrePrefix.dust, Materials.Lithium, 2) - .outputs(BATTERY_LV_LITHIUM.getStackForm()) - .duration(100).EUt(2) + // MV + CANNER_RECIPES.recipeBuilder().duration(400).EUt(2) + .input(BATTERY_HULL_MV) + .input(dust, Cadmium, 8) + .output(BATTERY_MV_CADMIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_LV.getStackForm()) - .input(OrePrefix.dust, Materials.Sodium, 2) - .outputs(BATTERY_LV_SODIUM.getStackForm()) - .duration(100).EUt(2) + CANNER_RECIPES.recipeBuilder().duration(400).EUt(2) + .input(BATTERY_HULL_MV) + .input(dust, Lithium, 8) + .output(BATTERY_MV_LITHIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_MV.getStackForm()) - .input(OrePrefix.dust, Materials.Cadmium, 8) - .outputs(BATTERY_MV_CADMIUM.getStackForm()) - .duration(400).EUt(2) + CANNER_RECIPES.recipeBuilder().duration(400).EUt(2) + .input(BATTERY_HULL_MV) + .input(dust, Sodium, 8) + .output(BATTERY_MV_SODIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_MV.getStackForm()) - .input(OrePrefix.dust, Materials.Lithium, 8) - .outputs(BATTERY_MV_LITHIUM.getStackForm()) - .duration(400).EUt(2) + // HV + CANNER_RECIPES.recipeBuilder().duration(1600).EUt(2) + .input(BATTERY_HULL_HV) + .input(dust, Cadmium, 16) + .output(BATTERY_HV_CADMIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_MV.getStackForm()) - .input(OrePrefix.dust, Materials.Sodium, 8) - .outputs(BATTERY_MV_SODIUM.getStackForm()) - .duration(400).EUt(2) + CANNER_RECIPES.recipeBuilder().duration(1600).EUt(2) + .input(BATTERY_HULL_HV) + .input(dust, Lithium, 16) + .output(BATTERY_HV_LITHIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_HV.getStackForm()) - .input(OrePrefix.dust, Materials.Cadmium, 16) - .outputs(BATTERY_HV_CADMIUM.getStackForm()) - .duration(1600).EUt(2) + CANNER_RECIPES.recipeBuilder().duration(1600).EUt(2) + .input(BATTERY_HULL_HV) + .input(dust, Sodium, 16) + .output(BATTERY_HV_SODIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_HV.getStackForm()) - .input(OrePrefix.dust, Materials.Lithium, 16) - .outputs(BATTERY_HV_LITHIUM.getStackForm()) - .duration(1600).EUt(2) + // EV + CANNER_RECIPES.recipeBuilder().duration(100).EUt(480) + .input(BATTERY_HULL_SMALL_VANADIUM) + .input(dust, Vanadium, 2) + .output(BATTERY_EV_VANADIUM) .buildAndRegister(); - RecipeMaps.CANNER_RECIPES.recipeBuilder() - .inputs(BATTERY_HULL_HV.getStackForm()) - .input(OrePrefix.dust, Materials.Sodium, 16) - .outputs(BATTERY_HV_SODIUM.getStackForm()) - .duration(1600).EUt(2) + // IV + CANNER_RECIPES.recipeBuilder().duration(150).EUt(1024) + .input(BATTERY_HULL_MEDIUM_VANADIUM) + .input(dust, Vanadium, 8) + .output(BATTERY_IV_VANADIUM) .buildAndRegister(); + + // LuV + CANNER_RECIPES.recipeBuilder().duration(200).EUt(1920) + .input(BATTERY_HULL_LARGE_VANADIUM) + .input(dust, Vanadium, 16) + .output(BATTERY_LUV_VANADIUM) + .buildAndRegister(); + + // ZPM + CANNER_RECIPES.recipeBuilder().duration(250).EUt(4096) + .input(BATTERY_HULL_MEDIUM_NAQUADRIA) + .input(dust, Naquadria, 8) + .output(BATTERY_ZPM_NAQUADRIA) + .buildAndRegister(); + + // UV + CANNER_RECIPES.recipeBuilder().duration(300).EUt(7680) + .input(BATTERY_HULL_LARGE_NAQUADRIA) + .input(dust, Naquadria, 16) + .output(BATTERY_UV_NAQUADRIA) + .buildAndRegister(); + + + // Battery Recycling Recipes + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_LV_CADMIUM).output(BATTERY_HULL_LV).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_LV_LITHIUM).output(BATTERY_HULL_LV).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_LV_SODIUM).output(BATTERY_HULL_LV).buildAndRegister(); + + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_MV_CADMIUM).output(BATTERY_HULL_MV).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_MV_LITHIUM).output(BATTERY_HULL_MV).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_MV_SODIUM).output(BATTERY_HULL_MV).buildAndRegister(); + + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_HV_CADMIUM).output(BATTERY_HULL_HV).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_HV_LITHIUM).output(BATTERY_HULL_HV).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_HV_SODIUM).output(BATTERY_HULL_HV).buildAndRegister(); + + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_EV_VANADIUM).output(BATTERY_HULL_SMALL_VANADIUM).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_IV_VANADIUM).output(BATTERY_HULL_MEDIUM_VANADIUM).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_LUV_VANADIUM).output(BATTERY_HULL_LARGE_VANADIUM).buildAndRegister(); + + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_ZPM_NAQUADRIA).output(BATTERY_HULL_MEDIUM_NAQUADRIA).buildAndRegister(); + EXTRACTOR_RECIPES.recipeBuilder().input(BATTERY_UV_NAQUADRIA).output(BATTERY_HULL_LARGE_NAQUADRIA).buildAndRegister(); } } diff --git a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java index 3ffe76c0ea3..b8cf97ddc22 100644 --- a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java @@ -107,9 +107,6 @@ private static void loadCraftingRecipes() { ModHandler.addShapelessRecipe("dust_cobalt_brass", OreDictUnifier.get(OrePrefix.dust, Materials.CobaltBrass, 8), new UnificationEntry(OrePrefix.dust, Materials.Brass), new UnificationEntry(OrePrefix.dust, Materials.Brass), new UnificationEntry(OrePrefix.dust, Materials.Brass), new UnificationEntry(OrePrefix.dust, Materials.Brass), new UnificationEntry(OrePrefix.dust, Materials.Brass), new UnificationEntry(OrePrefix.dust, Materials.Brass), new UnificationEntry(OrePrefix.dust, Materials.Brass), new UnificationEntry(OrePrefix.dust, Materials.Aluminium), new UnificationEntry(OrePrefix.dust, Materials.Cobalt)); ModHandler.addShapelessRecipe("dust_stainless_steel", OreDictUnifier.get(OrePrefix.dust, Materials.StainlessSteel, 8), new UnificationEntry(OrePrefix.dust, Materials.Iron), new UnificationEntry(OrePrefix.dust, Materials.Iron), new UnificationEntry(OrePrefix.dust, Materials.Iron), new UnificationEntry(OrePrefix.dust, Materials.Iron), new UnificationEntry(OrePrefix.dust, Materials.Iron), new UnificationEntry(OrePrefix.dust, Materials.Iron), new UnificationEntry(OrePrefix.dust, Materials.Nickel), new UnificationEntry(OrePrefix.dust, Materials.Manganese), new UnificationEntry(OrePrefix.dust, Materials.Chrome)); - ModHandler.addShapedRecipe("battery_hull_lv", MetaItems.BATTERY_HULL_LV.getStackForm(), "C", "P", "P", 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Tin), 'P', new UnificationEntry(OrePrefix.plate, Materials.BatteryAlloy)); - ModHandler.addShapedRecipe("battery_hull_mv", MetaItems.BATTERY_HULL_MV.getStackForm(), "C C", "PPP", "PPP", 'C', new UnificationEntry(OrePrefix.cableGtSingle, Materials.Copper), 'P', new UnificationEntry(OrePrefix.plate, Materials.BatteryAlloy)); - ModHandler.addShapedRecipe("carbon_mesh", MetaItems.CARBON_MESH.getStackForm(), "XX", 'X', MetaItems.CARBON_FIBERS.getStackForm()); ModHandler.addShapedRecipe("component_grinder_diamond", MetaItems.COMPONENT_GRINDER_DIAMOND.getStackForm(), "XSX", "SDS", "XSX", 'X', new UnificationEntry(OrePrefix.dust, Materials.Diamond), 'S', new UnificationEntry(OrePrefix.plate, Materials.Steel), 'D', new UnificationEntry(OrePrefix.gem, Materials.Diamond)); diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 21ff004543e..0e60ab09d4c 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -573,11 +573,6 @@ private static void registerAssemblerRecipes() { RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder().duration(50).EUt(16).inputs(MetaBlocks.MACHINE_CASING.getItemVariant(MachineCasingType.MAX)).input(OrePrefix.wireGtSingle, MarkerMaterials.Tier.Superconductor, 2).outputs(MetaTileEntities.HULL[14].getStackForm()).buildAndRegister(); } - ASSEMBLER_RECIPES.recipeBuilder().duration(800).EUt(1).input(cableGtSingle, Tin).input(plate, BatteryAlloy).fluidInputs(Polyethylene.getFluid(144)).output(BATTERY_HULL_LV).buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(1600).EUt(2).input(cableGtSingle, Copper, 2).input(plate, BatteryAlloy, 3).fluidInputs(Polyethylene.getFluid(432)).output(BATTERY_HULL_MV).buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(1600).EUt(2).input(cableGtSingle, AnnealedCopper, 2).input(plate, BatteryAlloy, 3).fluidInputs(Polyethylene.getFluid(432)).output(BATTERY_HULL_MV).buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().duration(3200).EUt(4).input(cableGtSingle, Gold, 4).input(plate, BatteryAlloy, 9).fluidInputs(Polyethylene.getFluid(1296)).output(BATTERY_HULL_HV).buildAndRegister(); - ASSEMBLER_RECIPES.recipeBuilder().EUt(2).inputs(new ItemStack(Blocks.CHEST, 1, GTValues.W)).input(plate, Iron, 5).outputs(new ItemStack(Blocks.HOPPER)).duration(800).buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().EUt(2).inputs(new ItemStack(Blocks.TRAPPED_CHEST, 1, GTValues.W)).input(plate, Iron, 5).outputs(new ItemStack(Blocks.HOPPER)).duration(800).buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().EUt(2).input(gear, CobaltBrass).input(dust, Diamond).output(COMPONENT_SAW_BLADE_DIAMOND).duration(1600).buildAndRegister(); diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 4b761143dc7..8002fba8c01 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -260,15 +260,20 @@ metaitem.battery.hull.mv.name=Medium Battery Hull metaitem.battery.hull.mv.tooltip=An empty MV Battery Hull metaitem.battery.hull.hv.name=Large Battery Hull metaitem.battery.hull.hv.tooltip=An empty HV Battery Hull +metaitem.battery.hull.ev.name=Small Vanadium Battery Hull +metaitem.battery.hull.ev.tooltip=An empty EV Battery Hull +metaitem.battery.hull.iv.name=Medium Vanadium Battery Hull +metaitem.battery.hull.iv.tooltip=An empty IV Battery Hull +metaitem.battery.hull.luv.name=Large Vanadium Battery Hull +metaitem.battery.hull.luv.tooltip=An empty LuV Battery Hull +metaitem.battery.hull.zpm.name=Medium Naquadria Battery Hull +metaitem.battery.hull.zpm.tooltip=An empty ZPM Battery Hull +metaitem.battery.hull.uv.name=Large Naquadria Battery Hull +metaitem.battery.hull.uv.tooltip=An empty UV Battery Hull metaitem.battery.re.ulv.tantalum.name=Tantalum Capacitor metaitem.battery.re.ulv.tantalum.tooltip=Reusable Battery -metaitem.battery.su.lv.sulfuricacid.name=Small Acid Battery -metaitem.battery.su.lv.sulfuricacid.tooltip=Single Use Battery -metaitem.battery.su.lv.mercury.name=Small Mercury Battery -metaitem.battery.su.lv.mercury.tooltip=Single Use Battery - metaitem.battery.re.lv.cadmium.name=Small Cadmium Battery metaitem.battery.re.lv.cadmium.tooltip=Reusable Battery metaitem.battery.re.lv.lithium.name=Small Lithium Battery @@ -276,11 +281,6 @@ metaitem.battery.re.lv.lithium.tooltip=Reusable Battery metaitem.battery.re.lv.sodium.name=Small Sodium Battery metaitem.battery.re.lv.sodium.tooltip=Reusable Battery -metaitem.battery.su.mv.sulfuricacid.name=Medium Acid Battery -metaitem.battery.su.mv.sulfuricacid.tooltip=Single Use Battery -metaitem.battery.su.mv.mercury.name=Medium Mercury Battery -metaitem.battery.su.mv.mercury.tooltip=Single Use Battery - metaitem.battery.re.mv.cadmium.name=Medium Cadmium Battery metaitem.battery.re.mv.cadmium.tooltip=Reusable Battery metaitem.battery.re.mv.lithium.name=Medium Lithium Battery @@ -288,11 +288,6 @@ metaitem.battery.re.mv.lithium.tooltip=Reusable Battery metaitem.battery.re.mv.sodium.name=Medium Sodium Battery metaitem.battery.re.mv.sodium.tooltip=Reusable Battery -metaitem.battery.su.hv.sulfuricacid.name=Large Acid Battery -metaitem.battery.su.hv.sulfuricacid.tooltip=Single Use Battery -metaitem.battery.su.hv.mercury.name=Large Mercury Battery -metaitem.battery.su.hv.mercury.tooltip=Single Use Battery - metaitem.battery.re.hv.cadmium.name=Large Cadmium Battery metaitem.battery.re.hv.cadmium.tooltip=Reusable Battery metaitem.battery.re.hv.lithium.name=Large Lithium Battery @@ -300,6 +295,18 @@ metaitem.battery.re.hv.lithium.tooltip=Reusable Battery metaitem.battery.re.hv.sodium.name=Large Sodium Battery metaitem.battery.re.hv.sodium.tooltip=Reusable Battery +metaitem.battery.ev.vanadium.name=Small Vanadium Battery +metaitem.battery.ev.vanadium.tooltip=Reusable Battery +metaitem.battery.iv.vanadium.name=Medium Vanadium Battery +metaitem.battery.iv.vanadium.tooltip=Reusable Battery +metaitem.battery.luv.vanadium.name=Large Vanadium Battery +metaitem.battery.luv.vanadium.tooltip=Reusable Battery + +metaitem.battery.zpm.naquadria.name=Medium Naquadria Battery +metaitem.battery.zpm.naquadria.tooltip=Reusable Battery +metaitem.battery.uv.naquadria.name=Large Naquadria Battery +metaitem.battery.uv.naquadria.tooltip=Reusable Battery + metaitem.energy_crystal.name=Energy Crystal metaitem.energy_crystal.tooltip=Reusable Battery metaitem.lapotron_crystal.name=Lapotron Crystal @@ -311,9 +318,11 @@ metaitem.energy.lapotronicorb2.tooltip=Reusable Battery metaitem.zpm.name=Zero Point Module metaitem.zpm.tooltip=Single Use Battery metaitem.energy.module.name=Energy Module +metaitem.energy.module.tooltip=Reusable Battery metaitem.energy.cluster.name=Energy Cluster +metaitem.energy.cluster.tooltip=Reusable Battery metaitem.max.battery.name=Ultimate Battery -metaitem.max.battery.tooltip=Fill this to win minecraft +metaitem.max.battery.tooltip=Fill this to win Minecraft metaitem.electric.motor.lv.name=LV Electric Motor metaitem.electric.motor.mv.name=MV Electric Motor diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/1.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/1.json new file mode 100644 index 00000000000..0db0cecb422 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.ev.vanadium/1" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/2.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/2.json new file mode 100644 index 00000000000..02eeb3bec2e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.ev.vanadium/2" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/3.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/3.json new file mode 100644 index 00000000000..84fb055a847 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.ev.vanadium/3" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/4.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/4.json new file mode 100644 index 00000000000..f10577aa0ec --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.ev.vanadium/4" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/5.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/5.json new file mode 100644 index 00000000000..9a4a54b9b18 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.ev.vanadium/5" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/6.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/6.json new file mode 100644 index 00000000000..24595da723d --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/6.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.ev.vanadium/6" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/7.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/7.json new file mode 100644 index 00000000000..369db3c3f7a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/7.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.ev.vanadium/7" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/8.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/8.json new file mode 100644 index 00000000000..4eb00d5dace --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.ev.vanadium/8.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.ev.vanadium/8" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.ev.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.ev.json new file mode 100644 index 00000000000..7bec3aab574 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.ev.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.hull.ev" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.iv.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.iv.json new file mode 100644 index 00000000000..a0b009eae9a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.iv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.hull.iv" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.luv.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.luv.json new file mode 100644 index 00000000000..624133f57d8 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.luv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.hull.luv" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.uv.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.uv.json new file mode 100644 index 00000000000..f242c2a53fe --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.uv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.hull.uv" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.zpm.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.zpm.json new file mode 100644 index 00000000000..89cd081ea2a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.hull.zpm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.hull.zpm" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/1.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/1.json new file mode 100644 index 00000000000..7110f406c97 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.iv.vanadium/1" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/2.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/2.json new file mode 100644 index 00000000000..c6f8685bd1c --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.iv.vanadium/2" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/3.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/3.json new file mode 100644 index 00000000000..be5f4dc40d2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.iv.vanadium/3" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/4.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/4.json new file mode 100644 index 00000000000..8625d8a1941 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.iv.vanadium/4" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/5.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/5.json new file mode 100644 index 00000000000..ce989c9ea91 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.iv.vanadium/5" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/6.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/6.json new file mode 100644 index 00000000000..1bfbed5fa8c --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/6.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.iv.vanadium/6" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/7.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/7.json new file mode 100644 index 00000000000..d17fc92fb76 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/7.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.iv.vanadium/7" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/8.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/8.json new file mode 100644 index 00000000000..b57ca45ad7e --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.iv.vanadium/8.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.iv.vanadium/8" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/1.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/1.json new file mode 100644 index 00000000000..00ea04f36c8 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.luv.vanadium/1" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/2.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/2.json new file mode 100644 index 00000000000..7d75b42f155 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.luv.vanadium/2" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/3.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/3.json new file mode 100644 index 00000000000..8f870a9e7ea --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.luv.vanadium/3" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/4.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/4.json new file mode 100644 index 00000000000..5327e378763 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.luv.vanadium/4" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/5.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/5.json new file mode 100644 index 00000000000..8214427664f --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.luv.vanadium/5" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/6.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/6.json new file mode 100644 index 00000000000..127a6ff5675 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/6.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.luv.vanadium/6" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/7.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/7.json new file mode 100644 index 00000000000..5aeaca50b20 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/7.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.luv.vanadium/7" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/8.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/8.json new file mode 100644 index 00000000000..ae8d36b9e3c --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.luv.vanadium/8.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.luv.vanadium/8" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.hv.mercury.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.hv.mercury.json deleted file mode 100644 index f0dc2131601..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.hv.mercury.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/battery.su.hv.mercury" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.hv.sulfuricacid.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.hv.sulfuricacid.json deleted file mode 100644 index a87b35a6419..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.hv.sulfuricacid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/battery.su.hv.sulfuricacid" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.lv.mercury.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.lv.mercury.json deleted file mode 100644 index d1fdd7aa8f7..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.lv.mercury.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/battery.su.lv.mercury" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.lv.sulfuricacid.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.lv.sulfuricacid.json deleted file mode 100644 index 6d772c2fcc4..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.lv.sulfuricacid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/battery.su.lv.sulfuricacid" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.mv.mercury.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.mv.mercury.json deleted file mode 100644 index 677fac00fc8..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.mv.mercury.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/battery.su.mv.mercury" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.mv.sulfuricacid.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.mv.sulfuricacid.json deleted file mode 100644 index 332edd98478..00000000000 --- a/src/main/resources/assets/gregtech/models/item/metaitems/battery.su.mv.sulfuricacid.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/battery.su.mv.sulfuricacid" - } -} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/1.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/1.json new file mode 100644 index 00000000000..0c28ba4ba76 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.uv.naquadria/1" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/2.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/2.json new file mode 100644 index 00000000000..07754c9f7b0 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.uv.naquadria/2" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/3.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/3.json new file mode 100644 index 00000000000..419aa4d9373 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.uv.naquadria/3" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/4.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/4.json new file mode 100644 index 00000000000..2ec280775a1 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.uv.naquadria/4" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/5.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/5.json new file mode 100644 index 00000000000..e4cae05ef32 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.uv.naquadria/5" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/6.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/6.json new file mode 100644 index 00000000000..44be600fa2a --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/6.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.uv.naquadria/6" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/7.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/7.json new file mode 100644 index 00000000000..6cc6d0d65f2 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/7.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.uv.naquadria/7" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/8.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/8.json new file mode 100644 index 00000000000..bf297b971fe --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.uv.naquadria/8.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.uv.naquadria/8" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/1.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/1.json new file mode 100644 index 00000000000..d417e2a9816 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.zpm.naquadria/1" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/2.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/2.json new file mode 100644 index 00000000000..875fe9d6644 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.zpm.naquadria/2" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/3.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/3.json new file mode 100644 index 00000000000..715f1c7fdd3 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.zpm.naquadria/3" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/4.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/4.json new file mode 100644 index 00000000000..91d189aa355 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.zpm.naquadria/4" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/5.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/5.json new file mode 100644 index 00000000000..11cef5ecb78 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.zpm.naquadria/5" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/6.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/6.json new file mode 100644 index 00000000000..529a3071648 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/6.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.zpm.naquadria/6" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/7.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/7.json new file mode 100644 index 00000000000..49fe6720f16 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/7.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.zpm.naquadria/7" + } +} diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/8.json b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/8.json new file mode 100644 index 00000000000..d7c658771a1 --- /dev/null +++ b/src/main/resources/assets/gregtech/models/item/metaitems/battery.zpm.naquadria/8.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/battery.zpm.naquadria/8" + } +} diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/1.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/1.png new file mode 100644 index 00000000000..84cedc4f95c Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/2.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/2.png new file mode 100644 index 00000000000..ac659fcc3d2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/3.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/3.png new file mode 100644 index 00000000000..16367774a66 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/4.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/4.png new file mode 100644 index 00000000000..b1a09beb290 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/5.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/5.png new file mode 100644 index 00000000000..331db0c53db Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/6.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/6.png new file mode 100644 index 00000000000..3e7b32cc48a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/7.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/7.png new file mode 100644 index 00000000000..47f697cfbf2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/8.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/8.png new file mode 100644 index 00000000000..c68a9b70d48 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.ev.vanadium/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.ev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.ev.png new file mode 100644 index 00000000000..fb8e5a6d9c4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.ev.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.iv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.iv.png new file mode 100644 index 00000000000..cba4b8aaecb Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.iv.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.luv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.luv.png new file mode 100644 index 00000000000..df159727211 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.luv.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.uv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.uv.png new file mode 100644 index 00000000000..9e66608c1e1 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.uv.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.zpm.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.zpm.png new file mode 100644 index 00000000000..49d8969b8d0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.hull.zpm.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/1.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/1.png new file mode 100644 index 00000000000..45140ae3bc4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/2.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/2.png new file mode 100644 index 00000000000..bfff7c02d9a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/3.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/3.png new file mode 100644 index 00000000000..8a75730084d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/4.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/4.png new file mode 100644 index 00000000000..69292d461dd Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/5.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/5.png new file mode 100644 index 00000000000..ce5b42b1926 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/6.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/6.png new file mode 100644 index 00000000000..27e5558eb71 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/7.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/7.png new file mode 100644 index 00000000000..401992a8549 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/8.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/8.png new file mode 100644 index 00000000000..ad9df5ba307 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.iv.vanadium/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/1.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/1.png new file mode 100644 index 00000000000..b9e35673290 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/2.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/2.png new file mode 100644 index 00000000000..caae7e00d5d Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/3.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/3.png new file mode 100644 index 00000000000..90180530ae2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/4.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/4.png new file mode 100644 index 00000000000..114823c5bad Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/5.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/5.png new file mode 100644 index 00000000000..7189dd0b2a6 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/6.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/6.png new file mode 100644 index 00000000000..54d31601ddf Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/7.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/7.png new file mode 100644 index 00000000000..4e771428cb0 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/8.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/8.png new file mode 100644 index 00000000000..33778625078 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.luv.vanadium/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.hv.mercury.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.hv.mercury.png deleted file mode 100644 index a0a222ee3de..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.hv.mercury.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.hv.sulfuricacid.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.hv.sulfuricacid.png deleted file mode 100644 index 0ea8aa896a7..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.hv.sulfuricacid.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.lv.mercury.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.lv.mercury.png deleted file mode 100644 index dfd36bb4d79..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.lv.mercury.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.lv.sulfuricacid.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.lv.sulfuricacid.png deleted file mode 100644 index 5a9a7a04dfc..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.lv.sulfuricacid.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.mv.mercury.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.mv.mercury.png deleted file mode 100644 index 5ebf6f720b0..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.mv.mercury.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.mv.sulfuricacid.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.mv.sulfuricacid.png deleted file mode 100644 index f4136f52d1f..00000000000 Binary files a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.su.mv.sulfuricacid.png and /dev/null differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/1.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/1.png new file mode 100644 index 00000000000..ca0c1c7cfb4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/2.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/2.png new file mode 100644 index 00000000000..4f6bfbf67ea Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/3.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/3.png new file mode 100644 index 00000000000..361b74fa1b2 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/4.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/4.png new file mode 100644 index 00000000000..b2515d4f84e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/5.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/5.png new file mode 100644 index 00000000000..e3d0d5183ef Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/6.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/6.png new file mode 100644 index 00000000000..ae642e38309 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/7.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/7.png new file mode 100644 index 00000000000..b9ae7caa394 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/8.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/8.png new file mode 100644 index 00000000000..563cd0dbada Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.uv.naquadria/8.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/1.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/1.png new file mode 100644 index 00000000000..06bc6e1d9bf Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/1.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/2.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/2.png new file mode 100644 index 00000000000..43fba748797 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/2.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/3.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/3.png new file mode 100644 index 00000000000..592f7d94806 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/3.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/4.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/4.png new file mode 100644 index 00000000000..67fb3f2210a Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/4.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/5.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/5.png new file mode 100644 index 00000000000..430cea2994e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/5.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/6.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/6.png new file mode 100644 index 00000000000..e35b0cfdb89 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/6.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/7.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/7.png new file mode 100644 index 00000000000..40d21363bf4 Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/7.png differ diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/8.png b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/8.png new file mode 100644 index 00000000000..eefcc8ea64e Binary files /dev/null and b/src/main/resources/assets/gregtech/textures/items/metaitems/battery.zpm.naquadria/8.png differ