From 44a6d50f8fceb395efd829c4fe2dd410d259c08c Mon Sep 17 00:00:00 2001 From: alexbegt Date: Sun, 7 Jul 2019 20:58:26 -0400 Subject: [PATCH] Add a 'PULSAR' log marker. --- build.gradle | 43 +++++++++++++------ gradle.properties | 4 +- .../mantle/pulsar/config/PulsarConfig.java | 4 +- .../mantle/pulsar/control/PulseManager.java | 8 ++-- 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index d5e12bf..e4337e8 100644 --- a/build.gradle +++ b/build.gradle @@ -72,15 +72,15 @@ version = "${minecraft_version}-${artifact_version}" minecraft { mappings channel: 'snapshot', version: mappings_version - + accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - + runs { client { workingDirectory project.file('run') // Recommended logging data for a userdev environment - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE,PULSARCONFIG' + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE,PULSAR' // Recommended logging level for the console property 'forge.logging.console.level', 'debug' @@ -96,7 +96,7 @@ minecraft { workingDirectory project.file('run') // Recommended logging data for a userdev environment - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE,PULSARCONFIG' + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE,PULSAR' // Recommended logging level for the console property 'forge.logging.console.level', 'debug' @@ -107,6 +107,24 @@ minecraft { } } } + + data { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE,PULSAR' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + args '--mod', 'mantle', '--all', '--output', file('src/generated/resources/') + + mods { + mantle { + source sourceSets.main + } + } + } } } @@ -118,26 +136,24 @@ configurations { dependencies { minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version - //compile "codechicken:CodeChickenLib:${minecraft_version}-${CCLIB_version}:dev" - //compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev" - //compile "codechicken:NotEnoughItems:${minecraft_version}-${NEI_version}:dev" - - compileOnly fg.deobf("mezz.jei:jei-${minecraft_version_previos}:${jei_version}") + // compile against the JEI API but do not include it at runtime + compileOnly fg.deobf("mezz.jei:jei-${minecraft_version_previos}:${jei_version}:api") + // at runtime, use the full JEI jar + runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version_previos}:${jei_version}") // Configuration shadow "ninja.leaping.configurate:configurate-hocon:${configurate_version}" //shade "ninja.leaping.configurate:configurate-gson:${configurate_version}" } -processResources -{ +processResources { inputs.property "version", artifact_version inputs.property "MCversion", minecraft_version from(sourceSets.main.resources.srcDirs) { include 'META-INF/mods.toml' - expand 'version':artifact_version, 'MCversion':minecraft_version, 'forge_version':forge_version_toml + expand 'version': artifact_version, 'MCversion': minecraft_version, 'forge_version': forge_version_toml } from(sourceSets.main.resources.srcDirs) { @@ -145,7 +161,6 @@ processResources } } - jar { manifest { attributes([ @@ -158,7 +173,7 @@ jar { "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } - + dependsOn shadowJar enabled = false } diff --git a/gradle.properties b/gradle.properties index 2168ed0..dcb664a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,11 +11,11 @@ minecraft_version_toml=14 minecraft_version_previos=1.14.2 # Forge Version Information -forge_version=27.0.13 +forge_version=27.0.25 forge_version_toml=27 # Mappings Information -mappings_version=20190626-1.14.3 +mappings_version=20190704-1.14.3 jei_version=6.0.+ configurate_version=3.3 diff --git a/src/main/java/slimeknights/mantle/pulsar/config/PulsarConfig.java b/src/main/java/slimeknights/mantle/pulsar/config/PulsarConfig.java index 9fe4ca8..f143c2a 100644 --- a/src/main/java/slimeknights/mantle/pulsar/config/PulsarConfig.java +++ b/src/main/java/slimeknights/mantle/pulsar/config/PulsarConfig.java @@ -100,9 +100,9 @@ public class PulsarConfig implements IConfiguration { public CommentedFileConfig createConfig(Path configBasePath, String configName) { final Path configPath = configBasePath.resolve(String.format("%s.toml", configName)); final CommentedFileConfig configData = CommentedFileConfig.builder(configPath).sync().autosave().writingMode(WritingMode.REPLACE).build(); - LOGGER.debug(PulseManager.CONFIG, "Built TOML config for {}", configPath.toString()); + LOGGER.debug(PulseManager.PULSAR, "Built TOML config for {}", configPath.toString()); configData.load(); - LOGGER.debug(PulseManager.CONFIG, "Loaded TOML config file {}", configPath.toString()); + LOGGER.debug(PulseManager.PULSAR, "Loaded TOML config file {}", configPath.toString()); return configData; } } diff --git a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java index a403190..347df80 100644 --- a/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java +++ b/src/main/java/slimeknights/mantle/pulsar/control/PulseManager.java @@ -60,7 +60,7 @@ public class PulseManager { private IConfiguration conf; private String id; - public static final Marker CONFIG = MarkerManager.getMarker("PULSARCONFIG"); + public static final Marker PULSAR = MarkerManager.getMarker("PULSAR"); /** * Configuration-using constructor. @@ -157,7 +157,7 @@ public class PulseManager { String[] parsedDeps = deps.split(";"); for (String s : parsedDeps) { if (!ModList.get().isLoaded(s)) { - this.log.info("Skipping Pulse " + id + "; missing dependency: " + s); + this.log.info(PULSAR, "Skipping Pulse " + id + "; missing dependency: " + s); missingDeps = true; enabled = false; break; @@ -184,7 +184,7 @@ public class PulseManager { */ private void attachToContainerEventBus(Object obj) { ModContainer cnt = ModLoadingContext.get().getActiveContainer(); - this.log.debug("Attaching [" + obj + "] to event bus for container [" + cnt + "]"); + this.log.debug(PULSAR, "Attaching [" + obj + "] to event bus for container [" + cnt + "]"); try { FMLModContainer mc = (FMLModContainer) cnt; Field ebf = mc.getClass().getDeclaredField("eventBus"); @@ -244,7 +244,7 @@ public class PulseManager { String[] parsedDeps = deps.split(";"); for (String s : parsedDeps) { if (!this.isPulseLoaded(s)) { - this.log.info("Skipping Pulse " + meta.getId() + "; missing pulse: " + s); + this.log.info(PULSAR, "Skipping Pulse " + meta.getId() + "; missing pulse: " + s); return false; } }