20w08a + fix last entry not searched

Signed-off-by: shedaniel <daniel@shedaniel.me>

build.gradle

@@ -126,7 +126,7 @@ curseforge {
                 embeddedLibrary 'cloth-config'
             }
             mainArtifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}.jar")) {
-                displayName = "[Fabric 20w07a] v$project.version"
+                displayName = "[Fabric 20w08a] v$project.version"
             }
             afterEvaluate {
                 uploadTask.dependsOn("remapJar")

gradle.properties

@@ -1,11 +1,11 @@
 mod_version=4.0.5-unstable
-minecraft_version=20w07a
-yarn_version=20w07a+build.1
+minecraft_version=20w08a
+yarn_version=20w08a+build.1
 fabricloader_version=0.7.8+build.184
 cloth_events_version=1.2.0
 cloth_config_version=2.10
 modmenu_version=1.10.1+build.30
-fabric_api=0.4.33+build.298-1.16
+fabric_api=0.4.33+build.299-1.16
 autoconfig1u=1.2.4
 api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations
 api_exculde=

src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java

@@ -151,6 +151,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         return System.getProperty("rei.test", "false").equals("true");
     }
     
+    @SuppressWarnings("deprecation")
     @Override
     public void onInitializeClient() {
         configManager = new ConfigManagerImpl();
@@ -158,7 +159,6 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         registerClothEvents();
         discoverPluginEntries();
         for (ModContainer modContainer : FabricLoader.getInstance().getAllMods()) {
-            //noinspection deprecation
             if (modContainer.getMetadata().containsCustomElement("roughlyenoughitems:plugins"))
                 RoughlyEnoughItemsCore.LOGGER.error("[REI] REI plugin from " + modContainer.getMetadata().getId() + " is not loaded because it is too old!");
         }
@@ -166,7 +166,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
         ClientSidePacketRegistry.INSTANCE.register(RoughlyEnoughItemsNetwork.CREATE_ITEMS_MESSAGE_PACKET, (packetContext, packetByteBuf) -> {
             ItemStack stack = packetByteBuf.readItemStack();
             String player = packetByteBuf.readString(32767);
-            packetContext.getPlayer().addChatMessage(new LiteralText(I18n.translate("text.rei.cheat_items").replaceAll("\\{item_name}", SearchArgument.tryGetItemStackName(stack.copy())).replaceAll("\\{item_count}", stack.copy().getCount() + "").replaceAll("\\{player_name}", player)), false);
+            packetContext.getPlayer().addMessage(new LiteralText(I18n.translate("text.rei.cheat_items").replaceAll("\\{item_name}", SearchArgument.tryGetItemStackName(stack.copy())).replaceAll("\\{item_count}", stack.copy().getCount() + "").replaceAll("\\{player_name}", player)), false);
         });
         ClientSidePacketRegistry.INSTANCE.register(RoughlyEnoughItemsNetwork.NOT_ENOUGH_ITEMS_PACKET, (packetContext, packetByteBuf) -> {
             Screen currentScreen = MinecraftClient.getInstance().currentScreen;

src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java

@@ -40,7 +40,7 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
         ServerSidePacketRegistry.INSTANCE.register(DELETE_ITEMS_PACKET, (packetContext, packetByteBuf) -> {
             ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer();
             if (player.getServer().getPermissionLevel(player.getGameProfile()) < player.getServer().getOpPermissionLevel()) {
-                player.addChatMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false);
+                player.addMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false);
                 return;
             }
             if (!player.inventory.getCursorStack().isEmpty())
@@ -49,14 +49,14 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
         ServerSidePacketRegistry.INSTANCE.register(CREATE_ITEMS_PACKET, (packetContext, packetByteBuf) -> {
             ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer();
             if (player.getServer().getPermissionLevel(player.getGameProfile()) < player.getServer().getOpPermissionLevel()) {
-                player.addChatMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false);
+                player.addMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false);
                 return;
             }
             ItemStack stack = packetByteBuf.readItemStack();
             if (player.inventory.insertStack(stack.copy())) {
                 ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, RoughlyEnoughItemsNetwork.CREATE_ITEMS_MESSAGE_PACKET, new PacketByteBuf(Unpooled.buffer()).writeItemStack(stack.copy()).writeString(player.getEntityName(), 32767));
             } else
-                player.addChatMessage(new TranslatableText("text.rei.failed_cheat_items"), false);
+                player.addMessage(new TranslatableText("text.rei.failed_cheat_items"), false);
         });
         ServerSidePacketRegistry.INSTANCE.register(MOVE_ITEMS_PACKET, (packetContext, packetByteBuf) -> {
             Identifier category = packetByteBuf.readIdentifier();

src/main/java/me/shedaniel/rei/api/ConfigManager.java

@@ -8,6 +8,7 @@ package me.shedaniel.rei.api;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.util.List;
 
@@ -17,8 +18,11 @@ public interface ConfigManager {
         return RoughlyEnoughItemsCore.getConfigManager();
     }
     
+    @ApiStatus.ScheduledForRemoval
     @Deprecated
-    List<EntryStack> getFavorites();
+    default List<EntryStack> getFavorites() {
+        return ConfigObject.getInstance().getFavorites();
+    }
     
     /**
      * Saves the config.

src/main/java/me/shedaniel/rei/gui/config/entry/RecipeScreenTypeEntry.java

@@ -43,6 +43,7 @@ public class RecipeScreenTypeEntry extends TooltipListEntry<RecipeScreenType> {
     };
     private List<Element> children = ImmutableList.of(buttonWidget);
     
+    @SuppressWarnings("deprecation")
     public RecipeScreenTypeEntry(int width, String fieldName, RecipeScreenType type, RecipeScreenType defaultValue, Consumer<RecipeScreenType> save) {
         super(fieldName, null);
         this.width = width;

src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java

@@ -640,7 +640,7 @@ public class EntryListWidget extends WidgetWithBounds {
                     for (int i = 0; i < stacks.size(); i += size) {
                         int[] start = {i};
                         completableFutures.add(CompletableFuture.supplyAsync(() -> {
-                            int end = Math.min(stacks.size() - 1, start[0] + size);
+                            int end = Math.min(stacks.size(), start[0] + size);
                             List<EntryStack> filtered = Lists.newArrayList();
                             for (; start[0] < end; start[0]++) {
                                 EntryStack stack = stacks.get(start[0]);

src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java

@@ -147,7 +147,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
             String madeUpCommand = og.replaceAll("\\{player_name}", MinecraftClient.getInstance().player.getEntityName()).replaceAll("\\{item_name}", identifier.getPath()).replaceAll("\\{item_identifier}", identifier.toString()).replaceAll("\\{nbt}", tagMessage).replaceAll("\\{count}", String.valueOf(cheatedStack.getCount()));
             if (madeUpCommand.length() > 256) {
                 madeUpCommand = og.replaceAll("\\{player_name}", MinecraftClient.getInstance().player.getEntityName()).replaceAll("\\{item_name}", identifier.getPath()).replaceAll("\\{item_identifier}", identifier.toString()).replaceAll("\\{nbt}", "").replaceAll("\\{count}", String.valueOf(cheatedStack.getCount()));
-                MinecraftClient.getInstance().player.addChatMessage(new TranslatableText("text.rei.too_long_nbt"), false);
+                MinecraftClient.getInstance().player.addMessage(new TranslatableText("text.rei.too_long_nbt"), false);
             }
             MinecraftClient.getInstance().player.sendChatMessage(madeUpCommand);
             return true;

src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java

@@ -108,11 +108,6 @@ public class ConfigManagerImpl implements ConfigManager {
         RoughlyEnoughItemsCore.LOGGER.info("[REI] Config is loaded.");
     }
     
-    @Override
-    public List<EntryStack> getFavorites() {
-        return getConfig().getFavorites();
-    }
-    
     @Override
     public void saveConfig() {
         if (getConfig().getFavorites() != null)

src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java

@@ -184,6 +184,7 @@ public class FluidEntryStack extends AbstractEntryStack {
         return QueuedTooltip.create(toolTip);
     }
     
+    @SuppressWarnings("deprecation")
     @Override
     public void render(Rectangle bounds, int mouseX, int mouseY, float delta) {
         if (get(Settings.RENDER).get()) {

src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java

@@ -252,12 +252,14 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt
         optimisedRenderEnd(delta);
     }
     
+    @SuppressWarnings("deprecation")
     @Override
     public void optimisedRenderStart(float delta) {
         MinecraftClient.getInstance().getTextureManager().bindTexture(SpriteAtlasTexture.BLOCK_ATLAS_TEX);
         GlStateManager.enableRescaleNormal();
     }
     
+    @SuppressWarnings("deprecation")
     @Override
     public void optimisedRenderEnd(float delta) {
         GlStateManager.disableRescaleNormal();

src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java

@@ -107,6 +107,7 @@ public class RecipeHelperImpl implements RecipeHelper {
         return categoryWorkingStations.get(category);
     }
     
+    @Deprecated
     @Override
     public void registerDisplay(Identifier categoryIdentifier, RecipeDisplay display) {
         if (!recipeCategoryListMap.containsKey(categoryIdentifier))