Skip to content

Commit 42870d3

Browse files
committed
Some fixes to c421d72
Checkstyle fixes.
1 parent 55f7888 commit 42870d3

23 files changed

+22
-35
lines changed

config/checkstyle/suppressions.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
<suppressions>
77
<suppress checks="." files="org[\\/]terasology[\\/]protobuf[\\/].*"/>
88
<suppress checks="MethodNameCheck" files="org[\\/]terasology[\\/]engine[\\/]paths[\\/]windows.*"/>
9+
<suppress checks="ParameterAssignment" files="org[\\/]terasology[\\/]math[\\/]TeraMath"/>
910
</suppressions>

src/main/java/org/terasology/engine/GameThread.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public final class GameThread {
3737
private static Thread gameThread;
3838
private static BlockingDeque<Runnable> pendingRunnables = Queues.newLinkedBlockingDeque();
3939

40+
private GameThread() {
41+
}
42+
4043
/**
4144
* @return Whether the currentThread is the gameThread.
4245
*/

src/main/java/org/terasology/math/MatrixUtils.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
*/
3131
public final class MatrixUtils {
3232

33+
private MatrixUtils() {
34+
}
35+
3336
/**
3437
* Copies the given matrix into a newly allocated FloatBuffer.
3538
* The order of the elements is column major (as used by OpenGL).

src/main/java/org/terasology/math/Rect2i.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717

1818
import com.google.common.collect.Lists;
1919

20-
import java.util.ArrayList;
2120
import java.util.List;
2221
import java.util.Objects;
2322

2423
/**
2524
* 2D Rectangle
2625
*/
2726
// TODO: Review and bring into line with Region3i's api
28-
public class Rect2i {
27+
public final class Rect2i {
2928
public static final Rect2i EMPTY = new Rect2i();
3029

3130
// position
@@ -184,6 +183,7 @@ public String toString() {
184183

185184
/**
186185
* Returns the difference between a and b - that is all parts of a that are not contained by b.
186+
*
187187
* @param a
188188
* @param b
189189
* @return A collection of rectangles that compose the difference of a - b. May be empty if a is completely encompassed by b.

src/main/java/org/terasology/math/Region3i.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*
2525
* @author Immortius
2626
*/
27-
public class Region3i implements Iterable<Vector3i> {
27+
public final class Region3i implements Iterable<Vector3i> {
2828
public static final Region3i EMPTY = new Region3i();
2929

3030
private final Vector3i min = new Vector3i();

src/main/java/org/terasology/math/TeraMath.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public static int pow(int base, int exp) {
163163
if (exp <= 0) {
164164
// x^0 and 1/(1^x) for any x are the only cases where an integer could represent a non-zero value
165165
// 0^0 is an indetermination, but Integers provides no means to represent it
166-
if (exp == 0) {
166+
if (exp == 0 || base == 1) {
167167
return 1;
168168
}
169169
return 0;
@@ -395,7 +395,8 @@ public static int calcChunkPosY(int y) {
395395
* @return The Y-coordinate of the chunk
396396
*/
397397
public static int calcChunkPosY(int y, int chunkPowerY) {
398-
return 0;//(y >> chunkPowerY);
398+
return 0;
399+
//return (y >> chunkPowerY);
399400
}
400401

401402
/**

src/main/java/org/terasology/monitoring/gui/ChunkMonitorDisplay.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import java.awt.event.MouseWheelEvent;
4444
import java.awt.event.MouseWheelListener;
4545
import java.awt.image.BufferedImage;
46-
import java.util.HashMap;
4746
import java.util.LinkedList;
4847
import java.util.List;
4948
import java.util.Map;

src/main/java/org/terasology/rendering/assets/font/Font.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.terasology.asset.Asset;
2020
import org.terasology.rendering.assets.material.Material;
2121
import org.terasology.rendering.assets.mesh.Mesh;
22-
import org.terasology.rendering.nui.Color;
2322
import org.terasology.rendering.nui.HorizontalAlignment;
2423

2524
import java.util.List;

src/main/java/org/terasology/rendering/assets/font/FontDataBuilder.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,7 @@
1818
import com.google.common.collect.Maps;
1919
import gnu.trove.map.TIntObjectMap;
2020
import gnu.trove.map.hash.TIntObjectHashMap;
21-
import org.terasology.asset.AssetType;
22-
import org.terasology.asset.AssetUri;
23-
import org.terasology.asset.Assets;
24-
import org.terasology.engine.Terasology;
25-
import org.terasology.engine.TerasologyConstants;
26-
import org.terasology.persistence.ModuleContext;
2721
import org.terasology.rendering.assets.material.Material;
28-
import org.terasology.rendering.assets.material.MaterialData;
2922
import org.terasology.rendering.assets.texture.Texture;
3023

3124
import java.util.Map;

src/main/java/org/terasology/rendering/assets/font/FontLoader.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import org.terasology.asset.AssetType;
2121
import org.terasology.asset.AssetUri;
2222
import org.terasology.asset.Assets;
23-
import org.terasology.engine.TerasologyConstants;
2423
import org.terasology.engine.module.Module;
25-
import org.terasology.persistence.ModuleContext;
2624
import org.terasology.rendering.assets.material.Material;
2725
import org.terasology.rendering.assets.material.MaterialData;
2826
import org.terasology.rendering.assets.texture.Texture;

0 commit comments

Comments
 (0)