Full support for MC 1.20.5+ (Paper)

Despical · May 31, 2024 · b76eb50 · b76eb50
1 parent 96961bf
commit b76eb50
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>me.despical</groupId>
 	<artifactId>one-in-the-chamber</artifactId>
-	<version>2.5.8</version>
+	<version>2.5.9</version>
 
 	<name>One In The Chamber</name>
 	<inceptionYear>2019</inceptionYear>
@@ -55,17 +55,17 @@
 		<dependency>
 			<groupId>com.github.Despical</groupId>
 			<artifactId>Commons</artifactId>
-			<version>1.7.3</version>
+			<version>1.7.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.Despical</groupId>
 			<artifactId>InventoryFramework</artifactId>
-			<version>2.2.9</version>
+			<version>2.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.Despical</groupId>
 			<artifactId>CommandFramework</artifactId>
-			<version>1.4.6</version>
+			<version>1.4.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bstats</groupId>
@@ -75,7 +75,7 @@
 		<dependency>
 			<groupId>me.clip</groupId>
 			<artifactId>placeholderapi</artifactId>
-			<version>2.11.2</version>
+			<version>2.11.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -93,7 +93,6 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
-
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -144,6 +143,10 @@
 							<createDependencyReducedPom>false</createDependencyReducedPom>
 							<minimizeJar>true</minimizeJar>
 							<relocations>
+								<relocation>
+									<pattern>me.despical.commandframework</pattern>
+									<shadedPattern>me.despical.oitc.commands</shadedPattern>
+								</relocation>
 								<relocation>
 									<pattern>org.bstats</pattern>
 									<shadedPattern>me.despical.oitc.util</shadedPattern>

diff --git a/src/main/java/me/despical/oitc/ConfigPreferences.java b/src/main/java/me/despical/oitc/ConfigPreferences.java
@@ -20,7 +20,7 @@
 
 import me.despical.commons.serializer.InventorySerializer;
 import me.despical.commons.string.StringUtils;
-import me.despical.commons.util.function.DoubleSupplier;
+import me.despical.commons.util.function.BiSupplier;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -84,7 +84,7 @@ NAME_TAGS_HIDDEN, UPDATE_NOTIFIER_ENABLED, REGEN_ENABLED(false), HIDE_PLAYERS, E
 			this.path = path;
 		}
 
-		Option(DoubleSupplier<FileConfiguration, Boolean> supplier) {
+		Option(BiSupplier<FileConfiguration, Boolean> supplier) {
 			this.path = "";
 			this.def = supplier.accept(JavaPlugin.getPlugin(Main.class).getConfig());
 		}

diff --git a/src/main/java/me/despical/oitc/arena/ArenaUtils.java b/src/main/java/me/despical/oitc/arena/ArenaUtils.java
@@ -18,8 +18,8 @@
 
 package me.despical.oitc.arena;
 
-import me.despical.commons.ReflectionUtils;
 import me.despical.commons.miscellaneous.PlayerUtils;
+import me.despical.commons.reflection.XReflection;
 import me.despical.oitc.ConfigPreferences;
 import me.despical.oitc.Main;
 import org.bukkit.entity.Player;
@@ -80,7 +80,7 @@ public static void showPlayersOutsideTheGame(Player player, Arena arena) {
 		}
 	}
 
-	private final static boolean isLegacy = !ReflectionUtils.supports(9);
+	private final static boolean isLegacy = !XReflection.supports(9);
 	private final static boolean hide = plugin.getOption(ConfigPreferences.Option.HIDE_PLAYERS);
 	private final static boolean isNameTagsSupported = !isLegacy && plugin.getOption(ConfigPreferences.Option.NAME_TAGS_HIDDEN);
 

diff --git a/src/main/java/me/despical/oitc/events/Events.java b/src/main/java/me/despical/oitc/events/Events.java
@@ -19,11 +19,11 @@
 package me.despical.oitc.events;
 
 import me.clip.placeholderapi.PlaceholderAPI;
-import me.despical.commons.ReflectionUtils;
 import me.despical.commons.compat.Titles;
 import me.despical.commons.compat.XMaterial;
 import me.despical.commons.miscellaneous.AttributeUtils;
 import me.despical.commons.miscellaneous.PlayerUtils;
+import me.despical.commons.reflection.XReflection;
 import me.despical.commons.serializer.InventorySerializer;
 import me.despical.commons.util.Collections;
 import me.despical.commons.util.UpdateChecker;
@@ -512,7 +512,7 @@ private String formatChatPlaceholders(String message, Player player, String said
 	}
 
 	private void registerLegacyEvents() {
-		registerIf(ReflectionUtils.supports(9) && ReflectionUtils.supportsPatch(2), new Listener() {
+		registerIf(XReflection.supports(9) && XReflection.supportsPatch(2), new Listener() {
 
 			@EventHandler
 			public void onItemSwap(PlayerSwapHandItemsEvent event) {
@@ -522,7 +522,7 @@ public void onItemSwap(PlayerSwapHandItemsEvent event) {
 			}
 		});
 
-		registerIf(ReflectionUtils.supports(9), new Listener() {
+		registerIf(XReflection.supports(9), new Listener() {
 
 			@EventHandler
 			public void onArrowPickup(PlayerPickupArrowEvent event) {

diff --git a/src/main/java/me/despical/oitc/user/User.java b/src/main/java/me/despical/oitc/user/User.java
@@ -18,9 +18,9 @@
 
 package me.despical.oitc.user;
 
-import me.despical.commons.ReflectionUtils;
 import me.despical.commons.compat.Titles;
 import me.despical.commons.miscellaneous.AttributeUtils;
+import me.despical.commons.reflection.XReflection;
 import me.despical.oitc.ConfigPreferences;
 import me.despical.oitc.Main;
 import me.despical.oitc.api.StatsStorage;
@@ -150,7 +150,7 @@ public void sendTitle(String title, String subTitle) {
 	}
 
 	public void updateAttackCooldown() {
-		if (!ReflectionUtils.supports(9)) return;
+		if (!XReflection.supports(9)) return;
 
 		Player player = this.getPlayer();
 
@@ -164,7 +164,7 @@ public void updateAttackCooldown() {
 	}
 
 	public void resetAttackCooldown() {
-		if (!ReflectionUtils.supports(9)) return;
+		if (!XReflection.supports(9)) return;
 
 		Player player = this.getPlayer();
 

diff --git a/src/main/java/me/despical/oitc/util/ItemPosition.java b/src/main/java/me/despical/oitc/util/ItemPosition.java
@@ -18,9 +18,9 @@
 
 package me.despical.oitc.util;
 
-import me.despical.commons.ReflectionUtils;
 import me.despical.commons.compat.XMaterial;
 import me.despical.commons.item.ItemBuilder;
+import me.despical.commons.reflection.XReflection;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -43,7 +43,7 @@ public enum ItemPosition {
 
 	ItemPosition(int itemPosition, ItemBuilder itemBuilder) {
 		this.itemPosition = itemPosition;
-		this.itemStack = ReflectionUtils.supports(9) ? itemBuilder.unbreakable(true).build() : itemBuilder.build();
+		this.itemStack = XReflection.supports(9) ? itemBuilder.unbreakable(true).build() : itemBuilder.build();
 	}
 
 	public static void addItem(Player player, ItemPosition itemPosition, ItemStack itemStack) {