-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Temporarily (pls) unify datagen and main mod code again
- Loading branch information
1 parent
4c93cc7
commit 85d0f8a
Showing
22 changed files
with
107 additions
and
98 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
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
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,67 +1,67 @@ | ||
| import org.slf4j.event.Level | ||
|
|
||
| plugins { | ||
| id("java") | ||
| id("eclipse") | ||
| id("idea") | ||
| id("maven-publish") | ||
| alias(neoforged.plugins.userdev) | ||
| } | ||
|
|
||
| val modId: String = "compactmachines" | ||
|
|
||
| val coreApi = project(":core-api") | ||
| val mainProject: Project = project(":neoforge-main") | ||
|
|
||
| project.evaluationDependsOn(coreApi.path) | ||
| project.evaluationDependsOn(mainProject.path) | ||
|
|
||
| java { | ||
| toolchain.languageVersion.set(JavaLanguageVersion.of(21)) | ||
| } | ||
|
|
||
| minecraft { | ||
| modIdentifier.set(modId) | ||
| } | ||
|
|
||
| runs { | ||
| // applies to all the run configs below | ||
| configureEach { | ||
| systemProperty("forge.logging.markers", "") | ||
| systemProperty("forge.logging.console.level", "debug") | ||
|
|
||
| modSources { | ||
| add(modId, project.sourceSets.main.get()) | ||
| add(modId, mainProject.sourceSets.main.get()) | ||
| add(modId, coreApi.sourceSets.main.get()) | ||
| } | ||
| } | ||
|
|
||
| create("data") { | ||
| dataGenerator(true) | ||
|
|
||
| programArguments("--mod", "compactmachines") | ||
| programArguments("--all") | ||
| programArguments("--output", mainProject.file("src/generated/resources").absolutePath) | ||
| programArguments("--existing", mainProject.file("src/main/resources").absolutePath) | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| } | ||
|
|
||
| dependencies { | ||
| compileOnly(coreApi) | ||
| compileOnly(mainProject) | ||
|
|
||
| implementation(neoforged.neoforge) | ||
| } | ||
|
|
||
| tasks.compileJava { | ||
| options.encoding = "UTF-8"; | ||
| } | ||
|
|
||
| tasks.withType<ProcessResources> { | ||
| duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
| } | ||
| //import org.slf4j.event.Level | ||
| // | ||
| //plugins { | ||
| // id("java") | ||
| // id("eclipse") | ||
| // id("idea") | ||
| // id("maven-publish") | ||
| // alias(neoforged.plugins.userdev) | ||
| //} | ||
| // | ||
| //val modId: String = "compactmachines" | ||
| // | ||
| //val coreApi = project(":core-api") | ||
| //val mainProject: Project = project(":neoforge-main") | ||
| // | ||
| //project.evaluationDependsOn(coreApi.path) | ||
| //project.evaluationDependsOn(mainProject.path) | ||
| // | ||
| //java { | ||
| // toolchain.languageVersion.set(JavaLanguageVersion.of(21)) | ||
| //} | ||
| // | ||
| //minecraft { | ||
| // modIdentifier.set(modId) | ||
| //} | ||
| // | ||
| //runs { | ||
| // // applies to all the run configs below | ||
| // configureEach { | ||
| // systemProperty("forge.logging.markers", "") | ||
| // systemProperty("forge.logging.console.level", "debug") | ||
| // | ||
| // modSources { | ||
| // add(modId, project.sourceSets.main.get()) | ||
| // add(modId, mainProject.sourceSets.main.get()) | ||
| // add(modId, coreApi.sourceSets.main.get()) | ||
| // } | ||
| // } | ||
| // | ||
| // create("data") { | ||
| // dataGenerator(true) | ||
| // | ||
| // programArguments("--mod", "compactmachines") | ||
| // programArguments("--all") | ||
| // programArguments("--output", mainProject.file("src/generated/resources").absolutePath) | ||
| // programArguments("--existing", mainProject.file("src/main/resources").absolutePath) | ||
| // } | ||
| //} | ||
| // | ||
| //repositories { | ||
| // mavenLocal() | ||
| //} | ||
| // | ||
| //dependencies { | ||
| // compileOnly(coreApi) | ||
| // compileOnly(mainProject) | ||
| // | ||
| // implementation(neoforged.neoforge) | ||
| //} | ||
| // | ||
| //tasks.compileJava { | ||
| // options.encoding = "UTF-8"; | ||
| //} | ||
| // | ||
| //tasks.withType<ProcessResources> { | ||
| // duplicatesStrategy = DuplicatesStrategy.EXCLUDE | ||
| //} |
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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # org.gradle.configuration-cache=false |
4 changes: 0 additions & 4 deletions
4
neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/VillagerTrades.java
This file was deleted.
Oops, something went wrong.
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: 8 additions & 10 deletions
18
...mods/machines/datagen/DataGeneration.java → ...machines/data/datagen/DataGeneration.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
...ines/datagen/DatapackRegisteredStuff.java → ...data/datagen/DatapackRegisteredStuff.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
.../machines/datagen/ItemModelGenerator.java → ...ines/data/datagen/ItemModelGenerator.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
...ods/machines/datagen/RecipeGenerator.java → ...achines/data/datagen/RecipeGenerator.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
...mods/machines/datagen/StateGenerator.java → ...machines/data/datagen/StateGenerator.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: 4 additions & 0 deletions
4
neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/VillagerTrades.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package dev.compactmods.machines.data.datagen; | ||
|
|
||
| public class VillagerTrades { | ||
| } |
2 changes: 1 addition & 1 deletion
2
...n/compat/curios/CurioEntityGenerator.java → ...n/compat/curios/CurioEntityGenerator.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
...gen/compat/curios/CurioSlotGenerator.java → ...gen/compat/curios/CurioSlotGenerator.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
...hines/datagen/lang/BaseLangGenerator.java → .../data/datagen/lang/BaseLangGenerator.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
...es/datagen/lang/EnglishLangGenerator.java → ...ta/datagen/lang/EnglishLangGenerator.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
...ines/datagen/loot/BlockLootGenerator.java → ...data/datagen/loot/BlockLootGenerator.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
...hines/datagen/tags/BlockTagGenerator.java → .../data/datagen/tags/BlockTagGenerator.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
...chines/datagen/tags/ItemTagGenerator.java → ...s/data/datagen/tags/ItemTagGenerator.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
...gen/tags/PointOfInterestTagGenerator.java → ...gen/tags/PointOfInterestTagGenerator.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
...es/datagen/util/DimensionTypeBuilder.java → ...ta/datagen/util/DimensionTypeBuilder.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
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