Fix missing settings (ldtteam#9618)

Fix network errors not displaying Fix Hire fire message error Improve chunk claim error logging
Aquerr · Dec 12, 2023 · 9a979e5 · 9a979e5
1 parent 560bf97
commit 9a979e5
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 13 deletions.
diff --git a/src/api/java/com/minecolonies/api/colony/IColonyTagCapability.java b/src/api/java/com/minecolonies/api/colony/IColonyTagCapability.java
@@ -186,7 +186,11 @@ public void addBuildingClaim(final int colonyId, final BlockPos pos, final Level
         {
             if (chunk.getPos().equals(ChunkPos.ZERO))
             {
-                Log.getLogger().warn("Claiming id:" + colonyId + " building at zero pos!" + pos, new Exception());
+                final IColony colony = IColonyManager.getInstance().getColonyByDimension(colonyId, chunk.getLevel().dimension());
+                if (colony == null || BlockPosUtil.getDistance2D(colony.getCenter(), BlockPos.ZERO) > 200)
+                {
+                    Log.getLogger().warn("Claiming id:" + colonyId + " building at zero pos!" + pos, new Exception());
+                }
             }
 
             if (owningColony == NO_COLONY_ID)

diff --git a/src/main/java/com/minecolonies/coremod/colony/CitizenData.java b/src/main/java/com/minecolonies/coremod/colony/CitizenData.java
@@ -1815,6 +1815,10 @@ else if (this.participatingQuests.contains(questId))
     @Override
     public void onInteractionClosed(final Component key, final ServerPlayer sender)
     {
-        citizenChatOptions.get(key).onClosed();
+        final IInteractionResponseHandler chatOption = citizenChatOptions.get(key);
+        if (chatOption != null)
+        {
+            chatOption.onClosed();
+        }
     }
 }
diff --git a/src/main/java/com/minecolonies/coremod/colony/buildings/modules/BuildingModules.java b/src/main/java/com/minecolonies/coremod/colony/buildings/modules/BuildingModules.java
@@ -459,6 +459,7 @@ public class BuildingModules
       new BuildingEntry.ModuleProducer<>("miner_settings", () -> new SettingsModule()
         .with(AbstractCraftingBuildingModule.RECIPE_MODE, new CrafterRecipeSetting())
         .with(BuildingMiner.FILL_BLOCK, new BlockSetting((BlockItem) Items.COBBLESTONE))
+        .with(BuildingBuilder.BUILDING_MODE, new BuilderModeSetting())
         .with(BuildingMiner.MAX_DEPTH, new IntSetting(-100))
         .with(AbstractBuilding.USE_SHEARS, new BoolSetting(true)), () -> SettingsModuleView::new);
     public static final BuildingEntry.ModuleProducer<IBuildingModule,MinerGuardAssignModuleView> MINER_GUARD_ASSIGN    =
@@ -513,7 +514,7 @@ public class BuildingModules
       new BuildingEntry.ModuleProducer<>("tool_scepterguard_view", null, () -> () -> new ToolModuleView(
         ModItems.scepterGuard));
     public static final BuildingEntry.ModuleProducer<SettingsModule,SettingsModuleView> GUARD_SETTINGS = new BuildingEntry.ModuleProducer<>("guard_settings", () -> new SettingsModule()
-      .with(AbstractBuildingGuards.GUARD_TASK, new GuardTaskSetting(GuardTaskSetting.PATROL, GuardTaskSetting.GUARD, GuardTaskSetting.FOLLOW))
+      .with(AbstractBuildingGuards.GUARD_TASK, new GuardTaskSetting(GuardTaskSetting.PATROL, GuardTaskSetting.GUARD, GuardTaskSetting.FOLLOW, GuardTaskSetting.PATROL_MINE))
       .with(AbstractBuildingGuards.RETREAT, new BoolSetting(true))
       .with(AbstractBuildingGuards.HIRE_TRAINEE, new BoolSetting(true))
       .with(AbstractBuildingGuards.PATROL_MODE, new GuardPatrolModeSetting())

diff --git a/...ava/com/minecolonies/coremod/network/messages/server/colony/building/HireFireMessage.java b/...ava/com/minecolonies/coremod/network/messages/server/colony/building/HireFireMessage.java
@@ -1,12 +1,10 @@
 package com.minecolonies.coremod.network.messages.server.colony.building;
 
-import com.minecolonies.api.IMinecoloniesAPI;
 import com.minecolonies.api.colony.ICitizenData;
 import com.minecolonies.api.colony.IColony;
 import com.minecolonies.api.colony.buildings.IBuilding;
 import com.minecolonies.api.colony.buildings.modules.IAssignsJob;
 import com.minecolonies.api.colony.buildings.views.IBuildingView;
-import com.minecolonies.api.colony.jobs.registry.JobEntry;
 import com.minecolonies.coremod.network.messages.server.AbstractBuildingServerMessage;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraftforge.network.NetworkEvent;
@@ -65,7 +63,7 @@ public void fromBytesOverride(@NotNull final FriendlyByteBuf buf)
     {
         hire = buf.readBoolean();
         citizenID = buf.readInt();
-        moduleId = buf.readRegistryId();
+        moduleId = buf.readInt();
     }
 
     /**

diff --git a/src/main/java/com/minecolonies/coremod/network/messages/splitting/SplitPacketMessage.java b/src/main/java/com/minecolonies/coremod/network/messages/splitting/SplitPacketMessage.java
@@ -104,7 +104,7 @@ public void onExecute(final NetworkEvent.Context ctxIn, final boolean isLogicalS
                                         .stream()
                                         .sorted(Map.Entry.comparingByKey())
                                         .map(Map.Entry::getValue)
-                                        .reduce(new byte[0], Bytes::concat);
+              .reduce(new byte[0], Bytes::concat);
 
             //Grab the entry from the inner message id.
             final NetworkChannel.NetworkingMessageEntry<?> messageEntry = Network.getNetwork().getMessagesTypes().get(this.innerMessageId);
@@ -114,7 +114,17 @@ public void onExecute(final NetworkEvent.Context ctxIn, final boolean isLogicalS
 
             //Create a new buffer that reads from the packet data and then deserialize the inner message.
             final ByteBuf buffer = Unpooled.wrappedBuffer(packetData);
-            message.fromBytes(new FriendlyByteBuf(buffer));
+            try
+            {
+                message.fromBytes(new FriendlyByteBuf(buffer));
+            }
+            catch (Exception e)
+            {
+                Log.getLogger().error("Packet error:", e);
+                buffer.release();
+                return;
+            }
+
             buffer.release();
 
             //Execute the message.

diff --git a/src/main/java/com/minecolonies/coremod/util/ChunkDataHelper.java b/src/main/java/com/minecolonies/coremod/util/ChunkDataHelper.java
@@ -5,10 +5,7 @@
 import com.minecolonies.api.colony.IColonyManager;
 import com.minecolonies.api.colony.IColonyTagCapability;
 import com.minecolonies.api.colony.buildings.IBuilding;
-import com.minecolonies.api.util.ChunkLoadStorage;
-import com.minecolonies.api.util.Log;
-import com.minecolonies.api.util.MessageUtils;
-import com.minecolonies.api.util.WorldUtil;
+import com.minecolonies.api.util.*;
 import com.minecolonies.coremod.MineColonies;
 import com.minecolonies.coremod.Network;
 import com.minecolonies.coremod.colony.IColonyManagerCapability;
@@ -445,7 +442,13 @@ public static boolean tryClaimBuilding(
 
         if (chunk.getPos().equals(ChunkPos.ZERO))
         {
-            Log.getLogger().warn("Trying to claim at zero chunk pos!:", new Exception());
+            if (chunk.getPos().equals(ChunkPos.ZERO))
+            {
+                if (colony == null || BlockPosUtil.getDistance2D(colony.getCenter(), BlockPos.ZERO) > 200)
+                {
+                    Log.getLogger().warn("Trying to claim at zero chunk pos!:", new Exception());
+                }
+            }
         }
 
         // Before directly adding cap data, apply data from our cache.