refactor: address IntelliJ QAPlug plugin findings

engine/src/main/java/org/terasology/engine/config/flexible/ui/ColorConstraintWidgetFactory.java

@@ -81,7 +81,6 @@ private float findClosestIndex(Color color) {
 
     private Color findClosestColor(float findex) {
         int index = DoubleMath.roundToInt(findex * (double) (colors.size() - 1), RoundingMode.HALF_UP);
-        Color color = colors.get(index);
-        return color;
+        return colors.get(index);
     }
 }

engine/src/main/java/org/terasology/engine/input/lwjgl/LwjglMouseDevice.java

@@ -77,8 +77,7 @@ public Vector2i getPosition() {
 
     @Override
     public Vector2d getDelta() {
-        Vector2d result = new Vector2d(xposDelta, yposDelta);
-        return result;
+        return new Vector2d(xposDelta, yposDelta);
     }
 
     @Override

engine/src/main/java/org/terasology/engine/logic/behavior/actions/conditions/GuardAction.java

@@ -27,9 +27,7 @@ public class GuardAction extends ConditionAction {
     public boolean prune(Actor actor) {
 
         try {
-            boolean condition = condition(actor);
-
-            return !condition;
+            return !condition(actor);
         } catch (ClassNotFoundException e) {
             logger.error("Class not found. Does the Component specified exist?", e);
         } catch (NoSuchFieldException e) {

engine/src/main/java/org/terasology/engine/logic/behavior/core/Actor.java

@@ -73,8 +73,7 @@ public void setDelta(float delta) {
      * @return The component of the actors minion or null if the minion has no such component.
      */
     public <T extends Component> T getComponent(Class<T> type) {
-        T component = entity.getComponent(type);
-        return component;
+        return entity.getComponent(type);
     }
 
     public Object getComponentField(ComponentFieldUri uri) {

engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java

@@ -120,23 +120,20 @@ public String getInstigatorName(EntityRef instigator) {
         if (instigator.hasComponent(CharacterComponent.class)) {
             EntityRef instigatorClient = instigator.getComponent(CharacterComponent.class).controller;
             EntityRef instigatorClientInfo = instigatorClient.getComponent(ClientComponent.class).clientInfo;
-            DisplayNameComponent displayNameComponent = instigatorClientInfo.getComponent(DisplayNameComponent.class);
-            return displayNameComponent.name;
+            return instigatorClientInfo.getComponent(DisplayNameComponent.class).name;
         } else if (instigator.getParentPrefab() != null) {
             //A DisplayName can be specified in the entity prefab
             //Otherwise, the game will attempt to generate one from the name of that prefab
             Prefab parentPrefab = instigator.getParentPrefab();
             if (parentPrefab.hasComponent(DisplayNameComponent.class)) {
-                DisplayNameComponent displayNameComponent = parentPrefab.getComponent(DisplayNameComponent.class);
-                return displayNameComponent.name;
+                return parentPrefab.getComponent(DisplayNameComponent.class).name;
             } else {
                 String instigatorName = parentPrefab.getName();
                 //getParentPrefab.getName() returns a ResourceUrn String such as "engine:player"
                 //The following calls change the damage type to be more readable
                 //For instance, "engine:player" becomes "Player"
                 instigatorName = instigatorName.replaceAll(".*:(.*)", "$1");
-                instigatorName = Character.toUpperCase(instigatorName.charAt(0)) + instigatorName.substring(1);
-                return instigatorName;
+                return Character.toUpperCase(instigatorName.charAt(0)) + instigatorName.substring(1);
             }
         } else {
             return null;
@@ -155,8 +152,7 @@ public String getDamageTypeName(Prefab damageType) {
         //A DisplayName can be specified in the damage type prefab
         //Otherwise, the game will attempt to generate one from the name of that prefab
         if (damageType.hasComponent(DisplayNameComponent.class)) {
-            DisplayNameComponent displayNameComponent = damageType.getComponent(DisplayNameComponent.class);
-            return displayNameComponent.name;
+            return damageType.getComponent(DisplayNameComponent.class).name;
         } else {
             logger.info(String.format("%s is missing a readable DisplayName", damageType.getName()));
             String damageTypeName = damageType.getName();

engine/src/main/java/org/terasology/engine/logic/characters/GazeAuthoritySystem.java

@@ -48,8 +48,7 @@ public void ensureGazeContainerEntitiesCreated(OnActivatedComponent event, Entit
 
     private EntityRef createGazeEntity() {
         EntityBuilder gazeContainerBuilder = entityManager.newBuilder("engine:gaze");
-        EntityRef gazeEntity = gazeContainerBuilder.build();
-        return gazeEntity;
+        return gazeContainerBuilder.build();
     }
 
     @Priority(EventPriority.PRIORITY_LOW)

engine/src/main/java/org/terasology/engine/logic/console/ConsoleImpl.java

@@ -327,9 +327,7 @@ public List<String> processParameters(String rawCommand) {
         String parameterPart = cleanedCommand.substring(commandEndIndex).trim();
 
         //get the parameters
-        List<String> params = splitParameters(parameterPart);
-
-        return params;
+        return splitParameters(parameterPart);
     }
 
     private static List<String> splitParameters(String paramStr) {

engine/src/main/java/org/terasology/engine/network/PingService.java

@@ -36,8 +36,7 @@ public Long call() throws IOException {
             // root privileges under some operating systems
             sock.connect(endpoint, timeout);
             Instant end = Instant.now();
-            long millis = Duration.between(start, end).toMillis();
-            return millis;
+            return Duration.between(start, end).toMillis();
         }
     }
 }

engine/src/main/java/org/terasology/engine/recording/EventCopier.java

@@ -89,8 +89,7 @@ public Event copyEvent(Event toBeCopied) {
             return newEvent;
         } else if (toBeCopied instanceof AttackEvent) {
             AttackEvent originalEvent = (AttackEvent) toBeCopied;
-            AttackEvent  newEvent = new AttackEvent(originalEvent.getInstigator(), originalEvent.getDirectCause());
-            return newEvent;
+            return new AttackEvent(originalEvent.getInstigator(), originalEvent.getDirectCause());
         } else {
             return null;
         }

engine/src/main/java/org/terasology/engine/rendering/animation/Animation.java

@@ -63,8 +63,7 @@ private Animation(Animator animator, float duration, RepeatMode repeatMode, Time
      * @return the animation
      */
     public static Animation once(Animator animator, float duration, TimeModifier timeModifier) {
-        Animation anim = new Animation(animator, duration, RepeatMode.RUN_ONCE, timeModifier);
-        return anim;
+        return new Animation(animator, duration, RepeatMode.RUN_ONCE, timeModifier);
     }
 
     /**
@@ -75,8 +74,7 @@ public static Animation once(Animator animator, float duration, TimeModifier tim
      * @return the animation
      */
     public static Animation infinite(Animator animator, float duration, TimeModifier timeModifier) {
-        Animation anim = new Animation(animator, duration, RepeatMode.REPEAT_INFINITE, timeModifier);
-        return anim;
+        return new Animation(animator, duration, RepeatMode.REPEAT_INFINITE, timeModifier);
     }
 
     /**

engine/src/main/java/org/terasology/engine/rendering/nui/BaseInteractionScreen.java

@@ -18,9 +18,7 @@ public abstract class BaseInteractionScreen extends CoreScreenLayer {
 
     protected EntityRef getInteractionTarget() {
         EntityRef characterEntity = localPlayer.getCharacterEntity();
-        CharacterComponent characterComponent = characterEntity.getComponent(CharacterComponent.class);
-
-        return characterComponent.predictedInteractionTarget;
+        return characterEntity.getComponent(CharacterComponent.class).predictedInteractionTarget;
     }
 
     @Override

engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/JoinGameScreen.java

@@ -191,8 +191,7 @@ public boolean isLowerLayerVisible() {
 
     private void join(final String address, final int port) {
         Callable<JoinStatus> operation = () -> {
-            JoinStatus joinStatus = networkSystem.join(address, port);
-            return joinStatus;
+            return networkSystem.join(address, port);
         };
 
         final WaitPopup<JoinStatus> popup = getManager().pushScreen(WaitPopup.ASSET_URI, WaitPopup.class);

engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/UnorderedListDecorator.java

@@ -23,9 +23,8 @@ public class UnorderedListDecorator implements ListDecorator {
 
     @Override
     public ParagraphData wrapParagraph(ParagraphData paragraphData) {
-        DefaultParagraphData defaultParagraphData = new DefaultParagraphData(paragraphData.getParagraphRenderStyle(),
+        return new DefaultParagraphData(paragraphData.getParagraphRenderStyle(),
                 new UnorderedListParagraphRenderable(paragraphData));
-        return defaultParagraphData;
     }
 
     private int getMaxIndent(Font font) {

engine/src/main/java/org/terasology/engine/world/generation/WorldBuilder.java

@@ -413,7 +413,6 @@ public FacetedWorldConfigurator createConfigurator() {
                 configurables.add((ConfigurableFacetProvider) facetProvider);
             }
         }
-        FacetedWorldConfigurator worldConfigurator = new FacetedWorldConfigurator(configurables);
-        return worldConfigurator;
+        return new FacetedWorldConfigurator(configurables);
     }
 }

engine/src/main/java/org/terasology/engine/world/viewer/color/ColorBlenderArgb.java

@@ -41,7 +41,6 @@ public int blend(int src, int dst) {
         int mg = (a * sg + (0xFF - a) * dg) / 0xFF;
         int mr = (a * sr + (0xFF - a) * dr) / 0xFF;
 
-        int mix = 0xFF000000 | mb | (mg << 8) | (mr << 16);
-        return mix;
+        return 0xFF000000 | mb | (mg << 8) | (mr << 16);
     }
 }

engine/src/main/java/org/terasology/engine/world/viewer/color/ColorBlenderRgba.java

@@ -46,7 +46,6 @@ public int blend(int src, int dst) {
         int mg = (a * sg + (0xFF - a) * dg) / 0xFF;
         int mr = (a * sr + (0xFF - a) * dr) / 0xFF;
 
-        int mix = (mb << 8) | (mg << 16) | (mr << 24) | 0xFF;
-        return mix;
+        return (mb << 8) | (mg << 16) | (mr << 24) | 0xFF;
     }
 }