Skip to content
Open
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
plugins {
id 'fabric-loom' version '1.10-SNAPSHOT' apply false
id 'net.neoforged.moddev' version '2.0.88' apply false
id 'net.fabricmc.fabric-loom' version '1.17-SNAPSHOT' apply false
id 'net.neoforged.moddev' version '2.0.141' apply false
}
18 changes: 9 additions & 9 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom'
id 'net.fabricmc.fabric-loom'
id 'maven-publish'
}

Expand Down Expand Up @@ -32,11 +32,11 @@ repositories {
dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings loom.officialMojangMappings()
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
// mappings loom.officialMojangMappings()
implementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"

// sosium
modImplementation "maven.modrinth:sodium:mc1.21.4-0.6.13-fabric"
// sodium
implementation "maven.modrinth:sodium:mc26.2-0.9.0-fabric"
}

processResources {
Expand All @@ -62,7 +62,7 @@ processResources {
}

tasks.withType(JavaCompile).configureEach {
it.options.release = 17
it.options.release = 25
}

java {
Expand All @@ -71,8 +71,8 @@ java {
// If you remove this line, sources will not be generated.
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_25
targetCompatibility = JavaVersion.VERSION_25
}

jar {
Expand All @@ -87,7 +87,7 @@ jar {
publishing {
publications {
create("mavenJava", MavenPublication) {
artifactId = project.mod_id
artifactId = providers.gradleProperty("mod_id").get()
from components.java
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
@Mixin(PreLaunchChecks.class)
public abstract class PreLaunchChecksMixin {
@Shadow(remap = false)
private static boolean isUsingPrismLauncher() { return false; }
private static String getLauncherBrand(){
return "unknown";
} ;

// removing this check may cause issues outside pojav
@Inject(
Expand All @@ -24,6 +26,6 @@ private static void checkLwjglRuntimeVersionMixin(CallbackInfo ci) {
// this means that if somehow, a prism user ends up with podium and the wrong lwjgl version
// we don't need to give them a weird crash message because some non-existant method has been
// called, but instead give them the default lwjgl mismatch message
if(!isUsingPrismLauncher()) ci.cancel();
if(!getLauncherBrand().equalsIgnoreCase("prismlauncher")) ci.cancel();
}
}
8 changes: 4 additions & 4 deletions fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
"podium.mixins.json"
],
"depends": {
"fabricloader": ">=0.15",
"minecraft": ">1.20",
"java": ">=17",
"sodium": ">=0.5.13"
"fabricloader": ">=0.19.3",
"minecraft": ">=26.2",
"java": ">=25",
"sodium": ">=0.9.0"
}
}
14 changes: 6 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configuration-cache=true

minecraft_version_range=[1.20.1,)
minecraft_version=1.21.4
minecraft_version_range=[26.2,)
minecraft_version=26.2

neo_version=21.5.68-beta
neo_version_range=[21,)
neo_version=26.2.0.1-beta
neo_version_range=[26.2,)
neo_loader_version_range=[4,)

fabric_loader_version=0.16.13
fabric_loader_version=0.19.3

# Mod Properties
mod_version=1.1.0
mod_version=2.0.0
mod_group_id=me.andreasmelone
mod_id=podium

Expand All @@ -23,6 +23,4 @@ mod_license=MIT
mod_authors=AndreasMelone
mod_description=Patches Sodium to disable the check for PojavLauncher!

parchment_minecraft_version=1.21
parchment_mappings_version=2024.11.10

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.12.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 3 additions & 6 deletions gradlew

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

3 changes: 1 addition & 2 deletions gradlew.bat

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

22 changes: 9 additions & 13 deletions neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,14 @@ base {
}

java {
toolchain.languageVersion = JavaLanguageVersion.of(21)
toolchain.languageVersion = JavaLanguageVersion.of(25)
withSourcesJar()
}

neoForge {
// Specify the version of NeoForge to use.
version = project.neo_version

parchment {
mappingsVersion = project.parchment_mappings_version
minecraftVersion = project.parchment_minecraft_version
}

// This line is optional. Access Transformers are automatically detected
// accessTransformers.add('src/main/resources/META-INF/accesstransformer.cfg')
Expand All @@ -83,21 +79,21 @@ neoForge {
client()

// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
systemProperty 'neoforge.enabledGameTestNamespaces', providers.gradleProperty("mod_id").get()
}

server {
server()
programArgument '--nogui'
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
systemProperty 'neoforge.enabledGameTestNamespaces', providers.gradleProperty("mod_id").get()
}

// This run config launches GameTestServer and runs all registered gametests, then exits.
// By default, the server will crash when no gametests are provided.
// The gametest system is also enabled by default for other run configs under the /test command.
gameTestServer {
type = "gameTestServer"
systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
systemProperty 'neoforge.enabledGameTestNamespaces', providers.gradleProperty("mod_id").get()
}

data {
Expand All @@ -107,7 +103,7 @@ neoForge {
// gameDirectory = project.file('run-data')

// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
programArguments.addAll '--mod', providers.gradleProperty("mod_id").get(), '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
}

// applies to all the run configs above
Expand Down Expand Up @@ -147,7 +143,7 @@ dependencies {
// compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
// compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
// runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
implementation "maven.modrinth:sodium:mc1.21.4-0.6.13-neoforge"
implementation "maven.modrinth:sodium:mc26.2-0.9.0-neoforge"

// Example mod dependency using a mod jar from ./libs with a flat dir repository
// This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar
Expand All @@ -166,10 +162,10 @@ dependencies {

// should prob not do it here lol
extractJarJarDependency(
"maven.modrinth:sodium:mc1.21.4-0.6.13-neoforge",
"net.caffeinemc.sodium-neoforge-0.6.13+mc1.21.4-service.jar"
"maven.modrinth:sodium:mc26.2-0.9.0-neoforge",
"net.caffeinemc.sodium-neoforge-0.9.0+mc26.2-mod.jar"
)
implementation fileTree(dir: "${buildDir}/extracted-jarjar-cache", include: "*.jar")
implementation fileTree(dir: layout.buildDirectory.dir("extracted-jarjar-cache").get().asFile, include: "*.jar")
}

// This block of code expands all declared replace properties in the specified resource targets.
Expand Down
2 changes: 1 addition & 1 deletion neoforge/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
2 changes: 1 addition & 1 deletion neoforge/src/main/templates/META-INF/neoforge.mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ side="CLIENT"
[[dependencies."${mod_id}"]]
modId = "sodium"
type = "required"
versionRange = "[0.5.13,)"
versionRange = "[0.9.0,)"
ordering = "BEFORE"
side = "CLIENT"

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pluginManagement {
}

plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
}

include 'fabric', 'neoforge'
Loading