From 686c5b201ad7f8ffce815f6e86d407cf37a19563 Mon Sep 17 00:00:00 2001 From: Cola Date: Wed, 30 Jun 2021 16:13:02 +0100 Subject: [PATCH 1/7] v2.5.0 - 1.17 & Java 16 --- pom.xml | 16 ++++++++++------ src/main/java/isaac/bastion/BastionBlock.java | 4 ++-- .../isaac/bastion/listeners/ModeListener.java | 14 +++++++------- .../bastion/storage/BastionBlockStorage.java | 4 ++-- .../bastion/utils/BastionSettingManager.java | 8 ++++---- src/main/resources/plugin.yml | 2 +- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index b7e6abe9..fce71fcb 100644 --- a/pom.xml +++ b/pom.xml @@ -13,37 +13,37 @@ isaac Bastion jar - 2.4.1 + 2.5.0 Bastion https://github.com/Civclassic/Bastion - com.destroystokyo.paper + io.papermc.paper paper - 1.16.5-R0.1-SNAPSHOT + 1.17-R0.1-SNAPSHOT provided vg.civcraft.mc.civmodcore CivModCore - 1.8.2 + 1.9.0 provided vg.civcraft.mc.namelayer NameLayer - 2.14.1 + 2.15.0 provided vg.civcraft.mc.citadel Citadel - 4.1.1 + 4.2.0 provided @@ -53,6 +53,10 @@ civ-github-repo https://raw.githubusercontent.com/CivClassic/artifacts/master/ + + papermc + https://papermc.io/repo/repository/maven-public/ + diff --git a/src/main/java/isaac/bastion/BastionBlock.java b/src/main/java/isaac/bastion/BastionBlock.java index 201e20e8..dba98da6 100644 --- a/src/main/java/isaac/bastion/BastionBlock.java +++ b/src/main/java/isaac/bastion/BastionBlock.java @@ -13,8 +13,8 @@ import vg.civcraft.mc.citadel.CitadelPermissionHandler; import vg.civcraft.mc.citadel.ReinforcementLogic; import vg.civcraft.mc.citadel.model.Reinforcement; -import vg.civcraft.mc.civmodcore.locations.QTBox; -import vg.civcraft.mc.civmodcore.util.TextUtil; +import vg.civcraft.mc.civmodcore.utilities.TextUtil; +import vg.civcraft.mc.civmodcore.world.locations.QTBox; import vg.civcraft.mc.namelayer.GroupManager; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.group.Group; diff --git a/src/main/java/isaac/bastion/listeners/ModeListener.java b/src/main/java/isaac/bastion/listeners/ModeListener.java index 586839ec..4d00943a 100644 --- a/src/main/java/isaac/bastion/listeners/ModeListener.java +++ b/src/main/java/isaac/bastion/listeners/ModeListener.java @@ -20,13 +20,13 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerMoveEvent; -import vg.civcraft.mc.civmodcore.playersettings.PlayerSetting; -import vg.civcraft.mc.civmodcore.playersettings.SettingChangeListener; -import vg.civcraft.mc.civmodcore.playersettings.impl.DisplayLocationSetting; -import vg.civcraft.mc.civmodcore.scoreboard.bottom.BottomLine; -import vg.civcraft.mc.civmodcore.scoreboard.bottom.BottomLineAPI; -import vg.civcraft.mc.civmodcore.scoreboard.side.CivScoreBoard; -import vg.civcraft.mc.civmodcore.scoreboard.side.ScoreBoardAPI; +import vg.civcraft.mc.civmodcore.players.scoreboard.bottom.BottomLine; +import vg.civcraft.mc.civmodcore.players.scoreboard.bottom.BottomLineAPI; +import vg.civcraft.mc.civmodcore.players.scoreboard.side.CivScoreBoard; +import vg.civcraft.mc.civmodcore.players.scoreboard.side.ScoreBoardAPI; +import vg.civcraft.mc.civmodcore.players.settings.PlayerSetting; +import vg.civcraft.mc.civmodcore.players.settings.SettingChangeListener; +import vg.civcraft.mc.civmodcore.players.settings.impl.DisplayLocationSetting; import vg.civcraft.mc.namelayer.NameAPI; import vg.civcraft.mc.namelayer.permission.PermissionType; diff --git a/src/main/java/isaac/bastion/storage/BastionBlockStorage.java b/src/main/java/isaac/bastion/storage/BastionBlockStorage.java index 6f8e9865..c9b26439 100644 --- a/src/main/java/isaac/bastion/storage/BastionBlockStorage.java +++ b/src/main/java/isaac/bastion/storage/BastionBlockStorage.java @@ -27,8 +27,8 @@ import org.bukkit.scheduler.BukkitRunnable; import vg.civcraft.mc.citadel.model.Reinforcement; import vg.civcraft.mc.civmodcore.dao.ManagedDatasource; -import vg.civcraft.mc.civmodcore.locations.QTBox; -import vg.civcraft.mc.civmodcore.locations.SparseQuadTree; +import vg.civcraft.mc.civmodcore.world.locations.QTBox; +import vg.civcraft.mc.civmodcore.world.locations.SparseQuadTree; public class BastionBlockStorage { diff --git a/src/main/java/isaac/bastion/utils/BastionSettingManager.java b/src/main/java/isaac/bastion/utils/BastionSettingManager.java index d2977a91..c4c04b7f 100644 --- a/src/main/java/isaac/bastion/utils/BastionSettingManager.java +++ b/src/main/java/isaac/bastion/utils/BastionSettingManager.java @@ -5,10 +5,10 @@ import java.util.UUID; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import vg.civcraft.mc.civmodcore.playersettings.PlayerSettingAPI; -import vg.civcraft.mc.civmodcore.playersettings.gui.MenuSection; -import vg.civcraft.mc.civmodcore.playersettings.impl.BooleanSetting; -import vg.civcraft.mc.civmodcore.playersettings.impl.DisplayLocationSetting; +import vg.civcraft.mc.civmodcore.players.settings.PlayerSettingAPI; +import vg.civcraft.mc.civmodcore.players.settings.gui.MenuSection; +import vg.civcraft.mc.civmodcore.players.settings.impl.BooleanSetting; +import vg.civcraft.mc.civmodcore.players.settings.impl.DisplayLocationSetting; public class BastionSettingManager { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 279baa00..c34ad3cd 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ main: isaac.bastion.Bastion author: spaceFountain authors: [Rourke750, ProgrammerDan, Maxopoly, TealNerd, Aleksey-Terzi] depend: [CivModCore, Citadel, NameLayer] -api-version: 1.16 +api-version: 1.17 commands: Bastion: description: Base command for Bastion From 0ac59fdbf74ee1ae7aee1e39f87853fac9c75481 Mon Sep 17 00:00:00 2001 From: Cola Date: Wed, 30 Jun 2021 16:50:57 +0100 Subject: [PATCH 2/7] Update group ids --- pom.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index fce71fcb..498be877 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,7 @@ civclassic-parent 1.0.0 - - isaac + Bastion jar 2.5.0 @@ -27,21 +26,21 @@ - vg.civcraft.mc.civmodcore + com.github.civclassic CivModCore 1.9.0 provided - vg.civcraft.mc.namelayer + com.github.civclassic NameLayer 2.15.0 provided - vg.civcraft.mc.citadel + com.github.civclassic Citadel 4.2.0 provided From 0e22ed49d7fc90eaf74bf9b3f210bef6a909baaf Mon Sep 17 00:00:00 2001 From: Cola Date: Wed, 30 Jun 2021 21:52:53 +0100 Subject: [PATCH 3/7] POM fix --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 498be877..bae46053 100644 --- a/pom.xml +++ b/pom.xml @@ -7,9 +7,9 @@ com.github.civclassic civclassic-parent - 1.0.0 + 1.0.1 - + Bastion jar 2.5.0 From 54b890b615aede5a20f8db8fbfabf4ea7044f786 Mon Sep 17 00:00:00 2001 From: Cola Date: Fri, 2 Jul 2021 21:37:05 +0100 Subject: [PATCH 4/7] Add various buckets to dispense check --- .../java/isaac/bastion/listeners/BastionDamageListener.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/isaac/bastion/listeners/BastionDamageListener.java b/src/main/java/isaac/bastion/listeners/BastionDamageListener.java index defa7314..7d0563d5 100644 --- a/src/main/java/isaac/bastion/listeners/BastionDamageListener.java +++ b/src/main/java/isaac/bastion/listeners/BastionDamageListener.java @@ -133,7 +133,10 @@ private boolean stopBlockEvent(Location source, Collection locations) @EventHandler(ignoreCancelled = true) public void onDispense(BlockDispenseEvent event) { if (!(event.getItem().getType() == Material.WATER_BUCKET || event.getItem().getType() == Material.LAVA_BUCKET - || event.getItem().getType() == Material.FLINT_AND_STEEL)) { + || event.getItem().getType() == Material.FLINT_AND_STEEL || event.getItem().getType() == Material.POWDER_SNOW_BUCKET + || event.getItem().getType() == Material.TROPICAL_FISH_BUCKET || event.getItem().getType() == Material.AXOLOTL_BUCKET + || event.getItem().getType() == Material.COD_BUCKET || event.getItem().getType() == Material.PUFFERFISH_BUCKET + || event.getItem().getType() == Material.SALMON_SPAWN_EGG)) { return; } Set blocks = new HashSet<>(); From 45129d09f7c0cc6b1e5f6fb205ddf7ccd740bb71 Mon Sep 17 00:00:00 2001 From: Cola Date: Fri, 2 Jul 2021 21:44:07 +0100 Subject: [PATCH 5/7] Add empty bucket --- .../bastion/listeners/BastionDamageListener.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/isaac/bastion/listeners/BastionDamageListener.java b/src/main/java/isaac/bastion/listeners/BastionDamageListener.java index 7d0563d5..68ee12b5 100644 --- a/src/main/java/isaac/bastion/listeners/BastionDamageListener.java +++ b/src/main/java/isaac/bastion/listeners/BastionDamageListener.java @@ -132,11 +132,12 @@ private boolean stopBlockEvent(Location source, Collection locations) @EventHandler(ignoreCancelled = true) public void onDispense(BlockDispenseEvent event) { - if (!(event.getItem().getType() == Material.WATER_BUCKET || event.getItem().getType() == Material.LAVA_BUCKET - || event.getItem().getType() == Material.FLINT_AND_STEEL || event.getItem().getType() == Material.POWDER_SNOW_BUCKET - || event.getItem().getType() == Material.TROPICAL_FISH_BUCKET || event.getItem().getType() == Material.AXOLOTL_BUCKET - || event.getItem().getType() == Material.COD_BUCKET || event.getItem().getType() == Material.PUFFERFISH_BUCKET - || event.getItem().getType() == Material.SALMON_SPAWN_EGG)) { + Material material = event.getItem().getType(); + if (!(material == Material.WATER_BUCKET || material == Material.LAVA_BUCKET + || material == Material.FLINT_AND_STEEL || material == Material.POWDER_SNOW_BUCKET + || material == Material.TROPICAL_FISH_BUCKET || material == Material.AXOLOTL_BUCKET + || material == Material.COD_BUCKET || material == Material.PUFFERFISH_BUCKET + || material == Material.SALMON_SPAWN_EGG || material == Material.BUCKET)) { return; } Set blocks = new HashSet<>(); From 31ddb09c7af8c033240d345324685bf55085c81f Mon Sep 17 00:00:00 2001 From: Cola Date: Mon, 5 Jul 2021 19:55:39 +0100 Subject: [PATCH 6/7] Lastest CMC --- src/main/java/isaac/bastion/Bastion.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/isaac/bastion/Bastion.java b/src/main/java/isaac/bastion/Bastion.java index aefb082b..2b7baf79 100644 --- a/src/main/java/isaac/bastion/Bastion.java +++ b/src/main/java/isaac/bastion/Bastion.java @@ -19,6 +19,7 @@ import java.util.logging.Level; import org.bukkit.configuration.ConfigurationSection; import vg.civcraft.mc.civmodcore.ACivMod; +import vg.civcraft.mc.civmodcore.dao.DatabaseCredentials; import vg.civcraft.mc.civmodcore.dao.ManagedDatasource; import vg.civcraft.mc.namelayer.GroupManager.PlayerType; import vg.civcraft.mc.namelayer.permission.PermissionType; @@ -86,7 +87,7 @@ private void setupDatabase() { long maxLifetime = config.getLong("maxLifetime"); ManagedDatasource db = null; try { - db = new ManagedDatasource(this, user, pass, host, port, dbname, poolsize, connectionTimeout, idleTimeout, maxLifetime); + db = ManagedDatasource.construct(this, new DatabaseCredentials(user, pass, host, port, "mysql", dbname, poolsize, connectionTimeout, idleTimeout, maxLifetime)); db.getConnection().close(); } catch(Exception e) { warning("Could not connect to database, stopping bastion", e); From 590c2e7ed895e6a8c0e83cc755d7a82ce3f63f87 Mon Sep 17 00:00:00 2001 From: Cola Date: Sun, 18 Jul 2021 23:46:17 +0100 Subject: [PATCH 7/7] 1.17.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bae46053..d2e214d0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.papermc.paper paper - 1.17-R0.1-SNAPSHOT + 1.17.1-R0.1-SNAPSHOT provided