diff options
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock')
4 files changed, 16 insertions, 16 deletions
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); |