diff --git a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/DiagramFactory.java b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/DiagramFactory.java index a544727..4dd0512 100644 --- a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/DiagramFactory.java +++ b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/DiagramFactory.java @@ -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), diff --git a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/LayoutHandler.java b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/LayoutHandler.java index 518ee74..32fd7b0 100644 --- a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/LayoutHandler.java +++ b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/LayoutHandler.java @@ -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"); @@ -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()); @@ -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, diff --git a/src/main/resources/assets/neicustomdiagram/lang/en_US.lang b/src/main/resources/assets/neicustomdiagram/lang/en_US.lang index 3dbd99c..76b82d4 100644 --- a/src/main/resources/assets/neicustomdiagram/lang/en_US.lang +++ b/src/main/resources/assets/neicustomdiagram/lang/en_US.lang @@ -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 diff --git a/src/main/resources/assets/neicustomdiagram/lang/zh_CN.lang b/src/main/resources/assets/neicustomdiagram/lang/zh_CN.lang index cfa7ab4..40128d2 100644 --- a/src/main/resources/assets/neicustomdiagram/lang/zh_CN.lang +++ b/src/main/resources/assets/neicustomdiagram/lang/zh_CN.lang @@ -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=合金板