diff --git a/README.md b/README.md index 96e820cd2a..0a92ade4de 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ +

WARNING! This is a community made update for the mod!

SkyblockAddons

diff --git a/gradle.properties b/gradle.properties index f882ffb6b8..371df66f95 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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] diff --git a/src/main/java/codes/biscuit/skyblockaddons/gui/IslandWarpGui.java b/src/main/java/codes/biscuit/skyblockaddons/gui/IslandWarpGui.java index 6366bd8bac..9fb6e3f33f 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/gui/IslandWarpGui.java +++ b/src/main/java/codes/biscuit/skyblockaddons/gui/IslandWarpGui.java @@ -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; @@ -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(); } @@ -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), @@ -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; diff --git a/src/main/resources/assets/skyblockaddons/islands/thegarden.png b/src/main/resources/assets/skyblockaddons/islands/thegarden.png new file mode 100644 index 0000000000..3be30f8654 Binary files /dev/null and b/src/main/resources/assets/skyblockaddons/islands/thegarden.png differ