Merge branch 'api-14' into api-15

Yeregorix · Yeregorix · commit f24b4c095af1 · 2025-10-10T19:30:20.000+02:00
diff --git a/bootstrap/src/main/java/org/spongepowered/bootstrap/dev/DevClasspath.java b/bootstrap/src/main/java/org/spongepowered/bootstrap/dev/DevClasspath.java
@@ -49,11 +49,11 @@ public static List<Path[]> resolve() {
         final Set<String> gameShadedNames = Set.of(System.getProperty("sponge.dev.gameShaded").split(File.pathSeparator));
 
         // boot layer
-        final Multimap<String, Path> bootUnions = new Multimap<>();
+        final Multimap<String, WeightedPath> bootUnions = new Multimap<>();
         final List<Path> bootLibs = new ArrayList<>();
 
         // game or plugin layer
-        final Multimap<String, Path> unions = new Multimap<>();
+        final Multimap<String, WeightedPath> unions = new Multimap<>();
         final List<Path> libs = new ArrayList<>();
 
         final AtomicBoolean hasAPISourceSet = new AtomicBoolean(false);
@@ -80,7 +80,7 @@ public static List<Path[]> resolve() {
                             // ignore
                             break;
                         case "modlauncher-transformers", "library-manager":
-                            bootUnions.add(projectName, path);
+                            bootUnions.add(projectName, new WeightedPath(0, path));
                             break;
                         case "SpongeAPI":
                             switch (sourceSet.name()) {
@@ -91,34 +91,35 @@ public static List<Path[]> resolve() {
                                     hasAPISourceSet.set(true);
                                     // no break
                                 default:
-                                    unions.add("sponge", path);
+                                    unions.add("sponge", new WeightedPath(0, path));
                                     break;
                             }
                             break;
                         case "", "vanilla", "forge", "neoforge":
+                            final WeightedPath weightedPath = new WeightedPath(projectName.isEmpty() ? 1 : 2, path);
                             switch (sourceSet.name()) {
                                 case "applaunchConfig":
                                 case "applaunch":
-                                    bootUnions.add("applaunch", path);
+                                    bootUnions.add("applaunch", weightedPath);
                                     break;
                                 case "lang":
-                                    unions.add("lang", path);
+                                    unions.add("lang", weightedPath);
                                     break;
                                 default:
-                                    unions.add("sponge", path);
+                                    unions.add("sponge", weightedPath);
                                     break;
                             }
                             break;
                         default:
-                            unions.add(projectName, path);
+                            unions.add(projectName, new WeightedPath(0, path));
                             break;
                     }
                 } else {
                     if (Bootstrap.DEBUG) {
                         System.out.println("External SourceSet (" + sourceSet + "): " + path);
                     }
 
-                    unions.add(sourceSet.project().toString(), path);
+                    unions.add(sourceSet.project().toString(), new WeightedPath(0, path));
                 }
                 continue;
             }
@@ -144,7 +145,7 @@ public static List<Path[]> resolve() {
                 if (Bootstrap.DEBUG) {
                     System.out.println("Sponge: " + path);
                 }
-                unions.add("sponge", path);
+                unions.add("sponge", new WeightedPath(0, path));
                 continue;
             }
 
@@ -160,12 +161,13 @@ public static List<Path[]> resolve() {
             classpath.add(new Path[] { lib });
         }
 
-        for (final List<Path> sourceSets : bootUnions.values()) {
-            classpath.add(sourceSets.toArray(Path[]::new));
+        for (final List<WeightedPath> sourceSets : bootUnions.values()) {
+            classpath.add(sourceSets.stream().sorted().map(WeightedPath::path).toArray(Path[]::new));
         }
 
         if (hasAPISourceSet.get()) {
-            unions.get("sponge").removeIf((path) -> {
+            unions.get("sponge").removeIf((w) -> {
+                final Path path = w.path();
                 if (Files.isRegularFile(path)) {
                     final String fileName = path.getFileName().toString();
                     if (fileName.startsWith("spongeapi") && fileName.endsWith(".jar")) {
@@ -183,10 +185,8 @@ public static List<Path[]> resolve() {
         for (final Path resource : libs) {
             resourcesEnvBuilder.append(resource).append(File.pathSeparator);
         }
-        for (final List<Path> project : unions.values()) {
-            for (final Path resource : project) {
-                resourcesEnvBuilder.append(resource).append('&');
-            }
+        for (final List<WeightedPath> project : unions.values()) {
+            project.stream().sorted().forEachOrdered(w -> resourcesEnvBuilder.append(w.path()).append('&'));
             resourcesEnvBuilder.setCharAt(resourcesEnvBuilder.length() - 1, File.pathSeparatorChar);
         }
         resourcesEnvBuilder.setLength(resourcesEnvBuilder.length() - 1);
diff --git a/bootstrap/src/main/java/org/spongepowered/bootstrap/dev/WeightedPath.java b/bootstrap/src/main/java/org/spongepowered/bootstrap/dev/WeightedPath.java
@@ -0,0 +1,38 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.bootstrap.dev;
+
+import java.nio.file.Path;
+
+public record WeightedPath(int weight, Path path) implements Comparable<WeightedPath> {
+    @Override
+    public int compareTo(WeightedPath o) {
+        final int result = Integer.compare(this.weight, o.weight);
+        if (result != 0) {
+            return result;
+        }
+        return this.path.compareTo(o.path);
+    }
+}
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -436,6 +436,7 @@ tasks {
         jvmArgs("-Dsponge.test.args=" + runServer.args.joinToString(" "))
         jvmArgs("-Dsponge.jacoco.packages=org.spongepowered")
         jvmArgs("-Djunit.platform.launcher.interceptors.enabled=true")
+        jvmArgs("-Djunit.jupiter.extensions.autodetection.enabled=true")
         workingDir = layout.buildDirectory.dir("test-run").get().asFile
 
         doFirst {
diff --git a/forge/src/main/resources/META-INF/MANIFEST.MF b/forge/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1 @@
+Superclass-Transformer: common.superclasschange,forge.superclasschange
diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,6 @@ projectDescription=The SpongeAPI implementation targeting vanilla Minecraft and
 mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.concurrent.json,mixins.sponge.core.json,\
   mixins.sponge.entityactivation.json,mixins.sponge.exploit.json,mixins.sponge.inventory.json,mixins.sponge.movementcheck.json,\
   mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json,mixins.sponge.test.json
-superClassChanges=common.superclasschange
 
 minecraftVersion=1.21.5
 recommendedVersion=0-SNAPSHOT
diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -411,6 +411,7 @@ tasks {
         jvmArgs("-Dsponge.test.args=" + runServer.get().args!!.joinToString(" "))
         jvmArgs("-Dsponge.jacoco.packages=org.spongepowered")
         jvmArgs("-Djunit.platform.launcher.interceptors.enabled=true")
+        jvmArgs("-Djunit.jupiter.extensions.autodetection.enabled=true")
         workingDir = layout.buildDirectory.dir("test-run").get().asFile
 
         doFirst {
diff --git a/neoforge/src/main/resources/META-INF/MANIFEST.MF b/neoforge/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1 @@
+Superclass-Transformer: common.superclasschange,neoforge.superclasschange
diff --git a/src/main/java/org/spongepowered/common/bridge/server/MinecraftServerBridge.java b/src/main/java/org/spongepowered/common/bridge/server/MinecraftServerBridge.java
@@ -53,4 +53,8 @@ public interface MinecraftServerBridge {
     default void bridge$tickServer(int ticks) {
         throw new UnsupportedOperationException("Cannot trigger manual server tick outside test environment");
     }
+
+    default boolean bridge$insideTestEnvironment() {
+        return false;
+    }
 }
diff --git a/src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java b/src/main/java/org/spongepowered/common/event/tracking/PhaseTracker.java
@@ -111,15 +111,17 @@ public static PhaseTracker getInstance() {
             return PhaseTracker.CLIENT;
         }
 
-        return PhaseTracker.SPINOFF_TRACKERS.computeIfAbsent(current, (thread) -> {
-            try {
-                final PhaseTracker phaseTracker = new PhaseTracker();
-                phaseTracker.setThread(thread);
-                return phaseTracker;
-            } catch (final IllegalAccessException e) {
-                throw new RuntimeException("Unable to create a new PhaseTracker for Thread: " + thread, e);
-            }
-        });
+        return PhaseTracker.SPINOFF_TRACKERS.computeIfAbsent(current, PhaseTracker::createNew);
+    }
+
+    public static PhaseTracker createNew(final Thread thread) {
+        try {
+            final PhaseTracker phaseTracker = new PhaseTracker();
+            phaseTracker.setThread(thread);
+            return phaseTracker;
+        } catch (final IllegalAccessException e) {
+            throw new RuntimeException("Unable to create a new PhaseTracker for Thread: " + thread, e);
+        }
     }
 
     /**
diff --git a/src/main/resources/common.superclasschange b/src/main/resources/common.superclasschange
@@ -1,4 +1 @@
-org.spongepowered.api.event.cause.entity.damage.source.common.AbstractDamageSource:org.spongepowered.common.event.cause.entity.damage.SpongeCommonDamageSource
-org.spongepowered.api.event.cause.entity.damage.source.common.AbstractEntityDamageSource:org.spongepowered.common.event.cause.entity.damage.SpongeCommonEntityDamageSource
-org.spongepowered.api.event.cause.entity.damage.source.common.AbstractIndirectEntityDamageSource:org.spongepowered.common.event.cause.entity.damage.SpongeCommonIndirectEntityDamageSource
 org.spongepowered.api.entity.ai.goal.AbstractGoal:net.minecraft.world.entity.ai.goal.Goal
diff --git a/src/mixins/java/org/spongepowered/common/mixin/test/server/MinecraftServerMixin_Test.java b/src/mixins/java/org/spongepowered/common/mixin/test/server/MinecraftServerMixin_Test.java
@@ -119,4 +119,9 @@ private boolean haveTime() {
             this.waitUntilNextTick();
         }
     }
+
+    @Override
+    public boolean bridge$insideTestEnvironment() {
+        return true;
+    }
 }
diff --git a/src/mixins/java/org/spongepowered/common/mixin/tracker/server/MinecraftServerMixin_Tracker.java b/src/mixins/java/org/spongepowered/common/mixin/tracker/server/MinecraftServerMixin_Tracker.java
@@ -37,6 +37,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.common.bridge.server.MinecraftServerBridge;
 import org.spongepowered.common.bridge.server.TickTaskBridge;
 import org.spongepowered.common.event.tracking.CauseTrackerCrashHandler;
 import org.spongepowered.common.event.tracking.PhaseContext;
@@ -70,7 +71,9 @@ public abstract class MinecraftServerMixin_Tracker extends BlockableEventLoopMix
             context.buildAndSwitch();
             original.call(hasTimeLeft);
         }
-        PhaseTracker.getServerInstanceExplicitly().ensureEmpty();
+        if (!((MinecraftServerBridge) this).bridge$insideTestEnvironment()) {
+            PhaseTracker.getServerInstanceExplicitly().ensureEmpty();
+        }
     }
 
     @WrapOperation(
diff --git a/src/test/java/org/spongepowered/common/event/tracking/PhaseTrackerTest.java b/src/test/java/org/spongepowered/common/event/tracking/PhaseTrackerTest.java
@@ -35,7 +35,7 @@ public class PhaseTrackerTest {
 
     @Test
     public void testPoppingFramePopsCauses() {
-        final PhaseTracker phaseTracker = PhaseTracker.getInstance();
+        final PhaseTracker phaseTracker = PhaseTracker.createNew(Thread.currentThread());
 
         // We start by pushing a frame...
         CauseStackManager.StackFrame frame1 = phaseTracker.pushCauseFrame();
@@ -60,7 +60,7 @@ public void testPoppingFramePopsCauses() {
 
     @Test
     public void testPoppingFrameRemovesFrameContexts() {
-        final PhaseTracker phaseTracker = PhaseTracker.getInstance();
+        final PhaseTracker phaseTracker = PhaseTracker.createNew(Thread.currentThread());
 
         String cmd1 = "one";
         String cmd2 = "two";
diff --git a/src/test/java/org/spongepowered/common/test/TestInvocationInterceptor.java b/src/test/java/org/spongepowered/common/test/TestInvocationInterceptor.java
@@ -0,0 +1,100 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.test;
+
+import net.minecraft.server.MinecraftServer;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.junit.jupiter.api.extension.DynamicTestInvocationContext;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.InvocationInterceptor;
+import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.common.event.tracking.PhaseContext;
+import org.spongepowered.common.event.tracking.PhaseTracker;
+import org.spongepowered.common.event.tracking.phase.tick.TickPhase;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+public final class TestInvocationInterceptor implements InvocationInterceptor {
+
+    @Override
+    public <T> T interceptTestClassConstructor(final Invocation<T> invocation, final ReflectiveInvocationContext<Constructor<T>> invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        return this.intercept(invocation);
+    }
+
+    @Override
+    public void interceptBeforeAllMethod(final Invocation<Void> invocation, final ReflectiveInvocationContext<Method> invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        this.intercept(invocation);
+    }
+
+    @Override
+    public void interceptBeforeEachMethod(final Invocation<Void> invocation, final ReflectiveInvocationContext<Method> invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        this.intercept(invocation);
+    }
+
+    @Override
+    public void interceptTestMethod(final Invocation<Void> invocation, final ReflectiveInvocationContext<Method> invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        this.intercept(invocation);
+    }
+
+    @Override
+    public <T> T interceptTestFactoryMethod(final Invocation<T> invocation, final ReflectiveInvocationContext<Method> invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        return this.intercept(invocation);
+    }
+
+    @Override
+    public void interceptTestTemplateMethod(final Invocation<Void> invocation, final ReflectiveInvocationContext<Method> invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        this.intercept(invocation);
+    }
+
+    @Override
+    public void interceptDynamicTest(final Invocation<Void> invocation, final DynamicTestInvocationContext invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        this.intercept(invocation);
+    }
+
+    @Override
+    public void interceptAfterAllMethod(final Invocation<Void> invocation, final ReflectiveInvocationContext<Method> invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        this.intercept(invocation);
+    }
+
+    @Override
+    public void interceptAfterEachMethod(final Invocation<Void> invocation, final ReflectiveInvocationContext<Method> invocationContext, final ExtensionContext extensionContext) throws Throwable {
+        this.intercept(invocation);
+    }
+
+    private <T> T intercept(final Invocation<T> invocation) throws Throwable {
+        try (
+            final PhaseContext<@NonNull ?> context = TickPhase.Tick.SERVER_TICK
+                .createPhaseContext(PhaseTracker.getServerInstanceExplicitly())
+                .server((MinecraftServer) Sponge.server())
+        ) {
+            context.buildAndSwitch();
+            return invocation.proceed();
+        } finally {
+            PhaseTracker.getServerInstanceExplicitly().ensureEmpty();
+        }
+    }
+}
diff --git a/src/test/java/org/spongepowered/common/transformation/MixinTest.java b/src/test/java/org/spongepowered/common/transformation/MixinTest.java
@@ -22,7 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.spongepowered.common.mixin;
+package org.spongepowered.common.transformation;
 
 import org.junit.jupiter.api.Test;
 import org.spongepowered.asm.mixin.MixinEnvironment;
diff --git a/src/test/java/org/spongepowered/common/transformation/SuperclassChangeTest.java b/src/test/java/org/spongepowered/common/transformation/SuperclassChangeTest.java
diff --git a/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/vanilla/build.gradle.kts b/vanilla/build.gradle.kts
diff --git a/vanilla/src/main/resources/META-INF/MANIFEST.MF b/vanilla/src/main/resources/META-INF/MANIFEST.MF

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Superclass-Transformer: common.superclasschange,forge.superclasschange`
Original file line number	Diff line number	Diff line change
`@@ -53,4 +53,8 @@ public interface MinecraftServerBridge {`
`53`	`53`	`default void bridge$tickServer(int ticks) {`
`54`	`54`	`throw new UnsupportedOperationException("Cannot trigger manual server tick outside test environment");`
`55`	`55`	`}`
	`56`	`+`
	`57`	`+ default boolean bridge$insideTestEnvironment() {`
	`58`	`+ return false;`
	`59`	`+ }`
`56`	`60`	`}`