diff options
Diffstat (limited to 'src/main')
5 files changed, 13 insertions, 7 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java index 6a9048d2..6436cdba 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java +++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java @@ -3,6 +3,7 @@ package me.xmrvizzy.skyblocker; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock; import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonBlaze; +import me.xmrvizzy.skyblocker.utils.RenderUtils; import me.xmrvizzy.skyblocker.utils.Utils; import net.fabricmc.api.ClientModInitializer; import net.minecraft.client.MinecraftClient; @@ -27,10 +28,12 @@ public class SkyblockerMod implements ClientModInitializer { if (TICKS % 4 == 0) try { if(Utils.isDungeons){ - DungeonBlaze.DungeonBlaze(); + if (SkyblockerConfig.get().locations.dungeons.blazesolver) { + DungeonBlaze.DungeonBlaze(); + } } }catch(Exception e) { - // do nothing :)) + //System.out.println("Blazesolver: " + e); } if (TICKS % 20 == 0) { if (client.world != null && !client.isInSingleplayer()) diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 48fefa24..fd289c5d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -52,6 +52,7 @@ public class SkyblockerConfig implements ConfigData { public static class Dungeons { public boolean enableMap = true; public boolean solveThreeWeirdos = true; + public boolean blazesolver = true; } public static class DwarvenMines { diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java index f8a2a277..2653aeef 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/InGameHudMixin.java @@ -85,7 +85,7 @@ public abstract class InGameHudMixin extends DrawableHelper { if (Utils.isDungeons && SkyblockerConfig.get().locations.dungeons.enableMap) DungeonMap.render(matrices); - this.client.getTextureManager().bindTexture(DrawableHelper.GUI_ICONS_TEXTURE); + RenderSystem.setShaderTexture(0, GUI_ICONS_TEXTURE); } @Inject(method = "renderMountHealth", at = @At("HEAD"), cancellable = true) 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 3531094a..e0158bc5 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java @@ -8,6 +8,7 @@ import net.minecraft.item.FilledMapItem; import net.minecraft.item.ItemStack; import net.minecraft.item.map.MapState; import net.minecraft.nbt.NbtCompound; +import org.apache.commons.lang3.StringUtils; public class DungeonMap { @@ -19,17 +20,17 @@ public class DungeonMap { if (tag != null && tag.contains("map")) { String tag2 = tag.asString(); - tag2 = tag2.substring(tag2.indexOf(":") + 1, tag2.indexOf("}")); - int tagid = Integer.parseInt(tag2); + tag2 = StringUtils.substringBetween(tag2, "map:", "}"); + int mapid = Integer.parseInt(tag2); VertexConsumerProvider.Immediate vertices = client.getBufferBuilders().getEffectVertexConsumers(); MapRenderer map = client.gameRenderer.getMapRenderer(); - MapState state = FilledMapItem.getMapState(tagid, client.world); + MapState state = FilledMapItem.getMapState(mapid, client.world); if (state == null) return; matrices.push(); matrices.translate(2, 2, 0); matrices.scale(1, 1, 0); - map.draw(matrices, vertices, 15728880,state, false,15728880); + map.draw( matrices, vertices, mapid, state, false, 15728880); vertices.draw(); matrices.pop(); } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 14882563..b2ffaeba 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -13,6 +13,7 @@ "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Enable Map", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Solve Blaze Puzzle", "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Dwarven Mines", "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Enable Drill Fuel", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Solve Fetchur", |