Skip to content

Commit fe02f99

Browse files
graycat27graycat27
authored
Merge pull request #27 from JavaJava19/work26JpsCore
Work26 jps core
2 parents 97e50f3 + dafcd12 commit fe02f99

15 files changed

Lines changed: 95 additions & 158 deletions

File tree

‎lib/TNE-0.1.1.16.jar‎

-5.07 MB
Binary file not shown.

‎lib/jpscore-1.10.7.jar‎

8.48 MB
Binary file not shown.

‎pom.xml‎

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66

77
<groupId>com.github.elic0de</groupId>
88
<artifactId>thejpspit</artifactId>
9-
<version>2</version>
9+
<version>1.10.7</version>
1010
<packaging>jar</packaging>
1111

1212
<name>TheJpsPit</name>
1313

1414
<properties>
15-
<java.version>16</java.version>
15+
<java.version>17</java.version>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
</properties>
1818

1919
<build>
20-
<finalName>${project.name}</finalName>
20+
<finalName>${project.name}-${version}</finalName>
2121
<plugins>
2222
<plugin>
2323
<groupId>org.apache.maven.plugins</groupId>
2424
<artifactId>maven-compiler-plugin</artifactId>
25-
<version>3.8.1</version>
25+
<version>3.11.0</version>
2626
<configuration>
2727
<source>${java.version}</source>
2828
<target>${java.version}</target>
@@ -31,7 +31,7 @@
3131
<plugin>
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-shade-plugin</artifactId>
34-
<version>3.2.4</version>
34+
<version>3.5.1</version>
3535
<executions>
3636
<execution>
3737
<phase>package</phase>
@@ -94,7 +94,7 @@
9494
<dependency>
9595
<groupId>fr.mrmicky</groupId>
9696
<artifactId>fastboard</artifactId>
97-
<version>1.2.1</version>
97+
<version>2.0.0</version>
9898
</dependency>
9999
<dependency>
100100
<groupId>co.aikar</groupId>
@@ -104,7 +104,7 @@
104104
<dependency>
105105
<groupId>org.xerial</groupId>
106106
<artifactId>sqlite-jdbc</artifactId>
107-
<version>3.25.2</version>
107+
<version>3.44.0.0</version>
108108
</dependency>
109109
<dependency>
110110
<groupId>de.themoep</groupId>
@@ -124,15 +124,20 @@
124124
<artifactId>gson-javatime-serialisers</artifactId>
125125
<version>1.1.2</version>
126126
</dependency>
127+
<dependency>
128+
<groupId>commons-lang</groupId>
129+
<artifactId>commons-lang</artifactId>
130+
<version>2.6</version>
131+
</dependency>
127132
<dependency>
128133
<groupId>org.jetbrains</groupId>
129134
<artifactId>annotations</artifactId>
130-
<version>23.0.0</version>
135+
<version>24.0.1</version>
131136
</dependency>
132137
<dependency>
133138
<groupId>dev.dejvokep</groupId>
134139
<artifactId>boosted-yaml</artifactId>
135-
<version>1.3</version>
140+
<version>1.3.1</version>
136141
</dependency>
137142
<dependency>
138143
<groupId>net.william278</groupId>
@@ -149,31 +154,19 @@
149154
<dependency>
150155
<groupId>xyz.xenondevs</groupId>
151156
<artifactId>particle</artifactId>
152-
<version>1.8.1</version>
157+
<version>1.8.4</version>
153158
</dependency>
154159
<dependency>
155160
<groupId>com.zaxxer</groupId>
156161
<artifactId>HikariCP</artifactId>
157162
<version>5.0.1</version>
158163
</dependency>
159164
<dependency>
160-
<groupId>net.tnemc.TNE</groupId>
161-
<artifactId>tne</artifactId>
162-
<version>1.1.9.2</version>
165+
<groupId>gg.jps</groupId>
166+
<artifactId>JpsCore</artifactId>
167+
<version>1.10.7</version>
163168
<scope>system</scope>
164-
<systemPath>${project.basedir}/lib/TNE-0.1.1.16.jar</systemPath>
165-
</dependency>
166-
<dependency>
167-
<groupId>com.github.MilkBowl</groupId>
168-
<artifactId>VaultAPI</artifactId>
169-
<version>1.7</version>
170-
<scope>provided</scope>
171-
</dependency>
172-
<dependency>
173-
<groupId>jp.jyn</groupId>
174-
<artifactId>Jecon</artifactId>
175-
<version>2.2.1</version>
176-
<scope>provided</scope>
169+
<systemPath>${project.basedir}/lib/jpscore-1.10.7.jar</systemPath>
177170
</dependency>
178171
</dependencies>
179172
</project>

‎src/main/java/com/github/elic0de/thejpspit/TheJpsPit.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import com.github.elic0de.thejpspit.database.SqLiteDatabase;
1414
import com.github.elic0de.thejpspit.game.Game;
1515
import com.github.elic0de.thejpspit.hook.*;
16+
import com.github.elic0de.thejpspit.hook.economy.EconomyHook;
17+
import com.github.elic0de.thejpspit.hook.economy.JpsCoreHook;
1618
import com.github.elic0de.thejpspit.item.ItemManager;
1719
import com.github.elic0de.thejpspit.leveler.Levels;
1820
import com.github.elic0de.thejpspit.listener.BlockPlaceListener;
@@ -35,6 +37,7 @@
3537
import java.util.Optional;
3638
import java.util.logging.Level;
3739

40+
import gg.jps.jpscore.define.JpsConst;
3841
import net.william278.annotaml.Annotaml;
3942
import org.bukkit.Bukkit;
4043
import org.bukkit.GameRule;
@@ -190,10 +193,8 @@ private void registerListener() {
190193

191194
private void registerHooks() {
192195
final PluginManager plugins = Bukkit.getPluginManager();
193-
if (plugins.getPlugin("Jecon") != null) {
194-
this.registerHook(new JeconEconomyHook(this));
195-
} else if (plugins.getPlugin("Vault") != null) {
196-
this.registerHook(new VaultEconomyHook(this));
196+
if (plugins.getPlugin(JpsConst.pluginName.get()) != null) {
197+
this.registerHook(new JpsCoreHook(this));
197198
}
198199
if (plugins.getPlugin("PlaceholderAPI") != null) {
199200
new PlaceholderHook().register();

‎src/main/java/com/github/elic0de/thejpspit/game/Game.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.util.HashSet;
88
import java.util.Set;
99

10-
import net.tnemc.core.item.ItemStackBuilder;
1110
import org.bukkit.Location;
1211
import org.bukkit.Material;
12+
import org.bukkit.inventory.ItemStack;
1313

1414
public class Game {
1515

@@ -36,7 +36,7 @@ public void leave(PitPlayer player) {
3636
public void death(PitPlayer player) {
3737
final PitPlayer killer = player.getKiller();
3838

39-
player.getPlayer().setItemOnCursor(ItemStackBuilder.create(Material.AIR).getStack());
39+
player.getPlayer().setItemOnCursor(new ItemStack(Material.AIR));
4040

4141
// 死んだらテレポートをさせる
4242
pit.getPitPreferences().ifPresent(pitPreferences -> {

‎src/main/java/com/github/elic0de/thejpspit/gui/PitChatMenu.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
package com.github.elic0de.thejpspit.gui;
22

33
import com.github.elic0de.thejpspit.TheJpsPit;
4-
import com.github.elic0de.thejpspit.hook.EconomyHook;
5-
import com.github.elic0de.thejpspit.item.PitItemEntry;
64
import com.github.elic0de.thejpspit.player.PitPlayer;
75
import com.github.elic0de.thejpspit.player.PitPlayerManager;
86
import de.themoep.inventorygui.DynamicGuiElement;
97
import de.themoep.inventorygui.InventoryGui;
108
import de.themoep.inventorygui.StaticGuiElement;
11-
import java.math.BigDecimal;
9+
1210
import java.util.concurrent.atomic.AtomicBoolean;
1311
import org.bukkit.Material;
1412
import org.bukkit.entity.Player;
15-
import org.bukkit.event.inventory.ClickType;
16-
import org.bukkit.inventory.Inventory;
1713
import org.bukkit.inventory.ItemStack;
1814

1915
public class PitChatMenu {

‎src/main/java/com/github/elic0de/thejpspit/gui/ShopMenu.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.elic0de.thejpspit.gui;
22

33
import com.github.elic0de.thejpspit.TheJpsPit;
4-
import com.github.elic0de.thejpspit.hook.EconomyHook;
4+
import com.github.elic0de.thejpspit.hook.economy.EconomyHook;
55
import com.github.elic0de.thejpspit.item.ItemManager;
66
import com.github.elic0de.thejpspit.item.PitItemEntry;
77
import com.github.elic0de.thejpspit.player.PitPlayer;

‎src/main/java/com/github/elic0de/thejpspit/hook/JeconEconomyHook.java‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎src/main/java/com/github/elic0de/thejpspit/hook/VaultEconomyHook.java‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/main/java/com/github/elic0de/thejpspit/hook/EconomyHook.java renamed to src/main/java/com/github/elic0de/thejpspit/hook/economy/EconomyHook.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package com.github.elic0de.thejpspit.hook;
1+
package com.github.elic0de.thejpspit.hook.economy;
22

33
import com.github.elic0de.thejpspit.TheJpsPit;
4+
import com.github.elic0de.thejpspit.hook.Hook;
45
import com.github.elic0de.thejpspit.player.PitPlayer;
56

67
import java.math.BigDecimal;

0 commit comments

Comments
 (0)