fix the jar not including everything on forge

This commit is contained in:
gamma-delta 2022-06-12 17:00:38 -05:00
parent 952b53eaed
commit 411e85579f
5 changed files with 25 additions and 5 deletions

View file

@ -48,7 +48,7 @@ public class ItemCreativeUnlocker extends Item implements ManaHolderItem {
@Override @Override
public int getMaxMana(ItemStack stack) { public int getMaxMana(ItemStack stack) {
return Integer.MAX_VALUE; return Integer.MAX_VALUE - 1;
} }
@Override @Override

View file

@ -50,7 +50,7 @@
"java": ">=17", "java": ">=17",
"fabric-language-kotlin": ">=1.7.4+kotlin.1.6.21", "fabric-language-kotlin": ">=1.7.4+kotlin.1.6.21",
"patchouli": ">=1.18.2-69", "patchouli": ">=1.18.2-69",
"paucal": ">=0.4.4" "paucal": "~0.4.6"
}, },
"suggests": { "suggests": {
"gravitychanger": "0.7.7+fabric", "gravitychanger": "0.7.7+fabric",

View file

@ -154,12 +154,33 @@ mixin {
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
source(project(":Common").sourceSets.main.allSource) source(project(":Common").sourceSets.main.allSource)
} }
compileKotlin {
source(project(":Common").sourceSets.main.allSource)
}
compileTestKotlin { compileTestKotlin {
source(project(":Common").sourceSets.main.allSource) source(project(":Common").sourceSets.main.allSource)
} }
// https://discord.com/channels/313125603924639766/733055378371117127/980968358658838540
// > It wint generate a refmap if there are jo changes source files
// > Since the last build
// > Gradle task execution avoidance breaks it that way
// > At one point i got it to work reliably bu forcing some specific task to always run i just don't remember the syntax and which task it was
// > It might have been compileJava
build {
println "Forcing re-compile of Java to include refmap"
tasks.withType(JavaCompile) {
outputs.upToDateWhen { false }
}
compileKotlin {
outputs.upToDateWhen { false }
}
}
sourceSets { sourceSets {
main.resources.srcDirs += ['src/generated/resources', '../Common/src/generated/resources'] main.resources.srcDirs += ['src/generated/resources', '../Common/src/generated/resources']
main.kotlin.srcDirs += 'src/main/java'
test.kotlin.srcDirs += 'src/main/java' test.kotlin.srcDirs += 'src/main/java'
} }
@ -173,5 +194,4 @@ processResources {
} }
jar.finalizedBy('reobfJar') jar.finalizedBy('reobfJar')
setupJar(this) setupJar(this)

View file

@ -31,7 +31,7 @@ side = "BOTH"
[[dependencies.hexcasting]] [[dependencies.hexcasting]]
modId = "paucal" modId = "paucal"
mandatory = true mandatory = true
versionRange = "[0.4.4,0.5.0)" versionRange = "[0.4.6,0.5.0)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"

View file

@ -10,7 +10,7 @@ minecraftVersion=1.18.2
kotlinVersion=1.6.21 kotlinVersion=1.6.21
modVersion=0.9.0 modVersion=0.9.0
paucalVersion=0.4.4 paucalVersion=0.4.6-pre-58
patchouliVersion=69 patchouliVersion=69
jeiVersion=9.5.3.143 jeiVersion=9.5.3.143