🌟 资源包注册API添加注册类型

Anvil-Dev · Aug 11, 2024 · 6d38c54 · 6d38c54
1 parent addaee1
commit 6d38c54
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/common/src/main/java/dev/anvilcraft/lib/registrar/ResourcePacksHelper.java b/common/src/main/java/dev/anvilcraft/lib/registrar/ResourcePacksHelper.java
@@ -6,7 +6,19 @@
 
 public class ResourcePacksHelper {
     @ExpectPlatform
-    public static void registerBuiltinResourcePack(@NotNull ResourceLocation pack) {
+    public static void registerBuiltinResourcePack(@NotNull ResourceLocation pack, PackType type) {
         throw new AssertionError();
     }
+
+    public enum PackType {
+        CLIENT, SERVER, BOTH;
+
+        public boolean isClient() {
+            return this == CLIENT || this == BOTH;
+        }
+
+        public boolean isServer() {
+            return this == SERVER || this == BOTH;
+        }
+    }
 }
diff --git a/fabric/src/main/java/dev/anvilcraft/lib/registrar/fabric/ResourcePacksHelperImpl.java b/fabric/src/main/java/dev/anvilcraft/lib/registrar/fabric/ResourcePacksHelperImpl.java
@@ -1,5 +1,6 @@
 package dev.anvilcraft.lib.registrar.fabric;
 
+import dev.anvilcraft.lib.registrar.ResourcePacksHelper;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
 import net.fabricmc.loader.api.FabricLoader;
@@ -9,7 +10,7 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ResourcePacksHelperImpl {
-    public static void registerBuiltinResourcePack(@NotNull ResourceLocation pack) {
+    public static void registerBuiltinResourcePack(@NotNull ResourceLocation pack, ResourcePacksHelper.PackType type) {
         String modid = pack.getNamespace();
         ModContainer modContainer = FabricLoader.getInstance()
             .getModContainer(modid)

diff --git a/forge/src/main/java/dev/anvilcraft/lib/registrar/forge/ResourcePacksHelperImpl.java b/forge/src/main/java/dev/anvilcraft/lib/registrar/forge/ResourcePacksHelperImpl.java
@@ -1,5 +1,6 @@
 package dev.anvilcraft.lib.registrar.forge;
 
+import dev.anvilcraft.lib.registrar.ResourcePacksHelper;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
@@ -16,17 +17,17 @@
 import java.nio.file.Path;
 
 public class ResourcePacksHelperImpl {
-    public static void registerBuiltinResourcePack(@NotNull ResourceLocation pack) {
+    public static void registerBuiltinResourcePack(@NotNull ResourceLocation pack, ResourcePacksHelper.PackType type) {
         String modid = pack.getNamespace();
         IModFileInfo modFileInfo = ModList.get().getModFileById(modid);
         if (modFileInfo == null) {
             throw new IllegalStateException("%s's ModContainer couldn't be found!".formatted(modid));
         }
         IModFile modFile = modFileInfo.getFile();
         MinecraftForge.EVENT_BUS.addListener((AddPackFindersEvent event) -> {
-            if (event.getPackType() == PackType.SERVER_DATA) {
+            if (event.getPackType() == PackType.SERVER_DATA && type.isServer()) {
                 registerPack(event, modFile, pack, PackType.SERVER_DATA);
-            } else {
+            } else if (type.isClient()) {
                 registerPack(event, modFile, pack, PackType.CLIENT_RESOURCES);
             }
         });

diff --git a/neoforge/src/main/java/dev/anvilcraft/lib/registrar/forge/ResourcePacksHelperImpl.java b/neoforge/src/main/java/dev/anvilcraft/lib/registrar/forge/ResourcePacksHelperImpl.java
@@ -1,5 +1,6 @@
 package dev.anvilcraft.lib.registrar.forge;
 
+import dev.anvilcraft.lib.registrar.ResourcePacksHelper;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.packs.PackType;
@@ -16,17 +17,17 @@
 import java.nio.file.Path;
 
 public class ResourcePacksHelperImpl {
-    public static void registerBuiltinResourcePack(@NotNull ResourceLocation pack) {
+    public static void registerBuiltinResourcePack(@NotNull ResourceLocation pack, ResourcePacksHelper.PackType type) {
         String modid = pack.getNamespace();
         IModFileInfo modFileInfo = ModList.get().getModFileById(modid);
         if (modFileInfo == null) {
             throw new IllegalStateException("%s's ModContainer couldn't be found!".formatted(modid));
         }
         IModFile modFile = modFileInfo.getFile();
         MinecraftForge.EVENT_BUS.addListener((AddPackFindersEvent event) -> {
-            if (event.getPackType() == PackType.SERVER_DATA) {
+            if (event.getPackType() == PackType.SERVER_DATA && type.isServer()) {
                 registerPack(event, modFile, pack, PackType.SERVER_DATA);
-            } else {
+            } else if (type.isClient()) {
                 registerPack(event, modFile, pack, PackType.CLIENT_RESOURCES);
             }
         });