ref rename package

Elic0de · Elic0de · commit 81ae5dd6eeeb · 2023-04-09T09:44:13.000+09:00
diff --git a/pom.xml b/pom.xml
@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.github.elic0de</groupId>
-    <artifactId>hungergames</artifactId>
+    <artifactId>battleroyale</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>HungerGames</name>
+    <name>BattleRoyale</name>
 
     <properties>
         <java.version>1.8</java.version>
diff --git a/src/main/java/com/github/elic0de/battleroyale/BattleRoyale.java b/src/main/java/com/github/elic0de/battleroyale/BattleRoyale.java
@@ -1,18 +1,18 @@
-package com.github.elic0de.hungergames;
+package com.github.elic0de.battleroyale;
 
 import co.aikar.commands.PaperCommandManager;
 import com.github.elic0de.eliccommon.plugin.AbstractPlugin;
-import com.github.elic0de.hungergames.command.HungerCommand;
-import com.github.elic0de.hungergames.game.HungerGame;
-import com.github.elic0de.hungergames.listener.EventListener;
-import com.github.elic0de.hungergames.user.GameUserManager;
+import com.github.elic0de.battleroyale.command.BattleCommand;
+import com.github.elic0de.battleroyale.game.Game;
+import com.github.elic0de.battleroyale.listener.EventListener;
+import com.github.elic0de.battleroyale.user.GameUserManager;
 import org.bukkit.Bukkit;
 
-public final class HungerGames extends AbstractPlugin {
+public final class BattleRoyale extends AbstractPlugin {
 
-    private static HungerGames instance;
+    private static BattleRoyale instance;
 
-    private HungerGame game;
+    private Game game;
 
     @Override
     public void onLoad() {
@@ -23,7 +23,7 @@ public void onLoad() {
     @Override
     public void onEnable() {
         // Plugin startup logic
-        game = new HungerGame();
+        game = new Game();
 
         registerCommands();
 
@@ -43,14 +43,14 @@ private void registerCommands() {
         PaperCommandManager commandManager = new PaperCommandManager(this);
 
         commandManager.enableUnstableAPI("brigadier");
-        commandManager.registerCommand(new HungerCommand());
+        commandManager.registerCommand(new BattleCommand());
     }
 
-    public HungerGame getGame() {
+    public Game getGame() {
         return game;
     }
 
-    public static HungerGames getInstance() {
+    public static BattleRoyale getInstance() {
         return instance;
     }
 }
diff --git a/src/main/java/com/github/elic0de/battleroyale/chest/DeathChest.java b/src/main/java/com/github/elic0de/battleroyale/chest/DeathChest.java
@@ -1,7 +1,7 @@
-package com.github.elic0de.hungergames.chest;
+package com.github.elic0de.battleroyale.chest;
 
-import com.github.elic0de.hungergames.menu.DeathChestMenu;
-import com.github.elic0de.hungergames.user.GameUser;
+import com.github.elic0de.battleroyale.menu.DeathChestMenu;
+import com.github.elic0de.battleroyale.user.GameUser;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
diff --git a/src/main/java/com/github/elic0de/battleroyale/dragon/DragonTrait.java b/src/main/java/com/github/elic0de/battleroyale/dragon/DragonTrait.java
@@ -1,9 +1,7 @@
-package com.github.elic0de.hungergames.dragon;
+package com.github.elic0de.battleroyale.dragon;
 
-import com.github.elic0de.hungergames.HungerGames;
+import com.github.elic0de.battleroyale.BattleRoyale;
 import net.citizensnpcs.api.trait.Trait;
-import net.citizensnpcs.npc.CitizensNPC;
-import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.WorldBorder;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -44,7 +42,7 @@ public void run() {
                 if (npc.getNavigator().isNavigating()) return;
                 if (npc.isSpawned()) npc.getNavigator().setTarget(locations.get(index.incrementAndGet()));
             }
-        }.runTaskTimer(HungerGames.getInstance(), 0, 20);
+        }.runTaskTimer(BattleRoyale.getInstance(), 0, 20);
     }
 
     public void reset() {
diff --git a/src/main/java/com/github/elic0de/battleroyale/game/GameBorder.java b/src/main/java/com/github/elic0de/battleroyale/game/GameBorder.java
@@ -1,6 +1,6 @@
-package com.github.elic0de.hungergames.game;
+package com.github.elic0de.battleroyale.game;
 
-import com.github.elic0de.hungergames.HungerGames;
+import com.github.elic0de.battleroyale.BattleRoyale;
 import de.themoep.minedown.MineDown;
 import org.bukkit.Bukkit;
 import org.bukkit.WorldBorder;
@@ -12,7 +12,7 @@
 
 public class GameBorder {
 
-    private final HungerGame game;
+    private final Game game;
 
     private final WorldBorder border = Bukkit.getWorlds().get(0).getWorldBorder();
 
@@ -22,7 +22,7 @@ public class GameBorder {
 
     private final AtomicLong borderTicks = new AtomicLong();
 
-    public GameBorder(HungerGame game) {
+    public GameBorder(Game game) {
         this.game = game;
         border.setDamageBuffer(2);
         border.setDamageAmount(0.5D);
@@ -50,7 +50,7 @@ public void run() {
                 game.getBossBar().setProgress((double) Math.max(timeInSeconds - borderTicks.get(), 0) / timeInSeconds);
                 game.getPlayers().forEach(player -> player.sendActionBar(new MineDown(String.format("ボーダーとの距離: &a%d &rブロック", (int) getDistanceToBorder(player.getPlayer(), border)))));
             }
-        }.runTaskTimer(HungerGames.getInstance(), 0, PERIOD);
+        }.runTaskTimer(BattleRoyale.getInstance(), 0, PERIOD);
     }
 
     public void stop() {
diff --git a/src/main/java/com/github/elic0de/battleroyale/game/GameBossBar.java b/src/main/java/com/github/elic0de/battleroyale/game/GameBossBar.java
@@ -1,6 +1,6 @@
-package com.github.elic0de.hungergames.game;
+package com.github.elic0de.battleroyale.game;
 
-import com.github.elic0de.hungergames.user.GameUser;
+import com.github.elic0de.battleroyale.user.GameUser;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.boss.BarColor;
diff --git a/src/main/java/com/github/elic0de/battleroyale/game/GameRecords.java b/src/main/java/com/github/elic0de/battleroyale/game/GameRecords.java
@@ -1,6 +1,6 @@
-package com.github.elic0de.hungergames.game;
+package com.github.elic0de.battleroyale.game;
 
-import com.github.elic0de.hungergames.user.GameUser;
+import com.github.elic0de.battleroyale.user.GameUser;
 import de.themoep.minedown.MineDown;
 
 import java.util.*;
@@ -11,13 +11,13 @@ public class GameRecords {
     // 全記録
     private final Map<UUID, Long> records = new HashMap<>();
 
-    private final HungerGame game;
+    private final Game game;
 
     private Map<UUID, Integer> rank = new HashMap<>();
 
     private UUID killLeader;
 
-    public GameRecords(HungerGame game) {
+    public GameRecords(Game game) {
         this.game = game;
         sortAsync();
     }
diff --git a/src/main/java/com/github/elic0de/battleroyale/game/phase/InGamePhase.java b/src/main/java/com/github/elic0de/battleroyale/game/phase/InGamePhase.java
@@ -1,14 +1,14 @@
-package com.github.elic0de.hungergames.game.phase;
+package com.github.elic0de.battleroyale.game.phase;
 
 import com.github.elic0de.eliccommon.game.phase.Phase;
 import com.github.elic0de.eliccommon.user.OnlineUser;
-import com.github.elic0de.hungergames.game.HungerGame;
-import com.github.elic0de.hungergames.user.GameUser;
+import com.github.elic0de.battleroyale.game.Game;
+import com.github.elic0de.battleroyale.user.GameUser;
 
 public class InGamePhase extends Phase {
 
-    private final HungerGame game;
-    public InGamePhase(HungerGame game) {
+    private final Game game;
+    public InGamePhase(Game game) {
         super(-0L, -0L);
         this.game = game;
     }
diff --git a/src/main/java/com/github/elic0de/battleroyale/game/phase/WaitingPhase.java b/src/main/java/com/github/elic0de/battleroyale/game/phase/WaitingPhase.java
@@ -1,4 +1,4 @@
-package com.github.elic0de.hungergames.game.phase;
+package com.github.elic0de.battleroyale.game.phase;
 
 import com.github.elic0de.eliccommon.game.phase.Phase;
 import com.github.elic0de.eliccommon.user.OnlineUser;
diff --git a/src/main/java/com/github/elic0de/battleroyale/listener/EventListener.java b/src/main/java/com/github/elic0de/battleroyale/listener/EventListener.java
@@ -1,24 +1,22 @@
-package com.github.elic0de.hungergames.listener;
+package com.github.elic0de.battleroyale.listener;
 
 import com.github.elic0de.eliccommon.util.ItemBuilder;
-import com.github.elic0de.hungergames.HungerGames;
-import com.github.elic0de.hungergames.game.HungerGame;
-import com.github.elic0de.hungergames.game.phase.InGamePhase;
-import com.github.elic0de.hungergames.game.phase.WaitingPhase;
-import com.github.elic0de.hungergames.user.GameUser;
-import com.github.elic0de.hungergames.user.GameUserManager;
+import com.github.elic0de.battleroyale.BattleRoyale;
+import com.github.elic0de.battleroyale.game.Game;
+import com.github.elic0de.battleroyale.game.phase.InGamePhase;
+import com.github.elic0de.battleroyale.game.phase.WaitingPhase;
+import com.github.elic0de.battleroyale.user.GameUser;
+import com.github.elic0de.battleroyale.user.GameUserManager;
 import de.themoep.minedown.MineDown;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import org.bukkit.*;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
@@ -33,7 +31,7 @@
 
 public class EventListener implements Listener {
 
-    private final HungerGame game = HungerGames.getInstance().getGame();
+    private final Game game = BattleRoyale.getInstance().getGame();
 
     @EventHandler
     private void onJoin(PlayerJoinEvent event) {
diff --git a/src/main/java/com/github/elic0de/battleroyale/menu/DeathChestMenu.java b/src/main/java/com/github/elic0de/battleroyale/menu/DeathChestMenu.java
@@ -1,11 +1,10 @@
-package com.github.elic0de.hungergames.menu;
+package com.github.elic0de.battleroyale.menu;
 
-import com.github.elic0de.hungergames.HungerGames;
-import com.github.elic0de.hungergames.chest.DeathChest;
+import com.github.elic0de.battleroyale.BattleRoyale;
+import com.github.elic0de.battleroyale.chest.DeathChest;
 import de.themoep.inventorygui.GuiStorageElement;
 import de.themoep.inventorygui.InventoryGui;
 import org.bukkit.Bukkit;
-import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -18,7 +17,7 @@ public class DeathChestMenu {
 
     private final Player player;
 
-    private final DeathChest deathChest = HungerGames.getInstance().getGame().getDeathChest();
+    private final DeathChest deathChest = BattleRoyale.getInstance().getGame().getDeathChest();
 
     private static final String[] MENU_LAYOUT = {
             "ppppppppp",
@@ -31,7 +30,7 @@ public class DeathChestMenu {
 
     public DeathChestMenu(ItemStack[] itemStacks, Consumer<ItemStack[]> items, Player player) {
         this.player = player;
-        this.menu = new InventoryGui(HungerGames.getInstance(), "DeathChest", MENU_LAYOUT);
+        this.menu = new InventoryGui(BattleRoyale.getInstance(), "DeathChest", MENU_LAYOUT);
         Inventory inv = Bukkit.createInventory(null, 54);
         inv.setContents(itemStacks);
         menu.addElement(new GuiStorageElement('p', inv));
diff --git a/src/main/java/com/github/elic0de/battleroyale/modifier/ModifierManager.java b/src/main/java/com/github/elic0de/battleroyale/modifier/ModifierManager.java
@@ -1,33 +1,38 @@
-package com.github.elic0de.hungergames.modifier;
+package com.github.elic0de.battleroyale.modifier;
 
-import com.github.elic0de.hungergames.animation.Test;
-import com.github.elic0de.hungergames.game.HungerGame;
-import com.github.elic0de.hungergames.modifier.modifiers.GameModifier;
-import com.github.elic0de.hungergames.modifier.modifiers.TrueUHC;
+import com.github.elic0de.battleroyale.animation.Test;
+import com.github.elic0de.battleroyale.game.Game;
+import com.github.elic0de.battleroyale.modifier.modifiers.*;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
 public class ModifierManager {
 
 
-    private final HungerGame game;
+    private final Game game;
     private final Random random = new Random();
     private GameModifier currentModifier;
 
     private final Map<String, GameModifier> modifiers = new HashMap<>();
 
-    public ModifierManager(HungerGame game) {
+    public ModifierManager(Game game) {
         this.game = game;
         registerMissions();
     }
 
     private void registerMissions() {
-        modifiers.put(Modifiers.GET_A_IRON_INGOT.getKey(), new TrueUHC());
+        modifiers.put(Modifiers.TRUE_UHC.getKey(), new TrueUHC());
+        modifiers.put(Modifiers.MAGIC_POWER.getKey(), new MagicPower());
+        modifiers.put(Modifiers.FLOWER_POWER.getKey(), new FlowerPower());
+        modifiers.put(Modifiers.PERALS.getKey(), new Pearls());
+        modifiers.put(Modifiers.NIGHT_TIME.getKey(), new NightTime());
+        modifiers.put(Modifiers.HEALTH_ON_KILL.getKey(), new HealthOnKill());
     }
 
     public void modify() {
-        Test.animation(getModifiers());
+        new Test().animation(getModifiers());
+        getCurrentMission().modify();
     }
 
     public void reset() {
@@ -38,7 +43,7 @@ private void randomModifier() {
         getRandomModifier().ifPresent(mission -> currentModifier = mission);
     }
 
-    private GameModifier getCurrentMission() {
+    public GameModifier getCurrentMission() {
         if (currentModifier == null) {
             randomModifier();
         }
diff --git a/src/main/java/com/github/elic0de/battleroyale/modifier/Modifiers.java b/src/main/java/com/github/elic0de/battleroyale/modifier/Modifiers.java
@@ -0,0 +1,21 @@
+package com.github.elic0de.battleroyale.modifier;
+
+public enum Modifiers {
+    TRUE_UHC("uhc"),
+    MAGIC_POWER("magic"),
+    FLOWER_POWER("flower_power"),
+    HEALTH_ON_KILL("health_on_kill"),
+    NIGHT_TIME("night_time"),
+    PERALS("pearls");
+
+    private final String key;
+
+
+    Modifiers(String key) {
+        this.key = key;
+    }
+
+    public String getKey() {
+        return key;
+    }
+}
diff --git a/src/main/java/com/github/elic0de/battleroyale/user/GameUser.java b/src/main/java/com/github/elic0de/battleroyale/user/GameUser.java
@@ -1,4 +1,4 @@
-package com.github.elic0de.hungergames.user;
+package com.github.elic0de.battleroyale.user;
 
 import com.github.elic0de.eliccommon.user.OnlineUser;
 import net.md_5.bungee.api.ChatMessageType;
diff --git a/src/main/java/com/github/elic0de/battleroyale/user/GameUserManager.java b/src/main/java/com/github/elic0de/battleroyale/user/GameUserManager.java
@@ -1,4 +1,4 @@
-package com.github.elic0de.hungergames.user;
+package com.github.elic0de.battleroyale.user;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/com/github/elic0de/hungergames/modifier/Modifiers.java b/src/main/java/com/github/elic0de/hungergames/modifier/Modifiers.java
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: HungerGames
 version: '${project.version}'
-main: com.github.elic0de.hungergames.HungerGames
+main: com.github.elic0de.battleroyale.BattleRoyale
 api-version: 1.19
 depend: [Citizens]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.elic0de.hungergames.game.phase;`
	`1`	`+package com.github.elic0de.battleroyale.game.phase;`
`2`	`2`
`3`	`3`	`import com.github.elic0de.eliccommon.game.phase.Phase;`
`4`	`4`	`import com.github.elic0de.eliccommon.user.OnlineUser;`