Skip to content

Commit 8b05067

Browse files
committed
Fix NeoForge startup crashes
1 parent 0ec852a commit 8b05067

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

common/src/main/java/juuxel/adorn/lib/AdornStats.java

+15-13
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,27 @@
1010

1111
public final class AdornStats {
1212
public static final Registrar<Identifier> CUSTOM_STATS = RegistrarFactory.get().create(RegistryKeys.CUSTOM_STAT);
13-
public static final Identifier OPEN_BREWER = register("open_brewer", StatFormatter.DEFAULT);
14-
public static final Identifier OPEN_DRAWER = register("open_drawer", StatFormatter.DEFAULT);
15-
public static final Identifier OPEN_KITCHEN_CUPBOARD = register("open_kitchen_cupboard", StatFormatter.DEFAULT);
16-
public static final Identifier INTERACT_WITH_SHELF = register("interact_with_shelf", StatFormatter.DEFAULT);
17-
public static final Identifier INTERACT_WITH_TABLE_LAMP = register("interact_with_table_lamp", StatFormatter.DEFAULT);
18-
public static final Identifier INTERACT_WITH_TRADING_STATION = register("interact_with_trading_station", StatFormatter.DEFAULT);
19-
public static final Identifier DYE_TABLE_LAMP = register("dye_table_lamp", StatFormatter.DEFAULT);
20-
public static final Identifier DYE_SOFA = register("dye_sofa", StatFormatter.DEFAULT);
21-
public static final Identifier SIT_ON_CHAIR = register("sit_on_chair", StatFormatter.DEFAULT);
22-
public static final Identifier SIT_ON_SOFA = register("sit_on_sofa", StatFormatter.DEFAULT);
23-
public static final Identifier SIT_ON_BENCH = register("sit_on_bench", StatFormatter.DEFAULT);
13+
public static final Identifier OPEN_BREWER = register("open_brewer");
14+
public static final Identifier OPEN_DRAWER = register("open_drawer");
15+
public static final Identifier OPEN_KITCHEN_CUPBOARD = register("open_kitchen_cupboard");
16+
public static final Identifier INTERACT_WITH_SHELF = register("interact_with_shelf");
17+
public static final Identifier INTERACT_WITH_TABLE_LAMP = register("interact_with_table_lamp");
18+
public static final Identifier INTERACT_WITH_TRADING_STATION = register("interact_with_trading_station");
19+
public static final Identifier DYE_TABLE_LAMP = register("dye_table_lamp");
20+
public static final Identifier DYE_SOFA = register("dye_sofa");
21+
public static final Identifier SIT_ON_CHAIR = register("sit_on_chair");
22+
public static final Identifier SIT_ON_SOFA = register("sit_on_sofa");
23+
public static final Identifier SIT_ON_BENCH = register("sit_on_bench");
2424

25-
private static Identifier register(String name, StatFormatter formatter) {
25+
private static Identifier register(String name) {
2626
var id = AdornCommon.id(name);
2727
CUSTOM_STATS.register(name, () -> id);
28-
Stats.CUSTOM.getOrCreateStat(id, formatter);
2928
return id;
3029
}
3130

3231
public static void init() {
32+
for (Identifier stat : CUSTOM_STATS) {
33+
Stats.CUSTOM.getOrCreateStat(stat, StatFormatter.DEFAULT);
34+
}
3335
}
3436
}

forge/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ tasks {
5454
// and should reset when the project version changes.
5555
inputs.property("version", project.version)
5656

57-
// Replace the $version template in mods.toml with the project version.
58-
filesMatching("META-INF/mods.toml") {
57+
// Replace the $version template in neoforge.mods.toml with the project version.
58+
filesMatching("META-INF/neoforge.mods.toml") {
5959
expand("version" to project.version)
6060
}
6161
}

forge/src/main/java/juuxel/adorn/platform/forge/Adorn.java

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ private void register(Registrar<?> registrar, IEventBus modBus) {
7979
private void init(FMLCommonSetupEvent event) {
8080
AdornGameRules.init();
8181
AdornTags.init();
82+
AdornStats.init();
8283
ConfigManager.get().finish();
8384
}
8485
}

0 commit comments

Comments
 (0)