Skip to content

Commit a19a2e3

Browse files
Dreeam-qwqDreeam-qwq
committed
Merge remote-tracking branch 'upstream/main'
2 parents cf8225c + 0749b13 commit a19a2e3

File tree

53 files changed

+1181
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1181
-63
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Clone the repository:
1717
git clone https://github.com/Gecolay/GSit.git
1818
```
1919

20+
### Build
21+
2022
Run the maven build command by your ide or in a terminal.
2123

2224
`mvn clean package`

‎core/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
<parent>
1010
<groupId>dev.geco.gsit</groupId>
1111
<artifactId>GSit</artifactId>
12-
<version>1.10.0</version>
12+
<version>1.11.2</version>
1313
</parent>
1414

1515
<properties>
16-
<paper.version>1.21.1-R0.1-SNAPSHOT</paper.version>
17-
<spigot.version>1.21.1-R0.1-SNAPSHOT</spigot.version>
18-
<worldguard.version>7.0.10</worldguard.version>
16+
<paper.version>1.21.3-R0.1-SNAPSHOT</paper.version>
17+
<spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
18+
<worldguard.version>7.0.12</worldguard.version>
1919
<placeholderapi.version>2.11.6</placeholderapi.version>
20-
<griefprevention.version>16.18.2</griefprevention.version>
21-
<plotsquared.version>7.3.8</plotsquared.version>
20+
<griefprevention.version>16.18.4</griefprevention.version>
21+
<plotsquared.version>7.3.12</plotsquared.version>
2222
</properties>
2323

2424
<repositories>

‎core/src/main/java/dev/geco/gsit/cmd/tab/GCrawlTabComplete.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ public List<String> onTabComplete(@NotNull CommandSender Sender, @NotNull Comman
2020

2121
List<String> complete = new ArrayList<>(), completeStarted = new ArrayList<>();
2222

23+
if(!GPM.getCManager().C_DOUBLE_SNEAK) return complete;
24+
2325
if(Sender instanceof Player) {
2426

2527
if(Args.length == 1) {
2628

27-
if(GPM.getPManager().hasPermission(Sender, "CrawlToggle", "Crawl.*") && GPM.getCManager().C_DOUBLE_SNEAK) complete.add("toggle");
29+
if(GPM.getPManager().hasPermission(Sender, "CrawlToggle", "Crawl.*")) complete.add("toggle");
2830

2931
if(!Args[Args.length - 1].isEmpty()) {
3032

@@ -34,7 +36,7 @@ public List<String> onTabComplete(@NotNull CommandSender Sender, @NotNull Comman
3436
}
3537
} else if(Args.length == 2) {
3638

37-
if(GPM.getPManager().hasPermission(Sender, "CrawlToggle", "Crawl.*") && Args[0].equalsIgnoreCase("toggle") && GPM.getCManager().C_DOUBLE_SNEAK) {
39+
if(GPM.getPManager().hasPermission(Sender, "CrawlToggle", "Crawl.*") && Args[0].equalsIgnoreCase("toggle")) {
3840

3941
complete.add("on");
4042
complete.add("off");

‎core/src/main/java/dev/geco/gsit/manager/DManager.java‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class DManager {
2525
public DManager(GSitMain GPluginMain) { GPM = GPluginMain; }
2626

2727
public boolean connect() {
28+
if(isConnected()) return true;
2829
File dataFile = new File(GPM.getDataFolder(), "data/data.yml");
2930
if(!dataFile.exists()) GPM.saveResource("data/data.yml", false);
3031
FileConfiguration dataConfig = YamlConfiguration.loadConfiguration(dataFile);
@@ -37,6 +38,13 @@ public boolean connect() {
3738
return reconnect();
3839
}
3940

41+
public boolean isConnected() {
42+
try {
43+
if(connection != null && !connection.isClosed()) return true;
44+
} catch (SQLException ignored) { }
45+
return false;
46+
}
47+
4048
private boolean reconnect() {
4149
try {
4250
if(type.equals("sqlite")) Class.forName("org.sqlite.JDBC");
@@ -67,22 +75,26 @@ private Connection getConnection(boolean WithDatabase) throws SQLException {
6775
return null;
6876
}
6977

70-
public boolean execute(String Query, Object... Data) throws SQLException {
71-
if(connection == null) throw new SQLException("missing " + type + " database connection");
72-
if(connection.isClosed() && !reconnect()) return false;
73-
PreparedStatement preparedStatement = connection.prepareStatement(Query);
74-
for(int i = 1; i <= Data.length; i++) preparedStatement.setObject(i, Data[i - 1]);
75-
return preparedStatement.execute();
78+
public void execute(String Query, Object... Data) throws SQLException {
79+
ensureConnection();
80+
try(PreparedStatement preparedStatement = connection.prepareStatement(Query)) {
81+
for(int i = 1; i <= Data.length; i++) preparedStatement.setObject(i, Data[i - 1]);
82+
preparedStatement.executeUpdate();
83+
}
7684
}
7785

7886
public ResultSet executeAndGet(String Query, Object... Data) throws SQLException {
79-
if(connection == null) throw new SQLException("missing " + type + " database connection");
80-
if(connection.isClosed() && !reconnect()) return null;
87+
ensureConnection();
8188
PreparedStatement preparedStatement = connection.prepareStatement(Query);
8289
for(int i = 1; i <= Data.length; i++) preparedStatement.setObject(i, Data[i - 1]);
8390
return preparedStatement.executeQuery();
8491
}
8592

86-
public void close() { try { if(connection != null) connection.close(); } catch (SQLException ignored) { } }
93+
private void ensureConnection() throws SQLException {
94+
if(isConnected()) return;
95+
if(!reconnect()) throw new SQLException("Failed to reconnect to the " + type + " database.");
96+
}
97+
98+
public void close() { try { if(connection != null && !connection.isClosed()) connection.close(); } catch (SQLException ignored) { } }
8799

88100
}

‎core/src/main/java/dev/geco/gsit/manager/SVManager.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class SVManager {
1010

1111
private final GSitMain GPM;
1212

13-
private final String LATEST_VERSION = "v1_20";
13+
private final String LATEST_VERSION = "v1_20_2";
1414
private final String SERVER_VERSION;
1515
private String PACKAGE_PATH;
1616
private boolean AVAILABLE;
@@ -23,6 +23,7 @@ public class SVManager {
2323
VERSION_MAPPING.put("v1_20_4", "v1_20_3");
2424
VERSION_MAPPING.put("v1_20_6", "v1_20_5");
2525
VERSION_MAPPING.put("v1_21_1", "v1_21");
26+
VERSION_MAPPING.put("v1_21_3", "v1_21_2");
2627
}
2728

2829
public SVManager(GSitMain GPluginMain) {

‎dist/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>dev.geco.gsit</groupId>
1111
<artifactId>GSit</artifactId>
12-
<version>1.10.0</version>
12+
<version>1.11.2</version>
1313
</parent>
1414

1515
<build>
@@ -116,6 +116,11 @@
116116
<artifactId>v1_21</artifactId>
117117
<version>${project.parent.version}</version>
118118
</dependency>
119+
<dependency>
120+
<groupId>dev.geco.gsit</groupId>
121+
<artifactId>v1_21_2</artifactId>
122+
<version>${project.parent.version}</version>
123+
</dependency>
119124
</dependencies>
120125

121126
</project>

‎jitpack.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ before_install:
1919
(mkdir BuildTools_1.20.2 && cd BuildTools_1.20.2 && curl -k -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && $JAVA_17 -jar BuildTools.jar --rev 1.20.2 --remapped > /dev/null) &
2020
(mkdir BuildTools_1.20.4 && cd BuildTools_1.20.4 && curl -k -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && $JAVA_17 -jar BuildTools.jar --rev 1.20.4 --remapped > /dev/null) &
2121
(mkdir BuildTools_1.20.6 && cd BuildTools_1.20.6 && curl -k -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && $JAVA_21 -jar BuildTools.jar --rev 1.20.6 --remapped > /dev/null) &
22-
(mkdir BuildTools_1.21.1 && cd BuildTools_1.21.1 && curl -k -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && $JAVA_21 -jar BuildTools.jar --rev 1.21.1 --remapped > /dev/null)
22+
(mkdir BuildTools_1.21.1 && cd BuildTools_1.21.1 && curl -k -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && $JAVA_21 -jar BuildTools.jar --rev 1.21.1 --remapped > /dev/null) &
23+
(mkdir BuildTools_1.21.3 && cd BuildTools_1.21.3 && curl -k -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar && $JAVA_21 -jar BuildTools.jar --rev 1.21.3 --remapped > /dev/null)
2324
- sdk use java 21.0.2-open

‎mcv1_17/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>dev.geco.gsit</groupId>
1111
<artifactId>GSit</artifactId>
12-
<version>1.10.0</version>
12+
<version>1.11.2</version>
1313
</parent>
1414

1515
<properties>

‎mcv1_17/src/main/java/dev/geco/gsit/mcv/x/objects/GPoseSeat.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@ public GPoseSeat(GSeat Seat, Pose Pose) {
120120

121121
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
122122
public void ICliE(InventoryClickEvent Event) { if(Event.getWhoClicked() == seatPlayer && seatPlayer.getGameMode() == GameMode.CREATIVE) Event.setCancelled(true); }
123+
124+
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
125+
public void PDroIE(PlayerDropItemEvent Event) { if(Event.getPlayer() == seatPlayer && seatPlayer.getGameMode() == GameMode.CREATIVE) Event.setCancelled(true); }
126+
127+
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
128+
public void EPotEE(EntityPotionEffectEvent Event) { if(Event.getEntity() == seatPlayer) serverPlayer.setInvisible(true); }
123129
};
124130
}
125131

‎mcv1_17_1/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>dev.geco.gsit</groupId>
1111
<artifactId>GSit</artifactId>
12-
<version>1.10.0</version>
12+
<version>1.11.2</version>
1313
</parent>
1414

1515
<properties>

0 commit comments

Comments
 (0)