Fix GuideExport, fix flaky gametest.

AppliedEnergistics · Dec 24, 2023 · 9296ad2 · 9296ad2
1 parent e501ce2
commit 9296ad2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,16 +44,10 @@ configurations {
         transitive = false
     }
     buildtoolsImplementation.extendsFrom(compileClasspath)
-
-    internal {
-        visible = false
-        canBeConsumed = false
-        canBeResolved = false
-    }
-    configurations.compileClasspath.extendsFrom(internal)
-    configurations.runtimeClasspath.extendsFrom(internal)
-    configurations.testCompileClasspath.extendsFrom(internal)
-    configurations.testRuntimeClasspath.extendsFrom(internal)
+    // Dependencies only used for the guide export, but not shipped
+    guideExportOnly
+    configurations.compileClasspath.extendsFrom(guideExportOnly)
+    configurations.runtimeClasspath.extendsFrom(guideExportOnly)
 }
 
 repositories {
@@ -127,7 +121,7 @@ dependencies {
         transitive = false
     }
     // Used for the guide export
-    implementation("org.bytedeco:ffmpeg-platform:${ffmpeg_version}")
+    guideExportOnly("org.bytedeco:ffmpeg-platform:${ffmpeg_version}")
 
     implementation "net.neoforged:neoforge:${neoforge_version}"
 
@@ -355,11 +349,8 @@ runs {
         modSources = [sourceSets.main]
 
         dependencies {
-            runtime project(":libs:markdown")
-            runtime "io.methvin:directory-watcher:${directory_watcher_version}"
-            runtime "org.yaml:snakeyaml:${snakeyaml_version}"
-            runtime "com.google.flatbuffers:flatbuffers-java:${flatbuffers_version}"
-            runtime "org.bytedeco:ffmpeg-platform:${ffmpeg_version}"
+            runtime configurations.shaded
+            runtime configurations.guideExportOnly
         }
     }
     client {

diff --git a/settings.gradle b/settings.gradle
@@ -16,5 +16,7 @@ pluginManagement {
     }
 }
 
+rootProject.name = 'ae2';
+
 include 'libs:markdown'
 include 'libs:junit'
diff --git a/src/main/java/appeng/server/testplots/ItemP2PTestPlots.java b/src/main/java/appeng/server/testplots/ItemP2PTestPlots.java
@@ -30,11 +30,10 @@ public static void item(PlotBuilder plot) {
         var chestPos = origin.east().east();
         plot.chest(chestPos);
 
-        plot.test(helper -> {
-            helper.succeedWhen(() -> {
-                helper.assertContainerContains(chestPos, Items.BEDROCK);
-            });
-        });
+        plot.test(helper -> helper
+                .startSequence()
+                .thenWaitUntil(() -> helper.assertContainerContains(chestPos, Items.BEDROCK))
+                .thenSucceed());
     }
 
     @TestPlot("p2p_recursive_item")
@@ -44,7 +43,7 @@ public static void recursiveItemP2P(PlotBuilder plot) {
         plot.block(origin, AEBlocks.DEBUG_ITEM_GEN);
         plot.creativeEnergyCell(origin.south().above().above());
         var curPos = origin.south();
-        for (var i = 0; i < 10; i++) {
+        for (var i = 0; i < 5; i++) {
             placeSubnet(plot, curPos);
             curPos = curPos.south(6);
         }