Skip to content

Commit 5e8ad15

Browse files
robotgryphonrobotgryphon
committed
Re-fix datagen (MDG ftw tho)
1 parent 0ab602f commit 5e8ad15

File tree

19 files changed

+101
-105
lines changed

19 files changed

+101
-105
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-main:runData
30+
run: ./gradlew :neoforge-datagen:runData
3131
env:
3232
VERSION: ${{ inputs.version }}
3333
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

‎neoforge-datagen/build.gradle.kts‎

Lines changed: 63 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,63 @@
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.moddev)
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+
neoForge {
24+
version = neoforged.versions.neoforge
25+
26+
this.mods.create(modId) {
27+
sourceSet(sourceSets.main.get())
28+
sourceSet(coreApi.sourceSets.main.get())
29+
sourceSet(mainProject.sourceSets.main.get())
30+
}
31+
32+
this.runs {
33+
configureEach {
34+
logLevel.set(Level.DEBUG)
35+
}
36+
37+
create("data") {
38+
data()
39+
40+
programArguments.addAll("--mod", modId)
41+
programArguments.addAll("--all")
42+
programArguments.addAll("--output", mainProject.file("src/generated/resources").absolutePath)
43+
programArguments.addAll("--existing", mainProject.file("src/main/resources").absolutePath)
44+
}
45+
}
46+
}
47+
48+
repositories {
49+
mavenLocal()
50+
}
51+
52+
dependencies {
53+
implementation(coreApi)
54+
implementation(mainProject)
55+
}
56+
57+
tasks.compileJava {
58+
options.encoding = "UTF-8";
59+
}
60+
61+
tasks.withType<ProcessResources> {
62+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
63+
}

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

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

33
import dev.compactmods.machines.api.CompactMachines;
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;
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;
1111
import net.minecraft.data.loot.LootTableProvider;
1212
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
1313
import net.neoforged.bus.api.SubscribeEvent;

neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/DatapackRegisteredStuff.java renamed to neoforge-datagen/src/main/java/dev.compactmods.machines.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.data.datagen;
1+
package dev.compactmods.machines.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.data.datagen.util.DimensionTypeBuilder;
6+
import dev.compactmods.machines.datagen.util.DimensionTypeBuilder;
77
import dev.compactmods.machines.dimension.Dimension;
88
import net.minecraft.core.HolderLookup;
99
import net.minecraft.core.RegistrySetBuilder;

neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/ItemModelGenerator.java renamed to neoforge-datagen/src/main/java/dev.compactmods.machines.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.data.datagen;
1+
package dev.compactmods.machines.datagen;
22

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

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

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

33
import dev.compactmods.machines.api.CompactMachines;
44
import dev.compactmods.machines.api.room.RoomTemplate;
@@ -33,7 +33,7 @@ protected void buildRecipes(RecipeOutput recipeOutput) {
3333
.pattern("D D")
3434
.pattern("DDD")
3535
.define('D', Items.POLISHED_DEEPSLATE)
36-
.unlockedBy("picked_up_deepslate", has(Tags.Items.COBBLESTONES_DEEPSLATE))
36+
.unlockedBy("picked_up_deepslate", RecipeProvider.has(Tags.Items.COBBLESTONES_DEEPSLATE))
3737
.save(recipeOutput);
3838

3939
ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, Shrinking.PERSONAL_SHRINKING_DEVICE.get())
@@ -47,7 +47,7 @@ protected void buildRecipes(RecipeOutput recipeOutput) {
4747
.define('5', Shrinking.SHRINKING_MODULE)
4848
.define('6', Tags.Items.INGOTS_IRON)
4949
.define('7', Tags.Items.INGOTS_COPPER)
50-
.unlockedBy("picked_up_ender_eye", has(Items.ENDER_EYE))
50+
.unlockedBy("picked_up_ender_eye", RecipeProvider.has(Items.ENDER_EYE))
5151
.save(recipeOutput);
5252

5353
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Shrinking.ENLARGING_MODULE)
@@ -58,7 +58,7 @@ protected void buildRecipes(RecipeOutput recipeOutput) {
5858
.define('P', Items.PISTON)
5959
.define('E', Items.ENDER_EYE)
6060
.define('L', Items.LIGHT_WEIGHTED_PRESSURE_PLATE)
61-
.unlockedBy("picked_up_ender_eye", has(Items.ENDER_EYE))
61+
.unlockedBy("picked_up_ender_eye", RecipeProvider.has(Items.ENDER_EYE))
6262
.save(recipeOutput);
6363

6464
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Shrinking.SHRINKING_MODULE)
@@ -69,7 +69,7 @@ protected void buildRecipes(RecipeOutput recipeOutput) {
6969
.define('P', Items.STICKY_PISTON)
7070
.define('E', Items.ENDER_EYE)
7171
.define('L', Items.LIGHT_WEIGHTED_PRESSURE_PLATE)
72-
.unlockedBy("picked_up_ender_eye", has(Items.ENDER_EYE))
72+
.unlockedBy("picked_up_ender_eye", RecipeProvider.has(Items.ENDER_EYE))
7373
.save(recipeOutput);
7474

7575
addMachineRecipes(recipeOutput);
@@ -105,7 +105,7 @@ protected void registerMachineRecipe(RecipeOutput consumer, ResourceLocation tem
105105
.define('S', Shrinking.SHRINKING_MODULE)
106106
.define('P', catalyst);
107107

108-
recipe.unlockedBy("has_recipe", has(Rooms.Items.BREAKABLE_WALL));
108+
recipe.unlockedBy("has_recipe", RecipeProvider.has(Rooms.Items.BREAKABLE_WALL));
109109

110110
final var recipeId = CompactMachines.modRL("new_machine_" + temId.getPath());
111111
recipe.save(consumer, recipeId);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.compactmods.machines.data.datagen;
1+
package dev.compactmods.machines.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/VillagerTrades.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package dev.compactmods.machines.datagen;
2+
3+
public class VillagerTrades {
4+
}

neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/compat/curios/CurioEntityGenerator.java renamed to neoforge-datagen/src/main/java/dev.compactmods.machines.datagen/compat/curios/CurioEntityGenerator.java

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

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;

neoforge-main/src/main/java/dev/compactmods/machines/data/datagen/compat/curios/CurioSlotGenerator.java renamed to neoforge-datagen/src/main/java/dev.compactmods.machines.datagen/compat/curios/CurioSlotGenerator.java

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

33
import com.mojang.serialization.Codec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;

0 commit comments

Comments
 (0)