Skip to content

Commit c7e0909

Browse files
BuddelbubiBuddelbubi
committed
Package refactor
1 parent 19ec30b commit c7e0909

74 files changed

Lines changed: 323 additions & 313 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ jobs:
2626
with:
2727
distribution: 'temurin'
2828
java-version: '21'
29+
server-id: powernukkitx-releases
30+
server-username: PNX_REPO_USERNAME
31+
server-password: PNX_REPO_PASSWORD
2932

3033
- name: Build with Maven
3134
run: mvn -B package -DskipTests=false -Darguments="-Dmaven.javadoc.skip=true"
@@ -75,3 +78,10 @@ jobs:
7578
else
7679
gh release create "$RELEASE_TAG" "${{ steps.project.outputs.jar_path }}" --target "${{ github.sha }}" --title "$RELEASE_TAG" --notes "Automated release for $RELEASE_TAG"
7780
fi
81+
82+
- name: Deploy to PowerNukkitX repository
83+
if: github.event_name == 'push' && (github.ref_type == 'tag' || github.ref_name == github.event.repository.default_branch)
84+
run: mvn -B deploy -DskipTests -Darguments="-Dmaven.javadoc.skip=true" -DaltDeploymentRepository=powernukkitx-releases::default::https://repo.powernukkitx.org/releases
85+
env:
86+
PNX_REPO_USERNAME: ${{ secrets.PNX_REPO_USERNAME }}
87+
PNX_REPO_PASSWORD: ${{ secrets.PNX_REPO_PASSWORD }}

‎pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>sergeydertan.sregionprotector</groupId>
7+
<groupId>net.sergeydertan.sregionprotector</groupId>
88
<artifactId>SRegionProtector</artifactId>
9-
<version>30.1</version>
9+
<version>30.2</version>
1010
<name>SRegionProtector</name>
1111
<description>Flexible region protection plugin for PowerNukkitX</description>
1212
<url>https://github.com/SergeyDertan/SRegionProtector</url>
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>org.powernukkitx</groupId>
6767
<artifactId>server</artifactId>
68-
<version>b-migration-SNAPSHOT</version>
68+
<version>nightly-SNAPSHOT</version>
6969
<scope>provided</scope>
7070
</dependency>
7171
<dependency>
@@ -81,9 +81,9 @@
8181
<scope>compile</scope>
8282
</dependency>
8383
<dependency>
84-
<groupId>com.github.PowerNukkitX-Bundle</groupId>
84+
<groupId>net.lldv.llamaeconomy</groupId>
8585
<artifactId>LlamaEconomy</artifactId>
86-
<version>34abcee45d</version>
86+
<version>1.0.2</version>
8787
<scope>provided</scope>
8888
</dependency>
8989
<dependency>

‎src/main/java/Sergey_Dertan/SRegionProtector/BlockEntity/BlockEntityHealer.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import Sergey_Dertan.SRegionProtector.Region.Flags.RegionFlags;
55
import Sergey_Dertan.SRegionProtector.Region.Region;
66
import Sergey_Dertan.SRegionProtector.Region.RegionManager;
7-
import cn.nukkit.Player;
8-
import cn.nukkit.blockentity.BlockEntitySpawnable;
9-
import cn.nukkit.entity.Entity;
10-
import cn.nukkit.level.format.IChunk;
11-
import cn.nukkit.math.AxisAlignedBB;
12-
import cn.nukkit.math.Vector3;
13-
import cn.nukkit.nbt.tag.CompoundTag;
7+
import org.powernukkitx.Player;
8+
import org.powernukkitx.blockentity.BlockEntitySpawnable;
9+
import org.powernukkitx.entity.Entity;
10+
import org.powernukkitx.level.format.IChunk;
11+
import org.powernukkitx.math.AxisAlignedBB;
12+
import org.powernukkitx.math.Vector3;
13+
import org.powernukkitx.nbt.tag.CompoundTag;
1414

1515
import static Sergey_Dertan.SRegionProtector.Utils.Tags.*;
1616

‎src/main/java/Sergey_Dertan/SRegionProtector/Command/Admin/MigrateCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import Sergey_Dertan.SRegionProtector.Command.SRegionProtectorCommand;
44
import Sergey_Dertan.SRegionProtector.Main.SRegionProtectorMain;
55
import Sergey_Dertan.SRegionProtector.Provider.DataProvider;
6-
import cn.nukkit.command.CommandSender;
7-
import cn.nukkit.command.data.CommandParameter;
6+
import org.powernukkitx.command.CommandSender;
7+
import org.powernukkitx.command.data.CommandParameter;
88
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
99

1010
import java.util.ArrayList;

‎src/main/java/Sergey_Dertan/SRegionProtector/Command/Admin/SaveCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import Sergey_Dertan.SRegionProtector.Command.SRegionProtectorCommand;
44
import Sergey_Dertan.SRegionProtector.Main.SRegionProtectorMain;
5-
import cn.nukkit.command.CommandSender;
5+
import org.powernukkitx.command.CommandSender;
66
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
77

88
public final class SaveCommand extends SRegionProtectorCommand {

‎src/main/java/Sergey_Dertan/SRegionProtector/Command/Creation/CreateRegionCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import Sergey_Dertan.SRegionProtector.Region.Selector.RegionSelector;
88
import Sergey_Dertan.SRegionProtector.Region.Selector.SelectorSession;
99
import Sergey_Dertan.SRegionProtector.Settings.RegionSettings;
10-
import cn.nukkit.Player;
11-
import cn.nukkit.command.CommandSender;
10+
import org.powernukkitx.Player;
11+
import org.powernukkitx.command.CommandSender;
1212
import org.cloudburstmc.protocol.bedrock.data.command.CommandParamType;
13-
import cn.nukkit.command.data.CommandParameter;
14-
import cn.nukkit.level.Position;
13+
import org.powernukkitx.command.data.CommandParameter;
14+
import org.powernukkitx.level.Position;
1515
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
1616

1717
import java.util.Map;

‎src/main/java/Sergey_Dertan/SRegionProtector/Command/Creation/GetWandCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package Sergey_Dertan.SRegionProtector.Command.Creation;
22

33
import Sergey_Dertan.SRegionProtector.Command.SRegionProtectorCommand;
4-
import cn.nukkit.Player;
5-
import cn.nukkit.command.CommandSender;
6-
import cn.nukkit.item.Item;
7-
import cn.nukkit.item.ItemID;
4+
import org.powernukkitx.Player;
5+
import org.powernukkitx.command.CommandSender;
6+
import org.powernukkitx.item.Item;
7+
import org.powernukkitx.item.ItemID;
88
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
99

1010
public final class GetWandCommand extends SRegionProtectorCommand {

‎src/main/java/Sergey_Dertan/SRegionProtector/Command/Creation/LPos1Command.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import Sergey_Dertan.SRegionProtector.Command.SRegionProtectorCommand;
44
import Sergey_Dertan.SRegionProtector.Region.Selector.RegionSelector;
5-
import cn.nukkit.Player;
6-
import cn.nukkit.command.CommandSender;
7-
import cn.nukkit.level.Position;
5+
import org.powernukkitx.Player;
6+
import org.powernukkitx.command.CommandSender;
7+
import org.powernukkitx.level.Position;
88
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
99

1010
public final class LPos1Command extends SRegionProtectorCommand {

‎src/main/java/Sergey_Dertan/SRegionProtector/Command/Creation/LPos2Command.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import Sergey_Dertan.SRegionProtector.Command.SRegionProtectorCommand;
44
import Sergey_Dertan.SRegionProtector.Region.Selector.RegionSelector;
5-
import cn.nukkit.Player;
6-
import cn.nukkit.command.CommandSender;
7-
import cn.nukkit.level.Position;
5+
import org.powernukkitx.Player;
6+
import org.powernukkitx.command.CommandSender;
7+
import org.powernukkitx.level.Position;
88
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
99

1010
public final class LPos2Command extends SRegionProtectorCommand {

‎src/main/java/Sergey_Dertan/SRegionProtector/Command/Creation/Pos1Command.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import Sergey_Dertan.SRegionProtector.Command.SRegionProtectorCommand;
44
import Sergey_Dertan.SRegionProtector.Region.Selector.RegionSelector;
5-
import cn.nukkit.Player;
6-
import cn.nukkit.command.CommandSender;
5+
import org.powernukkitx.Player;
6+
import org.powernukkitx.command.CommandSender;
77
import org.cloudburstmc.protocol.bedrock.data.command.CommandParamType;
8-
import cn.nukkit.command.data.CommandParameter;
9-
import cn.nukkit.level.Position;
10-
import cn.nukkit.math.Vector3;
8+
import org.powernukkitx.command.data.CommandParameter;
9+
import org.powernukkitx.level.Position;
10+
import org.powernukkitx.math.Vector3;
1111
import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
1212

1313
import java.util.Map;

0 commit comments

Comments
 (0)