Update to 1.17

This release Updates the mod to mc version 1.17.
This is the first time i created/edited a mod.

11 files changed, 93 insertions, 59 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index cdf60eed..0bda79d6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -1,10 +1,10 @@
 package me.xmrvizzy.skyblocker.config;
 
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
-import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
-import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry;
-import me.sargunvohra.mcmods.autoconfig1u.serializer.GsonConfigSerializer;
+import me.shedaniel.autoconfig.AutoConfig;
+import me.shedaniel.autoconfig.ConfigData;
+import me.shedaniel.autoconfig.annotation.Config;
+import me.shedaniel.autoconfig.annotation.ConfigEntry;
+import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java b/src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java
index cd0c7ad2..f9d4e8fe 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/modmenu/ModMenuEntry.java
@@ -1,8 +1,8 @@
 package me.xmrvizzy.skyblocker.config.modmenu;
 
-import io.github.prospector.modmenu.api.ConfigScreenFactory;
-import io.github.prospector.modmenu.api.ModMenuApi;
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import me.shedaniel.autoconfig.AutoConfig;
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java
index 343794b1..5825b394 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ClientPlayerEntityMixin.java
@@ -29,6 +29,6 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
 
     @Inject(method = "dropSelectedItem", at = @At("HEAD"), cancellable = true)
     public void dropSelectedItem(boolean dropEntireStack, CallbackInfoReturnable<Boolean> cir) {
-        if (Utils.isSkyblock) HotbarSlotLock.handleDropSelectedItem(this.inventory.selectedSlot, cir);
+        if (Utils.isSkyblock) HotbarSlotLock.handleDropSelectedItem(this.getInventory().selectedSlot, cir);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
index eba58fd0..b2a6dab2 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java
@@ -1,5 +1,6 @@
 package me.xmrvizzy.skyblocker.mixin;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.skyblock.Attribute;
@@ -29,7 +30,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(InGameHud.class)
 public abstract class InGameHudMixin extends DrawableHelper {
     private static final Identifier SLOT_LOCK = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png");
-    private static final Identifier BARS = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/bars.png");
+    private static final Identifier BARS = new Identifier(SkyblockerMod.NAMESPACE,"textures/gui/bars.png");
 
     private MatrixStack hotbarMatrices;
     private int hotbarSlotIndex;
@@ -41,8 +42,8 @@ public abstract class InGameHudMixin extends DrawableHelper {
     private int scaledHeight;
     @Shadow
     private int scaledWidth;
-
-    @Shadow public abstract TextRenderer getFontRenderer();
+    @Shadow
+    public abstract TextRenderer getTextRenderer();
 
     @ModifyVariable(method = "setOverlayMessage(Lnet/minecraft/text/Text;Z)V", at = @At("HEAD"))
     private Text setOverlayMessage(Text message) {
@@ -61,10 +62,10 @@ public abstract class InGameHudMixin extends DrawableHelper {
     }
 
     @Inject(method = "renderHotbarItem", at = @At("HEAD"))
-    public void renderHotbarItem(int i, int j, float f, PlayerEntity player, ItemStack item, CallbackInfo ci) {
+    public void renderHotbarItem(int i, int j, float f, PlayerEntity player, ItemStack stack, int seed, CallbackInfo ci) {
         if (Utils.isSkyblock) {
             if (HotbarSlotLock.isLocked(hotbarSlotIndex)) {
-                this.client.getTextureManager().bindTexture(SLOT_LOCK);
+                RenderSystem.setShaderTexture(0,SLOT_LOCK);
                 this.drawTexture(hotbarMatrices, i, j, 0, 0,16, 16);
             }
             hotbarSlotIndex++;
@@ -108,7 +109,8 @@ public abstract class InGameHudMixin extends DrawableHelper {
         int xp = (int) (this.client.player.experienceProgress * 33.0F);
 
         // Icons
-        this.client.getTextureManager().bindTexture(BARS);
+//        this.client.getTextureManager().bindTexture(BARS);
+        RenderSystem.setShaderTexture(0,InGameHudMixin.BARS);
         this.drawTexture(matrices, left, top, 0, 0, 9, 9);
         this.drawTexture(matrices, left + 47, top, 9, 0, 7, 9);
         this.drawTexture(matrices, left + 92, top, 16, 0, 9, 9);
@@ -131,17 +133,20 @@ public abstract class InGameHudMixin extends DrawableHelper {
         renderText(matrices, Attribute.MANA.get(), left + 56, top, 5636095);
         renderText(matrices, Attribute.DEFENCE.get(), left + 103, top, 12106180);
         renderText(matrices, this.client.player.experienceLevel, left + 150, top, 8453920);
+
     }
 
     private void renderText(MatrixStack matrices, int value, int left, int top, int color) {
         String text = Integer.toString(value);
-        int x = left + (33 - this.getFontRenderer().getWidth(text)) / 2;
+        int x = left + (33 - this.getTextRenderer().getWidth(text)) / 2;
         int y = top - 3;
 
-        this.getFontRenderer().draw(matrices, text, (float) (x + 1), (float) y, 0);
-        this.getFontRenderer().draw(matrices, text, (float) (x - 1), (float) y, 0);
-        this.getFontRenderer().draw(matrices, text, (float) x, (float) (y + 1), 0);
-        this.getFontRenderer().draw(matrices, text, (float) x, (float) (y - 1), 0);
-        this.getFontRenderer().draw(matrices, text, (float) x, (float) y, color);
+        this.getTextRenderer().draw(matrices, text, (float) (x + 1), (float) y, 0);
+        this.getTextRenderer().draw(matrices, text, (float) (x - 1), (float) y, 0);
+        this.getTextRenderer().draw(matrices, text, (float) x, (float) (y + 1), 0);
+        this.getTextRenderer().draw(matrices, text, (float) x, (float) (y - 1), 0);
+        this.getTextRenderer().draw(matrices, text, (float) x, (float) y, color);
     }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemRendererMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemRendererMixin.java
index eaac1c9c..90f82da6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemRendererMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemRendererMixin.java
@@ -10,7 +10,7 @@ import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.LiteralText;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.Nullable;
@@ -32,7 +32,7 @@ public abstract class ItemRendererMixin {
 
         if (Utils.isSkyblock && SkyblockerConfig.get().locations.dwarvenMines.enableDrillFuel) {
             if (!stack.isEmpty()) {
-                CompoundTag tag = stack.getTag();
+                NbtCompound tag = stack.getNbt();
                 if (tag != null && tag.contains("ExtraAttributes")) {
                     if (tag.getCompound("ExtraAttributes").contains("drill_fuel")) {
                         float current = 3000.0F;
@@ -50,7 +50,7 @@ public abstract class ItemRendererMixin {
 
                         RenderSystem.disableDepthTest();
                         RenderSystem.disableTexture();
-                        RenderSystem.disableAlphaTest();
+//                        RenderSystem.disableAlphaTest();
                         RenderSystem.disableBlend();
                         Tessellator tessellator = Tessellator.getInstance();
                         BufferBuilder buffer = tessellator.getBuffer();
@@ -60,7 +60,7 @@ public abstract class ItemRendererMixin {
                         this.renderGuiQuad(buffer, x + 2, y + 13, 13, 2, 0,0,0,255);
                         this.renderGuiQuad(buffer, x + 2, y + 13, width, 1, rgb >> 16 & 255, rgb >> 8 & 255, rgb & 255, 255);
                         RenderSystem.enableBlend();
-                        RenderSystem.enableAlphaTest();
+//                        RenderSystem.enableAlphaTest();
                         RenderSystem.enableTexture();
                         RenderSystem.enableDepthTest();
                     }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java
index 42b9db1d..e9b2bfa3 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java
@@ -1,10 +1,10 @@
 package me.xmrvizzy.skyblocker.skyblock;
 
-import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
+import me.shedaniel.autoconfig.AutoConfig;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.option.KeyBinding;
 import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -32,8 +32,8 @@ public class HotbarSlotLock {
     public static void handleInputEvents(ClientPlayerEntity player) {
         while (hotbarSlotLock.wasPressed()) {
             List<Integer> lockedSlots = SkyblockerConfig.get().general.lockedSlots;
-            int selected = player.inventory.selectedSlot;
-            if (!isLocked(player.inventory.selectedSlot)) lockedSlots.add(selected);
+            int selected = player.getInventory().selectedSlot;
+            if (!isLocked(player.getInventory().selectedSlot)) lockedSlots.add(selected);
             else lockedSlots.remove(Integer.valueOf(selected));
             AutoConfig.getConfigHolder(SkyblockerConfig.class).save();
         }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
index 4d77f734..fd20c3a4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java
@@ -38,7 +38,7 @@ import net.minecraft.client.render.debug.DebugRenderer;
 import net.minecraft.client.render.debug.DebugRenderer.Renderer;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.client.util.math.Vector3f;
+import net.minecraft.util.math.Vec3f;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.mob.BlazeEntity;
 import net.minecraft.text.LiteralText;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
index 61e747d0..c6da694b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java
@@ -1,32 +1,32 @@
 package me.xmrvizzy.skyblocker.skyblock.dungeon;
 
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.MapRenderer;
+import net.minecraft.client.render.MapRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.map.MapState;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtCompound;
 
 public class DungeonMap {
 
     public static void render(MatrixStack matrices) {
         MinecraftClient client = MinecraftClient.getInstance();
         if (client.player == null && client.world == null) return;
-        ItemStack item = client.player.inventory.main.get(8);
-        CompoundTag tag = item.getTag();
+        ItemStack item = client.player.getInventory().main.get(8);
+        NbtCompound tag = item.getNbt();
 
         if (tag != null && tag.contains("map")) {
             VertexConsumerProvider.Immediate vertices = client.getBufferBuilders().getEffectVertexConsumers();
             MapRenderer map = client.gameRenderer.getMapRenderer();
-            MapState state = FilledMapItem.getMapState(item, client.world);
+            MapState state = FilledMapItem.getOrCreateMapState(item, client.world);
 
             if (state == null) return;
             matrices.push();
             matrices.translate(2, 2, 0);
             matrices.scale(1, 1, 0);
-            map.draw(matrices, vertices, state, false, 15728880);
+            map.draw(matrices, vertices, 15728880,state, false,15728880);
             vertices.draw();
             matrices.pop();
         }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
index c4c3fb9c..ff02c675 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -19,7 +19,7 @@ import java.util.zip.GZIPInputStream;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.LiteralText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -65,14 +65,14 @@ public class PriceInfoTooltip {
     }
     public static String getInternalNameForItem(ItemStack stack) {
         if(stack == null) return null;
-        CompoundTag tag = stack.getTag();
+        NbtCompound tag = stack.getNbt();
         return getInternalnameFromNBT(tag);
     }
 
-    public static String getInternalnameFromNBT(CompoundTag tag) {
+    public static String getInternalnameFromNBT(NbtCompound tag) {
         String internalname = null;
         if(tag != null && tag.contains("ExtraAttributes", 10)) {
-            CompoundTag  ea = tag.getCompound("ExtraAttributes");
+            NbtCompound  ea = tag.getCompound("ExtraAttributes");
 
             if(ea.contains("id", 8)) {
                 internalname = ea.getString("id").replaceAll(":", "-");
@@ -82,7 +82,7 @@ public class PriceInfoTooltip {
 
 
             if("ENCHANTED_BOOK".equals(internalname)) {
-                CompoundTag enchants = ea.getCompound("enchantments");
+                NbtCompound enchants = ea.getCompound("enchantments");
 
                 for(String enchname : enchants.getKeys()) {
                     internalname = enchname.toUpperCase() + ";" + enchants.getInt(enchname);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
index f88accab..472c41d6 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtils.java
@@ -26,14 +26,20 @@ public class RenderUtils {
         // Fill
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin(5, VertexFormats.POSITION_COLOR);
+
+        VertexFormat.DrawMode drawMode = VertexFormat.DrawMode.QUADS;
+        buffer.begin(drawMode, VertexFormats.POSITION_COLOR);
+
+//        buffer.begin(5, VertexFormats.POSITION_COLOR);
         WorldRenderer.drawBox(buffer,
                 box.minX, box.minY, box.minZ,
                 box.maxX, box.maxY, box.maxZ, r, g, b, a / 2f);
         tessellator.draw();
 
         // Outline
-        buffer.begin(3, VertexFormats.POSITION_COLOR);
+        buffer.begin(drawMode, VertexFormats.POSITION_COLOR);
+
+//        buffer.begin(3, VertexFormats.POSITION_COLOR);
         buffer.vertex(box.minX, box.minY, box.minZ).color(r, g, b, a).next();
         buffer.vertex(box.minX, box.minY, box.maxZ).color(r, g, b, a).next();
         buffer.vertex(box.maxX, box.minY, box.maxZ).color(r, g, b, a).next();
@@ -70,7 +76,11 @@ public class RenderUtils {
         float float_8 = (color2 & 255) / 255.0F;
         Tessellator tessellator_1 = Tessellator.getInstance();
         BufferBuilder bufferBuilder_1 = tessellator_1.getBuffer();
-        bufferBuilder_1.begin(7, VertexFormats.POSITION_COLOR);
+
+        VertexFormat.DrawMode drawMode = VertexFormat.DrawMode.QUADS;
+        bufferBuilder_1.begin(drawMode, VertexFormats.POSITION_COLOR);
+
+//        bufferBuilder_1.begin(7, VertexFormats.POSITION_COLOR);
         bufferBuilder_1.vertex(x1, y1, 0).color(float_2, float_3, float_4, float_1).next();
         bufferBuilder_1.vertex(x1, y2, 0).color(float_2, float_3, float_4, float_1).next();
         bufferBuilder_1.vertex(x2, y2, 0).color(float_6, float_7, float_8, float_5).next();
@@ -86,7 +96,10 @@ public class RenderUtils {
         BufferBuilder buffer = tessellator.getBuffer();
 
         // Outline
-        buffer.begin(3, VertexFormats.POSITION_COLOR);
+        VertexFormat.DrawMode drawMode = VertexFormat.DrawMode.QUADS;
+        buffer.begin(drawMode, VertexFormats.POSITION_COLOR);
+
+//        buffer.begin(3, VertexFormats.POSITION_COLOR);
         buffer.vertex(box.minX, box.minY, box.minZ).color(r, g, b, a).next();
         buffer.vertex(box.minX, box.minY, box.maxZ).color(r, g, b, a).next();
         buffer.vertex(box.maxX, box.minY, box.maxZ).color(r, g, b, a).next();
@@ -114,7 +127,11 @@ public class RenderUtils {
 
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin(3, VertexFormats.POSITION_COLOR);
+
+        VertexFormat.DrawMode drawMode = VertexFormat.DrawMode.QUADS;
+        buffer.begin(drawMode, VertexFormats.POSITION_COLOR);
+
+//        buffer.begin(3, VertexFormats.POSITION_COLOR);
         buffer.vertex(x1, y1, z1).color(r, g, b, 0.0F).next();
         buffer.vertex(x1, y1, z1).color(r, g, b, 1.0F).next();
         buffer.vertex(x2, y2, z2).color(r, g, b, 1.0F).next();
@@ -130,21 +147,26 @@ public class RenderUtils {
         float blue = (float) (color & 255) / 255.0F;
         final Tessellator tessellator = Tessellator.getInstance();
         final BufferBuilder bufferbuilder = tessellator.getBuffer();
-        GlStateManager.enableBlend();
-        GlStateManager.disableTexture();
-        GlStateManager.blendFuncSeparate(770, 771, 1, 0);
-        bufferbuilder.begin(7, VertexFormats.POSITION_COLOR);
+        GlStateManager._enableBlend();
+        GlStateManager._disableTexture();
+        GlStateManager._blendFuncSeparate(770, 771, 1, 0);
+
+        VertexFormat.DrawMode drawMode = VertexFormat.DrawMode.QUADS;
+        bufferbuilder.begin(drawMode, VertexFormats.POSITION_COLOR);
+
+//        bufferbuilder.begin(7, VertexFormats.POSITION_COLOR);
         bufferbuilder.vertex(x, h, 0.0D).color(red, green, blue, alpha).next();
         bufferbuilder.vertex(w, h, 0.0D).color(red, green, blue, alpha).next();
         bufferbuilder.vertex(w, y, 0.0D).color(red, green, blue, alpha).next();
         bufferbuilder.vertex(x, y, 0.0D).color(red, green, blue, alpha).next();
         tessellator.draw();
-        GlStateManager.enableTexture();
-        GlStateManager.disableBlend();
+        GlStateManager._enableTexture();
+        GlStateManager._disableBlend();
     }
 
     public static void offsetRender() {
-        Camera camera = BlockEntityRenderDispatcher.INSTANCE.camera;
+        //debg
+        Camera camera = MinecraftClient.getInstance().gameRenderer.getCamera();
         Vec3d camPos = camera.getPos();
         GL11.glRotated(MathHelper.wrapDegrees(camera.getPitch()), 1, 0, 0);
         GL11.glRotated(MathHelper.wrapDegrees(camera.getYaw() + 180.0), 0, 1, 0);
@@ -177,7 +199,10 @@ public class RenderUtils {
         final Tessellator tessellator = Tessellator.getInstance();
         final BufferBuilder bufferbuilder = tessellator.getBuffer();
 
-        bufferbuilder.begin(GL11.GL_TRIANGLE_FAN, VertexFormats.POSITION);
+        VertexFormat.DrawMode drawMode = VertexFormat.DrawMode.TRIANGLE_FAN;
+        bufferbuilder.begin(drawMode, VertexFormats.POSITION_COLOR);
+
+//        bufferbuilder.begin(GL11.GL_TRIANGLE_FAN, VertexFormats.POSITION);
 
         float alpha = (float) (color >> 24 & 255) / 255.0F;
         float red = (float) (color >> 16 & 255) / 255.0F;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
index a4c00499..6fca52a0 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/RenderUtilsLiving.java
@@ -22,6 +22,7 @@ package me.xmrvizzy.skyblocker.utils;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
 import net.minecraft.client.render.model.json.ModelTransformation.Mode;
 import net.minecraft.client.resource.language.I18n;
@@ -54,7 +55,11 @@ public class RenderUtilsLiving {
         GL11.glDisable(GL11.GL_TEXTURE_2D);
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder bufferbuilder = tessellator.getBuffer();
-        bufferbuilder.begin(7, VertexFormats.POSITION_COLOR);
+
+        VertexFormat.DrawMode drawMode = VertexFormat.DrawMode.QUADS;
+        bufferbuilder.begin(drawMode, VertexFormats.POSITION_COLOR);
+
+//        bufferbuilder.begin(7, VertexFormats.POSITION_COLOR);
         float f = mc.options.getTextBackgroundOpacity(0.25F);
         bufferbuilder.vertex(-i - 1, -1, 0.0D).color(red, green, blue, f).next();
         bufferbuilder.vertex(-i - 1, 8, 0.0D).color(red, green, blue, f).next();
@@ -76,8 +81,7 @@ public class RenderUtilsLiving {
 
         GL11.glTranslated(offX, offY, 0);
         if (item.getItem() instanceof BlockItem) GL11.glRotatef(180F, 1F, 180F, 10F);
-        mc.getItemRenderer().renderItem(new ItemStack(
-                item.getItem()), Mode.GUI, 0, 0, new MatrixStack(), mc.getBufferBuilders().getEntityVertexConsumers());
+        mc.getItemRenderer().renderItem(new ItemStack(item.getItem()), Mode.GUI, 0, 0, new MatrixStack(), mc.getBufferBuilders().getEntityVertexConsumers(),42);
         if (item.getItem() instanceof BlockItem) GL11.glRotatef(-180F, -1F, -180F, -10F);
         GL11.glDisable(GL11.GL_LIGHTING);
 
@@ -118,8 +122,8 @@ public class RenderUtilsLiving {
         RenderUtils.offsetRender();
         GL11.glTranslated(x, y, z);
         GL11.glNormal3f(0.0F, 1.0F, 0.0F);
-        GL11.glRotatef(-mc.player.yaw, 0.0F, 1.0F, 0.0F);
-        GL11.glRotatef(mc.player.pitch, 1.0F, 0.0F, 0.0F);
+        GL11.glRotatef(-mc.player.getYaw(), 0.0F, 1.0F, 0.0F);
+        GL11.glRotatef(mc.player.getPitch(), 1.0F, 0.0F, 0.0F);
         //GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glDisable(GL11.GL_DEPTH_TEST);