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.

Sign up for GitHub

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

Jump to bottom

Add superdense plates to the nei diagram + update dependencies #38

Merged
merged 3 commits into from
Sep 15, 2024
Merged

Add superdense plates to the nei diagram + update dependencies #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f89c241
Update deps
FourIsTheNumber Sep 15, 2024
a3757ad
Add superdense to nei diagram
FourIsTheNumber Sep 15, 2024
ff97bc0
spotlessApply (#39)
github-actions[bot] Sep 15, 2024
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
6 changes: 3 additions & 3 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
1 change: 1 addition & 0 deletions .../github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/DiagramFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
15 changes: 15 additions & 0 deletions ...m/github/dcysteine/neicustomdiagram/generators/gregtech5/materialparts/LayoutHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -275,6 +277,19 @@ 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())
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/neicustomdiagram/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down