From f0d5bea218610b09bc52828652a8a5a591eec90b Mon Sep 17 00:00:00 2001 From: Adrianed04 Date: Thu, 1 Jul 2021 10:01:28 -0500 Subject: [PATCH 1/5] Convert to Maven --- .gitignore | 2 + pom.xml | 75 ++++++++++++++++++++++++++++++++++ src/{ => resources}/plugin.yml | 0 3 files changed, 77 insertions(+) create mode 100644 .gitignore create mode 100644 pom.xml rename src/{ => resources}/plugin.yml (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bc2107c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# Maven +target/ \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..4615bef --- /dev/null +++ b/pom.xml @@ -0,0 +1,75 @@ + + 4.0.0 + twolovers.viarewindpotions + ViaPotions + 0.0.2 + + 1.8 + 1.8 + + + ${project.artifactId} + ${basedir}/src/ + + + src/resources + + + + + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + jitpack.io + https://jitpack.io + + + + viaversion-repo + https://repo.viaversion.com + + + + dmulloy2-repo + https://repo.dmulloy2.net/repository/public/ + + + + + org.spigotmc + spigot-api + 1.16.5-R0.1-SNAPSHOT + provided + + + com.viaversion + viaversion-api + 4.0.0 + provided + + + com.comphenix.protocol + ProtocolLib + 4.6.0 + + + com.github.ProtocolSupport + ProtocolSupport + eafe538e35 + + + \ No newline at end of file diff --git a/src/plugin.yml b/src/resources/plugin.yml similarity index 100% rename from src/plugin.yml rename to src/resources/plugin.yml From b2a7932f638b972760b972c20fe1c7aa9d3b280c Mon Sep 17 00:00:00 2001 From: Adrianed04 Date: Thu, 1 Jul 2021 10:03:03 -0500 Subject: [PATCH 2/5] Update to ViaVersion 4 --- src/twolovers/viarewindpotions/utils/VersionUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/twolovers/viarewindpotions/utils/VersionUtil.java b/src/twolovers/viarewindpotions/utils/VersionUtil.java index 5b53bf6..775a2ec 100644 --- a/src/twolovers/viarewindpotions/utils/VersionUtil.java +++ b/src/twolovers/viarewindpotions/utils/VersionUtil.java @@ -5,7 +5,7 @@ import org.bukkit.plugin.PluginManager; import protocolsupport.api.ProtocolSupportAPI; import protocolsupport.api.ProtocolType; -import us.myles.ViaVersion.api.Via; +import com.viaversion.viaversion.api.Via; public class VersionUtil { private final Plugin protocolSupport; From 3b6296235fc1315ee59973258a815bf7100e71e0 Mon Sep 17 00:00:00 2001 From: Adrianed04 Date: Thu, 1 Jul 2021 10:34:50 -0500 Subject: [PATCH 3/5] 0.0.2 --- src/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/plugin.yml b/src/resources/plugin.yml index 33239c3..5ebc91e 100644 --- a/src/resources/plugin.yml +++ b/src/resources/plugin.yml @@ -1,5 +1,5 @@ name: ViaRewindPotions -version: 0.0.1 +version: 0.0.2 description: Translates thrown potions for ProtocolSupport and ViaRewind depend: [ProtocolLib] softdepend: From e0597122249d9f4065960086748ead3888fdfd70 Mon Sep 17 00:00:00 2001 From: Juan Cruz Linsalata <25271111+linsaftw@users.noreply.github.com> Date: Thu, 1 Jul 2021 13:34:54 -0300 Subject: [PATCH 4/5] Update .gitignore --- .gitignore | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bc2107c..0443cb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ -# Maven -target/ \ No newline at end of file +.project +.vscode +.settings +.factorypath +.classpath +/target From 4b258292fb83c37feddffeef1d3af470378a9559 Mon Sep 17 00:00:00 2001 From: Juan Cruz Linsalata <25271111+linsaftw@users.noreply.github.com> Date: Thu, 1 Jul 2021 13:36:01 -0300 Subject: [PATCH 5/5] Update pom.xml --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 4615bef..9c0e9a6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ - + spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ @@ -67,9 +67,9 @@ 4.6.0 - com.github.ProtocolSupport - ProtocolSupport - eafe538e35 + com.github.ProtocolSupport + ProtocolSupport + eafe538e35 - \ No newline at end of file +