Skip to content

Commit

Permalink
awesome fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@AViewFromTheTop
AViewFromTheTop committed Sep 30, 2024
1 parent e4b7d31 commit 15b820c
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 28 deletions.
8 changes: 1 addition & 7 deletions src/main/java/net/frozenblock/trailiertales/TTConstants.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package net.frozenblock.trailiertales;

import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import java.nio.file.Path;
import java.util.Map;
import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.ModContainer;
Expand All @@ -16,7 +15,7 @@
import org.slf4j.LoggerFactory;

public class TTConstants {
public static final String MOD_ID = "trailiertales";
public static final String MOD_ID = TTPreLoadConstants.MOD_ID;
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
public static final ModContainer MOD_CONTAINER = FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow();
// MEASURING
Expand Down Expand Up @@ -109,9 +108,4 @@ public static String string(@NotNull String path) {
public static @NotNull Component tooltip(String key) {
return Component.translatable("tooltip." + MOD_ID + "." + key);
}

@Contract(pure = true)
public static @NotNull Path configPath(String name, boolean json5) {
return Path.of("./config/" + MOD_ID + "/" + name + "." + (json5 ? "json5" : "json"));
}
}
3 changes: 2 additions & 1 deletion src/main/java/net/frozenblock/trailiertales/TTFeatureFlags.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package net.frozenblock.trailiertales;

import net.frozenblock.lib.FrozenBools;
import net.frozenblock.lib.feature_flag.api.FrozenFeatureFlags;
import net.minecraft.world.flag.FeatureFlag;
import net.minecraft.world.flag.FeatureFlagSet;
Expand All @@ -9,7 +10,7 @@ public class TTFeatureFlags {
public static final FeatureFlag TRAILIER_TALES = FrozenFeatureFlags.builder.create(TTConstants.id(TTConstants.MOD_ID));
public static final FeatureFlagSet TRAILIER_TALES_FLAG_SET = FeatureFlagSet.of(TRAILIER_TALES);

public static final FeatureFlag FEATURE_FLAG = TTPreLoadConstants.IS_DATAGEN ? TRAILIER_TALES : FeatureFlags.VANILLA;
public static final FeatureFlag FEATURE_FLAG = FrozenBools.IS_DATAGEN ? TRAILIER_TALES : FeatureFlags.VANILLA;

public static void init() {
}
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/net/frozenblock/trailiertales/TTPreLoadConstants.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

package net.frozenblock.trailiertales;

import net.fabricmc.loader.api.FabricLoader;
import java.util.Arrays;
import java.nio.file.Path;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;

public class TTPreLoadConstants {
public static final boolean IS_DATAGEN = isDatagen();
public static final String MOD_ID = "trailiertales";

private static boolean isDatagen() {
return Arrays.stream(
FabricLoader.getInstance().getLaunchArguments(true)
).toList().stream().anyMatch(string -> string.contains("datagen"));
@Contract(pure = true)
public static @NotNull Path configPath(String name, boolean json5) {
return Path.of("./config/" + MOD_ID + "/" + name + "." + (json5 ? "json5" : "json"));
}
}
3 changes: 2 additions & 1 deletion src/main/java/net/frozenblock/trailiertales/TrailierTales.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
import net.fabricmc.loader.api.ModContainer;
import net.frozenblock.lib.FrozenBools;
import net.frozenblock.lib.entrypoint.api.FrozenModInitializer;
import net.frozenblock.lib.feature_flag.api.FrozenFeatureFlags;
import net.frozenblock.trailiertales.config.TTMiscConfig;
Expand Down Expand Up @@ -48,7 +49,7 @@ public TrailierTales() {
public void onInitialize(String modId, ModContainer container) {
TTConstants.startMeasuring(this);

if (TTPreLoadConstants.IS_DATAGEN) {
if (FrozenBools.IS_DATAGEN) {
TTFeatureFlags.init();
FrozenFeatureFlags.rebuild();
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/frozenblock/trailiertales/config/TTBlockConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
import net.frozenblock.lib.config.api.sync.SyncBehavior;
import net.frozenblock.lib.config.api.sync.annotation.EntrySyncData;
import net.frozenblock.trailiertales.TTConstants;
import net.frozenblock.trailiertales.TTPreLoadConstants;

public final class TTBlockConfig {

public static final Config<TTBlockConfig> INSTANCE = ConfigRegistry.register(
new JsonConfig<>(
TTConstants.MOD_ID,
TTBlockConfig.class,
TTConstants.configPath("block", true),
TTPreLoadConstants.configPath("block", true),
JsonType.JSON5,
null,
null
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/frozenblock/trailiertales/config/TTEntityConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
import net.frozenblock.lib.config.api.registry.ConfigRegistry;
import net.frozenblock.lib.config.api.sync.annotation.EntrySyncData;
import net.frozenblock.trailiertales.TTConstants;
import net.frozenblock.trailiertales.TTPreLoadConstants;

public final class TTEntityConfig {

public static final Config<TTEntityConfig> INSTANCE = ConfigRegistry.register(
new JsonConfig<>(
TTConstants.MOD_ID,
TTEntityConfig.class,
TTConstants.configPath("entity", true),
TTPreLoadConstants.configPath("entity", true),
JsonType.JSON5,
null,
null
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/frozenblock/trailiertales/config/TTItemConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
import net.frozenblock.lib.config.api.sync.SyncBehavior;
import net.frozenblock.lib.config.api.sync.annotation.EntrySyncData;
import net.frozenblock.trailiertales.TTConstants;
import net.frozenblock.trailiertales.TTPreLoadConstants;

public final class TTItemConfig {

public static final Config<TTItemConfig> INSTANCE = ConfigRegistry.register(
new JsonConfig<>(
TTConstants.MOD_ID,
TTItemConfig.class,
TTConstants.configPath("item", true),
TTPreLoadConstants.configPath("item", true),
JsonType.JSON5,
null,
null
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/frozenblock/trailiertales/config/TTMiscConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
import net.frozenblock.lib.config.api.sync.SyncBehavior;
import net.frozenblock.lib.config.api.sync.annotation.EntrySyncData;
import net.frozenblock.trailiertales.TTConstants;
import net.frozenblock.trailiertales.TTPreLoadConstants;

public final class TTMiscConfig {

public static final Config<TTMiscConfig> INSTANCE = ConfigRegistry.register(
new JsonConfig<>(
TTConstants.MOD_ID,
TTMiscConfig.class,
TTConstants.configPath("misc", true),
TTPreLoadConstants.configPath("misc", true),
JsonType.JSON5,
null,
null
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/frozenblock/trailiertales/config/TTMixinsConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import net.frozenblock.lib.config.api.registry.ConfigRegistry;
import net.frozenblock.lib.shadow.blue.endless.jankson.Comment;
import static net.frozenblock.trailiertales.TTConstants.MOD_ID;
import static net.frozenblock.trailiertales.TTConstants.configPath;
import net.frozenblock.trailiertales.TTPreLoadConstants;
import org.jetbrains.annotations.ApiStatus;

@ApiStatus.Internal
Expand All @@ -16,7 +16,7 @@ public final class TTMixinsConfig {
new JsonConfig<>(
MOD_ID,
TTMixinsConfig.class,
configPath("mixins", true),
TTPreLoadConstants.configPath("mixins", true),
JsonType.JSON5,
false,
null,
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/frozenblock/trailiertales/config/TTWorldgenConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
import net.frozenblock.lib.config.api.registry.ConfigRegistry;
import net.frozenblock.lib.config.api.sync.annotation.EntrySyncData;
import net.frozenblock.trailiertales.TTConstants;
import net.frozenblock.trailiertales.TTPreLoadConstants;

public final class TTWorldgenConfig {

public static final Config<TTWorldgenConfig> INSTANCE = ConfigRegistry.register(
new JsonConfig<>(
TTConstants.MOD_ID,
TTWorldgenConfig.class,
TTConstants.configPath("worldgen", true),
TTPreLoadConstants.configPath("worldgen", true),
JsonType.JSON5,
null,
null
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/net/frozenblock/trailiertales/datagen/TTDataGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.frozenblock.lib.FrozenBools;
import net.frozenblock.lib.feature_flag.api.FrozenFeatureFlags;
import net.frozenblock.trailiertales.TTConstants;
import net.frozenblock.trailiertales.TTPreLoadConstants;
import net.frozenblock.trailiertales.datagen.advancement.TTAdvancementProvider;
import net.frozenblock.trailiertales.datagen.loot.TTArchaeologyLootProvider;
import net.frozenblock.trailiertales.datagen.loot.TTBlockLootProvider;
Expand Down Expand Up @@ -38,7 +38,7 @@ public final class TTDataGenerator implements DataGeneratorEntrypoint {
public static BlockFamily FAMILY_END_STONE;

static {
if (TTPreLoadConstants.IS_DATAGEN) {
if (FrozenBools.IS_DATAGEN) {
FAMILY_CALCITE = BlockFamilies.familyBuilder(Blocks.CALCITE)
.stairs(TTBlocks.CALCITE_STAIRS)
.slab(TTBlocks.CALCITE_SLAB)
Expand Down Expand Up @@ -82,7 +82,7 @@ public void onInitializeDataGenerator(@NotNull FabricDataGenerator dataGenerator

// ASSETS

if (TTPreLoadConstants.IS_DATAGEN) pack.addProvider(TTModelProvider::new);
if (FrozenBools.IS_DATAGEN) pack.addProvider(TTModelProvider::new);

// DATA

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/frozenblock/trailiertales/mixin/TTMixinPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.List;
import java.util.Set;
import net.frozenblock.trailiertales.TTPreLoadConstants;
import net.frozenblock.lib.FrozenBools;
import net.frozenblock.trailiertales.config.TTMixinsConfig;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -39,7 +39,7 @@ public boolean shouldApplyMixin(String targetClassName, @NotNull String mixinCla
if (mixinClassName.contains("haunt.")) return this.mixinsConfig.haunt;
if (mixinClassName.contains("surveyor.")) return this.mixinsConfig.surveyor;

if (mixinClassName.contains("datagen.")) return TTPreLoadConstants.IS_DATAGEN;
if (mixinClassName.contains("datagen.")) return FrozenBools.IS_DATAGEN;

return true;
}
Expand Down

0 comments on commit 15b820c

Please sign in to comment.