1.21.11

Author: TexBlock

build.gradle.kts

@@ -8,7 +8,7 @@ import org.eclipse.jgit.api.Git
 plugins {
     java
     `maven-publish`
-    id("band.kessoku.koom") // Version declared in buildSrc
+    id("dev.architectury.loom") // Version declared in buildSrc
     id("me.modmuss50.mod-publish-plugin") version "0.5.+"
 }
 
@@ -71,7 +71,7 @@ allprojects {
     }
 
     apply(plugin = "java-library")
-    apply(plugin = "band.kessoku.koom")
+    apply(plugin = "dev.architectury.loom")
 
     loom.silentMojangMappingsLicense()
 
@@ -104,11 +104,7 @@ allprojects {
     dependencies {
         minecraft(group = "com.mojang", name = "minecraft", version = versionMc)
         neoForge(group = "net.neoforged", name = "neoforge", version = versionForge)
-        mappings(loom.layered {
-            officialMojangMappings {
-                nameSyntheticMembers = true
-            }
-        })
+        mappings(loom.officialMojangMappings())
     }
 
     // Run this task after updating minecraft to regenerate any required resources

buildSrc/build.gradle.kts

@@ -32,7 +32,7 @@ repositories {
 }
 
 dependencies {
-    implementation("band.kessoku:koom:1.13-SNAPSHOT")
+    implementation("dev.architectury:architectury-loom:1.13-SNAPSHOT")
 
     implementation("net.fabricmc:fabric-loader:0.16.9")
 

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

@@ -16,9 +16,10 @@
 
 package net.fabricmc.fabric.api.event;
 
-import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
 
+import net.minecraft.resources.Identifier;
+
 /**
  * Base class for Fabric's event implementations.
  *
@@ -59,7 +60,7 @@ public final T invoker() {
 	 * The identifier of the default phase.
 	 * Have a look at {@link EventFactory#createWithPhases} for an explanation of event phases.
 	 */
-	public static final ResourceLocation DEFAULT_PHASE = ResourceLocation.fromNamespaceAndPath("fabric", "default");
+	public static final Identifier DEFAULT_PHASE = Identifier.fromNamespaceAndPath("fabric", "default");
 
 	/**
 	 * Register a listener to the event for the specified phase.
@@ -68,7 +69,7 @@ public final T invoker() {
 	 * @param phase Identifier of the phase this listener should be registered for. It will be created if it didn't exist yet.
 	 * @param listener The desired listener.
 	 */
-	public void register(ResourceLocation phase, T listener) {
+	public void register(Identifier phase, T listener) {
 		// This is done to keep compatibility with existing Event subclasses, but they should really not be subclassing Event.
 		register(listener);
 	}
@@ -84,7 +85,7 @@ public void register(ResourceLocation phase, T listener) {
 	 * @param firstPhase The identifier of the phase that should run before the other. It will be created if it didn't exist yet.
 	 * @param secondPhase The identifier of the phase that should run after the other. It will be created if it didn't exist yet.
 	 */
-	public void addPhaseOrdering(ResourceLocation firstPhase, ResourceLocation secondPhase) {
+	public void addPhaseOrdering(Identifier firstPhase, Identifier secondPhase) {
 		// This is not abstract to avoid breaking existing Event subclasses, but they should really not be subclassing Event.
 	}
 }

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

@@ -17,8 +17,10 @@
 package net.fabricmc.fabric.api.event;
 
 import java.util.function.Function;
+
+import net.minecraft.resources.Identifier;
+
 import net.fabricmc.fabric.impl.base.event.EventFactoryImpl;
-import net.minecraft.resources.ResourceLocation;
 
 /**
  * Helper for creating {@link Event} classes.
@@ -94,7 +96,7 @@ public static <T> Event<T> createArrayBacked(Class<T> type, T emptyInvoker, Func
 	 * @param <T>            The listener type.
 	 * @return The Event instance.
 	 */
-	public static <T> Event<T> createWithPhases(Class<? super T> type, Function<T[], T> invokerFactory, ResourceLocation... defaultPhases) {
+	public static <T> Event<T> createWithPhases(Class<? super T> type, Function<T[], T> invokerFactory, Identifier... defaultPhases) {
 		EventFactoryImpl.ensureContainsDefault(defaultPhases);
 		EventFactoryImpl.ensureNoDuplicates(defaultPhases);
 

fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/NbtType.java

@@ -16,15 +16,13 @@
 
 package net.fabricmc.fabric.api.util;
 
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 
 /**
  * NBT type ID constants. Useful for filtering by value type in a few cases.
  *
  * <p>For the current list of types, check with {@link Tag}.
  *
- * @see CompoundTag#contains(String, int)
  * @see net.minecraft.nbt.TagTypes#getType(int)
  * @deprecated Use the constants in {@link Tag} instead.
  */
@@ -44,12 +42,5 @@ public final class NbtType {
 	public static final int INT_ARRAY = 11;
 	public static final int LONG_ARRAY = 12;
 
-	/**
-	 * Any numeric value: byte, short, int, long, float, double.
-	 *
-	 * @see CompoundTag#contains(String, int)
-	 */
-	public static final int NUMBER = 99;
-
 	private NbtType() { }
 }

fabric-api-base/src/main/java/net/fabricmc/fabric/api/util/TriState.java

@@ -21,24 +21,31 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
 
-import org.jetbrains.annotations.Nullable;
+import com.mojang.serialization.Codec;
+import org.jspecify.annotations.Nullable;
+
+import net.minecraft.util.StringRepresentable;
 
 /**
  * Represents a boolean value which can be true, false or refer to a default value.
  */
-public enum TriState {
+public enum TriState implements StringRepresentable {
 	/**
 	 * Represents the boolean value of {@code false}.
 	 */
-	FALSE,
+	FALSE("false"),
 	/**
 	 * Represents a value that refers to a "default" value, often as a fallback.
 	 */
-	DEFAULT,
+	DEFAULT("default"),
 	/**
 	 * Represents the boolean value of {@code true}.
 	 */
-	TRUE;
+	TRUE("true");
+
+	public static final Codec<TriState> CODEC = StringRepresentable.fromEnum(TriState::values);
+
+	private final String name;
 
 	/**
 	 * Gets the corresponding tri-state from a boolean value.
@@ -136,4 +143,33 @@ public <X extends Throwable> boolean orElseThrow(Supplier<X> exceptionSupplier)
 
 		throw exceptionSupplier.get();
 	}
+
+	/**
+	 * {@return a parsed TriState from a system property}
+	 *
+	 * @param property the system property
+	 */
+	public static TriState fromSystemProperty(String property) {
+		String value = System.getProperty(property);
+
+		if (value != null) {
+			return Boolean.parseBoolean(value) ? TRUE : FALSE;
+		}
+
+		return DEFAULT;
+	}
+
+	/**
+	 * Value of this enum as string.
+	 *
+	 * @return lowercase name of the value.
+	 */
+	@Override
+	public String getSerializedName() {
+		return this.name;
+	}
+
+	TriState(String name) {
+		this.name = name;
+	}
 }

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

@@ -24,9 +24,11 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
+
+import net.minecraft.resources.Identifier;
+
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.impl.base.toposort.NodeSorting;
-import net.minecraft.resources.ResourceLocation;
 
 class ArrayBackedEvent<T> extends Event<T> {
 	private final Function<T[], T> invokerFactory;
@@ -35,7 +37,7 @@ class ArrayBackedEvent<T> extends Event<T> {
 	/**
 	 * Registered event phases.
 	 */
-	private final Map<ResourceLocation, EventPhaseData<T>> phases = new LinkedHashMap<>();
+	private final Map<Identifier, EventPhaseData<T>> phases = new LinkedHashMap<>();
 	/**
 	 * Phases sorted in the correct dependency order.
 	 */
@@ -58,7 +60,7 @@ public void register(T listener) {
 	}
 
 	@Override
-	public void register(ResourceLocation phaseIdentifier, T listener) {
+	public void register(Identifier phaseIdentifier, T listener) {
 		Objects.requireNonNull(phaseIdentifier, "Tried to register a listener for a null phase!");
 		Objects.requireNonNull(listener, "Tried to register a null listener!");
 
@@ -68,7 +70,7 @@ public void register(ResourceLocation phaseIdentifier, T listener) {
 		}
 	}
 
-	private EventPhaseData<T> getOrCreatePhase(ResourceLocation id, boolean sortIfCreate) {
+	private EventPhaseData<T> getOrCreatePhase(Identifier id, boolean sortIfCreate) {
 		EventPhaseData<T> phase = phases.get(id);
 
 		if (phase == null) {
@@ -108,7 +110,7 @@ private void rebuildInvoker(int newLength) {
 	}
 
 	@Override
-	public void addPhaseOrdering(ResourceLocation firstPhase, ResourceLocation secondPhase) {
+	public void addPhaseOrdering(Identifier firstPhase, Identifier secondPhase) {
 		Objects.requireNonNull(firstPhase, "Tried to add an ordering for a null phase.");
 		Objects.requireNonNull(secondPhase, "Tried to add an ordering for a null phase.");
 		if (firstPhase.equals(secondPhase)) throw new IllegalArgumentException("Tried to add a phase that depends on itself.");

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

@@ -28,8 +28,10 @@
 import java.util.function.Function;
 
 import com.google.common.collect.MapMaker;
+
+import net.minecraft.resources.Identifier;
+
 import net.fabricmc.fabric.api.event.Event;
-import net.minecraft.resources.ResourceLocation;
 
 public final class EventFactoryImpl {
 	private static final Set<ArrayBackedEvent<?>> ARRAY_BACKED_EVENTS
@@ -47,8 +49,8 @@ public static <T> Event<T> createArrayBacked(Class<? super T> type, Function<T[]
 		return event;
 	}
 
-	public static void ensureContainsDefault(ResourceLocation[] defaultPhases) {
-		for (ResourceLocation id : defaultPhases) {
+	public static void ensureContainsDefault(Identifier[] defaultPhases) {
+		for (Identifier id : defaultPhases) {
 			if (id.equals(Event.DEFAULT_PHASE)) {
 				return;
 			}
@@ -57,7 +59,7 @@ public static void ensureContainsDefault(ResourceLocation[] defaultPhases) {
 		throw new IllegalArgumentException("The event phases must contain Event.DEFAULT_PHASE.");
 	}
 
-	public static void ensureNoDuplicates(ResourceLocation[] defaultPhases) {
+	public static void ensureNoDuplicates(Identifier[] defaultPhases) {
 		for (int i = 0; i < defaultPhases.length; ++i) {
 			for (int j = i+1; j < defaultPhases.length; ++j) {
 				if (defaultPhases[i].equals(defaultPhases[j])) {

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

@@ -18,18 +18,20 @@
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
+
+import net.minecraft.resources.Identifier;
+
 import net.fabricmc.fabric.impl.base.toposort.SortableNode;
-import net.minecraft.resources.ResourceLocation;
 
 /**
  * Data of an {@link ArrayBackedEvent} phase.
  */
 class EventPhaseData<T> extends SortableNode<EventPhaseData<T>> {
-	final ResourceLocation id;
+	final Identifier id;
 	T[] listeners;
 
 	@SuppressWarnings("unchecked")
-	EventPhaseData(ResourceLocation id, Class<?> listenerClass) {
+	EventPhaseData(Identifier id, Class<?> listenerClass) {
 		this.id = id;
 		this.listeners = (T[]) Array.newInstance(listenerClass, 0);
 	}

fabric-api-base/src/main/java/net/fabricmc/fabric/impl/base/toposort/SortableNode.java

@@ -20,21 +20,29 @@
 import java.util.List;
 
 public abstract class SortableNode<N extends SortableNode<N>> {
-	final List<N> subsequentNodes = new ArrayList<>();
-	final List<N> previousNodes = new ArrayList<>();
+	protected final List<N> subsequentNodes = new ArrayList<>();
+	protected final List<N> previousNodes = new ArrayList<>();
 	boolean visited = false;
 
 	/**
 	 * @return Description of this node, used to print the cycle warning.
 	 */
 	protected abstract String getDescription();
 
+	protected void addSubsequentNode(N node) {
+		this.subsequentNodes.add(node);
+	}
+
+	protected void addPreviousNode(N node) {
+		this.previousNodes.add(node);
+	}
+
 	public static <N extends SortableNode<N>> void link(N first, N second) {
 		if (first == second) {
 			throw new IllegalArgumentException("Cannot link a node to itself!");
 		}
 
-		first.subsequentNodes.add(second);
-		second.previousNodes.add(first);
+		first.addSubsequentNode(second);
+		second.addPreviousNode(first);
 	}
 }