2.6.4 (#5170)

.github/workflows/java-17-builds.yml

@@ -1,6 +1,10 @@
 name: Java 17 CI (MC 1.17+)
 
-on: [push, pull_request]
+on:
+    push:
+        branches:
+            - master
+            - 'dev/**'
 
 jobs:
     build:

.github/workflows/java-8-builds.yml

@@ -1,6 +1,10 @@
 name: Java 8 CI (MC 1.13-1.16)
 
-on: [push, pull_request]
+on:
+    push:
+        branches:
+            - master
+            - 'dev/**'
 
 jobs:
     build:

.github/workflows/legacy-tests.yml

@@ -1,6 +1,10 @@
 name: Legacy Java 8 (MC 1.9.4-1.12.2)
 
-on: [push, pull_request]
+on:
+    push:
+        branches:
+            - master
+            - 'dev/**'
 
 jobs:
     build:

gradle.properties

@@ -1,6 +1,6 @@
 groupid=ch.njol
 name=skript
-version=2.6.3
+version=2.6.4
 jarName=Skript.jar
 testEnv=java17/paper-1.19
 testEnvJavaVersion=17

src/main/java/ch/njol/skript/aliases/ItemData.java

@@ -79,39 +79,18 @@ public static class OldItemData {
 
 	static final ItemFactory itemFactory = Bukkit.getServer().getItemFactory();
 
-	static final MaterialRegistry materialRegistry;
-
 	private static final boolean SPAWN_EGG_META_EXISTS = Skript.classExists("org.bukkit.inventory.meta.SpawnEggMeta");
 	private static final boolean HAS_NEW_SKULL_META_METHODS = Skript.methodExists(SkullMeta.class, "getOwningPlayer");
 
 	// Load or create material registry
 	static {
-		Gson gson = new GsonBuilder().registerTypeAdapterFactory(EnumTypeAdapter.factory).serializeNulls().create();
 		Path materialsFile = Paths.get(Skript.getInstance().getDataFolder().getAbsolutePath(), "materials.json");
 		if (Files.exists(materialsFile)) {
-			String content = null;
 			try {
-				content = new String(Files.readAllBytes(materialsFile), StandardCharsets.UTF_8);
+				Files.delete(materialsFile);
 			} catch (IOException e) {
-				Skript.exception(e, "Loading material registry failed!");
-			}
-			if (content != null) {
-				String[] names = gson.fromJson(content, String[].class);
-				assert names != null;
-				materialRegistry = MaterialRegistry.load(names);
-			} else {
-				materialRegistry = new MaterialRegistry();
+				Skript.exception(e, "Failed to remove legacy material registry file!");
 			}
-		} else {
-			materialRegistry = new MaterialRegistry();
-		}
-
-		// Always rewrite material registry, in case some updates got applied to it
-		String content = gson.toJson(materialRegistry.getMaterials());
-		try {
-			Files.write(materialsFile, content.getBytes(StandardCharsets.UTF_8));
-		} catch (IOException e) {
-			Skript.exception(e, "Saving material registry failed!");
 		}
 	}
 
@@ -142,7 +121,7 @@ public static class OldItemData {
 	 * allow comparing it against other blocks.
 	 */
 	@Nullable
-	transient BlockValues blockValues;
+	BlockValues blockValues;
 
 	/**
 	 * Whether this represents an item (that definitely cannot have
@@ -613,20 +592,24 @@ public boolean matchPlain(ItemData other) {
 	@Override
 	public Fields serialize() throws NotSerializableException {
 		Fields fields = new Fields(this); // ItemStack is transient, will be ignored
-		fields.putPrimitive("id", materialRegistry.getId(type));
+		fields.putPrimitive("id", type.ordinal());
 		fields.putObject("meta", stack.getItemMeta());
 		return fields;
 	}
 
+	private static final Material[] materials = Material.values();
+
 	@Override
 	public void deserialize(Fields fields) throws StreamCorruptedException, NotSerializableException {
-		this.type = materialRegistry.getMaterial(fields.getAndRemovePrimitive("id", int.class));
+		this.type = materials[fields.getAndRemovePrimitive("id", int.class)];
 		ItemMeta meta = fields.getAndRemoveObject("meta", ItemMeta.class);
 		fields.setFields(this); // Everything but ItemStack and Material
 
 		// Initialize ItemStack
 		this.stack = new ItemStack(type);
 		stack.setItemMeta(meta); // Just set meta to it
+
+		fields.setFields(this); // Everything but ItemStack and Material
 	}
 
 	/**

src/main/java/ch/njol/skript/aliases/MaterialRegistry.java

@@ -29,6 +29,7 @@
  * Manages Skript's own number -> Material mappings. They are used to save
  * items as variables.
  */
+@Deprecated
 public class MaterialRegistry {
 
 	static final boolean newMaterials = Skript.isRunningMinecraft(1, 13);

src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java

@@ -138,5 +138,20 @@ public static boolean itemStacksEqual(final @Nullable ItemStack is1, final @Null
 		return is1.getType() == is2.getType() && ItemUtils.getDamage(is1) == ItemUtils.getDamage(is2)
 			&& is1.getItemMeta().equals(is2.getItemMeta());
 	}
+
+	// Only 1.15 and versions after have Material#isAir method
+	private static final boolean IS_AIR_EXISTS = Skript.methodExists(Material.class, "isAir");
+	// Version 1.14 have multiple air types but no Material#isAir method
+	private static final boolean OTHER_AIR_EXISTS = Skript.isRunningMinecraft(1, 14);
+
+	public static boolean isAir(Material type) {
+		if (IS_AIR_EXISTS) {
+			return type.isAir();
+		} else if (OTHER_AIR_EXISTS) {
+			return type == Material.AIR || type == Material.CAVE_AIR || type == Material.VOID_AIR;
+		}
+		// All versions prior to 1.14 only have 1 air type
+		return type == Material.AIR;
+	}
 
 }

src/main/java/ch/njol/skript/bukkitutil/block/BlockValues.java

@@ -18,16 +18,14 @@
  */
 package ch.njol.skript.bukkitutil.block;
 
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.eclipse.jdt.annotation.Nullable;
-
 import ch.njol.skript.aliases.MatchQuality;
+import ch.njol.yggdrasil.YggdrasilSerializable.YggdrasilExtendedSerializable;
+import org.eclipse.jdt.annotation.Nullable;
 
 /**
  * Contains all data block has that is needed for comparisions.
  */
-public abstract class BlockValues {
+public abstract class BlockValues implements YggdrasilExtendedSerializable {
 
 	public abstract boolean isDefault();
 

src/main/java/ch/njol/skript/bukkitutil/block/MagicBlockCompat.java

@@ -18,6 +18,7 @@
  */
 package ch.njol.skript.bukkitutil.block;
 
+import java.io.StreamCorruptedException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
@@ -30,12 +31,15 @@
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.aliases.ItemFlags;
 import ch.njol.skript.aliases.MatchQuality;
 import ch.njol.skript.bukkitutil.ItemUtils;
+import ch.njol.skript.variables.Variables;
+import ch.njol.yggdrasil.Fields;
 
 /**
  * Block compatibility implemented with magic numbers. No other choice until
@@ -68,12 +72,21 @@ public class MagicBlockCompat implements BlockCompat {
 	}
 
 	@SuppressWarnings({"deprecation"})
-	private class MagicBlockValues extends BlockValues {
+	private static class MagicBlockValues extends BlockValues {
+
+		static {
+			Variables.yggdrasil.registerSingleClass(MagicBlockValues.class, "MagicBlockValues");
+		}
 
 		private Material id;
 		short data;
 		private int itemFlags;
 
+		/**
+		 * Used for serialization
+		 */
+		private MagicBlockValues() {}
+
 		public MagicBlockValues(BlockState block) {
 			this.id = ItemUtils.asItem(block.getType());
 			this.data = block.getRawData(); // Some black magic here, please look away...
@@ -131,6 +144,24 @@ public MatchQuality match(BlockValues other) {
 				return MatchQuality.DIFFERENT;
 			}
 		}
+
+		@Override
+		public Fields serialize() {
+			Fields fields = new Fields();
+			fields.putPrimitive("material", id.ordinal());
+			fields.putPrimitive("data", data);
+			fields.putPrimitive("itemFlags", itemFlags);
+			return fields;
+		}
+
+		private static final Material[] materials = Material.values();
+
+		@Override
+		public void deserialize(@NonNull Fields fields) throws StreamCorruptedException {
+			this.id = materials[fields.getAndRemovePrimitive("id", int.class)];
+			this.data = fields.getAndRemovePrimitive("data", Short.class);
+			this.itemFlags = fields.getAndRemovePrimitive("itemFlags", Integer.class);
+		}
 	}
 
 	private static class MagicBlockSetter implements BlockSetter {

src/main/java/ch/njol/skript/bukkitutil/block/NewBlockCompat.java

@@ -18,8 +18,12 @@
  */
 package ch.njol.skript.bukkitutil.block;
 
-import java.util.Map;
-
+import ch.njol.skript.Skript;
+import ch.njol.skript.aliases.Aliases;
+import ch.njol.skript.aliases.ItemType;
+import ch.njol.skript.aliases.MatchQuality;
+import ch.njol.skript.variables.Variables;
+import ch.njol.yggdrasil.Fields;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -34,12 +38,11 @@
 import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
-import ch.njol.skript.Skript;
-import ch.njol.skript.aliases.Aliases;
-import ch.njol.skript.aliases.ItemType;
-import ch.njol.skript.aliases.MatchQuality;
+import java.io.StreamCorruptedException;
+import java.util.Map;
 
 /**
  * 1.13+ block compat.
@@ -48,15 +51,26 @@ public class NewBlockCompat implements BlockCompat {
 
 	private static class NewBlockValues extends BlockValues {
 
+		static {
+			Variables.yggdrasil.registerSingleClass(NewBlockValues.class, "NewBlockValues");
+		}
+
 		Material type;
 		BlockData data;
 		boolean isDefault;
 
 		public NewBlockValues(Material type, BlockData data, boolean isDefault) {
+			if (type != data.getMaterial())
+				throw new IllegalArgumentException("'type' does not match material of 'data'");
 			this.type = type;
 			this.data = data;
 			this.isDefault = isDefault;
 		}
+
+		/**
+		 * For Serialization - INTERNAL USAGE ONLY!!
+		 */
+		private NewBlockValues() { }
 
 		@Override
 		public boolean isDefault() {
@@ -104,7 +118,26 @@ public MatchQuality match(BlockValues other) {
 				return MatchQuality.DIFFERENT;
 			}
 		}
-
+
+		@Override
+		public Fields serialize() {
+			Fields fields = new Fields();
+			fields.putObject("data", data.getAsString());
+			fields.putPrimitive("isDefault", isDefault);
+			return fields;
+		}
+
+		@Override
+		public void deserialize(@NonNull Fields fields) throws StreamCorruptedException {
+			String data = fields.getObject("data", String.class);
+			boolean isDefault = fields.getPrimitive("isDefault", Boolean.class);
+			if (data == null)
+				throw new StreamCorruptedException("'data' is missing.");
+
+			this.data = Bukkit.createBlockData(data);
+			this.type = this.data.getMaterial();
+			this.isDefault = isDefault;
+		}
 	}
 
 	private static class NewBlockSetter implements BlockSetter {