From 2b749b5ab7045e6f0c5e61ad10a7125c7f758df2 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Tue, 6 Sep 2022 20:51:59 -0700 Subject: [PATCH 1/3] NMS update / Compile --- build.gradle | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index a3a6d42b9..0d0562866 100644 --- a/build.gradle +++ b/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 -def nmsVersion = "1.19.2" +version '2.2.16-1.19.2' // Needs to be version specific +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' @@ -121,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 @@ -191,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() @@ -297,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") } } } @@ -314,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") } } } From 64e27c7fb048fcac8ddcad37510821b759166e01 Mon Sep 17 00:00:00 2001 From: Vatuu <21113232+Vatuu@users.noreply.github.com> Date: Fri, 9 Sep 2022 01:15:07 +0200 Subject: [PATCH 2/3] Disabled blockdrops as hotfix. --- src/main/java/com/volmit/iris/engine/IrisWorldManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 05309d79f..fe8920c60 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -623,7 +623,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager { } }); - KList d = new KList<>(); + /*KList d = new KList<>(); IrisBiome b = getEngine().getBiome(e.getBlock().getLocation().clone().subtract(0, getEngine().getWorld().minHeight(), 0)); List 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))); - } + }*/ } } From cec502340eb832a30034e7fb6b44325570301eec Mon Sep 17 00:00:00 2001 From: Vatuu <21113232+Vatuu@users.noreply.github.com> Date: Fri, 9 Sep 2022 01:15:53 +0200 Subject: [PATCH 3/3] V+ --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0d0562866..af1414015 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ plugins { id "de.undercouch.download" version "5.0.1" } -version '2.2.16-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" //[NMS] def apiVersion = '1.19' def specialSourceVersion = '1.11.0' //[NMS]