Enable Version-Dependent Features for 1.18

Flo56958 · Dec 12, 2021 · dea4655 · dea4655
1 parent 82cf882
commit dea4655
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/main/java/de/flo56958/minetinker/MineTinker.java b/src/main/java/de/flo56958/minetinker/MineTinker.java
@@ -36,8 +36,8 @@ public void onEnable() {
 		plugin = this;
 		final String version = Bukkit.getVersion().split("MC: ")[1];
 		is16compatible = version.startsWith("1.16")
-				|| version.startsWith("1.17");
-		is17compatible = version.startsWith("1.17");
+				|| version.startsWith("1.17") || version.startsWith("1.18");
+		is17compatible = version.startsWith("1.17") || version.startsWith("1.18");
 		if (is16compatible) {
 			ChatWriter.log(false, "1.16 enhanced features activated!");
 		}

diff --git a/src/main/java/de/flo56958/minetinker/modifiers/types/Power.java b/src/main/java/de/flo56958/minetinker/modifiers/types/Power.java
@@ -135,16 +135,11 @@ public void reload() {
 
 		blacklist = new ArrayList<>();
 
-		List<String> blacklistConfig = config.getStringList("Blacklist");
+		final List<String> blacklistConfig = config.getStringList("Blacklist");
 
-		for (String mat : blacklistConfig) {
+		for (final String mat : blacklistConfig) {
 			try {
 				Material material = Material.valueOf(mat);
-
-				if (blacklist == null) {
-					continue;
-				}
-
 				blacklist.add(material);
 			} catch (IllegalArgumentException e) {
 				MineTinker.getPlugin().getLogger()
@@ -177,7 +172,7 @@ public void effect(WorldSaveEvent e) {
 	}
 
 	/**
-	 * The effect when a Block was brocken
+	 * The effect when a Block was broken
 	 *
 	 * @param event The Event
 	 */