Style/codacity style fixes #2078

Raycoms · 2018-01-22T23:53:39Z

Fixes several codacity style issues.

Review please

BuildTeamLinter · 2018-01-23T00:07:26Z

...ain/java/com/minecolonies/coremod/entity/ai/citizen/deliveryman/EntityAIWorkDeliveryman.java

@@ -400,7 +400,7 @@ public BuildingWareHouse getWareHouse()
     */
    private AIState deliver()


Reduce the number of returns of this method 7, down to the maximum allowed 6.
The Cyclomatic Complexity of this method "deliver" is 19 which is greater than 15 authorized.
Refactor this method to reduce its Cognitive Complexity from 29 to the 20 allowed.

BuildTeamLinter · 2018-01-23T00:07:26Z

src/main/java/com/minecolonies/coremod/entity/ai/util/Structure.java

@@ -296,7 +297,7 @@ private static StructureWrapper loadStructure(
     */
    public Structure(final World targetWorld, final StructureWrapper structure, final Stage stageProgress)


Move this constructor to comply with Java Code Conventions.

BuildTeamLinter · 2018-01-23T00:07:27Z

src/main/java/com/minecolonies/coremod/colony/buildings/BuildingFarmer.java

@@ -310,7 +310,7 @@ public String getJobName()
    public void serializeToView(@NotNull final ByteBuf buf)


Refactor this method to reduce its Cognitive Complexity from 24 to the 20 allowed.

BuildTeamLinter · 2018-01-23T00:23:29Z

...in/java/com/minecolonies/coremod/colony/requestsystem/requests/StandardRequestFactories.java

@@ -381,7 +381,7 @@ private StandardRequestFactories()
    {
    }

-    public static <T extends IRequestable> NBTTagCompound serializeToNBT(IFactoryController controller, IRequest<T> request, IObjectToNBTConverter<T> typeSerialization)
+    public static <T extends IRequestable> NBTTagCompound serializeToNBT(final IFactoryController controller, final IRequest<T> request, final IObjectToNBTConverter<T> typeSerialization)


Split this 186 characters long line (which is greater than 180 authorized).

BuildTeamLinter · 2018-01-23T00:23:29Z

...ies/coremod/colony/requestsystem/resolvers/factory/StandardPlayerRequestResolverFactory.java

@@ -51,11 +51,11 @@ public StandardPlayerRequestResolver getNewInstance(
                                                 @NotNull final Object... context)
      throws IllegalArgumentException


Remove the declaration of thrown exception 'java.lang.IllegalArgumentException' which is a runtime exception.

BuildTeamLinter · 2018-01-23T00:23:30Z

...ies/coremod/colony/requestsystem/resolvers/factory/StandardPlayerRequestResolverFactory.java

@@ -51,11 +51,11 @@ public StandardPlayerRequestResolver getNewInstance(
                                                 @NotNull final Object... context)
      throws IllegalArgumentException
    {
-        ILocation location;
+        final ILocation location;
        try {


Move this left curly brace to the beginning of next line of code.

BuildTeamLinter · 2018-01-23T00:23:30Z

...ies/coremod/colony/requestsystem/resolvers/factory/StandardPlayerRequestResolverFactory.java

        try {
            location =
            factoryController.getNewInstance(TypeConstants.ILOCATION, iRequestManager.getColony().getCenter(), iRequestManager.getColony().getWorld().provider.getDimension());
-        } catch (Exception ex)
+        } catch (final Exception ex)


Move this "catch" keyword to a new dedicated line.

BuildTeamLinter · 2018-01-23T00:23:31Z

...ies/coremod/colony/requestsystem/resolvers/factory/StandardPlayerRequestResolverFactory.java

        try {
            location =
            factoryController.getNewInstance(TypeConstants.ILOCATION, iRequestManager.getColony().getCenter(), iRequestManager.getColony().getWorld().provider.getDimension());
-        } catch (Exception ex)
+        } catch (final Exception ex)
        {
            throw ex;


Add logic to this catch clause or eliminate it and rethrow the exception automatically.

BuildTeamLinter · 2018-01-23T00:23:32Z

src/main/java/com/minecolonies/coremod/colony/ColonyManager.java

@@ -810,7 +810,7 @@ public static void addToZipFile(final String fileName, final ZipOutputStream zos
            Files.copy(file, zos);
            fis.close();
        }
-        catch (Exception e)
+        catch (final Exception e)


Either log or rethrow this exception.

BuildTeamLinter · 2018-01-23T00:23:33Z

src/main/java/com/minecolonies/coremod/colony/buildings/views/AbstractBuildingView.java

@@ -332,7 +332,7 @@ public ColonyView getColony()
    public <R> ImmutableList<IRequest<? extends R>> getOpenRequestsOfTypeFiltered(


Remove usage of generic wildcard type.

BuildTeamLinter · 2018-01-23T00:23:34Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

-        int i = 222;
-        int j = 114;
+        final int i = 222;
+        final int j = 114;
        this.inventoryRows = containerMinecoloniesBuildingInventory.getLowerChestInventory().getSizeInventory() / 9;


Assign this magic number 9 to a well-named constant, and use the constant instead.

BuildTeamLinter · 2018-01-23T00:23:34Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

-        int i = 222;
-        int j = 114;
+        final int i = 222;
+        final int j = 114;
        this.inventoryRows = containerMinecoloniesBuildingInventory.getLowerChestInventory().getSizeInventory() / 9;
        this.ySize = 114 + this.inventoryRows * 18;


Assign this magic number 114 to a well-named constant, and use the constant instead.
Assign this magic number 18 to a well-named constant, and use the constant instead.

BuildTeamLinter · 2018-01-23T00:23:35Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

-        int i = (this.width - this.xSize) / 2;
-        int j = (this.height - this.ySize) / 2;
+        final int i = (this.width - this.xSize) / 2;
+        final int j = (this.height - this.ySize) / 2;
        this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.inventoryRows * 18 + 17);


Assign this magic number 18 to a well-named constant, and use the constant instead.
Assign this magic number 17 to a well-named constant, and use the constant instead.

BuildTeamLinter · 2018-01-23T00:23:35Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

-        int i = (this.width - this.xSize) / 2;
-        int j = (this.height - this.ySize) / 2;
+        final int i = (this.width - this.xSize) / 2;
+        final int j = (this.height - this.ySize) / 2;
        this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.inventoryRows * 18 + 17);
        this.drawTexturedModalRect(i, j + this.inventoryRows * 18 + 17, 0, 126, this.xSize, 96);


Assign this magic number 18 to a well-named constant, and use the constant instead.
Assign this magic number 17 to a well-named constant, and use the constant instead.
Assign this magic number 126 to a well-named constant, and use the constant instead.
Assign this magic number 96 to a well-named constant, and use the constant instead.

BuildTeamLinter · 2018-01-23T00:23:36Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

        this.inventoryRows = containerMinecoloniesBuildingInventory.getLowerChestInventory().getSizeInventory() / 9;
        this.ySize = 114 + this.inventoryRows * 18;
    }

    /**
     * Draw the foreground layer for the GuiContainer (everything in front of the items)
     */
-    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+    protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY)
    {
        this.fontRenderer.drawString(this.lowerChestInventory.getDisplayName().getUnformattedText(), 8, 6, 4210752);


Assign this magic number 8 to a well-named constant, and use the constant instead.
Assign this magic number 6 to a well-named constant, and use the constant instead.
Assign this magic number 4210752 to a well-named constant, and use the constant instead.
Add underscores to this numeric value for readability

BuildTeamLinter · 2018-01-23T00:23:37Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

        this.inventoryRows = containerMinecoloniesBuildingInventory.getLowerChestInventory().getSizeInventory() / 9;
        this.ySize = 114 + this.inventoryRows * 18;
    }

    /**
     * Draw the foreground layer for the GuiContainer (everything in front of the items)
     */
-    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+    protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY)
    {
        this.fontRenderer.drawString(this.lowerChestInventory.getDisplayName().getUnformattedText(), 8, 6, 4210752);
        this.fontRenderer.drawString(this.upperChestInventory.getDisplayName().getUnformattedText(), 8, this.ySize - 96 + 2, 4210752);


Assign this magic number 8 to a well-named constant, and use the constant instead.
Assign this magic number 96 to a well-named constant, and use the constant instead.
Assign this magic number 4210752 to a well-named constant, and use the constant instead.
Add underscores to this numeric value for readability

BuildTeamLinter · 2018-01-23T00:23:38Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

@@ -27,16 +27,16 @@ public GuiMinecoloniesBuildingInventory(final ContainerMinecoloniesBuildingInven
        this.upperChestInventory = containerMinecoloniesBuildingInventory.getPlayerInventory();
        this.lowerChestInventory = containerMinecoloniesBuildingInventory.getLowerChestInventory();
        this.allowUserInput = false;
-        int i = 222;
-        int j = 114;
+        final int i = 222;


Remove this unused "i" local variable.

if we aren't removing them could we name them better ( including the j variable)

BuildTeamLinter · 2018-01-23T00:23:39Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

-        int i = 222;
-        int j = 114;
+        final int i = 222;
+        final int j = 114;


Remove this unused "j" local variable.

BuildTeamLinter · 2018-01-23T00:23:40Z

...a/com/minecolonies/coremod/colony/requestsystem/resolvers/StandardPlayerRequestResolver.java

@@ -91,15 +91,15 @@ public void resolve(@NotNull final IRequestManager manager, @NotNull final IRequ
                    ((BuildingBasedRequester) request.getRequester()).getBuilding().isPresent() &&
                    ((BuildingBasedRequester) request.getRequester()).getBuilding().get() instanceof AbstractBuilding)


Call "Optional#isPresent()" before accessing the value.

BuildTeamLinter · 2018-01-23T00:23:41Z

...in/java/com/minecolonies/coremod/colony/requestsystem/resolvers/BuildingRequestResolver.java

@@ -96,9 +96,9 @@ public boolean canResolve(
    public void resolve(
                         @NotNull final IRequestManager manager, @NotNull final IRequest<? extends IDeliverable> request) throws RuntimeException


Remove the declaration of thrown exception 'java.lang.RuntimeException' which is a runtime exception.

BuildTeamLinter · 2018-01-23T00:23:41Z

...in/java/com/minecolonies/coremod/colony/requestsystem/resolvers/BuildingRequestResolver.java

@@ -116,7 +116,7 @@ public void resolve(
    private AbstractBuilding getBuildingFromRequest(
      @NotNull final IRequestManager manager, @NotNull final IRequest<? extends IDeliverable> request) throws RuntimeException


Define and throw a dedicated exception instead of using a generic one.
Remove the declaration of thrown exception 'java.lang.RuntimeException' which is a runtime exception.

BuildTeamLinter · 2018-01-23T00:23:42Z

...n/java/com/minecolonies/coremod/colony/requestsystem/resolvers/WarehouseRequestResolver.java

@@ -76,10 +76,10 @@ public boolean canResolve(@NotNull final IRequestManager manager, final IRequest
            return null;


Return an empty collection instead of null.

BuildTeamLinter · 2018-01-23T00:23:42Z

src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIBasic.java

@@ -473,7 +473,7 @@ private AIState lookForRequests()
            final ImmutableList<IRequest> completedRequests = getOwnBuilding().getCompletedRequests(worker.getCitizenData());

            completedRequests.stream().filter(r -> !(r.canBeDelivered())).forEach(r -> getOwnBuilding().markRequestAsAccepted(worker.getCitizenData(), r.getToken()));
-            IRequest firstDeliverableRequest = completedRequests.stream().filter(r -> r.canBeDelivered()).findFirst().orElse(null);
+            final IRequest firstDeliverableRequest = completedRequests.stream().filter(r -> r.canBeDelivered()).findFirst().orElse(null);


Replace this lambda with a method reference. (sonar.java.source not set. Assuming 8 or greater.)

can we set the sonar.java.source please? @OrionDevelopment

BuildTeamLinter · 2018-01-23T00:23:43Z

src/main/java/com/minecolonies/coremod/colony/CitizenData.java

@@ -796,7 +796,7 @@ public void serializeViewNetworkData(@NotNull final ByteBuf buf)

        buf.writeInt(colony.getID());

-        NBTTagCompound compound = new NBTTagCompound();
+        final NBTTagCompound compound = new NBTTagCompound();
        compound.setTag("inventory", inventory.writeToNBT(new NBTTagList()));


Use already-defined constant 'TAG_INVENTORY' instead of duplicating its value here.

BuildTeamLinter · 2018-01-23T00:23:44Z

src/main/java/com/minecolonies/blockout/views/ScrollingView.java

@@ -15,7 +15,7 @@
    protected ScrollingContainer container;
    protected Scrollbar          scrollbar;
    //  Params
-    private int scrollbarWidth = DEFAULT_SCROLLBAR_WIDTH;
+    private final int scrollbarWidth = DEFAULT_SCROLLBAR_WIDTH;


Make this final field static too.

BuildTeamLinter · 2018-01-23T00:23:45Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

-        int i = 222;
-        int j = 114;
+        final int i = 222;
+        final int j = 114;
        this.inventoryRows = containerMinecoloniesBuildingInventory.getLowerChestInventory().getSizeInventory() / 9;


Assign this magic number 9 to a well-named constant, and use the constant instead.

BuildTeamLinter · 2018-01-23T00:23:45Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

-        int i = 222;
-        int j = 114;
+        final int i = 222;
+        final int j = 114;
        this.inventoryRows = containerMinecoloniesBuildingInventory.getLowerChestInventory().getSizeInventory() / 9;
        this.ySize = 114 + this.inventoryRows * 18;


Assign this magic number 114 to a well-named constant, and use the constant instead.
Assign this magic number 18 to a well-named constant, and use the constant instead.

BuildTeamLinter · 2018-01-23T00:23:46Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

-        int i = (this.width - this.xSize) / 2;
-        int j = (this.height - this.ySize) / 2;
+        final int i = (this.width - this.xSize) / 2;
+        final int j = (this.height - this.ySize) / 2;
        this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.inventoryRows * 18 + 17);


Assign this magic number 18 to a well-named constant, and use the constant instead.
Assign this magic number 17 to a well-named constant, and use the constant instead.

BuildTeamLinter · 2018-01-23T00:23:47Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

-        int i = (this.width - this.xSize) / 2;
-        int j = (this.height - this.ySize) / 2;
+        final int i = (this.width - this.xSize) / 2;
+        final int j = (this.height - this.ySize) / 2;
        this.drawTexturedModalRect(i, j, 0, 0, this.xSize, this.inventoryRows * 18 + 17);
        this.drawTexturedModalRect(i, j + this.inventoryRows * 18 + 17, 0, 126, this.xSize, 96);


Assign this magic number 18 to a well-named constant, and use the constant instead.
Assign this magic number 17 to a well-named constant, and use the constant instead.
Assign this magic number 126 to a well-named constant, and use the constant instead.
Assign this magic number 96 to a well-named constant, and use the constant instead.

BuildTeamLinter · 2018-01-23T00:23:48Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

        this.inventoryRows = containerMinecoloniesBuildingInventory.getLowerChestInventory().getSizeInventory() / 9;
        this.ySize = 114 + this.inventoryRows * 18;
    }

    /**
     * Draw the foreground layer for the GuiContainer (everything in front of the items)
     */
-    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+    protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY)
    {
        this.fontRenderer.drawString(this.lowerChestInventory.getDisplayName().getUnformattedText(), 8, 6, 4210752);


Assign this magic number 8 to a well-named constant, and use the constant instead.
Assign this magic number 6 to a well-named constant, and use the constant instead.
Assign this magic number 4210752 to a well-named constant, and use the constant instead.
Add underscores to this numeric value for readability

BuildTeamLinter · 2018-01-23T00:23:48Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

        this.inventoryRows = containerMinecoloniesBuildingInventory.getLowerChestInventory().getSizeInventory() / 9;
        this.ySize = 114 + this.inventoryRows * 18;
    }

    /**
     * Draw the foreground layer for the GuiContainer (everything in front of the items)
     */
-    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY)
+    protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY)
    {
        this.fontRenderer.drawString(this.lowerChestInventory.getDisplayName().getUnformattedText(), 8, 6, 4210752);
        this.fontRenderer.drawString(this.upperChestInventory.getDisplayName().getUnformattedText(), 8, this.ySize - 96 + 2, 4210752);


Assign this magic number 8 to a well-named constant, and use the constant instead.
Assign this magic number 96 to a well-named constant, and use the constant instead.
Assign this magic number 4210752 to a well-named constant, and use the constant instead.
Add underscores to this numeric value for readability

BuildTeamLinter · 2018-01-23T00:23:49Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

@@ -27,16 +27,16 @@ public GuiMinecoloniesCitizenInventory(final ContainerMinecoloniesCitizenInvento
        this.upperChestInventory = containerMinecoloniesBuildingInventory.getPlayerInventory();
        this.lowerChestInventory = containerMinecoloniesBuildingInventory.getLowerChestInventory();
        this.allowUserInput = false;
-        int i = 222;
-        int j = 114;
+        final int i = 222;


Remove this unused "i" local variable.

Same as above comment

BuildTeamLinter · 2018-01-23T00:23:51Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

-        int i = 222;
-        int j = 114;
+        final int i = 222;
+        final int j = 114;


Remove this unused "j" local variable.

BuildTeamLinter · 2018-01-23T00:32:09Z

...in/java/com/minecolonies/coremod/colony/requestsystem/resolvers/DeliveryRequestResolver.java

@@ -90,7 +90,7 @@ public boolean canResolve(
            return null;


Return an empty collection instead of null.

Asherslab

Looks pretty good to me, will approve once i've got responses

Asherslab · 2018-01-23T01:27:36Z

src/main/java/com/minecolonies/coremod/colony/buildings/AbstractBuilding.java

@@ -1376,14 +1376,14 @@ private ItemStack forceItemStackToProvider(@NotNull final ICapabilityProvider pr
     */
    public void setMirror()
    {
-        this.isMirrored = !isMirrored;
+        this.isBuildingMirrored = !isBuildingMirrored;


shouldn't this method be invertMirror or something? or make it setMirror(final boolean isMirrored) ?

Good idea =)

Asherslab · 2018-01-23T01:30:07Z

...ies/coremod/colony/requestsystem/resolvers/factory/StandardPlayerRequestResolverFactory.java

@@ -51,11 +51,11 @@ public StandardPlayerRequestResolver getNewInstance(
                                                 @NotNull final Object... context)
      throws IllegalArgumentException
    {
-        ILocation location;
+        final ILocation location;
        try {


Asherslab · 2018-01-23T01:30:21Z

...ies/coremod/colony/requestsystem/resolvers/factory/StandardPlayerRequestResolverFactory.java

        try {
            location =
            factoryController.getNewInstance(TypeConstants.ILOCATION, iRequestManager.getColony().getCenter(), iRequestManager.getColony().getWorld().provider.getDimension());
-        } catch (Exception ex)
+        } catch (final Exception ex)


Asherslab · 2018-01-23T01:32:24Z

src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIBasic.java

@@ -473,7 +473,7 @@ private AIState lookForRequests()
            final ImmutableList<IRequest> completedRequests = getOwnBuilding().getCompletedRequests(worker.getCitizenData());

            completedRequests.stream().filter(r -> !(r.canBeDelivered())).forEach(r -> getOwnBuilding().markRequestAsAccepted(worker.getCitizenData(), r.getToken()));
-            IRequest firstDeliverableRequest = completedRequests.stream().filter(r -> r.canBeDelivered()).findFirst().orElse(null);
+            final IRequest firstDeliverableRequest = completedRequests.stream().filter(r -> r.canBeDelivered()).findFirst().orElse(null);


can we set the sonar.java.source please? @OrionDevelopment

Asherslab · 2018-01-23T01:33:50Z

src/main/java/com/minecolonies/coremod/entity/ai/basic/AbstractEntityAIBasic.java

-        }
-        return false;
+        return InventoryUtils.transferXOfFirstSlotInProviderWithIntoNextFreeSlotInItemHandler(
+                (ICapabilityProvider) world.getTileEntity(pos),


How are we guaranteeing that we can convert these two? (are tile entities always ICapabilityProviders?)

Asherslab · 2018-01-23T01:35:17Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesBuildingInventory.java

@@ -27,16 +27,16 @@ public GuiMinecoloniesBuildingInventory(final ContainerMinecoloniesBuildingInven
        this.upperChestInventory = containerMinecoloniesBuildingInventory.getPlayerInventory();
        this.lowerChestInventory = containerMinecoloniesBuildingInventory.getLowerChestInventory();
        this.allowUserInput = false;
-        int i = 222;
-        int j = 114;
+        final int i = 222;


if we aren't removing them could we name them better ( including the j variable)

Asherslab · 2018-01-23T01:35:44Z

src/main/java/com/minecolonies/coremod/inventory/GuiMinecoloniesCitizenInventory.java

@@ -27,16 +27,16 @@ public GuiMinecoloniesCitizenInventory(final ContainerMinecoloniesCitizenInvento
        this.upperChestInventory = containerMinecoloniesBuildingInventory.getPlayerInventory();
        this.lowerChestInventory = containerMinecoloniesBuildingInventory.getLowerChestInventory();
        this.allowUserInput = false;
-        int i = 222;
-        int j = 114;
+        final int i = 222;


Same as above comment

Raycoms · 2018-01-23T10:42:28Z

The rest of the issues are for another day =D

…

On Jan 22, 2018 11:38 PM, "Asherslab" ***@***.***> wrote: ***@***.**** commented on this pull request. Looks pretty good to me, will approve once i've got responses ------------------------------ In src/main/java/com/minecolonies/coremod/colony/ buildings/AbstractBuilding.java <#2078 (comment)> : > @@ -1376,14 +1376,14 @@ private ItemStack ***@***.*** final ICapabilityProvider pr */ public void setMirror() { - this.isMirrored = !isMirrored; + this.isBuildingMirrored = !isBuildingMirrored; shouldn't this method be invertMirror or something? or make it setMirror(final boolean isMirrored) ? ------------------------------ In src/main/java/com/minecolonies/coremod/colony/requestsystem/resolvers/ factory/StandardPlayerRequestResolverFactory.java <#2078 (comment)> : > @@ -51,11 +51,11 @@ public StandardPlayerRequestResolver getNewInstance( @NotNull final Object... context) throws IllegalArgumentException { - ILocation location; + final ILocation location; try { Agreed XD ------------------------------ In src/main/java/com/minecolonies/coremod/colony/requestsystem/resolvers/ factory/StandardPlayerRequestResolverFactory.java <#2078 (comment)> : > try { location = factoryController.getNewInstance(TypeConstants.ILOCATION, iRequestManager.getColony().getCenter(), iRequestManager.getColony().getWorld().provider.getDimension()); - } catch (Exception ex) + } catch (final Exception ex) Please ------------------------------ In src/main/java/com/minecolonies/coremod/entity/ai/basic/ AbstractEntityAIBasic.java <#2078 (comment)> : > @@ -473,7 +473,7 @@ private AIState lookForRequests() final ImmutableList<IRequest> completedRequests = getOwnBuilding().getCompletedRequests(worker.getCitizenData()); completedRequests.stream().filter(r -> !(r.canBeDelivered())).forEach(r -> getOwnBuilding().markRequestAsAccepted(worker.getCitizenData(), r.getToken())); - IRequest firstDeliverableRequest = completedRequests.stream().filter(r -> r.canBeDelivered()).findFirst().orElse(null); + final IRequest firstDeliverableRequest = completedRequests.stream().filter(r -> r.canBeDelivered()).findFirst().orElse(null); can we set the sonar.java.source please? @OrionDevelopment <https://github.com/oriondevelopment> ------------------------------ In src/main/java/com/minecolonies/coremod/entity/ai/basic/ AbstractEntityAIBasic.java <#2078 (comment)> : > @@ -1240,15 +1240,10 @@ public boolean ***@***.*** final ItemStack */ public boolean tryTransferFromPosToWorker(final BlockPos pos, @NotNull final Predicate<ItemStack> predicate) { - final TileEntity entity = world.getTileEntity(pos); - if (entity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.DOWN)) - { - return InventoryUtils.transferXOfFirstSlotInItemHandlerWithIntoNextFreeSlotInItemHandler( - new InvWrapper((IInventory) entity), - predicate, - Constants.STACKSIZE, - new InvWrapper(worker.getInventoryCitizen())); - } - return false; + return InventoryUtils.transferXOfFirstSlotInProviderWithIntoNextFreeSlotInItemHandler( + (ICapabilityProvider) world.getTileEntity(pos), How are we guaranteeing that we can convert these two? (are tile entities always ICapabilityProviders?) ------------------------------ In src/main/java/com/minecolonies/coremod/inventory/ GuiMinecoloniesBuildingInventory.java <#2078 (comment)> : > @@ -27,16 +27,16 @@ public GuiMinecoloniesBuildingInventory(final ContainerMinecoloniesBuildingInven this.upperChestInventory = containerMinecoloniesBuildingInventory.getPlayerInventory(); this.lowerChestInventory = containerMinecoloniesBuildingInventory.getLowerChestInventory(); this.allowUserInput = false; - int i = 222; - int j = 114; + final int i = 222; if we aren't removing them could we name them better ( including the j variable) ------------------------------ In src/main/java/com/minecolonies/coremod/inventory/ GuiMinecoloniesCitizenInventory.java <#2078 (comment)> : > @@ -27,16 +27,16 @@ public GuiMinecoloniesCitizenInventory(final ContainerMinecoloniesCitizenInvento this.upperChestInventory = containerMinecoloniesBuildingInventory.getPlayerInventory(); this.lowerChestInventory = containerMinecoloniesBuildingInventory.getLowerChestInventory(); this.allowUserInput = false; - int i = 222; - int j = 114; + final int i = 222; Same as above comment — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#2078 (review)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AGI9y0m9shP4uGgCugfxlBOmgoL2Jt85ks5tNTgGgaJpZM4Ro1nQ> .

BuildTeamLinter · 2018-01-23T12:10:18Z

...in/java/com/minecolonies/coremod/colony/requestsystem/resolvers/DeliveryRequestResolver.java

@@ -90,7 +90,7 @@ public boolean canResolve(
            return null;


Return an empty collection instead of null.

BuildTeamLinter · 2018-01-23T12:10:20Z

SonarQube analysis reported 342 issues

25 critical
184 major
113 minor
20 info

Watch the comments in this conversation to review them.

Top 10 extra issues

Note: The following issues were found on lines that were not modified in the pull request. Because these issues can't be reported as line comments, they are summarized here:

BlockConstructionTape.java#L360: Reduce the number of conditional operators (7) used in the expression (maximum allowed 6).
CitizenData.java#L190: Use already-defined constant 'TAG_SKILLS' instead of duplicating its value here.
CitizenData.java#L191: Use already-defined constant 'TAG_SKILL_STRENGTH' instead of duplicating its value here.
CitizenData.java#L192: Use already-defined constant 'TAG_SKILL_STAMINA' instead of duplicating its value here.
CitizenData.java#L193: Use already-defined constant 'TAG_SKILL_SPEED' instead of duplicating its value here.
CitizenData.java#L194: Use already-defined constant 'TAG_SKILL_INTELLIGENCE' instead of duplicating its value here.
CitizenData.java#L195: Use already-defined constant 'TAG_SKILL_DEXTERITY' instead of duplicating its value here.
ColonyManager.java#L733: Refactor this code to not nest more than 5 if/for/while/switch/try statements.
AbstractBuilding.java#L1448: Remove usage of generic wildcard type.
AbstractBuilding.java#L1477: Remove usage of generic wildcard type.

* Fixes one exception Code cleanup

* Style/codacity style fixes (#2078) * Fixes one exception Code cleanup * fix 1.10 related things

Raycoms added 3 commits January 22, 2018 23:52

Fix codacity style issues

3437d5f

fix it

2893717

java compile problem

c1933d3

BuildTeamLinter reviewed Jan 23, 2018

View reviewed changes

add finals

e8b8843

BuildTeamLinter reviewed Jan 23, 2018

View reviewed changes

fix codacity

c1b5f53

ldtteam deleted a comment Jan 23, 2018

BuildTeamLinter reviewed Jan 23, 2018

View reviewed changes

Asherslab reviewed Jan 23, 2018

View reviewed changes

adapt name

0751b81

ldtteam deleted a comment Jan 23, 2018

BuildTeamLinter reviewed Jan 23, 2018

View reviewed changes

marchermans approved these changes Jan 23, 2018

View reviewed changes

Raycoms merged commit 3b66f10 into version/1.12 Jan 23, 2018

Raycoms deleted the style/codacity-style-fixes branch January 23, 2018 12:46

Raycoms added a commit that referenced this pull request Jan 23, 2018

Style/codacity style fixes (#2078)

3388af7

* Fixes one exception Code cleanup

Raycoms added a commit that referenced this pull request Jan 23, 2018

Style/codacity style fixes (#2078)

931693e

* Fixes one exception Code cleanup

Raycoms added a commit that referenced this pull request Jan 23, 2018

Style/codacity style fixes (#2078) (#2081)

1cf5bdb

* Fixes one exception Code cleanup

Raycoms added a commit that referenced this pull request Jan 23, 2018

Port1.10/styles (#2080)

7faa028

* Style/codacity style fixes (#2078) * Fixes one exception Code cleanup * fix 1.10 related things

		@@ -400,7 +400,7 @@ public BuildingWareHouse getWareHouse()
		*/
		private AIState deliver()

		@@ -296,7 +297,7 @@ private static StructureWrapper loadStructure(
		*/
		public Structure(final World targetWorld, final StructureWrapper structure, final Stage stageProgress)

		@@ -310,7 +310,7 @@ public String getJobName()
		public void serializeToView(@NotNull final ByteBuf buf)

		@@ -51,11 +51,11 @@ public StandardPlayerRequestResolver getNewInstance(
		@NotNull final Object... context)
		throws IllegalArgumentException

		@@ -332,7 +332,7 @@ public ColonyView getColony()
		public <R> ImmutableList<IRequest<? extends R>> getOpenRequestsOfTypeFiltered(

		@@ -91,15 +91,15 @@ public void resolve(@NotNull final IRequestManager manager, @NotNull final IRequ
		((BuildingBasedRequester) request.getRequester()).getBuilding().isPresent() &&
		((BuildingBasedRequester) request.getRequester()).getBuilding().get() instanceof AbstractBuilding)

		@@ -96,9 +96,9 @@ public boolean canResolve(
		public void resolve(
		@NotNull final IRequestManager manager, @NotNull final IRequest<? extends IDeliverable> request) throws RuntimeException

		@@ -116,7 +116,7 @@ public void resolve(
		private AbstractBuilding getBuildingFromRequest(
		@NotNull final IRequestManager manager, @NotNull final IRequest<? extends IDeliverable> request) throws RuntimeException

		@@ -76,10 +76,10 @@ public boolean canResolve(@NotNull final IRequestManager manager, final IRequest
		return null;

Style/codacity style fixes #2078

Style/codacity style fixes #2078

Conversation

Raycoms commented Jan 22, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Asherslab left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Raycoms commented Jan 23, 2018 via email

Choose a reason for hiding this comment

BuildTeamLinter commented Jan 23, 2018

Top 10 extra issues