Merge pull request #889 from VolmitSoftware/Development

Development

build.gradle

@@ -24,10 +24,11 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.2.15-1.19.2' // Needs to be version specific
+version '2.2.17-1.19.2' // Needs to be version specific
-def nmsVersion = "1.19.2"
+def nmsVersion = "1.19.2" //[NMS]
 def apiVersion = '1.19'
-def spigotJarVersion = '1.19.2-R0.1-SNAPSHOT'
+def specialSourceVersion = '1.11.0' //[NMS]
+def spigotJarVersion = '1.19.2-R0.1-SNAPSHOT' //[NMS]
 def name = getRootProject().getName() // Defined in settings.gradle
 def main = 'com.volmit.iris.Iris'
 
@@ -73,11 +74,8 @@ repositories {
             includeGroup("org.spigotmc")
         }
     }
-    maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" }
+    maven { url "https://arcanearts.jfrog.io/artifactory/archives" }
-    maven { url "https://maven.enginehub.org/repo/" }
+
-    mavenCentral()
-    mavenLocal()
-    maven { url "https://jitpack.io"}
 }
 
 /**
@@ -124,10 +122,10 @@ 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.1-R0.1-SNAPSHOT'
+    implementation 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT' //[NMS]
     implementation 'me.clip:placeholderapi:2.11.1'
     implementation 'io.th0rgal:oraxen:1.94.0'
-    implementation 'org.bukkit:craftbukkit:1.19.2-R0.1-SNAPSHOT:remapped-mojang'
+    implementation 'org.bukkit:craftbukkit:1.19.2-R0.1-SNAPSHOT:remapped-mojang' //[NMS]
     implementation 'com.github.LoneDev6:api-itemsadder:3.1.0b'
 
     // Shaded
@@ -194,7 +192,7 @@ task downloadBuildtools(type: Download) {
 
 task downloadSpecialSource(type: Download) {
     group "remapping"
-    src 'https://repo.maven.apache.org/maven2/net/md-5/SpecialSource/1.10.0/SpecialSource-1.10.0-shaded.jar'
+    src 'https://repo.maven.apache.org/maven2/net/md-5/SpecialSource/' + specialSourceVersion + '/SpecialSource-'+specialSourceVersion+'-shaded.jar'
     dest specialSourceJar
     onlyIf {
         !specialSourceJar.exists()
@@ -300,7 +298,7 @@ def registerCustomOutputTask(name, path) {
         from(new File(buildDir, "Iris-" + version + ".jar"))
         into(file(path))
         rename { String fileName ->
-            fileName.replace("Iris-" + version + ".jar", "Iris.jar")
+            fileName.replace("Iris-" + version + ".jar", "Iris- "+ version +".jar")
         }
     }
 }
@@ -317,7 +315,7 @@ def registerCustomOutputTaskUnix(name, path) {
         from(new File(buildDir, "Iris-" + version + ".jar"))
         into(file(path))
         rename { String fileName ->
-            fileName.replace("Iris-" + version + ".jar", "Iris.jar")
+            fileName.replace("Iris-" + version + ".jar", "Iris- "+ version +".jar")
         }
     }
 }

src/main/java/com/volmit/iris/engine/IrisWorldManager.java

@@ -623,7 +623,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
                 }
             });
 
-            KList<ItemStack> d = new KList<>();
+            /*KList<ItemStack> d = new KList<>();
             IrisBiome b = getEngine().getBiome(e.getBlock().getLocation().clone().subtract(0, getEngine().getWorld().minHeight(), 0));
             List<IrisBlockDrops> dropProviders = filterDrops(b.getBlockDrops(), e, getData());
 
@@ -642,7 +642,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
             if(d.isNotEmpty()) {
                 World w = e.getBlock().getWorld();
                 J.s(() -> d.forEach(item -> w.dropItemNaturally(e.getBlock().getLocation().clone().add(.5, .5, .5), item)));
-            }
+            }*/
         }
     }