Skip to content

Commit

Permalink
Fixes for chunk/localisation/patchouli. Build now works properly.
Browse files Browse the repository at this point in the history
  • Loading branch information
leafreynolds committed Feb 7, 2022
1 parent 27a284f commit 928d315
Show file tree
Hide file tree
Showing 20 changed files with 232 additions and 147 deletions.
5 changes: 5 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SoulHome - For 1.18.1 Minecraft

B1

The initial build for 1.18.1 Minecraft, with basic patchouli, advancements, and soulkey item to access the user's own skyblock-esque dimension.
22 changes: 10 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ buildscript {
}

apply plugin: 'net.minecraftforge.gradle'
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
apply plugin: 'eclipse'
apply plugin: 'org.spongepowered.mixin'

Expand All @@ -31,8 +32,6 @@ archivesBaseName = "${project.jar_name}"
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))

// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/main/generated' }

minecraft {
mappings channel: 'official', version: "${minecraft_version}"
Expand Down Expand Up @@ -64,7 +63,7 @@ minecraft {

mods {
soulhome {
source sourceSets.main
source sourceSets.main
}
}
}
Expand Down Expand Up @@ -93,6 +92,9 @@ mixin {
add sourceSets.main, "soulhome.refmap.json"
}

// Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/main/generated' }

repositories {
maven {
// location of the maven that hosts JEI files
Expand Down Expand Up @@ -120,11 +122,7 @@ repositories {
}

dependencies {
// Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
// that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
// The userdev artifact is a special name and will get all sorts of transformations applied to it.
minecraft "net.minecraftforge:forge:${forge_version}"

annotationProcessor 'org.spongepowered:mixin:0.8.2:processor'

compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:9.1.0.44:api")
Expand All @@ -144,15 +142,15 @@ dependencies {
//implementation fg.deobf("curse.maven:ctm-267602:2642375")
}

// Example for how to get properties into the manifest for reading by the runtime..
// Example for how to get properties into the manifest for reading at runtime.
jar {
manifest {
attributes([
"Specification-Title" : "soulhome",
"Specification-Vendor" : "soulhome",
"Specification-Version" : "1", // We are version 1 of ourselves
"Implementation-Title" : project.name,
"Implementation-Version" : "${version}",
"Implementation-Version" : project.jar.archiveVersion,
"Implementation-Vendor" : "soulhome",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
"MixinConfigs" : "soulhome.mixins.json"
Expand Down Expand Up @@ -193,11 +191,11 @@ def parseConfig(File config) {
}
}

// Example configuration to allow publishing using the maven-publish task
// Example configuration to allow publishing using the maven-publish plugin
// This is the preferred method to reobfuscate your jar file
jar.finalizedBy('reobfJar')
// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
//publish.dependsOn('reobfJar')
// publish.dependsOn('reobfJar')

publishing {
publications {
Expand All @@ -207,7 +205,7 @@ publishing {
}
repositories {
maven {
url "file:///${project.projectDir}/mcmodsrepo"
url "file://${project.projectDir}/mcmodsrepo"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx8G

#Sat Jan 29 12:10:33 NZDT 2022
minecraft_version=1.18.1
forge_version=1.18.1-39.0.63
forge_version=1.18.1-39.0.66

jar_name=SoulHome-Mod
build_number=1
Expand Down
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,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 928d315

Please sign in to comment.