Skip to content

Update to Unimined 1.4.2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
halotroop2288 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update to Unimined 1.4.2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
import java.net.URI

plugins {
kotlin("jvm") version "1.9.23"
kotlin("jvm") version "2.1.20"
`java-gradle-plugin`
`maven-publish`
}

version = "${project.properties["version"]}" + if (project.hasProperty("version_snapshot")) "-SNAPSHOT" else ""
group = "${project.properties["maven_group"]}"

java {
toolchain.languageVersion = JavaLanguageVersion.of(8)
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlin {
jvmToolchain(8)
}

base.archivesName = "${project.properties["archives_base_name"]}"

val main: SourceSet by sourceSets.getting
Expand Down Expand Up @@ -39,7 +49,8 @@ dependencies {

runtimeOnly(gradleApi())

implementation("xyz.wagyourtail.unimined:unimined:1.3.15")
implementation("xyz.wagyourtail.unimined:unimined:1.4.2")
implementation("xyz.wagyourtail.unimined.mapping:unimined-mapping-library-jvm:1.2.1")
installerImplementation("io.github.java-diff-utils:java-diff-utils:4.16")
installerImplementation("net.neoforged.installertools:binarypatcher:3.0.13")
installerImplementation("org.ow2.asm:asm:9.8")
Expand Down Expand Up @@ -109,9 +120,9 @@ publishing {
}
publications {
create<MavenPublication>("maven") {
groupId = project.group as String
artifactId = project.properties["archives_base_name"] as String? ?: project.name
version = project.version as String
groupId = "${project.group}"
artifactId = "${project.properties["archives_base_name"]}"
version = "${project.version}"

artifact(installerJar.get()) {
classifier = "installer"
Expand Down
8 changes: 5 additions & 3 deletions src/installer/java/xyz/wagyourtail/patchbase/installer/PatchbaseInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
import java.io.InputStream;
import java.net.URI;
import java.nio.file.*;
import java.util.Collections;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;

Expand Down Expand Up @@ -65,7 +67,7 @@ public void patch(Path patchJar, Path baseJar, Path outputJar) throws IOExceptio

public static <T> T readZipInputStreamFor(Path path, String entry, boolean throwIfMissing, Function<InputStream, T> action) throws IOException {
try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(path))) {
var zipEntry = zis.getNextEntry();
ZipEntry zipEntry = zis.getNextEntry();
while (zipEntry != null) {
if (zipEntry.isDirectory()) {
zipEntry = zis.getNextEntry();
Expand All @@ -85,7 +87,7 @@ public static <T> T readZipInputStreamFor(Path path, String entry, boolean throw

public static void forEachInZip(Path path, BiConsumer<String, InputStream> action) throws IOException {
try (ZipInputStream zis = new ZipInputStream(Files.newInputStream(path))) {
var entry = zis.getNextEntry();
ZipEntry entry = zis.getNextEntry();
while (entry != null) {
if (entry.isDirectory()) {
entry = zis.getNextEntry();
Expand All @@ -98,7 +100,7 @@ public static void forEachInZip(Path path, BiConsumer<String, InputStream> actio
}

public static FileSystem openZipFileSystem(Path path) throws IOException {
return openZipFileSystem(path, Map.of());
return openZipFileSystem(path, Collections.emptyMap());
}

public static FileSystem openZipFileSystem(Path path, Map<String, Object> args) throws IOException {
Expand Down
13 changes: 0 additions & 13 deletions src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchCreatorPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,6 @@ package xyz.wagyourtail.patchbase.gradle

import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.tasks.SourceSet
import org.gradle.jvm.tasks.Jar
import xyz.wagyourtail.patchbase.gradle.tasks.ApplySourcePatchTask
import xyz.wagyourtail.patchbase.gradle.tasks.CreateClassPatchTask
import xyz.wagyourtail.patchbase.gradle.tasks.CreateSourcePatchTask
import xyz.wagyourtail.unimined.api.minecraft.EnvType
import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig
import xyz.wagyourtail.unimined.api.unimined
import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
import xyz.wagyourtail.unimined.internal.minecraft.patch.NoTransformMinecraftTransformer
import xyz.wagyourtail.unimined.internal.minecraft.patch.jarmod.JarModAgentMinecraftTransformer
import xyz.wagyourtail.unimined.util.sourceSets
import xyz.wagyourtail.unimined.util.withSourceSet

class PatchCreatorPlugin : Plugin<Project> {

Expand Down
9 changes: 4 additions & 5 deletions src/main/kotlin/xyz/wagyourtail/patchbase/gradle/PatchExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ package xyz.wagyourtail.patchbase.gradle

import org.gradle.api.Project
import org.gradle.api.tasks.SourceSet
import org.gradle.configurationcache.extensions.capitalized
import org.gradle.jvm.tasks.Jar
import org.jetbrains.annotations.ApiStatus
import xyz.wagyourtail.patchbase.gradle.tasks.ApplySourcePatchTask
import xyz.wagyourtail.patchbase.gradle.tasks.CreateClassPatchTask
import xyz.wagyourtail.patchbase.gradle.tasks.CreateSourcePatchTask
import xyz.wagyourtail.unimined.api.minecraft.EnvType
import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig
import xyz.wagyourtail.unimined.api.unimined
import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
import xyz.wagyourtail.unimined.internal.minecraft.patch.jarmod.JarModAgentMinecraftTransformer
import xyz.wagyourtail.unimined.mapping.EnvType
import xyz.wagyourtail.unimined.util.FinalizeOnRead
import xyz.wagyourtail.unimined.util.capitalized
import xyz.wagyourtail.unimined.util.withSourceSet
import kotlin.io.path.nameWithoutExtension

Expand All @@ -39,7 +39,7 @@ abstract class PatchExtension(val project: Project) {

fun patchBaseCreator(sourceSet: SourceSet, devJar: Boolean = false) {
val mc = project.unimined.minecrafts[sourceSet]!!
if (mc.side == EnvType.COMBINED) {
if (mc.side == EnvType.JOINED) {
project.logger.warn("[PatchBase/Creator ${this.project.path} ${sourceSet}] Merged may make applying patches more difficult, proceed with caution")
}
if (!mc.defaultRemapJar) {
Expand Down Expand Up @@ -91,8 +91,7 @@ abstract class PatchExtension(val project: Project) {
when (mc.side) {
EnvType.CLIENT -> it.classpath.set(project.files(mc.minecraftData.minecraftClientFile))
EnvType.SERVER -> it.classpath.set(project.files(mc.minecraftData.minecraftServerFile))
EnvType.COMBINED -> it.classpath.set(project.files(mc.mergedOfficialMinecraftFile))
else -> throw IllegalStateException("Unknown side: ${mc.side}")
EnvType.JOINED -> it.classpath.set(project.files(mc.mergedOfficialMinecraftFile))
}

it.archiveClassifier.set("patch")
Expand Down