diff options
Diffstat (limited to 'src/main/java/bloodasp/galacticgreg/schematics')
4 files changed, 26 insertions, 41 deletions
diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java index 606f2318ad..2173bd9067 100644 --- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java +++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematic.java @@ -1,18 +1,11 @@ package bloodasp.galacticgreg.schematics; -import java.util.ArrayList; -import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - +import bloodasp.galacticgreg.api.StructureInformation; import net.minecraft.block.Block; import net.minecraft.util.Vec3; -import bloodasp.galacticgreg.api.StructureInformation; + +import javax.xml.bind.annotation.*; +import java.util.ArrayList; /** * Class for XML Structure files. You only should edit/use this file/class if you want to add/fix stuff with @@ -65,7 +58,7 @@ public class SpaceSchematic { public ArrayList<BaseStructureInfo> coordInfo() { if (mStructureInfoList == null) - mStructureInfoList = new ArrayList<BaseStructureInfo>(); + mStructureInfoList = new ArrayList<>(); return mStructureInfoList; } @@ -73,7 +66,7 @@ public class SpaceSchematic { public void addStructureInfo(StructureInformation pStrucInfo) { if (mStructureInfoList == null) - mStructureInfoList = new ArrayList<BaseStructureInfo>(); + mStructureInfoList = new ArrayList<>(); mStructureInfoList.add(new BaseStructureInfo(pStrucInfo)); } diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java index d2fdf7716e..4aea25129f 100644 --- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java +++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicFactory.java @@ -1,13 +1,11 @@ package bloodasp.galacticgreg.schematics; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.util.Vec3; import bloodasp.galacticgreg.api.Enums.AllowedBlockPosition; import bloodasp.galacticgreg.api.Enums.TargetBlockPosition; import bloodasp.galacticgreg.api.SpecialBlockComb; import bloodasp.galacticgreg.api.StructureInformation; -import bloodasp.galacticgreg.schematics.SpaceSchematic.BaseStructureInfo; +import net.minecraft.block.Block; +import net.minecraft.util.Vec3; /** * Class for XML Structure files. You only should edit/use this file/class if you want to add/fix stuff with @@ -28,7 +26,6 @@ public class SpaceSchematicFactory { public static StructureInformation createStructureInfo(int pX, int pY, int pZ, Block pBlock, int pMeta) { - StructureInformation si = new StructureInformation(Vec3.createVectorHelper(pX, pY, pZ), TargetBlockPosition.Invalid, new SpecialBlockComb(pBlock, pMeta, AllowedBlockPosition.AsteroidCoreAndShell)); - return si; + return new StructureInformation(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 f44aaa4b88..50b5bb53aa 100644 --- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java +++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicHandler.java @@ -1,22 +1,17 @@ package bloodasp.galacticgreg.schematics; +import bloodasp.galacticgreg.GalacticGreg; +import org.apache.commons.io.FileUtils; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; import java.io.File; import java.io.FileOutputStream; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - -import org.apache.commons.io.FileUtils; - -import net.minecraft.util.Vec3; -import bloodasp.galacticgreg.GalacticGreg; -import bloodasp.galacticgreg.api.Enums.SpaceObjectType; -import bloodasp.galacticgreg.api.StructureInformation; - /** * Class for XML Structure files. You only should edit/use this file/class if you want to add/fix stuff with * GalacticGreg itself, and never if you're a mod developer and want to add support for GGreg to your mod. @@ -28,12 +23,13 @@ public class SpaceSchematicHandler { File _mSchematicsFolderName; private List<SpaceSchematic> _mSpaceSchematics; + @SuppressWarnings("ResultOfMethodCallIgnored") public SpaceSchematicHandler(File pConfigFolder) { _mConfigFolderName = new File(String.format("%s/%s", pConfigFolder.toString(), GalacticGreg.NICE_MODID)); _mSchematicsFolderName = new File(String.format("%s/schematics", _mConfigFolderName)); - _mSpaceSchematics = new ArrayList<SpaceSchematic>(); + _mSpaceSchematics = new ArrayList<>(); if (!_mSchematicsFolderName.exists()) _mSchematicsFolderName.mkdirs(); @@ -45,7 +41,7 @@ public class SpaceSchematicHandler { public SpaceSchematic getRandomSpaceSchematic() { int tRandomChance = GalacticGreg.GalacticRandom.nextInt(100); - List<Integer> tRandomIDs = new ArrayList<Integer>(); + List<Integer> tRandomIDs = new ArrayList<>(); SpaceSchematic tChoosenSchematic = null; if (_mSpaceSchematics == null) @@ -88,7 +84,7 @@ public class SpaceSchematicHandler { try { Collection<File> structureFiles = FileUtils.listFiles(_mSchematicsFolderName, new String[] {"xml"}, false); - List<SpaceSchematic> tNewSpaceSchematics = new ArrayList<SpaceSchematic>(); + List<SpaceSchematic> tNewSpaceSchematics = new ArrayList<>(); int tErrorsFound = 0; if (structureFiles.isEmpty()) @@ -111,7 +107,6 @@ public class SpaceSchematicHandler { { GalacticGreg.Logger.error("Error while loading Schematic %s", tSchematic); e.printStackTrace(); - continue; } } diff --git a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java index d0fc1d68a3..948a4e52a5 100644 --- a/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java +++ b/src/main/java/bloodasp/galacticgreg/schematics/SpaceSchematicWrapper.java @@ -1,11 +1,5 @@ package bloodasp.galacticgreg.schematics; -import java.util.ArrayList; -import java.util.List; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.util.Vec3; import bloodasp.galacticgreg.GalacticGreg; import bloodasp.galacticgreg.api.BlockMetaComb; import bloodasp.galacticgreg.api.Enums.SpaceObjectType; @@ -13,6 +7,12 @@ import bloodasp.galacticgreg.api.Enums.TargetBlockPosition; import bloodasp.galacticgreg.api.ISpaceObjectGenerator; import bloodasp.galacticgreg.api.StructureInformation; import bloodasp.galacticgreg.schematics.SpaceSchematic.BaseStructureInfo; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; +import net.minecraft.util.Vec3; + +import java.util.ArrayList; +import java.util.List; /** * Class for XML Structure files. You only should edit/use this file/class if you want to add/fix stuff with @@ -40,7 +40,7 @@ public class SpaceSchematicWrapper implements ISpaceObjectGenerator { */ private void RecalculatePosition() { - _mFinalizedStructure = new ArrayList<StructureInformation>(); + _mFinalizedStructure = new ArrayList<>(); for (BaseStructureInfo bsi: _mSchematic.coordInfo()) { |