Better Logging and Renamed AvailableRuleSets to RuleSetDataManager

AbstractionMC · Mar 30, 2024 · 6111f31 · 6111f31
1 parent 5e8ce88
commit 6111f31
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/net/rotgruengelb/landscape/command/debuglet/zone/RuleSetsDebuglet.java b/src/main/java/net/rotgruengelb/landscape/command/debuglet/zone/RuleSetsDebuglet.java
@@ -5,26 +5,26 @@
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import net.rotgruengelb.landscape.feature.zones.rule.AvailableRuleSets;
+import net.rotgruengelb.landscape.feature.zones.rule.RuleSetDataManager;
 import net.rotgruengelb.landscape.feature.zones.rule.RuleSet;
 
 import java.util.Map;
 import java.util.Set;
 
 public class RuleSetsDebuglet {
 	public static int showAvailableRuleSets(CommandContext<ServerCommandSource> ctx) {
-		Set<Identifier> rulesets = AvailableRuleSets.getRuleSets();
+		Set<Identifier> rulesets = RuleSetDataManager.getRuleSets();
 		for (Identifier ruleSet : rulesets) {
 			ctx.getSource()
-					.sendMessage(Text.literal("ruleset: " + ruleSet + " -> " + AvailableRuleSets.getRuleSet(ruleSet)
+					.sendMessage(Text.literal("ruleset: " + ruleSet + " -> " + RuleSetDataManager.getRuleSet(ruleSet)
 							.name()));
 		}
 		return 1;
 	}
 
 	public static int showRuleSetRules(CommandContext<ServerCommandSource> ctx) {
 		String ruleSetName = StringArgumentType.getString(ctx, "ruleset_name");
-		RuleSet ruleSet = AvailableRuleSets.getRuleSet(Identifier.tryParse(ruleSetName));
+		RuleSet ruleSet = RuleSetDataManager.getRuleSet(Identifier.tryParse(ruleSetName));
 		if (ruleSet == null) {
 			ctx.getSource()
 					.sendError(Text.literal("No RuleSet with name " + ruleSetName + " found"));

diff --git a/src/main/java/net/rotgruengelb/landscape/feature/zones/rule/RuleSet.java b/src/main/java/net/rotgruengelb/landscape/feature/zones/rule/RuleSet.java
@@ -18,7 +18,7 @@ public record RuleSet(String name,
 			.fieldOf("rules").forGetter(RuleSet::rules)).apply(instance, RuleSet::new));
 
 	public static RuleSet of(Identifier name) {
-		return AvailableRuleSets.getRuleSet(name);
+		return RuleSetDataManager.getRuleSet(name);
 	}
 
 	public boolean containsRule(String rule) {

diff --git a/...feature/zones/rule/AvailableRuleSets.java → ...eature/zones/rule/RuleSetDataManager.java b/...feature/zones/rule/AvailableRuleSets.java → ...eature/zones/rule/RuleSetDataManager.java
@@ -15,26 +15,26 @@
 import net.rotgruengelb.landscape.Landscape;
 import net.rotgruengelb.landscape.registry.LandscapeRegistries;
 import net.rotgruengelb.landscape.util.StringUtils;
+import org.slf4j.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import static net.rotgruengelb.landscape.Landscape.LOGGER;
-
-public class AvailableRuleSets extends JsonDataLoader implements IdentifiableResourceReloadListener {
+public class RuleSetDataManager extends JsonDataLoader implements IdentifiableResourceReloadListener {
 	private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping()
 			.create();
-	public static AvailableRuleSets INSTANCE;
+	public static RuleSetDataManager INSTANCE;
 	private final DynamicRegistryManager registryManager;
+	private final Logger LOGGER = Landscape.getClassLogger();
 
-	public AvailableRuleSets(DynamicRegistryManager registryManager) {
+	public RuleSetDataManager(DynamicRegistryManager registryManager) {
 		super(GSON, Landscape.MOD_ID + "/rulesets");
 		this.registryManager = registryManager;
 	}
 
 	public static void register(DynamicRegistryManager registryManager) {
-		INSTANCE = new AvailableRuleSets(registryManager);
+		INSTANCE = new RuleSetDataManager(registryManager);
 		ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(INSTANCE);
 	}
 
@@ -55,12 +55,12 @@ public Identifier getFabricId() {
 	@Override
 	protected void apply(Map<Identifier, JsonElement> prepared, ResourceManager manager, Profiler profiler) {
 
-		LOGGER.info("Loading rule sets");
+		LOGGER.info("Loading Data RuleSets for Landscape! ( Path: data/{namespace}/landscapes/rulesets/{name}.json -> RuleSet: {namespace}:{name} )");
 
 		for (Identifier id : prepared.keySet()) {
 			JsonObject json = prepared.get(id).getAsJsonObject();
 
-			LOGGER.debug("Loading rule set " + id.toString());
+			LOGGER.debug("Loading RuleSet: " + id.toString());
 
 			if (json.isJsonObject()) {
 				if (json.has("name") && json.has("rules")) {
@@ -75,7 +75,7 @@ protected void apply(Map<Identifier, JsonElement> prepared, ResourceManager mana
 
 					RuleSet ruleSet = new RuleSet(json.get("name").getAsString(), rules);
 
-					LOGGER.info("Loaded RuleSet " + cleanId);
+					LOGGER.debug("Loaded RuleSet: " + cleanId);
 				}
 			}
 		}

diff --git a/src/main/java/net/rotgruengelb/landscape/mixin/DataPackContentsMixin.java b/src/main/java/net/rotgruengelb/landscape/mixin/DataPackContentsMixin.java
@@ -4,7 +4,7 @@
 import net.minecraft.resource.featuretoggle.FeatureSet;
 import net.minecraft.server.DataPackContents;
 import net.minecraft.server.command.CommandManager;
-import net.rotgruengelb.landscape.feature.zones.rule.AvailableRuleSets;
+import net.rotgruengelb.landscape.feature.zones.rule.RuleSetDataManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,6 +14,6 @@
 public class DataPackContentsMixin {
 	@Inject(method = "<init>", at = @At("RETURN"))
 	private void createCocktailManager(DynamicRegistryManager.Immutable dynamicRegistryManager, FeatureSet enabledFeatures, CommandManager.RegistrationEnvironment environment, int functionPermissionLevel, CallbackInfo ci) {
-		AvailableRuleSets.register(dynamicRegistryManager);
+		RuleSetDataManager.register(dynamicRegistryManager);
 	}
 }