From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../xmod/gregtech/api/world/GTPP_Worldgen.java | 27 +-- .../gregtech/api/world/GTPP_Worldgen_Boulder.java | 44 ++--- .../api/world/GTPP_Worldgen_GT_Ore_Layer.java | 206 ++++++++++----------- .../gregtech/api/world/GTPP_Worldgen_Handler.java | 13 +- .../xmod/gregtech/api/world/GTPP_Worldgen_Ore.java | 19 +- .../api/world/GTPP_Worldgen_Ore_Normal.java | 76 +++----- .../xmod/gregtech/api/world/GT_OreVein_Object.java | 13 +- .../xmod/gregtech/api/world/WorldGenUtils.java | 27 +-- 8 files changed, 169 insertions(+), 256 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/world') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java index 6f58823eb1..bfbd4e6da3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; + import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -30,15 +31,8 @@ public abstract class GTPP_Worldgen { * @param aChunkZ zCoord of the Chunk * @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) { + public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, + int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { return false; } @@ -51,15 +45,8 @@ public abstract class GTPP_Worldgen { * @param aChunkZ zCoord of the Chunk * @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) { + public boolean executeCavegen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, + int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { return false; } @@ -67,8 +54,8 @@ public abstract class GTPP_Worldgen { String aDimName = aWorld.provider.getDimensionName(); Boolean tAllowed = mDimensionMap.get(aDimName); if (tAllowed == null) { - boolean tValue = sCustomWorldgenFile.get( - "worldgen.dimensions." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType); + boolean tValue = sCustomWorldgenFile + .get("worldgen.dimensions." + mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType); mDimensionMap.put(aDimName, tValue); return tValue; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java index 26f1b38084..ffb1baf9f0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Boulder.java @@ -1,27 +1,20 @@ package gtPlusPlus.xmod.gregtech.api.world; -import gtPlusPlus.core.lib.CORE; import java.util.Collection; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; +import gtPlusPlus.core.lib.CORE; + public class GTPP_Worldgen_Boulder extends GTPP_Worldgen_Ore { - public GTPP_Worldgen_Boulder( - String aName, - boolean aDefault, - Block aBlock, - int aBlockMeta, - int aDimensionType, - int aAmount, - int aSize, - int aProbability, - int aMinY, - int aMaxY, - Collection aBiomeList, + + public GTPP_Worldgen_Boulder(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, + int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection aBiomeList, boolean aAllowToGenerateinVoid) { super( aName, @@ -39,25 +32,16 @@ public class GTPP_Worldgen_Boulder extends GTPP_Worldgen_Ore { } @Override - public boolean executeWorldgen( - World aWorld, - Random aRandom, - String aBiome, - int aDimensionType, - int aChunkX, - int aChunkZ, - IChunkProvider aChunkGenerator, - IChunkProvider aChunkProvider) { + public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, + int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) && (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), + int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16); Block tBlock = aWorld.getBlock(tX, tY - 7, tZ); - if (tBlock != null - && tBlock.isOpaqueCube() + if (tBlock != null && tBlock.isOpaqueCube() && aWorld.getBlock(tX, tY - 6, tZ).isAir(aWorld, tX, tY - 6, tZ)) { float math_pi = CORE.PI; float var6 = aRandom.nextFloat() * math_pi; @@ -101,11 +85,9 @@ public class GTPP_Worldgen_Boulder extends GTPP_Worldgen_Ore { for (int var44 = var34; var44 <= var37; ++var44) { float var45 = (var44 + 0.5F - var24) / (var28); Block block = aWorld.getBlock(var38, var41, var44); - if (var14b + var45 * var45 < 1.0F - && ((mAllowToGenerateinVoid - && aWorld.getBlock(var38, var41, var44) - .isAir(aWorld, var38, var41, var44)) - || (block != null && !(block instanceof BlockContainer)))) { + if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld + .getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44)) + || (block != null && !(block instanceof BlockContainer)))) { aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java index 0dbd354547..e3f33f45e4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_GT_Ore_Layer.java @@ -2,22 +2,25 @@ package gtPlusPlus.xmod.gregtech.api.world; import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.common.blocks.GT_TileEntity_Ores; -import gregtech.loaders.misc.GT_Achievements; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.Material; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Random; + import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; +import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.loaders.misc.GT_Achievements; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.material.Material; + public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen { + public static ArrayList sList = new ArrayList(); public static int sWeight = 0; public final short mMinY; @@ -33,37 +36,27 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen { public final boolean mDarkWorld; public final String aTextWorldgen = "worldgen.gtpp."; - public GTPP_Worldgen_GT_Ore_Layer( - String aName, - boolean aDefault, - int aMinY, - int aMaxY, - int aWeight, - int aDensity, - int aSize, - boolean aOverworld, - Materials aPrimary, - Materials aSecondary, - Materials aBetween, + public GTPP_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, + int aSize, boolean aOverworld, Materials aPrimary, Materials aSecondary, Materials aBetween, Materials aSporadic) { super(aName, sList, aDefault); this.mDarkWorld = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); this.mMinY = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY)); - this.mMaxY = ((short) Math.max( - this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY))); + this.mMaxY = ((short) Math + .max(this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY))); this.mWeight = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); this.mDensity = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); this.mSize = ((short) Math.max(1, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); - this.mPrimaryMeta = ((short) sCustomWorldgenFile.get( - aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID)); - this.mSecondaryMeta = ((short) sCustomWorldgenFile.get( - aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID)); - this.mBetweenMeta = ((short) sCustomWorldgenFile.get( - aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID)); - this.mSporadicMeta = ((short) sCustomWorldgenFile.get( - aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID)); - this.mRestrictBiome = - sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); + this.mPrimaryMeta = ((short) sCustomWorldgenFile + .get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID)); + this.mSecondaryMeta = ((short) sCustomWorldgenFile + .get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID)); + this.mBetweenMeta = ((short) sCustomWorldgenFile + .get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID)); + this.mSporadicMeta = ((short) sCustomWorldgenFile + .get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID)); + this.mRestrictBiome = sCustomWorldgenFile + .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); if (this.mEnabled) { GT_Achievements.registerOre( @@ -102,65 +95,53 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen { } } - public GTPP_Worldgen_GT_Ore_Layer( - String aName, - boolean aDefault, - int aMinY, - int aMaxY, - int aWeight, - int aDensity, - int aSize, - Material aPrimary, - Material aSecondary, - Material aBetween, - Material aSporadic) { + public GTPP_Worldgen_GT_Ore_Layer(String aName, boolean aDefault, int aMinY, int aMaxY, int aWeight, int aDensity, + int aSize, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { super(aName, sList, aDefault); this.mDarkWorld = sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Darkworld", true); this.mMinY = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MinHeight", aMinY)); - this.mMaxY = ((short) Math.max( - this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY))); + this.mMaxY = ((short) Math + .max(this.mMinY + 5, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "MaxHeight", aMaxY))); this.mWeight = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); this.mDensity = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); this.mSize = ((short) Math.max(1, sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); - /*this.mPrimaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", aPrimary.mMetaItemSubID)); - this.mSecondaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID)); - this.mBetweenMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", aBetween.mMetaItemSubID)); - this.mSporadicMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID)); - */ this.mRestrictBiome = - sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); + /* + * this.mPrimaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OrePrimaryLayer", + * aPrimary.mMetaItemSubID)); this.mSecondaryMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + + * this.mWorldGenName, "OreSecondaryLayer", aSecondary.mMetaItemSubID)); this.mBetweenMeta = ((short) + * sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "OreSporadiclyInbetween", + * aBetween.mMetaItemSubID)); this.mSporadicMeta = ((short) sCustomWorldgenFile.get(aTextWorldgen + + * this.mWorldGenName, "OreSporaticlyAround", aSporadic.mMetaItemSubID)); + */ this.mRestrictBiome = sCustomWorldgenFile + .get(aTextWorldgen + this.mWorldGenName, "RestrictToBiomeName", "None"); if (this.mEnabled) { - /* GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false); - GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false); - GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false); - GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY, aWeight, false, false, false); + /* + * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY, + * aWeight, false, false, false); + * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY, + * aWeight, false, false, false); GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta + * % 1000)], aMinY, aMaxY, aWeight, false, false, false); + * GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY, + * aWeight, false, false, false); */ sWeight += this.mWeight; } } @Override - public boolean executeWorldgen( - World aWorld, - Random aRandom, - String aBiome, - int aDimensionType, - int aChunkX, - int aChunkZ, - IChunkProvider aChunkGenerator, - IChunkProvider aChunkProvider) { + public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, + int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { if (!this.mRestrictBiome.equals("None") && !(this.mRestrictBiome.equals(aBiome))) { return false; // Not the correct biome for ore mix } if (!isGenerationAllowed( aWorld, aDimensionType, - ((aDimensionType == -1) && (false)) - || ((aDimensionType == 0) && (this.mDarkWorld)) - || ((aDimensionType == 1) && (false)) - || ((aWorld.provider.getDimensionName().equals("Moon")) && (false)) - || ((aWorld.provider.getDimensionName().equals("Mars")) && (false)) - ? aDimensionType - : aDimensionType ^ 0xFFFFFFFF)) { + ((aDimensionType == -1) && (false)) || ((aDimensionType == 0) && (this.mDarkWorld)) + || ((aDimensionType == 1) && (false)) + || ((aWorld.provider.getDimensionName().equals("Moon")) && (false)) + || ((aWorld.provider.getDimensionName().equals("Mars")) && (false)) ? aDimensionType + : aDimensionType ^ 0xFFFFFFFF)) { return false; } int tMinY = this.mMinY + aRandom.nextInt(this.mMaxY - this.mMinY - 5); @@ -173,12 +154,14 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen { for (int tZ = cZ; tZ <= eZ; tZ++) { if (this.mSecondaryMeta > 0) { for (int i = tMinY - 1; i < tMinY + 2; i++) { - if ((aRandom.nextInt(Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / this.mDensity)) - == 0) - || (aRandom.nextInt(Math.max( + if ((aRandom.nextInt( + Math.max( + 1, + Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) + / this.mDensity)) + == 0) + || (aRandom.nextInt( + Math.max( 1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) @@ -187,27 +170,27 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen { } } } - if ((this.mBetweenMeta > 0) - && ((aRandom.nextInt(Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / this.mDensity)) - == 0) - || (aRandom.nextInt(Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / this.mDensity)) - == 0))) { + if ((this.mBetweenMeta > 0) && ((aRandom.nextInt( + Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) + == 0) + || (aRandom.nextInt( + Math.max( + 1, + Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) + / this.mDensity)) + == 0))) { setOreBlock(aWorld, tX, tMinY + 2 + aRandom.nextInt(2), tZ, this.mBetweenMeta, false); } if (this.mPrimaryMeta > 0) { for (int i = tMinY + 3; i < tMinY + 6; i++) { - if ((aRandom.nextInt(Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / this.mDensity)) - == 0) - || (aRandom.nextInt(Math.max( + if ((aRandom.nextInt( + Math.max( + 1, + Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) + / this.mDensity)) + == 0) + || (aRandom.nextInt( + Math.max( 1, Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) / this.mDensity)) @@ -216,17 +199,15 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen { } } } - if ((this.mSporadicMeta > 0) - && ((aRandom.nextInt(Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / this.mDensity)) - == 0) - || (aRandom.nextInt(Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / this.mDensity)) - == 0))) { + if ((this.mSporadicMeta > 0) && ((aRandom.nextInt( + Math.max(1, Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) / this.mDensity)) + == 0) + || (aRandom.nextInt( + Math.max( + 1, + Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) + / this.mDensity)) + == 0))) { setOreBlock(aWorld, tX, tMinY - 1 + aRandom.nextInt(7), tZ, this.mSporadicMeta, false); } } @@ -244,13 +225,18 @@ public class GTPP_Worldgen_GT_Ore_Layer extends GTPP_Worldgen { if (mSetOre == null) { try { mSetOre = GT_TileEntity_Ores.class.getMethod( - "setOreBlock", World.class, int.class, int.class, int.class, int.class, boolean.class); + "setOreBlock", + World.class, + int.class, + int.class, + int.class, + int.class, + boolean.class); } catch (SecurityException | NoSuchMethodException e) { try { - mSetOre = GT_TileEntity_Ores.class.getMethod( - "setOreBlock", World.class, int.class, int.class, int.class, int.class); - } catch (SecurityException | NoSuchMethodException r) { - } + mSetOre = GT_TileEntity_Ores.class + .getMethod("setOreBlock", World.class, int.class, int.class, int.class, int.class); + } catch (SecurityException | NoSuchMethodException r) {} } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java index b295d5be82..8ed90b799f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Handler.java @@ -28,17 +28,8 @@ public class GTPP_Worldgen_Handler implements Runnable { ore.aSporadic); } - private final GTPP_Worldgen_GT_Ore_Layer generateNewVein( - String mOreMixName, - int minY, - int maxY, - int weight, - int density, - int size, - Material aPrimary, - Material aSecondary, - Material aBetween, - Material aSporadic) { + private final GTPP_Worldgen_GT_Ore_Layer generateNewVein(String mOreMixName, int minY, int maxY, int weight, + int density, int size, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { return new GTPP_Worldgen_GT_Ore_Layer( "ore.mix." + mOreMixName, // String aName, true, // boolean aDefault, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java index e93a6c6d38..22b64d6cfc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore.java @@ -2,30 +2,23 @@ package gtPlusPlus.xmod.gregtech.api.world; import static gtPlusPlus.xmod.gregtech.HANDLER_GT.sCustomWorldgenFile; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; import java.util.ArrayList; import java.util.Collection; + import net.minecraft.block.Block; +import gtPlusPlus.xmod.gregtech.HANDLER_GT; + public abstract class GTPP_Worldgen_Ore extends GTPP_Worldgen { + public final int mBlockMeta, mAmount, mSize, mMinY, mMaxY, mProbability, mDimensionType; public final Block mBlock; public final Collection mBiomeList; public final boolean mAllowToGenerateinVoid; private final String aTextWorldgen = "worldgen."; - public GTPP_Worldgen_Ore( - String aName, - boolean aDefault, - Block aBlock, - int aBlockMeta, - int aDimensionType, - int aAmount, - int aSize, - int aProbability, - int aMinY, - int aMaxY, - Collection aBiomeList, + public GTPP_Worldgen_Ore(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, + int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection aBiomeList, boolean aAllowToGenerateinVoid) { super(aName, HANDLER_GT.sCustomWorldgenList, aDefault); mDimensionType = aDimensionType; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java index 3f0a6d48c9..b8113d5f86 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GTPP_Worldgen_Ore_Normal.java @@ -1,27 +1,20 @@ package gtPlusPlus.xmod.gregtech.api.world; -import gtPlusPlus.core.lib.CORE; import java.util.Collection; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; +import gtPlusPlus.core.lib.CORE; + public class GTPP_Worldgen_Ore_Normal extends GTPP_Worldgen_Ore { - public GTPP_Worldgen_Ore_Normal( - String aName, - boolean aDefault, - Block aBlock, - int aBlockMeta, - int aDimensionType, - int aAmount, - int aSize, - int aProbability, - int aMinY, - int aMaxY, - Collection aBiomeList, + + public GTPP_Worldgen_Ore_Normal(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, + int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection aBiomeList, boolean aAllowToGenerateinVoid) { super( aName, @@ -39,21 +32,13 @@ public class GTPP_Worldgen_Ore_Normal extends GTPP_Worldgen_Ore { } @Override - public boolean executeWorldgen( - World aWorld, - Random aRandom, - String aBiome, - int aDimensionType, - int aChunkX, - int aChunkZ, - IChunkProvider aChunkGenerator, - IChunkProvider aChunkProvider) { + public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, + int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { if (isGenerationAllowed(aWorld, aDimensionType, mDimensionType) && (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), + int tX = aChunkX + aRandom.nextInt(16), tY = mMinY + aRandom.nextInt(mMaxY - mMinY), tZ = aChunkZ + aRandom.nextInt(16); if (mAllowToGenerateinVoid || aWorld.getBlock(tX, tY, tZ).isAir(aWorld, tX, tY, tZ)) { float math_pi = CORE.PI; @@ -98,29 +83,26 @@ public class GTPP_Worldgen_Ore_Normal extends GTPP_Worldgen_Ore { for (int var44 = var34; var44 <= var37; ++var44) { float var45 = (var44 + 0.5F - var24) / (var28); Block block = aWorld.getBlock(var38, var41, var44); - if (var14b + var45 * var45 < 1.0F - && ((mAllowToGenerateinVoid - && aWorld.getBlock(var38, var41, var44) - .isAir(aWorld, var38, var41, var44)) - || (block != null - && (block.isReplaceableOreGen( - aWorld, - var38, - var41, - var44, - Blocks.stone) - || block.isReplaceableOreGen( - aWorld, - var38, - var41, - var44, - Blocks.end_stone) - || block.isReplaceableOreGen( - aWorld, - var38, - var41, - var44, - Blocks.netherrack))))) { + if (var14b + var45 * var45 < 1.0F && ((mAllowToGenerateinVoid && aWorld + .getBlock(var38, var41, var44).isAir(aWorld, var38, var41, var44)) + || (block != null && (block.isReplaceableOreGen( + aWorld, + var38, + var41, + var44, + Blocks.stone) + || block.isReplaceableOreGen( + aWorld, + var38, + var41, + var44, + Blocks.end_stone) + || block.isReplaceableOreGen( + aWorld, + var38, + var41, + var44, + Blocks.netherrack))))) { aWorld.setBlock(var38, var41, var44, mBlock, mBlockMeta, 0); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java index c6e9e6c92a..65813693b3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/GT_OreVein_Object.java @@ -14,17 +14,8 @@ public class GT_OreVein_Object { final Material aBetween; // Materials aBetween, final Material aSporadic; // Materials aSporadic - GT_OreVein_Object( - String mOreMixName, - int minY, - int maxY, - int weight, - int density, - int size, - Material aPrimary, - Material aSecondary, - Material aBetween, - Material aSporadic) { + GT_OreVein_Object(String mOreMixName, int minY, int maxY, int weight, int density, int size, Material aPrimary, + Material aSecondary, Material aBetween, Material aSporadic) { this.mOreMixName = mOreMixName; this.minY = minY; this.maxY = maxY; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java index 78f04269cf..5ca61cf4d7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/world/WorldGenUtils.java @@ -1,9 +1,10 @@ package gtPlusPlus.xmod.gregtech.api.world; -import gtPlusPlus.core.material.Material; import java.util.ArrayList; import java.util.List; +import gtPlusPlus.core.material.Material; + public class WorldGenUtils { static List mOresToRegister = new ArrayList(); @@ -12,19 +13,19 @@ public class WorldGenUtils { mOresToRegister.add(newVein); } - public static boolean generateNewOreVeinObject( - String mOreMixName, - int minY, - int maxY, - int weight, - int density, - int size, - Material aPrimary, - Material aSecondary, - Material aBetween, - Material aSporadic) { + public static boolean generateNewOreVeinObject(String mOreMixName, int minY, int maxY, int weight, int density, + int size, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { GT_OreVein_Object newVein = new GT_OreVein_Object( - mOreMixName, minY, maxY, weight, density, size, aPrimary, aSecondary, aBetween, aSporadic); + mOreMixName, + minY, + maxY, + weight, + density, + size, + aPrimary, + aSecondary, + aBetween, + aSporadic); addNewOreMixForWorldgen(newVein); return true; } -- cgit