From b53f5829d661c34ef840d0f744a8b61377a4634e Mon Sep 17 00:00:00 2001 From: kappa_maintainer Date: Tue, 21 Nov 2023 23:16:24 +0800 Subject: [PATCH] 3009 --- build.gradle | 45 +++++++++++-------- gradle.properties | 4 +- .../FallbackResourceManager.java.patch | 16 +++++++ .../resources/FileResourcePack.java.patch | 23 ++++++++++ .../org/lwjgl/opengl/ContextCapabilities.java | 1 + 5 files changed, 68 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 88c1b0063..dac5df474 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,11 @@ project(':mcp') { name "outlandsReleases" url "https://maven.outlands.top/releases" } + maven { + name 'MinecraftForge' + url 'https://maven.minecraftforge.net/' + } + } mcp { config = props.minecraft_version + '-' + props.mcp_version @@ -104,6 +109,10 @@ project(':minecraft') { name "outlandsReleases" url "https://maven.outlands.top/releases" } + maven { + name 'MinecraftForge' + url 'https://maven.minecraftforge.net/' + } } // configurations.all { @@ -412,23 +421,23 @@ project(':cleanroom') { installer "com.cleanroommc:bouncepad:$props.bouncepad_version" - installer 'com.ibm.icu:icu4j:73.2' + installer 'com.ibm.icu:icu4j:74.1' - installer 'org.jline:jline:3.5.1' - installer 'com.typesafe.akka:akka-actor_2.11:2.3.3' - installer 'com.typesafe:config:1.2.1' + installer 'org.jline:jline:3.24.1' + installer 'com.typesafe.akka:akka-actor_2.12:2.8.5' + installer 'com.typesafe:config:1.4.3' // TODO: Move scala away from being defaulted when installing (download on-demand?) installer 'org.scala-lang:scala-actors-migration_2.11:1.1.0' - installer 'org.scala-lang:scala-compiler:2.11.1' + installer 'org.scala-lang:scala-compiler:2.12.18' // We change the version so old installs don't break, as our clone of the jar is different the maven central - installer 'org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2_mc' - installer 'org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2_mc' - - installer 'org.scala-lang:scala-library:2.11.1' - installer 'org.scala-lang:scala-parser-combinators_2.11:1.0.1' - installer 'org.scala-lang:scala-reflect:2.11.1' - installer 'org.scala-lang:scala-swing_2.11:1.0.1' - installer 'org.scala-lang:scala-xml_2.11:1.0.2' + installer 'org.scala-lang.plugins:scala-continuations-library_2.12:1.0.3' + installer 'org.scala-lang.plugins:scala-continuations-plugin_2.12.2:1.0.3' + + installer 'org.scala-lang:scala-library:2.12.18' + installer 'org.scala-lang.modules:scala-parser-combinators_2.12:2.3.0' + installer 'org.scala-lang:scala-reflect:2.12.18' + installer 'org.scala-lang.modules:scala-swing_2.12:3.0.0' + installer 'org.scala-lang.modules:scala-xml_2.12:2.2.0' installer 'lzma:lzma:0.0.1' installer 'java3d:vecmath:1.5.2' installer 'net.sf.trove4j:trove4j:3.0.3' @@ -458,7 +467,7 @@ project(':cleanroom') { // Mixin installer 'com.cleanroommc:sponge-mixin:0.13.3+mixin.0.8.5' - installer annotationProcessor('com.github.llamalad7.mixinextras:mixinextras-common:0.2.1-beta.2') + installer annotationProcessor('com.github.llamalad7.mixinextras:mixinextras-common:0.2.1') testImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.0' testImplementation 'org.junit.vintage:junit-vintage-engine:5.+' @@ -1026,10 +1035,8 @@ project(':cleanroom') { // TODO: MDK Task userdevConfig { - def artifacts = Util.getArtifacts(project, project.configurations.installer, true) - artifacts.each { key, lib -> - libraries.add(lib.name) - } + Util.getArtifacts(project, project.configurations.installer, true).each { key, lib -> libraries.add(lib.name) } + artifacts libraries.add('net.minecraftforge:legacydev:0.2.3.+:fatjar') universalFilters.add('^(?!binpatches\\.pack\\.lzma$).*$') @@ -1100,7 +1107,7 @@ project(':cleanroom') { publishing { repositories { maven { - name = "outlandsReleases" + name = "outland" url = "https://maven.outlands.top/releases" credentials(PasswordCredentials) authentication { diff --git a/gradle.properties b/gradle.properties index 464e2f242..0a2da5e26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ patch_version = 0 # MAJOR.SPEC_MAJOR.SPEC_MINOR.BUILD last_forge_version = 14.23.5.2860 -new_forge_version = 15.24.0.3006 +new_forge_version = 15.24.0.3009 # Minecraft & Mappings mapping_channel = stable @@ -26,7 +26,7 @@ installer_tools_version = 1.3.0 # Libraries asm_version = 9.6 asm_deprecated = 7.1 -bouncepad_version = 0.4.5-cursed +bouncepad_version = 0.4.6-cursed lwjgl_version = 3.3.2-22-CLEANROOM # Sets default memory used for Gradle commands. Can be overridden by user or command line properties. diff --git a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch index b11cdd6fc..29e2d84df 100644 --- a/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch +++ b/patches/minecraft/net/minecraft/client/resources/FallbackResourceManager.java.patch @@ -35,3 +35,19 @@ ResourceLocation resourcelocation = func_110537_b(p_135056_1_); for (IResourcePack iresourcepack : this.field_110540_a) +@@ -134,15 +135,6 @@ + this.field_177329_c = true; + } + +- protected void finalize() throws Throwable +- { +- if (!this.field_177329_c) +- { +- FallbackResourceManager.field_177246_b.warn(this.field_177328_b); +- } +- +- super.finalize(); +- } + + public int read() throws IOException + { diff --git a/patches/minecraft/net/minecraft/client/resources/FileResourcePack.java.patch b/patches/minecraft/net/minecraft/client/resources/FileResourcePack.java.patch index 0ac42581b..1ded0314c 100644 --- a/patches/minecraft/net/minecraft/client/resources/FileResourcePack.java.patch +++ b/patches/minecraft/net/minecraft/client/resources/FileResourcePack.java.patch @@ -1,5 +1,14 @@ --- before/net/minecraft/client/resources/FileResourcePack.java +++ after/net/minecraft/client/resources/FileResourcePack.java +@@ -17,7 +17,7 @@ + import net.minecraftforge.fml.relauncher.SideOnly; + + @SideOnly(Side.CLIENT) +-public class FileResourcePack extends AbstractResourcePack implements Closeable ++public class FileResourcePack extends AbstractResourcePack implements AutoCloseable + { + public static final Splitter field_110601_c = Splitter.on('/').omitEmptyStrings().limit(3); + private ZipFile field_110600_d; @@ -58,7 +58,7 @@ { return this.func_110599_c().getEntry(p_110593_1_) != null; @@ -26,3 +35,17 @@ while (enumeration.hasMoreElements()) { +@@ -108,12 +108,8 @@ + return set; + } + +- protected void finalize() throws Throwable +- { +- this.close(); +- super.finalize(); +- } + ++ @Override + public void close() throws IOException + { + if (this.field_110600_d != null) diff --git a/src/main/java/org/lwjgl/opengl/ContextCapabilities.java b/src/main/java/org/lwjgl/opengl/ContextCapabilities.java index e6c34cedc..e17189621 100644 --- a/src/main/java/org/lwjgl/opengl/ContextCapabilities.java +++ b/src/main/java/org/lwjgl/opengl/ContextCapabilities.java @@ -309,6 +309,7 @@ public ContextCapabilities() { public boolean OpenGL42; public boolean OpenGL43; public boolean OpenGL44; + public boolean OpenGL45; public boolean GL_GREMEDY_frame_terminator; public boolean GL_GREMEDY_string_marker; public boolean GL_HP_occlusion_test;