diff options
Diffstat (limited to 'src')
23 files changed, 642 insertions, 609 deletions
diff --git a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java index 93900c3efe..dfa1307bce 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java @@ -16,12 +16,12 @@ public class GT_TileEntity_Ores_Space { // Renamed function to prevent function shadowing with base GT-code public static boolean setOuterSpaceOreBlock(ModDimensionDef pDimensionDef, World pWorld, int pX, int pY, int pZ, - int pMetaData) { + int pMetaData) { return setOuterSpaceOreBlock(pDimensionDef, pWorld, pX, pY, pZ, pMetaData, false, -1); } public static boolean setOuterSpaceOreBlock(ModDimensionDef pDimensionDef, World pWorld, int pX, int pY, int pZ, - int pMetaData, boolean pAir) { + int pMetaData, boolean pAir) { return setOuterSpaceOreBlock(pDimensionDef, pWorld, pX, pY, pZ, pMetaData, pAir, -1); } @@ -35,7 +35,7 @@ public class GT_TileEntity_Ores_Space { * @return */ private static ReplaceState CheckForReplaceableBlock(World pWorld, int pX, int pY, int pZ, - ModDimensionDef pDimDef) { + ModDimensionDef pDimDef) { try { ReplaceState tFlag = ReplaceState.Unknown; @@ -65,12 +65,12 @@ public class GT_TileEntity_Ores_Space { * @return */ public static boolean setOuterSpaceOreBlock(ModDimensionDef pDimensionDef, World pWorld, int pX, int pY, int pZ, - int pMetaData, boolean pAir, int pCustomGTOreOffset) { + int pMetaData, boolean pAir, int pCustomGTOreOffset) { if (!pAir) pY = Math.min(pWorld.getActualHeight(), Math.max(pY, 1)); if (pDimensionDef == null) { GalacticGreg.Logger - .warn("Unknown DimensionID: %d. Will not set anything here", pWorld.provider.dimensionId); + .warn("Unknown DimensionID: %d. Will not set anything here", pWorld.provider.dimensionId); return false; } try { @@ -96,20 +96,21 @@ public class GT_TileEntity_Ores_Space { return false; } - if (pCustomGTOreOffset == -1) pMetaData += pDimensionDef.getStoneType().getOffset(); + if (pCustomGTOreOffset == -1) pMetaData += pDimensionDef.getStoneType() + .getOffset(); else pMetaData += pCustomGTOreOffset; // This fix seems like cargo cult coding...The Abstract class just returns 0 for the harvest level. // But it aligns with the GT5U method, so yay? pWorld.setBlock( - pX, - pY, - pZ, - GregTech_API.sBlockOres1, - GT_TileEntity_Ores.getHarvestData( - (short) pMetaData, - ((GT_Block_Ores_Abstract) GregTech_API.sBlockOres1) - .getBaseBlockHarvestLevel(pMetaData % 16000 / 1000)), - 0); + pX, + pY, + pZ, + GregTech_API.sBlockOres1, + GT_TileEntity_Ores.getHarvestData( + (short) pMetaData, + ((GT_Block_Ores_Abstract) GregTech_API.sBlockOres1) + .getBaseBlockHarvestLevel(pMetaData % 16000 / 1000)), + 0); TileEntity tTileEntity = pWorld.getTileEntity(pX, pY, pZ); if ((tTileEntity instanceof GT_TileEntity_Ores)) { ((GT_TileEntity_Ores) tTileEntity).mMetaData = ((short) pMetaData); @@ -120,20 +121,20 @@ public class GT_TileEntity_Ores_Space { // That's why I put this behind a debug config option. If you ever find the reason for it, // please tell me what caused this if (GalacticGreg.GalacticConfig.ReportOreGenFailures) GalacticGreg.Logger.warn( - "Something went wrong while placing GT OreTileEntity. Meta: %d X [%d] Y [%d] Z [%d]", - pMetaData, - pX, - pY, - pZ); + "Something went wrong while placing GT OreTileEntity. Meta: %d X [%d] Y [%d] Z [%d]", + pMetaData, + pX, + pY, + pZ); } return true; } else GalacticGreg.Logger.warn( - "Not replacing block at pos %d %d %d due unexpected metaData for OreBlock: %d", - pX, - pY, - pZ, - pMetaData); + "Not replacing block at pos %d %d %d due unexpected metaData for OreBlock: %d", + pX, + pY, + pZ, + pMetaData); } } catch (Exception e) { if (GalacticGreg.GalacticConfig.ReportOreGenFailures) e.printStackTrace(); diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java index 67bbb492f8..44fa0bf5a4 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java @@ -42,24 +42,22 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { private DynamicOreMixWorldConfig _mDynWorldConfig; public GT_Worldgen_GT_Ore_Layer_Space(String pName, boolean pDefault, int pMinY, int pMaxY, int pWeight, - int pDensity, int pSize, Materials pPrimary, Materials pSecondary, Materials pBetween, - Materials pSporadic) { + int pDensity, int pSize, Materials pPrimary, Materials pSecondary, Materials pBetween, Materials pSporadic) { super(pName, GalacticGreg.oreVeinWorldgenList, pDefault); mMinY = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MinHeight", pMinY)); - mMaxY = ((short) Math.max( - this.mMinY + 5, - GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY))); + mMaxY = ((short) Math + .max(this.mMinY + 5, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY))); mWeight = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "RandomWeight", pWeight)); mDensity = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Density", pDensity)); mSize = ((short) Math.max(1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Size", pSize))); mPrimaryMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "OrePrimaryLayer", pPrimary.mMetaItemSubID)); + .get("worldgen." + this.mWorldGenName, "OrePrimaryLayer", pPrimary.mMetaItemSubID)); mSecondaryMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "OreSecondaryLayer", pSecondary.mMetaItemSubID)); + .get("worldgen." + this.mWorldGenName, "OreSecondaryLayer", pSecondary.mMetaItemSubID)); mBetweenMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "OreSporadiclyInbetween", pBetween.mMetaItemSubID)); + .get("worldgen." + this.mWorldGenName, "OreSporadiclyInbetween", pBetween.mMetaItemSubID)); mSporadicMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "OreSporaticlyAround", pSporadic.mMetaItemSubID)); + .get("worldgen." + this.mWorldGenName, "OreSporaticlyAround", pSporadic.mMetaItemSubID)); _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName); _mDynWorldConfig.InitDynamicConfig(); @@ -71,23 +69,22 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { } public GT_Worldgen_GT_Ore_Layer_Space(String pName, boolean pDefault, int pMinY, int pMaxY, int pWeight, - int pDensity, int pSize, short pPrimary, short pSecondary, short pBetween, short pSporadic) { + int pDensity, int pSize, short pPrimary, short pSecondary, short pBetween, short pSporadic) { super(pName, GalacticGreg.oreVeinWorldgenList, pDefault); mMinY = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MinHeight", pMinY)); - mMaxY = ((short) Math.max( - this.mMinY + 5, - GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY))); + mMaxY = ((short) Math + .max(this.mMinY + 5, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY))); mWeight = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "RandomWeight", pWeight)); mDensity = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Density", pDensity)); mSize = ((short) Math.max(1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Size", pSize))); mPrimaryMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "OrePrimaryLayer", pPrimary)); + .get("worldgen." + this.mWorldGenName, "OrePrimaryLayer", pPrimary)); mSecondaryMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "OreSecondaryLayer", pSecondary)); + .get("worldgen." + this.mWorldGenName, "OreSecondaryLayer", pSecondary)); mBetweenMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "OreSporadiclyInbetween", pBetween)); + .get("worldgen." + this.mWorldGenName, "OreSporadiclyInbetween", pBetween)); mSporadicMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "OreSporaticlyAround", pSporadic)); + .get("worldgen." + this.mWorldGenName, "OreSporaticlyAround", pSporadic)); _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName); _mDynWorldConfig.InitDynamicConfig(); @@ -124,8 +121,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { else { for (GT_Worldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) if (tWorldGen instanceof GT_Worldgen_GT_Ore_Layer_Space - && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef)) - tVal++; + && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef)) tVal++; _mBufferedVeinCountList.put(pDimensionDef.getDimIdentifier(), tVal); } @@ -150,10 +146,10 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { tReturn = new ArrayList<>(); for (GT_Worldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) if (tWorldGen instanceof GT_Worldgen_GT_Ore_Layer_Space - && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef)) + && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef)) tReturn.add(tWorldGen.mWorldGenName); else if (tWorldGen instanceof BW_Worldgen_Ore_Layer_Space - && ((BW_Worldgen_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef)) + && ((BW_Worldgen_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef)) tReturn.add(tWorldGen.mWorldGenName); _mBufferedVeinList.put(pDimensionDef.getDimIdentifier(), tReturn); @@ -166,8 +162,8 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { short tVal = 0; for (GT_Worldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) if (tWorldGen instanceof GT_Worldgen_GT_Ore_Layer_Space - && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef) - && tVal < ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).mWeight) + && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).isEnabledForDim(pDimensionDef) + && tVal < ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).mWeight) tVal = ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).mWeight; return tVal; @@ -200,8 +196,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { GT_Worldgen tGen = null; for (GT_Worldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) if (tWorldGen instanceof GT_Worldgen_GT_Ore_Layer_Space - && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).mWorldGenName.equals(tVeinName)) - tGen = tWorldGen; + && ((GT_Worldgen_GT_Ore_Layer_Space) tWorldGen).mWorldGenName.equals(tVeinName)) tGen = tWorldGen; if (tGen != null) { // GT_Worldgen_GT_Ore_Layer_Space tGen = GalacticGreg.oreVeinWorldgenList.get(tRndMix); @@ -249,21 +244,18 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { @Override public boolean executeWorldgen(World pWorld, Random pRandom, String pBiome, int pDimensionType, int pChunkX, - int pChunkZ, IChunkProvider pChunkGenerator, IChunkProvider pChunkProvider) { + int pChunkZ, IChunkProvider pChunkGenerator, IChunkProvider pChunkProvider) { GalacticGreg.Logger.trace("Entering executeWorldgen for [%s]", mWorldGenName); ModDimensionDef tMDD = GalacticGregRegistry.getDimensionTypeByChunkGenerator(pChunkGenerator); if (tMDD == null) { - GalacticGreg.Logger.trace( - "Can't find dimension definition for ChunkProvider %s, skipping", - pChunkGenerator.toString()); + GalacticGreg.Logger + .trace("Can't find dimension definition for ChunkProvider %s, skipping", pChunkGenerator.toString()); return false; } if (!_mDynWorldConfig.isEnabledInDim(tMDD)) { - GalacticGreg.Logger.trace( - "OreGen for %s is disallowed in dimension %s, skipping", - mWorldGenName, - tMDD.getDimensionName()); + GalacticGreg.Logger + .trace("OreGen for %s is disallowed in dimension %s, skipping", mWorldGenName, tMDD.getDimensionName()); return false; } @@ -280,31 +272,31 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { if (this.mSecondaryMeta > 0) { for (int i = tMinY - 1; i < tMinY + 3; i++) { int placeX = Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); + 1, + Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) + / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); int placeZ = Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); + 1, + Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) + / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); if ((pRandom.nextInt(placeZ) == 0) || (pRandom.nextInt(placeX) == 0)) { GT_TileEntity_Ores_Space - .setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mSecondaryMeta); + .setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mSecondaryMeta); } } } if (this.mBetweenMeta > 0) { for (int i = tMinY + 2; i < tMinY + 6; i++) { int placeX = Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); + 1, + Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) + / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); int placeZ = Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); + 1, + Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) + / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); if (((pRandom.nextInt(placeZ) == 0) || (pRandom.nextInt(placeX) == 0)) - && (pRandom.nextInt(2) == 0)) { + && (pRandom.nextInt(2) == 0)) { GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mBetweenMeta); } } @@ -313,13 +305,13 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { if (this.mPrimaryMeta > 0) { for (int i = tMinY + 4; i < tMinY + 8; i++) { int placeX = Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); + 1, + Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) + / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); int placeZ = Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); + 1, + Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) + / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); if ((pRandom.nextInt(placeZ) == 0) || (pRandom.nextInt(placeX) == 0)) { GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mPrimaryMeta); } @@ -328,15 +320,15 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { if (this.mSporadicMeta > 0) { for (int i = tMinY - 1; i < tMinY + 8; i++) { int placeX = Math.max( - 1, - Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) - / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); + 1, + Math.max(MathHelper.abs_int(cX - tX), MathHelper.abs_int(eX - tX)) + / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); int placeZ = Math.max( - 1, - Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) - / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); + 1, + Math.max(MathHelper.abs_int(cZ - tZ), MathHelper.abs_int(eZ - tZ)) + / getDensityFromPos(tX, tZ, pChunkX, pChunkZ)); if (((pRandom.nextInt(placeX) == 0) || (pRandom.nextInt(placeZ) == 0)) - && (pRandom.nextInt(7) == 0)) { + && (pRandom.nextInt(7) == 0)) { GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mSporadicMeta); } } @@ -356,7 +348,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { tZ = pRandom.nextInt(16) + pChunkZ + 2; tY = pRandom.nextInt(160) + 10; // Y height can vary from 10 to 170 for small ores. if (this.mSecondaryMeta > 0) GT_TileEntity_Ores_Space - .setOuterSpaceOreBlock(tMDD, pWorld, tX, tY, tZ, this.mSecondaryMeta + 16000); + .setOuterSpaceOreBlock(tMDD, pWorld, tX, tY, tZ, this.mSecondaryMeta + 16000); tX = pRandom.nextInt(16) + pChunkX + 2; tZ = pRandom.nextInt(16) + pChunkZ + 2; tY = pRandom.nextInt(160) + 10; // Y height can vary from 10 to 170 for small ores. @@ -366,7 +358,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { tZ = pRandom.nextInt(16) + pChunkZ + 2; tY = pRandom.nextInt(190) + 10; // Y height can vary from 10 to 200 for small ores. if (this.mSporadicMeta > 0) GT_TileEntity_Ores_Space - .setOuterSpaceOreBlock(tMDD, pWorld, tX, tY, tZ, this.mSporadicMeta + 16000); + .setOuterSpaceOreBlock(tMDD, pWorld, tX, tY, tZ, this.mSporadicMeta + 16000); } } @@ -377,9 +369,9 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { long tTotalTime = mProfilingEnd - mProfilingStart; GalacticGreg.Profiler.AddTimeToList(tMDD, tTotalTime); GalacticGreg.Logger.debug( - "Done with OreLayer-Worldgen in DimensionType %s. Generation took %d ms", - tMDD.getDimensionName(), - tTotalTime); + "Done with OreLayer-Worldgen in DimensionType %s. Generation took %d ms", + tMDD.getDimensionName(), + tTotalTime); } catch (Exception ignored) {} // Silently ignore errors } @@ -391,8 +383,8 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { if (aX < 0) aX -= 16; if (aZ < 0) aZ -= 16; return Math.max( - 1, - this.mDensity / ((int) Math - .sqrt(2 + Math.pow(aX / 16 - aSeedX / 16, 2) + Math.pow(aZ / 16 - aSeedZ / 16, 2)))); + 1, + this.mDensity + / ((int) Math.sqrt(2 + Math.pow(aX / 16 - aSeedX / 16, 2) + Math.pow(aZ / 16 - aSeedZ / 16, 2)))); } } diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java index 38f7a94d37..11e264b4fb 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_SmallPieces_Space.java @@ -24,17 +24,16 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen { private DynamicOreMixWorldConfig _mDynWorldConfig; public GT_Worldgen_GT_Ore_SmallPieces_Space(String pName, boolean pDefault, int pMinY, int pMaxY, int pAmount, - Materials pPrimary) { + Materials pPrimary) { super(pName, GalacticGreg.smallOreWorldgenList, pDefault); mMinY = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MinHeight", pMinY)); - mMaxY = ((short) Math.max( - this.mMinY + 1, - GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY))); + mMaxY = ((short) Math + .max(this.mMinY + 1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY))); mAmount = ((short) Math - .max(1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Amount", pAmount))); + .max(1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Amount", pAmount))); mMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen." + this.mWorldGenName, "Ore", pPrimary.mMetaItemSubID)); + .get("worldgen." + this.mWorldGenName, "Ore", pPrimary.mMetaItemSubID)); _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName); _mDynWorldConfig.InitDynamicConfig(); @@ -43,15 +42,14 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen { } public GT_Worldgen_GT_Ore_SmallPieces_Space(String pName, boolean pDefault, int pMinY, int pMaxY, int pAmount, - short pPrimary) { + short pPrimary) { super(pName, GalacticGreg.smallOreWorldgenList, pDefault); mMinY = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MinHeight", pMinY)); - mMaxY = ((short) Math.max( - this.mMinY + 1, - GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY))); + mMaxY = ((short) Math + .max(this.mMinY + 1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "MaxHeight", pMaxY))); mAmount = ((short) Math - .max(1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Amount", pAmount))); + .max(1, GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Amount", pAmount))); mMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen." + this.mWorldGenName, "Ore", pPrimary)); _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName); @@ -72,21 +70,18 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen { @Override public boolean executeWorldgen(World pWorld, Random pRandom, String pBiome, int pDimensionType, int pChunkX, - int pChunkZ, IChunkProvider pChunkGenerator, IChunkProvider pChunkProvider) { + int pChunkZ, IChunkProvider pChunkGenerator, IChunkProvider pChunkProvider) { GalacticGreg.Logger.trace("Entering executeWorldgen for [%s]", mWorldGenName); ModDimensionDef tMDD = GalacticGregRegistry.getDimensionTypeByChunkGenerator(pChunkGenerator); if (tMDD == null) { - GalacticGreg.Logger.trace( - "Can't find dimension definition for ChunkProvider %s, skipping", - pChunkGenerator.toString()); + GalacticGreg.Logger + .trace("Can't find dimension definition for ChunkProvider %s, skipping", pChunkGenerator.toString()); return false; } if (!_mDynWorldConfig.isEnabledInDim(tMDD)) { - GalacticGreg.Logger.trace( - "OreGen for %s is disallowed in dimension %s, skipping", - mWorldGenName, - tMDD.getDimensionName()); + GalacticGreg.Logger + .trace("OreGen for %s is disallowed in dimension %s, skipping", mWorldGenName, tMDD.getDimensionName()); return false; } @@ -97,12 +92,12 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen { int i = 0; for (int j = Math.max(1, this.mAmount / 2 + pRandom.nextInt(this.mAmount) / 2); i < j; i++) { GT_TileEntity_Ores_Space.setOuterSpaceOreBlock( - tMDD, - pWorld, - pChunkX + pRandom.nextInt(16), - this.mMinY + pRandom.nextInt(Math.max(1, this.mMaxY - this.mMinY)), - pChunkZ + pRandom.nextInt(16), - this.mMeta + 16000); + tMDD, + pWorld, + pChunkX + pRandom.nextInt(16), + this.mMinY + pRandom.nextInt(Math.max(1, this.mMaxY - this.mMinY)), + pChunkZ + pRandom.nextInt(16), + this.mMeta + 16000); } } // --------------------------- @@ -112,9 +107,9 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen { long tTotalTime = mProfilingEnd - mProfilingStart; GalacticGreg.Profiler.AddTimeToList(tMDD, tTotalTime); GalacticGreg.Logger.debug( - "Done with SmallOre-Worldgen in DimensionType %s. Generation took %d ms", - tMDD.getDimensionName(), - tTotalTime); + "Done with SmallOre-Worldgen in DimensionType %s. Generation took %d ms", + tMDD.getDimensionName(), + tTotalTime); } catch (Exception ignored) {} // Silently ignore errors } diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java index 2a8a7bafd5..d2060ca71e 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java @@ -53,7 +53,7 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { } public void generate(Random pRandom, int pX, int pZ, World pWorld, IChunkProvider pChunkGenerator, - IChunkProvider pChunkProvider) { + IChunkProvider pChunkProvider) { pX *= 16; pZ *= 16; @@ -63,14 +63,14 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { tBiome = BiomeGenBase.plains.biomeName; } GalacticGreg.Logger - .trace("Triggered generate: [ChunkGenerator %s] [Biome %s]", pChunkGenerator.toString(), tBiome); + .trace("Triggered generate: [ChunkGenerator %s] [Biome %s]", pChunkGenerator.toString(), tBiome); ModDimensionDef tDimDef = GalacticGregRegistry.getDimensionTypeByChunkGenerator(pChunkGenerator); if (tDimDef == null) { GalacticGreg.Logger.trace( - "Ignoring ChunkGenerator type %s as there is no definition for it in the registry", - pChunkGenerator.toString()); + "Ignoring ChunkGenerator type %s as there is no definition for it in the registry", + pChunkGenerator.toString()); return; } else { GalacticGreg.Logger.trace("Selected DimDef: [%s]", tDimDef.getDimIdentifier()); @@ -84,8 +84,8 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { if (tDimDef.getDimensionType() != DimensionType.Planet) { if (tDimDef.getRandomAsteroidMaterial() == null) GalacticGreg.Logger.error( - "Dimension [%s] is set to Asteroids, but no asteroid material is specified! Nothing will generate", - tDimDef.getDimensionName()); + "Dimension [%s] is set to Asteroids, but no asteroid material is specified! Nothing will generate", + tDimDef.getDimensionName()); else Generate_Asteroids(tDimDef, pRandom, pWorld, pX, pZ); } else if (tDimDef.getDimensionType() != DimensionType.Asteroid) { Generate_OreVeins(tDimDef, pRandom, pWorld, pX, pZ, "", pChunkGenerator, pChunkProvider); @@ -103,8 +103,8 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { AsteroidConfig tAConf = DynamicDimensionConfig.getAsteroidConfig(pDimensionDef); if (tAConf == null) { GalacticGreg.Logger.error( - "Dimension %s is set to asteroid, but no config object can be found. Skipping!", - pDimensionDef.getDimIdentifier()); + "Dimension %s is set to asteroid, but no config object can be found. Skipping!", + pDimensionDef.getDimIdentifier()); return; } else { GalacticGreg.Logger.trace("Asteroid probability: %d", tAConf.Probability); @@ -122,7 +122,8 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { int tZ = pZ + pRandom.nextInt(16); // Check if position is free - if ((pWorld.getBlock(tX, tY, tZ).isAir(pWorld, tX, tY, tZ))) { + if ((pWorld.getBlock(tX, tY, tZ) + .isAir(pWorld, tX, tY, tZ))) { int tCustomAsteroidOffset = -1; int tGraniteMeta = 0; @@ -135,20 +136,23 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { // Fill Vars for random Asteroid Block tFinalAsteroidBlock = tABComb.getBlock(); int tFinalAsteroidBlockMeta = tABComb.getMeta(); - int tFinalOreOffset = tABComb.getOreMaterial().getOffset(); - int tFinalUpdateMode = tABComb.getOreMaterial().getUpdateMode(); + int tFinalOreOffset = tABComb.getOreMaterial() + .getOffset(); + int tFinalUpdateMode = tABComb.getOreMaterial() + .getUpdateMode(); GalacticGreg.Logger.debug( - "Asteroid will be build with: Block: [%s] OreType: [%s]", - Block.blockRegistry.getNameForObject(tABComb.getBlock()), - tABComb.getOreMaterial().toString()); + "Asteroid will be build with: Block: [%s] OreType: [%s]", + Block.blockRegistry.getNameForObject(tABComb.getBlock()), + tABComb.getOreMaterial() + .toString()); // get random Ore-asteroid generator from the list of registered generators ISpaceObjectGenerator aGen = pDimensionDef.getRandomSOGenerator(SpaceObjectType.OreAsteroid); if (aGen == null) { GalacticGreg.Logger.ot_error( - "GalacticGreg.Generate_Asteroids.NoSOGenFound", - "No SpaceObjectGenerator has been registered for type ORE_ASTEROID in Dimension %s. Nothing will generate", - pDimensionDef.getDimensionName()); + "GalacticGreg.Generate_Asteroids.NoSOGenFound", + "No SpaceObjectGenerator has been registered for type ORE_ASTEROID in Dimension %s. Nothing will generate", + pDimensionDef.getDimensionName()); return; } @@ -172,24 +176,27 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { else tNumLootItems = tAConf.NumLootItems; GalacticGreg.Logger - .debug(String.format("Loot chest random item count will be: %d", tNumLootItems)); + .debug(String.format("Loot chest random item count will be: %d", tNumLootItems)); // try to find any block that is not on the asteroids outer-shell GalacticGreg.Logger.trace("Starting lookup for valid asteroid-block for the chest"); for (int x = 0; x < 64; x++) // 64 enough? Should be { - int tRndBlock = pRandom.nextInt(aGen.getStructure().size()); - StructureInformation tChestSI = aGen.getStructure().get(tRndBlock); + int tRndBlock = pRandom.nextInt( + aGen.getStructure() + .size()); + StructureInformation tChestSI = aGen.getStructure() + .get(tRndBlock); if (tChestSI.getBlockPosition() != TargetBlockPosition.AsteroidShell) { GalacticGreg.Logger.debug( - String.format( - "Chest position found [x:%d y:%d z:%d]", - tChestSI.getX(), - tChestSI.getY(), - tChestSI.getZ())); + String.format( + "Chest position found [x:%d y:%d z:%d]", + tChestSI.getX(), + tChestSI.getY(), + tChestSI.getZ())); // Found valid position "Somewhere" in the asteroid, set position... tChestPosition = Vec3 - .createVectorHelper(tChestSI.getX(), tChestSI.getY(), tChestSI.getZ()); + .createVectorHelper(tChestSI.getX(), tChestSI.getY(), tChestSI.getZ()); // .. and set CreateFlag to true tDoLootChest = true; break; @@ -208,56 +215,53 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { { // Check if current x/y/z is the location where the chest shall be created if ((int) tChestPosition.xCoord == si.getX() && (int) tChestPosition.yCoord == si.getY() - && (int) tChestPosition.zCoord == si.getZ()) { + && (int) tChestPosition.zCoord == si.getZ()) { GalacticGreg.Logger.trace("Now generating LootChest and contents"); // Get items for the configured loot-table WeightedRandomChestContent[] tRandomLoot = ChestGenHooks - .getItems(DynamicDimensionConfig.getLootChestTable(tAConf), pRandom); + .getItems(DynamicDimensionConfig.getLootChestTable(tAConf), pRandom); // Get chest-block to spawn BlockMetaComb tTargetChestType = GalacticGreg.GalacticConfig.CustomLootChest; // Place down the chest if (tTargetChestType.getMeta() > 0) pWorld.setBlock( - si.getX(), - si.getY(), - si.getZ(), - tTargetChestType.getBlock(), - tTargetChestType.getMeta(), - 2); + si.getX(), + si.getY(), + si.getZ(), + tTargetChestType.getBlock(), + tTargetChestType.getMeta(), + 2); else pWorld.setBlock(si.getX(), si.getY(), si.getZ(), tTargetChestType.getBlock()); // Retrieve the TEs IInventory that should've been created IInventory entityChestInventory = (IInventory) pWorld - .getTileEntity(si.getX(), si.getY(), si.getZ()); + .getTileEntity(si.getX(), si.getY(), si.getZ()); // If it's not null... if (entityChestInventory != null) { // and if we're on the server... if (!pWorld.isRemote) { // Fill the chest with stuffz! WeightedRandomChestContent.generateChestContents( - pRandom, - tRandomLoot, - entityChestInventory, - tNumLootItems); + pRandom, + tRandomLoot, + entityChestInventory, + tNumLootItems); GalacticGreg.Logger.trace("Loot chest successfully generated"); } } else { // Something made a boo.. GalacticGreg.Logger.warn( - "Could not create lootchest at X[%d] Y[%d] Z[%d]. getTileEntity() returned null", - si.getX(), - si.getY(), - si.getZ()); + "Could not create lootchest at X[%d] Y[%d] Z[%d]. getTileEntity() returned null", + si.getX(), + si.getY(), + si.getZ()); } // Make sure we never compare coordinates again (for this asteroid/Structure) tDoLootChest = false; // Do some debug logging - GalacticGreg.Logger.debug( - "Generated LootChest at X[%d] Y[%d] Z[%d]", - si.getX(), - si.getY(), - si.getZ()); + GalacticGreg.Logger + .debug("Generated LootChest at X[%d] Y[%d] Z[%d]", si.getX(), si.getY(), si.getZ()); // And skip the rest of this function continue; } @@ -303,18 +307,18 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { if (tAConf.HiddenOres && (si.getBlockPosition() == TargetBlockPosition.AsteroidShell)) { // Ore would be placed around the shell, which is disabled (hiddenores) GalacticGreg.Logger.trace( - "Skipping ore-placement event (HiddenOres=true; TargetBlockPosition=AsteroidShell)"); + "Skipping ore-placement event (HiddenOres=true; TargetBlockPosition=AsteroidShell)"); } else { // try to place the ore block. The result is stored in tPlacedOreBlock tPlacedOreBlock = GT_TileEntity_Ores_Space.setOuterSpaceOreBlock( - pDimensionDef, - pWorld, - si.getX(), - si.getY(), - si.getZ(), - tOreGroup.SecondaryMeta, - true, - tFinalOreOffset); + pDimensionDef, + pWorld, + si.getX(), + si.getY(), + si.getZ(), + tOreGroup.SecondaryMeta, + true, + tFinalOreOffset); } } } @@ -325,34 +329,34 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { if (!tPlacedOreBlock) { // try to spawn special blocks boolean tFlag = doGenerateSpecialBlocks( - pDimensionDef, - pRandom, - pWorld, - tAConf, - si.getX(), - si.getY(), - si.getZ(), - si.getBlockPosition()); + pDimensionDef, + pRandom, + pWorld, + tAConf, + si.getX(), + si.getY(), + si.getZ(), + si.getBlockPosition()); // No special block placed? Try smallores if (tFlag) tFlag = doGenerateSmallOreBlock( - pDimensionDef, - pRandom, - pWorld, - tAConf, - si.getX(), - si.getY(), - si.getZ(), - tFinalOreOffset); + pDimensionDef, + pRandom, + pWorld, + tAConf, + si.getX(), + si.getY(), + si.getZ(), + tFinalOreOffset); // no smallores either? do normal block if (tFlag) pWorld.setBlock( - si.getX(), - si.getY(), - si.getZ(), - tFinalAsteroidBlock, - tFinalAsteroidBlockMeta, - tFinalUpdateMode); + si.getX(), + si.getY(), + si.getZ(), + tFinalAsteroidBlock, + tFinalAsteroidBlockMeta, + tFinalUpdateMode); } // << Additional special blocks === @@ -367,9 +371,9 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { long tTotalTime = mProfilingEnd - mProfilingStart; GalacticGreg.Profiler.AddTimeToList(pDimensionDef, tTotalTime); GalacticGreg.Logger.debug( - "Done with Asteroid-Worldgen in DimensionType %s. Generation took %d ms", - pDimensionDef.getDimensionName(), - tTotalTime); + "Done with Asteroid-Worldgen in DimensionType %s. Generation took %d ms", + pDimensionDef.getDimensionName(), + tTotalTime); } catch (Exception ignored) {} // Silently ignore errors } // --------------------------- @@ -390,7 +394,7 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { * @return */ private boolean doGenerateSpecialBlocks(ModDimensionDef pDimensionDef, Random pRandom, World pWorld, - AsteroidConfig tAConf, int eX, int eY, int eZ, TargetBlockPosition pBlockPosition) { + AsteroidConfig tAConf, int eX, int eY, int eZ, TargetBlockPosition pBlockPosition) { boolean tFlag = true; // Handler to generate special BlockTypes randomly if activated @@ -406,8 +410,7 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { break; case AsteroidCoreAndShell: if (pBlockPosition == TargetBlockPosition.AsteroidCore - || pBlockPosition == TargetBlockPosition.AsteroidShell) - tIsAllowed = true; + || pBlockPosition == TargetBlockPosition.AsteroidShell) tIsAllowed = true; break; case AsteroidShell: if (pBlockPosition == TargetBlockPosition.AsteroidShell) tIsAllowed = true; @@ -437,7 +440,7 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { * @return */ private boolean doGenerateSmallOreBlock(ModDimensionDef pDimDef, Random pRandom, World pWorld, - AsteroidConfig pAConf, int pX, int pY, int pZ, int pTargetBlockOffset) { + AsteroidConfig pAConf, int pX, int pY, int pZ, int pTargetBlockOffset) { boolean tFlag = true; // If smallores are enabled... if (pAConf.SmallOreChance > 0) { @@ -465,8 +468,7 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { // And in the correct y-level, of ObeyLimits is true... if (pAConf.ObeyHeightLimits - && !((GT_Worldgen_GT_Ore_SmallPieces_Space) tWorldGen).isAllowedForHeight(pY)) - continue; + && !((GT_Worldgen_GT_Ore_SmallPieces_Space) tWorldGen).isAllowedForHeight(pY)) continue; // Care about weight tRandomWeight -= ((GT_Worldgen_GT_Ore_SmallPieces_Space) tWorldGen).mAmount; @@ -485,7 +487,7 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { // Set the smallOre block GT_TileEntity_Ores_Space - .setOuterSpaceOreBlock(pDimDef, pWorld, pX, pY, pZ, tFoundOreMeta, true, tCustomOffset); + .setOuterSpaceOreBlock(pDimDef, pWorld, pX, pY, pZ, tFoundOreMeta, true, tCustomOffset); tFlag = false; } else { bwOreGen.setOreBlock(pWorld, pX, pY, pZ, tFoundOreMeta, true); @@ -509,7 +511,7 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { * @param pChunkProvider */ private void Generate_OreVeins(ModDimensionDef pDimensionDef, Random pRandom, World pWorld, int pX, int pZ, - String pBiome, IChunkProvider pChunkGenerator, IChunkProvider pChunkProvider) { + String pBiome, IChunkProvider pChunkGenerator, IChunkProvider pChunkProvider) { GalacticGreg.Logger.trace("Running orevein-gen in Dim %s", pDimensionDef.getDimIdentifier()); if (GT_Worldgenerator.isOreChunk(pX / 16, pZ / 16)) { @@ -527,14 +529,14 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { if (tRandomWeight <= 0) { try { if (tWorldGen.executeWorldgen( - pWorld, - pRandom, - pBiome, - Integer.MIN_VALUE, - pX, - pZ, - pChunkGenerator, - pChunkProvider)) { + pWorld, + pRandom, + pBiome, + Integer.MIN_VALUE, + pX, + pZ, + pChunkGenerator, + pChunkProvider)) { temp = false; } } catch (Throwable e) { @@ -554,14 +556,14 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { for (GT_Worldgen tWorldGen : GalacticGreg.smallOreWorldgenList) { try { tWorldGen.executeWorldgen( - pWorld, - pRandom, - "", - Integer.MIN_VALUE, - tX, - tZ, - pChunkGenerator, - pChunkProvider); + pWorld, + pRandom, + "", + Integer.MIN_VALUE, + tX, + tZ, + pChunkGenerator, + pChunkProvider); } catch (Throwable e) { e.printStackTrace(GT_Log.err); } diff --git a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java index 570fbadbee..3becbcb92b 100644 --- a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java +++ b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java @@ -23,11 +23,11 @@ import gregtech.api.GregTech_API; import gregtech.api.world.GT_Worldgen; @Mod( - modid = GalacticGreg.MODID, - name = GalacticGreg.MODNAME, - version = GalacticGreg.VERSION, - dependencies = "required-after:GalacticraftCore; required-after:gregtech@5.09.32.30;", - acceptableRemoteVersions = "*") + modid = GalacticGreg.MODID, + name = GalacticGreg.MODNAME, + version = GalacticGreg.VERSION, + dependencies = "required-after:GalacticraftCore; required-after:gregtech@5.09.32.30;", + acceptableRemoteVersions = "*") public class GalacticGreg { public static final List<GT_Worldgen> smallOreWorldgenList = new ArrayList<>(); @@ -56,7 +56,7 @@ public class GalacticGreg { public void onPreLoad(FMLPreInitializationEvent aEvent) { GalacticConfig = new GalacticGregConfig(aEvent.getModConfigurationDirectory(), NICE_MODID, NICE_MODID); if (!GalacticConfig.LoadConfig()) GalacticGreg.Logger - .warn("Something went wrong while reading GalacticGregs config file. Things will be wonky.."); + .warn("Something went wrong while reading GalacticGregs config file. Things will be wonky.."); GalacticRandom = new Random(System.currentTimeMillis()); @@ -85,31 +85,29 @@ public class GalacticGreg { Logger.trace("Entering POSTLOAD"); if (!GalacticGregRegistry.InitRegistry()) throw new RuntimeException( - "GalacticGreg registry has been finalized from a 3rd-party mod, this is forbidden!"); + "GalacticGreg registry has been finalized from a 3rd-party mod, this is forbidden!"); // new WorldGenGaGT().run(); DO NOT UNCOMMENT, was moved to gregtech.loaders.postload.GT_Worldgenloader if (Loader.isModLoaded("bartworks")) { for (int f = 0, - j = GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks", "AmountOfCustomLargeVeinSlots", 0); f - < j; f++) { + j = GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks", "AmountOfCustomLargeVeinSlots", 0); f + < j; f++) { new BW_Worldgen_Ore_Layer_Space( - "mix.custom." + (f < 10 ? "0" : "") + f, - GregTech_API.sWorldgenFile.get( - "worldgen.GaGregBartworks." + "mix.custom." + (f < 10 ? "0" : "") + f, - "Enabled", - false)); + "mix.custom." + (f < 10 ? "0" : "") + f, + GregTech_API.sWorldgenFile + .get("worldgen.GaGregBartworks." + "mix.custom." + (f < 10 ? "0" : "") + f, "Enabled", false)); } for (int f = 0, - j = GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks", "AmountOfCustomSmallSlots", 0); f - < j; f++) { + j = GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks", "AmountOfCustomSmallSlots", 0); f + < j; f++) { new BW_Worldgen_Ore_SmallOre_Space( - "small.custom." + (f < 10 ? "0" : "") + f, - GregTech_API.sWorldgenFile.get( - "worldgen.GaGregBartworks." + "small.custom." + (f < 10 ? "0" : "") + f, - "Enabled", - false)); + "small.custom." + (f < 10 ? "0" : "") + f, + GregTech_API.sWorldgenFile.get( + "worldgen.GaGregBartworks." + "small.custom." + (f < 10 ? "0" : "") + f, + "Enabled", + false)); } } @@ -138,8 +136,7 @@ public class GalacticGreg { if (GalacticConfig.ProfileOreGen) pEvent.registerServerCommand(new ProfilingCommand()); if (Loader.isModLoaded("appliedenergistics2") && GalacticConfig.EnableAEExportCommand - && GalacticConfig.SchematicsEnabled) - pEvent.registerServerCommand(new AEStorageCommand()); + && GalacticConfig.SchematicsEnabled) pEvent.registerServerCommand(new AEStorageCommand()); Logger.trace("Leaving SERVERLOAD"); } diff --git a/src/main/java/bloodasp/galacticgreg/ModRegisterer.java b/src/main/java/bloodasp/galacticgreg/ModRegisterer.java index 9a917eafab..889cee0ca6 100644 --- a/src/main/java/bloodasp/galacticgreg/ModRegisterer.java +++ b/src/main/java/bloodasp/galacticgreg/ModRegisterer.java @@ -84,9 +84,9 @@ public class ModRegisterer { // DimensionType.Asteroid // also don't forget to add at least one asteroid type, or nothing will generate! ModDimensionDef dimEndAsteroids = new ModDimensionDef( - "EndAsteroids", - ChunkProviderEnd.class, - DimensionType.Asteroid); + "EndAsteroids", + ChunkProviderEnd.class, + DimensionType.Asteroid); dimEndAsteroids.addAsteroidMaterial(new AsteroidBlockComb(GTOreTypes.Netherrack)); dimEndAsteroids.addAsteroidMaterial(new AsteroidBlockComb(GTOreTypes.RedGranite)); @@ -110,10 +110,10 @@ public class ModRegisterer { ModDBMDef DBMMoon = new ModDBMDef("tile.moonBlock", 4); ModDimensionDef tMoonDim = new ModDimensionDef( - "Moon", - "micdoodle8.mods.galacticraft.core.world.gen.ChunkProviderMoon", - Enums.DimensionType.Planet, - singleToList(DBMMoon)); + "Moon", + "micdoodle8.mods.galacticraft.core.world.gen.ChunkProviderMoon", + Enums.DimensionType.Planet, + singleToList(DBMMoon)); modGCraftCore.addDimensionDef(tMoonDim); return modGCraftCore; @@ -128,19 +128,19 @@ public class ModRegisterer { ModContainer modGCraftPlanets = new ModContainer("GalacticraftMars"); ModDBMDef DBMMars = new ModDBMDef("tile.mars", 9); ModDimensionDef dimMars = new ModDimensionDef( - "Mars", - "micdoodle8.mods.galacticraft.planets.mars.world.gen.ChunkProviderMars", - DimensionType.Planet, - singleToList(DBMMars)); + "Mars", + "micdoodle8.mods.galacticraft.planets.mars.world.gen.ChunkProviderMars", + DimensionType.Planet, + singleToList(DBMMars)); // Overwrite ore blocks on mars with red granite ones. This will default to regular stone if not set dimMars.setStoneType(GTOreTypes.RedGranite); modGCraftPlanets.addDimensionDef(dimMars); ModDimensionDef dimAsteroids = new ModDimensionDef( - "Asteroids", - "micdoodle8.mods.galacticraft.planets.asteroids.world.gen.ChunkProviderAsteroids", - DimensionType.Asteroid); + "Asteroids", + "micdoodle8.mods.galacticraft.planets.asteroids.world.gen.ChunkProviderAsteroids", + DimensionType.Asteroid); dimAsteroids.addAsteroidMaterial(new AsteroidBlockComb(GTOreTypes.BlackGranite)); dimAsteroids.addAsteroidMaterial(new AsteroidBlockComb(GTOreTypes.RedGranite)); dimAsteroids.addAsteroidMaterial(new AsteroidBlockComb(GTOreTypes.Netherrack)); @@ -184,95 +184,95 @@ public class ModRegisterer { // 25.10.2015 GSpace v2.5 modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Pluto", - "blessentumble.planets.SolarSystem.pluto.dimension.ChunkProviderPluto", - DimensionType.Planet, - singleToList(DBMPluto))); + new ModDimensionDef( + "Pluto", + "blessentumble.planets.SolarSystem.pluto.dimension.ChunkProviderPluto", + DimensionType.Planet, + singleToList(DBMPluto))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Triton", - "blessentumble.moons.triton.dimension.ChunkProviderTriton", - DimensionType.Planet, - singleToList(DBMTriton))); + new ModDimensionDef( + "Triton", + "blessentumble.moons.triton.dimension.ChunkProviderTriton", + DimensionType.Planet, + singleToList(DBMTriton))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Proteus", - "blessentumble.moons.proteus.dimension.ChunkProviderProteus", - DimensionType.Planet, - singleToList(DBMProteus))); + new ModDimensionDef( + "Proteus", + "blessentumble.moons.proteus.dimension.ChunkProviderProteus", + DimensionType.Planet, + singleToList(DBMProteus))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Oberon", - "blessentumble.moons.oberon.dimension.ChunkProviderOberon", - DimensionType.Planet, - singleToList(DBMOberon))); + new ModDimensionDef( + "Oberon", + "blessentumble.moons.oberon.dimension.ChunkProviderOberon", + DimensionType.Planet, + singleToList(DBMOberon))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Titan", - "blessentumble.moons.titan.dimension.ChunkProviderTitan", - DimensionType.Planet, - singleToList(DBMTitan))); + new ModDimensionDef( + "Titan", + "blessentumble.moons.titan.dimension.ChunkProviderTitan", + DimensionType.Planet, + singleToList(DBMTitan))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Callisto", - "blessentumble.moons.SolarSystem.callisto.dimension.ChunkProviderCallisto", - DimensionType.Planet, - singleToList(DBMCallisto))); + new ModDimensionDef( + "Callisto", + "blessentumble.moons.SolarSystem.callisto.dimension.ChunkProviderCallisto", + DimensionType.Planet, + singleToList(DBMCallisto))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Ganymede", - "blessentumble.moons.ganymede.dimension.ChunkProviderGanymede", - DimensionType.Planet, - singleToList(DBMGanymede))); + new ModDimensionDef( + "Ganymede", + "blessentumble.moons.ganymede.dimension.ChunkProviderGanymede", + DimensionType.Planet, + singleToList(DBMGanymede))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Ceres", - "blessentumble.planets.SolarSystem.ceres.dimension.ChunkProviderCeres", - DimensionType.Planet, - singleToList(DBMCeres))); + new ModDimensionDef( + "Ceres", + "blessentumble.planets.SolarSystem.ceres.dimension.ChunkProviderCeres", + DimensionType.Planet, + singleToList(DBMCeres))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Deimos", - "blessentumble.moons.SolarSystem.deimos.dimension.ChunkProviderDeimos", - DimensionType.Planet, - singleToList(DBMDeimos))); + new ModDimensionDef( + "Deimos", + "blessentumble.moons.SolarSystem.deimos.dimension.ChunkProviderDeimos", + DimensionType.Planet, + singleToList(DBMDeimos))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Enceladus", - "blessentumble.moons.SolarSystem.enceladus.dimension.ChunkProviderEnceladus", - DimensionType.Planet, - singleToList(DBMEnceladus))); + new ModDimensionDef( + "Enceladus", + "blessentumble.moons.SolarSystem.enceladus.dimension.ChunkProviderEnceladus", + DimensionType.Planet, + singleToList(DBMEnceladus))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Io", - "blessentumble.moons.io.dimension.ChunkProviderIo", - DimensionType.Planet, - singleToList(DBMIO))); + new ModDimensionDef( + "Io", + "blessentumble.moons.io.dimension.ChunkProviderIo", + DimensionType.Planet, + singleToList(DBMIO))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Phobos", - "blessentumble.moons.phobos.dimension.ChunkProviderPhobos", - DimensionType.Planet, - singleToList(DBMPhobos))); + new ModDimensionDef( + "Phobos", + "blessentumble.moons.phobos.dimension.ChunkProviderPhobos", + DimensionType.Planet, + singleToList(DBMPhobos))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Venus", - "blessentumble.planets.SolarSystem.venus.dimension.ChunkProviderVenus", - DimensionType.Planet, - singleToList(DBMVenus))); + new ModDimensionDef( + "Venus", + "blessentumble.planets.SolarSystem.venus.dimension.ChunkProviderVenus", + DimensionType.Planet, + singleToList(DBMVenus))); modCGalaxySpace.addDimensionDef( - new ModDimensionDef( - "Mercury", - "blessentumble.planets.SolarSystem.mercury.dimension.ChunkProviderMercury", - DimensionType.Planet, - singleToList(DBMMercury))); + new ModDimensionDef( + "Mercury", + "blessentumble.planets.SolarSystem.mercury.dimension.ChunkProviderMercury", + DimensionType.Planet, + singleToList(DBMMercury))); // GSpace 2.2-Beta: Kupierbelt ModDimensionDef dimKupierBelt = new ModDimensionDef( - "Kuiperbelt", - "blessentumble.planets.SolarSystem.kuiperbelt.dimension.ChunkProviderKuiper", - DimensionType.Asteroid); + "Kuiperbelt", + "blessentumble.planets.SolarSystem.kuiperbelt.dimension.ChunkProviderKuiper", + DimensionType.Asteroid); dimKupierBelt.setDimensionType(DimensionType.Asteroid); dimKupierBelt.addAsteroidMaterial(new AsteroidBlockComb(GTOreTypes.RedGranite)); dimKupierBelt.addAsteroidMaterial(new AsteroidBlockComb(GTOreTypes.BlackGranite)); diff --git a/src/main/java/bloodasp/galacticgreg/WorldGenGaGT.java b/src/main/java/bloodasp/galacticgreg/WorldGenGaGT.java index 0e059da7ed..90f51ec7e1 100644 --- a/src/main/java/bloodasp/galacticgreg/WorldGenGaGT.java +++ b/src/main/java/bloodasp/galacticgreg/WorldGenGaGT.java @@ -50,12 +50,12 @@ public class WorldGenGaGT implements Runnable { */ for (int k = 0; k < GT_Worldgen_GT_Ore_SmallPieces.sList.size(); ++k) { new GT_Worldgen_GT_Ore_SmallPieces_Space( - GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mWorldGenName, - GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mEnabled, - GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMinY, - GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMaxY, - GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mAmount, - GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMeta); + GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mWorldGenName, + GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mEnabled, + GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMinY, + GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMaxY, + GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mAmount, + GT_Worldgen_GT_Ore_SmallPieces.sList.get(k).mMeta); } /* @@ -63,17 +63,17 @@ public class WorldGenGaGT implements Runnable { */ for (int k = 0; k < GT_Worldgen_GT_Ore_Layer.sList.size(); ++k) { new GT_Worldgen_GT_Ore_Layer_Space( - GT_Worldgen_GT_Ore_Layer.sList.get(k).mWorldGenName, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mEnabled, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mMinY, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mMaxY, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mWeight, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mDensity, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mSize, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mPrimaryMeta, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mSecondaryMeta, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mBetweenMeta, - GT_Worldgen_GT_Ore_Layer.sList.get(k).mSporadicMeta); + GT_Worldgen_GT_Ore_Layer.sList.get(k).mWorldGenName, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mEnabled, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mMinY, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mMaxY, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mWeight, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mDensity, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mSize, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mPrimaryMeta, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mSecondaryMeta, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mBetweenMeta, + GT_Worldgen_GT_Ore_Layer.sList.get(k).mSporadicMeta); } /* diff --git a/src/main/java/bloodasp/galacticgreg/api/ModContainer.java b/src/main/java/bloodasp/galacticgreg/api/ModContainer.java index 5ab4aecc8e..b5416b164f 100644 --- a/src/main/java/bloodasp/galacticgreg/api/ModContainer.java +++ b/src/main/java/bloodasp/galacticgreg/api/ModContainer.java @@ -70,7 +70,8 @@ public class ModContainer { */ public boolean addDimensionDef(ModDimensionDef pDimDef) { for (ModDimensionDef mdd : _mDimensionLookup) { - if (mdd.getChunkProviderName().equals(pDimDef.getChunkProviderName())) { + if (mdd.getChunkProviderName() + .equals(pDimDef.getChunkProviderName())) { // Cannot add DimensionDefinition; The Given chunk-provider name is already taken! return false; } diff --git a/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java b/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java index 6a2c544276..bd0df8652b 100644 --- a/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java +++ b/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java @@ -38,7 +38,8 @@ public class ModDBMDef { public ReplaceState blockEquals(Block pBlock) { if (pBlock == null) return ReplaceState.Unknown; - if (Block.blockRegistry.getNameForObject(pBlock).equals(_targetBlockName)) return ReplaceState.CanReplace; + if (Block.blockRegistry.getNameForObject(pBlock) + .equals(_targetBlockName)) return ReplaceState.CanReplace; else return ReplaceState.CannotReplace; } diff --git a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java index e56b929c4f..4b634173f1 100644 --- a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java +++ b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java @@ -282,8 +282,13 @@ public class ModDimensionDef { * @param pChunkProvider The chunkprovider class that shall be observed for the oregen */ public ModDimensionDef(String pDimensionName, Class<? extends IChunkProvider> pChunkProvider, - DimensionType pDimType) { - this(pDimensionName, pChunkProvider.toString().substring(6), pDimType, null); + DimensionType pDimType) { + this( + pDimensionName, + pChunkProvider.toString() + .substring(6), + pDimType, + null); } /** @@ -294,8 +299,13 @@ public class ModDimensionDef { * @param pBlockDefinitions The list of predefined blocks to be replaced by ores */ public ModDimensionDef(String pDimensionName, Class<? extends IChunkProvider> pChunkProvider, - DimensionType pDimType, List<ModDBMDef> pBlockDefinitions) { - this(pDimensionName, pChunkProvider.toString().substring(6), pDimType, pBlockDefinitions); + DimensionType pDimType, List<ModDBMDef> pBlockDefinitions) { + this( + pDimensionName, + pChunkProvider.toString() + .substring(6), + pDimType, + pBlockDefinitions); } /** @@ -316,7 +326,7 @@ public class ModDimensionDef { * @param pBlockDefinitions The list of predefined blocks to be replaced by ores */ public ModDimensionDef(String pDimensionName, String pChunkProviderName, DimensionType pDimType, - List<ModDBMDef> pBlockDefinitions) { + List<ModDBMDef> pBlockDefinitions) { _mInternalDimIdentifier = STR_NOTDEFINED; _mDimensionName = pDimensionName; _mChunkProvider = pChunkProviderName; diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/GalacticGregConfig.java b/src/main/java/bloodasp/galacticgreg/auxiliary/GalacticGregConfig.java index f932941c7e..156e620959 100644 --- a/src/main/java/bloodasp/galacticgreg/auxiliary/GalacticGregConfig.java +++ b/src/main/java/bloodasp/galacticgreg/auxiliary/GalacticGregConfig.java @@ -49,51 +49,51 @@ public class GalacticGregConfig extends ConfigManager { @Override protected void Init() { ProfileOreGen = _mainConfig.getBoolean( - "ProfileOreGen", - "Debug", - ProfileOreGen, - "Enable to profile oregen and register the ingame command ggregprofiler"); + "ProfileOreGen", + "Debug", + ProfileOreGen, + "Enable to profile oregen and register the ingame command ggregprofiler"); ReportOreGenFailures = _mainConfig.getBoolean( - "ReportOreGenFailures", - "Debug", - ReportOreGenFailures, - "Report if a ore tileentity could not be placed"); + "ReportOreGenFailures", + "Debug", + ReportOreGenFailures, + "Report if a ore tileentity could not be placed"); PrintDebugMessagesToFMLLog = _mainConfig.getBoolean( - "PrintDebugMessagesToFMLLog", - "Debug", - PrintDebugMessagesToFMLLog, - "Enable debug output, not recommended for servers"); + "PrintDebugMessagesToFMLLog", + "Debug", + PrintDebugMessagesToFMLLog, + "Enable debug output, not recommended for servers"); PrintTraceMessagesToFMLLog = _mainConfig.getBoolean( - "PrintTraceMessagesToFMLLog", - "Debug", - PrintTraceMessagesToFMLLog, - "Enable trace output. Warning: This will produce gazillions of log entries"); + "PrintTraceMessagesToFMLLog", + "Debug", + PrintTraceMessagesToFMLLog, + "Enable trace output. Warning: This will produce gazillions of log entries"); QuietMode = _mainConfig.getBoolean( - "QuietMode", - "Debug", - QuietMode, - "In quiet-mode only errors, warnings and fatals will be printed to the logfile/console"); + "QuietMode", + "Debug", + QuietMode, + "In quiet-mode only errors, warnings and fatals will be printed to the logfile/console"); LootChestsEnabled = _mainConfig.getBoolean( - "LootChestsEnabled", - "Extras", - LootChestsEnabled, - "Enables/disables the dungeon-chest generator system for asteroids. New config values will be generated if set to true"); + "LootChestsEnabled", + "Extras", + LootChestsEnabled, + "Enables/disables the dungeon-chest generator system for asteroids. New config values will be generated if set to true"); EnableAEExportCommand = _mainConfig.getBoolean( - "EnableAEExportCommand", - "Extras", - EnableAEExportCommand, - "If set to true, you can export any structure stored on a AE2 spatial storage disk. (Can't be spawned yet, WiP). Requires SchematicsEnabled to be true"); + "EnableAEExportCommand", + "Extras", + EnableAEExportCommand, + "If set to true, you can export any structure stored on a AE2 spatial storage disk. (Can't be spawned yet, WiP). Requires SchematicsEnabled to be true"); SchematicsEnabled = _mainConfig.getBoolean( - "SchematicsEnabled", - "Extras", - SchematicsEnabled, - "Enable the experimental Schematics-handler to spawn exported schematics in dimensions. This is WiP, use at own risk"); + "SchematicsEnabled", + "Extras", + SchematicsEnabled, + "Enable the experimental Schematics-handler to spawn exported schematics in dimensions. This is WiP, use at own risk"); LootChestItemOverride = _mainConfig.getString( - "CustomLootChest", - "Extras", - LootChestItemOverride, - "Define the chest you wish to use as LootChest. use the <ModID>:<Name>:<meta> format or leave empty for the default Minecraft Chest"); + "CustomLootChest", + "Extras", + LootChestItemOverride, + "Define the chest you wish to use as LootChest. use the <ModID>:<Name>:<meta> format or leave empty for the default Minecraft Chest"); GalacticGreg.Logger.setDebugOutput(PrintDebugMessagesToFMLLog); GalacticGreg.Logger.setTraceOutput(PrintTraceMessagesToFMLLog); @@ -123,7 +123,7 @@ public class GalacticGregConfig extends ConfigManager { Block tBlock = GameRegistry.findBlock(tMod, tName); if (tBlock != null) { GalacticGreg.Logger - .debug("Found valid ChestOverride: %s. LootChest replaced", LootChestItemOverride); + .debug("Found valid ChestOverride: %s. LootChest replaced", LootChestItemOverride); CustomLootChest = new BlockMetaComb(tBlock, tMeta); } } @@ -132,8 +132,8 @@ public class GalacticGregConfig extends ConfigManager { return true; } catch (Exception e) { GalacticGreg.Logger.error( - "Unable to find custom chest override %s. Make sure item exists. Defaulting to Minecraft:chest", - LootChestItemOverride); + "Unable to find custom chest override %s. Make sure item exists. Defaulting to Minecraft:chest", + LootChestItemOverride); e.printStackTrace(); return false; } diff --git a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java index 01345a4b40..ae5e6af7c5 100644 --- a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java +++ b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java @@ -50,21 +50,20 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { * @param sporadicBW either a werkstoff or a materials */ public BW_Worldgen_Ore_Layer_Space(String aName, boolean pDefault, int pMinY, int pMaxY, int pWeight, int pDensity, - int pSize, ISubTagContainer primaryBW, ISubTagContainer secondaryBW, ISubTagContainer betweenBW, - ISubTagContainer sporadicBW) { + int pSize, ISubTagContainer primaryBW, ISubTagContainer secondaryBW, ISubTagContainer betweenBW, + ISubTagContainer sporadicBW) { super(aName, pDefault, 0, 0, 0, 0, 0, primaryBW, secondaryBW, betweenBW, sporadicBW); mMinY = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "MinHeight", pMinY)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "MinHeight", pMinY)); mMaxY = ((short) Math.max( - this.mMinY + 5, - GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "MaxHeight", pMaxY))); + this.mMinY + 5, + GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "MaxHeight", pMaxY))); mWeight = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "RandomWeight", pWeight)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "RandomWeight", pWeight)); mDensity = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "Density", pDensity)); - mSize = ((short) Math.max( - 1, - GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "Size", pSize))); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "Density", pDensity)); + mSize = ((short) Math + .max(1, GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "Size", pSize))); // short pPrimary = primaryBW instanceof Materials ? (short)((Materials)primaryBW).mMetaItemSubID : (primaryBW // instanceof Werkstoff ? ((Werkstoff)primaryBW).getmID() : 0); // short pSecondary = secondaryBW instanceof Materials ? (short)((Materials)secondaryBW).mMetaItemSubID : @@ -91,9 +90,15 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { _mDynWorldConfig.InitDynamicConfig(); StringBuilder ret = new StringBuilder(); - for (Map.Entry<String, Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap().entrySet().stream() - .filter(Map.Entry::getValue).collect(Collectors.toSet())) - ret.append(key.getKey().split("_")[1]).append("; "); + for (Map.Entry<String, Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap() + .entrySet() + .stream() + .filter(Map.Entry::getValue) + .collect(Collectors.toSet())) + ret.append( + key.getKey() + .split("_")[1]) + .append("; "); name = ret.substring(0, ret.length() - 1); } @@ -117,48 +122,53 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { * @param sporadicBW */ public BW_Worldgen_Ore_Layer_Space(String aName, boolean pDefault, int pMinY, int pMaxY, int pWeight, int pDensity, - int pSize, int pPrimary, int pSecondary, int pBetween, int pSporadic, boolean primaryBW, - boolean secondaryBW, boolean betweenBW, boolean sporadicBW) { + int pSize, int pPrimary, int pSecondary, int pBetween, int pSporadic, boolean primaryBW, boolean secondaryBW, + boolean betweenBW, boolean sporadicBW) { super( - aName, - pDefault, - 0, - 0, - 0, - 0, - 0, - primaryBW ? Werkstoff.default_null_Werkstoff : Materials._NULL, - secondaryBW ? Werkstoff.default_null_Werkstoff : Materials._NULL, - betweenBW ? Werkstoff.default_null_Werkstoff : Materials._NULL, - sporadicBW ? Werkstoff.default_null_Werkstoff : Materials._NULL); + aName, + pDefault, + 0, + 0, + 0, + 0, + 0, + primaryBW ? Werkstoff.default_null_Werkstoff : Materials._NULL, + secondaryBW ? Werkstoff.default_null_Werkstoff : Materials._NULL, + betweenBW ? Werkstoff.default_null_Werkstoff : Materials._NULL, + sporadicBW ? Werkstoff.default_null_Werkstoff : Materials._NULL); mMinY = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "MinHeight", pMinY)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "MinHeight", pMinY)); mMaxY = ((short) Math.max( - this.mMinY + 5, - GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "MaxHeight", pMaxY))); + this.mMinY + 5, + GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "MaxHeight", pMaxY))); mWeight = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "RandomWeight", pWeight)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "RandomWeight", pWeight)); mDensity = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "Density", pDensity)); - mSize = ((short) Math.max( - 1, - GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "Size", pSize))); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "Density", pDensity)); + mSize = ((short) Math + .max(1, GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "Size", pSize))); mPrimaryMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "OrePrimaryLayer", pPrimary)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "OrePrimaryLayer", pPrimary)); mSecondaryMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSecondaryLayer", pSecondary)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSecondaryLayer", pSecondary)); mBetweenMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSporadiclyInbetween", pBetween)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSporadiclyInbetween", pBetween)); mSporadicMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSporaticlyAround", pSporadic)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSporaticlyAround", pSporadic)); bwOres = ((byte) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "BWGTlogic", bwOres)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "BWGTlogic", bwOres)); _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName, true); _mDynWorldConfig.InitDynamicConfig(); StringBuilder ret = new StringBuilder(); - for (Map.Entry<String, Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap().entrySet().stream() - .filter(Map.Entry::getValue).collect(Collectors.toSet())) - ret.append(key.getKey().split("_")[1]).append("; "); + for (Map.Entry<String, Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap() + .entrySet() + .stream() + .filter(Map.Entry::getValue) + .collect(Collectors.toSet())) + ret.append( + key.getKey() + .split("_")[1]) + .append("; "); name = ret.length() == 0 ? "" : ret.substring(0, ret.length() - 1); if (mEnabled) { sWeight += this.mWeight; @@ -182,61 +192,61 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { @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) { ModDimensionDef tMDD = GalacticGregRegistry.getDimensionTypeByChunkGenerator(aChunkGenerator); if (tMDD == null) return false; pDimensionDef = tMDD; return super.executeWorldgen( - aWorld, - aRandom, - aBiome, - aDimensionType, - aChunkX, - aChunkZ, - aChunkGenerator, - aChunkProvider); + aWorld, + aRandom, + aBiome, + aDimensionType, + aChunkX, + aChunkZ, + aChunkGenerator, + aChunkProvider); } public boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean isSmallOre) { TileEntity te = aWorld.getTileEntity(aX, aY, aZ); if (!(te instanceof BW_MetaGeneratedOreTE) && !(te instanceof GT_TileEntity_Ores)) { if (aMetaData == this.mSporadicMeta && (this.bwOres & 1) != 0 - || aMetaData == this.mBetweenMeta && (this.bwOres & 2) != 0 - || aMetaData == this.mPrimaryMeta && (this.bwOres & 8) != 0 - || aMetaData == this.mSecondaryMeta && (this.bwOres & 4) != 0) { + || aMetaData == this.mBetweenMeta && (this.bwOres & 2) != 0 + || aMetaData == this.mPrimaryMeta && (this.bwOres & 8) != 0 + || aMetaData == this.mSecondaryMeta && (this.bwOres & 4) != 0) { boolean wasSet; for (ModDBMDef e : pDimensionDef.getReplaceableBlocks()) { wasSet = isSmallOre - ? BW_MetaGenerated_SmallOres.setOreBlock( - aWorld, - aX, - aY, - aZ, - aMetaData, - pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir, - (Block) Block.blockRegistry.getObject(e.getBlockName()), - new int[] { e.getMeta() }) - : BW_MetaGenerated_Ores.setOreBlock( - aWorld, - aX, - aY, - aZ, - aMetaData, - pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir, - (Block) Block.blockRegistry.getObject(e.getBlockName()), - new int[] { e.getMeta() }); + ? BW_MetaGenerated_SmallOres.setOreBlock( + aWorld, + aX, + aY, + aZ, + aMetaData, + pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir, + (Block) Block.blockRegistry.getObject(e.getBlockName()), + new int[] { e.getMeta() }) + : BW_MetaGenerated_Ores.setOreBlock( + aWorld, + aX, + aY, + aZ, + aMetaData, + pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir, + (Block) Block.blockRegistry.getObject(e.getBlockName()), + new int[] { e.getMeta() }); if (wasSet) return true; } return false; } else { return GT_TileEntity_Ores_Space.setOuterSpaceOreBlock( - pDimensionDef, - aWorld, - aX, - aY, - aZ, - aMetaData, - pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir); + pDimensionDef, + aWorld, + aX, + aY, + aZ, + aMetaData, + pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir); } } else { return true; diff --git a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_SmallOre_Space.java b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_SmallOre_Space.java index d684438dd1..78f169e054 100644 --- a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_SmallOre_Space.java +++ b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_SmallOre_Space.java @@ -35,26 +35,32 @@ public class BW_Worldgen_Ore_SmallOre_Space extends BW_OreLayer { private String name; public BW_Worldgen_Ore_SmallOre_Space(String aName, boolean pDefault, int pMinY, int pMaxY, int pDensity, - int pPrimary, ISubTagContainer primaryBW) { + int pPrimary, ISubTagContainer primaryBW) { super(aName, pDefault, 0, 0, 0, 0, 0, primaryBW, Materials._NULL, Materials._NULL, Materials._NULL); mMinY = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "MinHeight", pMinY)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "MinHeight", pMinY)); mMaxY = ((short) Math.max( - this.mMinY + 1, - GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "MaxHeight", pMaxY))); + this.mMinY + 1, + GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "MaxHeight", pMaxY))); mDensity = ((short) Math.max( - 1, - GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "Amount", pDensity))); + 1, + GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "Amount", pDensity))); mPrimaryMeta = ((short) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "Meta", pPrimary)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "Meta", pPrimary)); bwOres = ((byte) GregTech_API.sWorldgenFile - .get("worldgen.GaGregBartworks." + this.mWorldGenName, "BWGTlogic", bwOres)); + .get("worldgen.GaGregBartworks." + this.mWorldGenName, "BWGTlogic", bwOres)); _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName, true); _mDynWorldConfig.InitDynamicConfig(); StringBuilder ret = new StringBuilder(); - for (Map.Entry<String, Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap().entrySet().stream() - .filter(Map.Entry::getValue).collect(Collectors.toSet())) - ret.append(key.getKey().split("_")[1]).append("; "); + for (Map.Entry<String, Boolean> key : _mDynWorldConfig.get_mDynWorldConfigMap() + .entrySet() + .stream() + .filter(Map.Entry::getValue) + .collect(Collectors.toSet())) + ret.append( + key.getKey() + .split("_")[1]) + .append("; "); name = ret.length() == 0 ? "" : ret.substring(0, ret.length() - 1); if (mEnabled) { smallOreWorldgenList.add(this); @@ -78,19 +84,19 @@ public class BW_Worldgen_Ore_SmallOre_Space extends BW_OreLayer { @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) { ModDimensionDef tMDD = GalacticGregRegistry.getDimensionTypeByChunkGenerator(aChunkGenerator); if (tMDD == null) return false; pDimensionDef = tMDD; if (this.mPrimaryMeta > 0) for (int i = 0, j = Math.max(1, this.mDensity / 2 + aRandom.nextInt(this.mDensity) / 2); i < j; i++) { this.setOreBlock( - aWorld, - aChunkX + aRandom.nextInt(16), - this.mMinY + aRandom.nextInt(Math.max(1, this.mMaxY - this.mMinY)), - aChunkZ + aRandom.nextInt(16), - this.mPrimaryMeta, - true); + aWorld, + aChunkX + aRandom.nextInt(16), + this.mMinY + aRandom.nextInt(Math.max(1, this.mMaxY - this.mMinY)), + aChunkZ + aRandom.nextInt(16), + this.mPrimaryMeta, + true); } return true; } @@ -100,42 +106,42 @@ public class BW_Worldgen_Ore_SmallOre_Space extends BW_OreLayer { TileEntity te = aWorld.getTileEntity(aX, aY, aZ); if (!(te instanceof BW_MetaGeneratedOreTE) && !(te instanceof GT_TileEntity_Ores)) { if (aMetaData == this.mSporadicMeta && (this.bwOres & 1) != 0 - || aMetaData == this.mBetweenMeta && (this.bwOres & 2) != 0 - || aMetaData == this.mPrimaryMeta && (this.bwOres & 8) != 0 - || aMetaData == this.mSecondaryMeta && (this.bwOres & 4) != 0) { + || aMetaData == this.mBetweenMeta && (this.bwOres & 2) != 0 + || aMetaData == this.mPrimaryMeta && (this.bwOres & 8) != 0 + || aMetaData == this.mSecondaryMeta && (this.bwOres & 4) != 0) { boolean wasSet; for (ModDBMDef e : pDimensionDef.getReplaceableBlocks()) { wasSet = isSmallOre - ? BW_MetaGenerated_SmallOres.setOreBlock( - aWorld, - aX, - aY, - aZ, - aMetaData, - pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir, - (Block) Block.blockRegistry.getObject(e.getBlockName()), - new int[] { e.getMeta() }) - : BW_MetaGenerated_Ores.setOreBlock( - aWorld, - aX, - aY, - aZ, - aMetaData, - pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir, - (Block) Block.blockRegistry.getObject(e.getBlockName()), - new int[] { e.getMeta() }); + ? BW_MetaGenerated_SmallOres.setOreBlock( + aWorld, + aX, + aY, + aZ, + aMetaData, + pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir, + (Block) Block.blockRegistry.getObject(e.getBlockName()), + new int[] { e.getMeta() }) + : BW_MetaGenerated_Ores.setOreBlock( + aWorld, + aX, + aY, + aZ, + aMetaData, + pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir, + (Block) Block.blockRegistry.getObject(e.getBlockName()), + new int[] { e.getMeta() }); if (wasSet) return true; } return false; } else { return GT_TileEntity_Ores_Space.setOuterSpaceOreBlock( - pDimensionDef, - aWorld, - aX, - aY, - aZ, - aMetaData, - pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir); + pDimensionDef, + aWorld, + aX, + aY, + aZ, + aMetaData, + pDimensionDef.getAirSetting() == Enums.AirReplaceRule.AllowReplaceAir); } } else { return true; diff --git a/src/main/java/bloodasp/galacticgreg/command/AEStorageCommand.java b/src/main/java/bloodasp/galacticgreg/command/AEStorageCommand.java index 8941d4813e..6192603bcd 100644 --- a/src/main/java/bloodasp/galacticgreg/command/AEStorageCommand.java +++ b/src/main/java/bloodasp/galacticgreg/command/AEStorageCommand.java @@ -73,10 +73,10 @@ public class AEStorageCommand implements ICommand { // Export structure GalacticGreg.Logger.info( - "Creating Structure from Spatial AE drive. Dimensions: X [%d] Y [%d] Z [%d]", - storedSize.x, - storedSize.y, - storedSize.z); + "Creating Structure from Spatial AE drive. Dimensions: X [%d] Y [%d] Z [%d]", + storedSize.x, + storedSize.y, + storedSize.z); SpaceSchematic tSchematic = SpaceSchematicFactory.createSchematic(tName); boolean tTEWarningSend = false; @@ -106,22 +106,22 @@ public class AEStorageCommand implements ICommand { // Print a warning on the console tMsg += " TE"; GalacticGreg.Logger.warn( - "Warning: Found TileEntity at X[%d] Y[%d] Z[%d]. NBT States are not exported!", - lX, - lY, - lZ); + "Warning: Found TileEntity at X[%d] Y[%d] Z[%d]. NBT States are not exported!", + lX, + lY, + lZ); if (!tTEWarningSend) { // Send a warning ingame, once per export command tTEWarningSend = true; PlayerChatHelper - .SendWarn(pCommandSender, "TileEntity states are not exported!"); + .SendWarn(pCommandSender, "TileEntity states are not exported!"); } } // If the block is not air, add it to the structure - if (b != Blocks.air) tSchematic.addStructureInfo( - SpaceSchematicFactory.createStructureInfo(lX, lY, lZ, b, bm)); + if (b != Blocks.air) tSchematic + .addStructureInfo(SpaceSchematicFactory.createStructureInfo(lX, lY, lZ, b, bm)); } } } @@ -134,16 +134,17 @@ public class AEStorageCommand implements ICommand { } else { // All good, xml exported. Notify player that he needs to edit the file PlayerChatHelper.SendInfo( - pCommandSender, - "Structure has been exported to " + tSchematic.getName() - + ".xml. It contains " - + tSchematic.coordInfo().size() - + " Blocks"); + pCommandSender, + "Structure has been exported to " + tSchematic.getName() + + ".xml. It contains " + + tSchematic.coordInfo() + .size() + + " Blocks"); PlayerChatHelper - .SendInfo(pCommandSender, "You have to edit the file before a reload will accept it!"); + .SendInfo(pCommandSender, "You have to edit the file before a reload will accept it!"); } } else PlayerChatHelper - .SendError(pCommandSender, "Error: Item in your hand is not a spatial storage drive!"); + .SendError(pCommandSender, "Error: Item in your hand is not a spatial storage drive!"); } } catch (Exception e) { e.printStackTrace(); @@ -155,7 +156,9 @@ public class AEStorageCommand implements ICommand { // Command is only enabled for actual players and only if they are OP-ed if (pCommandSender instanceof EntityPlayerMP) { EntityPlayerMP tEP = (EntityPlayerMP) pCommandSender; - return MinecraftServer.getServer().getConfigurationManager().func_152596_g(tEP.getGameProfile()); + return MinecraftServer.getServer() + .getConfigurationManager() + .func_152596_g(tEP.getGameProfile()); } else return false; } diff --git a/src/main/java/bloodasp/galacticgreg/command/ProfilingCommand.java b/src/main/java/bloodasp/galacticgreg/command/ProfilingCommand.java index a367668992..be43da5a4c 100644 --- a/src/main/java/bloodasp/galacticgreg/command/ProfilingCommand.java +++ b/src/main/java/bloodasp/galacticgreg/command/ProfilingCommand.java @@ -57,21 +57,26 @@ public class ProfilingCommand implements ICommand { if (tTime == -1) tInfo = "N/A"; else tInfo = String.format("%d ms", tTime); pCommandSender.addChatMessage( - new ChatComponentText( - String.format("%s (%s): %s", mdd.getDimIdentifier(), mdd.getDimensionName(), tInfo))); + new ChatComponentText( + String.format("%s (%s): %s", mdd.getDimIdentifier(), mdd.getDimensionName(), tInfo))); } } } @Override public boolean canCommandSenderUseCommand(ICommandSender pCommandSender) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER - && !FMLCommonHandler.instance().getMinecraftServerInstance().isDedicatedServer()) + if (FMLCommonHandler.instance() + .getEffectiveSide() == Side.SERVER + && !FMLCommonHandler.instance() + .getMinecraftServerInstance() + .isDedicatedServer()) return true; if (pCommandSender instanceof EntityPlayerMP) { EntityPlayerMP tEP = (EntityPlayerMP) pCommandSender; - return MinecraftServer.getServer().getConfigurationManager().func_152596_g(tEP.getGameProfile()); + return MinecraftServer.getServer() + .getConfigurationManager() + .func_152596_g(tEP.getGameProfile()); } return false; } diff --git a/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicDimensionConfig.java b/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicDimensionConfig.java index e855410246..5c419c7c13 100644 --- a/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicDimensionConfig.java +++ b/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicDimensionConfig.java @@ -62,37 +62,37 @@ public class DynamicDimensionConfig { if (dt == DimensionType.Asteroid || dt == DimensionType.AsteroidAndPlanet) { String tDimIdentifier = mdd.getDimIdentifier(); if (_mDynamicAsteroidMap.containsKey(tDimIdentifier)) GalacticGreg.Logger.warn( - "Found 2 Dimensions with the same Identifier! This should never happen, and you should report this to me. Identifier in question: %s", - tDimIdentifier); + "Found 2 Dimensions with the same Identifier! This should never happen, and you should report this to me. Identifier in question: %s", + tDimIdentifier); else { AsteroidConfig aConf = new AsteroidConfig(); aConf.MinSize = GregTech_API.sWorldgenFile.get(getConfigKeyName(mc, mdd), "SizeMin", 5); aConf.MaxSize = GregTech_API.sWorldgenFile.get(getConfigKeyName(mc, mdd), "SizeMax", 15); aConf.Probability = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd), "Probability", 200); + .get(getConfigKeyName(mc, mdd), "Probability", 200); aConf.SpecialBlockChance = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd), "SpecialBlockChance", 5); + .get(getConfigKeyName(mc, mdd), "SpecialBlockChance", 5); aConf.OreChance = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "orespawn"), "BaseOreChance", 5); + .get(getConfigKeyName(mc, mdd, "orespawn"), "BaseOreChance", 5); aConf.OrePrimaryOffset = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "orespawn"), "PrimaryToRareOreOffset", 5); + .get(getConfigKeyName(mc, mdd, "orespawn"), "PrimaryToRareOreOffset", 5); aConf.SmallOreChance = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "orespawn"), "SmallOreChance", 10); + .get(getConfigKeyName(mc, mdd, "orespawn"), "SmallOreChance", 10); aConf.ObeyHeightLimits = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "orespawn"), "ObeyHeightLimits", false); + .get(getConfigKeyName(mc, mdd, "orespawn"), "ObeyHeightLimits", false); aConf.HiddenOres = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "orespawn"), "OresOnlyInsideAsteroids", false); + .get(getConfigKeyName(mc, mdd, "orespawn"), "OresOnlyInsideAsteroids", false); if (GalacticGreg.GalacticConfig.LootChestsEnabled) { aConf.LootChestChance = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "loot"), "LootChestChance", 1); + .get(getConfigKeyName(mc, mdd, "loot"), "LootChestChance", 1); aConf.LootChestTable = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "loot"), "LootChestTable", 3); + .get(getConfigKeyName(mc, mdd, "loot"), "LootChestTable", 3); aConf.NumLootItems = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "loot"), "LootChestItemCount", 10); + .get(getConfigKeyName(mc, mdd, "loot"), "LootChestItemCount", 10); aConf.RandomizeNumLootItems = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "loot"), "RandomizeLootItemCount", true); + .get(getConfigKeyName(mc, mdd, "loot"), "RandomizeLootItemCount", true); } else { aConf.LootChestChance = 0; aConf.LootChestTable = 1; @@ -104,16 +104,14 @@ public class DynamicDimensionConfig { int tDefaultMaxY = mdd.getPreConfiguratedGroundOreMaxY(); int tDefaultMinY = mdd.getPreConfiguratedFloatingAsteroidMinY(); aConf.OreGenMaxY = GregTech_API.sWorldgenFile - .get(getConfigKeyName(mc, mdd, "floating"), "OreGenMaxY", tDefaultMaxY); - aConf.FloatingAsteroidMinY = GregTech_API.sWorldgenFile.get( - getConfigKeyName(mc, mdd, "floating"), - "FloatingAsteroidMinY", - tDefaultMinY); + .get(getConfigKeyName(mc, mdd, "floating"), "OreGenMaxY", tDefaultMaxY); + aConf.FloatingAsteroidMinY = GregTech_API.sWorldgenFile + .get(getConfigKeyName(mc, mdd, "floating"), "FloatingAsteroidMinY", tDefaultMinY); } if (aConf.MaxSize > 50) GalacticGreg.Logger.warn( - "Asteroid-MaxSize for dimID [%s] is larger than 50. This might cause memory-problems, as the maximum asteroid size will be larger than 50*50*50 blocks", - tDimIdentifier); + "Asteroid-MaxSize for dimID [%s] is larger than 50. This might cause memory-problems, as the maximum asteroid size will be larger than 50*50*50 blocks", + tDimIdentifier); _mDynamicAsteroidMap.put(tDimIdentifier, aConf); } } diff --git a/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicOreMixWorldConfig.java b/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicOreMixWorldConfig.java index 470eb8ef66..862bfd4e4e 100644 --- a/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicOreMixWorldConfig.java +++ b/src/main/java/bloodasp/galacticgreg/dynconfig/DynamicOreMixWorldConfig.java @@ -76,8 +76,8 @@ public class DynamicOreMixWorldConfig { for (ModDimensionDef mdd : mc.getDimensionList()) { String tDimIdentifier = mdd.getDimIdentifier(); if (_mDynWorldConfigMap.containsKey(tDimIdentifier)) GalacticGreg.Logger.error( - "Found 2 Dimensions with the same Identifier: %s Dimension will not generate Ores", - tDimIdentifier); + "Found 2 Dimensions with the same Identifier: %s Dimension will not generate Ores", + tDimIdentifier); else { boolean tFlag = GregTech_API.sWorldgenFile.get(_mConfigName, getConfigKeyName(mc, mdd), false); _mDynWorldConfigMap.put(tDimIdentifier, tFlag); diff --git a/src/main/java/bloodasp/galacticgreg/generators/GenEllipsoid.java b/src/main/java/bloodasp/galacticgreg/generators/GenEllipsoid.java index 435626946f..09d08a9923 100644 --- a/src/main/java/bloodasp/galacticgreg/generators/GenEllipsoid.java +++ b/src/main/java/bloodasp/galacticgreg/generators/GenEllipsoid.java @@ -106,8 +106,8 @@ public class GenEllipsoid implements ISpaceObjectGenerator { else if (val > 0.01D && val < _mCoreDensity) tbp = TargetBlockPosition.AsteroidCore; - else if (val >= _mCoreDensity && val <= (1.0D - (_mSineFactor - * MathHelper.sin((iZ + iX + iY - _mRandom.nextFloat() * _mRandomInfluence))))) + else if (val >= _mCoreDensity && val <= (1.0D + - (_mSineFactor * MathHelper.sin((iZ + iX + iY - _mRandom.nextFloat() * _mRandomInfluence))))) tbp = TargetBlockPosition.AsteroidShell; if (tbp != TargetBlockPosition.Invalid) diff --git a/src/main/java/bloodasp/galacticgreg/registry/GalacticGregRegistry.java b/src/main/java/bloodasp/galacticgreg/registry/GalacticGregRegistry.java index 112c174e42..b45353da6e 100644 --- a/src/main/java/bloodasp/galacticgreg/registry/GalacticGregRegistry.java +++ b/src/main/java/bloodasp/galacticgreg/registry/GalacticGregRegistry.java @@ -39,13 +39,14 @@ public class GalacticGregRegistry { if (_mModContainers.containsKey(pModContainer.getModName())) { GalacticGreg.Logger - .warn("There is already a mod registered with that name: [%s]", pModContainer.getModName()); + .warn("There is already a mod registered with that name: [%s]", pModContainer.getModName()); return false; } else { GalacticGreg.Logger.info( - "Registered new mod to generate ores: [%s] Dimensions provided: [%d]", - pModContainer.getModName(), - pModContainer.getDimensionList().size()); + "Registered new mod to generate ores: [%s] Dimensions provided: [%d]", + pModContainer.getModName(), + pModContainer.getDimensionList() + .size()); _mModContainers.put(pModContainer.getModName(), pModContainer); return true; } @@ -62,12 +63,14 @@ public class GalacticGregRegistry { try { if (!_mInitializationDone) return null; - String tFQCPN = pChunkProvider.toString().split("@")[0]; + String tFQCPN = pChunkProvider.toString() + .split("@")[0]; ModDimensionDef tReturnMDD = null; for (ModContainer mc : _mModContainers.values()) { for (ModDimensionDef mdd : mc.getDimensionList()) { - if (mdd.getChunkProviderName().equals(tFQCPN)) { + if (mdd.getChunkProviderName() + .equals(tFQCPN)) { tReturnMDD = mdd; break; } @@ -110,33 +113,38 @@ public class GalacticGregRegistry { */ private static void InitModContainers() { for (ModContainer mc : _mModContainers.values()) { - if (!Loader.isModLoaded(mc.getModName()) && !mc.getModName().equalsIgnoreCase("vanilla")) { + if (!Loader.isModLoaded(mc.getModName()) && !mc.getModName() + .equalsIgnoreCase("vanilla")) { GalacticGreg.Logger.warn( - "Ignoring ModRegistration for OreGen: [%s], because mod is not loaded. Did you misspell the name?", - mc.getModName()); + "Ignoring ModRegistration for OreGen: [%s], because mod is not loaded. Did you misspell the name?", + mc.getModName()); mc.setEnabled(false); } else { GalacticGreg.Logger.info("Mod [%s] is now enabled for OreGen by GalacticGreg", mc.getModName()); mc.setEnabled(true); for (ModDimensionDef md : mc.getDimensionList()) { GalacticGreg.Logger.info( - "ModID: [%s] DimName: [%s] ValidBlocks: [%d] Identifier: [%s] Generators: [%d]", - mc.getModName(), - md.getDimensionName(), - md.getReplaceableBlocks().size(), - md.getDimIdentifier(), - md.getSpaceObjectGenerators().size()); + "ModID: [%s] DimName: [%s] ValidBlocks: [%d] Identifier: [%s] Generators: [%d]", + mc.getModName(), + md.getDimensionName(), + md.getReplaceableBlocks() + .size(), + md.getDimIdentifier(), + md.getSpaceObjectGenerators() + .size()); // Register default generator if dimension is asteroid and no generator was added if (md.getDimensionType() == DimensionType.AsteroidAndPlanet - || md.getDimensionType() == DimensionType.Asteroid) { - if (md.getSpaceObjectGenerators().size() == 0) { + || md.getDimensionType() == DimensionType.Asteroid) { + if (md.getSpaceObjectGenerators() + .size() == 0) { GalacticGreg.Logger.debug("No generators found, adding build-in ellipsoid generator"); md.registerSpaceObjectGenerator(new GenEllipsoid()); } GalacticGreg.Logger.info( - "Asteroid-Enabled dimension. Registered Generators: [%d]", - md.getSpaceObjectGenerators().size()); + "Asteroid-Enabled dimension. Registered Generators: [%d]", + md.getSpaceObjectGenerators() + .size()); } md.finalizeReplaceableBlocks(mc.getModName()); @@ -158,7 +166,8 @@ public class GalacticGregRegistry { try { for (ModContainer mc : _mModContainers.values()) { for (ModDimensionDef md : mc.getDimensionList()) { - if (pDimensionDefinition.getDimIdentifier().equals(md.getDimIdentifier())) { + if (pDimensionDefinition.getDimIdentifier() + .equals(md.getDimIdentifier())) { return mc; } } diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java index 6d425c52ff..222d786cb4 100644 --- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java +++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java @@ -86,8 +86,11 @@ public class SpaceSchematic { posX = pSI.getX(); posY = pSI.getY(); posZ = pSI.getZ(); - blockName = Block.blockRegistry.getNameForObject(pSI.getBlock().getBlock()); - blockMeta = pSI.getBlock().getMeta(); + blockName = Block.blockRegistry.getNameForObject( + pSI.getBlock() + .getBlock()); + blockMeta = pSI.getBlock() + .getMeta(); } public Vec3 getVec3Pos() { diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java index 0929c94b63..5c76904a80 100644 --- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java +++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java @@ -26,8 +26,8 @@ public class SpaceSchematicFactory { public static StructureInformation createStructureInfo(int pX, int pY, int pZ, Block pBlock, int pMeta) { return new StructureInformation( - Vec3.createVectorHelper(pX, pY, pZ), - TargetBlockPosition.Invalid, - new SpecialBlockComb(pBlock, pMeta, AllowedBlockPosition.AsteroidCoreAndShell)); + Vec3.createVectorHelper(pX, pY, pZ), + TargetBlockPosition.Invalid, + new SpecialBlockComb(pBlock, pMeta, AllowedBlockPosition.AsteroidCoreAndShell)); } } diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java index 1f5a2e05e6..3300f98b92 100644 --- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java +++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java @@ -54,7 +54,8 @@ public class SpaceSchematicHandler { if (tChoosenSchematic.getRarity() < tRandomChance) tChoosenSchematic = null; } else { for (int i = 0; i < _mSpaceSchematics.size(); i++) { - if (_mSpaceSchematics.get(i).getRarity() >= tRandomChance) tRandomIDs.add(i); + if (_mSpaceSchematics.get(i) + .getRarity() >= tRandomChance) tRandomIDs.add(i); } } @@ -75,7 +76,7 @@ public class SpaceSchematicHandler { public boolean reloadSchematics(boolean pForceReload) { try { Collection<File> structureFiles = FileUtils - .listFiles(_mSchematicsFolderName, new String[] { "xml" }, false); + .listFiles(_mSchematicsFolderName, new String[] { "xml" }, false); List<SpaceSchematic> tNewSpaceSchematics = new ArrayList<>(); int tErrorsFound = 0; @@ -126,16 +127,15 @@ public class SpaceSchematicHandler { */ public boolean SaveSpaceStructure(SpaceSchematic pSchematic) { try { - if (pSchematic.getName().length() < 1) return false; + if (pSchematic.getName() + .length() < 1) return false; JAXBContext tJaxbCtx = JAXBContext.newInstance(SpaceSchematic.class); Marshaller jaxMarsh = tJaxbCtx.createMarshaller(); jaxMarsh.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); jaxMarsh.marshal( - pSchematic, - new FileOutputStream( - String.format("%s/%s.xml", _mSchematicsFolderName, pSchematic.getName()), - false)); + pSchematic, + new FileOutputStream(String.format("%s/%s.xml", _mSchematicsFolderName, pSchematic.getName()), false)); return true; } catch (Exception e) { diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java index f40aef3101..406b66c0a1 100644 --- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java +++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java @@ -50,12 +50,12 @@ public class SpaceSchematicWrapper implements ISpaceObjectGenerator { BlockMetaComb bmc = new BlockMetaComb(tBlock, bsi.blockMeta); Vec3 tCenteredPos = _mCenter.addVector(bsi.posX, bsi.posY, bsi.posZ); StructureInformation tnewSI = new StructureInformation( - tCenteredPos, - TargetBlockPosition.StructureBlock, - bmc); + tCenteredPos, + TargetBlockPosition.StructureBlock, + bmc); _mFinalizedStructure.add(tnewSI); } else GalacticGreg.Logger - .warn("Block %s:%s could not be found. Schematic will be incomplete!", tModID, tBlockName); + .warn("Block %s:%s could not be found. Schematic will be incomplete!", tModID, tBlockName); } catch (Exception e) { e.printStackTrace(); GalacticGreg.Logger.error("Error while recalculating blocks position"); |