diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin index 131450a..7cc1d85 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.bin and b/.gradle/8.8/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.8/executionHistory/executionHistory.lock b/.gradle/8.8/executionHistory/executionHistory.lock index cbe7499..ad3c85c 100644 Binary files a/.gradle/8.8/executionHistory/executionHistory.lock and b/.gradle/8.8/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.8/fileHashes/fileHashes.bin b/.gradle/8.8/fileHashes/fileHashes.bin index ad10538..0ed6b24 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.bin and b/.gradle/8.8/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.8/fileHashes/fileHashes.lock b/.gradle/8.8/fileHashes/fileHashes.lock index 4c1647a..61b175c 100644 Binary files a/.gradle/8.8/fileHashes/fileHashes.lock and b/.gradle/8.8/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin index c557b6d..12d1f4a 100644 Binary files a/.gradle/8.8/fileHashes/resourceHashesCache.bin and b/.gradle/8.8/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index c6193d0..dc50f56 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/CoswayUtil/CoswayUtil.class b/build/classes/java/main/CoswayUtil/CoswayUtil.class index 77f5d89..89c02af 100644 Binary files a/build/classes/java/main/CoswayUtil/CoswayUtil.class and b/build/classes/java/main/CoswayUtil/CoswayUtil.class differ diff --git a/build/classes/java/main/CoswayUtil/LaunchStick.class b/build/classes/java/main/CoswayUtil/LaunchStick.class index 367974c..80c25f8 100644 Binary files a/build/classes/java/main/CoswayUtil/LaunchStick.class and b/build/classes/java/main/CoswayUtil/LaunchStick.class differ diff --git a/build/libs/CoswayUtil-1.10-RELEASE.jar b/build/libs/CoswayUtil-1.10-RELEASE.jar index 1c5998e..4f9c7c0 100644 Binary files a/build/libs/CoswayUtil-1.10-RELEASE.jar and b/build/libs/CoswayUtil-1.10-RELEASE.jar differ diff --git a/build/resources/main/plugin.yml b/build/resources/main/plugin.yml index 862e27a..a7f0804 100644 --- a/build/resources/main/plugin.yml +++ b/build/resources/main/plugin.yml @@ -20,4 +20,8 @@ commands: getwand: description: "Gives player a levitation wand" usage: "/getwand" - permission: CoswayUtil.wand \ No newline at end of file + permission: CoswayUtil.wand + launchstick: + description: give player a stick to use for launching themselves + usage: /launchstick + permission: CoswayUtil.launchStick \ No newline at end of file diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$1.class.uniqueId8 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$1.class.uniqueId1 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$1.class.uniqueId8 rename to build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$1.class.uniqueId1 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$1.class.uniqueId19 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$1.class.uniqueId7 similarity index 91% rename from build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$1.class.uniqueId19 rename to build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$1.class.uniqueId7 index a902926..9db13e0 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$1.class.uniqueId19 and b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$1.class.uniqueId7 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$2.class.uniqueId10 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$2.class.uniqueId3 similarity index 93% rename from build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$2.class.uniqueId10 rename to build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$2.class.uniqueId3 index 8e88171..5342a47 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$2.class.uniqueId10 and b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$2.class.uniqueId3 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId7 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId5 similarity index 88% rename from build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId7 rename to build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId5 index 6a260f7..99e4ac5 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId7 and b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId5 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$4.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$4.class.uniqueId4 index 1bf84df..a8daf90 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$4.class.uniqueId4 and b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$4.class.uniqueId4 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield.class.uniqueId14 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield.class.uniqueId6 similarity index 87% rename from build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield.class.uniqueId14 rename to build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield.class.uniqueId6 index 8840a93..8338fbe 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield.class.uniqueId14 and b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield.class.uniqueId6 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil.class.uniqueId2 new file mode 100644 index 0000000..89c02af Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil.class.uniqueId2 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil.class.uniqueId9 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil.class.uniqueId9 deleted file mode 100644 index 24849f9..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil.class.uniqueId9 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/GiveWandCommand.class.uniqueId15 b/build/tmp/compileJava/compileTransaction/stash-dir/GiveWandCommand.class.uniqueId15 deleted file mode 100644 index 5746ceb..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/GiveWandCommand.class.uniqueId15 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/GravityGauntlet.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/GravityGauntlet.class.uniqueId0 deleted file mode 100644 index d11403e..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/GravityGauntlet.class.uniqueId0 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/GravityGauntletCommand.class.uniqueId3 b/build/tmp/compileJava/compileTransaction/stash-dir/GravityGauntletCommand.class.uniqueId3 deleted file mode 100644 index 61be90d..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/GravityGauntletCommand.class.uniqueId3 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MobLevitationWand$1.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/MobLevitationWand$1.class.uniqueId2 deleted file mode 100644 index 33eb1ac..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/MobLevitationWand$1.class.uniqueId2 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/MobLevitationWand.class.uniqueId11 b/build/tmp/compileJava/compileTransaction/stash-dir/MobLevitationWand.class.uniqueId11 deleted file mode 100644 index 032615c..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/MobLevitationWand.class.uniqueId11 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/PhantomDodge$1.class.uniqueId16 b/build/tmp/compileJava/compileTransaction/stash-dir/PhantomDodge$1.class.uniqueId16 deleted file mode 100644 index b8ab886..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/PhantomDodge$1.class.uniqueId16 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/PhantomDodge.class.uniqueId17 b/build/tmp/compileJava/compileTransaction/stash-dir/PhantomDodge.class.uniqueId17 deleted file mode 100644 index eff2eda..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/PhantomDodge.class.uniqueId17 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/ShadowStep.class.uniqueId12 b/build/tmp/compileJava/compileTransaction/stash-dir/ShadowStep.class.uniqueId12 deleted file mode 100644 index b63243a..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/ShadowStep.class.uniqueId12 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/TotemShield$1.class.uniqueId13 b/build/tmp/compileJava/compileTransaction/stash-dir/TotemShield$1.class.uniqueId13 deleted file mode 100644 index c321548..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/TotemShield$1.class.uniqueId13 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/TotemShield.class.uniqueId5 b/build/tmp/compileJava/compileTransaction/stash-dir/TotemShield.class.uniqueId5 deleted file mode 100644 index b84c586..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/TotemShield.class.uniqueId5 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract$1.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract$1.class.uniqueId1 deleted file mode 100644 index 1d9a4fa..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract$1.class.uniqueId1 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract$2.class.uniqueId6 b/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract$2.class.uniqueId6 deleted file mode 100644 index ef78745..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract$2.class.uniqueId6 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract.class.uniqueId18 b/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract.class.uniqueId18 deleted file mode 100644 index 6ce948a..0000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/WitherContract.class.uniqueId18 and /dev/null differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 1de9b14..482894e 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/CoswayUtil/GravityGauntletCommand.java b/src/main/java/CoswayUtil/GravityGauntletCommand.java index a31efff..75d3cda 100644 --- a/src/main/java/CoswayUtil/GravityGauntletCommand.java +++ b/src/main/java/CoswayUtil/GravityGauntletCommand.java @@ -9,6 +9,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import java.util.Collections; + public class GravityGauntletCommand implements CommandExecutor { @Override @@ -20,6 +22,7 @@ public class GravityGauntletCommand implements CommandExecutor { if (meta != null) { meta.setDisplayName(ChatColor.LIGHT_PURPLE + "Gravity Gauntlet"); + meta.setLore(Collections.singletonList(ChatColor.GOLD + "Right Click to pull, Shift+Right Click to throw")); meta.setUnbreakable(true); gauntlet.setItemMeta(meta); } diff --git a/src/main/java/CoswayUtil/LaunchStick.java b/src/main/java/CoswayUtil/LaunchStick.java index 2722b7e..21f9703 100644 --- a/src/main/java/CoswayUtil/LaunchStick.java +++ b/src/main/java/CoswayUtil/LaunchStick.java @@ -1,8 +1,6 @@ package CoswayUtil; -import org.bukkit.ChatColor; -import org.bukkit.Material; -import org.bukkit.World; +import org.bukkit.*; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -45,8 +43,9 @@ public class LaunchStick implements Listener { // Add player to no-fall damage list noFallPlayers.add(player); - - player.sendMessage(ChatColor.GREEN + "You launched yourself forward!"); + player.getWorld().playSound(player.getLocation(), Sound.ENTITY_BREEZE_JUMP,10,0); + player.getWorld().playEffect(player.getLocation(), Effect.TRIAL_SPAWNER_DETECT_PLAYER_OMINOUS,1); + //player.sendMessage(ChatColor.GREEN + "You launched yourself forward!"); } // Prevent fall damage for launched players diff --git a/src/main/java/CoswayUtil/MobLevitationWand.java b/src/main/java/CoswayUtil/MobLevitationWand.java index 09695a1..403760d 100644 --- a/src/main/java/CoswayUtil/MobLevitationWand.java +++ b/src/main/java/CoswayUtil/MobLevitationWand.java @@ -13,6 +13,7 @@ import org.bukkit.persistence.PersistentDataType; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.Vector; +import java.util.Collections; import java.util.HashMap; import java.util.UUID; @@ -57,7 +58,7 @@ public class MobLevitationWand implements Listener { private boolean isLevitationWand(ItemStack item) { - if (item == null || item.getType() != Material.STICK || !item.hasItemMeta()) return false; + if (item == null || item.getType() != Material.CARROT_ON_A_STICK || !item.hasItemMeta()) return false; ItemMeta meta = item.getItemMeta(); return meta.getPersistentDataContainer().has(wandKey, PersistentDataType.STRING); } @@ -117,9 +118,10 @@ public class MobLevitationWand implements Listener { } public static ItemStack createWand() { - ItemStack wand = new ItemStack(Material.STICK); + ItemStack wand = new ItemStack(Material.CARROT_ON_A_STICK); ItemMeta meta = wand.getItemMeta(); meta.setDisplayName(ChatColor.LIGHT_PURPLE + "Levitation Wand"); + meta.setLore(Collections.singletonList(ChatColor.GOLD + "Right Click near a mob to pick it up")); meta.getPersistentDataContainer().set(new NamespacedKey("coswayutil", "levitation_wand"), PersistentDataType.STRING, "true"); wand.setItemMeta(meta); return wand;