Skip to content

Commit 85d0f8a

Browse files
robotgryphonrobotgryphon
committed
Temporarily (pls) unify datagen and main mod code again
1 parent 4c93cc7 commit 85d0f8a

22 files changed

+107
-98
lines changed

‎.github/workflows/datagen.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: gradle/actions/setup-gradle@v3
2828

2929
- name: Data Generation
30-
run: ./gradlew :neoforge-datagen:runData
30+
run: ./gradlew :neoforge-main:runData
3131
env:
3232
VERSION: ${{ inputs.version }}
3333
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
22
# This is required to provide enough memory for the Minecraft decompilation process.
33
org.gradle.jvmargs=-Xmx3G
4-
org.gradle.configuration-cache=true
4+
# org.gradle.configuration-cache=true
55

66
neoForge.parchment.minecraftVersion=1.20.6
77
neoForge.parchment.mappingsVersion=2024.05.01

‎neoforge-datagen/build.gradle.kts‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
import org.slf4j.event.Level
2-
3-
plugins {
4-
id("java")
5-
id("eclipse")
6-
id("idea")
7-
id("maven-publish")
8-
alias(neoforged.plugins.userdev)
9-
}
10-
11-
val modId: String = "compactmachines"
12-
13-
val coreApi = project(":core-api")
14-
val mainProject: Project = project(":neoforge-main")
15-
16-
project.evaluationDependsOn(coreApi.path)
17-
project.evaluationDependsOn(mainProject.path)
18-
19-
java {
20-
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
21-
}
22-
23-
minecraft {
24-
modIdentifier.set(modId)
25-
}
26-
27-
runs {
28-
// applies to all the run configs below
29-
configureEach {
30-
systemProperty("forge.logging.markers", "")
31-
systemProperty("forge.logging.console.level", "debug")
32-
33-
modSources {
34-
add(modId, project.sourceSets.main.get())
35-
add(modId, mainProject.sourceSets.main.get())
36-
add(modId, coreApi.sourceSets.main.get())
37-
}
38-
}
39-
40-
create("data") {
41-
dataGenerator(true)
42-
43-
programArguments("--mod", "compactmachines")
44-
programArguments("--all")
45-
programArguments("--output", mainProject.file("src/generated/resources").absolutePath)
46-
programArguments("--existing", mainProject.file("src/main/resources").absolutePath)
47-
}
48-
}
49-
50-
repositories {
51-
mavenLocal()
52-
}
53-
54-
dependencies {
55-
compileOnly(coreApi)
56-
compileOnly(mainProject)
57-
58-
implementation(neoforged.neoforge)
59-
}
60-
61-
tasks.compileJava {
62-
options.encoding = "UTF-8";
63-
}
64-
65-
tasks.withType<ProcessResources> {
66-
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
67-
}
1+
//import org.slf4j.event.Level
2+
//
3+
//plugins {
4+
// id("java")
5+
// id("eclipse")
6+
// id("idea")
7+
// id("maven-publish")
8+
// alias(neoforged.plugins.userdev)
9+
//}
10+
//
11+
//val modId: String = "compactmachines"
12+
//
13+
//val coreApi = project(":core-api")
14+
//val mainProject: Project = project(":neoforge-main")
15+
//
16+
//project.evaluationDependsOn(coreApi.path)
17+
//project.evaluationDependsOn(mainProject.path)
18+
//
19+
//java {
20+
// toolchain.languageVersion.set(JavaLanguageVersion.of(21))
21+
//}
22+
//
23+
//minecraft {
24+
// modIdentifier.set(modId)
25+
//}
26+
//
27+
//runs {
28+
// // applies to all the run configs below
29+
// configureEach {
30+
// systemProperty("forge.logging.markers", "")
31+
// systemProperty("forge.logging.console.level", "debug")
32+
//
33+
// modSources {
34+
// add(modId, project.sourceSets.main.get())
35+
// add(modId, mainProject.sourceSets.main.get())
36+
// add(modId, coreApi.sourceSets.main.get())
37+
// }
38+
// }
39+
//
40+
// create("data") {
41+
// dataGenerator(true)
42+
//
43+
// programArguments("--mod", "compactmachines")
44+
// programArguments("--all")
45+
// programArguments("--output", mainProject.file("src/generated/resources").absolutePath)
46+
// programArguments("--existing", mainProject.file("src/main/resources").absolutePath)
47+
// }
48+
//}
49+
//
50+
//repositories {
51+
// mavenLocal()
52+
//}
53+
//
54+
//dependencies {
55+
// compileOnly(coreApi)
56+
// compileOnly(mainProject)
57+
//
58+
// implementation(neoforged.neoforge)
59+
//}
60+
//
61+
//tasks.compileJava {
62+
// options.encoding = "UTF-8";
63+
//}
64+
//
65+
//tasks.withType<ProcessResources> {
66+
// duplicatesStrategy = DuplicatesStrategy.EXCLUDE
67+
//}

‎neoforge-datagen/gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# org.gradle.configuration-cache=false

‎neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/VillagerTrades.java‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎neoforge-main/build.gradle.kts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,16 @@ neoForge {
112112
// sourceSets.add(project.sourceSets.test.get())
113113
}
114114

115+
create("data") {
116+
data()
117+
gameDirectory.set(file("runs/datagen"))
118+
119+
programArguments.addAll("--mod", "compactmachines")
120+
programArguments.addAll("--all")
121+
programArguments.addAll("--output", file("src/generated/resources").absolutePath)
122+
programArguments.addAll("--existing", file("src/main/resources").absolutePath)
123+
}
124+
115125
create("gameTestServer") {
116126
type = "gameTestServer"
117127
gameDirectory.set(file("runs/gametest"))

neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/DataGeneration.java renamed to neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/DataGeneration.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
package dev.compactmods.machines.datagen;
1+
package dev.compactmods.machines.data.datagen;
22

33
import dev.compactmods.machines.api.CompactMachines;
4-
import dev.compactmods.machines.datagen.compat.curios.CurioEntityGenerator;
5-
import dev.compactmods.machines.datagen.compat.curios.CurioSlotGenerator;
6-
import dev.compactmods.machines.datagen.lang.EnglishLangGenerator;
7-
import dev.compactmods.machines.datagen.loot.BlockLootGenerator;
8-
import dev.compactmods.machines.datagen.tags.BlockTagGenerator;
9-
import dev.compactmods.machines.datagen.tags.ItemTagGenerator;
10-
import dev.compactmods.machines.datagen.tags.PointOfInterestTagGenerator;
4+
import dev.compactmods.machines.data.datagen.compat.curios.CurioEntityGenerator;
5+
import dev.compactmods.machines.data.datagen.compat.curios.CurioSlotGenerator;
6+
import dev.compactmods.machines.data.datagen.lang.EnglishLangGenerator;
7+
import dev.compactmods.machines.data.datagen.loot.BlockLootGenerator;
8+
import dev.compactmods.machines.data.datagen.tags.BlockTagGenerator;
9+
import dev.compactmods.machines.data.datagen.tags.ItemTagGenerator;
10+
import dev.compactmods.machines.data.datagen.tags.PointOfInterestTagGenerator;
1111
import net.minecraft.data.loot.LootTableProvider;
1212
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
13-
import net.neoforged.bus.api.IEventBus;
1413
import net.neoforged.bus.api.SubscribeEvent;
1514
import net.neoforged.fml.common.EventBusSubscriber;
16-
import net.neoforged.fml.common.Mod;
1715
import net.neoforged.neoforge.data.event.GatherDataEvent;
1816

1917
import java.util.Collections;

neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/DatapackRegisteredStuff.java renamed to neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/DatapackRegisteredStuff.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package dev.compactmods.machines.datagen;
1+
package dev.compactmods.machines.data.datagen;
22

33
import dev.compactmods.machines.api.room.RoomTemplate;
44
import dev.compactmods.machines.api.CompactMachines;
55
import dev.compactmods.machines.api.dimension.CompactDimension;
6-
import dev.compactmods.machines.datagen.util.DimensionTypeBuilder;
6+
import dev.compactmods.machines.data.datagen.util.DimensionTypeBuilder;
77
import dev.compactmods.machines.dimension.Dimension;
88
import net.minecraft.core.HolderLookup;
99
import net.minecraft.core.RegistrySetBuilder;

neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/ItemModelGenerator.java renamed to neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/ItemModelGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.compactmods.machines.datagen;
1+
package dev.compactmods.machines.data.datagen;
22

33
import dev.compactmods.machines.api.CompactMachines;
44
import dev.compactmods.machines.machine.Machines;

neoforge-datagen/src/main/java/dev/compactmods/machines/datagen/RecipeGenerator.java renamed to neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/RecipeGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.compactmods.machines.datagen;
1+
package dev.compactmods.machines.data.datagen;
22

33
import dev.compactmods.machines.api.CompactMachines;
44
import dev.compactmods.machines.api.room.RoomTemplate;

0 commit comments

Comments
 (0)