* Small patch for bucket events involved liquids

* Slight optimization so internal API
Hempfest · May 15, 2021 · 849b3b0 · 849b3b0
1 parent 0aa2e53
commit 849b3b0
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 25 deletions.
diff --git a/.idea/libraries/Maven__com_github_MilkBowl_VaultAPI_1_7.xml b/.idea/libraries/Maven__com_github_MilkBowl_VaultAPI_1_7.xml
diff --git a/...com_github_the_h_team_Labyrinth_1_4_5.xml → ..._com_github_the_h_team_Enterprise_1_5.xml b/...com_github_the_h_team_Labyrinth_1_4_5.xml → ..._com_github_the_h_team_Enterprise_1_5.xml
diff --git a/.idea/libraries/Maven__com_github_the_h_team_Labyrinth_1_5_1.xml b/.idea/libraries/Maven__com_github_the_h_team_Labyrinth_1_5_1.xml
diff --git a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml
diff --git a/.idea/libraries/Maven__junit_junit_4_10.xml b/.idea/libraries/Maven__junit_junit_4_10.xml
diff --git a/.idea/libraries/Maven__org_bukkit_bukkit_1_13_1_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__org_bukkit_bukkit_1_13_1_R0_1_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
diff --git a/TestPlugin.iml b/TestPlugin.iml
@@ -20,12 +20,17 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
-    <orderEntry type="library" name="Maven: com.github.the-h-team:Labyrinth:1.4.5" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: com.github.the-h-team:Labyrinth:1.5.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.the-h-team:Enterprise:1.5" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:19.0.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.ms5984:ClansBanks:1.1.4" level="project" />

diff --git a/out/artifacts/hEssentialsClans.jar b/out/artifacts/hEssentialsClans.jar
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.youtube.hempfest.clans</groupId>
 	<artifactId>Clans</artifactId>
-	<version>2.1.8</version>
+	<version>2.2.0</version>
 	<packaging>jar</packaging>
 
 	<name>Clans</name>
@@ -77,7 +77,7 @@
 		<dependency>
 			<groupId>com.github.the-h-team</groupId>
 			<artifactId>Labyrinth</artifactId>
-			<version>1.4.5</version>
+			<version>1.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>me.clip</groupId>

diff --git a/src/main/java/com/youtube/hempfest/clans/commands/CommandClan.java b/src/main/java/com/youtube/hempfest/clans/commands/CommandClan.java
@@ -227,7 +227,7 @@ public List<String> tabComplete(CommandSender sender, String alias, String[] arg
 			}
 			return result;
 		}
-		return null;
+		return super.tabComplete(sender, alias, args);
 	}
 
 	@Override

diff --git a/src/main/java/com/youtube/hempfest/clans/util/construct/ClanUtil.java b/src/main/java/com/youtube/hempfest/clans/util/construct/ClanUtil.java
@@ -362,19 +362,12 @@ public double getKD(UUID playerID) {
 	}
 
 	public UUID getUserID(String playerName) {
-		UUID result = null;
-		for (UUID player : getAllUsers()) {
-			DataManager dm = new DataManager(player.toString(), null);
-			Config user = dm.getFile(ConfigType.USER_FILE);
-			if (user.getConfig().getString("username") == null) {
-				user.getConfig().set("username", Bukkit.getOfflinePlayer(player).getName());
-				user.saveConfig();
-			}
-			if (Objects.equals(user.getConfig().getString("username"), playerName)) {
-				result = player;
+		for (OfflinePlayer op : Bukkit.getOfflinePlayers()) {
+			if (op.getName().equalsIgnoreCase(playerName)) {
+				return op.getUniqueId();
 			}
 		}
-		return result;
+		return null;
 	}
 
 	public List<UUID> getAllUsers() {

diff --git a/src/main/resources/Config.yml b/src/main/resources/Config.yml
@@ -160,4 +160,4 @@ Response:
 # Contributors: Coolmike35
 # Pro link: https://www.spigotmc.org/resources/clans-pro-modular-configurable-1-14-1-16.87515/
 ##------------------------
-Version: 2.1.8
+Version: 2.1.9
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Clans
-version: 2.1.8
+version: 2.2.0
 author: Hempfest
 api-version: 1.13
 depend: [ Labyrinth ]