Skip to content
Merged

26.1 #135

Show file tree
Hide file tree
Changes from all commits
Commits
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
95 changes: 54 additions & 41 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ plugins {
}

version = "$baseVersion+$branch"
archivesBaseName = project.slug
base {
archivesName = project.slug
}

repositories {
maven { url "https://maven.nucleoid.xyz/" }
Expand All @@ -18,29 +20,40 @@ repositories {
name = 'BlameJared Maven (CrT / Bookshelf)'
url = 'https://maven.blamejared.com'
}
exclusiveContent {
forRepository {
maven {
name = "Modrinth"
url = "https://api.modrinth.com/maven"
}
}
filter {
includeGroup "maven.modrinth"
}
}
}

dependencies {
minecraft libs.mc
mappings variantOf(libs.yarn) { classifier "v2" }

modImplementation libs.fl
modImplementation libs.fapi

modImplementation libs.placeholder
modCompileOnly libs.polydex
implementation libs.fl
implementation libs.fapi

implementation libs.placeholder
include libs.placeholder
modLocalRuntime libs.polydex

// compileOnly libs.polydex
//
// localRuntime libs.polydex

implementation libs.kaleidoConfig
include libs.kaleidoConfig

/*modCompileOnly libs.emi
modLocalRuntime libs.emi*/
/*compileOnly libs.emi
localRuntime libs.emi*/

modCompileOnly libs.modmenu
modLocalRuntime libs.modmenu
compileOnly libs.modmenu
localRuntime libs.modmenu
}

loom {
Expand All @@ -54,29 +67,29 @@ loom {
source sourceSets.main
vmArg "-Dmixin.debug.export=true"

try {
afterEvaluate {
def mixinDep = this.configurations.compileClasspath
.allDependencies
.findAll { it.name == "sponge-mixin" }
.first()

if (mixin != null) {
def mixinPath = this.configurations.compileClasspath.files(mixinDep).first().path;

println(mixinPath)

vmArg("-javaagent:\"${mixinPath}\"")

println("[Info]: Mixin Hotswap Run should be working")
} else {
println("[Warning]: Unable to locate file path for Mixin Jar, HotSwap Run will not work!")
}
}
} catch (Exception e) {
println("[Error]: MixinHotswap Run had a issue!")
e.printStackTrace()
}
// try {
// afterEvaluate {
// def mixinDep = this.configurations.compileClasspath
// .allDependencies
// .findAll { it.name == "sponge-mixin" }
// .first()
//
// if (mixin != null) {
// def mixinPath = this.configurations.compileClasspath.files(mixinDep).first().path;
//
// println(mixinPath)
//
// vmArg("-javaagent:\"${mixinPath}\"")
//
// println("[Info]: Mixin Hotswap Run should be working")
// } else {
// println("[Warning]: Unable to locate file path for Mixin Jar, HotSwap Run will not work!")
// }
// }
// } catch (Exception e) {
// println("[Error]: MixinHotswap Run had a issue!")
// e.printStackTrace()
// }
Comment on lines +70 to +92

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was this commented?
Did it start throwing an exception when attempting to run?

I don't see why it would be broken on 26.1

Copy link
Author

@reoseah reoseah Mar 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it didn't launch, at least for me. I think it couldn't find mixin jar.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, should it be centered at player or be changed to be at the block pos?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it didn't launch, at least for me. I think it couldn't find mixin jar.

Ok. I'll look into it later when I start working on the rest of the port.

}
}
}
Expand Down Expand Up @@ -104,7 +117,7 @@ processResources {
fl : libs.versions.fl.get(),
fapi : libs.versions.fapi.get(),
placeholder : libs.versions.placeholder.get(),
polydex : libs.versions.polydex.get()
// polydex : libs.versions.polydex.get()
]
inputs.properties meta
filesMatching("*.mod.json") { expand(meta) }
Expand All @@ -113,13 +126,13 @@ processResources {

tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 21
it.options.release = 25
}

java {
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
sourceCompatibility = JavaVersion.VERSION_25
targetCompatibility = JavaVersion.VERSION_25
}

jar {
Expand All @@ -140,14 +153,14 @@ modrinth {
token = "$System.env.MODRINTH_TOKEN"
projectId = slug
versionNumber = project.version
uploadFile = remapJar
uploadFile = jar
gameVersions = compatibleVersions.split(", ").toList()
loaders = compatibleLoaders.split(", ").toList()
changelog = "$System.env.CHANGELOG"
syncBodyFrom = "<!--DO NOT EDIT MANUALLY: synced from gh readme-->\n" + rootProject.file("README.md").text
dependencies {
required.version "fabric-api", libs.versions.fapi.get()
embedded.version "placeholder-api", libs.versions.placeholder.get()
optional.version "polydex", libs.versions.polydex.get()
// optional.version "polydex", libs.versions.polydex.get()
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
23 changes: 11 additions & 12 deletions libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
[versions]
loom = "1.11.+"
loom = "1.15-SNAPSHOT"
minotaur = "2.+"

kaleidoConfig = "0.3.3+1.3.2"

mc = "1.21.7"
fl = "0.16.14"
yarn = "1.21.7+build.2"
fapi = "0.128.2+1.21.7"
mc = "26.1-snapshot-9"
fl = "0.18.4"
fapi = "0.143.5+26.1"

placeholder = "2.4.0+1.21"
polydex = "1.6.0+1.21.6"
placeholder = "3.0.0-beta.1+26.1"
#polydex = "1.8.1+1.21.11"
# emi = "1.1.19+1.21.1"
modmenu = "15.0.0-beta.3"
modmenu = "18.0.0-alpha.5"

[plugins]
loom = { id = "fabric-loom", version.ref = "loom" }
loom = { id = "net.fabricmc.fabric-loom", version.ref = "loom" }
minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }

[libraries]
mc = { group = "mojang", name = "minecraft", version.ref = "mc" }
fl = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fl" }
yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
fapi = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fapi" }

placeholder = { group = "eu.pb4", name = "placeholder-api", version.ref = "placeholder" }
polydex = { group = "eu.pb4", name = "polydex", version.ref = "polydex" }
#placeholder = { group = "eu.pb4", name = "placeholder-api", version.ref = "placeholder" } // not available on its maven? using Modrinth one:
placeholder = { group = "maven.modrinth", name = "placeholder-api", version.ref = "placeholder" }
#polydex = { group = "eu.pb4", name = "polydex", version.ref = "polydex" }
kaleidoConfig = { group = "folk.sisby", name = "kaleido-config", version.ref = "kaleidoConfig" }

# emi = { group = "dev.emi", name = "emi-fabric", version.ref = "emi" }
Expand Down
Loading