Przeglądaj źródła

Adds CriteriaTriggersRegistry

shedaniel 4 lat temu
rodzic
commit
f09f23db35

+ 1 - 1
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

+ 20 - 0
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();
+    }
+}

+ 10 - 0
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);
+    }
+}

+ 2 - 1
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
+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;

+ 10 - 0
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);
+    }
+}