diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml index 74a8b6dcaf2..c2898ccdc20 100644 --- a/config/checkstyle/suppressions.xml +++ b/config/checkstyle/suppressions.xml @@ -6,4 +6,5 @@ + \ No newline at end of file diff --git a/src/main/java/org/terasology/engine/GameThread.java b/src/main/java/org/terasology/engine/GameThread.java index 864e54df83a..f2a300ee5b7 100644 --- a/src/main/java/org/terasology/engine/GameThread.java +++ b/src/main/java/org/terasology/engine/GameThread.java @@ -37,6 +37,9 @@ public final class GameThread { private static Thread gameThread; private static BlockingDeque pendingRunnables = Queues.newLinkedBlockingDeque(); + private GameThread() { + } + /** * @return Whether the currentThread is the gameThread. */ diff --git a/src/main/java/org/terasology/math/MatrixUtils.java b/src/main/java/org/terasology/math/MatrixUtils.java index 0e96ee1faac..b4555edf260 100755 --- a/src/main/java/org/terasology/math/MatrixUtils.java +++ b/src/main/java/org/terasology/math/MatrixUtils.java @@ -30,6 +30,9 @@ */ public final class MatrixUtils { + private MatrixUtils() { + } + /** * Copies the given matrix into a newly allocated FloatBuffer. * The order of the elements is column major (as used by OpenGL). diff --git a/src/main/java/org/terasology/math/Rect2i.java b/src/main/java/org/terasology/math/Rect2i.java index 95a5f9b379d..96a8b5b208e 100644 --- a/src/main/java/org/terasology/math/Rect2i.java +++ b/src/main/java/org/terasology/math/Rect2i.java @@ -17,7 +17,6 @@ import com.google.common.collect.Lists; -import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -25,7 +24,7 @@ * 2D Rectangle */ // TODO: Review and bring into line with Region3i's api -public class Rect2i { +public final class Rect2i { public static final Rect2i EMPTY = new Rect2i(); // position @@ -184,6 +183,7 @@ public String toString() { /** * Returns the difference between a and b - that is all parts of a that are not contained by b. + * * @param a * @param b * @return A collection of rectangles that compose the difference of a - b. May be empty if a is completely encompassed by b. diff --git a/src/main/java/org/terasology/math/Region3i.java b/src/main/java/org/terasology/math/Region3i.java index f73cb8ad77d..39f7fbdbe42 100644 --- a/src/main/java/org/terasology/math/Region3i.java +++ b/src/main/java/org/terasology/math/Region3i.java @@ -24,7 +24,7 @@ * * @author Immortius */ -public class Region3i implements Iterable { +public final class Region3i implements Iterable { public static final Region3i EMPTY = new Region3i(); private final Vector3i min = new Vector3i(); diff --git a/src/main/java/org/terasology/math/TeraMath.java b/src/main/java/org/terasology/math/TeraMath.java index 3e047eddc8e..3bc01705918 100644 --- a/src/main/java/org/terasology/math/TeraMath.java +++ b/src/main/java/org/terasology/math/TeraMath.java @@ -163,7 +163,7 @@ public static int pow(int base, int exp) { if (exp <= 0) { // x^0 and 1/(1^x) for any x are the only cases where an integer could represent a non-zero value // 0^0 is an indetermination, but Integers provides no means to represent it - if (exp == 0) { + if (exp == 0 || base == 1) { return 1; } return 0; @@ -395,7 +395,8 @@ public static int calcChunkPosY(int y) { * @return The Y-coordinate of the chunk */ public static int calcChunkPosY(int y, int chunkPowerY) { - return 0;//(y >> chunkPowerY); + return 0; + //return (y >> chunkPowerY); } /** diff --git a/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java b/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java index bb522b47b50..281ecaf242b 100644 --- a/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java +++ b/src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java @@ -43,7 +43,6 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import java.awt.image.BufferedImage; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/terasology/rendering/assets/font/Font.java b/src/main/java/org/terasology/rendering/assets/font/Font.java index e8e5d58e181..0edb085e5c4 100644 --- a/src/main/java/org/terasology/rendering/assets/font/Font.java +++ b/src/main/java/org/terasology/rendering/assets/font/Font.java @@ -19,7 +19,6 @@ import org.terasology.asset.Asset; import org.terasology.rendering.assets.material.Material; import org.terasology.rendering.assets.mesh.Mesh; -import org.terasology.rendering.nui.Color; import org.terasology.rendering.nui.HorizontalAlignment; import java.util.List; diff --git a/src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java b/src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java index 493465bf463..ca5dd3bff4a 100644 --- a/src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java +++ b/src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java @@ -18,14 +18,7 @@ import com.google.common.collect.Maps; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.TIntObjectHashMap; -import org.terasology.asset.AssetType; -import org.terasology.asset.AssetUri; -import org.terasology.asset.Assets; -import org.terasology.engine.Terasology; -import org.terasology.engine.TerasologyConstants; -import org.terasology.persistence.ModuleContext; import org.terasology.rendering.assets.material.Material; -import org.terasology.rendering.assets.material.MaterialData; import org.terasology.rendering.assets.texture.Texture; import java.util.Map; diff --git a/src/main/java/org/terasology/rendering/assets/font/FontLoader.java b/src/main/java/org/terasology/rendering/assets/font/FontLoader.java index 997d064ae67..deff109ebdb 100644 --- a/src/main/java/org/terasology/rendering/assets/font/FontLoader.java +++ b/src/main/java/org/terasology/rendering/assets/font/FontLoader.java @@ -20,9 +20,7 @@ import org.terasology.asset.AssetType; import org.terasology.asset.AssetUri; import org.terasology.asset.Assets; -import org.terasology.engine.TerasologyConstants; import org.terasology.engine.module.Module; -import org.terasology.persistence.ModuleContext; import org.terasology.rendering.assets.material.Material; import org.terasology.rendering.assets.material.MaterialData; import org.terasology.rendering.assets.texture.Texture; diff --git a/src/main/java/org/terasology/rendering/cameras/Camera.java b/src/main/java/org/terasology/rendering/cameras/Camera.java index 10764bcfeae..8f7c73d6129 100644 --- a/src/main/java/org/terasology/rendering/cameras/Camera.java +++ b/src/main/java/org/terasology/rendering/cameras/Camera.java @@ -18,7 +18,6 @@ import org.terasology.config.Config; import org.terasology.engine.CoreRegistry; import org.terasology.math.MatrixUtils; -import org.terasology.math.TeraMath; import javax.vecmath.Matrix4f; import javax.vecmath.Vector3f; diff --git a/src/main/java/org/terasology/rendering/cameras/OculusStereoCamera.java b/src/main/java/org/terasology/rendering/cameras/OculusStereoCamera.java index 708efdfd976..6705574076d 100644 --- a/src/main/java/org/terasology/rendering/cameras/OculusStereoCamera.java +++ b/src/main/java/org/terasology/rendering/cameras/OculusStereoCamera.java @@ -18,7 +18,6 @@ import org.lwjgl.opengl.GL11; import org.terasology.engine.CoreRegistry; import org.terasology.math.MatrixUtils; -import org.terasology.math.TeraMath; import org.terasology.rendering.oculusVr.OculusVrHelper; import org.terasology.rendering.world.WorldRenderer; diff --git a/src/main/java/org/terasology/rendering/cameras/OrthographicCamera.java b/src/main/java/org/terasology/rendering/cameras/OrthographicCamera.java index 8666e7ce01c..fce383219ed 100644 --- a/src/main/java/org/terasology/rendering/cameras/OrthographicCamera.java +++ b/src/main/java/org/terasology/rendering/cameras/OrthographicCamera.java @@ -17,7 +17,6 @@ import org.lwjgl.opengl.GL11; import org.terasology.math.MatrixUtils; -import org.terasology.math.TeraMath; import static org.lwjgl.opengl.GL11.GL_PROJECTION; import static org.lwjgl.opengl.GL11.glMatrixMode; diff --git a/src/main/java/org/terasology/rendering/cameras/PerspectiveCamera.java b/src/main/java/org/terasology/rendering/cameras/PerspectiveCamera.java index 66e008ace55..7d07e686a49 100644 --- a/src/main/java/org/terasology/rendering/cameras/PerspectiveCamera.java +++ b/src/main/java/org/terasology/rendering/cameras/PerspectiveCamera.java @@ -1,4 +1,3 @@ - /* * Copyright 2013 MovingBlocks * diff --git a/src/main/java/org/terasology/rendering/gui/windows/UINUITest.java b/src/main/java/org/terasology/rendering/gui/windows/UINUITest.java index 78116fce9ed..2c64fb872c1 100644 --- a/src/main/java/org/terasology/rendering/gui/windows/UINUITest.java +++ b/src/main/java/org/terasology/rendering/gui/windows/UINUITest.java @@ -24,9 +24,6 @@ import org.terasology.rendering.nui.HorizontalAlignment; import org.terasology.rendering.nui.LwjglCanvas; import org.terasology.rendering.nui.ScaleMode; -import org.terasology.rendering.nui.SubRegion; - -import javax.vecmath.Vector2f; /** * @author Immortius diff --git a/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java b/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java index a92a516ddab..d016885cd2b 100644 --- a/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java +++ b/src/main/java/org/terasology/rendering/logic/SkeletonRenderer.java @@ -38,7 +38,6 @@ import org.terasology.logic.location.Location; import org.terasology.logic.location.LocationComponent; import org.terasology.math.MatrixUtils; -import org.terasology.math.TeraMath; import org.terasology.rendering.assets.animation.MeshAnimation; import org.terasology.rendering.assets.animation.MeshAnimationFrame; import org.terasology.rendering.assets.material.Material; diff --git a/src/main/java/org/terasology/rendering/nui/Canvas.java b/src/main/java/org/terasology/rendering/nui/Canvas.java index f2c6f1ed3dd..cbc96499d70 100644 --- a/src/main/java/org/terasology/rendering/nui/Canvas.java +++ b/src/main/java/org/terasology/rendering/nui/Canvas.java @@ -20,8 +20,6 @@ import org.terasology.rendering.assets.font.Font; import org.terasology.rendering.assets.texture.Texture; -import javax.vecmath.Vector2f; - /** * Canvas provides primitive drawing operations for use by the UI. * diff --git a/src/main/java/org/terasology/rendering/nui/LineBuilder.java b/src/main/java/org/terasology/rendering/nui/LineBuilder.java index 467e31cff75..35244729ffe 100644 --- a/src/main/java/org/terasology/rendering/nui/LineBuilder.java +++ b/src/main/java/org/terasology/rendering/nui/LineBuilder.java @@ -31,7 +31,7 @@ public class LineBuilder { private final int maxWidth; private List lines = Lists.newArrayList(); - private int currentLineLength = 0; + private int currentLineLength; private StringBuilder lineBuilder = new StringBuilder(); public LineBuilder(Font font, int maxWidth) { @@ -48,7 +48,8 @@ public static List getLines(Font font, String text, int maxWidth) { public void addText(String text) { List paragraphs = Arrays.asList(text.split("\\r?\\n")); - for (String remainder : paragraphs) { + for (String paragraph : paragraphs) { + String remainder = paragraph; while (!remainder.isEmpty()) { String[] split = remainder.split(" ", 2); String word = split[0]; diff --git a/src/main/java/org/terasology/rendering/nui/ScaleMode.java b/src/main/java/org/terasology/rendering/nui/ScaleMode.java index 84ff9dfee2b..fb8c9d4a6cd 100644 --- a/src/main/java/org/terasology/rendering/nui/ScaleMode.java +++ b/src/main/java/org/terasology/rendering/nui/ScaleMode.java @@ -16,7 +16,6 @@ package org.terasology.rendering.nui; import org.terasology.math.Rect2i; -import org.terasology.math.Vector2i; import javax.vecmath.Vector2f; diff --git a/src/main/java/org/terasology/rendering/opengl/GLSLMaterial.java b/src/main/java/org/terasology/rendering/opengl/GLSLMaterial.java index d8f836a953c..6cf703b6771 100644 --- a/src/main/java/org/terasology/rendering/opengl/GLSLMaterial.java +++ b/src/main/java/org/terasology/rendering/opengl/GLSLMaterial.java @@ -34,7 +34,6 @@ import org.terasology.asset.AssetUri; import org.terasology.engine.CoreRegistry; import org.terasology.math.MatrixUtils; -import org.terasology.math.TeraMath; import org.terasology.rendering.ShaderManager; import org.terasology.rendering.assets.material.Material; import org.terasology.rendering.assets.material.MaterialData; diff --git a/src/main/java/org/terasology/utilities/procedural/FastRandom.java b/src/main/java/org/terasology/utilities/procedural/FastRandom.java index d793dc810c0..ba889706a57 100644 --- a/src/main/java/org/terasology/utilities/procedural/FastRandom.java +++ b/src/main/java/org/terasology/utilities/procedural/FastRandom.java @@ -153,7 +153,7 @@ public boolean randomBoolean() { public String randomCharacterString(int length) { char[] randomChars = new char[length]; for (int i = 0; i < length; i++) { - randomChars[i] = VALID_CHARS[VALID_CHARS.length * TeraMath.fastAbs(randomDouble())]; + randomChars[i] = VALID_CHARS[randomInt(VALID_CHARS.length)]; } return new String(randomChars); } diff --git a/src/main/java/org/terasology/world/propagation/AbstractFullWorldView.java b/src/main/java/org/terasology/world/propagation/AbstractFullWorldView.java index 03764da5778..b9e67c2b1cc 100644 --- a/src/main/java/org/terasology/world/propagation/AbstractFullWorldView.java +++ b/src/main/java/org/terasology/world/propagation/AbstractFullWorldView.java @@ -18,12 +18,12 @@ import org.terasology.math.TeraMath; import org.terasology.math.Vector3i; import org.terasology.world.block.Block; -import org.terasology.world.block.BlockManager; import org.terasology.world.chunks.Chunk; import org.terasology.world.chunks.ChunkProvider; /** * A base world view implementation sitting on ChunkProvider. + * * @author Immortius */ public abstract class AbstractFullWorldView implements PropagatorWorldView { @@ -53,8 +53,9 @@ public byte getValueAt(Vector3i pos) { /** * Obtains the relevant value from the given chunk + * * @param chunk - * @param pos The internal position of the chunk to get the value from + * @param pos The internal position of the chunk to get the value from * @return The relevant value for this view */ protected abstract byte getValueAt(Chunk chunk, Vector3i pos); @@ -72,8 +73,9 @@ public void setValueAt(Vector3i pos, byte value) { /** * Sets the relevant value for the given chunk + * * @param chunk - * @param pos The internal position of the chunk to set the value of + * @param pos The internal position of the chunk to set the value of * @param value The new value */ protected abstract void setValueAt(Chunk chunk, Vector3i pos, byte value); diff --git a/src/main/java/org/terasology/world/propagation/BatchPropagator.java b/src/main/java/org/terasology/world/propagation/BatchPropagator.java index f4be5866e35..374fce75689 100644 --- a/src/main/java/org/terasology/world/propagation/BatchPropagator.java +++ b/src/main/java/org/terasology/world/propagation/BatchPropagator.java @@ -25,7 +25,6 @@ import org.terasology.world.chunks.Chunk; import java.util.Arrays; -import java.util.List; import java.util.Map; import java.util.Set;