World Updates

src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

@@ -146,80 +146,6 @@ protected boolean canBeInstantiated() {
 					}
 				}).cloner(BlockData::clone));
 
-		Classes.registerClass(new ClassInfo<>(World.class, "world")
-				.user("worlds?")
-				.name("World")
-				.description("One of the server's worlds. Worlds can be put into scripts by surrounding their name with double quotes, e.g. \"world_nether\", " +
-						"but this might not work reliably as <a href='#string'>text</a> uses the same syntax.")
-				.usage("<code>\"world_name\"</code>, e.g. \"world\"")
-				.examples("broadcast \"Hello!\" to the world \"world_nether\"")
-				.since("1.0, 2.2 (alternate syntax)")
-				.after("string")
-				.defaultExpression(new EventValueExpression<>(World.class))
-				.parser(new Parser<World>() {
-					@SuppressWarnings("null")
-					private final Pattern parsePattern = Pattern.compile("(?:(?:the )?world )?\"(.+)\"", Pattern.CASE_INSENSITIVE);
-
-					@Override
-					@Nullable
-					public World parse(final String s, final ParseContext context) {
-						// REMIND allow shortcuts '[over]world', 'nether' and '[the_]end' (server.properties: 'level-name=world') // inconsistent with 'world is "..."'
-						if (context == ParseContext.COMMAND || context == ParseContext.PARSE || context == ParseContext.CONFIG)
-							return Bukkit.getWorld(s);
-						final Matcher m = parsePattern.matcher(s);
-						if (m.matches())
-							return Bukkit.getWorld(m.group(1));
-						return null;
-					}
-
-					@Override
-					public String toString(World world, int flags) {
-						return world.getName();
-					}
-
-					@Override
-					public String toVariableNameString(World world) {
-						return world.getName();
-					}
-				}).serializer(new Serializer<>() {
-					@Override
-					public Fields serialize(World world) {
-						return Fields.singletonObject("name", world.getName());
-					}
-
-					@Override
-					public boolean canBeInstantiated() {
-						return false;
-					}
-
-					@Override
-					protected World deserialize(Fields fields) throws StreamCorruptedException {
-						String name = fields.getObject("name", String.class);
-						assert name != null;
-						World world = Bukkit.getWorld(name);
-						if (world == null)
-							throw new StreamCorruptedException("Missing world " + name);
-						return world;
-					}
-
-					// return w.getName();
-					@Override
-					@Nullable
-					public World deserialize(final String s) {
-						return Bukkit.getWorld(s);
-					}
-
-					@Override
-					public boolean mustSyncDeserialization() {
-						return true;
-					}
-				})
-				.property(Property.NAME,
-					"A world's name, as text. Cannot be changed.",
-					Skript.instance(),
-					ExpressionPropertyHandler.of(World::getName, String.class)
-				));
-
 		Classes.registerClass(new EnumClassInfo<>(InventoryAction.class, "inventoryaction", "inventory actions")
 				.user("inventory ?actions?")
 				.name("Inventory Action")
@@ -535,12 +461,6 @@ public String toVariableNameString(FireworkEffect effect) {
 					}
 				}));
 
-		Classes.registerClass(new EnumClassInfo<>(Difficulty.class, "difficulty", "difficulties")
-				.user("difficult(y|ies)")
-				.name("Difficulty")
-				.description("The difficulty of a <a href='#world'>world</a>.")
-				.since("2.3"));
-
 		Classes.registerClass(new EnumClassInfo<>(Status.class, "resourcepackstate", "resource pack states")
 				.user("resource ?pack ?states?")
 				.name("Resource Pack State")
@@ -609,19 +529,6 @@ public String[] getPatterns() {
 					"NOTE: Minecraft namespaces are supported, ex: 'minecraft:generic.attack_damage'.")
 				.since("2.5"));
 
-		Classes.registerClass(new EnumClassInfo<>(Environment.class, "environment", "environments")
-				.user("(world ?)?environments?")
-				.name("World Environment")
-				.description("Represents the environment of a world.")
-				.since("2.7"));
-
-		if (Skript.classExists("io.papermc.paper.world.MoonPhase"))
-			Classes.registerClass(new EnumClassInfo<>(MoonPhase.class, "moonphase", "moon phases")
-					.user("(lunar|moon) ?phases?")
-					.name("Moon Phase")
-					.description("Represents the phase of a moon.")
-					.since("2.7"));
-
 		if (Skript.classExists("org.bukkit.event.player.PlayerQuitEvent$QuitReason"))
 			Classes.registerClass(new EnumClassInfo<>(QuitReason.class, "quitreason", "quit reasons")
 					.user("(quit|disconnect) ?(reason|cause)s?")

src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java

@@ -79,8 +79,7 @@ public final class BukkitEventValues {
 	private static final ItemStack AIR_IS = new ItemStack(Material.AIR);
 
 	public static void register(EventValueRegistry registry) {
-		// === WorldEvents ===
-		registry.register(EventValue.simple(WorldEvent.class, World.class, WorldEvent::getWorld));
+
 		// StructureGrowEvent - a WorldEvent
 		registry.register(EventValue.simple(StructureGrowEvent.class, Block.class, event -> event.getLocation().getBlock()));
 
@@ -103,10 +102,6 @@ public static void register(EventValueRegistry registry) {
 				.toArray(Block[]::new))
 			.time(Time.FUTURE)
 			.build());
-		// WeatherEvent - not a WorldEvent (wtf ô_Ô)
-		registry.register(EventValue.simple(WeatherEvent.class, World.class, WeatherEvent::getWorld));
-		// ChunkEvents
-		registry.register(EventValue.simple(ChunkEvent.class, Chunk.class, ChunkEvent::getChunk));
 
 		// === BlockEvents ===
 		registry.register(EventValue.simple(BlockEvent.class, Block.class, BlockEvent::getBlock));
@@ -301,8 +296,6 @@ public PotionEffectType convert(AreaEffectCloudApplyEvent event) {
 		}));
 		// ItemSpawnEvent
 		registry.register(EventValue.simple(ItemSpawnEvent.class, ItemStack.class, event -> event.getEntity().getItemStack()));
-		// LightningStrikeEvent
-		registry.register(EventValue.simple(LightningStrikeEvent.class, Entity.class, LightningStrikeEvent::getLightning));
 		// EndermanAttackPlayerEvent
 		if (Skript.classExists("com.destroystokyo.paper.event.entity.EndermanAttackPlayerEvent")) {
 			registry.register(EventValue.simple(EndermanAttackPlayerEvent.class, Player.class, EndermanAttackPlayerEvent::getPlayer));
@@ -554,14 +547,7 @@ else if (hand == EquipmentSlot.OFF_HAND)
 		registry.register(EventValue.simple(InventoryPickupItemEvent.class, Inventory.class, InventoryPickupItemEvent::getInventory));
 		registry.register(EventValue.simple(InventoryPickupItemEvent.class, Item.class, InventoryPickupItemEvent::getItem));
 		registry.register(EventValue.simple(InventoryPickupItemEvent.class, ItemStack.class, event -> event.getItem().getItemStack()));
-		//PortalCreateEvent
-		registry.register(EventValue.simple(PortalCreateEvent.class, World.class, WorldEvent::getWorld));
-		registry.register(EventValue.simple(PortalCreateEvent.class, Block[].class, event -> event.getBlocks().stream()
-			.map(BlockState::getBlock)
-			.toArray(Block[]::new)));
-		if (Skript.methodExists(PortalCreateEvent.class, "getEntity")) { // Minecraft 1.14+
-			registry.register(EventValue.simple(PortalCreateEvent.class, Entity.class, PortalCreateEvent::getEntity));
-		}
+
 		//PlayerEditBookEvent
 		registry.register(EventValue.builder(PlayerEditBookEvent.class, ItemStack.class)
 			.getter(event -> {

src/main/java/ch/njol/skript/classes/data/DefaultComparators.java

@@ -367,19 +367,6 @@ public boolean supportsOrdering() {
 		// OfflinePlayer - UUID
 		Comparators.registerComparator(OfflinePlayer.class, UUID.class, (player, uuid) -> Relation.get(player.getUniqueId().equals(uuid)));
 
-		// World - String
-		Comparators.registerComparator(World.class, String.class, new Comparator<World, String>() {
-			@Override
-			public Relation compare(World w, String name) {
-				return Relation.get(w.getName().equalsIgnoreCase(name));
-			}
-
-			@Override
-			public boolean supportsOrdering() {
-				return false;
-			}
-		});
-
 		// String - String
 		Comparators.registerComparator(String.class, String.class, new Comparator<String, String>() {
 			@Override

src/main/java/ch/njol/skript/conditions/CondPvP.java

@@ -14,6 +14,8 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
+import static org.skriptlang.skript.lang.script.ScriptWarning.printDeprecationWarning;
+
 @Name("PvP")
 @Description("Checks the PvP state of a world.")
 @Example("PvP is enabled")

src/main/java/ch/njol/skript/effects/EffPvP.java

@@ -14,6 +14,8 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 
+import static org.skriptlang.skript.lang.script.ScriptWarning.printDeprecationWarning;
+
 @Name("PvP")
 @Description("Set the PvP state for a given world.")
 @Example("enable PvP #(current world only)")