Move changes to module fabric-dev-debug-api-v1

Author: Kilip1000

build.gradle

@@ -617,7 +617,8 @@ void setupRepositories(RepositoryHandler repositories) {
 // These modules are not included in the fat jar, maven will resolve them via the pom.
 def devOnlyModules = [
 	"fabric-client-gametest-api-v1",
-	"fabric-gametest-api-v1"
+	"fabric-gametest-api-v1",
+	"fabric-dev-debug-api-v1"
 ]
 
 dependencies {

fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/event/EventFactoryImpl.java

@@ -33,7 +33,6 @@
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.impl.test.TestableEventFactoryImpl;
 
 public class EventFactoryImpl {
 	public static final EventFactoryImpl INSTANCE = ServiceLoader.load(EventFactoryImpl.class).findFirst().orElseGet(EventFactoryImpl::new);
@@ -43,9 +42,7 @@ public class EventFactoryImpl {
 	protected EventFactoryImpl() {
 		Class<?> thisClass = getClass();
 
-		String validInheritor = TestableEventFactoryImpl.class.getName();
-
-		if (thisClass != EventFactoryImpl.class && !thisClass.getName().equals(validInheritor)) {
+		if (thisClass != EventFactoryImpl.class && !thisClass.getName().equals("net.fabricmc.fabric.impl.test.TestableEventFactoryImpl")) {
 			throw new IllegalStateException("You are not allowed to create a custom EventFactoryImpl!");
 		}
 	}

fabric-debug-api-v1/src/main/java/net/fabricmc/fabric/impl/test/EventScopeImpl.java

@@ -0,0 +1,8 @@
+version = getSubprojectVersion(project)
+
+moduleDependencies(project, [
+	'fabric-api-base'
+])
+
+testDependencies(project, [
+])

fabric-debug-api-v1/src/main/java/net/fabricmc/fabric/impl/test/TestableArrayBackedEvent.java

@@ -1,11 +1,27 @@
-package net.fabricmc.fabric.api.test;
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.api.devdebug.v1;
 
 import org.jetbrains.annotations.ApiStatus;
 
 import net.minecraft.resources.Identifier;
 
 import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.impl.test.EventTestingImpl;
+import net.fabricmc.fabric.impl.devdebug.v1.EventTestingImpl;
 
 /**
  * Represents a wrapper around a short-lived {@link Event}.

fabric-debug-api-v1/src/main/java/net/fabricmc/fabric/impl/test/TestableEventFactoryImpl.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.impl.devdebug.v1;
+
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.api.devdebug.v1.EventScope;
+
+public class EventScopeImpl<T> implements EventScope {
+	private final TestableArrayBackedEvent<T> event;
+	private final Identifier phase;
+	private final T listener;
+
+	public EventScopeImpl(TestableArrayBackedEvent<T> event, Identifier phase, T listener) {
+		this.event = event;
+		this.phase = phase;
+		this.listener = listener;
+	}
+
+	@Override
+	public void close() {
+		event.unregister(phase, listener);
+	}
+}

fabric-dev-debug-api-v1/build.gradle

@@ -1,9 +1,25 @@
-package net.fabricmc.fabric.impl.test;
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.impl.devdebug.v1;
 
 import net.minecraft.resources.Identifier;
 
+import net.fabricmc.fabric.api.devdebug.v1.EventScope;
 import net.fabricmc.fabric.api.event.Event;
-import net.fabricmc.fabric.api.test.EventScope;
 import net.fabricmc.loader.api.FabricLoader;
 
 public final class EventTestingImpl {

…fabricmc/fabric/api/test/EventScope.java …c/fabric/api/devdebug/v1/EventScope.javafabric-debug-api-v1/src/main/java/net/fabricmc/fabric/api/test/EventScope.java renamed to fabric-dev-debug-api-v1/src/main/java/net/fabricmc/fabric/api/devdebug/v1/EventScope.java fabric-debug-api-v1/src/main/java/net/fabricmc/fabric/api/test/EventScope.java renamed to fabric-dev-debug-api-v1/src/main/java/net/fabricmc/fabric/api/devdebug/v1/EventScope.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.impl.devdebug.v1;
+
+import java.util.Objects;
+import java.util.function.Function;
+
+import net.minecraft.resources.Identifier;
+
+import net.fabricmc.fabric.impl.base.event.ArrayBackedEvent;
+
+public class TestableArrayBackedEvent<T> extends ArrayBackedEvent<T> {
+	TestableArrayBackedEvent(Class<? super T> type, Function<T[], T> invokerFactory) {
+		super(type, invokerFactory);
+	}
+
+	public void unregister(Identifier phaseIdentifier, T listener) {
+		Objects.requireNonNull(phaseIdentifier, "Tried to unregister a listener for a null phase!");
+		Objects.requireNonNull(listener, "Tried to unregister a null listener!");
+
+		synchronized (lock) {
+			if (getOrCreatePhase(phaseIdentifier, false).removeListener(listener)) {
+				rebuildInvoker(handlers.length - 1);
+			}
+		}
+	}
+}