-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Move from multi-version setup to single version, future releas…
…es only target latest MC version
- Loading branch information
1 parent
6c4a7fc
commit ff7c319
Showing
361 changed files
with
200 additions
and
16,236 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,68 @@ | ||
| plugins { | ||
| id("java") | ||
| id("fabric-loom").version("1.6-SNAPSHOT") | ||
| id("maven-publish") | ||
| } | ||
|
|
||
| subprojects { | ||
| apply<JavaPlugin>() | ||
| //subprojects { | ||
| //apply<JavaPlugin>() | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| mavenCentral() | ||
| } | ||
|
|
||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_16 | ||
| targetCompatibility = JavaVersion.VERSION_16 | ||
| } | ||
| } | ||
| val minecraft_version: String by project | ||
| val yarn_mappings: String by project | ||
| val loader_version: String by project | ||
| val fabric_version: String by project | ||
| val malilib_version: String by project | ||
| val litematica_projectid: String by project | ||
| val litematica_fileid: String by project | ||
|
|
||
| val archives_base_name: String by project | ||
| val mod_version: String by project | ||
|
|
||
| val buildAll = tasks.create("buildAll") { | ||
| dependsOn(":v1_17:build") | ||
| dependsOn(":v1_18:build") | ||
| dependsOn(":v1_19:build") | ||
| dependsOn(":v1_19_3:build") | ||
| dependsOn(":v1_19_4:build") | ||
| // This isn't working.... you still have to run each build individually | ||
| tasks.findByName(":v1_19_3:build")?.mustRunAfter(":v1_19_4:build") | ||
| tasks.findByName(":v1_19:build")?.mustRunAfter(":v1_19_3:build") | ||
| tasks.findByName(":v1_18:build")?.mustRunAfter(":v1_19:build") | ||
| tasks.findByName(":v1_17:build")?.mustRunAfter(":v1_18:build") | ||
| java { | ||
| withSourcesJar() | ||
|
|
||
| sourceCompatibility = JavaVersion.VERSION_21 | ||
| targetCompatibility = JavaVersion.VERSION_21 | ||
| } | ||
| //} | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| mavenCentral() | ||
| maven("https://masa.dy.fi/maven") | ||
| maven("https://www.cursemaven.com") | ||
| } | ||
|
|
||
| dependencies { | ||
| // implementation(project(":common")) | ||
| minecraft("com.mojang:minecraft:${minecraft_version}") | ||
| mappings("net.fabricmc:yarn:${yarn_mappings}:v2") | ||
|
|
||
| modImplementation("net.fabricmc:fabric-loader:${loader_version}") | ||
| modImplementation("net.fabricmc.fabric-api:fabric-api:${fabric_version}") | ||
| modImplementation("fi.dy.masa.malilib:malilib-fabric-${malilib_version}") | ||
| modImplementation("curse.maven:litematica-${litematica_projectid}:${litematica_fileid}") | ||
| } | ||
|
|
||
| tasks.withType<ProcessResources> { | ||
| inputs.property("version", mod_version) | ||
|
|
||
| filesMatching("fabric.mod.json") { | ||
| expand(mapOf("version" to mod_version)) | ||
| } | ||
| } | ||
|
|
||
| tasks.register("copyJar") { | ||
| // Specify that this task runs after the 'build' task | ||
| dependsOn("build") | ||
|
|
||
| // Specify the task's action | ||
| doLast { | ||
| println("Copying files...") | ||
| file("v1_19_4/build/libs/v1_19_4.jar").copyTo( | ||
| file("build/${archives_base_name}-1.19.4-${mod_version}.jar"), | ||
| true | ||
| ) | ||
| file("v1_19_3/build/libs/v1_19_3.jar").copyTo( | ||
| file("build/${archives_base_name}-1.19.3-${mod_version}.jar"), | ||
| true | ||
| ) | ||
| file("v1_19/build/libs/v1_19.jar").copyTo(file("build/${archives_base_name}-1.19-${mod_version}.jar"), true) | ||
| file("v1_18/build/libs/v1_18.jar").copyTo(file("build/${archives_base_name}-1.18-${mod_version}.jar"), true) | ||
| file("v1_17/build/libs/v1_17.jar").copyTo(file("build/${archives_base_name}-1.17-${mod_version}.jar"), true) | ||
| val destination = file("build/${archives_base_name}-${minecraft_version}-${mod_version}.jar") | ||
| file("build/libs/litematica-printer.jar").copyTo(destination, true) | ||
| println("Copied output to ${destination.absolutePath}") | ||
| } | ||
| } | ||
|
|
||
| tasks.build { | ||
| finalizedBy("copyJar") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,18 @@ | ||
| # Done to increase the memory available to gradle. | ||
| org.gradle.jvmargs=-Xmx2G | ||
| org.gradle.parallel=false | ||
| org.gradle.jvmargs=-Xmx1G | ||
| #org.gradle.parallel=false | ||
| # Mod Properties | ||
| mod_version=3.2 | ||
| mod_version=3.2.1 | ||
| maven_group=net.fabricmc | ||
| archives_base_name=litematica-printer | ||
| # https://masa.dy.fi/maven/fi/dy/masa/malilib/ | ||
| malilib_version=1.20.4:0.18.0 | ||
| # https://www.curseforge.com/minecraft/mc-mods/litematica/files | ||
| litematica_fileid=4946471 | ||
| litematica_projectid=308892 | ||
| # Fabric Properties: https://fabricmc.net/develop/ | ||
| minecraft_version=1.20.4 | ||
| yarn_mappings=1.20.4+build.3 | ||
| loader_version=0.15.3 | ||
| #Fabric api | ||
| fabric_version=0.91.3+1.20.4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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.3-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip | ||
| networkTimeout=10000 | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...tematica/printer/v1_19/ActionHandler.java → ...ila/litematica/printer/ActionHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...litematica/printer/v1_19/BlockHelper.java → ...ssila/litematica/printer/BlockHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ica/printer/v1_19/LitematicaMixinMod.java → ...itematica/printer/LitematicaMixinMod.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...ila/litematica/printer/v1_20/Printer.java → ...silassila/litematica/printer/Printer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ca/printer/v1_17/SchematicBlockState.java → ...tematica/printer/SchematicBlockState.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...matica/printer/v1_20_4/UpdateChecker.java → ...ila/litematica/printer/UpdateChecker.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ematica/printer/v1_17/actions/Action.java → ...la/litematica/printer/actions/Action.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...printer/v1_19/actions/InteractAction.java → ...atica/printer/actions/InteractAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
.../printer/v1_19/actions/PrepareAction.java → ...matica/printer/actions/PrepareAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ter/v1_19/actions/ReleaseShiftAction.java → ...a/printer/actions/ReleaseShiftAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...itematica/printer/v1_20/guides/Guide.java → ...sila/litematica/printer/guides/Guide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...tematica/printer/v1_17/guides/Guides.java → ...ila/litematica/printer/guides/Guides.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...atica/printer/v1_19/guides/SkipGuide.java → .../litematica/printer/guides/SkipGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
.../interaction/CampfireExtinguishGuide.java → .../interaction/CampfireExtinguishGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...9/guides/interaction/CycleStateGuide.java → ...r/guides/interaction/CycleStateGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
..._19/guides/interaction/EnderEyeGuide.java → ...ter/guides/interaction/EnderEyeGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...uides/interaction/FlowerPotFillGuide.java → ...uides/interaction/FlowerPotFillGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 9 additions & 9 deletions
18
.../guides/interaction/InteractionGuide.java → .../guides/interaction/InteractionGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
.../guides/interaction/LightCandleGuide.java → .../guides/interaction/LightCandleGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...guides/interaction/LogStrippingGuide.java → ...guides/interaction/LogStrippingGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...1_19/guides/interaction/TillingGuide.java → ...nter/guides/interaction/TillingGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...acement/BlockIndifferentGuesserGuide.java → ...acement/BlockIndifferentGuesserGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...ides/placement/BlockReplacementGuide.java → ...ides/placement/BlockReplacementGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...er/v1_19/guides/placement/ChestGuide.java → .../printer/guides/placement/ChestGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...8/guides/placement/FallingBlockGuide.java → ...r/guides/placement/FallingBlockGuide.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.