ワークフローテストもかねてのmaster移動

.github/workflows/deploy.yml

@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: deploy
+
+on:
+  workflow_run:
+    branches:
+      - master
+    workflows:
+      - build
+    types:
+      - completed
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: deploy file
+        uses: wlixcc/SFTP-Deploy-Action@v1.2.1
+        with:
+          username: ${{ secrets.SSH_USERNAME }}
+          server: ${{ secrets.SSH_SERVER }}
+          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+          local_path: './target/Metaverseplugin.jar'
+          remote_path: '/home/riku/minecraft/plugins/'
+          args: '-o ConnectTimeout=5'

README.md

@@ -0,0 +1,2 @@
+# metaverseplugin
+あらいぬメタバースプロジェクトマインクラフトサーバーのプラグイン

pom.xml

@@ -25,8 +25,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>14</source>
-                    <target>14</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -137,5 +137,12 @@
             <scope>system</scope>
             <systemPath>${basedir}/lib/AdvancedBan-Bundle-2.3.0-RELEASE.jar</systemPath>
         </dependency>
+        <dependency>
+            <groupId>org.dynmap</groupId>
+            <artifactId>DynmapCoreAPI</artifactId>
+            <version>3.2.1</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/lib/Dynmap-3.2.1-spigot.jar</systemPath>
+        </dependency>
     </dependencies>
 </project>

src/main/java/world/arainu/core/metaverseplugin/MetaversePlugin.java

@@ -18,26 +18,30 @@
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
-//import org.dynmap.DynmapAPI;
+import org.dynmap.DynmapAPI;
 import org.jetbrains.annotations.NotNull;
 import world.arainu.core.metaverseplugin.commands.CommandBase;
 import world.arainu.core.metaverseplugin.commands.CommandSpawn;
 import world.arainu.core.metaverseplugin.commands.CommandWhitelist;
-import world.arainu.core.metaverseplugin.commands.CommandiPhone;
-import world.arainu.core.metaverseplugin.gui.Gui;
-import world.arainu.core.metaverseplugin.gui.MenuItem;
 import world.arainu.core.metaverseplugin.iphone.Bank;
+import world.arainu.core.metaverseplugin.iphone.LinkDiscord;
 import world.arainu.core.metaverseplugin.iphone.MoveSurvival;
+import world.arainu.core.metaverseplugin.iphone.Municipal;
 import world.arainu.core.metaverseplugin.iphone.TrapTower;
 import world.arainu.core.metaverseplugin.iphone.Worldteleport;
 import world.arainu.core.metaverseplugin.iphone.iPhoneEnderDragon;
+import world.arainu.core.metaverseplugin.commands.CommandiPhone;
+import world.arainu.core.metaverseplugin.gui.Gui;
+import world.arainu.core.metaverseplugin.gui.MenuItem;
 import world.arainu.core.metaverseplugin.listener.BankListener;
+import world.arainu.core.metaverseplugin.listener.MoneyListener;
+import world.arainu.core.metaverseplugin.listener.MunicipalCreateListener;
 import world.arainu.core.metaverseplugin.listener.PublicListener;
 import world.arainu.core.metaverseplugin.listener.ServerListener;
 import world.arainu.core.metaverseplugin.listener.SittingListener;
 import world.arainu.core.metaverseplugin.listener.VillagerListener;
 import world.arainu.core.metaverseplugin.scheduler.LateScheduler;
-import world.arainu.core.metaverseplugin.scheduler.MoneyScheduler;
+import world.arainu.core.metaverseplugin.scheduler.ParticleScheduler;
 import world.arainu.core.metaverseplugin.scheduler.SqlScheduler;
 import world.arainu.core.metaverseplugin.store.ServerStore;
 import world.arainu.core.metaverseplugin.store.iPhoneStore;
@@ -60,7 +64,7 @@ public final class MetaversePlugin extends JavaPlugin {
     private static MetaversePlugin Instance;
     @Getter
     private static FileConfiguration configuration;
-    //    @Getter private static DynmapAPI dynmap;
+    @Getter private static DynmapAPI dynmap;
     private final HashMap<String, CommandBase> commands = new HashMap<>();
 
     @Override
@@ -79,14 +83,14 @@ public void onEnable() {
     }
 
     private void setScheduler() {
-        new MoneyScheduler().runTaskTimer(this, 0, 20);
         new LateScheduler().runTaskTimer(this, 0, 20);
         new SqlScheduler().runTaskTimer(this, 0, 20 * 60 * 60);
+        new ParticleScheduler().runTaskTimer(this, 0, 10);
         createStairsYml();
     }
 
     private void EnablePlugins() {
-//        dynmap = (DynmapAPI) getServer().getPluginManager().getPlugin("Dynmap");
+        dynmap = (DynmapAPI) getServer().getPluginManager().getPlugin("Dynmap");
         if (!setupEconomy()) {
             getLogger().severe(String.format("[%s] - Vaultが依存する経済プラグインがなかったためメタバースプラグインを無効にしました！！！", getDescription().getName()));
             getServer().getPluginManager().disablePlugin(this);
@@ -128,6 +132,8 @@ private void loadGuis() {
         iPhoneStore.addGuiItem(new MenuItem("トラップタワーに行く", new TrapTower()::executeGui, true, traptowerItem), (p) -> !p.getWorld().getName().equals(configuration.getString("world.traptower")) && Objects.equals(ServerStore.getServerName(), "survival"));
         iPhoneStore.addGuiItem(new MenuItem("サバイバルサーバーに戻る", new MoveSurvival()::executeGui, true, Material.GRASS_BLOCK), (p) -> p.getWorld().getName().equals(configuration.getString("world.traptower")));
         iPhoneStore.addGuiItem(new MenuItem("エンドラを復活させる", new iPhoneEnderDragon()::executeGui, true, Material.END_STONE), (p) -> !Gui.isEnderDragonLiving(p) && Gui.isPlayerInEnd(p));
+        iPhoneStore.addGuiItem(new MenuItem("自治体", new Municipal()::executeGui, true, Material.END_STONE), (p) -> Objects.equals(ServerStore.getServerName(), "survival"));
+        iPhoneStore.addGuiItem(new MenuItem("discordと連携する", new LinkDiscord()::executeGui, true, Material.PAPER), (p) -> DiscordSRV.getPlugin().getAccountLinkManager().getDiscordId(p.getUniqueId()) == null);
     }
 
     /**
@@ -142,6 +148,8 @@ public void setListener() {
         PM.registerEvents(new PublicListener(), this);
         PM.registerEvents(new VillagerListener(), this);
         PM.registerEvents(new CommandWhitelist(), this);
+        PM.registerEvents(new MunicipalCreateListener(), this);
+        PM.registerEvents(new MoneyListener(), this);
         DiscordSRV.api.subscribe(this);
         getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
     }

src/main/java/world/arainu/core/metaverseplugin/gui/Gui.java

@@ -22,7 +22,6 @@
 import org.geysermc.cumulus.response.SimpleFormResponse;
 import org.geysermc.floodgate.api.FloodgateApi;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
-import world.arainu.core.metaverseplugin.utils.PosItemStack;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -38,6 +37,12 @@
  * @author kumitatepazuru
  */
 public class Gui implements Listener {
+    /**
+     * Guiで主に使用するItemStackと場所(index)を紐付けるクラス
+     */
+    public record PosItemStack(ItemStack item, int index) {
+    }
+
     /**
      * インスタンスを取得します。
      *
@@ -117,7 +122,7 @@ public void onInventoryClose(InventoryCloseEvent e) {
 
     private void openMenuJavaImpl(Player player, String title, MenuItem[] items) {
         Integer max = Arrays.stream(items).map(MenuItem::getY).max(Comparator.naturalOrder()).orElse(0);
-        final int size = Math.max(1 + (items.length-1) / 9, max) * 9;
+        final int size = Math.max(1 + (items.length - 1) / 9, max) * 9;
         final Inventory inv = Bukkit.createInventory(null, size, Component.text(title));
         final HashMap<Integer, MenuItem> itemmap = new HashMap<>();
         final int[] count = {0};
@@ -139,7 +144,7 @@ private void openMenuJavaImpl(Player player, String title, MenuItem[] items) {
             itemmap.put(index, i);
 
             return new PosItemStack(item, index);
-        }).forEach(i -> inv.setItem(i.getIndex(), i.getItem()));
+        }).forEach(i -> inv.setItem(i.index(), i.item()));
 
         invMap.put(inv, itemmap);
         player.openInventory(inv);
@@ -150,15 +155,19 @@ private void openMenuBedrockImpl(Player player, String title, MenuItem[] items)
                 .title(title);
 
         for (var item : items) {
-            Component text = item.getIcon().displayName();
+            Component text;
+            text = item.getIcon().getItemMeta().displayName();
+            if (text == null) {
+                text = item.getIcon().displayName();
+            }
             if (item.isShiny()) {
                 text = text.color(NamedTextColor.GREEN);
             }
             if (item.isClose()) {
-                if(text instanceof TextComponent) builder.button(((TextComponent) text).content());
+                if (text instanceof TextComponent) builder.button(((TextComponent) text).content());
                 else builder.button(Objects.requireNonNull(item.getIcon().getI18NDisplayName()));
             } else {
-                if(text instanceof TextComponent) builder.content(((TextComponent) text).content());
+                if (text instanceof TextComponent) builder.content(((TextComponent) text).content());
                 else builder.content(Objects.requireNonNull(item.getIcon().getI18NDisplayName()));
             }
         }
@@ -209,10 +218,11 @@ public static boolean isPlayerInEnd(Player player) {
      */
 
     public static boolean isEnderDragonLiving(Player player) {
-            List<LivingEntity> entity = player.getWorld().getLivingEntities();
-            for (LivingEntity i : entity) {
-                if (i instanceof EnderDragon) return true;
-            } return false;
+        List<LivingEntity> entity = player.getWorld().getLivingEntities();
+        for (LivingEntity i : entity) {
+            if (i instanceof EnderDragon) return true;
+        }
+        return false;
     }
 
     private final HashMap<Inventory, HashMap<Integer, MenuItem>> invMap = new HashMap<>();

src/main/java/world/arainu/core/metaverseplugin/iphone/Bank.java

@@ -23,16 +23,12 @@
 import world.arainu.core.metaverseplugin.commands.CommandiPhone;
 import world.arainu.core.metaverseplugin.gui.Gui;
 import world.arainu.core.metaverseplugin.gui.MenuItem;
+import world.arainu.core.metaverseplugin.listener.VillagerListener;
 import world.arainu.core.metaverseplugin.store.BankStore;
 import world.arainu.core.metaverseplugin.utils.BankNotice;
 import world.arainu.core.metaverseplugin.utils.ChatUtil;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 
@@ -118,6 +114,11 @@ private void withdraw_Complete(Player player, String text, Economy econ, AtomicB
 
     private void payment_Complete(Player player, String text, AtomicBoolean complete_flag) {
         try {
+            if(Objects.equals(text, "#")){
+                final Inventory player_inv = player.getInventory();
+                final VillagerListener.ReturnMoney returnMoney = VillagerListener.getTotalmoney(player_inv);
+                text = String.valueOf(returnMoney.total_money());
+            }
             int payment_yen = Integer.parseInt(text);
             if (payment_yen < 0) {
                 throw new NumberFormatException();
@@ -250,7 +251,7 @@ public void executeGui(MenuItem menuItem) {
                 Player player = menuItem.getClicker();
                 CustomForm.Builder builder = CustomForm.builder()
                         .title("お金の入金")
-                        .input("入金する金額を入力", "半角数字で!!!!!")
+                        .input("入金する金額を入力", "全額入金は#と入力")
                         .responseHandler((form, responseData) -> {
                             CustomFormResponse response = form.parseResponse(responseData);
                             if (!response.isCorrect()) ChatUtil.warning(player, "お金の入金を取りやめました。");
@@ -296,7 +297,7 @@ public void executeGui(MenuItem menuItem) {
                         return AnvilGUI.Response.close();
                     })
                     .title("入金する金額を入力")
-                    .text("半角数字で!!!")
+                    .text("全額入金は#と入力")
                     .plugin(MetaversePlugin.getInstance())
                     .open(menuItem.getClicker());
 

src/main/java/world/arainu/core/metaverseplugin/iphone/LinkDiscord.java

@@ -0,0 +1,13 @@
+package world.arainu.core.metaverseplugin.iphone;
+
+import github.scarsz.discordsrv.DiscordSRV;
+import world.arainu.core.metaverseplugin.gui.MenuItem;
+import world.arainu.core.metaverseplugin.utils.ChatUtil;
+
+public class LinkDiscord extends iPhoneBase{
+    @Override
+    public void executeGui(MenuItem menuItem) {
+        String code = DiscordSRV.getPlugin().getAccountLinkManager().generateCode(menuItem.getClicker().getUniqueId());
+        ChatUtil.success(menuItem.getClicker(),"discordサーバー内の「草ブロック」BOT(A.L.ではありません)のDMに"+code+"を送ってください。");
+    }
+}

src/main/java/world/arainu/core/metaverseplugin/iphone/MoveSurvival.java

@@ -13,6 +13,8 @@
 
 /**
  * 公共施設からサバイバルサーバーに戻るボタンを実現するクラス
+ *
+ * @author kumitatepazuru
  */
 public class MoveSurvival extends iPhoneBase {
     /**