Broaden out the new location display (ldtteam#5877)

Change from AbstractBuildingCrafter.View to IBuildingWorkerView, to ensure more buildings display
thepriz · Oct 5, 2020 · f7a46d9 · f7a46d9
1 parent fa16a54
commit f7a46d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/com/minecolonies/coremod/colony/requestsystem/requests/StandardRequests.java b/src/main/java/com/minecolonies/coremod/colony/requestsystem/requests/StandardRequests.java
@@ -5,6 +5,7 @@
 import com.minecolonies.api.colony.ICitizenDataView;
 import com.minecolonies.api.colony.IColonyManager;
 import com.minecolonies.api.colony.IColonyView;
+import com.minecolonies.api.colony.buildings.IBuildingWorkerView;
 import com.minecolonies.api.colony.buildings.views.IBuildingView;
 import com.minecolonies.api.colony.requestsystem.request.RequestState;
 import com.minecolonies.api.colony.requestsystem.requestable.*;
@@ -368,9 +369,9 @@ public List<String> getResolverToolTip(final IColonyView colony)
             final IBuildingView view = colony.getBuilding(resolver);
 
             int posInList = -1;
-            if (view instanceof AbstractBuildingCrafter.View)
+            if (view instanceof IBuildingWorkerView)
             {
-                for (int worker : ((AbstractBuildingCrafter.View) view).getWorkerId())
+                for (int worker : ((IBuildingWorkerView) view).getWorkerId())
                 {
                     final ICitizenDataView citizen = colony.getCitizen(worker);
                     if (citizen != null)

diff --git a/...lonies/coremod/colony/requestsystem/resolvers/PublicWorkerCraftingProductionResolver.java b/...lonies/coremod/colony/requestsystem/resolvers/PublicWorkerCraftingProductionResolver.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import com.minecolonies.api.colony.ICitizenData;
 import com.minecolonies.api.colony.IColony;
+import com.minecolonies.api.colony.buildings.IBuildingWorkerView;
 import com.minecolonies.api.colony.requestsystem.location.ILocation;
 import com.minecolonies.api.colony.requestsystem.manager.IRequestManager;
 import com.minecolonies.api.colony.requestsystem.request.IRequest;
@@ -131,9 +132,9 @@ public void onRequestedRequestCancelled(@NotNull final IRequestManager manager,
     public ITextComponent getRequesterDisplayName(@NotNull final IRequestManager manager, @NotNull final IRequest<?> request)
     {
         final IRequester requester = manager.getColony().getRequesterBuildingForPosition(getLocation().getInDimensionLocation());
-        if (requester instanceof AbstractBuildingCrafter.View)
+        if (requester instanceof IBuildingWorkerView)
         {
-            return new StringTextComponent(((AbstractBuildingCrafter.View) requester).getJobName());
+            return new StringTextComponent(((IBuildingWorkerView) requester).getJobName());
         }
         return super.getRequesterDisplayName(manager, request);
     }

diff --git a/...ecolonies/coremod/colony/requestsystem/resolvers/PublicWorkerCraftingRequestResolver.java b/...ecolonies/coremod/colony/requestsystem/resolvers/PublicWorkerCraftingRequestResolver.java
@@ -1,5 +1,6 @@
 package com.minecolonies.coremod.colony.requestsystem.resolvers;
 
+import com.minecolonies.api.colony.buildings.IBuildingWorkerView;
 import com.minecolonies.api.colony.requestsystem.location.ILocation;
 import com.minecolonies.api.colony.requestsystem.manager.IRequestManager;
 import com.minecolonies.api.colony.requestsystem.request.IRequest;
@@ -8,7 +9,6 @@
 import com.minecolonies.api.colony.requestsystem.requestable.crafting.PublicCrafting;
 import com.minecolonies.api.colony.requestsystem.requester.IRequester;
 import com.minecolonies.api.colony.requestsystem.token.IToken;
-import com.minecolonies.coremod.colony.buildings.AbstractBuildingCrafter;
 import com.minecolonies.coremod.colony.buildings.AbstractBuildingWorker;
 import com.minecolonies.coremod.colony.requestsystem.resolvers.core.AbstractCraftingRequestResolver;
 import net.minecraft.item.ItemStack;
@@ -76,9 +76,9 @@ public void onRequestedRequestCancelled(@NotNull final IRequestManager manager,
     public ITextComponent getRequesterDisplayName(@NotNull final IRequestManager manager, @NotNull final IRequest<?> request)
     {
         final IRequester requester = manager.getColony().getRequesterBuildingForPosition(getLocation().getInDimensionLocation());
-        if (requester instanceof AbstractBuildingCrafter.View)
+        if (requester instanceof IBuildingWorkerView)
         {
-            return new StringTextComponent(((AbstractBuildingCrafter.View) requester).getJobName());
+            return new StringTextComponent(((IBuildingWorkerView) requester).getJobName());
         }
         return super.getRequesterDisplayName(manager, request);
     }