Merge branch 'master' into null-world-biome-set-fix

Iridium-Development · Jan 14, 2024 · 2c65d9d · 2c65d9d
2 parents 743dff5 + 03e1833
commit 2c65d9d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/src/main/java/com/iridium/iridiumskyblock/IridiumSkyblock.java b/src/main/java/com/iridium/iridiumskyblock/IridiumSkyblock.java
@@ -1,5 +1,6 @@
 package com.iridium.iridiumskyblock;
 
+import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
 import com.iridium.iridiumskyblock.configs.*;
 import com.iridium.iridiumskyblock.database.Island;
 import com.iridium.iridiumskyblock.database.User;
@@ -140,6 +141,7 @@ public void registerListeners() {
         Bukkit.getPluginManager().registerEvents(new PlayerPortalListener(), this);
         Bukkit.getPluginManager().registerEvents(new PlayerInteractListener(), this);
         Bukkit.getPluginManager().registerEvents(new EntityDamageListener(), this);
+        if(!XMaterial.supports(15)) Bukkit.getPluginManager().registerEvents(new PortalCreateListener(), this);
     }
 
     @Override

diff --git a/src/main/java/com/iridium/iridiumskyblock/configs/Schematics.java b/src/main/java/com/iridium/iridiumskyblock/configs/Schematics.java
@@ -19,23 +19,23 @@ public class Schematics {
             .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(1000, new HashMap<>()), -0.5, 89, -0.5, 90, new SchematicWorld(Biome.DESERT,
                     "desert.schem", 90.0, true
-            ), new SchematicWorld(Biome.NETHER_WASTES,
+            ), new SchematicWorld(XMaterial.supports(16) ? Biome.NETHER_WASTES : Biome.valueOf("NETHER"),
                     "desert_nether.schem", 90.0, true
             ), new SchematicWorld(Biome.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(1000, new HashMap<>()), 1.5, 83, 1.5, 90, new SchematicWorld(Biome.JUNGLE,
                     "jungle.schem", 90.0, true
-            ), new SchematicWorld(Biome.NETHER_WASTES,
+            ), new SchematicWorld(XMaterial.supports(16) ? Biome.NETHER_WASTES : Biome.valueOf("NETHER"),
                     "jungle_nether.schem", 90.0, true
             ), new SchematicWorld(Biome.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(1000, new HashMap<>()), 0.5, 89, -0.5, 90, new SchematicWorld(Biome.MUSHROOM_FIELDS,
                     "mushroom.schem", 90.0, true
-            ), new SchematicWorld(Biome.NETHER_WASTES,
+            ), new SchematicWorld(XMaterial.supports(16) ? Biome.NETHER_WASTES : Biome.valueOf("NETHER"),
                     "mushroom_nether.schem", 90.0, true
             ), new SchematicWorld(Biome.THE_END,
                     "mushroom_end.schem", 90.0, true

diff --git a/src/main/java/com/iridium/iridiumskyblock/listeners/PlayerPortalListener.java b/src/main/java/com/iridium/iridiumskyblock/listeners/PlayerPortalListener.java
@@ -1,5 +1,6 @@
 package com.iridium.iridiumskyblock.listeners;
 
+import com.iridium.iridiumcore.dependencies.xseries.XMaterial;
 import com.iridium.iridiumcore.utils.StringUtils;
 import com.iridium.iridiumskyblock.IridiumSkyblock;
 import com.iridium.iridiumskyblock.utils.LocationUtils;
@@ -62,6 +63,8 @@ public void onPlayerPortal(PlayerPortalEvent event) {
                     event.setCancelled(true);
                     return;
                 }
+                location.setY(location.getY() + 1);
+                if(XMaterial.supports(15)) event.setCanCreatePortal(false);
                 event.setTo(location);
             }
         });

diff --git a/src/main/java/com/iridium/iridiumskyblock/listeners/PortalCreateListener.java b/src/main/java/com/iridium/iridiumskyblock/listeners/PortalCreateListener.java
@@ -0,0 +1,16 @@
+package com.iridium.iridiumskyblock.listeners;
+
+import com.iridium.iridiumskyblock.api.IridiumSkyblockAPI;
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.world.PortalCreateEvent;
+
+public class PortalCreateListener implements Listener {
+    @EventHandler
+    public void onPortalCreate(PortalCreateEvent event){
+        if (event.getWorld().equals(IridiumSkyblockAPI.getInstance().getEndWorld()) && event.getBlocks().stream().anyMatch(blockState -> blockState.getType().equals(Material.OBSIDIAN))) {
+            event.setCancelled(true);
+        }
+    }
+}
diff --git a/src/main/resources/jungle.schem b/src/main/resources/jungle.schem