Merge pull request #1097 from Gu-ZT/releases/1.20.1

升级 AnvilLib 版本，添加内置资源包
Anvil-Dev · Aug 11, 2024 · 8cc20dc · 8cc20dc
2 parents 1f90dbf + 489e5f5
commit 8cc20dc
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -118,3 +118,5 @@ run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+/forge/src/main/resources/resoucepacks/
+/fabric/src/main/resources/resoucepacks/
diff --git a/common/src/main/java/dev/dubhe/anvilcraft/AnvilCraft.java b/common/src/main/java/dev/dubhe/anvilcraft/AnvilCraft.java
@@ -17,6 +17,7 @@
 import dev.dubhe.anvilcraft.init.ModItems;
 import dev.dubhe.anvilcraft.init.ModMenuTypes;
 import dev.dubhe.anvilcraft.init.ModNetworks;
+import dev.dubhe.anvilcraft.init.ModResourcePacks;
 import dev.dubhe.anvilcraft.util.EnchantmentDisableUtil;
 import dev.dubhe.anvilcraft.util.Lazy;
 import me.shedaniel.autoconfig.AutoConfig;
@@ -55,6 +56,7 @@ public static void init() {
         ModNetworks.register();
         ModDispenserBehavior.register();
         ModEnchantments.register();
+        ModResourcePacks.register();
 
         AnvilRecipe.init();
         // datagen

diff --git a/common/src/main/java/dev/dubhe/anvilcraft/data/generator/lang/OtherLang.java b/common/src/main/java/dev/dubhe/anvilcraft/data/generator/lang/OtherLang.java
@@ -48,5 +48,10 @@ public static void init(@NotNull RegistrateLangProvider provider) {
             "We have detected that you have only installed JEI and will not be able to obtain a complete recipe query. "
                 + "We recommend installing %s for a complete gaming experience!"
         );
+
+        provider.add(
+            "pack.anvilcraft.transparent_cauldron.description",
+            "Transparent Cauldron"
+        );
     }
 }
diff --git a/common/src/main/java/dev/dubhe/anvilcraft/init/ModResourcePacks.java b/common/src/main/java/dev/dubhe/anvilcraft/init/ModResourcePacks.java
@@ -0,0 +1,13 @@
+package dev.dubhe.anvilcraft.init;
+
+import dev.anvilcraft.lib.registrar.ResourcePacksHelper;
+import dev.dubhe.anvilcraft.AnvilCraft;
+
+public class ModResourcePacks {
+    public static void register() {
+        ResourcePacksHelper.registerBuiltinResourcePack(
+            AnvilCraft.of("transparent_cauldron"),
+            ResourcePacksHelper.PackType.CLIENT
+        );
+    }
+}
diff --git a/common/src/main/resources/resourcepacks/transparent_cauldron/pack.mcmeta b/common/src/main/resources/resourcepacks/transparent_cauldron/pack.mcmeta
@@ -0,0 +1,8 @@
+{
+  "pack": {
+    "description": {
+      "translate": "pack.anvilcraft.transparent_cauldron.description"
+    },
+    "pack_format": 15
+  }
+}
diff --git a/common/src/main/resources/resourcepacks/transparent_cauldron/pack.png b/common/src/main/resources/resourcepacks/transparent_cauldron/pack.png
diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_ud.json
@@ -347,6 +347,7 @@
   "itemGroup.anvilcraft.tools": "sǝıʇıןıʇ∩ :ʇɟɐɹƆןıʌuⱯ",
   "message.anvilcraft.need_patchouli_installed": "pǝןןɐʇsuı ǝq oʇ spǝǝu ıןnoɥɔʇɐԀ",
   "modmenu.nameTranslation.anvilcraft": "ʇɟɐɹƆןıʌuⱯ",
+  "pack.anvilcraft.transparent_cauldron.description": "uoɹpןnɐƆ ʇuǝɹɐdsuɐɹ⟘",
   "patchouli.anvilcraft.landing_text": "ʇɟɐɹƆןıʌuⱯ oʇ ǝɯoɔןǝM",
   "screen.anvilcraft.active_silencer.title": "ɹǝɔuǝןıS ǝʌıʇɔⱯ",
   "screen.anvilcraft.button.direction": "%s :uoıʇɔǝɹıᗡ ʇndʇnO",

diff --git a/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json b/fabric/src/generated/resources/assets/anvilcraft/lang/en_us.json
@@ -347,6 +347,7 @@
   "itemGroup.anvilcraft.tools": "AnvilCraft: Utilities",
   "message.anvilcraft.need_patchouli_installed": "Patchouli needs to be installed",
   "modmenu.nameTranslation.anvilcraft": "AnvilCraft",
+  "pack.anvilcraft.transparent_cauldron.description": "Transparent Cauldron",
   "patchouli.anvilcraft.landing_text": "Welcome to AnvilCraft",
   "screen.anvilcraft.active_silencer.title": "Active Silencer",
   "screen.anvilcraft.button.direction": "Output Direction: %s",

diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_ud.json
@@ -347,6 +347,7 @@
   "itemGroup.anvilcraft.tools": "sǝıʇıןıʇ∩ :ʇɟɐɹƆןıʌuⱯ",
   "message.anvilcraft.need_patchouli_installed": "pǝןןɐʇsuı ǝq oʇ spǝǝu ıןnoɥɔʇɐԀ",
   "modmenu.nameTranslation.anvilcraft": "ʇɟɐɹƆןıʌuⱯ",
+  "pack.anvilcraft.transparent_cauldron.description": "uoɹpןnɐƆ ʇuǝɹɐdsuɐɹ⟘",
   "patchouli.anvilcraft.landing_text": "ʇɟɐɹƆןıʌuⱯ oʇ ǝɯoɔןǝM",
   "screen.anvilcraft.active_silencer.title": "ɹǝɔuǝןıS ǝʌıʇɔⱯ",
   "screen.anvilcraft.button.direction": "%s :uoıʇɔǝɹıᗡ ʇndʇnO",

diff --git a/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json b/forge/src/generated/resources/assets/anvilcraft/lang/en_us.json
@@ -347,6 +347,7 @@
   "itemGroup.anvilcraft.tools": "AnvilCraft: Utilities",
   "message.anvilcraft.need_patchouli_installed": "Patchouli needs to be installed",
   "modmenu.nameTranslation.anvilcraft": "AnvilCraft",
+  "pack.anvilcraft.transparent_cauldron.description": "Transparent Cauldron",
   "patchouli.anvilcraft.landing_text": "Welcome to AnvilCraft",
   "screen.anvilcraft.active_silencer.title": "Active Silencer",
   "screen.anvilcraft.button.direction": "Output Direction: %s",

diff --git a/gradle.properties b/gradle.properties
@@ -27,7 +27,7 @@ jei_version=15.3.0.4
 rei_version=12.0.648
 emi_version=1.1.10+1.20.1
 kjs_version=2001.6.3-build.37
-anvil_lib_version=1.0.0+build.7
+anvil_lib_version=1.0.0+build.29
 ## Fabric
 fabric_loader_version=0.15.7
 fabric_api_version=0.92.0