From beca961222a2f923cd6b60e95031785d58b8ebe4 Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sat, 23 Jul 2022 21:09:41 +0200 Subject: [PATCH 1/9] Add intermediate project for nms --- nms/all/nms-assembly.xml | 20 +++ nms/all/pom.xml | 73 +++++++++++ nms/interface/pom.xml | 9 +- nms/pom.xml | 123 ++++++++++++++++++ nms/reflection/pom.xml | 9 +- nms/v1_17_R1/pom.xml | 9 +- nms/{v1_17_1_R1 => v1_17_R2}/pom.xml | 9 +- .../nms/v1_17_R2}/FakeArmorStandImpl.java | 2 +- .../nms/v1_17_R2}/FakeEntityImpl.java | 2 +- .../shopchest/nms/v1_17_R2}/FakeItemImpl.java | 2 +- .../shopchest/nms/v1_17_R2}/PlatformImpl.java | 2 +- .../v1_17_R2}/TextComponentHelperImpl.java | 2 +- nms/v1_18_R1/pom.xml | 9 +- nms/v1_18_R2/pom.xml | 9 +- nms/v1_19_R1/pom.xml | 9 +- plugin/pom.xml | 27 +--- .../shopchest/nms/PlatformLoader.java | 2 +- pom.xml | 83 +++--------- 18 files changed, 267 insertions(+), 134 deletions(-) create mode 100644 nms/all/nms-assembly.xml create mode 100644 nms/all/pom.xml create mode 100644 nms/pom.xml rename nms/{v1_17_1_R1 => v1_17_R2}/pom.xml (80%) rename nms/{v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2}/FakeArmorStandImpl.java (98%) rename nms/{v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2}/FakeEntityImpl.java (98%) rename nms/{v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2}/FakeItemImpl.java (97%) rename nms/{v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2}/PlatformImpl.java (92%) rename nms/{v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1 => v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2}/TextComponentHelperImpl.java (91%) diff --git a/nms/all/nms-assembly.xml b/nms/all/nms-assembly.xml new file mode 100644 index 0000000..ac4ca96 --- /dev/null +++ b/nms/all/nms-assembly.xml @@ -0,0 +1,20 @@ + + ${nmsAssemblyClassifier} + + jar + + false + + + true + + de.epiceric:shopchest-nms-* + + + true + + + + \ No newline at end of file diff --git a/nms/all/pom.xml b/nms/all/pom.xml new file mode 100644 index 0000000..4500051 --- /dev/null +++ b/nms/all/pom.xml @@ -0,0 +1,73 @@ + + + + shopchest-nms + de.epiceric + 1.0.0 + ../pom.xml + + 4.0.0 + + shopchest-nms-all + 1.0.0 + + pom + + + + + de.epiceric + shopchest-nms-interface + + + de.epiceric + shopchest-nms-reflection + + + de.epiceric + shopchest-nms-v1_17_R1 + + + de.epiceric + shopchest-nms-v1_17_1_R1 + + + de.epiceric + shopchest-nms-v1_18_R1 + + + de.epiceric + shopchest-nms-v1_18_R2 + + + de.epiceric + shopchest-nms-v1_19_R1 + + + + + + + maven-assembly-plugin + + + nms-assembly + package + + single + + + + nms-assembly.xml + + + + + + + + + + diff --git a/nms/interface/pom.xml b/nms/interface/pom.xml index 7e4da9f..bf0cab1 100644 --- a/nms/interface/pom.xml +++ b/nms/interface/pom.xml @@ -1,12 +1,11 @@ - - shopchest-parent + shopchest-nms de.epiceric - 1.15.0-SNAPSHOT - ../../pom.xml + 1.0.0 4.0.0 diff --git a/nms/pom.xml b/nms/pom.xml new file mode 100644 index 0000000..ec0dd88 --- /dev/null +++ b/nms/pom.xml @@ -0,0 +1,123 @@ + + + + shopchest-parent + de.epiceric + 1.15.0-SNAPSHOT + + 4.0.0 + + shopchest-nms + 1.0.0 + pom + + + interface + reflection + v1_17_R1 + v1_17_R2 + v1_18_R1 + v1_18_R2 + v1_19_R1 + all + + + + + defaultVersion + + + + + + de.epiceric + shopchest-nms-interface + 1.0.0 + provided + + + de.epiceric + shopchest-nms-reflection + 1.0.0 + provided + + + de.epiceric + shopchest-nms-v1_17_R1 + 1.0.0 + provided + + + de.epiceric + shopchest-nms-v1_17_1_R1 + 1.0.0 + provided + + + de.epiceric + shopchest-nms-v1_18_R1 + 1.0.0 + provided + + + de.epiceric + shopchest-nms-v1_18_R2 + 1.0.0 + provided + + + de.epiceric + shopchest-nms-v1_19_R1 + 1.0.0 + provided + + + + + + + + + net.md-5 + specialsource-maven-plugin + + + package + + remap + + remap-obf + + org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang + true + org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang + + true + remapped-obf + + + + package + + remap + + remap-spigot + + + ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar + + org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot + org.spigotmc:spigot:${spigot.version}:jar:remapped-obf + + + + + + + + + + + \ No newline at end of file diff --git a/nms/reflection/pom.xml b/nms/reflection/pom.xml index d279214..db56e62 100644 --- a/nms/reflection/pom.xml +++ b/nms/reflection/pom.xml @@ -1,12 +1,11 @@ - - shopchest-parent + shopchest-nms de.epiceric - 1.15.0-SNAPSHOT - ../../pom.xml + 1.0.0 4.0.0 diff --git a/nms/v1_17_R1/pom.xml b/nms/v1_17_R1/pom.xml index a94f376..c1b065b 100644 --- a/nms/v1_17_R1/pom.xml +++ b/nms/v1_17_R1/pom.xml @@ -1,12 +1,11 @@ - - shopchest-parent + shopchest-nms de.epiceric - 1.15.0-SNAPSHOT - ../../pom.xml + 1.0.0 4.0.0 diff --git a/nms/v1_17_1_R1/pom.xml b/nms/v1_17_R2/pom.xml similarity index 80% rename from nms/v1_17_1_R1/pom.xml rename to nms/v1_17_R2/pom.xml index a8caa33..8fb8f7a 100644 --- a/nms/v1_17_1_R1/pom.xml +++ b/nms/v1_17_R2/pom.xml @@ -1,12 +1,11 @@ - - shopchest-parent + shopchest-nms de.epiceric - 1.15.0-SNAPSHOT - ../../pom.xml + 1.0.0 4.0.0 diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeArmorStandImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeArmorStandImpl.java similarity index 98% rename from nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeArmorStandImpl.java rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeArmorStandImpl.java index 4eebd1c..3952fa0 100644 --- a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeArmorStandImpl.java +++ b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeArmorStandImpl.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.nms.v1_17_1_R1; +package de.epiceric.shopchest.nms.v1_17_R2; import de.epiceric.shopchest.nms.FakeArmorStand; import io.netty.buffer.Unpooled; diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeEntityImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeEntityImpl.java similarity index 98% rename from nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeEntityImpl.java rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeEntityImpl.java index f0a280f..066d5b4 100644 --- a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeEntityImpl.java +++ b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeEntityImpl.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.nms.v1_17_1_R1; +package de.epiceric.shopchest.nms.v1_17_R2; import de.epiceric.shopchest.nms.FakeEntity; import net.minecraft.network.protocol.Packet; diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeItemImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeItemImpl.java similarity index 97% rename from nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeItemImpl.java rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeItemImpl.java index 6807965..d9a10fc 100644 --- a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/FakeItemImpl.java +++ b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/FakeItemImpl.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.nms.v1_17_1_R1; +package de.epiceric.shopchest.nms.v1_17_R2; import de.epiceric.shopchest.nms.FakeItem; import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket; diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/PlatformImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PlatformImpl.java similarity index 92% rename from nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/PlatformImpl.java rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PlatformImpl.java index 5d41eb8..8daf575 100644 --- a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/PlatformImpl.java +++ b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/PlatformImpl.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.nms.v1_17_1_R1; +package de.epiceric.shopchest.nms.v1_17_R2; import de.epiceric.shopchest.nms.FakeArmorStand; import de.epiceric.shopchest.nms.FakeItem; diff --git a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/TextComponentHelperImpl.java b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/TextComponentHelperImpl.java similarity index 91% rename from nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/TextComponentHelperImpl.java rename to nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/TextComponentHelperImpl.java index 90bc670..0ad6620 100644 --- a/nms/v1_17_1_R1/src/main/java/de/epiceric/shopchest/nms/v1_17_1_R1/TextComponentHelperImpl.java +++ b/nms/v1_17_R2/src/main/java/de/epiceric/shopchest/nms/v1_17_R2/TextComponentHelperImpl.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.nms.v1_17_1_R1; +package de.epiceric.shopchest.nms.v1_17_R2; import de.epiceric.shopchest.nms.TextComponentHelper; import net.minecraft.nbt.CompoundTag; diff --git a/nms/v1_18_R1/pom.xml b/nms/v1_18_R1/pom.xml index 2cecce9..b272d92 100644 --- a/nms/v1_18_R1/pom.xml +++ b/nms/v1_18_R1/pom.xml @@ -1,12 +1,11 @@ - - shopchest-parent + shopchest-nms de.epiceric - 1.15.0-SNAPSHOT - ../../pom.xml + 1.0.0 4.0.0 diff --git a/nms/v1_18_R2/pom.xml b/nms/v1_18_R2/pom.xml index 73e1080..15f9700 100644 --- a/nms/v1_18_R2/pom.xml +++ b/nms/v1_18_R2/pom.xml @@ -1,12 +1,11 @@ - - shopchest-parent + shopchest-nms de.epiceric - 1.15.0-SNAPSHOT - ../../pom.xml + 1.0.0 4.0.0 diff --git a/nms/v1_19_R1/pom.xml b/nms/v1_19_R1/pom.xml index c8cac50..0bec1dd 100644 --- a/nms/v1_19_R1/pom.xml +++ b/nms/v1_19_R1/pom.xml @@ -1,12 +1,11 @@ - - shopchest-parent + shopchest-nms de.epiceric - 1.15.0-SNAPSHOT - ../../pom.xml + 1.0.0 4.0.0 diff --git a/plugin/pom.xml b/plugin/pom.xml index ec000d6..a49a8f5 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -49,31 +49,8 @@ de.epiceric - shopchest-nms-interface - - - de.epiceric - shopchest-nms-reflection - - - de.epiceric - shopchest-nms-v1_17_R1 - - - de.epiceric - shopchest-nms-v1_17_1_R1 - - - de.epiceric - shopchest-nms-v1_18_R1 - - - de.epiceric - shopchest-nms-v1_18_R2 - - - de.epiceric - shopchest-nms-v1_19_R1 + shopchest-nms-all + ${nmsAssemblyClassifier} de.epiceric diff --git a/plugin/src/main/java/de/epiceric/shopchest/nms/PlatformLoader.java b/plugin/src/main/java/de/epiceric/shopchest/nms/PlatformLoader.java index 1c3ba34..6b683ce 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/nms/PlatformLoader.java +++ b/plugin/src/main/java/de/epiceric/shopchest/nms/PlatformLoader.java @@ -61,7 +61,7 @@ public class PlatformLoader { case "acd6e6c27e5a0a9440afba70a96c27c9" -> // 1.17 (v1_17_R1) new de.epiceric.shopchest.nms.v1_17_R1.PlatformImpl(); case "f0e3dfc7390de285a4693518dd5bd126" -> // 1.17.1 (v1_17_R1) - new de.epiceric.shopchest.nms.v1_17_1_R1.PlatformImpl(); + new de.epiceric.shopchest.nms.v1_17_R2.PlatformImpl(); case "9e9fe6961a80f3e586c25601590b51ec", "20b026e774dbf715e40a0b2afe114792" -> // 1.18 ; 1.18.1 (v1_18_R1) new de.epiceric.shopchest.nms.v1_18_R1.PlatformImpl(); case "eaeedbff51b16ead3170906872fda334" -> // 1.18.2 (v1_18_R2) diff --git a/pom.xml b/pom.xml index 6771f65..1a7e4c0 100644 --- a/pom.xml +++ b/pom.xml @@ -12,13 +12,7 @@ common plugin - nms/interface - nms/reflection - nms/v1_17_R1 - nms/v1_17_1_R1 - nms/v1_18_R1 - nms/v1_18_R2 - nms/v1_19_R1 + nms external @@ -63,11 +57,11 @@ 17 17 + + nms-assembly + ShopChest - - - defaultVersion @@ -161,40 +155,17 @@ provided + + de.epiceric + shopchest-nms-all + ${nmsAssemblyClassifier} + 1.0.0 + de.epiceric shopchest-nms-interface 1.0.0 - - - de.epiceric - shopchest-nms-reflection - 1.0.0 - - - de.epiceric - shopchest-nms-v1_17_R1 - 1.0.0 - - - de.epiceric - shopchest-nms-v1_17_1_R1 - 1.0.0 - - - de.epiceric - shopchest-nms-v1_18_R1 - 1.0.0 - - - de.epiceric - shopchest-nms-v1_18_R2 - 1.0.0 - - - de.epiceric - shopchest-nms-v1_19_R1 - 1.0.0 + provided @@ -325,34 +296,10 @@ net.md-5 specialsource-maven-plugin 1.2.4 - - - package - - remap - - remap-obf - - org.spigotmc:minecraft-server:${spigot.version}:txt:maps-mojang - true - org.spigotmc:spigot:${spigot.version}:jar:remapped-mojang - true - remapped-obf - - - - package - - remap - - remap-spigot - - ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:${spigot.version}:csrg:maps-spigot - org.spigotmc:spigot:${spigot.version}:jar:remapped-obf - - - + + + maven-assembly-plugin + 3.3.0 From b5d36c71d2fd3b6cd2ebee49472fdd365b659b64 Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sat, 23 Jul 2022 22:08:35 +0200 Subject: [PATCH 2/9] Add profiles to toggle nms build --- pom.xml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a7e4c0..47faa98 100644 --- a/pom.xml +++ b/pom.xml @@ -12,10 +12,31 @@ common plugin - nms external + + + build-nms + + + buildNMS + + + + nms + + + + import-nms + + + !buildNMS + + + + + ShopChest https://www.spigotmc.org/resources/shopchest.11431/ A Bukkit plugin letting players create custom chest shops. From 86bc32f2c65bbe05ef61121e67be267238410ad4 Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sun, 24 Jul 2022 02:53:50 +0200 Subject: [PATCH 3/9] Add a way to deploy shopchest-nms-all artifact --- nms/all/pom.xml | 4 ++++ pom.xml | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/nms/all/pom.xml b/nms/all/pom.xml index 4500051..c1cc7fd 100644 --- a/nms/all/pom.xml +++ b/nms/all/pom.xml @@ -15,6 +15,10 @@ pom + + false + + diff --git a/pom.xml b/pom.xml index 47faa98..173f4e5 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,13 @@ !buildNMS + + + github + GitHub Packages + https://maven.pkg.github.com/Flowsqy/ShopChest + + @@ -60,13 +67,10 @@ - codemc-releases - https://repo.codemc.io/repository/maven-releases/ + github + GitHub Packages + https://maven.pkg.github.com/Flowsqy/ShopChest - - codemc-snapshots - https://repo.codemc.io/repository/maven-snapshots/ - @@ -81,6 +85,9 @@ nms-assembly + + true + ShopChest From b1faf3dfaa848036a245247e9797bf2f9645b32e Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sun, 24 Jul 2022 03:03:18 +0200 Subject: [PATCH 4/9] Fix shopchest-nms-v1_17_R2 artifactId --- nms/v1_17_R2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nms/v1_17_R2/pom.xml b/nms/v1_17_R2/pom.xml index 8fb8f7a..6119bd3 100644 --- a/nms/v1_17_R2/pom.xml +++ b/nms/v1_17_R2/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - shopchest-nms-v1_17_1_R1 + shopchest-nms-v1_17_R2 1.0.0 From 9c8547278297219d4338de8ab07f3bdcb547d167 Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sun, 24 Jul 2022 03:09:13 +0200 Subject: [PATCH 5/9] Fix shopchest-nms-v1_17_R2 import in nms-all --- nms/all/pom.xml | 2 +- nms/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nms/all/pom.xml b/nms/all/pom.xml index c1cc7fd..6860598 100644 --- a/nms/all/pom.xml +++ b/nms/all/pom.xml @@ -35,7 +35,7 @@ de.epiceric - shopchest-nms-v1_17_1_R1 + shopchest-nms-v1_17_R2 de.epiceric diff --git a/nms/pom.xml b/nms/pom.xml index ec0dd88..5555d62 100644 --- a/nms/pom.xml +++ b/nms/pom.xml @@ -51,7 +51,7 @@ de.epiceric - shopchest-nms-v1_17_1_R1 + shopchest-nms-v1_17_R2 1.0.0 provided From 8cebf411445774a3ef92ecd42116738066a7b4fe Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sun, 24 Jul 2022 03:51:43 +0200 Subject: [PATCH 6/9] Remove useless classifier for shopchest-nms-all --- nms/all/nms-assembly.xml | 2 +- nms/all/pom.xml | 1 + plugin/pom.xml | 1 - pom.xml | 4 ---- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nms/all/nms-assembly.xml b/nms/all/nms-assembly.xml index ac4ca96..28b77f7 100644 --- a/nms/all/nms-assembly.xml +++ b/nms/all/nms-assembly.xml @@ -1,7 +1,7 @@ - ${nmsAssemblyClassifier} + nms-assembly jar diff --git a/nms/all/pom.xml b/nms/all/pom.xml index 6860598..5a20026 100644 --- a/nms/all/pom.xml +++ b/nms/all/pom.xml @@ -63,6 +63,7 @@ single + false nms-assembly.xml diff --git a/plugin/pom.xml b/plugin/pom.xml index a49a8f5..5c2b33c 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -50,7 +50,6 @@ de.epiceric shopchest-nms-all - ${nmsAssemblyClassifier} de.epiceric diff --git a/pom.xml b/pom.xml index 173f4e5..b654621 100644 --- a/pom.xml +++ b/pom.xml @@ -82,9 +82,6 @@ 17 17 - - nms-assembly - true @@ -186,7 +183,6 @@ de.epiceric shopchest-nms-all - ${nmsAssemblyClassifier} 1.0.0 From 67e7c8987c5898d116e3097169d5e024d815fa46 Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sun, 24 Jul 2022 04:22:00 +0200 Subject: [PATCH 7/9] Add groupId to make it usable without parent --- nms/all/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nms/all/pom.xml b/nms/all/pom.xml index 5a20026..3e3981e 100644 --- a/nms/all/pom.xml +++ b/nms/all/pom.xml @@ -6,10 +6,10 @@ shopchest-nms de.epiceric 1.0.0 - ../pom.xml 4.0.0 + de.epiceric shopchest-nms-all 1.0.0 From 5a81fc0b9aaf997a2e2a6ee0ad0685de962b1066 Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sun, 24 Jul 2022 04:22:10 +0200 Subject: [PATCH 8/9] Remove useless blank lines --- nms/v1_18_R1/pom.xml | 1 - nms/v1_18_R2/pom.xml | 1 - nms/v1_19_R1/pom.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/nms/v1_18_R1/pom.xml b/nms/v1_18_R1/pom.xml index b272d92..9998e79 100644 --- a/nms/v1_18_R1/pom.xml +++ b/nms/v1_18_R1/pom.xml @@ -12,7 +12,6 @@ shopchest-nms-v1_18_R1 1.0.0 - 1.18-R0.1-SNAPSHOT diff --git a/nms/v1_18_R2/pom.xml b/nms/v1_18_R2/pom.xml index 15f9700..a7c6082 100644 --- a/nms/v1_18_R2/pom.xml +++ b/nms/v1_18_R2/pom.xml @@ -12,7 +12,6 @@ shopchest-nms-v1_18_R2 1.0.0 - 1.18.2-R0.1-SNAPSHOT diff --git a/nms/v1_19_R1/pom.xml b/nms/v1_19_R1/pom.xml index 0bec1dd..af864a5 100644 --- a/nms/v1_19_R1/pom.xml +++ b/nms/v1_19_R1/pom.xml @@ -12,7 +12,6 @@ shopchest-nms-v1_19_R1 1.0.0 - 1.19-R0.1-SNAPSHOT From 0c5d872764a04b955cc62e56fb1a8feb3575449d Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sun, 24 Jul 2022 04:32:06 +0200 Subject: [PATCH 9/9] Update build instructions in README --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0019eab..bcbc1a8 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,11 @@ Maybe in future I will post an official API through github packages, but current ## Build -You need Maven and a jdk. +You need Maven with Github access and a jdk. +If you don't know how to give Github access to maven, check [this](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-apache-maven-registry#authenticating-with-a-personal-access-token). +If you don't know how to create a personal token, check [this](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). -- First, compile spigot with the BuildTools.jar and the '--remapped' argument. - You need to do it for a lot of minecraft version, starting from 1.17. - To get them all, just do the next step, an error message will tell you what minecraft version is missing. - (I will try to suppress this step in future) -- Use ``mvn clean package`` or ``mvn clean install`` at the root of the project to build ShopChest artefact. +- Use ``mvn clean install`` at the root of the project to build ShopChest artefact. - After the build succeeded, the ShopChest.jar is found in the ``/plugin/target/`` folder. ## Issues