From dd615fa595d9a29d25883c58ad21791f2eea4d10 Mon Sep 17 00:00:00 2001 From: duck_egg Date: Tue, 17 Jan 2023 12:18:21 +0800 Subject: [PATCH] IV batteries now have normal capacity. (I don't know why it was same with EV batteries) --- .../gregtech/loaders/b/Loader_MultiTileEntities.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java b/src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java index bfdc87ecc..a5160cfd6 100644 --- a/src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java +++ b/src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java @@ -1045,7 +1045,7 @@ private static void unsorted2(MultiTileEntityRegistry aRegistry, MultiTileEntity IL.Battery_Lead_Acid_MV .set(aRegistry.add("Lead-Acid Battery ("+VN[2]+")" , "Batteries" , 14002, 14013, MultiTileEntityBatteryEU128 .class, 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Orange] , NBT_INPUT, V[2], NBT_CAPACITY, V[2] * 2000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "PBP", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Lead_Acid_Cell_Filled, 'W', MT.DATA.CABLES_01[2], 'C', OD_CIRCUITS[2]), null, "gt:re-battery2"); IL.Battery_Lead_Acid_HV .set(aRegistry.add("Lead-Acid Battery ("+VN[3]+")" , "Batteries" , 14003, 14013, MultiTileEntityBatteryEU512 .class, 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Orange] , NBT_INPUT, V[3], NBT_CAPACITY, V[3] * 2000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "BPB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Lead_Acid_Cell_Filled, 'W', MT.DATA.CABLES_01[3], 'C', OD_CIRCUITS[3]), null, "gt:re-battery3"); IL.Battery_Lead_Acid_EV .set(aRegistry.add("Lead-Acid Battery ("+VN[4]+")" , "Batteries" , 14004, 14013, MultiTileEntityBatteryEU2048 .class, 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Orange] , NBT_INPUT, V[4], NBT_CAPACITY, V[4] * 2000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Lead_Acid_Cell_Filled, 'W', MT.DATA.CABLES_01[4], 'C', OD_CIRCUITS[4]), null, "gt:re-battery4"); - IL.Battery_Lead_Acid_IV .set(aRegistry.add("Lead-Acid Battery ("+VN[5]+")" , "Batteries" , 14005, 14013, MultiTileEntityBatteryEU8192 .class, 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Orange] , NBT_INPUT, V[5], NBT_CAPACITY, V[4] * 2000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Lead_Acid_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[5]), null, "gt:re-battery5"); + IL.Battery_Lead_Acid_IV .set(aRegistry.add("Lead-Acid Battery ("+VN[5]+")" , "Batteries" , 14005, 14013, MultiTileEntityBatteryEU8192 .class, 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Orange] , NBT_INPUT, V[5], NBT_CAPACITY, V[5] * 2000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Lead_Acid_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[5]), null, "gt:re-battery5"); IL.Battery_SU_LV_SulfuricAcid.set(IL.Battery_Lead_Acid_LV.get(1)); IL.Battery_SU_MV_SulfuricAcid.set(IL.Battery_Lead_Acid_MV.get(1)); @@ -1070,7 +1070,7 @@ private static void unsorted2(MultiTileEntityRegistry aRegistry, MultiTileEntity IL.Battery_Alkaline_MV .set(aRegistry.add("Alkaline Battery ("+VN[2]+")" , "Batteries" , 14012, 14013, MultiTileEntityBatteryEU128 .class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[2], NBT_CAPACITY, V[2] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "PBP", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Alkaline_Cell_Filled, 'W', MT.DATA.CABLES_01[2], 'C', OD_CIRCUITS[2]), null, "gt:re-battery2"); IL.Battery_Alkaline_HV .set(aRegistry.add("Alkaline Battery ("+VN[3]+")" , "Batteries" , 14013, 14013, MultiTileEntityBatteryEU512 .class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[3], NBT_CAPACITY, V[3] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "BPB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Alkaline_Cell_Filled, 'W', MT.DATA.CABLES_01[3], 'C', OD_CIRCUITS[3]), null, "gt:re-battery3"); IL.Battery_Alkaline_EV .set(aRegistry.add("Alkaline Battery ("+VN[4]+")" , "Batteries" , 14014, 14013, MultiTileEntityBatteryEU2048.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[4], NBT_CAPACITY, V[4] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Alkaline_Cell_Filled, 'W', MT.DATA.CABLES_01[4], 'C', OD_CIRCUITS[4]), null, "gt:re-battery4"); - IL.Battery_Alkaline_IV .set(aRegistry.add("Alkaline Battery ("+VN[5]+")" , "Batteries" , 14015, 14013, MultiTileEntityBatteryEU8192.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[5], NBT_CAPACITY, V[4] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Alkaline_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[5]), null, "gt:re-battery5"); + IL.Battery_Alkaline_IV .set(aRegistry.add("Alkaline Battery ("+VN[5]+")" , "Batteries" , 14015, 14013, MultiTileEntityBatteryEU8192.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[5], NBT_CAPACITY, V[5] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_Alkaline_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[5]), null, "gt:re-battery5"); // Just to populate those Fields with something for Compat with outdated Addons. IL.Battery_SU_LV_Mercury.set(IL.Battery_Alkaline_LV.get(1)); @@ -1082,7 +1082,7 @@ private static void unsorted2(MultiTileEntityRegistry aRegistry, MultiTileEntity IL.Battery_NiCd_MV .set(aRegistry.add("Nickel-Cadmium Battery ("+VN[2]+")" , "Batteries" , 14022, 14013, MultiTileEntityBatteryEU128 .class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Lime] , NBT_INPUT, V[2], NBT_CAPACITY, V[2] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "PBP", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_NiCd_Cell_Filled, 'W', MT.DATA.CABLES_01[2], 'C', OD_CIRCUITS[2]), null, "gt:re-battery2"); IL.Battery_NiCd_HV .set(aRegistry.add("Nickel-Cadmium Battery ("+VN[3]+")" , "Batteries" , 14023, 14013, MultiTileEntityBatteryEU512 .class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Lime] , NBT_INPUT, V[3], NBT_CAPACITY, V[3] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "BPB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_NiCd_Cell_Filled, 'W', MT.DATA.CABLES_01[3], 'C', OD_CIRCUITS[3]), null, "gt:re-battery3"); IL.Battery_NiCd_EV .set(aRegistry.add("Nickel-Cadmium Battery ("+VN[4]+")" , "Batteries" , 14024, 14013, MultiTileEntityBatteryEU2048.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Lime] , NBT_INPUT, V[4], NBT_CAPACITY, V[4] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_NiCd_Cell_Filled, 'W', MT.DATA.CABLES_01[4], 'C', OD_CIRCUITS[4]), null, "gt:re-battery4"); - IL.Battery_NiCd_IV .set(aRegistry.add("Nickel-Cadmium Battery ("+VN[5]+")" , "Batteries" , 14025, 14013, MultiTileEntityBatteryEU8192.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Lime] , NBT_INPUT, V[5], NBT_CAPACITY, V[4] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_NiCd_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[5]), null, "gt:re-battery5"); + IL.Battery_NiCd_IV .set(aRegistry.add("Nickel-Cadmium Battery ("+VN[5]+")" , "Batteries" , 14025, 14013, MultiTileEntityBatteryEU8192.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Lime] , NBT_INPUT, V[5], NBT_CAPACITY, V[5] * 4000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_NiCd_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[5]), null, "gt:re-battery5"); IL.Battery_RE_LV_Cadmium.set(IL.Battery_NiCd_LV.get(1)); IL.Battery_RE_MV_Cadmium.set(IL.Battery_NiCd_MV.get(1)); @@ -1093,7 +1093,7 @@ private static void unsorted2(MultiTileEntityRegistry aRegistry, MultiTileEntity IL.Battery_LiCoO2_MV .set(aRegistry.add("Lithium-Cobalt Battery ("+VN[2]+")" , "Batteries" , 14032, 14013, MultiTileEntityBatteryAdvEU128 .class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[2], NBT_CAPACITY, V[2] * 64000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "PBP", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiCoO2_Cell_Filled, 'W', MT.DATA.CABLES_01[2], 'C', OD_CIRCUITS[4]), null, "gt:re-battery2"); IL.Battery_LiCoO2_HV .set(aRegistry.add("Lithium-Cobalt Battery ("+VN[3]+")" , "Batteries" , 14033, 14013, MultiTileEntityBatteryAdvEU512 .class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[3], NBT_CAPACITY, V[3] * 64000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "BPB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiCoO2_Cell_Filled, 'W', MT.DATA.CABLES_01[3], 'C', OD_CIRCUITS[5]), null, "gt:re-battery3"); IL.Battery_LiCoO2_EV .set(aRegistry.add("Lithium-Cobalt Battery ("+VN[4]+")" , "Batteries" , 14034, 14013, MultiTileEntityBatteryAdvEU2048.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[4], NBT_CAPACITY, V[4] * 64000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiCoO2_Cell_Filled, 'W', MT.DATA.CABLES_01[4], 'C', OD_CIRCUITS[6]), null, "gt:re-battery4"); - IL.Battery_LiCoO2_IV .set(aRegistry.add("Lithium-Cobalt Battery ("+VN[5]+")" , "Batteries" , 14035, 14013, MultiTileEntityBatteryAdvEU8192.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[5], NBT_CAPACITY, V[4] * 64000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiCoO2_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[6]), null, "gt:re-battery5"); + IL.Battery_LiCoO2_IV .set(aRegistry.add("Lithium-Cobalt Battery ("+VN[5]+")" , "Batteries" , 14035, 14013, MultiTileEntityBatteryAdvEU8192.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Blue] , NBT_INPUT, V[5], NBT_CAPACITY, V[5] * 64000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiCoO2_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[6]), null, "gt:re-battery5"); IL.Battery_RE_LV_Lithium.set(IL.Battery_LiCoO2_LV.get(1)); IL.Battery_RE_MV_Lithium.set(IL.Battery_LiCoO2_MV.get(1)); @@ -1104,7 +1104,7 @@ private static void unsorted2(MultiTileEntityRegistry aRegistry, MultiTileEntity IL.Battery_LiMn_MV .set(aRegistry.add("Lithium-Manganese Battery ("+VN[2]+")" , "Batteries" , 14042, 14013, MultiTileEntityBatteryAdvEU128 .class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Green] , NBT_INPUT, V[2], NBT_CAPACITY, V[2] * 128000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "PBP", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiMn_Cell_Filled, 'W', MT.DATA.CABLES_01[2], 'C', OD_CIRCUITS[4]), null, "gt:re-battery2"); IL.Battery_LiMn_HV .set(aRegistry.add("Lithium-Manganese Battery ("+VN[3]+")" , "Batteries" , 14043, 14013, MultiTileEntityBatteryAdvEU512 .class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Green] , NBT_INPUT, V[3], NBT_CAPACITY, V[3] * 128000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WxW", "BCB", "BPB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiMn_Cell_Filled, 'W', MT.DATA.CABLES_01[3], 'C', OD_CIRCUITS[5]), null, "gt:re-battery3"); IL.Battery_LiMn_EV .set(aRegistry.add("Lithium-Manganese Battery ("+VN[4]+")" , "Batteries" , 14044, 14013, MultiTileEntityBatteryAdvEU2048.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Green] , NBT_INPUT, V[4], NBT_CAPACITY, V[4] * 128000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiMn_Cell_Filled, 'W', MT.DATA.CABLES_01[4], 'C', OD_CIRCUITS[6]), null, "gt:re-battery4"); - IL.Battery_LiMn_IV .set(aRegistry.add("Lithium-Manganese Battery ("+VN[5]+")" , "Batteries" , 14045, 14013, MultiTileEntityBatteryAdvEU8192.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Green] , NBT_INPUT, V[5], NBT_CAPACITY, V[4] * 128000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiMn_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[6]), null, "gt:re-battery5"); + IL.Battery_LiMn_IV .set(aRegistry.add("Lithium-Manganese Battery ("+VN[5]+")" , "Batteries" , 14045, 14013, MultiTileEntityBatteryAdvEU8192.class , 0, 16, aUtilMetal , UT.NBT.make(NBT_HARDNESS, 0.5F, NBT_RESISTANCE, 3.0F, NBT_COLOR, DYES_INT[DYE_INDEX_Green] , NBT_INPUT, V[5], NBT_CAPACITY, V[5] * 128000, NBT_ENERGY_ACCEPTED, TD.Energy.EU), "WPW", "BCB", "BBB", 'P', OP.plate.dat(MT.BatteryAlloy), 'B', IL.Battery_LiMn_Cell_Filled, 'W', MT.DATA.CABLES_01[5], 'C', OD_CIRCUITS[6]), null, "gt:re-battery5"); // Just to populate those Fields with something for Compat with outdated Addons. IL.Battery_RE_LV_Sodium.set(IL.Battery_LiMn_LV.get(1));