aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/world
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/api/world
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/api/world')
-rw-r--r--src/main/java/gregtech/api/world/GT_Worldgen.java30
-rw-r--r--src/main/java/gregtech/api/world/GT_Worldgen_Ore.java4
-rw-r--r--src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java44
-rw-r--r--src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java46
4 files changed, 61 insertions, 63 deletions
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen.java b/src/main/java/gregtech/api/world/GT_Worldgen.java
index ae6fc930a4..4e1d5c7a73 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen.java
+++ b/src/main/java/gregtech/api/world/GT_Worldgen.java
@@ -33,12 +33,12 @@ public abstract class GT_Worldgen {
* @return if the Worldgeneration has been successfully completed
*/
public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
- int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
return false;
}
public int executeWorldgenChunkified(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
- int aChunkZ, int seedX, int seedZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+ int aChunkZ, int seedX, int seedZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
return 4; // This is for the empty Orevein
}
@@ -52,7 +52,7 @@ public abstract class GT_Worldgen {
* @return if the Worldgeneration has been successfully completed
*/
public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
- int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
return false;
}
@@ -67,24 +67,22 @@ public abstract class GT_Worldgen {
public boolean isGenerationAllowed(World aWorld, int aDimensionType, int aAllowedDimensionType) {
if (!((aWorld.provider.getDimensionName()
- .equalsIgnoreCase("Overworld"))
- || (aWorld.provider.getDimensionName()
- .equalsIgnoreCase("Nether"))
- || (aWorld.provider.getDimensionName()
- .equalsIgnoreCase("The End"))
- || (aWorld.provider.getDimensionName()
- .equalsIgnoreCase("Twilight Forest"))
- || (aWorld.provider.getDimensionName()
- .equalsIgnoreCase("Underdark"))))
+ .equalsIgnoreCase("Overworld"))
+ || (aWorld.provider.getDimensionName()
+ .equalsIgnoreCase("Nether"))
+ || (aWorld.provider.getDimensionName()
+ .equalsIgnoreCase("The End"))
+ || (aWorld.provider.getDimensionName()
+ .equalsIgnoreCase("Twilight Forest"))
+ || (aWorld.provider.getDimensionName()
+ .equalsIgnoreCase("Underdark"))))
return false;
String aDimName = aWorld.provider.getDimensionName();
Boolean tAllowed = mDimensionMap.get(aDimName);
if (tAllowed == null) {
- boolean tValue = GregTech_API.sWorldgenFile.get(
- "worldgen." + mWorldGenName,
- aDimName,
- aDimensionType == aAllowedDimensionType);
+ boolean tValue = GregTech_API.sWorldgenFile
+ .get("worldgen." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType);
mDimensionMap.put(aDimName, tValue);
return tValue;
}
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java
index c40b3dfe13..958adfad54 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java
+++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java
@@ -16,8 +16,8 @@ public abstract class GT_Worldgen_Ore extends GT_Worldgen {
private final String aTextWorldgen = "worldgen.";
public GT_Worldgen_Ore(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType,
- int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList,
- boolean aAllowToGenerateinVoid) {
+ int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList,
+ boolean aAllowToGenerateinVoid) {
super(aName, GregTech_API.sWorldgenList, aDefault);
mDimensionType = aDimensionType;
mBlock = aBlock;
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java
index 79b9e1711f..900f7808b1 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java
+++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock.java
@@ -11,38 +11,38 @@ import net.minecraft.world.chunk.IChunkProvider;
public class GT_Worldgen_Ore_SingleBlock extends GT_Worldgen_Ore {
public GT_Worldgen_Ore_SingleBlock(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType,
- int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList,
- boolean aAllowToGenerateinVoid) {
+ int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList,
+ boolean aAllowToGenerateinVoid) {
super(
- aName,
- aDefault,
- aBlock,
- aBlockMeta,
- aDimensionType,
- aAmount,
- aSize,
- aProbability,
- aMinY,
- aMaxY,
- aBiomeList,
- aAllowToGenerateinVoid);
+ aName,
+ aDefault,
+ aBlock,
+ aBlockMeta,
+ aDimensionType,
+ aAmount,
+ aSize,
+ aProbability,
+ aMinY,
+ aMaxY,
+ aBiomeList,
+ aAllowToGenerateinVoid);
}
@Override
public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
- int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType)
- && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome))
- && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
+ && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome))
+ && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
for (int i = 0; i < mAmount; i++) {
int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY),
- tZ = aChunkZ + aRandom.nextInt(16);
+ tZ = aChunkZ + aRandom.nextInt(16);
Block tBlock = aWorld.getBlock(tX, tY, tZ);
if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ)
- .isAir(aWorld, tX, tY, tZ))
- || (tBlock != null && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone)
- || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone)
- || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) {
+ .isAir(aWorld, tX, tY, tZ))
+ || (tBlock != null && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone)
+ || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone)
+ || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) {
aWorld.setBlock(tX, tY, tZ, mBlock, mBlockMeta, 0);
}
}
diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java
index 2c35dbf27e..956cd0eb4c 100644
--- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java
+++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore_SingleBlock_UnderLava.java
@@ -11,40 +11,40 @@ import net.minecraft.world.chunk.IChunkProvider;
public class GT_Worldgen_Ore_SingleBlock_UnderLava extends GT_Worldgen_Ore {
public GT_Worldgen_Ore_SingleBlock_UnderLava(String aName, boolean aDefault, Block aBlock, int aBlockMeta,
- int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY,
- Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
+ int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY,
+ Collection<String> aBiomeList, boolean aAllowToGenerateinVoid) {
super(
- aName,
- aDefault,
- aBlock,
- aBlockMeta,
- aDimensionType,
- aAmount,
- aSize,
- aProbability,
- aMinY,
- aMaxY,
- aBiomeList,
- aAllowToGenerateinVoid);
+ aName,
+ aDefault,
+ aBlock,
+ aBlockMeta,
+ aDimensionType,
+ aAmount,
+ aSize,
+ aProbability,
+ aMinY,
+ aMaxY,
+ aBiomeList,
+ aAllowToGenerateinVoid);
}
@Override
public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX,
- int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
+ int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) {
if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType)
- && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome))
- && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
+ && (mBiomeList.isEmpty() || mBiomeList.contains(aBiome))
+ && (mProbability <= 1 || aRandom.nextInt(mProbability) == 0)) {
for (int i = 0; i < mAmount; i++) {
int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY),
- tZ = aChunkZ + aRandom.nextInt(16);
+ tZ = aChunkZ + aRandom.nextInt(16);
Block tBlock = aWorld.getBlock(tX, tY, tZ);
if (((mAllowToGenerateinVoid && aWorld.getBlock(tX, tY, tZ)
- .isAir(aWorld, tX, tY, tZ))
- || (tBlock != null && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone)
- || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone)
- || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) {
+ .isAir(aWorld, tX, tY, tZ))
+ || (tBlock != null && (tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.stone)
+ || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.end_stone)
+ || tBlock.isReplaceableOreGen(aWorld, tX, tY, tZ, Blocks.netherrack))))) {
if (aWorld.getBlock(tX, tY + 1, tZ) == Blocks.lava
- || aWorld.getBlock(tX, tY, tZ) == Blocks.flowing_lava)
+ || aWorld.getBlock(tX, tY, tZ) == Blocks.flowing_lava)
aWorld.setBlock(tX, tY, tZ, mBlock, mBlockMeta, 0);
}
}