diff options
Diffstat (limited to 'src/main/java/galacticgreg')
23 files changed, 64 insertions, 72 deletions
diff --git a/src/main/java/galacticgreg/WorldGeneratorSpace.java b/src/main/java/galacticgreg/WorldGeneratorSpace.java index 336900326c..4f76049480 100644 --- a/src/main/java/galacticgreg/WorldGeneratorSpace.java +++ b/src/main/java/galacticgreg/WorldGeneratorSpace.java @@ -38,7 +38,7 @@ public class WorldGeneratorSpace implements IWorldGenerator { private int chunkX; private int chunkZ; - private int mSize = 100; + private final int mSize = 100; private long mProfilingStart; private long mProfilingEnd; @@ -502,7 +502,7 @@ public class WorldGeneratorSpace implements IWorldGenerator { GalacticGreg.Logger.trace("Running orevein-gen in Dim %s", pDimensionDef.getDimIdentifier()); if (GTWorldgenerator.isOreChunk(pX / 16, pZ / 16)) { - if ((WorldgenOreLayerSpace.sWeight > 0) && (GalacticGreg.oreVeinWorldgenList.size() > 0)) { + if ((WorldgenOreLayerSpace.sWeight > 0) && (!GalacticGreg.oreVeinWorldgenList.isEmpty())) { boolean temp = true; int tRandomWeight; diff --git a/src/main/java/galacticgreg/WorldgenOreLayerSpace.java b/src/main/java/galacticgreg/WorldgenOreLayerSpace.java index 3cd0a8baa4..10591cb32d 100644 --- a/src/main/java/galacticgreg/WorldgenOreLayerSpace.java +++ b/src/main/java/galacticgreg/WorldgenOreLayerSpace.java @@ -36,7 +36,7 @@ public class WorldgenOreLayerSpace extends GTWorldgen { private long mProfilingStart; private long mProfilingEnd; - private Map<String, Boolean> allowedDims; + private final Map<String, Boolean> allowedDims; public WorldgenOreLayerSpace(OreMixBuilder mix) { super(mix.oreMixName, GalacticGreg.oreVeinWorldgenList, mix.enabledByDefault); @@ -82,7 +82,7 @@ public class WorldgenOreLayerSpace extends GTWorldgen { return allowedDims.getOrDefault(pDimensionDef.getDimIdentifier(), false); } - private static Map<String, List<String>> _mBufferedVeinList = new HashMap<>(); + private static final Map<String, List<String>> _mBufferedVeinList = new HashMap<>(); /** * Get a List of all Veins which are enabled for given Dim. Query is buffered @@ -126,8 +126,9 @@ public class WorldgenOreLayerSpace extends GTWorldgen { String tVeinName = tEnabledVeins.get(tRnd); GTWorldgen tGen = null; - for (GTWorldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) if (tWorldGen instanceof WorldgenOreLayerSpace - && ((WorldgenOreLayerSpace) tWorldGen).mWorldGenName.equals(tVeinName)) tGen = tWorldGen; + for (GTWorldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) + if (tWorldGen instanceof WorldgenOreLayerSpace && tWorldGen.mWorldGenName.equals(tVeinName)) + tGen = tWorldGen; if (tGen != null) { // GT_Worldgen_GT_Ore_Layer_Space tGen = GalacticGreg.oreVeinWorldgenList.get(tRndMix); @@ -138,7 +139,7 @@ public class WorldgenOreLayerSpace extends GTWorldgen { sporadicMeta = ((WorldgenOreLayerSpace) tGen).mSporadicMeta; } } else { - if ((WorldgenOreLayerSpace.sWeight > 0) && (GalacticGreg.oreVeinWorldgenList.size() > 0)) { + if ((WorldgenOreLayerSpace.sWeight > 0) && (!GalacticGreg.oreVeinWorldgenList.isEmpty())) { GalacticGreg.Logger.trace("About to select oremix"); boolean temp = true; int tRandomWeight; diff --git a/src/main/java/galacticgreg/WorldgenOreSmallSpace.java b/src/main/java/galacticgreg/WorldgenOreSmallSpace.java index 95b40c69eb..40fede19b0 100644 --- a/src/main/java/galacticgreg/WorldgenOreSmallSpace.java +++ b/src/main/java/galacticgreg/WorldgenOreSmallSpace.java @@ -22,7 +22,7 @@ public class WorldgenOreSmallSpace extends GTWorldgen { private long mProfilingStart; private long mProfilingEnd; - private Map<String, Boolean> allowedDims; + private final Map<String, Boolean> allowedDims; public WorldgenOreSmallSpace(SmallOreBuilder ore) { super(ore.smallOreName, GalacticGreg.smallOreWorldgenList, ore.enabledByDefault); diff --git a/src/main/java/galacticgreg/api/AsteroidBlockComb.java b/src/main/java/galacticgreg/api/AsteroidBlockComb.java index 208d8faed3..d9961cf8ec 100644 --- a/src/main/java/galacticgreg/api/AsteroidBlockComb.java +++ b/src/main/java/galacticgreg/api/AsteroidBlockComb.java @@ -58,8 +58,7 @@ public class AsteroidBlockComb extends BlockMetaComb { public boolean equals(Object other) { if (other == null) return false; if (other == this) return true; - if (!(other instanceof AsteroidBlockComb)) return false; - AsteroidBlockComb otherObj = (AsteroidBlockComb) other; + if (!(other instanceof AsteroidBlockComb otherObj)) return false; boolean tFlag = true; String otherName = Block.blockRegistry.getNameForObject(otherObj.getBlock()); diff --git a/src/main/java/galacticgreg/api/BlockMetaComb.java b/src/main/java/galacticgreg/api/BlockMetaComb.java index f4dc416c6b..47a1ced4f3 100644 --- a/src/main/java/galacticgreg/api/BlockMetaComb.java +++ b/src/main/java/galacticgreg/api/BlockMetaComb.java @@ -7,8 +7,8 @@ import net.minecraft.block.Block; */ public class BlockMetaComb { - private int mMeta; - private Block mBlock; + private final int mMeta; + private final Block mBlock; /** * Creates a simple instance for a block that has no meta value diff --git a/src/main/java/galacticgreg/api/GTOreTypes.java b/src/main/java/galacticgreg/api/GTOreTypes.java index fdc4ea61ff..7c0245419a 100644 --- a/src/main/java/galacticgreg/api/GTOreTypes.java +++ b/src/main/java/galacticgreg/api/GTOreTypes.java @@ -36,10 +36,10 @@ public enum GTOreTypes { */ NormalOres(0, Blocks.stone, 0, 0); // Unsure about blockupdate value! - private int _mOffset; - private Block _mStoneBlock; - private int _mBlockMeta; - private int _mUpdateMode; + private final int _mOffset; + private final Block _mStoneBlock; + private final int _mBlockMeta; + private final int _mUpdateMode; GTOreTypes(int pOffset, Block pBlock, int pMeta, int pUpdateMode) { _mOffset = pOffset; diff --git a/src/main/java/galacticgreg/api/ModDBMDef.java b/src/main/java/galacticgreg/api/ModDBMDef.java index 11d6bc630e..e405dfdd1f 100644 --- a/src/main/java/galacticgreg/api/ModDBMDef.java +++ b/src/main/java/galacticgreg/api/ModDBMDef.java @@ -10,8 +10,8 @@ import net.minecraft.block.Block; public class ModDBMDef { private String _targetBlockName; - private int _targetMeta; - private boolean _canAlwaysReplace; + private final int _targetMeta; + private final boolean _canAlwaysReplace; public String getBlockName() { return _targetBlockName; @@ -27,7 +27,7 @@ public class ModDBMDef { /** * Internal function - * + * <p> * Check if the given Block is equal to the block in this instance * * @param pBlock the Block in question @@ -43,7 +43,7 @@ public class ModDBMDef { /** * Internal function - * + * <p> * Check if the given Block is equal to the block in this instance and matches the metadata * * @param pBlock the block in question @@ -64,8 +64,7 @@ public class ModDBMDef { public boolean equals(Object other) { if (other == null) return false; if (other == this) return true; - if (!(other instanceof ModDBMDef)) return false; - ModDBMDef otherModDBMDef = (ModDBMDef) other; + if (!(other instanceof ModDBMDef otherModDBMDef)) return false; return (otherModDBMDef._targetBlockName.equals(_targetBlockName) && otherModDBMDef._targetMeta == _targetMeta); } diff --git a/src/main/java/galacticgreg/api/ModDimensionDef.java b/src/main/java/galacticgreg/api/ModDimensionDef.java index b456aa031e..fbfbd674f3 100644 --- a/src/main/java/galacticgreg/api/ModDimensionDef.java +++ b/src/main/java/galacticgreg/api/ModDimensionDef.java @@ -15,15 +15,15 @@ import net.minecraft.world.chunk.IChunkProvider; public class ModDimensionDef { private static final String STR_NOTDEFINED = "iiznotdefined"; - private String _mDimensionName; + private final String _mDimensionName; private String _mInternalDimIdentifier; - private String _mChunkProvider; + private final String _mChunkProvider; private Enums.AirReplaceRule _mDimAirSetting; - private ArrayList<ModDBMDef> _mReplaceableBlocks; + private final ArrayList<ModDBMDef> _mReplaceableBlocks; private Enums.DimensionType _mDimensionType; - private List<ISpaceObjectGenerator> _mSpaceObjectsGenerators; - private List<ISpaceObjectGenerator> _mSpaceStructureGenerators; + private final List<ISpaceObjectGenerator> _mSpaceObjectsGenerators; + private final List<ISpaceObjectGenerator> _mSpaceStructureGenerators; // Special Planets config settings private int _mGroundOreMaxY = 64; @@ -34,10 +34,10 @@ public class ModDimensionDef { private GTOreTypes _mStoneType; // Asteroid stuff - private List<AsteroidBlockComb> _mValidAsteroidMaterials; - private List<SpecialBlockComb> _mSpecialBlocksForAsteroids; + private final List<AsteroidBlockComb> _mValidAsteroidMaterials; + private final List<SpecialBlockComb> _mSpecialBlocksForAsteroids; - private Random _mRandom = new Random(System.currentTimeMillis()); + private final Random _mRandom = new Random(System.currentTimeMillis()); /** * Internal function @@ -184,7 +184,7 @@ public class ModDimensionDef { * NeverReplaceAir: No matter what, if there is an Air-Block found, it will not replace it. AllowReplaceAir: This * will generate Ores in Stones (defined by addBlockDefinition()) and air if found OnlyReplaceAir : This will not * generate Ores in solid blocks, but only in air - * + * <p> * Note that "OnlyReplaceAir" is a special setting if you have a dimension that is not defined as "Asteroids" but * you still need/want to generate ores in midair. * @@ -206,7 +206,7 @@ public class ModDimensionDef { /** * Set a manual override for ores that shall be generated. This setting is ignored if getIsAsteroidDimension() * returns true - * + * <p> * 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. * @@ -336,7 +336,7 @@ public class ModDimensionDef { /** * Internal function - * + * <p> * Do not call this function by yourself. Ever. It will cause explosions, water to blood, death of firstborn,... * Seriously, don't do it. */ @@ -351,7 +351,7 @@ public class ModDimensionDef { /** * Internal function - * + * <p> * Check if pBlock can be replaced by an ore * * @param pBlock @@ -380,13 +380,13 @@ public class ModDimensionDef { /** * Internal function - * + * <p> * Randomly select one material out of all defined materials * * @return */ public AsteroidBlockComb getRandomAsteroidMaterial() { - if (_mValidAsteroidMaterials.size() == 0) return null; + if (_mValidAsteroidMaterials.isEmpty()) return null; if (_mValidAsteroidMaterials.size() == 1) return _mValidAsteroidMaterials.get(0); else { @@ -396,13 +396,13 @@ public class ModDimensionDef { /** * Internal function - * + * <p> * Randomly select one special block to be placed in the asteroids * * @return */ public SpecialBlockComb getRandomSpecialAsteroidBlock() { - if (_mSpecialBlocksForAsteroids.size() == 0) return null; + if (_mSpecialBlocksForAsteroids.isEmpty()) return null; if (_mSpecialBlocksForAsteroids.size() == 1) return _mSpecialBlocksForAsteroids.get(0); else { diff --git a/src/main/java/galacticgreg/api/SpecialBlockComb.java b/src/main/java/galacticgreg/api/SpecialBlockComb.java index 2cf812169a..bc3d884d3d 100644 --- a/src/main/java/galacticgreg/api/SpecialBlockComb.java +++ b/src/main/java/galacticgreg/api/SpecialBlockComb.java @@ -4,7 +4,7 @@ import net.minecraft.block.Block; public class SpecialBlockComb extends BlockMetaComb { - private Enums.AllowedBlockPosition _mBlockPosition; + private final Enums.AllowedBlockPosition _mBlockPosition; /** * Creates a simple instance for a block that has a meta value and a block position it is allowed to spawn @@ -52,8 +52,7 @@ public class SpecialBlockComb extends BlockMetaComb { public boolean equals(Object other) { if (other == null) return false; if (other == this) return true; - if (!(other instanceof SpecialBlockComb)) return false; - SpecialBlockComb otherObj = (SpecialBlockComb) other; + if (!(other instanceof SpecialBlockComb otherObj)) return false; boolean tFlag = true; String otherName = Block.blockRegistry.getNameForObject(otherObj.getBlock()); diff --git a/src/main/java/galacticgreg/api/StructureInformation.java b/src/main/java/galacticgreg/api/StructureInformation.java index 4c33f88c20..83c47603f5 100644 --- a/src/main/java/galacticgreg/api/StructureInformation.java +++ b/src/main/java/galacticgreg/api/StructureInformation.java @@ -9,9 +9,9 @@ import galacticgreg.api.Enums.TargetBlockPosition; */ public class StructureInformation { - private Vec3 _mCoordinates; - private TargetBlockPosition _mBlockPosition; - private BlockMetaComb _mBlockMetaComb; + private final Vec3 _mCoordinates; + private final TargetBlockPosition _mBlockPosition; + private final BlockMetaComb _mBlockMetaComb; public TargetBlockPosition getBlockPosition() { return _mBlockPosition; diff --git a/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java b/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java index a9cf4a4e79..72dfd9f512 100644 --- a/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java +++ b/src/main/java/galacticgreg/api/enums/DimensionBlockMetaDefinitionList.java @@ -51,7 +51,7 @@ public enum DimensionBlockMetaDefinitionList { public final List<ModDBMDef> DBMDefList; - private DimensionBlockMetaDefinitionList(ModDBMDef... DBMDefArray) { + DimensionBlockMetaDefinitionList(ModDBMDef... DBMDefArray) { DBMDefList = Arrays.asList(DBMDefArray); } } diff --git a/src/main/java/galacticgreg/api/enums/DimensionDef.java b/src/main/java/galacticgreg/api/enums/DimensionDef.java index 96626ee7f3..6684777bba 100644 --- a/src/main/java/galacticgreg/api/enums/DimensionDef.java +++ b/src/main/java/galacticgreg/api/enums/DimensionDef.java @@ -222,7 +222,7 @@ public enum DimensionDef { public final ModDimensionDef modDimensionDef; - private DimensionDef(ModDimensionDef modDimDef) { + DimensionDef(ModDimensionDef modDimDef) { this.modDimensionDef = modDimDef; } } diff --git a/src/main/java/galacticgreg/api/enums/ModContainers.java b/src/main/java/galacticgreg/api/enums/ModContainers.java index ddac1e14d5..e49d8aca39 100644 --- a/src/main/java/galacticgreg/api/enums/ModContainers.java +++ b/src/main/java/galacticgreg/api/enums/ModContainers.java @@ -13,7 +13,7 @@ public enum ModContainers { public final ModContainer modContainer; - private ModContainers(ModContainer modContainer) { + ModContainers(ModContainer modContainer) { this.modContainer = modContainer; } } diff --git a/src/main/java/galacticgreg/api/enums/properties/Asteroids.java b/src/main/java/galacticgreg/api/enums/properties/Asteroids.java index 2916031aaf..32020506ce 100644 --- a/src/main/java/galacticgreg/api/enums/properties/Asteroids.java +++ b/src/main/java/galacticgreg/api/enums/properties/Asteroids.java @@ -69,8 +69,7 @@ public enum Asteroids { public DimensionDef dimensionDef; public AsteroidPropertyBuilder asteroidPropertyBuilder; - private Asteroids(ModContainers modContainers, DimensionDef dimensionDef, - AsteroidPropertyBuilder asteroidPropertyBuilder) { + Asteroids(ModContainers modContainers, DimensionDef dimensionDef, AsteroidPropertyBuilder asteroidPropertyBuilder) { this.modContainers = modContainers; this.dimensionDef = dimensionDef; this.asteroidPropertyBuilder = asteroidPropertyBuilder; diff --git a/src/main/java/galacticgreg/auxiliary/ConfigManager.java b/src/main/java/galacticgreg/auxiliary/ConfigManager.java index b460757609..6a972f2447 100644 --- a/src/main/java/galacticgreg/auxiliary/ConfigManager.java +++ b/src/main/java/galacticgreg/auxiliary/ConfigManager.java @@ -14,7 +14,7 @@ import galacticgreg.GalacticGreg; public abstract class ConfigManager { private File _mainconfigDir = null; - private File _blocksconfigDir = null; + private final File _blocksconfigDir = null; private String _mModCollection = ""; private String _mModID = ""; diff --git a/src/main/java/galacticgreg/auxiliary/GalacticGregConfig.java b/src/main/java/galacticgreg/auxiliary/GalacticGregConfig.java index 39980925a1..72b6bb8708 100644 --- a/src/main/java/galacticgreg/auxiliary/GalacticGregConfig.java +++ b/src/main/java/galacticgreg/auxiliary/GalacticGregConfig.java @@ -108,7 +108,7 @@ public class GalacticGregConfig extends ConfigManager { public boolean serverPostInit() { CustomLootChest = new BlockMetaComb(Blocks.chest); try { - if (LootChestItemOverride != "") { + if (LootChestItemOverride != null && !LootChestItemOverride.isEmpty()) { String[] args = LootChestItemOverride.split(":"); String tMod; String tName; diff --git a/src/main/java/galacticgreg/auxiliary/ProfilingStorage.java b/src/main/java/galacticgreg/auxiliary/ProfilingStorage.java index b429b7f76a..94ffb8da88 100644 --- a/src/main/java/galacticgreg/auxiliary/ProfilingStorage.java +++ b/src/main/java/galacticgreg/auxiliary/ProfilingStorage.java @@ -13,7 +13,7 @@ import galacticgreg.api.ModDimensionDef; */ public class ProfilingStorage { - private Map<String, List<Long>> mProfilingMap; + private final Map<String, List<Long>> mProfilingMap; public ProfilingStorage() { mProfilingMap = new HashMap<>(); diff --git a/src/main/java/galacticgreg/command/AEStorageCommand.java b/src/main/java/galacticgreg/command/AEStorageCommand.java index 7aff0ff107..f00ecfbe6c 100644 --- a/src/main/java/galacticgreg/command/AEStorageCommand.java +++ b/src/main/java/galacticgreg/command/AEStorageCommand.java @@ -27,7 +27,7 @@ import galacticgreg.schematics.SpaceSchematicFactory; */ public class AEStorageCommand implements ICommand { - private List<String> aliases; + private final List<String> aliases; public AEStorageCommand() { this.aliases = new ArrayList<>(); @@ -52,16 +52,14 @@ public class AEStorageCommand implements ICommand { @Override public void processCommand(ICommandSender pCommandSender, String[] pArgs) { try { - if (pCommandSender instanceof EntityPlayer) { + if (pCommandSender instanceof EntityPlayer tEP) { if (pArgs.length < 1) return; String tName = pArgs[0]; - EntityPlayer tEP = (EntityPlayer) pCommandSender; // Check if item in hand is a spatial storage cell ItemStack tIS = tEP.inventory.getCurrentItem(); - if (tIS.getItem() instanceof ItemSpatialStorageCell) { - ItemSpatialStorageCell tCell = (ItemSpatialStorageCell) tIS.getItem(); + if (tIS.getItem() instanceof ItemSpatialStorageCell tCell) { World tSpatialWorld = tCell.getWorld(tIS); WorldCoord storedSize = tCell.getStoredSize(tIS); @@ -104,7 +102,6 @@ public class AEStorageCommand implements ICommand { // If block is a TileEntity if (bTE != null) { // 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, @@ -154,8 +151,7 @@ public class AEStorageCommand implements ICommand { @Override public boolean canCommandSenderUseCommand(ICommandSender pCommandSender) { // Command is only enabled for actual players and only if they are OP-ed - if (pCommandSender instanceof EntityPlayerMP) { - EntityPlayerMP tEP = (EntityPlayerMP) pCommandSender; + if (pCommandSender instanceof EntityPlayerMP tEP) { return MinecraftServer.getServer() .getConfigurationManager() .func_152596_g(tEP.getGameProfile()); diff --git a/src/main/java/galacticgreg/command/ProfilingCommand.java b/src/main/java/galacticgreg/command/ProfilingCommand.java index 91805265dc..402006d1ca 100644 --- a/src/main/java/galacticgreg/command/ProfilingCommand.java +++ b/src/main/java/galacticgreg/command/ProfilingCommand.java @@ -23,7 +23,7 @@ import galacticgreg.registry.GalacticGregRegistry; */ public class ProfilingCommand implements ICommand { - private List<String> aliases; + private final List<String> aliases; public ProfilingCommand() { this.aliases = new ArrayList<>(); @@ -72,8 +72,7 @@ public class ProfilingCommand implements ICommand { .isDedicatedServer()) return true; - if (pCommandSender instanceof EntityPlayerMP) { - EntityPlayerMP tEP = (EntityPlayerMP) pCommandSender; + if (pCommandSender instanceof EntityPlayerMP tEP) { return MinecraftServer.getServer() .getConfigurationManager() .func_152596_g(tEP.getGameProfile()); diff --git a/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java b/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java index 8e6a7ef6e2..d63d403971 100644 --- a/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java +++ b/src/main/java/galacticgreg/dynconfig/DynamicDimensionConfig.java @@ -31,7 +31,7 @@ public class DynamicDimensionConfig { public boolean RandomizeNumLootItems; } - private static Map<String, AsteroidConfig> _mDynamicAsteroidMap = new HashMap<>(); + private static final Map<String, AsteroidConfig> _mDynamicAsteroidMap = new HashMap<>(); public static AsteroidConfig getAsteroidConfig(ModDimensionDef pDimDef) { return _mDynamicAsteroidMap.getOrDefault(pDimDef.getDimIdentifier(), null); diff --git a/src/main/java/galacticgreg/generators/GenEllipsoid.java b/src/main/java/galacticgreg/generators/GenEllipsoid.java index 432260a696..1ffc479a5b 100644 --- a/src/main/java/galacticgreg/generators/GenEllipsoid.java +++ b/src/main/java/galacticgreg/generators/GenEllipsoid.java @@ -14,7 +14,7 @@ import galacticgreg.api.StructureInformation; /** * Simple ellipsoid-generator. Based on the formular created by Chrysator. Thanks for the help! - * + * <p> * Generates a simple ellipsoid with dynamic rotation, random size-values, random noise for the surface, etc. Can * probably be tweaked even more, but works for now... */ @@ -24,8 +24,8 @@ public class GenEllipsoid implements ISpaceObjectGenerator { private Random _mRandom; private List<StructureInformation> _mStructure; - private double _mCoreDensity = 0.7D; - private double _mSineFactor = 0.05D; + private final double _mCoreDensity = 0.7D; + private final double _mSineFactor = 0.05D; private float _mRandomInfluence; private float _mRandomAngleX; private float _mRandomAngleY; diff --git a/src/main/java/galacticgreg/schematics/SpaceSchematicHandler.java b/src/main/java/galacticgreg/schematics/SpaceSchematicHandler.java index 9282ebca06..575befaf0a 100644 --- a/src/main/java/galacticgreg/schematics/SpaceSchematicHandler.java +++ b/src/main/java/galacticgreg/schematics/SpaceSchematicHandler.java @@ -47,7 +47,7 @@ public class SpaceSchematicHandler { if (_mSpaceSchematics == null) return null; - if (_mSpaceSchematics.size() == 0) return null; + if (_mSpaceSchematics.isEmpty()) return null; if (_mSpaceSchematics.size() == 1) { tChoosenSchematic = _mSpaceSchematics.get(0); @@ -59,7 +59,7 @@ public class SpaceSchematicHandler { } } - if (tRandomIDs.size() > 0) { + if (!tRandomIDs.isEmpty()) { int tRnd = GalacticGreg.GalacticRandom.nextInt(tRandomIDs.size()); tChoosenSchematic = _mSpaceSchematics.get(tRandomIDs.get(tRnd)); } @@ -128,7 +128,7 @@ public class SpaceSchematicHandler { public boolean SaveSpaceStructure(SpaceSchematic pSchematic) { try { if (pSchematic.getName() - .length() < 1) return false; + .isEmpty()) return false; JAXBContext tJaxbCtx = JAXBContext.newInstance(SpaceSchematic.class); Marshaller jaxMarsh = tJaxbCtx.createMarshaller(); diff --git a/src/main/java/galacticgreg/schematics/SpaceSchematicWrapper.java b/src/main/java/galacticgreg/schematics/SpaceSchematicWrapper.java index 4addc5107d..06ffd079d2 100644 --- a/src/main/java/galacticgreg/schematics/SpaceSchematicWrapper.java +++ b/src/main/java/galacticgreg/schematics/SpaceSchematicWrapper.java @@ -22,7 +22,7 @@ import galacticgreg.schematics.SpaceSchematic.BaseStructureInfo; */ public class SpaceSchematicWrapper implements ISpaceObjectGenerator { - private SpaceSchematic _mSchematic; + private final SpaceSchematic _mSchematic; private Vec3 _mCenter = Vec3.createVectorHelper(0, 0, 0); private List<StructureInformation> _mFinalizedStructure; @@ -31,7 +31,7 @@ public class SpaceSchematicWrapper implements ISpaceObjectGenerator { } public boolean isCalculated() { - return _mFinalizedStructure != null && _mFinalizedStructure.size() > 0; + return _mFinalizedStructure != null && !_mFinalizedStructure.isEmpty(); } /** |