Merge pull request #7 from Th3Shadowbroker/feature/material-restricti…

…on-list

Feature/material restriction list

pom.xml

@@ -34,7 +34,7 @@
 
     <groupId>org.inventivetalent</groupId>
     <artifactId>bookshelves</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
 
 
     <build>

resources/config.yml

@@ -8,4 +8,21 @@ inventory:
 disabledWorlds: []
 
 # Whether to allow only books in shelves
-onlyBooks: true
+onlyBooks: true
+
+# Material-restrictions
+# IMPORTANT: Restrictions only work when onlyBooks is set to false
+restrictions:
+
+  # When true restrictions will be enabled
+  enabled: false
+
+  # When true the material-list will be used as whitelist
+  whitelist: true
+
+  # Define the restricted/whitelisted materials below
+  materials:
+    - BOOK
+    - WRITABLE_BOOK
+    - WRITTEN_BOOK
+    - ENCHANTED_BOOK

src/org/inventivetalent/bookshelves/Bookshelves.java

@@ -32,6 +32,8 @@ public class Bookshelves extends JavaPlugin {
 	Set<String> disabledWorlds  = new HashSet<>();
 	boolean     onlyBooks       = true;
 	boolean     worldGuardSupport = false;
+	boolean checkRestrictions = false;
+	RestrictionManager restrictionManager = null;
 
 	Set<Location> shelves   = new HashSet<>();
 	File          shelfFile = new File(getDataFolder(), "shelves.json");
@@ -50,6 +52,7 @@ public void onEnable() {
 		instance = this;
 		Bukkit.getPluginManager().registerEvents(new ShelfListener(this), this);
 
+		// Save configuration & load values
 		saveDefaultConfig();
 		INVENTORY_SIZE = getConfig().getInt("inventory.size");
 		if (INVENTORY_SIZE % 9 != 0) {
@@ -59,7 +62,14 @@ public void onEnable() {
 		INVENTORY_TITLE = ChatColor.translateAlternateColorCodes('&', getConfig().getString("inventory.title")) +/* Unique title */"§B§S";
 		if (getConfig().contains("disabledWorlds")) { disabledWorlds.addAll(getConfig().getStringList("disabledWorlds")); }
 		onlyBooks = getConfig().getBoolean("onlyBooks", true);
+		checkRestrictions = getConfig().getBoolean("restrictions.enabled");
 
+		// Initialize restrictions
+		if (checkRestrictions) {
+			restrictionManager = new RestrictionManager();
+		}
+
+		// GriefPrevention compatibility
 		if (Bukkit.getPluginManager().isPluginEnabled("GriefPrevention")) {
 			getLogger().info("Found GriefPrevention plugin");
 			try {
@@ -87,6 +97,7 @@ public void onEnable() {
 			}
 		}
 
+		// ShelfFile creation
 		if (!shelfFile.exists()) {
 			try {
 				shelfFile.createNewFile();
@@ -95,6 +106,7 @@ public void onEnable() {
 			}
 		}
 
+		// Schedule bookshelf loading
 		Bukkit.getScheduler().runTaskLater(this, new Runnable() {
 			@Override
 			public void run() {
@@ -192,7 +204,7 @@ public void onDisable() {
 	}
 
 	boolean isValidBook(ItemStack itemStack) {
-		if (!onlyBooks) { return true; }
+		if (!onlyBooks) { return checkRestrictions ? restrictionManager.isRestricted(itemStack.getType()) : true; }
 
 		if (itemStack == null) { return false; }
 		if (itemStack.getType() == Material.BOOK) { return true; }

src/org/inventivetalent/bookshelves/RestrictionManager.java

@@ -0,0 +1,37 @@
+package org.inventivetalent.bookshelves;
+
+import org.bukkit.Material;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class RestrictionManager {
+
+    private final boolean whitelist;
+
+    private final List<Material> materials = new ArrayList<>();
+
+    public RestrictionManager() {
+        this.whitelist = Bookshelves.instance.getConfig().getBoolean("restrictions.whitelist");
+
+        Bookshelves.instance.getConfig().getStringList("restrictions.materials").forEach(
+                materialName -> {
+                    Optional<Material> parsedMaterial = Optional.ofNullable(Material.getMaterial(materialName));
+
+                    if (parsedMaterial.isPresent()) {
+                        materials.add(parsedMaterial.get());
+                    } else {
+                        Bookshelves.instance.getLogger().warning(String.format("Unable to parse material \"%s\". Material will be ignored.", materialName));
+                    }
+                }
+        );
+
+        Bookshelves.instance.getLogger().info(String.format("Loaded %s material-restrictions.", materials.size()));
+    }
+
+    public boolean isRestricted(Material material) {
+        return whitelist ? materials.contains(material) : !materials.contains(material);
+    }
+
+}