diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/PumpCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/PumpCover.java index c2d9849fd39..fd77f5892f8 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/PumpCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/PumpCover.java @@ -55,7 +55,7 @@ public class PumpCover extends CoverBehavior implements IIOCover, IMuiCover, IControllable { // .5b 2b 8b - public static final Int2IntFunction PUMP_SCALING = tier -> 64 * (int) Math.pow(4, Math.min(tier - 1, GTValues.IV)); + public static final Int2IntFunction PUMP_SCALING = tier -> 64 * (int) Math.pow(4, Math.min(tier, GTValues.LuV) - 1); public final int tier; public final int maxFluidTransferRate; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java index fafef5889c9..7869fb1ab0d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -22,6 +22,8 @@ import com.gregtechceu.gtceu.api.item.component.*; import com.gregtechceu.gtceu.api.item.component.prospector.ProspectorMode; import com.gregtechceu.gtceu.api.item.tool.MaterialToolTier; +import com.gregtechceu.gtceu.common.cover.ConveyorCover; +import com.gregtechceu.gtceu.common.cover.PumpCover; import com.gregtechceu.gtceu.common.data.materials.GTFoods; import com.gregtechceu.gtceu.common.entity.GTBoat; import com.gregtechceu.gtceu.common.item.*; @@ -728,8 +730,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[0]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - FormattingUtil.formatNumbers(1280 / 20))); + lines.add(fluidRateTooltip(GTValues.LV)); }))) .tag(CustomTags.ELECTRIC_PUMPS) .register(); @@ -739,8 +740,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[1]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - FormattingUtil.formatNumbers(1280 * 4 / 20))); + lines.add(fluidRateTooltip(GTValues.MV)); }))) .tag(CustomTags.ELECTRIC_PUMPS) .register(); @@ -749,8 +749,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[2]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - FormattingUtil.formatNumbers(1280 * 16 / 20))); + lines.add(fluidRateTooltip(GTValues.HV)); }))) .tag(CustomTags.ELECTRIC_PUMPS) .register(); @@ -759,8 +758,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[3]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - FormattingUtil.formatNumbers(1280 * 64 / 20))); + lines.add(fluidRateTooltip(GTValues.EV)); }))) .tag(CustomTags.ELECTRIC_PUMPS) .register(); @@ -769,8 +767,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[4]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - FormattingUtil.formatNumbers(1280 * 64 * 4 / 20))); + lines.add(fluidRateTooltip(GTValues.IV)); }))) .tag(CustomTags.ELECTRIC_PUMPS) .register(); @@ -780,8 +777,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[5]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - FormattingUtil.formatNumbers(1280 * 64 * 16 / 20))); + lines.add(fluidRateTooltip(GTValues.LuV)); }))) .tag(CustomTags.ELECTRIC_PUMPS) .register(); @@ -791,8 +787,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[6]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - FormattingUtil.formatNumbers(1280 * 64 * 64 / 20))); + lines.add(fluidRateTooltip(GTValues.ZPM)); }))) .tag(CustomTags.ELECTRIC_PUMPS) .register(); @@ -801,9 +796,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[7]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add( - Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - FormattingUtil.formatNumbers(1280 * 64 * 64 * 4 / 20))); + lines.add(fluidRateTooltip(GTValues.UV)); }))) .tag(CustomTags.ELECTRIC_PUMPS) .register(); @@ -814,8 +807,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[8]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UHV)); }))) .register() : null; @@ -826,8 +818,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[9]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UEV)); }))) .register() : null; @@ -838,8 +829,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[10]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UIV)); }))) .register() : null; @@ -850,8 +840,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[11]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UXV)); }))) .register() : null; @@ -862,8 +851,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.PUMPS[12]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.electric.pump.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.OpV)); }))) .register() : null; @@ -874,7 +862,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[0]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 / 20)); + lines.add(fluidRateTooltip(GTValues.LV)); }))) .tag(CustomTags.FLUID_REGULATORS) .register(); @@ -884,7 +872,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[1]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.MV)); }))) .tag(CustomTags.FLUID_REGULATORS) .register(); @@ -894,7 +882,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[2]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 16 / 20)); + lines.add(fluidRateTooltip(GTValues.HV)); }))) .tag(CustomTags.FLUID_REGULATORS) .register(); @@ -904,7 +892,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[3]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 / 20)); + lines.add(fluidRateTooltip(GTValues.EV)); }))) .tag(CustomTags.FLUID_REGULATORS) .register(); @@ -914,7 +902,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[4]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.IV)); }))) .tag(CustomTags.FLUID_REGULATORS) .register(); @@ -924,7 +912,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[5]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 * 16 / 20)); + lines.add(fluidRateTooltip(GTValues.LuV)); }))) .tag(CustomTags.FLUID_REGULATORS) .register(); @@ -934,7 +922,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[6]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 * 64 / 20)); + lines.add(fluidRateTooltip(GTValues.ZPM)); }))) .tag(CustomTags.FLUID_REGULATORS) .register(); @@ -944,8 +932,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[7]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add( - Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UV)); }))) .tag(CustomTags.FLUID_REGULATORS) .register(); @@ -955,8 +942,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[8]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UHV)); }))) .register() : null; @@ -966,8 +952,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[9]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UEV)); }))) .register() : null; @@ -977,8 +962,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[10]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UIV)); }))) .register() : null; @@ -988,8 +972,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[11]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.UXV)); }))) .register() : null; @@ -999,8 +982,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.FLUID_REGULATORS[12]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.fluid.regulator.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", - 1280 * 64 * 64 * 4 / 20)); + lines.add(fluidRateTooltip(GTValues.OpV)); }))) .register() : null; @@ -1017,7 +999,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[0]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 8)); + lines.add(itemRateTooltip(GTValues.LV)); }))) .tag(CustomTags.CONVEYOR_MODULES) .register(); @@ -1027,7 +1009,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[1]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 32)); + lines.add(itemRateTooltip(GTValues.MV)); }))) .tag(CustomTags.CONVEYOR_MODULES) .register(); @@ -1037,7 +1019,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[2]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 64)); + lines.add(itemRateTooltip(GTValues.HV)); }))) .tag(CustomTags.CONVEYOR_MODULES) .register(); @@ -1047,7 +1029,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[3]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 3)); + lines.add(itemRateTooltip(GTValues.EV)); }))) .tag(CustomTags.CONVEYOR_MODULES) .register(); @@ -1057,7 +1039,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[4]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 8)); + lines.add(itemRateTooltip(GTValues.IV)); }))) .tag(CustomTags.CONVEYOR_MODULES) .register(); @@ -1067,7 +1049,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[5]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.LuV)); }))) .tag(CustomTags.CONVEYOR_MODULES) .register(); @@ -1077,7 +1059,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[6]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.ZPM)); }))) .tag(CustomTags.CONVEYOR_MODULES) .register(); @@ -1087,7 +1069,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[7]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UV)); }))) .tag(CustomTags.CONVEYOR_MODULES) .register(); @@ -1097,7 +1079,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[8]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UHV)); }))) .register() : null; @@ -1107,7 +1089,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[9]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UEV)); }))) .register() : null; @@ -1117,7 +1099,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[10]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UIV)); }))) .register() : null; @@ -1127,7 +1109,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[11]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UXV)); }))) .register() : null; @@ -1137,7 +1119,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.CONVEYORS[12]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.conveyor.module.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.OpV)); }))) .register() : null; @@ -1200,7 +1182,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[0]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 8)); + lines.add(itemRateTooltip(GTValues.LV)); }))) .tag(CustomTags.ROBOT_ARMS) .register(); @@ -1209,7 +1191,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[1]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 32)); + lines.add(itemRateTooltip(GTValues.MV)); }))) .tag(CustomTags.ROBOT_ARMS) .register(); @@ -1218,7 +1200,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[2]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate", 64)); + lines.add(itemRateTooltip(GTValues.HV)); }))) .tag(CustomTags.ROBOT_ARMS) .register(); @@ -1227,7 +1209,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[3]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 3)); + lines.add(itemRateTooltip(GTValues.EV)); }))) .tag(CustomTags.ROBOT_ARMS) .register(); @@ -1236,7 +1218,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[4]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 8)); + lines.add(itemRateTooltip(GTValues.IV)); }))) .tag(CustomTags.ROBOT_ARMS) .register(); @@ -1245,7 +1227,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[5]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.LuV)); }))) .tag(CustomTags.ROBOT_ARMS) .register(); @@ -1254,7 +1236,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[6]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.ZPM)); }))) .tag(CustomTags.ROBOT_ARMS) .register(); @@ -1263,7 +1245,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[7]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UV)); }))) .tag(CustomTags.ROBOT_ARMS) .register(); @@ -1273,7 +1255,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[8]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UHV)); }))) .register() : null; @@ -1283,7 +1265,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[9]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UEV)); }))) .register() : null; @@ -1293,7 +1275,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[10]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UIV)); }))) .register() : null; @@ -1303,7 +1285,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[11]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.UXV)); }))) .register() : null; @@ -1313,7 +1295,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit .onRegister(attach(new CoverPlaceBehavior(GTCovers.ROBOT_ARMS[12]))) .onRegister(attach(new TooltipBehavior(lines -> { lines.add(Component.translatable("item.gtceu.robot.arm.tooltip")); - lines.add(Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", 16)); + lines.add(itemRateTooltip(GTValues.OpV)); }))) .register() : null; @@ -2653,6 +2635,19 @@ public static void registerToolTier(MaterialToolTier tier, ResourceLocation id, Arrays.asList((Object[]) after.toArray(ResourceLocation[]::new))); } + private static Component itemRateTooltip(int tier) { + var itemsPerSecond = ConveyorCover.CONVEYOR_SCALING.applyAsInt(tier); + return itemsPerSecond > 64 ? + Component.translatable("gtceu.universal.tooltip.item_transfer_rate_stacks", itemsPerSecond / 64) : + Component.translatable("gtceu.universal.tooltip.item_transfer_rate", itemsPerSecond); + } + + private static Component fluidRateTooltip(int tier) { + var mbPerTick = PumpCover.PUMP_SCALING.applyAsInt(tier); + return Component.translatable("gtceu.universal.tooltip.fluid_transfer_rate", + FormattingUtil.formatNumbers(mbPerTick)); + } + public static ResourceLocation getTierName(Tier tier) { return TierSortingRegistry.getName(tier); }