Functional marketplace upgrades.

Author: armele

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

@@ -3,12 +3,15 @@
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.event.config.ModConfigEvent;
+import net.neoforged.neoforge.common.ModConfigSpec;
 
 // 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 Config
 {
+    private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder();
+    static final ModConfigSpec SPEC = BUILDER.build();
 
     @SubscribeEvent
     static void onLoad(final ModConfigEvent event)

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

@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 
+import com.deathfrog.mctradepost.api.sounds.ModSoundEvents;
 import com.deathfrog.mctradepost.apiimp.initializer.ModBuildingsInitializer;
 import com.deathfrog.mctradepost.apiimp.initializer.ModJobsInitializer;
 import com.deathfrog.mctradepost.apiimp.initializer.ModModelTypeInitializer;
@@ -76,22 +77,24 @@ public class MCTradePostMod
     public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);
 
     // Creates a new Block with the id "examplemod:example_block", combining the namespace and path
-    public static final DeferredBlock<Block> EXAMPLE_BLOCK = BLOCKS.registerSimpleBlock("example_block", BlockBehaviour.Properties.of().mapColor(MapColor.STONE));
+    // public static final DeferredBlock<Block> EXAMPLE_BLOCK = BLOCKS.registerSimpleBlock("example_block", BlockBehaviour.Properties.of().mapColor(MapColor.STONE));
+    
     // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
-    public static final DeferredItem<BlockItem> EXAMPLE_BLOCK_ITEM = ITEMS.registerSimpleBlockItem("example_block", EXAMPLE_BLOCK);
+    // public static final DeferredItem<BlockItem> EXAMPLE_BLOCK_ITEM = ITEMS.registerSimpleBlockItem("example_block", EXAMPLE_BLOCK);
 
     // Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2
-    public static final DeferredItem<Item> EXAMPLE_ITEM = ITEMS.registerSimpleItem("example_item", new Item.Properties().food(new FoodProperties.Builder()
-            .alwaysEdible().nutrition(1).saturationModifier(2f).build()));
+    // public static final DeferredItem<Item> EXAMPLE_ITEM = ITEMS.registerSimpleItem("example_item", new Item.Properties().food(new FoodProperties.Builder().alwaysEdible().nutrition(1).saturationModifier(2f).build()));
 
     // Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab
+    /* 
     public static final DeferredHolder<CreativeModeTab, CreativeModeTab> EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder()
             .title(Component.translatable("itemGroup.examplemod")) //The language key for the title of your CreativeModeTab
             .withTabsBefore(CreativeModeTabs.COMBAT)
             .icon(() -> EXAMPLE_ITEM.get().getDefaultInstance())
             .displayItems((parameters, output) -> {
                 output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event
             }).build());
+    */
 
     // The constructor for the mod class is the first code that is run when your mod is loaded.
     // FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically.
@@ -123,6 +126,7 @@ public MCTradePostMod(IEventBus modEventBus, ModContainer modContainer)
         ModJobsInitializer.DEFERRED_REGISTER.register(modEventBus);        
         TileEntityInitializer.BLOCK_ENTITIES.register(modEventBus);
         ModBuildingsInitializer.DEFERRED_REGISTER.register(modEventBus);
+        ModSoundEvents.SOUND_EVENTS.register(modEventBus);       
     }
 
     private void commonSetup(final FMLCommonSetupEvent event)
@@ -136,11 +140,11 @@ private void commonSetup(final FMLCommonSetupEvent event)
     private void addCreative(BuildCreativeModeTabContentsEvent event)
     {
         if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) {
-            event.accept(EXAMPLE_BLOCK_ITEM);
+            // event.accept(EXAMPLE_BLOCK_ITEM);
         }
 
         if (event.getTabKey() == CreativeModeTabs.TOOLS_AND_UTILITIES) {
-            event.accept(EXAMPLE_ITEM.get());
+            // event.accept(EXAMPLE_ITEM.get());
             event.accept(MCTradePostMod.ADVANCED_CLIPBOARD.get());
         }
     }

src/main/java/com/deathfrog/mctradepost/api/colony/buildings/jobs/MCTPModJobs.java

@@ -1,5 +1,7 @@
 package com.deathfrog.mctradepost.api.colony.buildings.jobs;
 
+import java.util.ArrayList;
+import java.util.List;
 import com.deathfrog.mctradepost.MCTradePostMod;
 import com.minecolonies.api.colony.jobs.registry.JobEntry;
 import net.minecraft.resources.ResourceLocation;
@@ -18,5 +20,13 @@ private MCTPModJobs()
     {
         throw new IllegalStateException("Tried to initialize: ModJobs but this is a Utility class.");
     }
+
+    public static List<ResourceLocation> getJobs()
+    {
+        List<ResourceLocation> jobs = new ArrayList<>() { };
+        jobs.add(SHOPKEEPER_ID);
+        
+        return jobs;
+    }
 }
 

src/main/java/com/deathfrog/mctradepost/api/sounds/ModSoundEvents.java

@@ -0,0 +1,101 @@
+package com.deathfrog.mctradepost.api.sounds;
+
+import com.deathfrog.mctradepost.MCTradePostMod;
+import com.deathfrog.mctradepost.api.colony.buildings.jobs.MCTPModJobs;
+import com.minecolonies.api.sounds.EventType;
+import com.minecolonies.api.util.Tuple;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvent;
+import net.neoforged.neoforge.registries.DeferredRegister;
+import java.util.*;
+
+/**
+ * Registering of sound events for our colony.
+ */
+public final class ModSoundEvents
+{
+    /**
+     * Citizen sound prefix.
+     */
+    public static final String CITIZEN_SOUND_EVENT_PREFIX = "citizen.";
+
+    public static final DeferredRegister<SoundEvent> SOUND_EVENTS = DeferredRegister.create(Registries.SOUND_EVENT, MCTradePostMod.MODID);
+
+    /**
+     * Map of sound events.
+     */
+    public static Map<String, Map<EventType, List<Tuple<SoundEvent, SoundEvent>>>> CITIZEN_SOUND_EVENTS = new HashMap<>();
+
+    /**
+     * Private constructor to hide the implicit public one.
+     */
+    private ModSoundEvents()
+    {
+        /*
+         * Intentionally left empty.
+         */
+    }
+
+    /**
+     * Register the {@link SoundEvent}s.
+     *
+     * @param registry the registry to register at.
+     */
+    static
+    {
+        final List<ResourceLocation> mainTypes = new ArrayList<>(MCTPModJobs.getJobs());
+
+        for (final ResourceLocation job : mainTypes)
+        {
+            final Map<EventType, List<Tuple<SoundEvent, SoundEvent>>> map = new HashMap<>();
+            for (final EventType event : EventType.values())
+            {
+                final List<Tuple<SoundEvent, SoundEvent>> individualSounds = new ArrayList<>();
+                for (int i = 1; i <= 4; i++)
+                {
+                    final SoundEvent maleSoundEvent =
+                      ModSoundEvents.getSoundID(CITIZEN_SOUND_EVENT_PREFIX + job.getPath() + ".male" + i + "." + event.getId());
+                    final SoundEvent femaleSoundEvent =
+                      ModSoundEvents.getSoundID(CITIZEN_SOUND_EVENT_PREFIX + job.getPath() + ".female" + i + "." + event.getId());
+
+                    SOUND_EVENTS.register(maleSoundEvent.getLocation().getPath(), () -> maleSoundEvent);
+                    SOUND_EVENTS.register(femaleSoundEvent.getLocation().getPath(), () -> femaleSoundEvent);
+                    individualSounds.add(new Tuple<>(maleSoundEvent, femaleSoundEvent));
+                }
+                map.put(event, individualSounds);
+            }
+            CITIZEN_SOUND_EVENTS.put(job.getPath(), map);
+        }
+
+        final Map<EventType, List<Tuple<SoundEvent, SoundEvent>>> map = new HashMap<>();
+        for (final EventType event : EventType.values())
+        {
+            final List<Tuple<SoundEvent, SoundEvent>> individualSounds = new ArrayList<>();
+            for (int i = 1; i <= 2; i++)
+            {
+                final SoundEvent maleSoundEvent =
+                        ModSoundEvents.getSoundID(CITIZEN_SOUND_EVENT_PREFIX + "child.male" + i + "." + event.getId());
+                final SoundEvent femaleSoundEvent =
+                        ModSoundEvents.getSoundID(CITIZEN_SOUND_EVENT_PREFIX + "child.female" + i + "." + event.getId());
+
+                individualSounds.add(new Tuple<>(maleSoundEvent, femaleSoundEvent));
+                individualSounds.add(new Tuple<>(maleSoundEvent, femaleSoundEvent));
+            }
+            map.put(event, individualSounds);
+        }
+        CITIZEN_SOUND_EVENTS.put("child", map);
+
+    }
+
+    /**
+     * Register a {@link SoundEvent}.
+     *
+     * @param soundName The SoundEvent's name without the minecolonies prefix
+     * @return The SoundEvent
+     */
+    public static SoundEvent getSoundID(final String soundName)
+    {
+        return SoundEvent.createVariableRangeEvent(ResourceLocation.parse(MCTradePostMod.MODID + ":" + soundName));
+    }
+}

src/main/java/com/deathfrog/mctradepost/apiimp/initializer/ModModelTypeInitializer.java

@@ -16,7 +16,7 @@ private ModModelTypeInitializer()
     }
 
     // TODO: Design shopkeeper textures and models  
-
+    // TODO: Set up and record shopkeeper sounds.  Investigate ModSoundEvents.
 
     public static void init(final EntityRendererProvider.Context context)
     {

src/main/java/com/deathfrog/mctradepost/core/blocks/huts/MCTPBaseBlockHut.java

@@ -77,14 +77,17 @@ public void onBlockPlacedByBuildTool(
         if (tileEntity != null) {
             MCTradePostMod.LOGGER.info("Placing hut of type {}", tileEntity.getClass().getName());
         } else {
-             MCTradePostMod.LOGGER.info("Attempting to place a null tile entity.");
+            MCTradePostMod.LOGGER.info("Attempting to place a null tile entity.");
         }
 
         if (tileEntity instanceof final MCTPTileEntityColonyBuilding hut)
         {
+            MCTradePostMod.LOGGER.info("Rotation mirror: {}; pack name: {}; blueprint path: {}", rotMir, style, blueprintPath);
             hut.setRotationMirror(rotMir);
             hut.setPackName(style);
             hut.setBlueprintPath(blueprintPath);
+        } else {
+            MCTradePostMod.LOGGER.info("Wrong instance to place a tile entity of type {}", tileEntity.getClass().getName());
         }
 
         setPlacedBy(worldIn, pos, state, placer, stack);

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

@@ -46,7 +46,7 @@ public BuildingMarketplace(@NotNull IColony colony, BlockPos pos) {
      * Description string of the building.
      */
     // TODO: Consistency between building (MARKETPLACE) and job (SHOPKEEPER)
-    // TODO: Upgrading the building throws an exception - possibly due to schematics not implemented as a data pack.
+    // TODO: Worker has no face...
     private static final String SHOPKEEPER = "shopkeeper";
 
 
@@ -66,13 +66,14 @@ public int getMaxBuildingLevel()
     @Override
     public void registerBlockPosition(@NotNull final BlockState block, @NotNull final BlockPos pos, @NotNull final Level world)
     {
+        // MCTradePostMod.LOGGER.info("Registering Block Position: " + block + " at " + pos);
         super.registerBlockPosition(block, pos, world);
     }
 
     @Override
     public void deserializeNBT(@NotNull final HolderLookup.Provider provider, final CompoundTag compound)
     {
-
+        super.deserializeNBT(provider, compound);
     }
 
     @Override

src/main/resources/blueprints/mctradepost/ancientathens/luxury/marketplace.blueprint

@@ -0,0 +1,15 @@
+{
+"version": 1,
+"pack-format": 1,
+"desc": "Trade Post structures.",
+"authors":
+    [
+    "Ayar", "Alysar"
+    ],
+"mods":
+    [
+    "structurize", "mctradepost"
+    ],
+"name": "Economic",
+"icon": "tradepost.png"
+}