Skip to content

Commit

Permalink
Warp fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Chri6s committed May 15, 2024
1 parent dd20082 commit 8d77901
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<!--suppress HtmlDeprecatedAttribute -->
<h2 align="center">WARNING! This is a community made update for the mod!</h2>
<h1 align="center">SkyblockAddons</h1>

<p align="center">
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
org.gradle.jvmargs=-Xmx2G

# SkyblockAddons Properties
version=1.7.3
version=1.7.4
# Set by CI
buildNumber=0
acceptedMinecraftVersions=[1.8.9]
Expand Down
21 changes: 15 additions & 6 deletions src/main/java/codes/biscuit/skyblockaddons/gui/IslandWarpGui.java
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,11 @@ public enum Island {
DEEP_CAVERNS("Deep Caverns", 1400, 200),
GOLD_MINE("Gold Mine", 1130, 475),
MUSHROOM_DESERT("Mushroom Desert", 1470, 475),
THE_BARN("The Barn", 1125, 800),
THE_BARN("The Barn", 1125, 830),
HUB("Hub", 300, 724),
PRIVATE_ISLAND("Private Island", 275, 1122),
DUNGEON_HUB("Dungeon Hub", 1500, 1050);
DUNGEON_HUB("Dungeon Hub", 1500, 1050),
THE_GARDEN("The Garden", 10, 870);

private final String label;
private final int x;
Expand All @@ -328,11 +329,15 @@ public enum Island {
bufferedImage = TextureUtil.readBufferedImage(Minecraft.getMinecraft().getResourceManager().getResource(this.resourceLocation).getInputStream());
this.w = bufferedImage.getWidth();
this.h = bufferedImage.getHeight();

if (label.equals("The End")) {
IslandWarpGui.IMAGE_SCALED_DOWN_FACTOR = this.w/573F; // The original end HD texture is 573 pixels wide.

switch(label) {
case "The End":
IslandWarpGui.IMAGE_SCALED_DOWN_FACTOR = this.w/573F; // The original end HD texture is 573 pixels wide.
break;
case "The Garden":
IslandWarpGui.IMAGE_SCALED_DOWN_FACTOR = this.w/300F;
break;
}

} catch (IOException ex) {
ex.printStackTrace();
}
Expand Down Expand Up @@ -360,6 +365,7 @@ public enum Marker {
CRYPT("crypt", "Crypts", Island.HUB, 550, 100),
DUNGEON_HUB("dungeon_hub", "Dungeon Hub", Island.HUB, false, 400, 175),
MUSEUM("museum", "Museum", Island.HUB, true, 310, 200),
WIZARD("wizard", "Wizard", Island.HUB, true, 472, 210),

SPIDERS_DEN("spider", Translations.getMessage("warpMenu.spawn"), Island.SPIDERS_DEN, true, 345, 240),
SPIDERS_DEN_NEST("nest", "Top of Nest", Island.SPIDERS_DEN, 450, 30),
Expand Down Expand Up @@ -387,10 +393,13 @@ public enum Marker {
DEEP_CAVERNS("deep", Translations.getMessage("warpMenu.spawn"), Island.DEEP_CAVERNS, true, 97, 213),
DWARVEN_MINES("mines", "Dwarven Mines", Island.DEEP_CAVERNS, false, 280, 205),
DWARVEN_FORGE("forge", "Forge", Island.DEEP_CAVERNS, true, 260, 280),
DWARVEN_BASE_CAMP("glacite", "Dwarven Base Camp", Island.DEEP_CAVERNS, true, 110, 300),
CRYSTAL_HOLLOWS("crystals", "Crystal Hollows", Island.DEEP_CAVERNS, true, 220, 350),
CRYSTAL_NUCLEUS("nucleus", "Crystal Nucleus", Island.DEEP_CAVERNS, true, 170, 380),

DUNGEON_HUB_ISLAND("dungeon_hub", Translations.getMessage("warpMenu.spawn"), Island.DUNGEON_HUB, false, 35, 80),

GARDEN("garden", "The Garden", Island.THE_GARDEN, false, 150, 90),
;

private final String warpName;
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8d77901

Please sign in to comment.