Skip to content

1.17.1 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Diet-Cola wants to merge 10 commits into
base: master
Choose a base branch
from
Open

1.17.1 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
686c5b2
v2.5.0 - 1.17 & Java 16
Diet-Cola Jun 30, 2021
0ac59fd
Update group ids
Diet-Cola Jun 30, 2021
0e22ed4
POM fix
Diet-Cola Jun 30, 2021
54b890b
Add various buckets to dispense check
Diet-Cola Jul 2, 2021
45129d0
Add empty bucket
Diet-Cola Jul 2, 2021
31ddb09
Lastest CMC
Diet-Cola Jul 5, 2021
590c2e7
1.17.1
Diet-Cola Jul 18, 2021
8e74986
Merge branch 'master' into 16+17
Diet-Cola Sep 10, 2021
7567d31
Merge branch 'master' into 16+17
Diet-Cola Sep 26, 2021
88ef825
Merge remote-tracking branch 'origin/master' into 16+17
Diet-Cola Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,42 @@
<parent>
<groupId>com.github.civclassic</groupId>
<artifactId>civclassic-parent</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
</parent>

<groupId>isaac</groupId>
<artifactId>Bastion</artifactId>
<packaging>jar</packaging>
<version>2.4.1</version>
<version>2.5.0</version>
<name>Bastion</name>
<url>https://github.com/Civclassic/Bastion</url>

<dependencies>
<!-- https://github.com/PaperMC/Paper -->
<dependency>
<groupId>com.destroystokyo.paper</groupId>
<groupId>io.papermc.paper</groupId>
<artifactId>paper</artifactId>
<version>1.16.5-R0.1-SNAPSHOT</version>
<version>1.17.1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- https://github.com/CivClassic/CivModCore -->
<dependency>
<groupId>vg.civcraft.mc.civmodcore</groupId>
<groupId>com.github.civclassic</groupId>
<artifactId>CivModCore</artifactId>
<version>1.8.2</version>
<version>1.9.0</version>
<scope>provided</scope>
</dependency>
<!-- https://github.com/CivClassic/NameLayer -->
<dependency>
<groupId>vg.civcraft.mc.namelayer</groupId>
<groupId>com.github.civclassic</groupId>
<artifactId>NameLayer</artifactId>
<version>2.14.1</version>
<version>2.15.0</version>
<scope>provided</scope>
</dependency>
<!-- https://github.com/CivClassic/Citadel -->
<dependency>
<groupId>vg.civcraft.mc.citadel</groupId>
<groupId>com.github.civclassic</groupId>
<artifactId>Citadel</artifactId>
<version>4.1.1</version>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -53,6 +52,10 @@
<id>civ-github-repo</id>
<url>https://raw.githubusercontent.com/CivClassic/artifacts/master/</url>
</repository>
<repository>
<id>papermc</id>
<url>https://papermc.io/repo/repository/maven-public/</url>
</repository>
</repositories>

</project>
3 changes: 2 additions & 1 deletion src/main/java/isaac/bastion/Bastion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/isaac/bastion/BastionBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/isaac/bastion/listeners/BastionDamageListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ private boolean stopBlockEvent(Location source, Collection<Location> locations)
public void onDispense(BlockDispenseEvent event) {
Material material = event.getItem().getType();
if (!(material == Material.WATER_BUCKET || material == Material.LAVA_BUCKET
|| material == Material.FLINT_AND_STEEL || material == Material.TROPICAL_FISH_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;
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/isaac/bastion/listeners/ModeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/isaac/bastion/storage/BastionBlockStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/isaac/bastion/utils/BastionSettingManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down