diff --git a/pom.xml b/pom.xml index 8077581..b67db22 100644 --- a/pom.xml +++ b/pom.xml @@ -38,20 +38,20 @@ org.spigotmc spigot-api - 1.14-R0.1-SNAPSHOT + 1.16.1-R0.1-SNAPSHOT provided - + org.spigotmc spigot - 1.15.2-R0.1-SNAPSHOT + 1.16.1-R0.1-SNAPSHOT provided diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java index ee64e20..fa7447e 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/player/RTP.java @@ -6,10 +6,7 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.protection.managers.RegionManager; import me.SuperRonanCraft.BetterRTP.Main; import me.SuperRonanCraft.BetterRTP.references.file.FileBasics; -import me.SuperRonanCraft.BetterRTP.references.worlds.Custom; -import me.SuperRonanCraft.BetterRTP.references.worlds.Default; -import me.SuperRonanCraft.BetterRTP.references.worlds.PlayerWorld; -import me.SuperRonanCraft.BetterRTP.references.worlds.RTPWorld; +import me.SuperRonanCraft.BetterRTP.references.worlds.*; import me.ryanhamshire.GriefPrevention.GriefPrevention; import org.bukkit.*; import org.bukkit.block.Biome; @@ -33,6 +30,7 @@ public class RTP { private List disabledWorlds, blockList; private int maxAttempts, delayTime; private boolean cancelOnMove; + private HashMap world_type = new HashMap<>(); public RTP(Main pl) { this.pl = pl; @@ -60,6 +58,14 @@ public class RTP { for (Map m : map) for (Map.Entry entry : m.entrySet()) customWorlds.put(entry.getKey().toString(), new Custom(entry.getKey().toString())); + try { + List> world_map = config.getMapList("WorldType"); + for (Map m : world_map) + for (Map.Entry entry : m.entrySet()) + world_type.put(entry.getKey().toString(), RTP_WORLD_TYPE.valueOf(entry.getKey().toString())); + } catch (Exception e) { + //No World Types + } } public List disabledWorlds() { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/Custom.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/Custom.java index 18cb867..438236d 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/Custom.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/Custom.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Map; public class Custom implements RTPWorld { - public String world; + public String world, world_type; private boolean useWorldborder = false; private int CenterX, CenterZ, maxBorderRad, minBorderRad, price; private List Biomes; diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/Default.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/Default.java index 277b90a..eaffe67 100644 --- a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/Default.java +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/Default.java @@ -5,6 +5,7 @@ import me.SuperRonanCraft.BetterRTP.Main; import me.SuperRonanCraft.BetterRTP.references.file.FileBasics; import org.bukkit.Bukkit; +import java.util.HashMap; import java.util.List; public class Default implements RTPWorld { diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTP_WORLD_TYPE.java b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTP_WORLD_TYPE.java new file mode 100644 index 0000000..fc08461 --- /dev/null +++ b/src/main/java/me/SuperRonanCraft/BetterRTP/references/worlds/RTP_WORLD_TYPE.java @@ -0,0 +1,7 @@ +package me.SuperRonanCraft.BetterRTP.references.worlds; + +public enum RTP_WORLD_TYPE { + NORMAL, //Default + NETHER, //Nether world has different conditions + //END //End world type, not supported yet +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 699283f..3a209c5 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -24,6 +24,10 @@ Settings: CancelOnMove: true DisableUpdater: false +WorldType: # Available types are NETHER, NORMAL + - world: NORMAL + - world_nether: NETHER + Default: UseWorldBorder: true ## "Biomes: []" means all biomes are allowed! # @@ -75,6 +79,6 @@ CustomWorlds: ## Override a world and rtp a player executing the command in one world, to another Override: #FORMAT : - world_nether: 'world' - creative: 'world' + - world_nether: 'world' + - creative: 'world'