Renaming classes

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/MWCommandCompletions.java

@@ -57,7 +57,7 @@ public class MWCommandCompletions {
             Game game = GameManager.getInstance().getGame(player.getLocation());
             if (game == null) return null;
 
-            return game.getArena().getMissileConfiguration().getSchematicNames();
+            return game.getArena().getMissileConfig().getSchematicNames();
         });
     }
     

missilewars-plugin/src/main/java/de/butzlabben/missilewars/commands/MWCommands.java

@@ -236,7 +236,7 @@ public class MWCommands extends BaseCommand {
             return;
         }
 
-        Missile missile = (Missile) game.getArena().getMissileConfiguration().getSchematicFromFileName(args[0]);
+        Missile missile = (Missile) game.getArena().getMissileConfig().getSchematicFromFileName(args[0]);
         if (missile == null) {
             player.sendMessage(PluginMessages.getMessage(true, PluginMessages.MessageEnum.COMMAND_INVALID_MISSILE)
                     .replace("%input%", args[0]));

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/AreaConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/AreaConfig.java

@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
 @Getter
 @ToString
 @AllArgsConstructor
-public class AreaConfiguration implements ConfigurationSerializable {
+public class AreaConfig implements ConfigurationSerializable {
 
     @SerializedName("min_x") private int minX;
     @SerializedName("min_y") private int minY;
@@ -49,8 +49,8 @@ public class AreaConfiguration implements ConfigurationSerializable {
      *
      * @return an area configuration around the location
      */
-    public static AreaConfiguration aroundLocation(Location location, int margin) {
-        return new AreaConfiguration(location.getBlockX() - margin,
+    public static AreaConfig aroundLocation(Location location, int margin) {
+        return new AreaConfig(location.getBlockX() - margin,
                 0,
                 location.getBlockZ() - margin,
                 location.getBlockX() + margin,

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/Arena.java

@@ -39,22 +39,22 @@ public class Arena implements Cloneable {
     @SerializedName("display_material") private String displayMaterial = "STONE";
     @SerializedName("template_world") private String templateWorld = "default_map";
     @SerializedName("auto_respawn") private boolean autoRespawn = true;
-    @SerializedName("game_spawn") private GameSpawnConfiguration spawn = new GameSpawnConfiguration();
-    @SerializedName("game_respawn") private GameRespawnConfiguration respawn = new GameRespawnConfiguration();
+    @SerializedName("game_spawn") private GameSpawnConfig spawn = new GameSpawnConfig();
+    @SerializedName("game_respawn") private GameRespawnConfig respawn = new GameRespawnConfig();
     @SerializedName("do_tile_drops") private boolean doTileDrops = false;
     @SerializedName("keep_inventory") private boolean keepInventory = false;
     @SerializedName("max_move_height") private int maxMoveHeight = 170;
     @SerializedName("death_height") private int deathHeight = 65;
     @SerializedName("game_duration") private int gameDuration = 30;
-    @SerializedName("fireball") private FireballConfiguration fireballConfiguration = new FireballConfiguration();
-    @SerializedName("arrow") private ArrowConfiguration arrowConfiguration = new ArrowConfiguration();
+    @SerializedName("fireball") private FireballConfig fireballConfig = new FireballConfig();
+    @SerializedName("arrow") private ArrowConfig arrowConfig = new ArrowConfig();
     @SerializedName("save_statistics") private boolean saveStatistics = true;
-    @SerializedName("fall_protection") private FallProtectionConfiguration fallProtection = new FallProtectionConfiguration();
-    @SerializedName("game_result.money") private MoneyConfiguration money = new MoneyConfiguration();
-    @SerializedName("equipment_interval") private EquipmentIntervalConfiguration interval = new EquipmentIntervalConfiguration();
-    @SerializedName("missile") private MissileConfiguration missileConfiguration = new MissileConfiguration();
-    @SerializedName("shield") private ShieldConfiguration shieldConfiguration = new ShieldConfiguration();
-    @Setter @SerializedName("area") private AreaConfiguration areaConfig = new AreaConfiguration(-30, 0, -72, 30, 256, 72);
+    @SerializedName("fall_protection") private FallProtectionConfig fallProtection = new FallProtectionConfig();
+    @SerializedName("game_result.money") private MoneyConfig money = new MoneyConfig();
+    @SerializedName("equipment_interval") private EquipmentIntervalConfig interval = new EquipmentIntervalConfig();
+    @SerializedName("missile") private MissileConfig missileConfig = new MissileConfig();
+    @SerializedName("shield") private ShieldConfig shieldConfig = new ShieldConfig();
+    @Setter @SerializedName("area") private AreaConfig areaConfig = new AreaConfig(-30, 0, -72, 30, 256, 72);
     @SerializedName("teamchange_ongoing_game") private boolean teamchangeOngoingGame = false;
 
     @SerializedName("spectator_spawn")

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/ArrowConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/ArrowConfig.java

@@ -25,7 +25,7 @@ import lombok.ToString;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class ArrowConfiguration {
+public class ArrowConfig {
 
     private int occurrence = 2;
     private int amount = 3;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/EquipmentIntervalConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/EquipmentIntervalConfig.java

@@ -28,7 +28,7 @@ import lombok.ToString;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class EquipmentIntervalConfiguration {
+public class EquipmentIntervalConfig {
 
     @SerializedName("custom_start_interval") private int customStartInterval = 10;
     @SerializedName("reset_after_respawn") private boolean resetAfterRespawn = true;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/FallProtectionConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/FallProtectionConfig.java

@@ -26,7 +26,7 @@ import lombok.ToString;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class FallProtectionConfiguration {
+public class FallProtectionConfig {
 
     private boolean enabled = true;
     private int duration = 60;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/FireballConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/FireballConfig.java

@@ -26,7 +26,7 @@ import lombok.ToString;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class FireballConfiguration {
+public class FireballConfig {
 
     private String name = "Fireball";
     private int occurrence = 2;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/GameSpawnConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/GameRespawnConfig.java

@@ -26,7 +26,7 @@ import lombok.ToString;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class GameSpawnConfiguration {
+public class GameRespawnConfig {
 
     @SerializedName("send_bow") private boolean sendBow = true;
     @SerializedName("send_pickaxe") private boolean sendPickaxe = false;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/GameRespawnConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/GameSpawnConfig.java

@@ -26,7 +26,7 @@ import lombok.ToString;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class GameRespawnConfiguration {
+public class GameSpawnConfig {
 
     @SerializedName("send_bow") private boolean sendBow = true;
     @SerializedName("send_pickaxe") private boolean sendPickaxe = false;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/MissileConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/MissileConfig.java

@@ -35,7 +35,7 @@ import java.util.*;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class MissileConfiguration extends SchematicConfiguration {
+public class MissileConfig extends SchematicConfiguration {
 
     // TODO pretty names
     private boolean onlyBlockPlaceable = false;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/MoneyConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/MoneyConfig.java

@@ -25,7 +25,7 @@ import lombok.ToString;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class MoneyConfiguration {
+public class MoneyConfig {
 
     private int win = 80;
     private int loss = 50;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/ShieldConfiguration.java → missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/arena/ShieldConfig.java

@@ -36,7 +36,7 @@ import java.util.Set;
 @Getter
 @ToString
 @RequiredArgsConstructor
-public class ShieldConfiguration extends SchematicConfiguration {
+public class ShieldConfig extends SchematicConfiguration {
 
     @SerializedName("fly_time") private int flyTime = 20;
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/configuration/lobby/Lobby.java

@@ -21,7 +21,7 @@ package de.butzlabben.missilewars.configuration.lobby;
 import com.google.gson.annotations.SerializedName;
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.configuration.Config;
-import de.butzlabben.missilewars.configuration.arena.AreaConfiguration;
+import de.butzlabben.missilewars.configuration.arena.AreaConfig;
 import de.butzlabben.missilewars.configuration.arena.Arena;
 import de.butzlabben.missilewars.game.Arenas;
 import de.butzlabben.missilewars.game.enums.JoinIngameBehavior;
@@ -62,7 +62,7 @@ public class Lobby {
     @SerializedName("team_spectator") private GameTeamConfiguration teamConfigSpec = new GameTeamConfiguration("Spectator", "&f");
     @Setter @SerializedName("spawn_point") private Location spawnPoint = Config.getFallbackSpawn().add(40, 0, 0);
     @Setter @SerializedName("after_game_spawn") private Location afterGameSpawn = Config.getFallbackSpawn();
-    @Setter @SerializedName("area") private AreaConfiguration areaConfig = AreaConfiguration.aroundLocation(spawnPoint, 20);
+    @Setter @SerializedName("area") private AreaConfig areaConfig = AreaConfig.aroundLocation(spawnPoint, 20);
     @SerializedName("map_choose_procedure") private MapChooseProcedure mapChooseProcedure = MapChooseProcedure.FIRST;
     @SerializedName("join_ongoing_game") private JoinIngameBehavior joinIngameBehavior = JoinIngameBehavior.SPECTATOR;
     @SerializedName("rejoin_ongoing_game") private RejoinIngameBehavior rejoinIngameBehavior = RejoinIngameBehavior.LAST_TEAM;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/Game.java

@@ -457,7 +457,7 @@ public class Game {
     public void spawnMissile(Player player, ItemStack itemStack) {
 
         // Are missiles only allowed to spawn inside the arena, between the two arena spawn points?
-        boolean isOnlyBetweenSpawnPlaceable = this.arena.getMissileConfiguration().isOnlyBetweenSpawnPlaceable();
+        boolean isOnlyBetweenSpawnPlaceable = this.arena.getMissileConfig().isOnlyBetweenSpawnPlaceable();
         if (isOnlyBetweenSpawnPlaceable) {
             if (!isInInnerGameArea(player.getLocation())) {
                 player.sendMessage(PluginMessages.getMessage(true, PluginMessages.MessageEnum.ARENA_MISSILE_PLACE_DENY));
@@ -468,7 +468,7 @@ public class Game {
         ItemMeta itemMeta = itemStack.getItemMeta();
         if (itemMeta == null) return;
         
-        Missile missile = (Missile) this.arena.getMissileConfiguration().getSchematicFromDisplayName(itemMeta.getDisplayName());
+        Missile missile = (Missile) this.arena.getMissileConfig().getSchematicFromDisplayName(itemMeta.getDisplayName());
         if (missile == null) {
             player.sendMessage(PluginMessages.getMessage(true, PluginMessages.MessageEnum.COMMAND_INVALID_MISSILE)
                     .replace("%input%", itemMeta.getDisplayName()));
@@ -491,7 +491,7 @@ public class Game {
         ItemMeta itemMeta = ball.getItem().getItemMeta();
         if (itemMeta == null) return;
 
-        Shield shield = (Shield) this.arena.getShieldConfiguration().getSchematicFromDisplayName(itemMeta.getDisplayName());
+        Shield shield = (Shield) this.arena.getShieldConfig().getSchematicFromDisplayName(itemMeta.getDisplayName());
         if (shield == null) {
             player.sendMessage(PluginMessages.getMessage(true, PluginMessages.MessageEnum.COMMAND_INVALID_SHIELD)
                     .replace("%input%", itemMeta.getDisplayName()));
@@ -525,8 +525,8 @@ public class Game {
             throw new IllegalStateException("Arena already set");
         }
 
-        arena.getMissileConfiguration().check();
-        arena.getShieldConfiguration().check();
+        arena.getMissileConfig().check();
+        arena.getShieldConfig().check();
 
         this.arena = arena.clone();
         gameWorld = new GameWorld(this, arena.getTemplateWorld());

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/equipment/SchematicGameEquipment.java

@@ -52,13 +52,13 @@ public class SchematicGameEquipment {
     private void createSchematicEquipmentList(SchematicObject.schematicType schematicType) {
 
         if (schematicType == SchematicObject.schematicType.MISSILE) {
-            for (SchematicObject object : game.getArena().getMissileConfiguration().getSchematics()) {
+            for (SchematicObject object : game.getArena().getMissileConfig().getSchematics()) {
                 for (int i = object.getOccurrence(); i > 0; i--) {
                     schematicEquipmentList.add(object);
                 }
             }
         } else if (schematicType == SchematicObject.schematicType.SHIELD) {
-            for (SchematicObject object : game.getArena().getShieldConfiguration().getSchematics()) {
+            for (SchematicObject object : game.getArena().getShieldConfig().getSchematics()) {
                 for (int i = object.getOccurrence(); i > 0; i--) {
                     schematicEquipmentList.add(object);
                 }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/equipment/SpecialGameEquipment.java

@@ -60,8 +60,8 @@ public class SpecialGameEquipment {
      */
     private void createSpecialEquipmentList() {
         
-        int arrowOccurrence = game.getArena().getArrowConfiguration().getOccurrence();
-        int fireballOccurrence = game.getArena().getFireballConfiguration().getOccurrence();
+        int arrowOccurrence = game.getArena().getArrowConfig().getOccurrence();
+        int fireballOccurrence = game.getArena().getFireballConfig().getOccurrence();
 
         for (int i = arrowOccurrence; i > 0; i--) {
             specialEquipmentList.add(arrow);
@@ -77,7 +77,7 @@ public class SpecialGameEquipment {
      * This method creates the arrow item stack.
      */
     private void createArrow() {
-        arrow = new ItemStack(Material.ARROW, game.getArena().getArrowConfiguration().getAmount());
+        arrow = new ItemStack(Material.ARROW, game.getArena().getArrowConfig().getAmount());
     }
 
     /**
@@ -86,7 +86,7 @@ public class SpecialGameEquipment {
     private void createFireball() {
         fireball = new ItemStack(Material.FIRE_CHARGE);
         ItemMeta fireballMeta = fireball.getItemMeta();
-        fireballMeta.setDisplayName(game.getArena().getFireballConfiguration().getName());
+        fireballMeta.setDisplayName(game.getArena().getFireballConfig().getName());
         fireball.setItemMeta(fireballMeta);
     }
 

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/misc/MissileWarsPlaceholder.java

@@ -182,7 +182,7 @@ public class MissileWarsPlaceholder extends PlaceholderExpansion {
 
                 // %missilewars_arena_missileamount_<arena name or 'this'>%
                 if (params.equalsIgnoreCase("arena_missileamount_" + arena.getName())) {
-                    return Integer.toString(arena.getMissileConfiguration().getSchematics().size());
+                    return Integer.toString(arena.getMissileConfig().getSchematics().size());
                 }
                 
                 // %missilewars_arena_gameduration_<arena name or 'this'>%

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/schematics/SchematicFacing.java

@@ -19,7 +19,7 @@
 package de.butzlabben.missilewars.game.schematics;
 
 import de.butzlabben.missilewars.Logger;
-import de.butzlabben.missilewars.configuration.arena.MissileConfiguration;
+import de.butzlabben.missilewars.configuration.arena.MissileConfig;
 import de.butzlabben.missilewars.util.missile.Interval;
 import org.bukkit.entity.Player;
 
@@ -46,7 +46,7 @@ public enum SchematicFacing {
         this.secondary = secondary;
     }
 
-    public static SchematicFacing getFacing(double degree, MissileConfiguration configuration) {
+    public static SchematicFacing getFacing(double degree, MissileConfig configuration) {
         List<SchematicFacing> values = Arrays.stream(SchematicFacing.values()).filter(f -> configuration.getEnabledFacings().contains(f)).collect(Collectors.toList());
         SchematicFacing facing = null;
         for (SchematicFacing fac : values) {
@@ -72,7 +72,7 @@ public enum SchematicFacing {
         return facing;
     }
 
-    public static SchematicFacing getFacingPlayer(Player playerSelf, MissileConfiguration configuration) {
+    public static SchematicFacing getFacingPlayer(Player playerSelf, MissileConfig configuration) {
         float y = playerSelf.getLocation().getYaw();
         if (y < 0) {
             y += 360;

missilewars-plugin/src/main/java/de/butzlabben/missilewars/game/schematics/objects/Missile.java

@@ -69,7 +69,7 @@ public class Missile extends SchematicObject {
     public void paste(Game game, Player player, boolean hasTempBlock, Material tempBlockMaterial, int tempBlockDelay, 
                       int tempBlockRadius) {
         
-        SchematicFacing schematicFacing = SchematicFacing.getFacingPlayer(player, game.getArena().getMissileConfiguration());
+        SchematicFacing schematicFacing = SchematicFacing.getFacingPlayer(player, game.getArena().getMissileConfig());
         if (schematicFacing == null) return;
         
         try {

missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/game/GameListener.java

@@ -21,7 +21,7 @@ package de.butzlabben.missilewars.listener.game;
 import de.butzlabben.missilewars.Logger;
 import de.butzlabben.missilewars.MissileWars;
 import de.butzlabben.missilewars.configuration.PluginMessages;
-import de.butzlabben.missilewars.configuration.arena.FallProtectionConfiguration;
+import de.butzlabben.missilewars.configuration.arena.FallProtectionConfig;
 import de.butzlabben.missilewars.event.PlayerArenaJoinEvent;
 import de.butzlabben.missilewars.event.PlayerArenaLeaveEvent;
 import de.butzlabben.missilewars.game.Game;
@@ -70,7 +70,7 @@ public class GameListener extends GameBoundListener {
         if (!isInGameWorld(event.getLocation())) return;
 
         if (event.getEntity().getType() != EntityType.FIREBALL) return;
-        if (getGame().getArena().getFireballConfiguration().isDestroysPortal()) return;
+        if (getGame().getArena().getFireballConfig().isDestroysPortal()) return;
 
         event.blockList().removeIf(b -> b.getType() == Material.NETHER_PORTAL);
     }
@@ -103,7 +103,7 @@ public class GameListener extends GameBoundListener {
             event.setCancelled(true);
 
             // Can missiles only be spawned if the item interaction was performed on a block (no air)?
-            boolean isOnlyBlockPlaceable = getGame().getArena().getMissileConfiguration().isOnlyBlockPlaceable();
+            boolean isOnlyBlockPlaceable = getGame().getArena().getMissileConfig().isOnlyBlockPlaceable();
             if (isOnlyBlockPlaceable) {
                 if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
             }
@@ -139,7 +139,7 @@ public class GameListener extends GameBoundListener {
             // or a projectile hit before.
             if (!snowball.isDead()) getGame().spawnShield(shooter, snowball);
             
-        }, getGame().getArena().getShieldConfiguration().getFlyTime());
+        }, getGame().getArena().getShieldConfig().getFlyTime());
     }
 
     @EventHandler
@@ -193,7 +193,7 @@ public class GameListener extends GameBoundListener {
             getGame().setPlayerAttributes(player);
             getGame().getPlayer(player).getPlayerEquipmentRandomizer().resetPlayerInterval();
 
-            FallProtectionConfiguration fallProtection = getGame().getArena().getFallProtection();
+            FallProtectionConfig fallProtection = getGame().getArena().getFallProtection();
             if (fallProtection.isEnabled()) {
                 new RespawnGoldBlock(player, fallProtection.getDuration(), fallProtection.isMessageOnlyOnStart(), getGame());
             }

missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/geometry/GameArea.java

@@ -18,7 +18,7 @@
 
 package de.butzlabben.missilewars.util.geometry;
 
-import de.butzlabben.missilewars.configuration.arena.AreaConfiguration;
+import de.butzlabben.missilewars.configuration.arena.AreaConfig;
 import lombok.Getter;
 import lombok.Setter;
 import org.bukkit.Location;
@@ -97,7 +97,7 @@ public class GameArea {
      * @param world      (World) the target world for the desired area
      * @param areaConfig (AreaConfiguration) the loaded Area-Configuration from which the data is taken
      */
-    public GameArea(World world, AreaConfiguration areaConfig) {
+    public GameArea(World world, AreaConfig areaConfig) {
 
         this.world = world;
 
@@ -153,8 +153,8 @@ public class GameArea {
         }
     }
 
-    public AreaConfiguration getAreaConfiguration() {
-        return new AreaConfiguration(position1.getBlockX(), position1.getBlockY(), position1.getBlockZ(),
+    public AreaConfig getAreaConfiguration() {
+        return new AreaConfig(position1.getBlockX(), position1.getBlockY(), position1.getBlockZ(),
                 position2.getBlockX(), position2.getBlockY(), position2.getBlockZ());
     }