Skip to content

26.1 Support #73

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
AzureAaron wants to merge 1 commit into
base: v4
Choose a base branch
from
Open

26.1 Support #73

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
24 changes: 15 additions & 9 deletions build-src/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
`kotlin-dsl`
kotlin("jvm") version "2.1.20"
kotlin("jvm") version "2.3.20"
}
repositories {
mavenCentral()
Expand All @@ -13,20 +13,26 @@ repositories {
maven("https://maven.neoforged.net/releases")
maven("https://maven.minecraftforge.net/")
maven("https://repo.spongepowered.org/maven/")
maven("https://repo.sk1er.club/repository/maven-releases/")
maven {
url = uri("https://repo.sk1er.club/repository/maven-releases/")
content {
excludeGroup("xyz.wagyourtail.unimined.mapping")
}
}
}

dependencies {
api("xyz.wagyourtail.unimined:unimined:1.3.14")
api("xyz.wagyourtail.unimined:unimined:1.4.2-SNAPSHOT")
api("xyz.wagyourtail.unimined.mapping:unimined-mapping-library-jvm:1.2.2")
api("commons-io:commons-io:2.16.1")
api("org.ow2.asm:asm-util:9.7")
api("org.ow2.asm:asm-tree:9.7")
api("org.ow2.asm:asm:9.7")
api("org.ow2.asm:asm-commons:9.7")
api("org.ow2.asm:asm-analysis:9.7")
api("org.ow2.asm:asm-util:9.9.1")
api("org.ow2.asm:asm-tree:9.9.1")
api("org.ow2.asm:asm:9.9.1")
api("org.ow2.asm:asm-commons:9.9.1")
api("org.ow2.asm:asm-analysis:9.9.1")
api("com.gradleup.shadow:shadow-gradle-plugin:9.0.0-beta12")
api("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
val kotlinVersion = "2.0.20"
val kotlinVersion = "2.3.20"
api("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$kotlinVersion")
api("org.jetbrains.kotlin.plugin.lombok:org.jetbrains.kotlin.plugin.lombok.gradle.plugin:$kotlinVersion")
api("systems.manifold.manifold-gradle-plugin:systems.manifold.manifold-gradle-plugin.gradle.plugin:0.0.2-alpha")
Expand Down
2 changes: 1 addition & 1 deletion build-src/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ object Dependencies {
*/
val LEGACY_GSON = "com.google.code.gson:gson:2.1"

val LOMBOK = "org.projectlombok:lombok:1.18.32"
val LOMBOK = "org.projectlombok:lombok:1.18.44"
}
19 changes: 14 additions & 5 deletions build-src/src/main/kotlin/moulconfig.fabric.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,19 @@ plugins {

val fabricVersion = property("moulconfig.fabric") as String
val minecraftVersion = property("moulconfig.minecraft") as String
val isDeobfuscated = findProperty("moulconfig.deobfuscated") as String?
val useResourceLoaderv1 = findProperty("moulconfig.rlv1") as String?
val aF = project.file("src/main/resources/moulconfig.accesswidener")
val hasAW = aF.exists()
the<UniminedExtension>().minecraft {
version(minecraftVersion)
mappings {
intermediary()
mojmap()
}

if (isDeobfuscated == null) {
mappings {
intermediary()
mojmap()
}
}

fabric {
loader("0.18.4")
Expand Down Expand Up @@ -68,7 +73,11 @@ the<PreProcessorArgs>().forDefaultCompilation {

val fabricDeps = extensions.create("fabricDeps", FabricUtils::class, fabricVersion)

fabricDeps.impl("fabric-resource-loader-v0")
if (useResourceLoaderv1 != null) {
fabricDeps.impl("fabric-resource-loader-v1")
} else {
fabricDeps.impl("fabric-resource-loader-v0")
}

val remapJar by tasks.named("remapJar", RemapJarTask::class) {
asJar {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
33 changes: 20 additions & 13 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

186 changes: 94 additions & 92 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions modern/26.1/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
plugins {
id("moulconfig.fabric")
}
fabricDeps {
impl("fabric-command-api-v2")
}

java.toolchain.languageVersion.set(JavaLanguageVersion.of(25))
5 changes: 5 additions & 0 deletions modern/26.1/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
moulconfig.minecraft=26.1-pre-3
moulconfig.yarn=2
moulconfig.fabric=0.143.14+26.1
moulconfig.rlv1=true
moulconfig.deobfuscated=true
10 changes: 10 additions & 0 deletions modern/26.1/src/main/resources/moulconfig.accesswidener
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
accessWidener v2 named

accessible field net/minecraft/client/gui/GuiGraphicsExtractor scissorStack Lnet/minecraft/client/gui/GuiGraphicsExtractor$ScissorStack;
accessible class net/minecraft/client/gui/GuiGraphicsExtractor$ScissorStack
accessible field net/minecraft/client/gui/GuiGraphicsExtractor$ScissorStack stack Ljava/util/Deque;
accessible method net/minecraft/client/gui/GuiGraphicsExtractor fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;IIIII)V
accessible field net/minecraft/client/renderer/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
accessible field net/minecraft/client/gui/GuiGraphicsExtractor guiRenderState Lnet/minecraft/client/renderer/state/gui/GuiRenderState;
accessible method net/minecraft/client/gui/GuiGraphicsExtractor innerFill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
accessible method net/minecraft/client/gui/GuiGraphicsExtractor innerBlit (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lcom/mojang/blaze3d/textures/GpuTextureView;Lcom/mojang/blaze3d/textures/GpuSampler;IIIIFFFFI)V
Loading