diff options
| author | Serhan <serhanduzce@gmail.com> | 2023-05-13 22:49:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 22:49:33 +0300 |
| commit | f32aecfc1bb89d0e383da1364ecb06ac9c22cf50 (patch) | |
| tree | 194372d820952224f4b0c90c87d9762624b05138 /src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon | |
| parent | 6e58eddaab6d2830976ee06ae1f3b2801308408c (diff) | |
| parent | 076ba90b23db2ae3df3f5c3918ccda836ad90690 (diff) | |
| download | Skyblocker-f32aecfc1bb89d0e383da1364ecb06ac9c22cf50.tar.gz Skyblocker-f32aecfc1bb89d0e383da1364ecb06ac9c22cf50.tar.bz2 Skyblocker-f32aecfc1bb89d0e383da1364ecb06ac9c22cf50.zip | |
Merge branch 'SkyblockerMod:master' into minor-updates
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java | 7 | ||||
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java | 2 |
2 files changed, 6 insertions, 3 deletions
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 e0158bc5..dda8da41 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java @@ -1,5 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; +import org.apache.commons.lang3.StringUtils; + +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.MapRenderer; import net.minecraft.client.render.VertexConsumerProvider; @@ -8,7 +11,6 @@ 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 { @@ -25,11 +27,12 @@ public class DungeonMap { VertexConsumerProvider.Immediate vertices = client.getBufferBuilders().getEffectVertexConsumers(); MapRenderer map = client.gameRenderer.getMapRenderer(); MapState state = FilledMapItem.getMapState(mapid, client.world); + float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling; if (state == null) return; matrices.push(); matrices.translate(2, 2, 0); - matrices.scale(1, 1, 0); + matrices.scale(scaling, scaling, 0f); map.draw( matrices, vertices, mapid, state, false, 15728880); vertices.draw(); matrices.pop(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java index 81bee4ba..10a2e413 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java @@ -69,7 +69,7 @@ public class Trivia extends ChatPatternListener { answers.put("What is the status of Storm?", new String[]{"The Wither Lords"}); answers.put("What is the status of Necron?", new String[]{"The Wither Lords"}); answers.put("What is the status of Maxor, Storm, Goldor and Necron?", new String[]{"The Wither Lords"}); - answers.put("How many total Fairy Souls are there?", new String[]{"239 Fairy Souls"}); + answers.put("How many total Fairy Souls are there?", new String[]{"240 Fairy Souls"}); answers.put("How many Fairy Souls are there in Spider's Den?", new String[]{"19 Fairy Souls"}); answers.put("How many Fairy Souls are there in The End?", new String[]{"12 Fairy Souls"}); answers.put("How many Fairy Souls are there in The Farming Islands?", new String[]{"20 Fairy Souls"}); |