remove unused import and create directory command

SpaceServerUniverse · Oct 18, 2024 · 532719d · 532719d
1 parent 2fcf6f6
commit 532719d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git a/src/main/java/space/yurisi/universecorev2/item/gun/F2.java b/src/main/java/space/yurisi/universecorev2/item/gun/F2.java
@@ -1,15 +1,11 @@
 package space.yurisi.universecorev2.item.gun;
 
 import org.bukkit.Sound;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import space.yurisi.universecorev2.subplugins.universeguns.constants.GunType;
 
 import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.inventory.ItemStack;
-import space.yurisi.universecorev2.subplugins.universeguns.constants.GunType;
 
 public final class F2 extends Gun {
 

diff --git a/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/UniverseGuns.java b/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/UniverseGuns.java
@@ -4,7 +4,7 @@
 import space.yurisi.universecorev2.UniverseCoreV2API;
 import space.yurisi.universecorev2.database.DatabaseManager;
 import space.yurisi.universecorev2.subplugins.SubPlugin;
-import space.yurisi.universecorev2.subplugins.universeguns.core.GunCommand;
+import space.yurisi.universecorev2.subplugins.universeguns.command.GunCommand;
 import space.yurisi.universecorev2.subplugins.universeguns.event.GunEvent;
 import space.yurisi.universecorev2.subplugins.universeguns.connector.UniverseCoreAPIConnector;
 

diff --git a/...plugins/universeguns/core/GunCommand.java → ...gins/universeguns/command/GunCommand.java b/...plugins/universeguns/core/GunCommand.java → ...gins/universeguns/command/GunCommand.java
@@ -1,4 +1,4 @@
-package space.yurisi.universecorev2.subplugins.universeguns.core;
+package space.yurisi.universecorev2.subplugins.universeguns.command;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -26,7 +26,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         AmmoManagerInventoryMenu ammoManagerInventoryMenu = new AmmoManagerInventoryMenu(connector);
         ammoManagerInventoryMenu.sendMenu(player);
 
-        Message.sendSuccessMessage(player, "[武器AI]", "弾薬管理メニューを開きました");
+//        Message.sendSuccessMessage(player, "[武器AI]", "弾薬管理メニューを開きました");
         return true;
     }
 }
diff --git a/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/event/GunEvent.java b/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/event/GunEvent.java
@@ -23,7 +23,6 @@
 import org.bukkit.persistence.PersistentDataType;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scoreboard.Team;
 import org.bukkit.util.Vector;
 import space.yurisi.universecorev2.UniverseCoreV2;
 import space.yurisi.universecorev2.constants.UniverseItemKeyString;
@@ -299,7 +298,6 @@ public void onPlayerHit(EntityDamageByEntityEvent event) {
 //            livingEntity.setHealth(newHealth);
             event.setDamage(damage);
             projectileData.remove(snowball);
-            // TODO: ヒットエフェクト
         } else {
             livingEntity.setMaximumNoDamageTicks(10);
             livingEntity.setNoDamageTicks(10);

diff --git a/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/event/GunShot.java b/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/event/GunShot.java
@@ -54,10 +54,11 @@ public void run() {
 
     private Vector SpreadProjectile(Vector direction, Gun gun) {
         double spread = gun.getSpread();
+        spread /= 5.0;
         Random random = new Random();
-        double spreadX = (random.nextDouble() - 0.5) * spread;
-        double spreadY = (random.nextDouble() - 0.5) * spread;
-        double spreadZ = (random.nextDouble() - 0.5) * spread;
+        double spreadX = random.nextGaussian() * spread;
+        double spreadY = random.nextGaussian() * spread;
+        double spreadZ = random.nextGaussian() * spread;
         return direction.add(new Vector(spreadX, spreadY, spreadZ)).normalize();
     }
 

diff --git a/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/event/ShotgunShot.java b/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/event/ShotgunShot.java
@@ -1,14 +1,11 @@
 package space.yurisi.universecorev2.subplugins.universeguns.event;
 
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.Location;
 import org.bukkit.entity.Snowball;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 import space.yurisi.universecorev2.UniverseCoreV2;
 import space.yurisi.universecorev2.item.gun.Gun;
-import space.yurisi.universecorev2.subplugins.universeguns.constants.GunType;
 import space.yurisi.universecorev2.subplugins.universeguns.core.GunStatus;
 
 import java.util.ArrayList;
@@ -41,7 +38,7 @@ public ShotgunShot(Player player, Gun gun, GunStatus gunStatus, ArrayList<Player
 
 
         for (int i = 0; i < bulletNumber; i++) {
-            Vector spreadDirection = SpreadProjectile(direction.clone(), gun, spread);
+            Vector spreadDirection = SpreadProjectile(direction.clone(), spread);
             Vector velocity = spreadDirection.multiply(gun.getBulletSpeed());
             Snowball projectile = player.launchProjectile(Snowball.class, velocity);
 //            projectile.setGravity(false);
@@ -59,7 +56,7 @@ public void run() {
 
     }
 
-    private Vector SpreadProjectile(Vector direction, Gun gun, double spread) {
+    private Vector SpreadProjectile(Vector direction, double spread) {
         Random random = new Random();
         double spreadX = random.nextGaussian() * spread;
         double spreadY = random.nextGaussian() * spread;

diff --git a/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/event/SniperShot.java b/src/main/java/space/yurisi/universecorev2/subplugins/universeguns/event/SniperShot.java
@@ -5,7 +5,6 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.util.RayTraceResult;
 import org.bukkit.util.Vector;
 import space.yurisi.universecorev2.item.gun.Gun;

diff --git a/...va/space/yurisi/universecorev2/subplugins/universeguns/menu/AmmoManagerInventoryMenu.java b/...va/space/yurisi/universecorev2/subplugins/universeguns/menu/AmmoManagerInventoryMenu.java
@@ -1,6 +1,7 @@
 package space.yurisi.universecorev2.subplugins.universeguns.menu;
 
 import org.bukkit.Material;
+import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import space.yurisi.universecorev2.exception.AmmoNotFoundException;
@@ -30,6 +31,8 @@ public void sendMenu(Player player) {
                 this.connector.AmmoDataInit(player);
             }
 
+            player.playSound(player.getLocation(), Sound.BLOCK_BARREL_OPEN, 1, 1);
+
             Item border = new SimpleItem(new ItemBuilder(Material.BLACK_STAINED_GLASS_PANE));
             Item iron1 = new SimpleItem(new ItemBuilder(Material.IRON_INGOT).setAmount(1));
             Item iron2 = new SimpleItem(new ItemBuilder(Material.IRON_INGOT).setAmount(2));