build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.134'
+    id 'net.neoforged.gradle.userdev' version '7.0.96'
 }
 
 def buildSuffix = System.getenv('BUILD_NUMBER') ? "-b${System.getenv('BUILD_NUMBER')}" : ""

gradle.properties

@@ -2,20 +2,20 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 # Actually Additions
 
-mod_version=1.2.12
+mod_version=1.2.11
 
 # Forge
 game_version=1.20.4
-neo_version=20.4.232
+neo_version=20.4.190
 
 # mods.toml
 loader=2
-neo_version_range=[20.4.212,)
+neo_version_range=[20.4.190,)
 minecraft_version_range=[1.20.4,1.21)
 
 # Parchment (Mappings)
 neogradle.subsystems.parchment.minecraftVersion=1.20.4
-neogradle.subsystems.parchment.mappingsVersion=2024.04.14
+neogradle.subsystems.parchment.mappingsVersion=2024.02.25
 
 # Other mods
 jei_version=17.3.0.49

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletChapter.java

@@ -14,7 +14,6 @@ import net.minecraft.world.item.ItemStack;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
 
-//TODO: We're using Patchouli API for the new booklets. Do we still need this?
 public interface IBookletChapter {
 
     IBookletPage[] getAllPages();

src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletEntry.java

@@ -15,7 +15,6 @@ import net.neoforged.api.distmarker.OnlyIn;
 
 import java.util.List;
 
-//TODO: We're using Patchouli API for the new booklets. Do we still need this?
 public interface IBookletEntry {
 
     List<IBookletChapter> getAllChapters();

src/main/java/de/ellpeck/actuallyadditions/api/booklet/IBookletPage.java

@@ -19,7 +19,6 @@ import net.neoforged.neoforge.fluids.FluidStack;
 
 import java.util.List;
 
-//TODO: We're using Patchouli API for the new booklets. Do we still need this?
 public interface IBookletPage {
 
     void getItemStacksForPage(List<ItemStack> list);

src/main/java/de/ellpeck/actuallyadditions/api/booklet/internal/GuiBookletBase.java

@@ -17,7 +17,6 @@ import net.minecraft.world.item.ItemStack;
 
 import java.util.List;
 
-//TODO: We're using Patchouli API for the new booklets. Do we still need this?
 public abstract class GuiBookletBase extends Screen {
 
     protected GuiBookletBase(Component titleIn) {

src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShaped.java

@@ -10,7 +10,7 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.ShapedRecipe;
-import net.neoforged.neoforge.attachment.AttachmentUtils;
+import net.neoforged.neoforge.attachment.AttachmentInternals;
 
 import javax.annotation.Nullable;
 
@@ -46,7 +46,7 @@ public class RecipeKeepDataShaped extends ShapedRecipe {
             craftingResult.setTag(datasource.getTag().copy());
 
         if (!datasource.isEmpty())
-            AttachmentUtils.copyStackAttachments(datasource, craftingResult);
+            AttachmentInternals.copyStackAttachments(datasource, craftingResult);
 
         return craftingResult;
     }

src/main/java/de/ellpeck/actuallyadditions/mod/crafting/RecipeKeepDataShapeless.java

@@ -21,7 +21,7 @@ import net.minecraft.world.item.crafting.CraftingBookCategory;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.ShapelessRecipe;
-import net.neoforged.neoforge.attachment.AttachmentUtils;
+import net.neoforged.neoforge.attachment.AttachmentInternals;
 
 public class RecipeKeepDataShapeless extends ShapelessRecipe {
     public static String NAME = "copy_nbt_shapeless";
@@ -69,7 +69,7 @@ public class RecipeKeepDataShapeless extends ShapelessRecipe {
         }
 
         if (!datasource.isEmpty())
-            AttachmentUtils.copyStackAttachments(datasource, result);
+            AttachmentInternals.copyStackAttachments(datasource, result);
 
         return result;
     }

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java

@@ -63,7 +63,7 @@ public class ContainerCoalGenerator extends AbstractContainerMenu {
             //Other Slots in Inventory excluded
             if (slot >= inventoryStart) {
                 //Shift from Inventory
-                if (newStack.getBurnTime(null) > 0) {
+                if (CommonHooks.getBurnTime(newStack, null) > 0) {
                     if (!this.moveItemStackTo(newStack, 0, 1, false)) {
                         return ItemStack.EMPTY;
                     }