mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-06-19 07:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Development' into Development

Browse Source
This commit is contained in:
cyberpwn
2022-09-09 01:25:16 -04:00
parent dd4b85cbfe cec502340e
commit 494c38a153
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+8 -7
View File
@@ -24,10 +24,11 @@ plugins {
id "de.undercouch.download" version "5.0.1" 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 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 name = getRootProject().getName() // Defined in settings.gradle
def main = 'com.volmit.iris.Iris' def main = 'com.volmit.iris.Iris'
@@ -124,7 +125,7 @@ dependencies {
implementation 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT' implementation 'org.spigotmc:spigot-api:1.19.2-R0.1-SNAPSHOT'
implementation 'me.clip:placeholderapi:2.11.1' implementation 'me.clip:placeholderapi:2.11.1'
implementation 'io.th0rgal:oraxen:1.94.0' 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' implementation 'com.github.LoneDev6:api-itemsadder:3.1.0b'
// Shaded // Shaded
@@ -191,7 +192,7 @@ task downloadBuildtools(type: Download) {
task downloadSpecialSource(type: Download) { task downloadSpecialSource(type: Download) {
group "remapping" 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 dest specialSourceJar
onlyIf { onlyIf {
!specialSourceJar.exists() !specialSourceJar.exists()
@@ -297,7 +298,7 @@ def registerCustomOutputTask(name, path) {
from(new File(buildDir, "Iris-" + version + ".jar")) from(new File(buildDir, "Iris-" + version + ".jar"))
into(file(path)) into(file(path))
rename { String fileName -> 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")) from(new File(buildDir, "Iris-" + version + ".jar"))
into(file(path)) into(file(path))
rename { String fileName -> 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
+2 -2
View File
@@ -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)); IrisBiome b = getEngine().getBiome(e.getBlock().getLocation().clone().subtract(0, getEngine().getWorld().minHeight(), 0));
List<IrisBlockDrops> dropProviders = filterDrops(b.getBlockDrops(), e, getData()); List<IrisBlockDrops> dropProviders = filterDrops(b.getBlockDrops(), e, getData());
@@ -642,7 +642,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
if(d.isNotEmpty()) { if(d.isNotEmpty()) {
World w = e.getBlock().getWorld(); World w = e.getBlock().getWorld();
J.s(() -> d.forEach(item -> w.dropItemNaturally(e.getBlock().getLocation().clone().add(.5, .5, .5), item))); J.s(() -> d.forEach(item -> w.dropItemNaturally(e.getBlock().getLocation().clone().add(.5, .5, .5), item)));
} }*/
} }
} }