From f89c241346456315e2ae445169dd5db95350d5ce Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sun, 15 Sep 2024 15:22:30 -0400 Subject: [PATCH 1/3] Update deps --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 9f744ec..2ee720c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev') api('com.github.GTNewHorizons:EnderStorage:1.6.0:dev') {transitive=false} - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.60:dev') - api('com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.18:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.105:dev') + api('com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.44:dev') - compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.10:dev') + compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.16:dev') } From a3757ad2be5a1e62c7f31b5b016c12f0962c0b6e Mon Sep 17 00:00:00 2001 From: Mary Hopson Date: Sun, 15 Sep 2024 15:39:26 -0400 Subject: [PATCH 2/3] Add superdense to nei diagram --- .../gregtech5/materialparts/DiagramFactory.java | 1 + .../gregtech5/materialparts/LayoutHandler.java | 11 +++++++++++ .../resources/assets/neicustomdiagram/lang/en_US.lang | 1 + 3 files changed, 13 insertions(+) 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 1ba3656..a544727 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 @@ -62,6 +62,7 @@ private enum MaterialPart { PLATES(LayoutHandler.SlotGroupKeys.PLATES, OrePrefixes.plate, OrePrefixes.foil, OrePrefixes.plateDense), MULTI_PLATES(LayoutHandler.SlotGroupKeys.MULTI_PLATES, OrePrefixes.plateDouble, OrePrefixes.plateTriple, OrePrefixes.plateQuadruple, OrePrefixes.plateQuintuple), + SUPERDENSE_PLATES(LayoutHandler.SlotKeys.SUPERDENSE_PLATES, OrePrefixes.plateSuperdense), RODS(LayoutHandler.SlotGroupKeys.RODS, OrePrefixes.stick, OrePrefixes.stickLong), BOLTS(LayoutHandler.SlotGroupKeys.BOLTS, OrePrefixes.bolt, OrePrefixes.screw), 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 ddf1eb5..0826b30 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 @@ -25,6 +25,7 @@ static final class SlotKeys { static final Layout.SlotKey NANITES = Layout.SlotKey.create("nanites"); static final Layout.SlotKey HOT_INGOT = Layout.SlotKey.create("hot-ingot"); static final Layout.SlotKey ALLOY_PLATE = Layout.SlotKey.create("alloy-plate"); + static final Layout.SlotKey SUPERDENSE_PLATES = Layout.SlotKey.create("superdense-plates"); static final Layout.SlotKey RING = Layout.SlotKey.create("ring"); static final Layout.SlotKey ROUND = Layout.SlotKey.create("round"); @@ -95,6 +96,7 @@ void initialize() { optionalLayoutsBuilder.add(buildAlloyPlateLayout()); optionalLayoutsBuilder.add(buildPlatesLayout()); optionalLayoutsBuilder.add(buildMultiPlatesLayout()); + optionalLayoutsBuilder.add(buildSuperdensePlateLayout()); optionalLayoutsBuilder.add(buildRodsLayout()); optionalLayoutsBuilder.add(buildBoltsLayout()); optionalLayoutsBuilder.add(buildRingLayout()); @@ -275,6 +277,15 @@ private Layout buildPlatesLayout() { .build(); } + private Layout buildSuperdensePlateLayout() { + return Layout.builder().putSlot( + SlotKeys.SUPERDENSE_PLATES, + Slot.builder(Grid.GRID.grid(10, 11)).setTooltip( + Tooltip.create(Lang.GREGTECH_5_MATERIAL_PARTS.trans("superdenseplateslot"), Tooltip.SLOT_FORMATTING)) + .build()) + .build(); + } + private Layout buildMultiPlatesLayout() { return Layout.builder() .addLines(Lines.builder(Grid.GRID.grid(8, 8)).addArrow(Grid.GRID.edge(10, 8, Grid.Direction.W)).build()) diff --git a/src/main/resources/assets/neicustomdiagram/lang/en_US.lang b/src/main/resources/assets/neicustomdiagram/lang/en_US.lang index 898e286..3dbd99c 100644 --- a/src/main/resources/assets/neicustomdiagram/lang/en_US.lang +++ b/src/main/resources/assets/neicustomdiagram/lang/en_US.lang @@ -138,6 +138,7 @@ 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 +neicustomdiagram.generators.gregtech5.materialparts.superdenseplateslot=Superdense plate neicustomdiagram.generators.gregtech5.materialparts.rodsslot=Rods neicustomdiagram.generators.gregtech5.materialparts.boltsslot=Bolts neicustomdiagram.generators.gregtech5.materialparts.ringslot=Ring From ff97bc054b2aaedbbdef12f0d35cda969c6311a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 15 Sep 2024 15:48:24 -0400 Subject: [PATCH 3/3] spotlessApply (#39) Co-authored-by: GitHub GTNH Actions <> --- .../gregtech5/materialparts/LayoutHandler.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 0826b30..518ee74 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 @@ -278,10 +278,14 @@ private Layout buildPlatesLayout() { } private Layout buildSuperdensePlateLayout() { - return Layout.builder().putSlot( + return Layout.builder() + .putSlot( SlotKeys.SUPERDENSE_PLATES, - Slot.builder(Grid.GRID.grid(10, 11)).setTooltip( - Tooltip.create(Lang.GREGTECH_5_MATERIAL_PARTS.trans("superdenseplateslot"), Tooltip.SLOT_FORMATTING)) + Slot.builder(Grid.GRID.grid(10, 11)) + .setTooltip( + Tooltip.create( + Lang.GREGTECH_5_MATERIAL_PARTS.trans("superdenseplateslot"), + Tooltip.SLOT_FORMATTING)) .build()) .build(); }