Fix citizens using inventory search to find out whether there is an empty slot, despite tracking empty slot count

Removed unused AbstractResearchEffect
Improve research effect checks

Author: someaddons

src/main/java/com/minecolonies/api/research/effects/AbstractResearchEffect.java

@@ -159,7 +159,7 @@ public static void init()
 
         InteractionValidatorRegistry.registerStandardPredicate(Component.translatable(PATIENT_FULL_INVENTORY),
             citizen -> citizen.getEntity().isPresent() && citizen.getCitizenDiseaseHandler().isSick()
-                       && InventoryUtils.isItemHandlerFull(citizen.getEntity().get().getInventoryCitizen()));
+                && !citizen.getEntity().get().getInventoryCitizen().hasSpace());
 
         InteractionValidatorRegistry.registerStandardPredicate(Component.translatable(PUPIL_NO_CARPET),
           citizen -> citizen.getEntity().isPresent() && citizen.isChild() && citizen.getWorkBuilding() instanceof BuildingSchool

src/main/java/com/minecolonies/apiimp/initializer/InteractionValidatorInitializer.java

@@ -16,14 +16,13 @@
 import com.minecolonies.api.colony.requestsystem.token.IToken;
 import com.minecolonies.api.crafting.IRecipeStorage;
 import com.minecolonies.api.crafting.ItemStorage;
-import com.minecolonies.api.research.effects.AbstractResearchEffect;
 import com.minecolonies.api.util.BlockPosUtil;
 import com.minecolonies.api.util.ItemStackUtils;
 import com.minecolonies.core.colony.buildings.AbstractBuilding;
 import com.minecolonies.core.colony.buildings.modules.WorkerBuildingModule;
 import com.minecolonies.core.colony.requestsystem.requesters.IBuildingBasedRequester;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Blocks;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -296,8 +295,7 @@ protected List<IToken<?>> createRequestsForRecipe(
         final List<ItemStorage> inputs = recipeRequest.getCleanedInput();
         final ItemStack requestStack = recipeRequest.getPrimaryOutput();
         final List<ItemStack> secondaryStacks = recipeRequest.getCraftingToolsAndSecondaryOutputs();
-        final AbstractResearchEffect<Double> researchEffect =  manager.getColony().getResearchManager().getResearchEffects().getEffect(CITIZEN_INV_SLOTS, AbstractResearchEffect.class);
-        final int extraSlots = researchEffect != null ? researchEffect.getEffect().intValue() : 0;         
+        final int extraSlots = (int) manager.getColony().getResearchManager().getResearchEffects().getEffectStrength(CITIZEN_INV_SLOTS);
         final int maxSlots = (27 + extraSlots) - (27 + extraSlots) % 8;  // retaining 1 slot per row for 'overhead'
 
         int recipeExecutionsCount = (int) Math.ceil((double) count / requestStack.getCount());

src/main/java/com/minecolonies/core/colony/requestsystem/resolvers/core/AbstractCraftingRequestResolver.java

@@ -345,7 +345,7 @@ protected IAIState structureStep()
             return PICK_UP_RESIDUALS;
         }
 
-        if (InventoryUtils.isItemHandlerFull(worker.getInventoryCitizen()))
+        if (!worker.getInventoryCitizen().hasSpace())
         {
             return INVENTORY_FULL;
         }

src/main/java/com/minecolonies/core/entity/ai/workers/AbstractEntityAIStructure.java

@@ -107,7 +107,7 @@ protected IAIState sift()
             return getState();
         }
 
-        if (InventoryUtils.isItemHandlerFull(worker.getInventoryCitizen()))
+        if (!worker.getInventoryCitizen().hasSpace())
         {
             return INVENTORY_FULL;
         }

src/main/java/com/minecolonies/core/entity/ai/workers/crafting/EntityAIWorkSifter.java

@@ -151,7 +151,7 @@ protected IAIState checkForImportantJobs()
             worker.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY);
         }
 
-        if (InventoryUtils.isItemHandlerFull(worker.getInventoryCitizen()))
+        if (!worker.getInventoryCitizen().hasSpace())
         {
             return INVENTORY_FULL;
         }

src/main/java/com/minecolonies/core/entity/ai/workers/crafting/EntityAIWorkSmelter.java

@@ -312,7 +312,7 @@ protected IAIState decide()
             {
                 return getState();
             }
-            if (InventoryUtils.isItemHandlerFull(worker.getInventoryCitizen()))
+            if (!worker.getInventoryCitizen().hasSpace())
             {
                 return INVENTORY_FULL;
             }
@@ -339,7 +339,7 @@ protected IAIState decide()
      */
     protected IAIState leaveForNether()
     {
-        if (InventoryUtils.isItemHandlerFull(worker.getInventoryCitizen()))
+        if (!worker.getInventoryCitizen().hasSpace())
         {
             return INVENTORY_FULL;
         }

src/main/java/com/minecolonies/core/entity/ai/workers/production/EntityAIWorkNether.java

@@ -12,6 +12,7 @@
 import com.minecolonies.api.entity.ai.statemachine.states.IAIState;
 import com.minecolonies.api.entity.citizen.AbstractEntityCitizen;
 import com.minecolonies.api.entity.citizen.VisibleCitizenStatus;
+import com.minecolonies.api.inventory.InventoryCitizen;
 import com.minecolonies.api.util.*;
 import com.minecolonies.api.util.constant.CitizenConstants;
 import com.minecolonies.api.util.constant.Constants;
@@ -178,12 +179,12 @@ private IAIState serveFoodToCitizen()
         }
 
         final AbstractEntityCitizen citizen = citizenToServe.poll();
-        final IItemHandler handler = citizen.getInventoryCitizen();
+        final InventoryCitizen handler = citizen.getInventoryCitizen();
         final RestaurantMenuModule module = worker.getCitizenData().getWorkBuilding().getModule(RESTAURANT_MENU);
         final Predicate<ItemStack> canEatPredicate = stack -> module.getMenu().contains(new ItemStorage(stack));
         final ICitizenData citizenData = citizen.getCitizenData();
 
-        if (InventoryUtils.isItemHandlerFull(handler))
+        if (!handler.hasSpace())
         {
             for (int feedingAttempts = 0; feedingAttempts < 10; feedingAttempts++)
             {

src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkCook.java

@@ -148,7 +148,7 @@ private IAIState decide()
                     return FREE_CURE;
                 }
 
-                if (!InventoryUtils.isItemHandlerFull(citizen.getInventoryCitizen()))
+                if (citizen.getInventoryCitizen().hasSpace())
                 {
                     if (hasCureInInventory(disease, worker.getInventoryCitizen()) ||
                           hasCureInInventory(disease, building.getCapability(ForgeCapabilities.ITEM_HANDLER).orElseGet(null)))
@@ -362,7 +362,7 @@ private IAIState cure()
             {
                 if (InventoryUtils.getItemCountInItemHandler(citizen.getInventoryCitizen(), Disease.hasCureItem(cure)) < cure.getAmount())
                 {
-                    if (InventoryUtils.isItemHandlerFull(citizen.getInventoryCitizen()))
+                    if (!citizen.getInventoryCitizen().hasSpace())
                     {
                         data.triggerInteraction(new StandardInteraction(Component.translatable(PATIENT_FULL_INVENTORY), ChatPriority.BLOCKING));
                         currentPatient = null;

src/main/java/com/minecolonies/core/entity/ai/workers/service/EntityAIWorkHealer.java

@@ -32,22 +32,20 @@ public <W extends IResearchEffect<?>> W getEffect(final ResourceLocation id, @No
     @Override
     public double getEffectStrength(final ResourceLocation id)
     {
-        if(effectMap.containsKey(id))
+        final IResearchEffect<?> effect = effectMap.get(id);
+        if (effect instanceof GlobalResearchEffect)
         {
-            if(effectMap.get(id) instanceof GlobalResearchEffect)
-            {
-                return ((GlobalResearchEffect)effectMap.get(id)).getEffect();
-            }
+            return ((GlobalResearchEffect) effect).getEffect();
         }
         return 0;
     }
 
     @Override
     public void applyEffect(final IResearchEffect<?> effect)
     {
-        if (effectMap.containsKey(effect.getId()))
+        final IResearchEffect<?> effectInMap = effectMap.get(effect.getId());
+        if (effectInMap != null)
         {
-            final IResearchEffect<?> effectInMap = effectMap.get(effect.getId());
             if (effect.overrides(effectInMap))
             {
                 effectMap.put(effect.getId(), effect);