Skip to content

Commit 1158773

Browse files
committed
Bump Java for Workflows
Update NF
1 parent 546945d commit 1158773

File tree

5 files changed

+12
-15
lines changed

5 files changed

+12
-15
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
- name: checkout repository
1414
uses: actions/checkout@v2
1515

16-
- name: Set up JDK 17
16+
- name: Set up JDK 25
1717
uses: actions/setup-java@v3
1818
with:
1919
distribution: 'microsoft'
20-
java-version: '17'
20+
java-version: '25'
2121

2222
- name: Setup Gradle
2323
uses: gradle/gradle-build-action@v2

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@v2
1313

14-
- name: Set up JDK 17
14+
- name: Set up JDK 25
1515
uses: actions/setup-java@v3
1616
with:
1717
distribution: 'microsoft'
18-
java-version: '17'
18+
java-version: '25'
1919

2020
- name: Setup Gradle
2121
uses: gradle/gradle-build-action@v2

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ curseforge_project = 552758
1919
modrinth_project = fMpvLrnF
2020

2121
# Dependencies
22-
neoforge_version=26.1.0.0-alpha.2+snapshot-1
22+
neoforge_version=26.1.0.0-alpha.3+snapshot-1
2323

2424
# In-dev runtime mods
2525
rei_version=16.0.729

src/main/java/dev/technici4n/moderndynamics/network/item/ItemHost.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ private void tickExtractor(Direction side, ItemAttachedIo extractor) {
205205

206206
var maxParticipant = new MaxParticipant();
207207

208-
// TODO 26.1: This was previously stacking on move, but this helper is not.
209-
if (ResourceHandlerUtil.move(
208+
if (ResourceHandlerUtil.moveStacking(
210209
adjStorage,
211210
buildExtractorNetworkInjectStorage(side, extractor, maxParticipant),
212211
extractor::matchesItemFilter,
@@ -264,8 +263,7 @@ public void tickAttractor(Direction side, ItemAttachedIo attractor) {
264263
reversedPath.getStartingPoint(cache.level).getHost().addTravelingItem(travelingItem);
265264
});
266265
});
267-
// TODO 26.1: This was previously stacking on move, but this helper is not.
268-
toTransfer -= ResourceHandlerUtil.move(
266+
toTransfer -= ResourceHandlerUtil.moveStacking(
269267
extractTarget,
270268
insertStorage,
271269
v -> attractor.matchesItemFilter(v) && endpointFilter.test(v),

src/main/java/dev/technici4n/moderndynamics/test/MachineExtenderTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,18 @@ public void machineExtenderNotForwardingFromBelow(MdGameTestHelper helper) {
4040

4141
helper.startSequence()
4242
.thenExecute(() -> {
43-
var hopperPos = helper.absolutePos(origin);
44-
var hopperCap = helper.getLevel().getCapability(Capabilities.Item.BLOCK, hopperPos, Direction.UP);
43+
var hopperCap = helper.requireCapability(Capabilities.Item.BLOCK, origin, Direction.UP);
4544

46-
var extenderPos = hopperPos.above();
45+
var extenderPos = origin.above();
4746
for (var side : Direction.values()) {
48-
var cap = helper.getLevel().getCapability(Capabilities.Item.BLOCK, extenderPos, side);
47+
var cap = helper.getCapability(Capabilities.Item.BLOCK, extenderPos, side);
4948
if (side != Direction.DOWN) {
5049
if (cap != hopperCap) {
51-
throw helper.assertionException(origin.above(), Component.literal("Should expose Hopper on side " + side));
50+
throw helper.assertionException(extenderPos, Component.literal("Should expose Hopper on side " + side));
5251
}
5352
} else {
5453
if (cap != null) {
55-
throw helper.assertionException(origin.above(), Component.literal("Should NOT expose Hopper on side " + side));
54+
throw helper.assertionException(extenderPos, Component.literal("Should NOT expose Hopper on side " + side));
5655
}
5756
}
5857
}

0 commit comments

Comments
 (0)