diff options
| author | Yasin <LifeIsAParadox@users.noreply.github.com> | 2023-09-22 23:17:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 23:17:11 +0200 |
| commit | dbdb0598086a4d31018294f87026da517ceb0ce2 (patch) | |
| tree | 0df6b352acdef90569dd63630c5a61663a45075a /src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon | |
| parent | 2eab021f679fc91f87a344ac24c3db084f415670 (diff) | |
| parent | a72371d944c2fb5f311339bf20cd74f8d7bed967 (diff) | |
| download | Skyblocker-dbdb0598086a4d31018294f87026da517ceb0ce2.tar.gz Skyblocker-dbdb0598086a4d31018294f87026da517ceb0ce2.tar.bz2 Skyblocker-dbdb0598086a4d31018294f87026da517ceb0ce2.zip | |
Merge pull request #324 from SkyblockerMod/1.20.2
1.20.2
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java index f0ae1590..d4fe812b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java @@ -21,7 +21,7 @@ public class DungeonMapConfigScreen extends Screen { @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); - renderBackground(context); + renderBackground(context, mouseX, mouseY, delta); DungeonMap.renderHUDMap(context, hudX, hudY); context.drawCenteredTextWithShadow(textRenderer, "Right Click To Reset Position", width >> 1, height >> 1, Color.GRAY.getRGB()); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java index 13789fe1..91de7a1d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java @@ -2,7 +2,7 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import net.minecraft.block.Block; -import net.minecraft.block.enums.WallMountLocation; +import net.minecraft.block.enums.BlockFace; import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; @@ -13,13 +13,13 @@ public class OldLever { protected static final VoxelShape EAST_SHAPE = Block.createCuboidShape(0.0D, 3.0D, 5.0D, 6.0D, 13.0D, 11.0D); protected static final VoxelShape WEST_SHAPE = Block.createCuboidShape(10.0D, 3.0D, 5.0D, 16.0D, 13.0D, 11.0D); - public static VoxelShape getShape(WallMountLocation wallMountLocation, Direction direction) { + public static VoxelShape getShape(BlockFace face, Direction direction) { if (!SkyblockerConfig.get().general.hitbox.oldLeverHitbox) return null; - if (wallMountLocation == WallMountLocation.FLOOR) { + if (face == BlockFace.FLOOR) { return FLOOR_SHAPE; - } else if (wallMountLocation == WallMountLocation.WALL) { + } else if (face == BlockFace.WALL) { switch (direction) { case EAST -> { return EAST_SHAPE; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java index b56b2827..04cde662 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/DungeonMapUtils.java @@ -44,8 +44,8 @@ public class DungeonMapUtils { @Nullable private static Vector2i getMapPlayerPos(MapState map) { for (MapIcon icon : map.getIcons()) { - if (icon.getType() == MapIcon.Type.FRAME) { - return new Vector2i((icon.getX() >> 1) + 64, (icon.getZ() >> 1) + 64); + if (icon.type() == MapIcon.Type.FRAME) { + return new Vector2i((icon.x() >> 1) + 64, (icon.z() >> 1) + 64); } } return null; |
