From fcd8f0bc7d72b48f2c4215209768d803cb1be7fc Mon Sep 17 00:00:00 2001 From: Peaches_MLG Date: Fri, 27 Dec 2024 19:57:41 +0000 Subject: [PATCH] Fixed more stuff --- .../iridiumskyblock/configs/Schematics.java | 23 ++++++++++--------- .../managers/IslandManager.java | 6 ++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/iridium/iridiumskyblock/configs/Schematics.java b/src/main/java/com/iridium/iridiumskyblock/configs/Schematics.java index b7f25abff..092107ecf 100644 --- a/src/main/java/com/iridium/iridiumskyblock/configs/Schematics.java +++ b/src/main/java/com/iridium/iridiumskyblock/configs/Schematics.java @@ -1,5 +1,6 @@ package com.iridium.iridiumskyblock.configs; +import com.cryptomorin.xseries.XBiome; import com.cryptomorin.xseries.XMaterial; import com.cryptomorin.xseries.XSound; import com.cryptomorin.xseries.reflection.XReflection; @@ -20,27 +21,27 @@ public class Schematics { public Map schematics = ImmutableMap.builder() .put("desert", new SchematicConfig(new Item(XMaterial.PLAYER_HEAD, 11, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNGY0OTNkZDgwNjUzM2Q5ZDIwZTg0OTUzOTU0MzY1ZjRkMzY5NzA5Y2ViYzlkZGVmMDIyZDFmZDQwZDg2YTY4ZiJ9fX0=", 1, "&9&lDesert Island", Arrays.asList("&7A starter desert island.", "", "&9&l[!] &7Costs $1000")), - new Schematics.Cost(0, new HashMap<>()), 1, -0.5, 89, -0.5, 90, new SchematicWorld(Biome.DESERT, + new Schematics.Cost(0, new HashMap<>()), 1, -0.5, 89, -0.5, 90, new SchematicWorld(XBiome.DESERT, "desert.schem", 90.0, true - ), new SchematicWorld(XReflection.supports(16) ? Biome.NETHER_WASTES : Biome.valueOf("NETHER"), + ), new SchematicWorld(XBiome.NETHER_WASTES, "desert_nether.schem", 90.0, true - ), new SchematicWorld(Biome.THE_END, + ), new SchematicWorld(XBiome.THE_END, "desert_end.schem", 90.0, true ))) .put("jungle", new SchematicConfig(new Item(XMaterial.PLAYER_HEAD, 13, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNjgzYWRmNDU2MGRlNDc0MTQwNDA5M2FjNjFjMzNmYjU1NmIzZDllZTUxNDBmNjIwMzYyNTg5ZmRkZWRlZmEyZCJ9fX0=", 1, "&9&lJungle Island", Arrays.asList("&7A starter jungle island.", "", "&9&l[!] &7Costs $1000")), - new Schematics.Cost(0, new HashMap<>()), 1, 1.5, 83, 1.5, 90, new SchematicWorld(Biome.JUNGLE, + new Schematics.Cost(0, new HashMap<>()), 1, 1.5, 83, 1.5, 90, new SchematicWorld(XBiome.JUNGLE, "jungle.schem", 90.0, true - ), new SchematicWorld(XReflection.supports(16) ? Biome.NETHER_WASTES : Biome.valueOf("NETHER"), + ), new SchematicWorld(XBiome.NETHER_WASTES, "jungle_nether.schem", 90.0, true - ), new SchematicWorld(Biome.THE_END, + ), new SchematicWorld(XBiome.THE_END, "jungle_end.schem", 90.0, true ))) .put("mushroom", new SchematicConfig(new Item(XMaterial.PLAYER_HEAD, 15, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZWE0NWQxYjQxN2NiZGRjMjE3NjdiMDYwNDRlODk5YjI2NmJmNzhhNjZlMjE4NzZiZTNjMDUxNWFiNTVkNzEifX19", 1, "&9&lMushroom Island", Arrays.asList("&7A starter mushroom island.", "", "&9&l[!] &7Costs $1000")), - new Schematics.Cost(0, new HashMap<>()), 1, 0.5, 89, -0.5, 90, new SchematicWorld(Biome.MUSHROOM_FIELDS, + new Schematics.Cost(0, new HashMap<>()), 1, 0.5, 89, -0.5, 90, new SchematicWorld(XBiome.MUSHROOM_FIELDS, "mushroom.schem", 90.0, true - ), new SchematicWorld(XReflection.supports(16) ? Biome.NETHER_WASTES : Biome.valueOf("NETHER"), + ), new SchematicWorld(XBiome.NETHER_WASTES, "mushroom_nether.schem", 90.0, true - ), new SchematicWorld(Biome.THE_END, + ), new SchematicWorld(XBiome.THE_END, "mushroom_end.schem", 90.0, true ))) .build(); @@ -68,12 +69,12 @@ public static class SchematicConfig { @NoArgsConstructor public static class SchematicWorld { - public Biome biome; + public XBiome biome; public String schematicID; public Double islandHeight; public Boolean ignoreAirBlocks; - public SchematicWorld(Biome biome, String schematicID, Double islandHeight, Boolean ignoreAirBlocks) { + public SchematicWorld(XBiome biome, String schematicID, Double islandHeight, Boolean ignoreAirBlocks) { this.biome = biome; this.schematicID = schematicID; this.islandHeight = islandHeight; diff --git a/src/main/java/com/iridium/iridiumskyblock/managers/IslandManager.java b/src/main/java/com/iridium/iridiumskyblock/managers/IslandManager.java index d7bfeeb91..8cf7196cb 100644 --- a/src/main/java/com/iridium/iridiumskyblock/managers/IslandManager.java +++ b/src/main/java/com/iridium/iridiumskyblock/managers/IslandManager.java @@ -253,9 +253,9 @@ public CompletableFuture generateIsland(Island island, Schematics.Schemati deleteIslandBlocks(island).join(); clearEntities(island); IridiumSkyblock.getInstance().getSchematicManager().pasteSchematic(island, schematicConfig).join(); - setIslandBiome(island, XBiome.of(schematicConfig.overworld.biome)); - setIslandBiome(island, XBiome.of(schematicConfig.nether.biome)); - setIslandBiome(island, XBiome.of(schematicConfig.end.biome)); + setIslandBiome(island, schematicConfig.overworld.biome); + setIslandBiome(island, schematicConfig.nether.biome); + setIslandBiome(island, schematicConfig.end.biome); }); }