no changes

Author: acrylic-style

.github/workflows/build.yml

@@ -23,5 +23,9 @@ jobs:
           java-version: '17'
           cache: 'gradle'
 
-      - run: chmod +x ./gradlew
+      - name: Prepare gradle.properties
+        run: |
+          mkdir -p $HOME/.gradle
+          echo "azisabaNmsUsername=${{ secrets.REPO_USERNAME }}" >> $HOME/.gradle/gradle.properties
+          echo "azisabaNmsPassword=${{ secrets.REPO_PASSWORD }}" >> $HOME/.gradle/gradle.properties
       - run: ./gradlew build

build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     java
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 group = "net.azisaba.afnw"
@@ -15,14 +16,29 @@ repositories {
         name = "sonatype"
         url = uri("https://oss.sonatype.org/content/groups/public/")
     }
+    maven {
+        name = "azisaba"
+        url = uri("https://repo.azisaba.net/repository/maven-public/")
+    }
     maven {
         name = "essentialsx"
         url = uri("https://repo.essentialsx.net/releases/")
     }
+    if (properties["azisabaNmsUsername"] != null && properties["azisabaNmsPassword"] != null) {
+        maven {
+            name = "azisabaNms"
+            credentials(PasswordCredentials::class)
+            url = uri("https://repo.azisaba.net/repository/nms/")
+        }
+    }
+    mavenLocal()
 }
 
 dependencies {
+    implementation("net.blueberrymc:native-util:2.1.0")
     compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT")
+    compileOnly("net.azisaba.ballotbox:receiver:1.0.1")
     compileOnly("net.essentialsx:EssentialsX:2.19.7")
 }
 

gradlew

@@ -17,15 +17,13 @@
 import net.azisaba.afnw.afnwcore2.listeners.block.CropsBreakCanceller;
 import net.azisaba.afnw.afnwcore2.listeners.block.SaplingBreakCanceller;
 import net.azisaba.afnw.afnwcore2.listeners.entity.WitherSpawn;
-import net.azisaba.afnw.afnwcore2.listeners.player.AFKListener;
-import net.azisaba.afnw.afnwcore2.listeners.player.DeathListener;
-import net.azisaba.afnw.afnwcore2.listeners.player.FirstPlayerJoinListener;
-import net.azisaba.afnw.afnwcore2.listeners.player.JoinListener;
-import net.azisaba.afnw.afnwcore2.listeners.player.QuitListener;
-import net.azisaba.afnw.afnwcore2.listeners.player.RespawnEnvironment;
+import net.azisaba.afnw.afnwcore2.listeners.other.VoteListener;
+import net.azisaba.afnw.afnwcore2.listeners.player.*;
 import net.azisaba.afnw.afnwcore2.util.data.PlayerData;
 import net.azisaba.afnw.afnwcore2.util.data.PlayerDataSave;
 import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.entity.Dolphin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -65,8 +63,11 @@ public void onEnable() {
     pluginEvent.registerEvents(new FirstPlayerJoinListener(this, data), this);
     pluginEvent.registerEvents(new AFKListener(this), this);
     pluginEvent.registerEvents(new RespawnEnvironment(this), this);
+    pluginEvent.registerEvents(new SuperAfnwTicketListener(), this);
     /* エンティティリスナー */
     pluginEvent.registerEvents(new WitherSpawn(this), this);
+    /* その他 */
+    pluginEvent.registerEvents(new VoteListener(), this);
     getLogger().info("Listener 設定完了");
     /* ブロックリスナー */
     pluginEvent.registerEvents(new CropsBreakCanceller(), this);
@@ -95,6 +96,13 @@ public void onEnable() {
       return;
     }
 
+    Bukkit.getScheduler().runTaskTimer(this, () -> {
+      for (World world : Bukkit.getWorlds()) {
+        for (Dolphin entity : world.getEntitiesByClass(Dolphin.class)) {
+          entity.remove();
+        }
+      }
+    }, 1, 1);
     getLogger().info("正常に起動しました。");
   }
 

src/main/java/net/azisaba/afnw/afnwcore2/AfnwCore2.java

@@ -19,6 +19,7 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -57,6 +58,19 @@ private static boolean isAllowed(Material type) {
     }
   }
 
+  @Contract("_ -> new")
+  public static @NotNull ItemStack getRandomItem(int amount) {
+    try {
+      SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
+      List<Material> itemList = new ArrayList<>(Arrays.asList(Material.values()));
+      itemList.removeIf(type -> !isAllowed(type));
+      return new ItemStack(itemList.get(random.nextInt(itemList.size() - 1)), amount);
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException(e);
+    }
+
+  }
+
   /**
    * /afnw
    *
@@ -97,16 +111,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     int itemSize = config.getInt("vote.item-size", 1);
     int scaffoldSize = config.getInt("vote.scaffold-size", 8);
 
-    SecureRandom random;
-    ItemStack afnwItem;
-    try {
-      random = SecureRandom.getInstance("SHA1PRNG");
-      List<Material> itemList = new ArrayList<>(Arrays.asList(Material.values()));
-      itemList.removeIf(type -> !isAllowed(type));
-      afnwItem = new ItemStack(itemList.get(random.nextInt(itemList.size() - 1)), itemSize);
-    } catch (NoSuchAlgorithmException e) {
-      throw new RuntimeException(e);
-    }
+    ItemStack afnwItem = getRandomItem(itemSize);
 
     inv.removeItem(AfnwTicket.afnwTicket);
     inv.addItem(afnwItem);

src/main/java/net/azisaba/afnw/afnwcore2/commands/AfnwCommand.java

@@ -0,0 +1,12 @@
+package net.azisaba.afnw.afnwcore2.listeners.other;
+
+import com.vexsoftware.votifier.model.VotifierEvent;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class VoteListener implements Listener {
+    @EventHandler
+    public void onVote(VotifierEvent e) {
+        //
+    }
+}

src/main/java/net/azisaba/afnw/afnwcore2/listeners/other/VoteListener.java

@@ -0,0 +1,13 @@
+package net.azisaba.afnw.afnwcore2.listeners.player;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+
+public class SuperAfnwTicketListener implements Listener {
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent e) {
+        if (e.getAction() != Action.LEFT_CLICK_AIR && e.getAction() != Action.LEFT_CLICK_BLOCK) return;
+    }
+}