Working configuration logic.

Author: armele

README.md

@@ -1,5 +1,4 @@
-# MC Trade Post
-=======
+# MC Trade Post  
 
 ## Description
 
@@ -41,7 +40,7 @@ These frames should be mounted in empty (air) blocks tagged with the "display_sh
 This mod can best be described as a "pre-alpha" state. It functionality may change rapidly and without warning.
 
 ### Roadmap (Roughly Prioritized)
-
+External configurability
 Interface for spending earned income.  
 - Unlock subsequent levels of the merchant building  
 - Summon traders  

gradle.properties

@@ -32,7 +32,7 @@ mod_name=MC Trade Post
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=0.0.4
+mod_version=0.1.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/com/deathfrog/mctradepost/Config.java

@@ -0,0 +1,69 @@
+package com.deathfrog.mctradepost;
+
+import java.io.ObjectInputFilter.Config;
+import java.lang.reflect.Field;
+
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.fml.config.ModConfig;
+import net.neoforged.fml.event.config.ModConfigEvent;
+import net.neoforged.neoforge.common.ModConfigSpec;
+import net.neoforged.neoforge.common.ModConfigSpec.ConfigValue;
+import net.neoforged.neoforge.common.ModConfigSpec.IntValue;
+
+
+// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
+// Demonstrates how to use Neo's config APIs
+@EventBusSubscriber(modid = MCTradePostMod.MODID, bus = EventBusSubscriber.Bus.MOD)
+public class MCTPConfig
+{
+    public static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder();
+    public static final ModConfigSpec SPEC;
+
+    public static final ConfigValue<Integer> marketplaceLevel3;
+
+    static {
+        BUILDER.push("marketplace");
+
+        marketplaceLevel3 = BUILDER
+            .comment("How much does unlocking the level 3 marketplace cost?")
+            .define("marketplaceLevel3", 500);
+
+        BUILDER.pop();
+
+        SPEC = BUILDER.build(); // Last
+
+        // TODO: Eliminate once testing is complete.
+        MCTradePostMod.LOGGER.info("Static initialization of MCTPConfig complete.");
+    }
+
+
+    private static void setupConfiguration(final ModConfigEvent sourceEvent)
+    {
+        // No-op
+    }
+
+    @SubscribeEvent
+    static void onLoad(final ModConfigEvent.Loading event)
+    {
+        MCTradePostMod.LOGGER.info("Loading config");
+        setupConfiguration(event);
+    }
+
+    @SubscribeEvent
+    static void onReload(final ModConfigEvent.Reloading event)
+    {
+        MCTradePostMod.LOGGER.info("Reloading config");
+        setupConfiguration(event);
+    }
+
+    /**
+     * Register the config with the given mod container.
+     * @param modContainer The mod container to register the config with.
+     */
+    public static void register(ModContainer modContainer) {
+        MCTradePostMod.LOGGER.info("Registering MCTPConfig to handle configurations.");
+        modContainer.registerConfig(ModConfig.Type.COMMON, SPEC, "mctradepost-common.toml");
+    }
+}

src/main/java/com/deathfrog/mctradepost/MCTPConfig.java

@@ -41,6 +41,9 @@
 import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.neoforged.neoforge.client.event.EntityRenderersEvent;
 import net.neoforged.neoforge.client.event.RegisterItemDecorationsEvent;
+import net.neoforged.neoforge.client.gui.ConfigurationScreen;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
+import net.neoforged.neoforge.common.ModConfigSpec;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
@@ -348,7 +351,7 @@ public class MCTradePostMod
     public static final DeferredItem<AdvancedClipboardItem> ADVANCED_CLIPBOARD = ITEMS.register("advanced_clipboard",
         () -> new AdvancedClipboardItem(new Item.Properties().stacksTo(1)));
 
-    // TODO: Get the block hut registered with the JEI.
+
     public static MCTPBaseBlockHut blockHutMarketplace;
 
     // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "examplemod" namespace
@@ -400,7 +403,12 @@ public MCTradePostMod(IEventBus modEventBus, ModContainer modContainer)
         modEventBus.addListener(this::onLoadComplete);
 
         // Register our mod's ModConfigSpec so that FML can create and load the config file for us
-        modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
+        // TODO: Once working, refactor into server/client/common pattern.
+        MCTPConfig.register(modContainer);
+
+        // This will use NeoForge's ConfigurationScreen to display this mod's configs
+        modContainer.registerExtensionPoint(IConfigScreenFactory.class, ConfigurationScreen::new);
+
         ModJobsInitializer.DEFERRED_REGISTER.register(modEventBus);        
         TileEntityInitializer.BLOCK_ENTITIES.register(modEventBus);
         ModBuildingsInitializer.DEFERRED_REGISTER.register(modEventBus);
@@ -424,7 +432,6 @@ private void addCreative(BuildCreativeModeTabContentsEvent event)
             event.accept(MCTradePostMod.ADVANCED_CLIPBOARD.get());
         }
 
-        // TODO: Test Marketplace from creative mode tab and JEI
         if (event.getTabKey() == CreativeModeTabs.FUNCTIONAL_BLOCKS) {
             event.accept(MCTradePostMod.blockHutMarketplace);
         }        

src/main/java/com/deathfrog/mctradepost/MCTradePostMod.java

@@ -64,6 +64,8 @@ public static void generateValues()
 
             startTracking = false;
         }
+
+        MCTradePostMod.LOGGER.info("Finished configuring theItemValueRegistry.");
     }
 
     /**

src/main/java/com/deathfrog/mctradepost/core/colony/jobs/buildings/modules/ItemValueRegistry.java

@@ -56,7 +56,7 @@ public class MCTPBuildingModules
       "econ_module", BuildingEconModule::new,
       () -> EconModuleView::new);
 
-    // TODO: Repair the setting label (possibly requiring a custom gui XML, which in turn requires a custom view and window class).
+    // TODO: TEST: Repair the setting label
     // TODO: The settings window will also be where spend takes place.
     public static final BuildingEntry.ModuleProducer<SettingsModule,SettingsModuleView> ECON_SETTINGS              =
       new BuildingEntry.ModuleProducer<>("marketplace_settings",

src/main/java/com/deathfrog/mctradepost/core/colony/jobs/buildings/modules/MCTPBuildingModules.java

@@ -27,6 +27,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import com.deathfrog.mctradepost.MCTPConfig;
 import com.deathfrog.mctradepost.MCTradePostMod;
 import com.google.common.collect.ImmutableList;
 

src/main/java/com/deathfrog/mctradepost/core/colony/jobs/buildings/workerbuildings/BuildingMarketplace.java

@@ -12,6 +12,7 @@
 import com.minecolonies.api.colony.requestsystem.token.IToken;
 import com.minecolonies.core.client.gui.AbstractWindowRequestTree;
 import com.minecolonies.core.network.messages.server.colony.UpdateRequestStateMessage;
+import com.deathfrog.mctradepost.MCTPConfig;
 import com.deathfrog.mctradepost.MCTradePostMod;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.Minecraft;
@@ -75,6 +76,18 @@ private void togglePlayerOnly()
     {
         this.playerOnly = !this.playerOnly;
         MCTradePostMod.LOGGER.info("Player Only filter set to: " + this.playerOnly);
+
+        try{      
+            // TODO: Remove when testing complete.
+            if (MCTPConfig.SPEC.isLoaded()) {
+                MCTradePostMod.LOGGER.info("Confirmed SPEC is loaded.");
+                MCTradePostMod.LOGGER.info("Configured value for marketplaceLevel3 is: ", MCTPConfig.marketplaceLevel3.get());
+            } else {
+                MCTradePostMod.LOGGER.info("SPEC is not loaded.");   
+            }
+        } catch (Exception e) {
+            MCTradePostMod.LOGGER.error("Error getting config value for itemCost", e);
+        }
     }
 
     /**