Skip to content

Commit 3cd084c

Browse files
committed
Bump neo stuff, datagen pls
1 parent dcc4a5b commit 3cd084c

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

neoforge-datagen/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.slf4j.event.Level
2+
13
plugins {
24
id("java")
35
id("eclipse")
@@ -28,6 +30,10 @@ neoForge {
2830
}
2931

3032
this.runs {
33+
configureEach {
34+
logLevel.set(Level.DEBUG)
35+
}
36+
3137
create("data") {
3238
data()
3339

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,22 @@
1010
import dev.compactmods.machines.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;
1314
import net.neoforged.bus.api.SubscribeEvent;
14-
import net.neoforged.fml.common.EventBusSubscriber;
15+
import net.neoforged.fml.common.Mod;
1516
import net.neoforged.neoforge.data.event.GatherDataEvent;
1617

1718
import java.util.Collections;
1819
import java.util.List;
1920

20-
@EventBusSubscriber(modid = CompactMachines.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
21+
@Mod(CompactMachines.MOD_ID)
2122
public class DataGeneration {
2223

23-
@SubscribeEvent
24-
public static void gatherData(GatherDataEvent event) {
24+
public DataGeneration(IEventBus modBus) {
25+
modBus.addListener(DataGeneration::gatherData);
26+
}
27+
28+
private static void gatherData(GatherDataEvent event) {
2529
final var fileHelper = event.getExistingFileHelper();
2630
final var generator = event.getGenerator();
2731

neoforge-main/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@file:Suppress("SpellCheckingInspection")
22

3+
import org.slf4j.event.Level
34
import java.text.SimpleDateFormat
45
import java.util.*
56

@@ -72,10 +73,8 @@ neoForge {
7273
runs {
7374
// applies to all the run configs below
7475
configureEach {
75-
systemProperty("forge.logging.markers", "") // 'SCAN,REGISTRIES,REGISTRYDUMP'
7676

77-
// Recommended logging level for the console
78-
systemProperty("forge.logging.console.level", "debug")
77+
logLevel.set(Level.DEBUG)
7978

8079
sourceSet = project.sourceSets.main
8180

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ rootProject.name = "Compact Machines 21.0"
22

33
dependencyResolutionManagement {
44
versionCatalogs.create("neoforged") {
5-
version("mdg", "0.1.79")
6-
version("neoforge", "21.0.2-beta")
5+
version("mdg", "0.1.92")
6+
version("neoforge", "21.0.14-beta")
77
version("neoforgeRange") {
88
require("[21.0,22)")
99
prefer("21.0.2-beta")

0 commit comments

Comments
 (0)