[ci skip] spotlessApply with the new settings

1 files changed, 64 insertions, 59 deletions

diff --git a/src/main/java/bloodasp/galacticgreg/api/SpecialBlockComb.java b/src/main/java/bloodasp/galacticgreg/api/SpecialBlockComb.java
index 857e379629..d5f6feb1ca 100644
--- a/src/main/java/bloodasp/galacticgreg/api/SpecialBlockComb.java
+++ b/src/main/java/bloodasp/galacticgreg/api/SpecialBlockComb.java
@@ -1,66 +1,71 @@
 package bloodasp.galacticgreg.api;
 
-import bloodasp.galacticgreg.api.Enums.AllowedBlockPosition;
 import net.minecraft.block.Block;
 
+import bloodasp.galacticgreg.api.Enums.AllowedBlockPosition;
+
 public class SpecialBlockComb extends BlockMetaComb {
-	private AllowedBlockPosition _mBlockPosition;
-		
-	/** Creates a simple instance for a block that has a meta value and a block position it is allowed to spawn
-	 * @param pBlock The Block in question
-	 * @param pMeta The meta value of the block
-	 * @param pBlockPosition The position this block is allowed to generate
-	 */
-	public SpecialBlockComb(Block pBlock, int pMeta, AllowedBlockPosition pBlockPosition) {
-		super(pBlock, pMeta);
-		_mBlockPosition = pBlockPosition;
-	}
 
-	/** Creates a simple instance for a block that has no meta value but a position it is allowed to spawn
-	 * @param pBlock The Block in question. 0 is used as meta
-	 * @param pBlockPosition The position this block is allowed to generate
-	 */
-	public SpecialBlockComb(Block pBlock, AllowedBlockPosition pBlockPosition) {
-		super(pBlock, 0);
-		_mBlockPosition = pBlockPosition;
-	}
-	
-	/** Creates a simple instance for a block that has no meta value and is allowed to spawn everywhere
-	 * @param pBlock The Block in question. 0 is used as meta, and "CoreAndShell" is used as position
-	 */
-	public SpecialBlockComb(Block pBlock) {
-		super(pBlock, 0);
-		_mBlockPosition = AllowedBlockPosition.AsteroidCoreAndShell;
-	}
-	
-	/** Internal function
-	 * @return The position the block is supposed to spawn at
-	 */
-	public AllowedBlockPosition getBlockPosition()
-	{
-		return _mBlockPosition;
-	}
-	
-	@Override
-	public boolean equals(Object other)
-	{
-	    if (other == null) return false;
-	    if (other == this) return true;
-	    if (!(other instanceof SpecialBlockComb))return false;
-	    SpecialBlockComb otherObj = (SpecialBlockComb)other;
-	    
-	    boolean tFlag = true;
-	    String otherName = Block.blockRegistry.getNameForObject(otherObj.getBlock());
-	    String thisName = Block.blockRegistry.getNameForObject(this.getBlock());
-	    if (!otherName.equals(thisName))
-	    	tFlag = false;
-	    
-	    if (!(otherObj.getMeta() == this.getMeta()))
-	    	tFlag = false;
-	    
-	    if (!(otherObj.getBlockPosition() == this.getBlockPosition()))
-	    	tFlag = false;
-	    
-	    return tFlag;
-	}
+    private AllowedBlockPosition _mBlockPosition;
+
+    /**
+     * Creates a simple instance for a block that has a meta value and a block position it is allowed to spawn
+     * 
+     * @param pBlock         The Block in question
+     * @param pMeta          The meta value of the block
+     * @param pBlockPosition The position this block is allowed to generate
+     */
+    public SpecialBlockComb(Block pBlock, int pMeta, AllowedBlockPosition pBlockPosition) {
+        super(pBlock, pMeta);
+        _mBlockPosition = pBlockPosition;
+    }
+
+    /**
+     * Creates a simple instance for a block that has no meta value but a position it is allowed to spawn
+     * 
+     * @param pBlock         The Block in question. 0 is used as meta
+     * @param pBlockPosition The position this block is allowed to generate
+     */
+    public SpecialBlockComb(Block pBlock, AllowedBlockPosition pBlockPosition) {
+        super(pBlock, 0);
+        _mBlockPosition = pBlockPosition;
+    }
+
+    /**
+     * Creates a simple instance for a block that has no meta value and is allowed to spawn everywhere
+     * 
+     * @param pBlock The Block in question. 0 is used as meta, and "CoreAndShell" is used as position
+     */
+    public SpecialBlockComb(Block pBlock) {
+        super(pBlock, 0);
+        _mBlockPosition = AllowedBlockPosition.AsteroidCoreAndShell;
+    }
+
+    /**
+     * Internal function
+     * 
+     * @return The position the block is supposed to spawn at
+     */
+    public AllowedBlockPosition getBlockPosition() {
+        return _mBlockPosition;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == null) return false;
+        if (other == this) return true;
+        if (!(other instanceof SpecialBlockComb)) return false;
+        SpecialBlockComb otherObj = (SpecialBlockComb) other;
+
+        boolean tFlag = true;
+        String otherName = Block.blockRegistry.getNameForObject(otherObj.getBlock());
+        String thisName = Block.blockRegistry.getNameForObject(this.getBlock());
+        if (!otherName.equals(thisName)) tFlag = false;
+
+        if (!(otherObj.getMeta() == this.getMeta())) tFlag = false;
+
+        if (!(otherObj.getBlockPosition() == this.getBlockPosition())) tFlag = false;
+
+        return tFlag;
+    }
 }