Update to 20w49a

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

17 files changed, 59 insertions, 86 deletions

diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
index e2f6f5f8a..fd07d8953 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/widget/TextFieldWidget.java
@@ -24,19 +24,16 @@
 package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.Matrix4f;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.math.impl.PointHelper;
 import me.shedaniel.rei.api.REIHelper;
 import net.minecraft.SharedConstants;
 import net.minecraft.Util;
+import net.minecraft.client.gui.components.TickableWidget;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.util.Mth;
-import net.minecraft.world.level.block.entity.TickableBlockEntity;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -51,7 +48,7 @@ import java.util.function.Predicate;
  * @see net.minecraft.client.gui.widget.TextFieldWidget
  */
 @ApiStatus.Internal
-public class TextFieldWidget extends WidgetWithBounds implements TickableBlockEntity {
+public class TextFieldWidget extends WidgetWithBounds implements TickableWidget {
     
     public Function<String, String> stripInvalid;
     protected int focusedTicks;
@@ -514,7 +511,7 @@ public class TextFieldWidget extends WidgetWithBounds implements TickableBlockEn
         RenderSystem.blendFuncSeparate(770, 771, 1, 0);
         RenderSystem.shadeModel(7425);
         Matrix4f matrix = matrices.last().pose();
-        buffer.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
         buffer.vertex(matrix, x1, y2, getBlitOffset() + 50f).color(r, g, b, 120).endVertex();
         buffer.vertex(matrix, x2, y2, getBlitOffset() + 50f).color(r, g, b, 120).endVertex();
         buffer.vertex(matrix, x2, y1, getBlitOffset() + 50f).color(r, g, b, 120).endVertex();
diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/server/ContainerInfo.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/server/ContainerInfo.java
index b827f23f1..79da344ce 100644
--- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/server/ContainerInfo.java
+++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/server/ContainerInfo.java
@@ -88,14 +88,14 @@ public interface ContainerInfo<T extends AbstractContainerMenu> {
     }
     
     default List<StackAccessor> getInventoryStacks(ContainerContext<T> context) {
-        Inventory inventory = context.getPlayerEntity().inventory;
+        Inventory inventory = context.getPlayerEntity().getInventory();
         return IntStream.range(0, inventory.items.size())
                 .mapToObj(index -> (StackAccessor) new InventoryStackAccessor(inventory, index))
                 .collect(Collectors.toList());
     }
     
     default void markDirty(ContainerContext<T> context) {
-        context.getPlayerEntity().inventory.setChanged();
+        context.getPlayerEntity().getInventory().setChanged();
         context.getContainer().broadcastChanges();
         
         NonNullList<ItemStack> defaultedList = NonNullList.create();
diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java
index 727dce65f..f18982399 100644
--- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java
+++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/favorites/GameModeFavoriteEntry.java
@@ -59,10 +59,11 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
     public static final ResourceLocation ID = new ResourceLocation("roughlyenoughitems", "gamemode");
     public static final String TRANSLATION_KEY = "favorite.section.gamemode";
     public static final String KEY = "mode";
+    @Nullable
     private GameType gameMode;
     
-    public GameModeFavoriteEntry(GameType gameMode) {
-        this.gameMode = Objects.requireNonNull(gameMode);
+    public GameModeFavoriteEntry(@Nullable GameType gameMode) {
+        this.gameMode = gameMode;
     }
     
     @Override
@@ -85,7 +86,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
                 fillGradient(matrices, bounds.getX(), bounds.getY(), bounds.getX() + 1, bounds.getMaxY(), color, color);
                 fillGradient(matrices, bounds.getMaxX() - 1, bounds.getY(), bounds.getMaxX(), bounds.getMaxY(), color, color);
                 if (bounds.width > 4 && bounds.height > 4) {
-                    if (gameMode == GameType.NOT_SET) {
+                    if (gameMode == null) {
                         updateAnimator(delta);
                         notSetScissorArea.setBounds(bounds.x + 2, bounds.y + 2, bounds.width - 4, bounds.height - 4);
                         ScissorsHandler.INSTANCE.scissor(notSetScissorArea);
@@ -119,14 +120,14 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
             private void renderGameModeText(PoseStack matrices, GameType type, int centerX, int centerY, int color) {
                 Component s = new TranslatableComponent("text.rei.short_gamemode." + type.getName());
                 Font font = Minecraft.getInstance().font;
-                font.draw(matrices, s, centerX - font.width(s) / 2 + (type == GameType.NOT_SET ? 0 : 0.5f), centerY - 3.5f, color);
+                font.draw(matrices, s, centerX - font.width(s) / 2 + (type == null ? 0 : 0.5f), centerY - 3.5f, color);
             }
             
             @Override
             public @Nullable Tooltip getTooltip(Point mouse) {
-                if (gameMode == GameType.NOT_SET)
+                if (gameMode == null)
                     return Tooltip.create(mouse, new TranslatableComponent("text.rei.gamemode_button.tooltip.all"));
-                return Tooltip.create(mouse, new TranslatableComponent("text.rei.gamemode_button.tooltip.entry", gameMode.getDisplayName().getString()));
+                return Tooltip.create(mouse, new TranslatableComponent("text.rei.gamemode_button.tooltip.entry", gameMode.getLongDisplayName().getString()));
             }
         };
     }
@@ -134,11 +135,10 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
     @Override
     public boolean doAction(int button) {
         if (button == 0) {
-            GameType type = gameMode;
-            if (type == GameType.NOT_SET) {
-                type = GameType.byId(Minecraft.getInstance().gameMode.getPlayerMode().getId() + 1 % 4);
+            if (gameMode == null) {
+                gameMode = GameType.byId(Minecraft.getInstance().gameMode.getPlayerMode().getId() + 1 % 4);
             }
-            Minecraft.getInstance().player.chat(ConfigObject.getInstance().getGamemodeCommand().replaceAll("\\{gamemode}", type.name().toLowerCase(Locale.ROOT)));
+            Minecraft.getInstance().player.chat(ConfigObject.getInstance().getGamemodeCommand().replaceAll("\\{gamemode}", gameMode.name().toLowerCase(Locale.ROOT)));
             Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F));
             return true;
         }
@@ -147,18 +147,18 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
     
     @Override
     public @NotNull Optional<Supplier<Collection<@NotNull FavoriteMenuEntry>>> getMenuEntries() {
-        if (gameMode == GameType.NOT_SET)
+        if (gameMode == null)
             return Optional.of(this::_getMenuEntries);
         return Optional.empty();
     }
     
     private Collection<FavoriteMenuEntry> _getMenuEntries() {
-        return CollectionUtils.filterAndMap(Arrays.asList(GameType.values()), mode -> mode != GameType.NOT_SET, GameModeMenuEntry::new);
+        return CollectionUtils.map(GameType.values(), GameModeMenuEntry::new);
     }
     
     @Override
     public int hashIgnoreAmount() {
-        return gameMode.ordinal();
+        return gameMode == null ? -1 : gameMode.ordinal();
     }
     
     @Override
@@ -183,7 +183,9 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
         
         @Override
         public @NotNull GameModeFavoriteEntry fromJson(@NotNull JsonObject object) {
-            return new GameModeFavoriteEntry(GameType.valueOf(GsonHelper.getAsString(object, KEY)));
+            String stringValue = GsonHelper.getAsString(object, KEY);
+            GameType type = stringValue.equals("NOT_SET") ? null : GameType.valueOf(stringValue);
+            return new GameModeFavoriteEntry(type);
         }
         
         @Override
@@ -193,7 +195,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
         
         @Override
         public @NotNull JsonObject toJson(@NotNull GameModeFavoriteEntry entry, @NotNull JsonObject object) {
-            object.addProperty(KEY, entry.gameMode.name());
+            object.addProperty(KEY, entry.gameMode == null ? "NOT_SET" : entry.gameMode.name());
             return object;
         }
     }
@@ -206,7 +208,7 @@ public class GameModeFavoriteEntry extends FavoriteEntry {
         private int textWidth = -69;
         
         public GameModeMenuEntry(GameType gameMode) {
-            this.text = gameMode.getDisplayName().getString();
+            this.text = gameMode.getLongDisplayName().getString();
             this.gameMode = gameMode;
         }
         
diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java
index ec1b14ef3..eca98915c 100644
--- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java
+++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/information/DefaultInformationCategory.java
@@ -60,7 +60,7 @@ import java.util.Objects;
 public class DefaultInformationCategory implements RecipeCategory<DefaultInformationDisplay> {
     protected static void innerBlit(Matrix4f matrix4f, int xStart, int xEnd, int yStart, int yEnd, int z, float uStart, float uEnd, float vStart, float vEnd) {
         BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder();
-        bufferBuilder.begin(7, DefaultVertexFormat.POSITION_TEX);
+        bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
         bufferBuilder.vertex(matrix4f, xStart, yEnd, z).uv(uStart, vEnd).endVertex();
         bufferBuilder.vertex(matrix4f, xEnd, yEnd, z).uv(uEnd, vEnd).endVertex();
         bufferBuilder.vertex(matrix4f, xEnd, yStart, z).uv(uEnd, vStart).endVertex();
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
index 373ba7919..145795eda 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
@@ -66,8 +66,8 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
                     player.displayClientMessage(new TranslatableComponent("text.rei.no_permission_cheat").withStyle(ChatFormatting.RED), false);
                     return;
                 }
-                if (!player.inventory.getCarried().isEmpty()) {
-                    player.inventory.setCarried(ItemStack.EMPTY);
+                if (!player.getInventory().getCarried().isEmpty()) {
+                    player.getInventory().setCarried(ItemStack.EMPTY);
                     player.broadcastCarriedItem();
                 }
             });
@@ -78,7 +78,7 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
                     return;
                 }
                 ItemStack stack = packetByteBuf.readItem();
-                if (player.inventory.add(stack.copy())) {
+                if (player.getInventory().add(stack.copy())) {
                     ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, RoughlyEnoughItemsNetwork.CREATE_ITEMS_MESSAGE_PACKET, new FriendlyByteBuf(Unpooled.buffer()).writeItem(stack.copy()).writeUtf(player.getScoreboardName(), 32767));
                 } else
                     player.displayClientMessage(new TranslatableComponent("text.rei.failed_cheat_items"), false);
@@ -90,7 +90,7 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer {
                     return;
                 }
                 
-                Inventory inventory = player.inventory;
+                Inventory inventory = player.getInventory();
                 ItemStack itemStack = packetByteBuf.readItem();
                 ItemStack stack = itemStack.copy();
                 if (!inventory.getCarried().isEmpty() && ItemStack.isSameIgnoreDurability(inventory.getCarried(), stack) && ItemStack.tagMatches(inventory.getCarried(), stack)) {
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
index 958158775..55c702c71 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -303,7 +303,7 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
                             if (isOpened != inBounds) {
                                 if (inBounds) {
                                     Menu menu = new Menu(new Point(button.getBounds().x, button.getBounds().getMaxY()),
-                                            CollectionUtils.filterAndMap(Arrays.asList(GameType.values()), mode -> mode != GameType.NOT_SET, GameModeMenuEntry::new));
+                                            CollectionUtils.map(GameType.values(), GameModeMenuEntry::new));
                                     if (ConfigObject.getInstance().isLeftHandSidePanel())
                                         menu.menuStartPoint.x -= menu.getBounds().width - button.getBounds().width;
                                     openMenu(Menu.GAME_TYPE, menu, point -> button.isFocused() && button.containsMouse(PointHelper.ofMouse()));
@@ -437,22 +437,6 @@ public class ContainerScreenOverlay extends WidgetWithBounds implements REIOverl
         return I18n.get("selectWorld.gameMode." + gameMode.getName());
     }
     
-    private GameType getNextGameMode(boolean reverse) {
-        try {
-            GameType current = getCurrentGameMode();
-            int next = current.getId() + 1;
-            if (reverse)
-                next -= 2;
-            if (next > 3)
-                next = 0;
-            if (next < 0)
-                next = 3;
-            return GameType.byId(next);
-        } catch (Exception e) {
-            return GameType.NOT_SET;
-        }
-    }
-    
     private GameType getCurrentGameMode() {
         return Minecraft.getInstance().getConnection().getPlayerInfo(Minecraft.getInstance().player.getGameProfile().getId()).getGameMode();
     }
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringScreen.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringScreen.java
index 49ac034e6..31e2a3948 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringScreen.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/config/entry/FilteringScreen.java
@@ -26,10 +26,7 @@ package me.shedaniel.rei.gui.config.entry;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.Matrix4f;
 import me.shedaniel.clothconfig2.ClothConfigInitializer;
 import me.shedaniel.clothconfig2.api.ScissorsHandler;
@@ -197,7 +194,7 @@ public class FilteringScreen extends Screen {
         Matrix4f matrix = matrices.last().pose();
         RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
         float float_1 = 32.0F;
-        buffer.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
         buffer.vertex(matrix, 0, y2, 0.0F).uv(0.0F, y2 / 32.0F).color(tint, tint, tint, alpha2).endVertex();
         buffer.vertex(matrix, this.width, y2, 0.0F).uv(this.width / 32.0F, y2 / 32.0F).color(tint, tint, tint, alpha2).endVertex();
         buffer.vertex(matrix, this.width, y1, 0.0F).uv(this.width / 32.0F, y1 / 32.0F).color(tint, tint, tint, alpha1).endVertex();
@@ -249,7 +246,7 @@ public class FilteringScreen extends Screen {
         RenderSystem.shadeModel(7425);
         RenderSystem.disableTexture();
         Matrix4f matrix = matrices.last().pose();
-        buffer.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+        buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
         buffer.vertex(matrix, 0, bounds.y + 4, 0.0F).uv(0.0F, 1.0F).color(0, 0, 0, 0).endVertex();
         buffer.vertex(matrix, width, bounds.y + 4, 0.0F).uv(1.0F, 1.0F).color(0, 0, 0, 0).endVertex();
         buffer.vertex(matrix, width, bounds.y, 0.0F).uv(1.0F, 0.0F).color(0, 0, 0, 255).endVertex();
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/modules/entries/GameModeMenuEntry.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/modules/entries/GameModeMenuEntry.java
index 1e8ee8569..4fa48e5d0 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/modules/entries/GameModeMenuEntry.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/modules/entries/GameModeMenuEntry.java
@@ -48,7 +48,7 @@ public class GameModeMenuEntry extends MenuEntry {
     private int textWidth = -69;
     
     public GameModeMenuEntry(GameType gameMode) {
-        this.text = gameMode.getDisplayName().getString();
+        this.text = gameMode.getLongDisplayName().getString();
         this.gameMode = gameMode;
     }
     
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListEntryWidget.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListEntryWidget.java
index 2dd35885a..b5037e46f 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListEntryWidget.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListEntryWidget.java
@@ -48,7 +48,7 @@ public abstract class EntryListEntryWidget extends EntryWidget {
     
     @Override
     public void queueTooltip(PoseStack matrices, int mouseX, int mouseY, float delta) {
-        if (ClientHelper.getInstance().isCheating() && !minecraft.player.inventory.getCarried().isEmpty()) {
+        if (ClientHelper.getInstance().isCheating() && !minecraft.player.getInventory().getCarried().isEmpty()) {
             return;
         }
         super.queueTooltip(matrices, mouseX, mouseY, delta);
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
index a36beea28..2ca72fee7 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java
@@ -341,8 +341,8 @@ public class EntryListWidget extends WidgetWithBounds {
             matrices.popPose();
         }
         
-        if (containsMouse(mouseX, mouseY) && ClientHelper.getInstance().isCheating() && !minecraft.player.inventory.getCarried().isEmpty() && RoughlyEnoughItemsCore.canDeleteItems()) {
-            EntryStack stack = EntryStack.create(minecraft.player.inventory.getCarried().copy());
+        if (containsMouse(mouseX, mouseY) && ClientHelper.getInstance().isCheating() && !minecraft.player.getInventory().getCarried().isEmpty() && RoughlyEnoughItemsCore.canDeleteItems()) {
+            EntryStack stack = EntryStack.create(minecraft.player.getInventory().getCarried().copy());
             if (stack.getType() == EntryStack.Type.FLUID) {
                 Item bucketItem = stack.getFluid().getBucket();
                 if (bucketItem != null) {
@@ -557,7 +557,7 @@ public class EntryListWidget extends WidgetWithBounds {
     public boolean mouseReleased(double mouseX, double mouseY, int button) {
         if (containsMouse(mouseX, mouseY)) {
             LocalPlayer player = minecraft.player;
-            if (ClientHelper.getInstance().isCheating() && player != null && player.inventory != null && !player.inventory.getCarried().isEmpty() && RoughlyEnoughItemsCore.canDeleteItems()) {
+            if (ClientHelper.getInstance().isCheating() && player != null && player.getInventory() != null && !player.getInventory().getCarried().isEmpty() && RoughlyEnoughItemsCore.canDeleteItems()) {
                 ClientHelper.getInstance().sendDeletePacket();
                 return true;
             }
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
index 50da7c39e..35900f2ff 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
@@ -120,7 +120,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
     @Override
     public void sendDeletePacket() {
         if (Minecraft.getInstance().screen instanceof CreativeModeInventoryScreen) {
-            Minecraft.getInstance().player.inventory.setCarried(ItemStack.EMPTY);
+            Minecraft.getInstance().player.getInventory().setCarried(ItemStack.EMPTY);
             ((CreativeModeInventoryScreen) Minecraft.getInstance().screen).isQuickCrafting = false;
             return;
         }
@@ -135,10 +135,10 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
         if (entry.getType() != EntryStack.Type.ITEM)
             return false;
         if (Minecraft.getInstance().player == null) return false;
-        if (Minecraft.getInstance().player.inventory == null) return false;
+        if (Minecraft.getInstance().player.getInventory() == null) return false;
         ItemStack cheatedStack = entry.getItemStack().copy();
         if (ConfigObject.getInstance().isGrabbingItems() && Minecraft.getInstance().screen instanceof CreativeModeInventoryScreen) {
-            Inventory inventory = Minecraft.getInstance().player.inventory;
+            Inventory inventory = Minecraft.getInstance().player.getInventory();
             EntryStack stack = entry.copy();
             if (!inventory.getCarried().isEmpty() && EntryStack.create(inventory.getCarried()).equalsIgnoreAmount(stack)) {
                 stack.setAmount(Mth.clamp(stack.getAmount() + inventory.getCarried().getCount(), 1, stack.getItemStack().getMaxStackSize()));
@@ -148,7 +148,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
             inventory.setCarried(stack.getItemStack().copy());
             return true;
         } else if (RoughlyEnoughItemsCore.canUsePackets()) {
-            Inventory inventory = Minecraft.getInstance().player.inventory;
+            Inventory inventory = Minecraft.getInstance().player.getInventory();
             EntryStack stack = entry.copy();
             if (!inventory.getCarried().isEmpty() && !EntryStack.create(inventory.getCarried()).equalsIgnoreAmount(stack)) {
                 return false;
@@ -177,12 +177,12 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
     
     @Override
     public List<ItemStack> getInventoryItemsTypes() {
-        return Minecraft.getInstance().player.inventory.compartments.stream().flatMap(Collection::stream).collect(Collectors.toList());
+        return Minecraft.getInstance().player.getInventory().compartments.stream().flatMap(Collection::stream).collect(Collectors.toList());
     }
     
     @ApiStatus.Internal
     public Set<EntryStack> _getInventoryItemsTypes() {
-        return Minecraft.getInstance().player.inventory.compartments.stream()
+        return Minecraft.getInstance().player.getInventory().compartments.stream()
                 .flatMap(Collection::stream)
                 .map(EntryStack::create)
                 .collect(Collectors.toSet());
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
index 76f586b68..5fefe3beb 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/FluidEntryStack.java
@@ -24,10 +24,7 @@
 package me.shedaniel.rei.impl;
 
 import com.google.common.collect.Lists;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.*;
 import com.mojang.math.Matrix4f;
 import it.unimi.dsi.fastutil.shorts.Short2ObjectMap;
 import me.shedaniel.math.Point;
@@ -222,7 +219,7 @@ public class FluidEntryStack extends AbstractEntryStack {
                 Tesselator tess = Tesselator.getInstance();
                 BufferBuilder bb = tess.getBuilder();
                 Matrix4f matrix = matrices.last().pose();
-                bb.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR);
+                bb.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
                 bb.vertex(matrix, bounds.getMaxX(), bounds.y, getZ()).uv(sprite.getU1(), sprite.getV0()).color(r, g, b, a).endVertex();
                 bb.vertex(matrix, bounds.x, bounds.y, getZ()).uv(sprite.getU0(), sprite.getV0()).color(r, g, b, a).endVertex();
                 bb.vertex(matrix, bounds.x, bounds.getMaxY(), getZ()).uv(sprite.getU0(), sprite.getV1()).color(r, g, b, a).endVertex();
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
index cc471494e..76477f1f1 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/ItemEntryStack.java
@@ -346,7 +346,7 @@ public class ItemEntryStack extends AbstractEntryStack implements OptimalEntrySt
     }
     
     private BakedModel getModelFromStack(ItemStack stack) {
-        return Minecraft.getInstance().getItemRenderer().getModel(stack, null, null);
+        return Minecraft.getInstance().getItemRenderer().getModel(stack, null, null, 0);
     }
     
     @Override
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java
index 1c273d986..b36db301e 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/widgets/FillRectangleDrawableConsumer.java
@@ -24,10 +24,7 @@
 package me.shedaniel.rei.impl.widgets;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.*;
 import me.shedaniel.math.Rectangle;
 import me.shedaniel.rei.api.DrawableConsumer;
 import net.minecraft.client.gui.GuiComponent;
@@ -56,7 +53,7 @@ public final class FillRectangleDrawableConsumer implements DrawableConsumer {
         RenderSystem.shadeModel(7425);
         Tesselator tessellator = Tesselator.getInstance();
         BufferBuilder bufferBuilder = tessellator.getBuilder();
-        bufferBuilder.begin(7, DefaultVertexFormat.POSITION_COLOR);
+        bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
         bufferBuilder.vertex(rectangle.getMaxX(), rectangle.getMinY(), helper.getBlitOffset()).color(r, g, b, a).endVertex();
         bufferBuilder.vertex(rectangle.getMinX(), rectangle.getMinY(), helper.getBlitOffset()).color(r, g, b, a).endVertex();
         bufferBuilder.vertex(rectangle.getMinX(), rectangle.getMaxY(), helper.getBlitOffset()).color(r, g, b, a).endVertex();
diff --git a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java
index 017fbf3cf..49d713518 100644
--- a/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java
+++ b/RoughlyEnoughItems-runtime/src/main/java/me/shedaniel/rei/impl/widgets/TexturedDrawableConsumer.java
@@ -31,7 +31,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;
-import org.lwjgl.opengl.GL11;
 
 public final class TexturedDrawableConsumer implements DrawableConsumer {
     
@@ -66,7 +65,7 @@ public final class TexturedDrawableConsumer implements DrawableConsumer {
     
     protected static void innerBlit(Matrix4f matrix, int xStart, int xEnd, int yStart, int yEnd, int z, float uStart, float uEnd, float vStart, float vEnd) {
         BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder();
-        bufferBuilder.begin(GL11.GL_QUADS, DefaultVertexFormat.POSITION_TEX);
+        bufferBuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX);
         bufferBuilder.vertex(matrix, xStart, yEnd, z).uv(uStart, vEnd).endVertex();
         bufferBuilder.vertex(matrix, xEnd, yEnd, z).uv(uEnd, vEnd).endVertex();
         bufferBuilder.vertex(matrix, xEnd, yStart, z).uv(uEnd, vStart).endVertex();
diff --git a/gradle.properties b/gradle.properties
index b5c2857a3..c52caaf65 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,12 +1,12 @@
 org.gradle.jvmargs=-Xmx3G
-mod_version=5.8.8
-supported_version=1.16.2/3/4
-minecraft_version=1.16.4
-fabricloader_version=0.10.6+build.214
-cloth_client_events_v0_version=1.4.5
-cloth_config_version=4.8.3
-modmenu_version=1.14.6+build.31
-fabric_api=0.17.0+build.393-1.16
+mod_version=6.0.0-alpha
+supported_version=20w49a
+minecraft_version=20w49a
+fabricloader_version=0.10.8
+cloth_client_events_v0_version=2.0.0
+cloth_config_version=5.0.0
+modmenu_version=2.0.0-beta.1+build.2
+fabric_api=0.28.0+1.17
 autoconfig1u=3.3.1
 api_include=me.shed