diff --git a/common/build.gradle b/common/build.gradle index aba601c..26f780a 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -30,8 +30,8 @@ dependencies { // GeckoLib modImplementation("software.bernie.geckolib:geckolib-fabric-${minecraft_version}:${geckolib_version}") - // PaperDoll Render - // modImplementation("org.ayamemc:paperdoll-render:common-${paperdollrender_version}") + // Ayame PaperDoll + //modImplementation("org.ayamemc:ayame-paperdoll:common-${ayame_paperdoll_version}") } repositories { diff --git a/common/src/main/java/org/ayamemc/ayame/client/DefaultAyameModels.java b/common/src/main/java/org/ayamemc/ayame/client/DefaultAyameModels.java index cb5fd66..4939bee 100644 --- a/common/src/main/java/org/ayamemc/ayame/client/DefaultAyameModels.java +++ b/common/src/main/java/org/ayamemc/ayame/client/DefaultAyameModels.java @@ -28,6 +28,7 @@ import org.ayamemc.ayame.model.DefaultAyameModelType; import org.ayamemc.ayame.util.FileUtil; import org.ayamemc.ayame.util.TaskManager; +import org.jetbrains.annotations.NotNull; import java.io.IOException; import java.nio.file.Files; @@ -64,7 +65,7 @@ public static void init() { } // TODO: JSON爆null问题在于此处,res.getDefault传入的content内的index.json为null - private static IModelResource createModelResource(String name) { + private static @NotNull IModelResource createModelResource(String name) { Path path = Path.of(MODEL_PATH + name + ".zip"); // 检查文件是否存在 if (!Files.exists(path)) { diff --git a/fabric/build.gradle b/fabric/build.gradle index 986bd27..34a8862 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -62,8 +62,8 @@ dependencies { modImplementation("maven.modrinth:too-many-shortcuts:0.0.5+mc.1.21.1") // Fabric Language Kotlin 它是too-many-shortcuts的前置,不是我们模组的前置,在这里只是为了让too-many-shortcuts正常加载 modImplementation("net.fabricmc:fabric-language-kotlin:1.12.1+kotlin.2.0.20") - // PaperDoll Render - //modImplementation("org.ayamemc:paperdoll-render:fabric-${paperdollrender_version}") + // Ayame PaperDoll + //modImplementation("org.ayamemc:ayame-paperdoll:fabric-${ayame_paperdoll_version}") common(project(path: ':common', configuration: 'namedElements')) { transitive false } shadowBundle project(path: ':common', configuration: 'transformProductionFabric') diff --git a/gradle.properties b/gradle.properties index 3e25530..e80cb47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,4 +39,4 @@ geckolib_version=4.5.8 # Fabric Mod Menu Version modmenu_version=11.0.2 # PaperDoll Render Version -paperdollrender_version=4.0.0 +ayame_paperdoll_version=4.0.0 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index c3b832a..648a5f5 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -65,8 +65,8 @@ dependencies { // 不要使用modImplementation,否则IO会爆炸 // GeckoLib implementation("software.bernie.geckolib:geckolib-neoforge-${minecraft_version}:${geckolib_version}") - // PaperDoll Render - //implementation("org.ayamemc:paperdoll-render:neoforge-${paperdollrender_version}") + // Ayame PaperDoll + //implementation("org.ayamemc:ayame-paperdoll:neoforge-${ayame_paperdoll_version}") } processResources {