From f09f23db35d13dcf0a018638775336b8f2f65d95 Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Thu, 7 Jan 2021 01:14:37 +0800
Subject: [PATCH] Adds CriteriaTriggersRegistry

---
 .../architectury/registry/CreativeTabs.java   |  2 +-
 .../registry/CriteriaTriggersRegistry.java    | 20 +++++++++++++++++++
 .../fabric/CriteriaTriggersRegistryImpl.java  | 10 ++++++++++
 .../main/resources/architectury.accessWidener |  3 ++-
 .../forge/CriteriaTriggersRegistryImpl.java   | 10 ++++++++++
 5 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java
 create mode 100644 fabric/src/main/java/me/shedaniel/architectury/registry/fabric/CriteriaTriggersRegistryImpl.java
 create mode 100644 forge/src/main/java/me/shedaniel/architectury/registry/forge/CriteriaTriggersRegistryImpl.java

diff --git a/common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java b/common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java
index 002e6303..59b005e8 100644
--- a/common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java
+++ b/common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java
@@ -27,7 +27,7 @@ import net.minecraft.world.item.ItemStack;
 import java.util.function.Supplier;
 
 public final class CreativeTabs {
-    public CreativeTabs() {}
+    private CreativeTabs() {}
     
     // I am sorry, fabric wants a resource location instead of the translation key for whatever reason
     @ExpectPlatform
diff --git a/common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java b/common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java
new file mode 100644
index 00000000..50e953f3
--- /dev/null
+++ b/common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java
@@ -0,0 +1,20 @@
+package me.shedaniel.architectury.registry;
+
+import me.shedaniel.architectury.ExpectPlatform;
+import net.minecraft.advancements.CriterionTrigger;
+
+public final class CriteriaTriggersRegistry {
+    private CriteriaTriggersRegistry() {}
+    
+    /**
+     * Invokes {@link net.minecraft.advancements.CriteriaTriggers#register(CriterionTrigger)}.
+     *
+     * @param trigger The trigger to register
+     * @param <T>     The type of trigger
+     * @return The trigger registered
+     */
+    @ExpectPlatform
+    public static <T extends CriterionTrigger<?>> T register(T trigger) {
+        throw new AssertionError();
+    }
+}
diff --git a/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/CriteriaTriggersRegistryImpl.java b/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/CriteriaTriggersRegistryImpl.java
new file mode 100644
index 00000000..70539e35
--- /dev/null
+++ b/fabric/src/main/java/me/shedaniel/architectury/registry/fabric/CriteriaTriggersRegistryImpl.java
@@ -0,0 +1,10 @@
+package me.shedaniel.architectury.registry.fabric;
+
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.advancements.CriterionTrigger;
+
+public class CriteriaTriggersRegistryImpl {
+    public static <T extends CriterionTrigger<?>> T register(T trigger) {
+        return CriteriaTriggers.register(trigger);
+    }
+}
diff --git a/fabric/src/main/resources/architectury.accessWidener b/fabric/src/main/resources/architectury.accessWidener
index 27a3797b..c0361a72 100644
--- a/fabric/src/main/resources/architectury.accessWidener
+++ b/fabric/src/main/resources/architectury.accessWidener
@@ -51,4 +51,5 @@ accessible method net/minecraft/world/entity/Entity getEncodeId ()Ljava/lang/Str
 accessible field net/minecraft/server/packs/repository/PackRepository sources Ljava/util/Set;
 mutable field net/minecraft/server/packs/repository/PackRepository sources Ljava/util/Set;
 accessible field net/minecraft/world/item/DyeColor textureDiffuseColor I
-accessible method net/minecraft/world/entity/player/Player closeContainer ()V
\ No newline at end of file
+accessible method net/minecraft/world/entity/player/Player closeContainer ()V
+accessible method net/minecraft/advancements/CriteriaTriggers register (Lnet/minecraft/advancements/CriterionTrigger;)Lnet/minecraft/advancements/CriterionTrigger;
\ No newline at end of file
diff --git a/forge/src/main/java/me/shedaniel/architectury/registry/forge/CriteriaTriggersRegistryImpl.java b/forge/src/main/java/me/shedaniel/architectury/registry/forge/CriteriaTriggersRegistryImpl.java
new file mode 100644
index 00000000..ef812f30
--- /dev/null
+++ b/forge/src/main/java/me/shedaniel/architectury/registry/forge/CriteriaTriggersRegistryImpl.java
@@ -0,0 +1,10 @@
+package me.shedaniel.architectury.registry.forge;
+
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.advancements.CriterionTrigger;
+
+public class CriteriaTriggersRegistryImpl {
+    public static <T extends CriterionTrigger<?>> T register(T trigger) {
+        return CriteriaTriggers.register(trigger);
+    }
+}