Merge remote-tracking branch 'upstream/1.20' into 1.20.1-update

# Conflicts:
#	src/main/java/slimeknights/mantle/Mantle.java
#	src/main/java/slimeknights/mantle/recipe/ingredient/PotionIngredient.java
#	src/main/java/slimeknights/mantle/util/RetexturedHelper.java
#	src/main/resources/assets/mantle/lang/en_us.json

Author: AlphaMode

src/main/java/slimeknights/mantle/Mantle.java

@@ -63,6 +63,7 @@
 import slimeknights.mantle.recipe.condition.TagFilledCondition;
 import slimeknights.mantle.recipe.helper.TagPreference;
 import slimeknights.mantle.recipe.ingredient.FluidContainerIngredient;
+import slimeknights.mantle.recipe.ingredient.PotionDisplayIngredient;
 import slimeknights.mantle.recipe.ingredient.PotionIngredient;
 import slimeknights.mantle.registration.MantleRegistrations;
 import slimeknights.mantle.registration.RegistrationHelper;
@@ -126,6 +127,7 @@ private void register() {
     ResourceConditions.register(TagCombinationCondition.ID, TagCombinationCondition::test);
     CustomIngredientSerializer.register(FluidContainerIngredient.SERIALIZER);
     CustomIngredientSerializer.register(PotionIngredient.SERIALIZER);
+      CraftingHelper.register(getResource("potion_display"), PotionDisplayIngredient.SERIALIZER);
 
     // fluid container transfer
     FluidContainerTransferManager.TRANSFER_LOADERS.registerDeserializer(EmptyFluidContainerTransfer.ID, EmptyFluidContainerTransfer.DESERIALIZER);
@@ -143,7 +145,7 @@ private void register() {
       BlockPredicate.LOADER.register(getResource("block_properties"), BlockPropertiesPredicate.LOADER);
 
       // item predicates
-      ItemPredicate.LOADER.register(getResource("has_container"), ItemPredicate.MAY_HAVE_TRANSFER.getLoader());
+      ItemPredicate.LOADER.register(getResource("has_container"), ItemPredicate.HAS_CONTAINER.getLoader());
       ItemPredicate.LOADER.register(getResource("may_have_transfer"), ItemPredicate.MAY_HAVE_TRANSFER.getLoader());
 
       // entity predicates
@@ -157,7 +159,7 @@ private void register() {
       LivingEntityPredicate.LOADER.register(getResource("on_ground"), LivingEntityPredicate.ON_GROUND.getLoader());
       LivingEntityPredicate.LOADER.register(getResource("crouching"), LivingEntityPredicate.CROUCHING.getLoader());
       LivingEntityPredicate.LOADER.register(getResource("sprinting"), LivingEntityPredicate.SPRINTING.getLoader());
-      LivingEntityPredicate.LOADER.register(getResource("has_effect"), HasMobEffectPredicate.LOADER);
+      LivingEntityPredicate.LOADER.register(getResource("blocking"), LivingEntityPredicate.BLOCKING.getLoader());LivingEntityPredicate.LOADER.register(getResource("has_effect"), HasMobEffectPredicate.LOADER);
       LivingEntityPredicate.LOADER.register(getResource("block_at_entity"), BlockAtEntityPredicate.LOADER);
       LivingEntityPredicate.LOADER.register(getResource("eyes_in_water"), LivingEntityPredicate.EYES_IN_WATER.getLoader());
       LivingEntityPredicate.LOADER.register(getResource("feet_in_water"), LivingEntityPredicate.FEET_IN_WATER.getLoader());

src/main/java/slimeknights/mantle/block/RetexturedBlock.java

@@ -42,8 +42,8 @@ public ItemStack getPickedStack(BlockState state, BlockGetter world, BlockPos po
   }
 
   @Override
-  public void appendHoverText(ItemStack stack, @Nullable BlockGetter pLevel, List<Component> tooltip, TooltipFlag pFlag) {
-    RetexturedHelper.addTooltip(stack, tooltip);
+  public void appendHoverText(ItemStack stack, @Nullable BlockGetter pLevel, List<Component> tooltip, TooltipFlag flag) {
+    RetexturedHelper.addTooltip(stack, tooltip, flag);
   }
 
 

src/main/java/slimeknights/mantle/client/book/data/content/ContentPageIconList.java

@@ -170,15 +170,15 @@ public static List<ContentPageIconList> getPagesNeededForItemCount(int count, Se
       padding.load();
       // hack: add padding to the previous section so section links start at the index
       int sectionIndex = data.parent.sections.indexOf(data);
-      if (data.pages.isEmpty() && sectionIndex > 0) {
+      if (sectionIndex > 0) {
         data.parent.sections.get(sectionIndex - 1).pages.add(padding);
       } else {
-        data.pages.add(padding);
+        newPages.add(0, padding);
       }
     }
 
-    // padding done, can add new pages
-    data.pages.addAll(newPages);
+    // padding done, can add new pages at the start of the section
+    data.pages.addAll(0, newPages);
 
     return listPages;
   }
@@ -191,15 +191,33 @@ public record PageWithIcon(SizedBookElement icon, PageData page) {}
    * @param data       Section to receive pages
    * @param indexList  List of indexes from {@link #getPagesNeededForItemCount(int, SectionData, String, String)}
    * @param pages      List of pages to add to the indexes.
+   * @param index      Start index to insert new pages. Should generally be the size of {@link #getPagesNeededForItemCount(int, SectionData, String, String)},
+   *                   though you may need to compare {@link SectionData#pages} count if not using {@link slimeknights.mantle.client.book.transformer.IndexTransformer}.
    */
-  public static void addPages(SectionData data, List<ContentPageIconList> indexList, Collection<PageWithIcon> pages) {
+  public static void addPages(SectionData data, List<ContentPageIconList> indexList, Collection<PageWithIcon> pages, int index) {
     Iterator<ContentPageIconList> indexes = indexList.iterator();
     ContentPageIconList overview = indexes.next();
+    List<PageData> newPages = new ArrayList<>(pages.size());
     for (PageWithIcon page : pages) {
-      data.pages.add(page.page);
+      newPages.add(page.page);
       while (!overview.addLink(page.icon, Component.literal(page.page.getTitle()), page.page)) {
         overview = indexes.next();
       }
     }
+    if (index == -1) {
+      data.pages.addAll(newPages);
+    } else {
+      data.pages.addAll(index, newPages);
+    }
+  }
+
+  /**
+   * Adds the list of pages with icons to the indexes and the book
+   * @param data       Section to receive pages
+   * @param indexList  List of indexes from {@link #getPagesNeededForItemCount(int, SectionData, String, String)}
+   * @param pages      List of pages to add to the indexes.
+   */
+  public static void addPages(SectionData data, List<ContentPageIconList> indexList, Collection<PageWithIcon> pages) {
+    addPages(data, indexList, pages, indexList.size());
   }
 }

src/main/java/slimeknights/mantle/client/book/transformer/ContentGroupingSectionTransformer.java

@@ -14,6 +14,7 @@
 import slimeknights.mantle.client.screen.book.TextDataRenderer;
 
 import javax.annotation.Nullable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -52,6 +53,7 @@ public void transform(BookData book, SectionData data) {
       // add padding page to keep indexes stretching over two pages together
       int i = 0;
       List<ContentListing> finishedListings = builder.getFinishedListings();
+      List<PageData> newPages = new ArrayList<>(finishedListings.size() + 1);
       if (finishedListings.size() % 2 == 0) {
         PageData padding = new PageData(true);
         padding.source = data.source;
@@ -63,8 +65,7 @@ public void transform(BookData book, SectionData data) {
         if (sectionIndex > 0) {
           data.parent.sections.get(sectionIndex - 1).pages.add(padding);
         } else {
-          data.pages.add(padding);
-          i++;
+          newPages.add(padding);
         }
       }
 
@@ -76,9 +77,10 @@ public void transform(BookData book, SectionData data) {
         listingPage.parent = data;
         listingPage.content = listing;
         listingPage.load();
-        data.pages.add(i, listingPage);
-        i++;
+        newPages.add(listingPage);
       }
+      // add new pages at the start of the section
+      data.pages.addAll(0, newPages);
     }
   }
 

src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java

@@ -59,9 +59,12 @@ public class BookScreen extends Screen {
   @Nullable
   private static Font altFont;
 
-  // Used for the book to image exporter to disable arrows and mouse input
+  /** If true, shows next and previous page buttons. Set to false during export. */
   public boolean drawArrows = true;
+  /** If true, the mouse may be used to interact with book elements. Set to false during export. */
   public boolean mouseInput = true;
+  /** If true, animated elements can animate. Set to false during export to ensure first element consistently shows. */
+  public boolean enableAnimations = true;
 
   private ArrowButton previousArrow, nextArrow, backArrow, indexArrow;
 
@@ -708,10 +711,10 @@ private void buildPages() {
     }
 
     for (BookElement element : this.leftElements) {
-      element.parent = this;
+      element.setParent(this);
     }
     for (BookElement element : this.rightElements) {
-      element.parent = this;
+      element.setParent(this);
     }
   }
 

src/main/java/slimeknights/mantle/client/screen/book/element/BookElement.java

@@ -1,5 +1,6 @@
 package slimeknights.mantle.client.screen.book.element;
 
+import lombok.Setter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
@@ -20,6 +21,8 @@
 
 public abstract class BookElement {
 
+  /** TODO 1.21: make this field protected instead of public to ensure setter is used. */
+  @Setter
   public BookScreen parent;
 
   protected Minecraft mc = Minecraft.getInstance();

src/main/java/slimeknights/mantle/client/screen/book/element/ImageElement.java

@@ -6,6 +6,7 @@
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.resources.ResourceLocation;
 import slimeknights.mantle.client.book.data.element.ImageData;
+import slimeknights.mantle.client.screen.book.BookScreen;
 
 import static java.util.Objects.requireNonNullElse;
 
@@ -60,6 +61,14 @@ public ImageElement(int x, int y, int width, int height, ImageData image, int co
     }
   }
 
+  @Override
+  public void setParent(BookScreen parent) {
+    super.setParent(parent);
+    if (itemElement != null) {
+      itemElement.setParent(parent);
+    }
+  }
+
   @Override
   public void draw(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks, Font fontRenderer) {
     float r = ((this.colorMultiplier >> 16) & 0xff) / 255.F;

src/main/java/slimeknights/mantle/client/screen/book/element/ItemElement.java

@@ -84,13 +84,18 @@ public void scale(float scale) {
   public void draw(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks, Font fontRenderer) {
     long nano = Util.getNanos();
 
-    if(nano > lastTime + ITEM_SWITCH_TIME) {
-      this.lastTime = nano;
-      this.currentItem++;
-
-      if (this.currentItem >= this.itemCycle.size()) {
-        this.currentItem = 0;
+    // don't cycle items during export
+    if (parent == null || parent.enableAnimations) {
+      if (nano > lastTime + ITEM_SWITCH_TIME){
+        this.lastTime = nano;
+        this.currentItem++;
+
+        if (this.currentItem >= this.itemCycle.size()) {
+          this.currentItem = 0;
+        }
       }
+    } else {
+      this.currentItem = 0;
     }
 
     if (this.currentItem < this.itemCycle.size()) {

src/main/java/slimeknights/mantle/client/screen/book/element/PageIconLinkElement.java

@@ -8,6 +8,7 @@
 import slimeknights.mantle.client.book.action.StringActionProcessor;
 import slimeknights.mantle.client.book.data.PageData;
 import slimeknights.mantle.client.book.data.element.TextData;
+import slimeknights.mantle.client.screen.book.BookScreen;
 
 /** Link elements for {@link slimeknights.mantle.client.book.data.content.ContentPageIconList} */
 public class PageIconLinkElement extends SizedBookElement {
@@ -32,6 +33,12 @@ public PageIconLinkElement(int x, int y, int w, int h, SizedBookElement displayE
     this.name = name;
   }
 
+  @Override
+  public void setParent(BookScreen parent) {
+    super.setParent(parent);
+    displayElement.setParent(parent);
+  }
+
   @Override
   public void draw(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks, Font fontRenderer) {
     boolean hover = this.isHovered(mouseX, mouseY);

src/main/java/slimeknights/mantle/client/screen/book/element/SelectionElement.java

@@ -6,6 +6,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import slimeknights.mantle.client.book.data.SectionData;
+import slimeknights.mantle.client.screen.book.BookScreen;
 import slimeknights.mantle.client.screen.book.TextDataRenderer;
 
 import java.util.ArrayList;
@@ -34,6 +35,12 @@ public SelectionElement(int x, int y, SectionData section) {
     this.iconRenderer = new ImageElement(this.iconX, this.iconY, IMG_SIZE, IMG_SIZE, section.icon);
   }
 
+  @Override
+  public void setParent(BookScreen parent) {
+    super.setParent(parent);
+    iconRenderer.setParent(parent);
+  }
+
   @Override
   public void draw(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks, Font fontRenderer) {
     boolean unlocked = this.section.isUnlocked(this.parent.advancementCache);