From d8ba93b8f1614f98debf98d447aa7b9c6243740a Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Mon, 5 Aug 2024 10:58:15 -0400 Subject: [PATCH 1/5] f --- .../volmit/adapt/content/adaptation/rift/RiftResist.java | 4 +++- src/main/resources/plugin.yml | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftResist.java b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftResist.java index be555e7e..a9a66d5e 100644 --- a/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftResist.java +++ b/src/main/java/com/volmit/adapt/content/adaptation/rift/RiftResist.java @@ -82,7 +82,7 @@ public void on(PlayerInteractEvent e) { switch (hand.getType()) { case ENDER_EYE, ENDER_PEARL -> { xp(p, 3); - riftResistStackAdd(p, 80, 10); + riftResistStackAdd(p, getConfig().duration, getConfig().amplitude); } } } @@ -111,6 +111,8 @@ protected static class Config { int baseCost = 3; double costFactor = 1; int maxLevel = 1; + int amplitude = 1; + int duration = 80; int initialCost = 5; } } \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 41b57618..13aa7dcb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -29,6 +29,9 @@ permissions: adapt.idontknowwhatimdoingiswear: description: This is for the Adapt Testing command DEVELOPERS ONLY default: op + adapt.listboosts: + description: Allows for you to view the boosts on a player + default: op adapt.opengui: description: Open the GUI without needing a Bookshelf default: op @@ -356,6 +359,9 @@ permissions: adapt.blacklist.riftresist: description: Blacklist the adaptation RiftResist default: false + adapt.blacklist.riftvisage: + description: Blacklist the adaptation RiftVisage + default: false adapt.blacklist.seaborne: description: Blacklist the skill Seaborne default: false From 10f66f5d372af3b4edbe2e9bdd07d7ea0f5f3c75 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 22 Aug 2024 13:57:35 +0200 Subject: [PATCH 2/5] update advancementapi for 1.21.1 support --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 30f377e0..e934ce8b 100644 --- a/build.gradle +++ b/build.gradle @@ -141,7 +141,7 @@ allprojects { implementation "com.github.angeschossen:ChestProtectAPI:3.9.1" implementation "com.github.TechFortress:GriefPrevention:16.18.1" implementation 'xyz.xenondevs:particle:1.8.1' - implementation "com.frengor:ultimateadvancementapi-shadeable:2.4.0" + implementation "com.frengor:ultimateadvancementapi-shadeable:2.4.1" compileOnly 'com.griefdefender:api:2.1.0-SNAPSHOT' compileOnly 'io.netty:netty-all:4.1.68.Final' @@ -221,7 +221,7 @@ dependencies { implementation "com.github.angeschossen:ChestProtectAPI:3.9.1" implementation "com.github.TechFortress:GriefPrevention:16.18.1" implementation 'xyz.xenondevs:particle:1.8.1' - implementation "com.frengor:ultimateadvancementapi-shadeable:2.4.0" + implementation "com.frengor:ultimateadvancementapi-shadeable:2.4.1" compileOnly 'com.griefdefender:api:2.1.0-SNAPSHOT' compileOnly 'io.netty:netty-all:4.1.68.Final' From 66ede5b3f85f910bd86e602cc8650d3b81b2f045 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 22 Aug 2024 13:57:44 +0200 Subject: [PATCH 3/5] v+ --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e934ce8b..5092486a 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id "com.github.johnrengelman.shadow" version "7.1.2" } -version '1.15.0-1.19.2-1.21' +version '1.15.1-1.19.2-1.21.1' def apiVersion = '1.19' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.adapt.Adapt' From 7ce96abb8ebc7694549fe870654cfe75c75ecd92 Mon Sep 17 00:00:00 2001 From: Julian Krings Date: Thu, 22 Aug 2024 20:10:15 +0200 Subject: [PATCH 4/5] woops --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5092486a..edd773e2 100644 --- a/build.gradle +++ b/build.gradle @@ -179,7 +179,7 @@ shadowJar { include(dependency('systems.manifold:')) include(dependency('xyz.xenondevs:')) include(dependency('art.arcane:')) - include(dependency('com.frengor:ultimateadvancementapi-shadeable:2.4.0')) + include(dependency('com.frengor:ultimateadvancementapi-shadeable:')) } } From 52c702957a8e9f5e89c8194da60364f0d11d8b3f Mon Sep 17 00:00:00 2001 From: Brian Neumann-Fopiano Date: Thu, 22 Aug 2024 14:15:33 -0400 Subject: [PATCH 5/5] fff --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index edd773e2..66cd8931 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ version '1.15.1-1.19.2-1.21.1' def apiVersion = '1.19' def name = getRootProject().getName() // Defined in settings.gradle def main = 'com.volmit.adapt.Adapt' -def manifoldVersion = '2024.1.10' +def manifoldVersion = '2024.1.30' // ADD YOURSELF AS A NEW LINE IF YOU WANT YOUR OWN BUILD TASK GENERATED // ======================== WINDOWS =============================