diff options
Diffstat (limited to 'src')
22 files changed, 208 insertions, 244 deletions
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 32b7c7c7e5..745f72cb60 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 @@ -1,24 +1,18 @@ package bloodasp.galacticgreg; +import bloodasp.galacticgreg.api.ModDimensionDef; +import bloodasp.galacticgreg.auxiliary.GTOreGroup; import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_Layer_Space; -import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_SmallOre_Space; +import bloodasp.galacticgreg.dynconfig.DynamicOreMixWorldConfig; +import bloodasp.galacticgreg.registry.GalacticGregRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.util.GT_Log; import gregtech.api.world.GT_Worldgen; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import bloodasp.galacticgreg.api.ModDimensionDef; -import bloodasp.galacticgreg.auxiliary.GTOreGroup; -import bloodasp.galacticgreg.dynconfig.DynamicOreMixWorldConfig; -import bloodasp.galacticgreg.registry.GalacticGregRegistry; + +import java.util.*; public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { public static int sWeight = 0; @@ -35,7 +29,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { private long mProfilingStart; private long mProfilingEnd; - private DynamicOreMixWorldConfig _mDynWorldConfig = null; + 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) { @@ -92,7 +86,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { return _mDynWorldConfig.isEnabledInDim(pDimensionDef); } - private static Map<String, Integer> _mBufferedVeinCountList = new HashMap<String, Integer>(); + private static Map<String, Integer> _mBufferedVeinCountList = new HashMap<>(); /** * Get the number of enabled OreMixes for given Dimension. @@ -118,7 +112,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { } - private static Map<String, List<String>> _mBufferedVeinList = new HashMap<String, List<String>>(); + private static Map<String, List<String>> _mBufferedVeinList = new HashMap<>(); /** * Get a List of all Veins which are enabled for given Dim. Query is buffered * @param pDimensionDef @@ -126,13 +120,13 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { */ private static List<String> getOreMixIDsForDim(ModDimensionDef pDimensionDef) { - List<String> tReturn = null; + List<String> tReturn; if (_mBufferedVeinList.containsKey(pDimensionDef.getDimIdentifier())) tReturn = _mBufferedVeinList.get(pDimensionDef.getDimIdentifier()); else { - tReturn = new ArrayList<String>(); + 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)) tReturn.add(tWorldGen.mWorldGenName); @@ -268,31 +262,28 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { int cZ = pChunkZ - pRandom.nextInt(this.mSize); int eZ = pChunkZ + 16 + pRandom.nextInt(this.mSize); for (int tZ = cZ; tZ <= eZ; tZ++) { + final int maxx = Math.max(Math.abs(cX - tX), Math.abs(eX - tX)); + final int maxz = Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)); if (this.mSecondaryMeta > 0) { for (int i = tMinY - 1; i < tMinY + 2; i++) { - if ((pRandom.nextInt(Math.max(1, Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)) / this.mDensity)) == 0) - || (pRandom.nextInt(Math.max(1, Math.max(Math.abs(cX - tX), Math.abs(eX - tX)) / this.mDensity)) == 0)) { + if ((pRandom.nextInt(Math.max(1, maxz / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, maxx / this.mDensity)) == 0)) { GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mSecondaryMeta); } } } if ((this.mBetweenMeta > 0) - && ((pRandom.nextInt(Math.max(1, Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)) / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, - Math.max(Math.abs(cX - tX), Math.abs(eX - tX)) / this.mDensity)) == 0))) { + && ((pRandom.nextInt(Math.max(1, maxz / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, maxx / this.mDensity)) == 0))) { GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, tMinY + 2 + pRandom.nextInt(2), tZ, this.mBetweenMeta); } if (this.mPrimaryMeta > 0) { for (int i = tMinY + 3; i < tMinY + 6; i++) { - if ((pRandom.nextInt(Math.max(1, Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)) / this.mDensity)) == 0) - || (pRandom.nextInt(Math.max(1, Math.max(Math.abs(cX - tX), Math.abs(eX - tX)) / this.mDensity)) == 0)) { - + if ((pRandom.nextInt(Math.max(1, maxz / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, maxx / this.mDensity)) == 0)) { GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, i, tZ, this.mPrimaryMeta); } } } if ((this.mSporadicMeta > 0) - && ((pRandom.nextInt(Math.max(1, Math.max(Math.abs(cZ - tZ), Math.abs(eZ - tZ)) / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, - Math.max(Math.abs(cX - tX), Math.abs(eX - tX)) / this.mDensity)) == 0))) { + && ((pRandom.nextInt(Math.max(1, maxz / this.mDensity)) == 0) || (pRandom.nextInt(Math.max(1, maxx / this.mDensity)) == 0))) { GT_TileEntity_Ores_Space.setOuterSpaceOreBlock(tMDD, pWorld, tX, tMinY - 1 + pRandom.nextInt(7), tZ, this.mSporadicMeta); } } @@ -305,10 +296,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); - } catch (Exception e) { } // Silently ignore errors + } catch (Exception ignored) { } // Silently ignore errors } - GalacticGreg.Logger.trace("Leaving executeWorldgen"); return true; } 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 cb46d2351b..da307cdbb6 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 @@ -1,16 +1,15 @@ package bloodasp.galacticgreg; +import bloodasp.galacticgreg.api.ModDimensionDef; +import bloodasp.galacticgreg.dynconfig.DynamicOreMixWorldConfig; +import bloodasp.galacticgreg.registry.GalacticGregRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.world.GT_Worldgen; - -import java.util.Random; - import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import bloodasp.galacticgreg.api.ModDimensionDef; -import bloodasp.galacticgreg.dynconfig.DynamicOreMixWorldConfig; -import bloodasp.galacticgreg.registry.GalacticGregRegistry; + +import java.util.Random; public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen { public final short mMinY; @@ -20,7 +19,7 @@ public class GT_Worldgen_GT_Ore_SmallPieces_Space extends GT_Worldgen { private long mProfilingStart; private long mProfilingEnd; - private DynamicOreMixWorldConfig _mDynWorldConfig = null; + private DynamicOreMixWorldConfig _mDynWorldConfig; public GT_Worldgen_GT_Ore_SmallPieces_Space(String pName, boolean pDefault, int pMinY, int pMaxY, int pAmount, Materials pPrimary) { @@ -97,7 +96,7 @@ 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); - } catch (Exception e) { } // Silently ignore errors + } catch (Exception ignored) { } // Silently ignore errors } GalacticGreg.Logger.trace("Leaving executeWorldgen"); diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java index c76cd1e425..9efcaf0d4f 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java @@ -1,19 +1,22 @@ package bloodasp.galacticgreg; +import bloodasp.galacticgreg.api.*; +import bloodasp.galacticgreg.api.Enums.DimensionType; +import bloodasp.galacticgreg.api.Enums.SpaceObjectType; +import bloodasp.galacticgreg.api.Enums.TargetBlockPosition; +import bloodasp.galacticgreg.auxiliary.GTOreGroup; import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_Layer_Space; import bloodasp.galacticgreg.bartworks.BW_Worldgen_Ore_SmallOre_Space; -import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGeneratedOreTE; -import com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_SmallOres; +import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig; +import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig.AsteroidConfig; +import bloodasp.galacticgreg.registry.GalacticGregRegistry; +import cpw.mods.fml.common.IWorldGenerator; +import cpw.mods.fml.common.eventhandler.EventBus; +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.util.GT_Log; - -import java.util.Random; - import gregtech.api.world.GT_Worldgen; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.Vec3; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; @@ -21,23 +24,8 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.ChestGenHooks; -import bloodasp.galacticgreg.api.AsteroidBlockComb; -import bloodasp.galacticgreg.api.BlockMetaComb; -import bloodasp.galacticgreg.api.Enums.DimensionType; -import bloodasp.galacticgreg.api.Enums.SpaceObjectType; -import bloodasp.galacticgreg.api.Enums.TargetBlockPosition; -import bloodasp.galacticgreg.api.GTOreTypes; -import bloodasp.galacticgreg.api.ISpaceObjectGenerator; -import bloodasp.galacticgreg.api.ModDimensionDef; -import bloodasp.galacticgreg.api.SpecialBlockComb; -import bloodasp.galacticgreg.api.StructureInformation; -import bloodasp.galacticgreg.auxiliary.GTOreGroup; -import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig; -import bloodasp.galacticgreg.dynconfig.DynamicDimensionConfig.AsteroidConfig; -import bloodasp.galacticgreg.registry.GalacticGregRegistry; -import cpw.mods.fml.common.IWorldGenerator; -import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.registry.GameRegistry; + +import java.util.Random; public class GT_Worldgenerator_Space implements IWorldGenerator { public static boolean sAsteroids = true; @@ -87,14 +75,14 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { tBiome = BiomeGenBase.plains.biomeName; }*/ - if (tDimDef.getDimensionType() == DimensionType.Asteroid || tDimDef.getDimensionType() == DimensionType.AsteroidAndPlanet) + 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()); else Generate_Asteroids(tDimDef, pRandom, pWorld, pX, pZ); } - else if (tDimDef.getDimensionType() == DimensionType.Planet || tDimDef.getDimensionType() == DimensionType.AsteroidAndPlanet) + else if (tDimDef.getDimensionType() != DimensionType.Asteroid) { Generate_OreVeins(tDimDef, pRandom, pWorld, pX, pZ, "", pChunkGenerator, pChunkProvider); } @@ -323,10 +311,8 @@ public class GT_Worldgenerator_Space implements IWorldGenerator { // If no ore-block has been placed yet... if (!tPlacedOreBlock) { - boolean tFlag = true; - // try to spawn special blocks - tFlag = doGenerateSpecialBlocks(pDimensionDef, pRandom, pWorld, tAConf, si.getX(), si.getY(), si.getZ(), si.getBlockPosition()); + boolean tFlag = doGenerateSpecialBlocks(pDimensionDef, pRandom, pWorld, tAConf, si.getX(), si.getY(), si.getZ(), si.getBlockPosition()); // No special block placed? Try smallores if (tFlag) @@ -350,7 +336,7 @@ 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); - } catch (Exception e) { } // Silently ignore errors + } catch (Exception ignored) { } // Silently ignore errors } // --------------------------- } diff --git a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java index 82a41fd17c..074eaef829 100644 --- a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java +++ b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java @@ -1,9 +1,5 @@ package bloodasp.galacticgreg; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import bloodasp.galacticgreg.auxiliary.GalacticGregConfig; import bloodasp.galacticgreg.auxiliary.LogHelper; import bloodasp.galacticgreg.auxiliary.ProfilingStorage; @@ -16,17 +12,20 @@ import bloodasp.galacticgreg.schematics.SpaceSchematicHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import gregtech.api.GregTech_API; import gregtech.api.world.GT_Worldgen; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + @Mod(modid = GalacticGreg.MODID, 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(); - public static final List<GT_Worldgen> oreVeinWorldgenList = new ArrayList(); + public static final List<GT_Worldgen> smallOreWorldgenList = new ArrayList<>(); + public static final List<GT_Worldgen> oreVeinWorldgenList = new ArrayList<>(); public static final String NICE_MODID = "GalacticGreg"; public static final String MODID = "galacticgreg"; @@ -64,7 +63,7 @@ public class GalacticGreg { // GalacticGregRegistry.registerModContainer(ModRegisterer.Setup_GalactiCraftCore()); // } - public static final ArrayList<Runnable> ADDITIONALVEINREGISTER = new ArrayList<Runnable>(); + public static final ArrayList<Runnable> ADDITIONALVEINREGISTER = new ArrayList<>(); /** * Postload phase. Mods can add their custom definition to our api in their own PreLoad or Init-phase diff --git a/src/main/java/bloodasp/galacticgreg/ModRegisterer.java b/src/main/java/bloodasp/galacticgreg/ModRegisterer.java index afc0df4eec..51bd268b25 100644 --- a/src/main/java/bloodasp/galacticgreg/ModRegisterer.java +++ b/src/main/java/bloodasp/galacticgreg/ModRegisterer.java @@ -1,17 +1,14 @@ package bloodasp.galacticgreg; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.init.Blocks; -import net.minecraft.world.gen.ChunkProviderEnd; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; -import micdoodle8.mods.galacticraft.core.world.gen.ChunkProviderMoon; import bloodasp.galacticgreg.api.*; import bloodasp.galacticgreg.api.Enums.AllowedBlockPosition; import bloodasp.galacticgreg.api.Enums.DimensionType; +import net.minecraft.init.Blocks; +import net.minecraft.world.gen.ChunkProviderEnd; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; /** * In this class, you'll find everything you need in order to tell GGreg what to do and where. @@ -27,7 +24,7 @@ public class ModRegisterer */ private static List<ModDBMDef> singleToList(ModDBMDef pDef) { - List<ModDBMDef> tLst = new ArrayList<ModDBMDef>(); + List<ModDBMDef> tLst = new ArrayList<>(); tLst.add(pDef); return tLst; } diff --git a/src/main/java/bloodasp/galacticgreg/api/GTOreTypes.java b/src/main/java/bloodasp/galacticgreg/api/GTOreTypes.java index 0106cd0e6e..8a3920b116 100644 --- a/src/main/java/bloodasp/galacticgreg/api/GTOreTypes.java +++ b/src/main/java/bloodasp/galacticgreg/api/GTOreTypes.java @@ -40,7 +40,7 @@ public enum GTOreTypes { private int _mBlockMeta; private int _mUpdateMode; - private GTOreTypes(int pOffset, Block pBlock, int pMeta, int pUpdateMode) + GTOreTypes(int pOffset, Block pBlock, int pMeta, int pUpdateMode) { _mOffset = pOffset; _mStoneBlock = pBlock; diff --git a/src/main/java/bloodasp/galacticgreg/api/ModContainer.java b/src/main/java/bloodasp/galacticgreg/api/ModContainer.java index 9cea43b754..fc6e09d37d 100644 --- a/src/main/java/bloodasp/galacticgreg/api/ModContainer.java +++ b/src/main/java/bloodasp/galacticgreg/api/ModContainer.java @@ -44,7 +44,7 @@ public class ModContainer { public ModContainer(String pModName) { _mModName = pModName; - _mDimensionLookup = new ArrayList<ModDimensionDef>(); + _mDimensionLookup = new ArrayList<>(); } diff --git a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java index 74796c384c..450841b922 100644 --- a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java +++ b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java @@ -1,16 +1,17 @@ package bloodasp.galacticgreg.api; +import bloodasp.galacticgreg.api.Enums.AirReplaceRule; +import bloodasp.galacticgreg.api.Enums.DimensionType; +import bloodasp.galacticgreg.api.Enums.ReplaceState; +import bloodasp.galacticgreg.api.Enums.SpaceObjectType; +import net.minecraft.block.Block; +import net.minecraft.world.chunk.IChunkProvider; + import java.util.ArrayList; import java.util.List; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.world.chunk.IChunkProvider; //import bloodasp.galacticgreg.GalacticGreg; -import bloodasp.galacticgreg.api.Enums.AirReplaceRule; -import bloodasp.galacticgreg.api.Enums.DimensionType; -import bloodasp.galacticgreg.api.Enums.ReplaceState; -import bloodasp.galacticgreg.api.Enums.SpaceObjectType; /** * Class to define a Dimension. Supposed to be added to a ModContainer @@ -222,7 +223,7 @@ public class ModDimensionDef { * * For example, on GalactiCraft Mars, this value is set to GTOreTypes.RedGranite, because it matches the * color better. If you don't set anything here, it will generate regular stone-ores. - * @param pOffset + * @param pStoneType */ public void setStoneType(GTOreTypes pStoneType) { @@ -325,14 +326,14 @@ public class ModDimensionDef { _mChunkProvider = pChunkProviderName; _mDimensionType = pDimType; - _mReplaceableBlocks = new ArrayList<ModDBMDef>(); + _mReplaceableBlocks = new ArrayList<>(); if (pBlockDefinitions != null) _mReplaceableBlocks.addAll(pBlockDefinitions); - _mValidAsteroidMaterials = new ArrayList<AsteroidBlockComb>(); - _mSpecialBlocksForAsteroids = new ArrayList<SpecialBlockComb>(); - _mSpaceObjectsGenerators = new ArrayList<ISpaceObjectGenerator>(); - _mSpaceStructureGenerators = new ArrayList<ISpaceObjectGenerator>(); + _mValidAsteroidMaterials = new ArrayList<>(); + _mSpecialBlocksForAsteroids = new ArrayList<>(); + _mSpaceObjectsGenerators = new ArrayList<>(); + _mSpaceStructureGenerators = new ArrayList<>(); } /**Internal function @@ -342,13 +343,13 @@ public class ModDimensionDef { */ protected void setParentModName(String pModName) { - if (!_mInternalDimIdentifier.equals(STR_NOTDEFINED)) - return; // Don't update, we're already set - else - { + if (_mInternalDimIdentifier.equals(STR_NOTDEFINED)) { _mInternalDimIdentifier = String.format("%s_%s", pModName, _mDimensionName); //GalacticGreg.Logger.debug("Set Internal Identifier for Dimension %s to %s", _mDimensionName, _mInternalDimIdentifier); } + + // Else Don't update, we're already set + } /**Internal function @@ -431,13 +432,12 @@ public class ModDimensionDef { /** * Define the material the asteroid shall be made of, more advanced option to specify your own blocks - * @param pMaterial + * @param pBlockComb */ public void addAsteroidMaterial(AsteroidBlockComb pBlockComb) { - if (_mValidAsteroidMaterials.contains(pBlockComb)) - return; - else + if (!_mValidAsteroidMaterials.contains(pBlockComb)) { _mValidAsteroidMaterials.add(pBlockComb); + } } /** @@ -448,10 +448,9 @@ public class ModDimensionDef { * @param pBlock Block-Meta Combination that shall be used */ public void addSpecialAsteroidBlock(SpecialBlockComb pBlock) { - if (_mSpecialBlocksForAsteroids.contains(pBlock)) - return; - else + if (!_mSpecialBlocksForAsteroids.contains(pBlock)) { _mSpecialBlocksForAsteroids.add(pBlock); + } } /**Internal function @@ -470,7 +469,6 @@ public class ModDimensionDef { catch(Exception e) { //GalacticGreg.Logger.error("Unable to finalize replaceable block with modname for block %s. Dimension %s will probably have problems generating ores", rpb.getBlockName(), _mDimensionName); - continue; } } } diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java index 4f6166e3eb..eb3db77060 100644 --- a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java +++ b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java @@ -1,17 +1,16 @@ package bloodasp.galacticgreg.auxiliary; -import java.util.ArrayList; - +import cpw.mods.fml.common.FMLLog; import org.apache.logging.log4j.Level; -import cpw.mods.fml.common.FMLLog; +import java.util.ArrayList; /** * Generic LogHelper to print stuff to the console * @author Namikon */ public final class LogHelper { - private ArrayList<String> _mReportedCategories = new ArrayList<String>(); + private ArrayList<String> _mReportedCategories = new ArrayList<>(); private boolean doDebugLogs = false; private boolean doTraceLogs = false; private boolean quietMode = false; @@ -56,7 +55,7 @@ public final class LogHelper { */ public void ResetCategories() { - _mReportedCategories = new ArrayList<String>(); + _mReportedCategories = new ArrayList<>(); } /** diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java b/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java index 192fb07262..dafa1e628e 100644 --- a/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java +++ b/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java @@ -1,13 +1,12 @@ package bloodasp.galacticgreg.auxiliary; +import bloodasp.galacticgreg.api.ModDimensionDef; + import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; -import bloodasp.galacticgreg.api.ModDimensionDef; - /** * A simple FIFO-storage for Long-values * Will keep 50 values for each dimension in memory @@ -18,13 +17,13 @@ public class ProfilingStorage { public ProfilingStorage() { - mProfilingMap = new HashMap<String, List<Long>>(); + mProfilingMap = new HashMap<>(); } /** * Add a new time to the list of pDimension. Will be ignored it tTotalTime == 0 * @param pDimension - * @param tTotalTime + * @param pTotalTime */ public void AddTimeToList(ModDimensionDef pDimension, long pTotalTime) { @@ -34,7 +33,7 @@ public class ProfilingStorage { return; if(!mProfilingMap.containsKey(pDimension.getDimIdentifier())) - mProfilingMap.put(pDimension.getDimIdentifier(), new LinkedList<Long>()); + mProfilingMap.put(pDimension.getDimIdentifier(), new LinkedList<>()); LinkedList<Long> ll = (LinkedList<Long>) mProfilingMap.get(pDimension.getDimIdentifier()); @@ -64,14 +63,12 @@ public class ProfilingStorage { long tAverage = 0; long tReturnVal = 0; - LinkedList ll = (LinkedList) mProfilingMap.get(pDimension.getDimIdentifier()); + LinkedList<Long> ll = (LinkedList<Long>) mProfilingMap.get(pDimension.getDimIdentifier()); if(ll != null) { - Iterator<Long> qItr = ll.iterator(); - while(qItr.hasNext()) - { - tAverage += qItr.next(); + for (Long aLong : ll) { + tAverage += aLong; tTotalVal++; } 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 e359def408..134661b8c5 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 @@ -20,14 +20,16 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; +import java.util.Map; import java.util.Random; +import java.util.stream.Collectors; import static bloodasp.galacticgreg.GalacticGreg.oreVeinWorldgenList; public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { private ModDimensionDef pDimensionDef; - + private String name; private DynamicOreMixWorldConfig _mDynWorldConfig; /** @@ -67,6 +69,11 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { } _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("; "); + name = ret.substring(0, ret.length() - 1); } /** @@ -100,12 +107,16 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { mBetweenMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSporadiclyInbetween", pBetween)); mSporadicMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "OreSporaticlyAround", pSporadic)); bwOres = ((byte) GregTech_API.sWorldgenFile.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("; "); + name = ret.length() == 0 ? "" : ret.substring(0, ret.length() - 1); if (mEnabled) { sWeight += this.mWeight; oreVeinWorldgenList.add(this); } - _mDynWorldConfig = new DynamicOreMixWorldConfig(mWorldGenName,true); - _mDynWorldConfig.InitDynamicConfig(); } /** @@ -118,8 +129,7 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { this(aName,enabled,0,0,0,0,0,0,0,0,0,true,true,true,true); } - public boolean isEnabledForDim(ModDimensionDef pDimensionDef) - { + public boolean isEnabledForDim(ModDimensionDef pDimensionDef) { return _mDynWorldConfig.isEnabledInDim(pDimensionDef); } @@ -163,7 +173,7 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { @Override public String getDimName() { - return pDimensionDef.getDimensionName(); + return name; } 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 449f60f57a..af9af323d7 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 @@ -20,7 +20,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; +import java.util.Map; import java.util.Random; +import java.util.stream.Collectors; import static bloodasp.galacticgreg.GalacticGreg. |