Merge pull request #503 from VolmitSoftware/Development

1.21.1 - Update

Author: NextdoorPsycho

build.gradle

@@ -22,11 +22,11 @@ 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'
-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 =============================
@@ -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'
 
@@ -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:'))
     }
 }
 
@@ -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'
 

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;
     }
 }

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