Update to 1.6.0 将手册升级到1.6.0

dependencies.gradle

@@ -3,16 +3,21 @@ dependencies {
     api(libs.registrate)
 
     // Anvil Lib
-    implementation(libs.anvillib)
-    interfaceInjectionData(libs.anvillib)
+    runtimeOnly(libs.anvillib)
+    compileOnly(libs.anvillibConfig)
+    compileOnly(libs.anvillibRecipe)
+    interfaceInjectionData(libs.anvillibRecipe)
+    compileOnly(libs.anvillibMoveableEntityBlock)
+    interfaceInjectionData(libs.anvillibMoveableEntityBlock)
+    compileOnly(libs.anvillibIntegration)
 
     // AnvilCraft
     implementation(libs.anvilcraft) { transitive = false }
     interfaceInjectionData(libs.anvilcraft) { transitive = false }
 
     // GuideME
     compileOnly("org.appliedenergistics:guideme:${libs.versions.guideme.get()}:api")
-    runtimeOnly(libs.guideme)
+    implementation(libs.guideme)
 
     // AE2
     implementation(libs.ae2)

gradle.properties

@@ -21,7 +21,7 @@ curseforge_id=1424985
 mod_id=anvilcraft_guideme
 mod_name=AnvilCraft-GuideME
 mod_license=LGPL-3.0
-mod_version=1.5.1-1
+mod_version=1.6.0
 maven_group=dev.anvilcraft.guideme
 mod_authors=Anvil-Dev
 mod_description=AnvilCraft's GuideME Compat

gradle/libs.versions.toml

@@ -2,22 +2,27 @@
 minecraft = "1.21.1"
 neoForge = "21.1.217"
 registrate = "MC1.21-1.3.0+62"
-anvillib = "1.4.0+build.172"
-anvilcraft = "1.5.1"
+anvillib = "2.0.0+build.186"
+anvilcraft = "1.6.0+snapshot.1594"
 modDevGradle = "2.0.78"
 lombok = "8.7.1"
-guideme = "21.1.9"
+guideme = "21.1.15"
 ae2 = "19.2.10"
 jei = "19.25.1.332"
 
 [libraries]
 registrate = { group = "com.tterrag.registrate", name = "Registrate", version.ref = "registrate" }
-anvillib = { group = "dev.anvilcraft.lib", name = "anvillib-neoforge-1.21.1", version.ref = "anvillib" }
 anvilcraft = { group = "dev.dubhe", name = "anvilcraft-neoforge-1.21.1", version.ref = "anvilcraft" }
 guideme = { group = "org.appliedenergistics", name = "guideme", version.ref = "guideme" }
 ae2 = { group = "org.appliedenergistics", name = "appliedenergistics2", version.ref = "ae2" }
 jei = { group = "mezz.jei", name = "jei-1.21.1-neoforge", version.ref = "jei" }
 
+anvillibConfig = { group = "dev.anvilcraft.lib", name = "anvillib-config-neoforge-1.21.1", version.ref = "anvillib" }
+anvillibRecipe = { group = "dev.anvilcraft.lib", name = "anvillib-recipe-neoforge-1.21.1", version.ref = "anvillib" }
+anvillibMoveableEntityBlock = { group = "dev.anvilcraft.lib", name = "anvillib-moveable-entity-block-neoforge-1.21.1", version.ref = "anvillib" }
+anvillibIntegration = { group = "dev.anvilcraft.lib", name = "anvillib-integration-neoforge-1.21.1", version.ref = "anvillib" }
+anvillib = { group = "dev.anvilcraft.lib", name = "anvillib-neoforge-1.21.1", version.ref = "anvillib" }
+
 [plugins]
 modDevGradle = { id = "net.neoforged.moddev", version.ref = "modDevGradle" }
 lombok = { id = "io.freefair.lombok", version.ref = "lombok" }

src/main/java/dev/anvilcraft/guideme/event/AddonGuideEventListener.java

@@ -4,6 +4,7 @@
 import dev.dubhe.anvilcraft.api.event.CheckIntegrationLoadedEvent;
 import dev.dubhe.anvilcraft.api.event.GuideBookEvent;
 import guideme.GuidesCommon;
+import guideme.internal.GuideME;
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
@@ -25,7 +26,7 @@ public static void onOpenGuide(GuideBookEvent.OpenGuideBookEvent event) {
 
     @SubscribeEvent
     public static void onHasGuide(CheckIntegrationLoadedEvent event) {
-        if (event.getId().equals("guideme")) {
+        if (event.getId().equals(GuideME.MOD_ID)) {
             event.setLoaded();
         }
     }

src/main/java/dev/anvilcraft/guideme/guide/RecipeTypeContributions.java

@@ -24,7 +24,7 @@
 import dev.anvilcraft.guideme.guide.recipe.LytTimeWarpRecipe;
 import dev.anvilcraft.guideme.guide.recipe.LytUnpackRecipe;
 import dev.anvilcraft.guideme.guide.recipe.vanilla.VanillaRecipes;
-import dev.dubhe.anvilcraft.init.reicpe.ModRecipeTypes;
+import dev.dubhe.anvilcraft.init.recipe.ModRecipeTypes;
 import dev.dubhe.anvilcraft.recipe.ChargerChargingRecipe;
 import dev.dubhe.anvilcraft.recipe.JewelCraftingRecipe;
 import dev.dubhe.anvilcraft.recipe.anvil.MassInjectRecipe;

src/main/java/dev/anvilcraft/guideme/guide/compiler/tag/KeyMapTagCompiler.java

@@ -13,11 +13,11 @@
 
 import java.util.Set;
 
-// TODO: 将来GuideME升到21.5.6-beta及以上，移除这个
+// 不移除 原因:guideme本体做的KeyBind信息不全
 public class KeyMapTagCompiler extends FlowTagCompiler {
     @Override
     public Set<String> getTagNames() {
-        return Set.of("Key", "KeyBind");
+        return Set.of("Key");
     }
 
     @Override

src/main/java/dev/anvilcraft/guideme/guide/recipe/LytBaseMultipleToOneSmithingRecipe.java

@@ -42,7 +42,7 @@ public class LytBaseMultipleToOneSmithingRecipe extends LytVBox {
     public LytBaseMultipleToOneSmithingRecipe(BaseMultipleToOneSmithingRecipe recipe) {
         append(templateSlot = new LytSimpleItemSlot(Ingredient.of(recipe.getTemplate().getItems())));
         append(materialSlot = new LytSimpleItemSlot(Ingredient.of(recipe.getMaterial().getItems())));
-        append(outputSlot = new LytSimpleItemSlot(recipe.getResult().getResult()));
+        append(outputSlot = new LytSimpleItemSlot(recipe.getResult().result().getDefaultInstance()));
         for (int i = 0; i < Math.min(8, recipe.getInputs().size()); i++) {
             LytSimpleItemSlot slot;
             append(slot = new LytSimpleItemSlot(Ingredient.of(recipe.getInputs().get(i).getItems())));

src/main/java/dev/anvilcraft/guideme/guide/tooltip/ChanceItemTooltip.java

@@ -1,7 +1,7 @@
 package dev.anvilcraft.guideme.guide.tooltip;
 
 import dev.anvilcraft.lib.recipe.component.ChanceItemStack;
-import dev.anvilcraft.lib.util.NumberProviderUtil;
+import dev.anvilcraft.lib.recipe.util.NumberProviderUtil;
 import guideme.document.interaction.GuideTooltip;
 import guideme.siteexport.ResourceExporter;
 import net.minecraft.ChatFormatting;