Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove multi-ingots from NEI material page #47

Merged
merged 1 commit into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ private enum MaterialPart {

HOT_INGOT(LayoutHandler.SlotKeys.HOT_INGOT, OrePrefixes.ingotHot),
INGOTS(LayoutHandler.SlotGroupKeys.INGOTS, OrePrefixes.ingot, OrePrefixes.nugget, OrePrefixes.block),
MULTI_INGOTS(LayoutHandler.SlotGroupKeys.MULTI_INGOTS, OrePrefixes.ingotDouble, OrePrefixes.ingotTriple,
OrePrefixes.ingotQuadruple, OrePrefixes.ingotQuintuple),

ALLOY_PLATE(LayoutHandler.SlotKeys.ALLOY_PLATE, OrePrefixes.plateAlloy),
PLATES(LayoutHandler.SlotGroupKeys.PLATES, OrePrefixes.plate, OrePrefixes.foil, OrePrefixes.plateDense),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ static final class SlotGroupKeys {
static final Layout.SlotGroupKey DUSTS = Layout.SlotGroupKey.create("dusts");

static final Layout.SlotGroupKey INGOTS = Layout.SlotGroupKey.create("ingots");
static final Layout.SlotGroupKey MULTI_INGOTS = Layout.SlotGroupKey.create("multi-ingots");

static final Layout.SlotGroupKey PLATES = Layout.SlotGroupKey.create("plates");
static final Layout.SlotGroupKey MULTI_PLATES = Layout.SlotGroupKey.create("multi-plates");
Expand Down Expand Up @@ -92,7 +91,6 @@ void initialize() {
optionalLayoutsBuilder.add(buildDustsLayout());
optionalLayoutsBuilder.add(buildHotIngotLayout());
optionalLayoutsBuilder.add(buildIngotsLayout());
optionalLayoutsBuilder.add(buildMultiIngotsLayout());
optionalLayoutsBuilder.add(buildAlloyPlateLayout());
optionalLayoutsBuilder.add(buildPlatesLayout());
optionalLayoutsBuilder.add(buildMultiPlatesLayout());
Expand Down Expand Up @@ -245,20 +243,6 @@ private Layout buildIngotsLayout() {
.build();
}

private Layout buildMultiIngotsLayout() {
return Layout.builder()
.addLines(Lines.builder(Grid.GRID.grid(2, 8)).addArrow(Grid.GRID.edge(4, 8, Grid.Direction.W)).build())
.putSlotGroup(
SlotGroupKeys.MULTI_INGOTS,
SlotGroup.builder(2, 2, Grid.GRID.grid(4, 8), Grid.Direction.SE)
.setDefaultTooltip(
Tooltip.create(
Lang.GREGTECH_5_MATERIAL_PARTS.trans("multiingotsslot"),
Tooltip.SLOT_FORMATTING))
.build())
.build();
}

private Layout buildAlloyPlateLayout() {
return Layout.builder().putSlot(
SlotKeys.ALLOY_PLATE,
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/neicustomdiagram/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ neicustomdiagram.generators.gregtech5.materialparts.dustsslot=Dusts
neicustomdiagram.generators.gregtech5.materialparts.nanitesslot=Nanites
neicustomdiagram.generators.gregtech5.materialparts.ingotsslot=Ingots
neicustomdiagram.generators.gregtech5.materialparts.hotingotslot=Hot ingot
neicustomdiagram.generators.gregtech5.materialparts.multiingotsslot=Multi-ingots
neicustomdiagram.generators.gregtech5.materialparts.platesslot=Plates
neicustomdiagram.generators.gregtech5.materialparts.multiplatesslot=Multi-plates
neicustomdiagram.generators.gregtech5.materialparts.alloyplateslot=Alloy plate
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/neicustomdiagram/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ neicustomdiagram.generators.gregtech5.materialparts.dustsslot=粉
neicustomdiagram.generators.gregtech5.materialparts.nanitesslot=Nanites
neicustomdiagram.generators.gregtech5.materialparts.ingotsslot=锭
neicustomdiagram.generators.gregtech5.materialparts.hotingotslot=热锭
neicustomdiagram.generators.gregtech5.materialparts.multiingotsslot=多重锭
neicustomdiagram.generators.gregtech5.materialparts.platesslot=板
neicustomdiagram.generators.gregtech5.materialparts.multiplatesslot=多重板
neicustomdiagram.generators.gregtech5.materialparts.alloyplateslot=合金板
Expand Down