checks for folia w/ barrels

BreweryTeam · Aug 27, 2024 · 02b6891 · 02b6891
1 parent 621942b
commit 02b6891
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 20 deletions.
diff --git a/src/main/java/com/dre/brewery/Barrel.java b/src/main/java/com/dre/brewery/Barrel.java
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * A Multi Block Barrel with Inventory
@@ -477,7 +478,15 @@ public boolean isLarge() {
 	 * is this a Small barrel?
 	 */
 	public boolean isSmall() {
-		return LegacyUtil.isSign(spigot.getType());
+		if (!BreweryPlugin.isFolia()) {
+			return LegacyUtil.isSign(spigot.getType());
+		}
+
+
+		AtomicBoolean type = new AtomicBoolean(false);
+		BreweryPlugin.getScheduler().runTask(spigot.getLocation(),
+				() -> type.set(LegacyUtil.isSign(spigot.getType())));
+		return type.get();
 	}
 
 	/**

diff --git a/src/main/java/com/dre/brewery/BreweryPlugin.java b/src/main/java/com/dre/brewery/BreweryPlugin.java
@@ -79,6 +79,7 @@ public class BreweryPlugin extends JavaPlugin {
 	private static BreweryPlugin breweryPlugin;
 	private static MinecraftVersion minecraftVersion;
 	private static DataManager dataManager;
+	private static boolean isFolia = false;
 	public static boolean debug;
 	public static boolean useNBT;
 
@@ -105,6 +106,11 @@ public void onLoad() {
 	@Override
 	public void onEnable() {
 		migrateBreweryDataFolder();
+		try {
+			Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
+			isFolia = true;
+		} catch (ClassNotFoundException ignored) {
+		}
 
 
 		// MC 1.13 uses a different NBT API than the newer versions.
@@ -380,6 +386,10 @@ public static DataManager getDataManager() {
 		return dataManager;
 	}
 
+	public static boolean isFolia() {
+		return isFolia;
+	}
+
 	// Utility
 
 	public void msg(CommandSender sender, String msg) {

diff --git a/src/main/java/com/dre/brewery/api/addons/AddonManager.java b/src/main/java/com/dre/brewery/api/addons/AddonManager.java
@@ -37,7 +37,11 @@ public AddonManager(BreweryPlugin plugin) {
 
 	public void unloadAddons() {
 		for (BreweryAddon addon : addons) {
-			addon.onAddonDisable();
+			try {
+				addon.onAddonDisable();
+			} catch (Throwable t) {
+				plugin.errorLog("Failed to disable addon " + addon.getClass().getSimpleName(), t);
+			}
 		}
 		int loaded = addons.size();
 		if (loaded > 0) plugin.log("Disabled " + loaded + " addon(s)");
@@ -46,7 +50,11 @@ public void unloadAddons() {
 
 	public void reloadAddons() {
 		for (BreweryAddon addon : addons) {
-			addon.onBreweryReload();
+			try {
+				addon.onBreweryReload();
+			} catch (Throwable t) {
+				plugin.errorLog("Failed to reload addon " + addon.getClass().getSimpleName(), t);
+			}
 		}
 		int loaded = addons.size();
 		if (loaded > 0) plugin.log("Reloaded " + loaded + " addon(s)");
@@ -113,7 +121,11 @@ public void loadAddons() {
 		}
 
 		for (BreweryAddon addon : addons) {
-			addon.onAddonEnable();
+			try {
+				addon.onAddonEnable();
+			} catch (Throwable t) {
+				plugin.errorLog("Failed to enable addon " + addon.getClass().getSimpleName(), t);
+			}
 		}
 		int loaded = addons.size();
 		if (loaded > 0) plugin.log("Loaded " + loaded + " addon(s)");

diff --git a/src/main/java/com/dre/brewery/utility/LegacyUtil.java b/src/main/java/com/dre/brewery/utility/LegacyUtil.java
@@ -279,22 +279,15 @@ public static byte getWoodType(Block wood) throws NoSuchFieldError, NoClassDefFo
 				return 0;
 			}
 
-			switch (woodType) {
-				case GENERIC:
-					return 2;
-				case REDWOOD:
-					return 4;
-				case BIRCH:
-					return 1;
-				case JUNGLE:
-					return 3;
-				case ACACIA:
-					return 5;
-				case DARK_OAK:
-					return 6;
-				default:
-					return 0;
-			}
+            return switch (woodType) {
+                case GENERIC -> 2;
+                case REDWOOD -> 4;
+                case BIRCH -> 1;
+                case JUNGLE -> 3;
+                case ACACIA -> 5;
+                case DARK_OAK -> 6;
+                default -> 0;
+            };
 		}
 	}