mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 02:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
cyberpwn 2022-01-10 21:01:03 -05:00
parent 90b8747775
commit 0d3f8de811
2 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
build.gradle
View File

@ -87,7 +87,7 @@ compileJava {
* Configure Iris for shading * Configure Iris for shading
*/ */
shadowJar { shadowJar {
minimize() //minimize()
append("plugin.yml") append("plugin.yml")
relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic' relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic'
relocate 'io.papermc.lib', 'com.volmit.iris.util.paper' relocate 'io.papermc.lib', 'com.volmit.iris.util.paper'
@ -148,32 +148,6 @@ dependencies {
if(JavaVersion.current().toString() != "17") if(JavaVersion.current().toString() != "17")
{ {
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println() System.err.println()
System.err.println("=========================================================================================================") System.err.println("=========================================================================================================")
System.err.println("You must run gradle on Java 17. You are using " + JavaVersion.current()) System.err.println("You must run gradle on Java 17. You are using " + JavaVersion.current())
@ -188,10 +162,6 @@ if(JavaVersion.current().toString() != "17")
System.err.println("3. Open a new command prompt window to get the new environment variables if need be.") System.err.println("3. Open a new command prompt window to get the new environment variables if need be.")
System.err.println("=========================================================================================================") System.err.println("=========================================================================================================")
System.err.println() System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.err.println()
System.exit(69); System.exit(69);
} }
@ -203,6 +173,7 @@ def buildToolsHint = new File(buildDir, "buildtools/craftbukkit-" + nmsVersion +
def outputShadeJar = new File(buildDir, "libs/Iris-" + version + "-all.jar"); def outputShadeJar = new File(buildDir, "libs/Iris-" + version + "-all.jar");
def ssiJar = new File(buildDir, "specialsource/Iris-" + version + "-all.jar"); def ssiJar = new File(buildDir, "specialsource/Iris-" + version + "-all.jar");
def ssobfJar = new File(buildDir, "specialsource/Iris-" + version + "-rmo.jar"); def ssobfJar = new File(buildDir, "specialsource/Iris-" + version + "-rmo.jar");
def ssJar = new File(buildDir, "specialsource/Iris-" + version + "-rma.jar");
def homePath = System.properties['user.home'] def homePath = System.properties['user.home']
def m2 = new File(homePath + "/.m2/repository") def m2 = new File(homePath + "/.m2/repository")
def m2s = m2.getAbsolutePath(); def m2s = m2.getAbsolutePath();
@ -271,6 +242,25 @@ task specialSourceRemapObfuscate(type: JavaExec)
] ]
} }
task specialSourceRemap(type: JavaExec)
{
group "remapping"
dependsOn(specialSourceRemapObfuscate)
workingDir = specialSourceFolder
classpath = files(specialSourceJar,
new File(m2s + "/org/spigotmc/spigot/"+spigotJarVersion+"/spigot-" + spigotJarVersion + "-remapped-obf.jar"))
mainClass = "net.md_5.specialsource.SpecialSource"
args = [
"--live",
"-i",
ssobfJar.getName(),
"-o",
ssJar.getName(),
"-m",
m2s + "/org/spigotmc/minecraft-server/"+spigotJarVersion+"/minecraft-server-" + spigotJarVersion + "-maps-spigot.csrg"
]
}
tasks.compileJava.dependsOn(executeBuildTools) tasks.compileJava.dependsOn(executeBuildTools)
task setup() task setup()
@ -282,12 +272,12 @@ task setup()
task iris(type: Copy) task iris(type: Copy)
{ {
group "iris" group "iris"
from ssobfJar from ssJar
into buildDir into buildDir
rename { String fileName -> rename { String fileName ->
fileName.replace('Iris-' + version + '-rmo.jar', "Iris-" + version + ".jar") fileName.replace('Iris-' + version + '-rma.jar', "Iris-" + version + ".jar")
} }
dependsOn(specialSourceRemapObfuscate) dependsOn(specialSourceRemap)
} }

1
src/main/java/com/volmit/iris/core/nms/v18_1/NMSBinding18_1.java
View File

@ -35,6 +35,7 @@ import com.volmit.iris.util.nbt.mca.palette.MCAPaletteAccess;
import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer; import com.volmit.iris.util.nbt.mca.palette.MCAPalettedContainer;
import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer; import com.volmit.iris.util.nbt.mca.palette.MCAWrappedPalettedContainer;
import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.nbt.tag.CompoundTag;
import com.volmit.iris.util.scheduling.Queue;
import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMap;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
import net.minecraft.nbt.NbtIo; import net.minecraft.nbt.NbtIo;