Skip to content

Commit 4e6b5fd

Browse files
Fox2CodeFox2Code
committed
FoxLoader 2.0-alpha39
1 parent 741caa7 commit 4e6b5fd

File tree

3 files changed

+31
-34
lines changed

3 files changed

+31
-34
lines changed

‎gradle.properties‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8
55
org.gradle.java.installations.auto-download=true
66

77
# FoxLoader properties
8-
foxloader.version=2.0-alpha38
8+
foxloader.version=2.0-alpha39
99
# https://www.jitpack.io/#com.fox2code/FoxLoader
1010

1111
# ReIndev properties
@@ -19,12 +19,12 @@ reindev.version=2.9_03
1919
reindev.version.allowFrom=2.9
2020

2121
# https://plugins.gradle.org/plugin/com.diffplug.spotless
22-
spotless.version=8.0.0
22+
spotless.version=8.1.0
2323

2424
# https://modrinth.com/mod/spark/versions
2525
#Spark properties
26-
spark.dependency=maven.modrinth:spark:1.10.145-fabric
27-
spark.version=1.10.145
26+
spark.dependency=maven.modrinth:spark:1.10.156-fabric
27+
spark.version=1.10.156
2828

2929
# https://mvnrepository.com/artifact/it.unimi.dsi/fastutil-core
3030
fastutil.version=8.5.18
@@ -40,25 +40,25 @@ jansi.version=2.4.2
4040

4141
# https://github.com/Vineflower/vineflower/releases
4242
#VineFlower properties
43-
vineflower.dependency=org.vineflower:vineflower:1.11.1
43+
vineflower.dependency=org.vineflower:vineflower:1.11.2
4444

4545
# https://asm.ow2.io/versions.html
4646
#ASM properties
47-
asm.version=9.9
47+
asm.version=9.9.1
4848
asm.java-support-max=26
4949

5050
# https://github.com/unimined/JvmDowngrader/releases
5151
#JvmDowngrader properties
52-
jvm-downgrader.version=1.3.3
53-
jvm-downgrader.java-support-max=24
52+
jvm-downgrader.version=1.3.5
53+
jvm-downgrader.java-support-max=25
5454

5555
# https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
5656
# Fabric Mixin version
57-
fabric-mixin.version=0.16.5+mixin.0.8.7
57+
fabric-mixin.version=0.17.0+mixin.0.8.7
5858

5959
# https://github.com/LlamaLad7/MixinExtras/releases
6060
# Mixin Extras version
61-
mixin-extras.version=0.5.0
61+
mixin-extras.version=0.5.3
6262

6363
# https://github.com/Bawnorton/MixinSquared/releases
6464
# Mixin Squared version
@@ -69,7 +69,7 @@ mixin-constraints.version=1.1.0
6969

7070
# https://repo.sleeping.town/blue/endless/jankson/
7171
# Jankson version
72-
jankson.version=2.0.0-SNAPSHOT-38
72+
jankson.version=2.0.0-SNAPSHOT-41
7373

7474
# https://github.com/Fox2Code/ReBuild/releases
7575
rebuild.version=1.1.0
@@ -88,7 +88,7 @@ lwjglx.version=v0.29
8888
jna.version=5.18.1
8989

9090
# https://kotlinlang.org/docs/home.html
91-
kotlin.version=2.2.20
91+
kotlin.version=2.3.0
9292

9393
# https://mvnrepository.com/artifact/org.jetbrains.kotlinx/atomicfu-jvm
9494
kotlinx.atomicfu.version=0.29.0
@@ -103,7 +103,7 @@ kotlinx.coroutines.version=1.10.2
103103
kotlinx.datetime.version=0.7.1
104104

105105
# https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-io-core-jvm
106-
kotlinx.io.version=0.8.0
106+
kotlinx.io.version=0.8.2
107107

108108
# https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-metadata-jvm
109109
kotlinx.metadata.version=0.9.0

‎loader/src/main/java/com/fox2code/foxloader/spark/FoxLoaderSparkJanksonConfigParser.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@
2525

2626
import blue.endless.jankson.api.Jankson;
2727
import blue.endless.jankson.api.SyntaxError;
28-
import blue.endless.jankson.api.document.KeyValuePairElement;
29-
import blue.endless.jankson.api.document.ObjectElement;
30-
import blue.endless.jankson.api.document.PrimitiveElement;
31-
import blue.endless.jankson.api.document.ValueElement;
32-
import blue.endless.jankson.impl.document.BooleanElementImpl;
28+
import blue.endless.jankson.api.document.*;
3329
import com.fox2code.foxloader.config.ConfigIO;
3430
import com.fox2code.foxloader.loader.ModLoaderInit;
3531
import com.google.gson.JsonElement;
@@ -75,7 +71,7 @@ private static void dumpConfiguration(String path, HashMap<String, Object> hash
7571
hashMap, keyValuePairElement.getValue());
7672
}
7773
} else if (valueElement instanceof PrimitiveElement) {
78-
hashMap.put(path, ((BooleanElementImpl) valueElement)
74+
hashMap.put(path, ((PrimitiveElement) valueElement)
7975
.getValue().orElseThrow(NoSuchElementException::new));
8076
}
8177
}

‎patching/src/main/java/com/fox2code/foxloader/dependencies/DependencyHelper.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,26 @@ public final class DependencyHelper {
7474
// Extra dependencies not included in ReIndev
7575
public static final Dependency jvmDowngraderCore =
7676
new Dependency("xyz.wagyourtail.jvmdowngrader:jvmdowngrader:" + BuildConfig.JVM_DOWNGRADER_VERSION,
77-
MAVEN_CENTRAL, "xyz.wagyourtail.jvmdg.ClassDowngrader", null, "6f3543575eb970f7e8e0f5e87c16486e3a8db198d391ff525e67a0d15879b0b7");
77+
MAVEN_CENTRAL, "xyz.wagyourtail.jvmdg.ClassDowngrader", null, "b6e0188e0aaa419a5b553a8bd54940733745427138944ad16d8a988bcce439b1");
7878
public static final Dependency jvmDowngraderJavaAPI =
7979
new Dependency("xyz.wagyourtail.jvmdowngrader:jvmdowngrader-java-api:" + BuildConfig.JVM_DOWNGRADER_VERSION,
80-
MAVEN_CENTRAL, "xyz.wagyourtail.jvmdg.j9.stub.java_base.J_L_ClassLoader", null, "6bebc6fc4950c7121b5ff76ff1b792bec8dcb9b8d0bb949cb8bfddda59c1e51b");
80+
MAVEN_CENTRAL, "xyz.wagyourtail.jvmdg.j9.stub.java_base.J_L_ClassLoader", null, "42cb56bf25e104719d111781b800a15f6cc50d025a7ccd9e8819770f37677845");
8181

8282
public static final Dependency[] commonDependencies = new Dependency[]{
8383
new Dependency("org.slf4j:slf4j-api:" + BuildConfig.SLF4J_VERSION, MAVEN_CENTRAL, "org.slf4j.Logger", null, "7b751d952061954d5abfed7181c1f645d336091b679891591d63329c622eb832"),
84-
new Dependency("org.ow2.asm:asm:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.ClassVisitor", null, "03d99a74ad1ee5c71334ef67437f4ef4fe3488caa7c96d8645abc73c8e2017d4"),
85-
new Dependency("org.ow2.asm:asm-tree:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.tree.ClassNode", null, "42178f3775c9c63f9e5e1446747d29b4eca4d91bd6e75e5c43cfa372a47d38c6"),
86-
new Dependency("org.ow2.asm:asm-analysis:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.tree.analysis.Analyzer", null , "6a15d28e8bd29ba4fd5bca4baf9b50e8fba2d7b51fbf78cfa0c875a7214c678b"),
87-
new Dependency("org.ow2.asm:asm-commons:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.commons.InstructionAdapter", null, "db2f6f26150bbe7c126606b4a1151836bcc22a1e05a423b3585698bece995ff8"),
88-
new Dependency("org.ow2.asm:asm-util:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.util.CheckClassAdapter", null, "3842e13cfe324ee9ab7cdc4914be9943541ead397c17e26daf0b8a755bede717"),
84+
new Dependency("org.ow2.asm:asm:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.ClassVisitor", null, "6f3828a215c920059a5efa2fb55c233d6c54ec5cadca99ce1b1bdd10077c7ddd"),
85+
new Dependency("org.ow2.asm:asm-tree:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.tree.ClassNode", null, "0f3555096b720b820bbacab0b515589bee0200bee099bda14c561738ae837ba1"),
86+
new Dependency("org.ow2.asm:asm-analysis:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.tree.analysis.Analyzer", null , "6260bffc8ec008dd1b713702c7994e2c94d188a3da5bef9e87278a16df6a7522"),
87+
new Dependency("org.ow2.asm:asm-commons:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.commons.InstructionAdapter", null, "c2319e014ce7199f2b7f7d56d6bb991863168c3f4b6cd6c9f542a4937ef7ef88"),
88+
new Dependency("org.ow2.asm:asm-util:" + BuildConfig.ASM_VERSION, MAVEN_CENTRAL, "org.objectweb.asm.util.CheckClassAdapter", null, "c5ebbbeaf68126af094b42fa4800f59bc4413abd02d95b9aefad722cd257e207"),
8989
GSON_DEPENDENCY, new Dependency("com.google.guava:guava:21.0", MAVEN_CENTRAL, "com.google.common.io.Files", null, "972139718abc8a4893fa78cba8cf7b2c903f35c97aaf44fa3031b0669948b480"),
9090
new Dependency("it.unimi.dsi:fastutil-core:" + BuildConfig.FASTUTIL_VERSION, MAVEN_CENTRAL, "it.unimi.dsi.fastutil.Pair", null, "edae1dc6de09e46ab7646616125cc0575a6810f17ed6298bfc6e8dc85f9c4258"),
9191
new Dependency("com.unascribed:ears-api:" + BuildConfig.EARS_VERSION, UNASCRIBED, "com.unascribed.ears.api.features.EarsFeatures", null, "6482fe4f9473c1b49e0513684e95647a95dca289528b5fdcad3347c193500871"),
9292
new Dependency("com.unascribed:ears-common:" + BuildConfig.EARS_VERSION, UNASCRIBED, "com.unascribed.ears.common.EarsCommon", null, "8ec4fb89e30901abf1f9d35c5ed5ac4d0d57d212dc4f4260566b33fbc826ca0d"),
9393
new Dependency("net.fabricmc:sponge-mixin:" + BuildConfig.FABRIC_MIXIN_VERSION, FABRIC_MC,
94-
"org.spongepowered.asm.mixin.Mixins", null, "bf65996f6edd93ba4061a175e2c814205c1ba694357a1e5a336c7ba5078ca376"),
94+
"org.spongepowered.asm.mixin.Mixins", null, "e7889fcd185e4199052dcbcf0fe2128581cbf8630aea7feb37429667b1ba49a9"),
9595
new Dependency("io.github.llamalad7:mixinextras-common:" + BuildConfig.MIXIN_EXTRAS_VERSION, MAVEN_CENTRAL,
96-
"com.llamalad7.mixinextras.MixinExtrasBootstrap", null, "42c6bdf93c12cbf90f5451988dfed763ab8489ce2e40a1d843518b309ff0abaa"),
96+
"com.llamalad7.mixinextras.MixinExtrasBootstrap", null, "30e7538eb27d8f7e78e4745dc0c56c857464a6f03fcacfd3101d2fce29cf8890"),
9797
new Dependency("com.github.bawnorton.mixinsquared:mixinsquared-common:" + BuildConfig.MIXIN_SQUARED_VERSION,
9898
FOX2CODE, "com.bawnorton.mixinsquared.MixinSquaredBootstrap", null, "5ae421a724f2cc9b06ade3da79fb3224e8073fdeac9a35df6f16ae59147a1abb"),
9999
new Dependency("com.fox2code:ReBuild:" + BuildConfig.REBUILD_VERSION, FOX2CODE,
@@ -115,20 +115,20 @@ GSON_DEPENDENCY, new Dependency("com.google.guava:guava:21.0", MAVEN_CENTRAL, "c
115115
public static final Dependency[] commonDependenciesModernJava = new Dependency[]{
116116
new Dependency("blue.endless:jankson:" + BuildConfig.JANKSON_VERSION, SLEEPING_TOWN,
117117
"blue.endless.jankson.api.Jankson", null,
118-
"9e22cfd3d4eb59da6026f6d8310b498dc1775d86c7f92b8301f7aa30ac7d2e51", 21),
118+
"c2216ae22bcf45bc7de45c90f0fa58f3c2d5af3d72b25adca42a86b4ce19c4a0", 21),
119119
new Dependency("com.moulberry:mixinconstraints:" + BuildConfig.MIXIN_CONSTRAINTS_VERSION,
120120
MAVEN_CENTRAL, "com.moulberry.mixinconstraints.MixinConstraints", null,
121121
"67e1fca9cb518f8afb356105c7816587e02880c2acca3bbdb6e08c8e967fc1be", 17),
122122
};
123123

124124
public static final Dependency sparkDependency =
125125
new Dependency(BuildConfig.SPARK_DEPENDENCY, MODRINTH, "me.lucko.spark.common.SparkPlugin",
126-
null, "6944504c201f20845713f710fbaed48b29bd6f4176b94ac047fee548719c2637");
126+
null, "36ed138ffde2a2f1fcb32ecbcc7fa21beaf1611e003d19e3ad40954873e572fa");
127127

128128
public static final Dependency vineFlower = new Dependency(
129129
BuildConfig.VINEFLOWER_DEPENDENCY, MAVEN_CENTRAL,
130130
"org.jetbrains.java.decompiler.main.Fernflower", null,
131-
"a615d07ddbbcd489369674f40e42df639c32be95410890b38f173d5c1e2ea39c", 17);
131+
"e1e2415e7f78b34960402c4beddfc88e033d7842a23ecd132a8ec2eadd54f6bf", 17);
132132

133133
public static final Dependency reIndevDependencySlim =
134134
new Dependency("net.silveros:reindev-slim:" + BuildConfig.REINDEV_VERSION,
@@ -141,9 +141,9 @@ GSON_DEPENDENCY, new Dependency("com.google.guava:guava:21.0", MAVEN_CENTRAL, "c
141141

142142
public static final Dependency[] kotlinDependencyBundle = new Dependency[]{
143143
new Dependency("org.jetbrains.kotlin:kotlin-reflect:" + BuildConfig.KOTLIN_VERSION,
144-
MAVEN_CENTRAL, "kotlin.reflect.full.KClasses", null, "8209083a4a7c4e476d9842b078308fa96a96f07a6bd99f05f3586ee13289ab26"),
144+
MAVEN_CENTRAL, "kotlin.reflect.full.KClasses", null, "714df4be819545ff4de1f36aa2183e0dea94b4c8cdf7ca29e9c89919baf36362"),
145145
new Dependency("org.jetbrains.kotlin:kotlin-stdlib:" + BuildConfig.KOTLIN_VERSION,
146-
MAVEN_CENTRAL, "kotlin.KotlinVersion", null, "8836ccffd3585fadda9901244b20d42901d2f3cd581058d8434e2ffabcf3a3e7"),
146+
MAVEN_CENTRAL, "kotlin.KotlinVersion", null, "887587c91713250ad52fe14ad9166d042c33835049890e9437f355ffc5a195b1"),
147147
new Dependency("org.jetbrains.kotlinx:atomicfu-jvm:" + BuildConfig.KOTLINX_ATOMICFU_VERSION,
148148
MAVEN_CENTRAL, "kotlinx.atomicfu.AtomicRef", null, "97cd462f8e8ab92571ab8805070e4450c52cb1ad63c224208f71a10943a01e46"),
149149
new Dependency("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:" + BuildConfig.KOTLINX_COLLECTIONS_IMMUTABLE_VERSION,
@@ -201,7 +201,8 @@ public static void loadCoreDependencies(boolean client) {
201201
loadDependencyBuiltIn(dependency);
202202
}
203203
if ((DependencyImpl.CURRENT_IMPL.hasClass("org.lwjgl.opengl.GL11") &&
204-
!DependencyImpl.CURRENT_IMPL.hasClass("org.lwjgl.opengl.Display")) ||
204+
(!DependencyImpl.CURRENT_IMPL.hasClass("org.lwjgl.opengl.AMDDebugOutputCallback$Handler") ||
205+
!DependencyImpl.CURRENT_IMPL.hasClass("org.lwjgl.opengl.Display"))) ||
205206
DependencyImpl.CURRENT_IMPL.hasClass("org.lwjgl.system.LWJGLXHelper")) {
206207
// If we are on LWJGL3 so let's use LWJGL3
207208
loadDependency(lwjglx);

0 commit comments

Comments
 (0)