Merge pull request #347 from VolmitSoftware/Development

Development

Author: NextdoorPsycho

build.gradle

@@ -23,11 +23,11 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '1.4.20-1.19.2'
-def nmsVersion = "1.19.2" //[NMS]
+version '1.4.21-1.19.3'
+def nmsVersion = "1.19.3" //[NMS]
 def apiVersion = '1.19'
 def specialSourceVersion = '1.11.0' //[NMS]
-def spigotJarVersion = '1.19.2-R0.1-SNAPSHOT' //[NMS]
+def spigotJarVersion = '1.19.3-R0.1-SNAPSHOT' //[NMS]
 def name = getRootProject().getName() // Defined in settings.gradle
 def main = 'com.volmit.adapt.Adapt'
 
@@ -70,6 +70,13 @@ repositories {
             includeGroup("org.spigotmc")
         }
     }
+//    maven {
+//        url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
+//        content {
+//            includeGroup 'org.bukkit'
+//            includeGroup 'org.spigotmc'
+//        }
+//    }
     maven { url "https://arcanearts.jfrog.io/artifactory/archives" }
     maven { url = 'https://repo.extendedclip.com/content/repositories/placeholderapi/' }
     mavenCentral()
@@ -120,8 +127,8 @@ dependencies {
     // Provided or Classpath
     compileOnly 'org.projectlombok:lombok:1.18.24'
     annotationProcessor 'org.projectlombok:lombok:1.18.24'
-    implementation 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT' //[NMS]
-    implementation 'org.bukkit:craftbukkit:1.19.2-R0.1-SNAPSHOT' //[NMS]
+    implementation 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' //[NMS]
+    implementation 'org.bukkit:craftbukkit:1.19.3-R0.1-SNAPSHOT' //[NMS]
 
     // Cancer
     implementation 'art.arcane:Amulet:22.7.18'

src/main/java/com/volmit/adapt/content/adaptation/nether/NetherSkullYeet.java

@@ -154,10 +154,10 @@ public static class Config {
         public boolean permanent = false;
         private boolean enabled = true;
         private int baseCooldown = 15;
-        private int levelCooldown = 7;
+        private int levelCooldown = 5;
         private int baseCost = 10;
         private double costFactor = 1.5;
-        private int maxLevel = 3;
+        private int maxLevel = 2;
         private int initialCost = 5;
     }
 }

src/main/java/com/volmit/adapt/nms/NMS.java

@@ -30,7 +30,7 @@
 public final class NMS {
 
     private static final Map<String, Impl> VERSIONS = new ImmutableMap.Builder<String, Impl>()
-            .put("1.19.2", new NMS_1_19_2())
+            .put("1.19.3", new NMS_1_19_3())
             .build();
 
     private static String version;

src/main/java/com/volmit/adapt/nms/NMS_1_19_2.java renamed to src/main/java/com/volmit/adapt/nms/NMS_1_19_3.java

@@ -24,9 +24,9 @@
 import net.minecraft.network.protocol.game.PacketPlayOutSetCooldown;
 import net.minecraft.world.item.Item;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_19_R1.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_19_R2.util.CraftMagicNumbers;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -35,7 +35,7 @@
 import java.io.IOException;
 import java.util.Base64;
 
-public class NMS_1_19_2 implements NMS.Impl {
+public class NMS_1_19_3 implements NMS.Impl {
 
     @Override
     public String serializeStack(ItemStack is) {

src/main/java/com/volmit/adapt/util/advancements/AdvancementPacketReceiver.java

@@ -30,7 +30,7 @@
 import net.minecraft.network.protocol.game.PacketPlayInAdvancements;
 import net.minecraft.network.protocol.game.PacketPlayInAdvancements.Status;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import java.lang.reflect.Field;

src/main/java/com/volmit/adapt/util/advancements/CrazyAdvancementsAPI.java

@@ -42,7 +42,7 @@
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

src/main/java/com/volmit/adapt/util/advancements/packet/AdvancementsPacket.java

@@ -23,7 +23,7 @@
 import net.minecraft.advancements.AdvancementProgress;
 import net.minecraft.network.protocol.game.PacketPlayOutAdvancements;
 import net.minecraft.resources.MinecraftKey;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import java.util.*;

src/main/java/com/volmit/adapt/util/advancements/packet/PacketConverter.java

@@ -28,7 +28,7 @@
 import net.minecraft.advancements.AdvancementRewards;
 import net.minecraft.resources.MinecraftKey;
 import net.minecraft.world.item.ItemStack;
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftItemStack;
 
 import java.util.HashMap;
 

src/main/java/com/volmit/adapt/util/advancements/packet/ToastPacket.java

@@ -22,7 +22,7 @@
 import net.minecraft.advancements.AdvancementProgress;
 import net.minecraft.network.protocol.game.PacketPlayOutAdvancements;
 import net.minecraft.resources.MinecraftKey;
-import org.bukkit.craftbukkit.v1_19_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_19_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
 import java.util.*;