From 4af01afc1acba4f1c989b79df42898445884d9b0 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sat, 20 Mar 2021 19:48:16 +0100 Subject: [PATCH 01/13] Add orb pickup KelpSound --- core/src/main/java/de/pxav/kelp/core/sound/KelpSound.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/de/pxav/kelp/core/sound/KelpSound.java b/core/src/main/java/de/pxav/kelp/core/sound/KelpSound.java index db801123..86a52523 100644 --- a/core/src/main/java/de/pxav/kelp/core/sound/KelpSound.java +++ b/core/src/main/java/de/pxav/kelp/core/sound/KelpSound.java @@ -14,9 +14,8 @@ public enum KelpSound { LEVEL_UP(KelpVersion.MC_1_8_0), - ITEM_BREAK(KelpVersion.MC_1_8_0) - - ; + ITEM_BREAK(KelpVersion.MC_1_8_0), + ORB_PICKUP(KelpVersion.MC_1_8_0); private KelpVersion since; From e0adc5a7b7eca33e0567ccb83019606b2ec69e0b Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sat, 20 Mar 2021 19:50:43 +0100 Subject: [PATCH 02/13] Add ORB_PICKUP to VersionedSound defaults --- .../de/pxav/kelp/implementation1_8/sound/VersionedSound.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/sound/VersionedSound.java b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/sound/VersionedSound.java index 9c47c802..233edaff 100644 --- a/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/sound/VersionedSound.java +++ b/v1_8_implementation/src/main/java/de/pxav/kelp/implementation1_8/sound/VersionedSound.java @@ -28,7 +28,8 @@ public void defineDefaults() { soundRepository.addSound(KelpSound.LEVEL_UP, Sound.LEVEL_UP.toString()); soundRepository.addSound(KelpSound.ITEM_BREAK, Sound.ITEM_BREAK.toString()); - + soundRepository.addSound(KelpSound.ORB_PICKUP, Sound.ORB_PICKUP.toString()); + long elapsed = System.currentTimeMillis() - started; System.out.println("[VERSION-1.8] Successfully defined sound names (took " + elapsed + "ms)"); } From 292c9403571cf57ac7e6cf880b242fbb55a23721 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sat, 20 Mar 2021 20:03:24 +0100 Subject: [PATCH 03/13] bump version --- core/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 0fccfd18..0f029bad 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.github.pxav.kelp parent - 0.3.2 + 0.3.3 4.0.0 @@ -172,4 +172,4 @@ - \ No newline at end of file + From 083104e09d270891eb82dda4691ff29def83abf8 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sat, 20 Mar 2021 20:04:01 +0100 Subject: [PATCH 04/13] bump version --- core/src/main/java/de/pxav/kelp/core/KelpPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java b/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java index bf61ba98..9b5d4a88 100644 --- a/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java +++ b/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java @@ -35,7 +35,7 @@ * * @author pxav */ -@Plugin(name = "Kelp", version = "0.3.2") +@Plugin(name = "Kelp", version = "0.3.3") @Author("pxav") @Description("A cross version spigot framework.") @Singleton From 95a645753864dde41defbccd8d8251306566cee6 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sat, 20 Mar 2021 20:04:32 +0100 Subject: [PATCH 05/13] bump version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4a557119..a2761896 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.github.pxav.kelp parent pom - 0.3.2 + 0.3.3 Kelp A cross-version spigot framework to avoid boilerplate code and make your plugin compatible with multiple spigot versions easily @@ -244,4 +244,4 @@ - \ No newline at end of file + From 084b3534ba70f3536c1fbbdf97a0d15050f4d18a Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sat, 20 Mar 2021 20:04:48 +0100 Subject: [PATCH 06/13] bump version --- kelp-sql/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kelp-sql/pom.xml b/kelp-sql/pom.xml index f899b4b7..340d0554 100644 --- a/kelp-sql/pom.xml +++ b/kelp-sql/pom.xml @@ -5,7 +5,7 @@ parent com.github.pxav.kelp - 0.3.2 + 0.3.3 4.0.0 @@ -69,4 +69,4 @@ - \ No newline at end of file + From 8de67478202567117e14687e5d6fd1b2956750d5 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sat, 20 Mar 2021 20:05:14 +0100 Subject: [PATCH 07/13] Update pom.xml --- v_1_14_implementation/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v_1_14_implementation/pom.xml b/v_1_14_implementation/pom.xml index 649854f7..7762b4a7 100644 --- a/v_1_14_implementation/pom.xml +++ b/v_1_14_implementation/pom.xml @@ -5,7 +5,7 @@ parent com.github.pxav.kelp - 0.3.2 + 0.3.3 4.0.0 @@ -105,4 +105,4 @@ - \ No newline at end of file + From e2d672a2ec2dd8dbe326497eb2ce2cd3fa442647 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sun, 21 Mar 2021 09:59:22 +0100 Subject: [PATCH 08/13] undo version --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 0f029bad..78ecab0e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.github.pxav.kelp parent - 0.3.3 + 0.32 4.0.0 From 15e4ba52871d762001601680cad2295bf144fed6 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sun, 21 Mar 2021 10:00:26 +0100 Subject: [PATCH 09/13] Undo version --- core/src/main/java/de/pxav/kelp/core/KelpPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java b/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java index 9b5d4a88..bf61ba98 100644 --- a/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java +++ b/core/src/main/java/de/pxav/kelp/core/KelpPlugin.java @@ -35,7 +35,7 @@ * * @author pxav */ -@Plugin(name = "Kelp", version = "0.3.3") +@Plugin(name = "Kelp", version = "0.3.2") @Author("pxav") @Description("A cross version spigot framework.") @Singleton From 590c179c95d5b48cd28d71648e09d26f1eb81711 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sun, 21 Mar 2021 10:00:52 +0100 Subject: [PATCH 10/13] Update pom.xml --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 78ecab0e..9ae73ded 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.github.pxav.kelp parent - 0.32 + 0.3.2 4.0.0 From 3f4f48878bd7876e46b9aa2521a248123304aa59 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sun, 21 Mar 2021 10:01:28 +0100 Subject: [PATCH 11/13] Undo version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2761896..b5a80458 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.github.pxav.kelp parent pom - 0.3.3 + 0.3.2 Kelp A cross-version spigot framework to avoid boilerplate code and make your plugin compatible with multiple spigot versions easily From 387a03d96f3c5c60edde4dc05bdef1c0dbb829e8 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sun, 21 Mar 2021 10:01:52 +0100 Subject: [PATCH 12/13] Undo version --- kelp-sql/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kelp-sql/pom.xml b/kelp-sql/pom.xml index 340d0554..24b0efbb 100644 --- a/kelp-sql/pom.xml +++ b/kelp-sql/pom.xml @@ -5,7 +5,7 @@ parent com.github.pxav.kelp - 0.3.3 + 0.3.2 4.0.0 From 1d82d9330a65c2758ff16e0565a85e35e3643c85 Mon Sep 17 00:00:00 2001 From: sqlongithub Date: Sun, 21 Mar 2021 10:02:13 +0100 Subject: [PATCH 13/13] Update pom.xml --- v_1_14_implementation/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v_1_14_implementation/pom.xml b/v_1_14_implementation/pom.xml index 7762b4a7..132c85a7 100644 --- a/v_1_14_implementation/pom.xml +++ b/v_1_14_implementation/pom.xml @@ -5,7 +5,7 @@ parent com.github.pxav.kelp - 0.3.3 + 0.3.2 4.0.0