Merge branch 'master' into cosmetics

# Conflicts:
#	pom.xml

Author: Elic0de

.github/workflows/main.yml

@@ -0,0 +1,26 @@
+name: release
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 16
+      uses: actions/setup-java@v1
+      with:
+        java-version: 16
+    - name: Mavenを使ってビルド
+      run: mvn --batch-mode --update-snapshots verify
+    - name: original-*.jarを削除
+      run:  rm target/original-*.jar
+    - name: パッケージをビルドの成果物としてリリース
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: release-v${{ github.run_number }}
+        files: target/*.jar

pom.xml

@@ -145,10 +145,5 @@
             <version>2.0.1</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>xyz.xenondevs</groupId>
-            <artifactId>particle</artifactId>
-            <version>1.8.1</version>
-        </dependency>
     </dependencies>
 </project>

…/elic0de/thejpspit/spigot/TheJpsPit.java …/github/elic0de/thejpspit/TheJpsPit.javasrc/main/java/com/github/elic0de/thejpspit/spigot/TheJpsPit.java renamed to src/main/java/com/github/elic0de/thejpspit/TheJpsPit.java src/main/java/com/github/elic0de/thejpspit/spigot/TheJpsPit.java renamed to src/main/java/com/github/elic0de/thejpspit/TheJpsPit.java

@@ -1,41 +1,42 @@
-package com.github.elic0de.thejpspit.spigot;
+package com.github.elic0de.thejpspit;
 
 import co.aikar.commands.PaperCommandManager;
 import com.fatboyindustrial.gsonjavatime.Converters;
-import com.github.elic0de.thejpspit.spigot.command.PitCommand;
-import com.github.elic0de.thejpspit.spigot.command.SpawnCommand;
-import com.github.elic0de.thejpspit.spigot.config.PitPreferences;
-import com.github.elic0de.thejpspit.spigot.database.Database;
-import com.github.elic0de.thejpspit.spigot.database.SqLiteDatabase;
-import com.github.elic0de.thejpspit.spigot.game.Game;
-import com.github.elic0de.thejpspit.spigot.hook.EconomyHook;
-import com.github.elic0de.thejpspit.spigot.hook.Hook;
-import com.github.elic0de.thejpspit.spigot.hook.VaultEconomyHook;
-import com.github.elic0de.thejpspit.spigot.item.ItemManager;
-import com.github.elic0de.thejpspit.spigot.item.items.*;
-import com.github.elic0de.thejpspit.spigot.listener.CombatTagger;
-import com.github.elic0de.thejpspit.spigot.listener.EventListener;
-import com.github.elic0de.thejpspit.spigot.network.PluginMessageReceiver;
-import com.github.elic0de.thejpspit.spigot.nms.PacketManager;
-import com.github.elic0de.thejpspit.spigot.nms.PacketManager1_19_R1;
-import com.github.elic0de.thejpspit.spigot.player.PitPlayer;
-import com.github.elic0de.thejpspit.spigot.player.PitPlayerManager;
-import com.github.elic0de.thejpspit.spigot.queue.QueueManager;
-import com.github.elic0de.thejpspit.spigot.task.QueueTask;
-import com.github.elic0de.thejpspit.spigot.util.KillAssistHelper;
-import com.github.elic0de.thejpspit.spigot.util.KillRatingHelper;
-import com.github.elic0de.thejpspit.spigot.villager.VillagerNPCManager;
-import com.github.elic0de.thejpspit.spigot.villager.villagers.ShopVillager;
+import com.github.elic0de.thejpspit.command.PitChatCommand;
+import com.github.elic0de.thejpspit.command.PitCommand;
+import com.github.elic0de.thejpspit.command.SpawnCommand;
+import com.github.elic0de.thejpspit.config.PitPreferences;
+import com.github.elic0de.thejpspit.config.Settings;
+import com.github.elic0de.thejpspit.database.Database;
+import com.github.elic0de.thejpspit.database.SqLiteDatabase;
+import com.github.elic0de.thejpspit.hook.PlaceholderHook;
+import com.github.elic0de.thejpspit.leveler.Levels;
+import com.github.elic0de.thejpspit.listener.CombatTagger;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+import com.github.elic0de.thejpspit.player.PitPlayerManager;
+import com.github.elic0de.thejpspit.game.Game;
+import com.github.elic0de.thejpspit.hook.EconomyHook;
+import com.github.elic0de.thejpspit.hook.Hook;
+import com.github.elic0de.thejpspit.hook.VaultEconomyHook;
+import com.github.elic0de.thejpspit.item.ItemManager;
+import com.github.elic0de.thejpspit.listener.BlockPlaceListener;
+import com.github.elic0de.thejpspit.listener.EventListener;
+import com.github.elic0de.thejpspit.util.KillAssistHelper;
+import com.github.elic0de.thejpspit.util.KillRatingHelper;
+import com.github.elic0de.thejpspit.villager.VillagerNPCManager;
+import com.github.elic0de.thejpspit.villager.villagers.ShopVillager;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import me.clip.placeholderapi.configuration.PlaceholderAPIConfig;
+import net.william278.annotaml.Annotaml;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
-import org.bukkit.attribute.Attribute;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
-
-
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -45,19 +46,16 @@
 public final class TheJpsPit extends JavaPlugin {
 
     private static TheJpsPit instance;
+    private Settings settings;
     private Game game;
     private Database database;
     private KillRatingHelper ratingHelper;
 
     private KillAssistHelper assistKillHelper;
-    private QueueManager queueManager;
-    private QueueTask queueTask;
     private List<Hook> hooks = new ArrayList<>();
 
     private Optional<PitPreferences> pitPreferences;
 
-    private PacketManager packetManager;
-
     public static TheJpsPit getInstance() {
         return instance;
     }
@@ -67,9 +65,25 @@ public void onLoad() {
         instance = this;
     }
 
+    private void loadConfig() throws RuntimeException {
+        try {
+            this.settings = Annotaml.create(new File(getDataFolder(), "config.yml"), Settings.class).get();
+        } catch (IOException | InvocationTargetException | InstantiationException |
+                 IllegalAccessException e) {
+            getLogger().log(Level.SEVERE, "Failed to load configuration files", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void reload() {
+        loadConfig();
+        Levels.initialize();
+    }
+
     @Override
     public void onEnable() {
         // Initialize TheJpsPit
+        this.loadConfig();
         saveConfig();
         final AtomicBoolean initialized = new AtomicBoolean(true);
         game = new Game();
@@ -88,17 +102,9 @@ public void onEnable() {
 
         assistKillHelper = new KillAssistHelper();
         ratingHelper = new KillRatingHelper(0);
-        queueManager = new QueueManager();
-        queueTask = new QueueTask();
 
         setPreferences();
-        setPacketManager();
-
-        getServer().getMessenger()
-                .registerIncomingPluginChannel(this, PluginMessageReceiver.BUNGEE_CHANNEL_ID,
-                        new PluginMessageReceiver());
-        getServer().getMessenger()
-                .registerOutgoingPluginChannel(this, PluginMessageReceiver.BUNGEE_CHANNEL_ID);
+        //setPacketManager();
 
         registerCommands();
         registerListener();
@@ -111,7 +117,7 @@ public void onEnable() {
             world.setGameRule(GameRule.KEEP_INVENTORY, true);
         });
 
-        createItems();
+        ItemManager.createItems();
         createNPCs();
 
         Bukkit.getOnlinePlayers().forEach(player -> {
@@ -129,7 +135,6 @@ public void onEnable() {
             if (updateNeeded) {
                 database.updateUserData(pitPlayer);
             }
-
         });
     }
 
@@ -144,7 +149,7 @@ private void setPreferences() {
         this.pitPreferences = preferences;
     }
 
-    private void setPacketManager() {
+/*    private void setPacketManager() {
         final String serverVersion = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3].trim();
         PacketManager packetManager;
         switch (serverVersion) {
@@ -155,7 +160,7 @@ private void setPacketManager() {
                 throw new RuntimeException("Failed to create version specific server accessor");
         }
         this.packetManager = packetManager;
-    }
+    }*/
 
     private void registerCommands() {
         PaperCommandManager commandManager = new PaperCommandManager(this);
@@ -164,26 +169,23 @@ private void registerCommands() {
 
         commandManager.registerCommand(new PitCommand());
         commandManager.registerCommand(new SpawnCommand());
+        commandManager.registerCommand(new PitChatCommand());
     }
 
     private void registerListener() {
         new EventListener();
         new CombatTagger();
+        new BlockPlaceListener();
     }
 
     private void registerHooks() {
         final PluginManager plugins = Bukkit.getPluginManager();
         if (plugins.getPlugin("Vault") != null) {
             this.registerHook(new VaultEconomyHook(this));
         }
-    }
-
-    private void createItems() {
-        ItemManager.register(new ItemDiamondSword());
-        ItemManager.register(new ItemDiamondChestPlate());
-        ItemManager.register(new ItemDiamondBoots());
-        ItemManager.register(new ItemObsidian());
-        ItemManager.register(new ItemVividSword());
+        if (plugins.getPlugin("PlaceholderAPI") != null) {
+            new PlaceholderHook().register();
+        }
     }
 
     private void createNPCs() {
@@ -192,18 +194,18 @@ private void createNPCs() {
 
     @Override
     public void onDisable() {
-        pitPreferences.ifPresent(preferences -> database.updatePitPreferences(preferences));
         // Plugin shutdown logic
         if (database != null) {
             database.terminate();
         }
         game.getTask().stop();
 
-        queueTask.stop();
-
         getServer().getMessenger().unregisterOutgoingPluginChannel(this);
         getServer().getMessenger().unregisterIncomingPluginChannel(this);
 
+        //　置かれたブロックを削除
+        BlockPlaceListener.restoreBlocks();
+
         Bukkit.getOnlinePlayers().forEach(player -> {
             final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(player);
             game.leave(pitPlayer);
@@ -214,6 +216,10 @@ public void onDisable() {
         Bukkit.getScheduler().cancelTasks(this);
     }
 
+    public Settings getSettings() {
+        return settings;
+    }
+
     private List<Hook> getHooks() {
         return hooks;
     }
@@ -254,17 +260,10 @@ public KillAssistHelper getAssistKillHelper() {
         return assistKillHelper;
     }
 
-    public QueueManager getQueueManager() {
-        return queueManager;
-    }
-
     public Optional<PitPreferences> getPitPreferences() {
         return pitPreferences;
     }
 
-    public PacketManager getPacketManager() {
-        return packetManager;
-    }
 
     public Gson getGson() {
         return Converters.registerOffsetDateTime(new GsonBuilder().excludeFieldsWithoutExposeAnnotation()).create();

src/main/java/com/github/elic0de/thejpspit/bungee/RequestReceiveListener.java

@@ -0,0 +1,19 @@
+package com.github.elic0de.thejpspit.command;
+
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.CommandAlias;
+import com.github.elic0de.thejpspit.TheJpsPit;
+import com.github.elic0de.thejpspit.gui.PitChatMenu;
+import com.github.elic0de.thejpspit.player.PitPlayer;
+import com.github.elic0de.thejpspit.player.PitPlayerManager;
+import org.bukkit.entity.Player;
+
+public class PitChatCommand extends BaseCommand {
+    private final TheJpsPit pit = TheJpsPit.getInstance();
+
+    @CommandAlias("pitchat")
+    public void onChat(Player player) {
+        final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(player);
+        PitChatMenu.create(pit, "PitChat").show(pitPlayer);
+    }
+}