Merge pull request #7 from GTNewHorizons/fixes-spotless-fixes

Spotless apply for branch fixes for #6
GTNewHorizons · May 1, 2023 · b47c689 · b47c689
2 parents 6fba603 + 84703d1
commit b47c689
Show file tree

Hide file tree

Showing 186 changed files with 595 additions and 746 deletions.
diff --git a/src/main/java/de/katzenpapst/amunra/AmunRa.java b/src/main/java/de/katzenpapst/amunra/AmunRa.java
@@ -3,25 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import micdoodle8.mods.galacticraft.api.GalacticraftRegistry;
-import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody;
-import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody.ScalableDistance;
-import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry;
-import micdoodle8.mods.galacticraft.api.galaxies.Moon;
-import micdoodle8.mods.galacticraft.api.galaxies.Planet;
-import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem;
-import micdoodle8.mods.galacticraft.api.galaxies.Star;
-import micdoodle8.mods.galacticraft.api.vector.Vector3;
-import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas;
-import micdoodle8.mods.galacticraft.core.GalacticraftCore;
-import micdoodle8.mods.galacticraft.core.dimension.TeleportTypeMoon;
-import micdoodle8.mods.galacticraft.core.dimension.TeleportTypeOverworld;
-import micdoodle8.mods.galacticraft.core.dimension.TeleportTypeSpaceStation;
-import micdoodle8.mods.galacticraft.core.items.GCItems;
-import micdoodle8.mods.galacticraft.core.util.CreativeTabGC;
-import micdoodle8.mods.galacticraft.planets.asteroids.dimension.TeleportTypeAsteroids;
-import micdoodle8.mods.galacticraft.planets.asteroids.items.AsteroidsItems;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.init.Blocks;
@@ -99,6 +80,24 @@
 import de.katzenpapst.amunra.world.mehen.MehenWorldProvider;
 import de.katzenpapst.amunra.world.neper.NeperWorldProvider;
 import de.katzenpapst.amunra.world.seth.SethWorldProvider;
+import micdoodle8.mods.galacticraft.api.GalacticraftRegistry;
+import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody;
+import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody.ScalableDistance;
+import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry;
+import micdoodle8.mods.galacticraft.api.galaxies.Moon;
+import micdoodle8.mods.galacticraft.api.galaxies.Planet;
+import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem;
+import micdoodle8.mods.galacticraft.api.galaxies.Star;
+import micdoodle8.mods.galacticraft.api.vector.Vector3;
+import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas;
+import micdoodle8.mods.galacticraft.core.GalacticraftCore;
+import micdoodle8.mods.galacticraft.core.dimension.TeleportTypeMoon;
+import micdoodle8.mods.galacticraft.core.dimension.TeleportTypeOverworld;
+import micdoodle8.mods.galacticraft.core.dimension.TeleportTypeSpaceStation;
+import micdoodle8.mods.galacticraft.core.items.GCItems;
+import micdoodle8.mods.galacticraft.core.util.CreativeTabGC;
+import micdoodle8.mods.galacticraft.planets.asteroids.dimension.TeleportTypeAsteroids;
+import micdoodle8.mods.galacticraft.planets.asteroids.items.AsteroidsItems;
 
 @Mod(
         modid = AmunRa.MODID,

diff --git a/src/main/java/de/katzenpapst/amunra/GuiHandler.java b/src/main/java/de/katzenpapst/amunra/GuiHandler.java
@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.tileentity.TileEntity;
@@ -37,6 +35,7 @@
 import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract;
 import de.katzenpapst.amunra.tile.TileEntityMothershipSettings;
 import de.katzenpapst.amunra.tile.TileEntityShuttleDock;
+import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody;
 
 public class GuiHandler implements IGuiHandler {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/ARBlocks.java b/src/main/java/de/katzenpapst/amunra/block/ARBlocks.java
@@ -1,10 +1,5 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-import micdoodle8.mods.galacticraft.core.GalacticraftCore;
-import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
-import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
@@ -35,6 +30,10 @@
 import de.katzenpapst.amunra.block.ore.SubBlockOre;
 import de.katzenpapst.amunra.block.ore.SubBlockOreMultidrop;
 import de.katzenpapst.amunra.item.ItemDamagePair;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
+import micdoodle8.mods.galacticraft.core.GalacticraftCore;
+import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
+import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule;
 
 public class ARBlocks {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockARChest.java b/src/main/java/de/katzenpapst/amunra/block/BlockARChest.java
@@ -2,9 +2,6 @@
 
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
-import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.ITileEntityProvider;
@@ -29,6 +26,8 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.tile.TileEntityARChest;
+import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
+import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
 
 public class BlockARChest extends BlockContainer
         implements ITileEntityProvider, ItemBlockDesc.IBlockShiftDesc, IMassiveBlock {

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockBasicMeta.java b/src/main/java/de/katzenpapst/amunra/block/BlockBasicMeta.java
@@ -5,12 +5,6 @@
 import java.util.List;
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.api.block.IDetectableResource;
-import micdoodle8.mods.galacticraft.api.block.IPartialSealableBlock;
-import micdoodle8.mods.galacticraft.api.block.IPlantableBlock;
-import micdoodle8.mods.galacticraft.api.block.ITerraformableBlock;
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -35,6 +29,11 @@
 import de.katzenpapst.amunra.block.bush.SubBlockBush;
 import de.katzenpapst.amunra.helper.BlockMassHelper;
 import de.katzenpapst.amunra.item.ItemBlockMulti;
+import micdoodle8.mods.galacticraft.api.block.IDetectableResource;
+import micdoodle8.mods.galacticraft.api.block.IPartialSealableBlock;
+import micdoodle8.mods.galacticraft.api.block.IPlantableBlock;
+import micdoodle8.mods.galacticraft.api.block.ITerraformableBlock;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
 
 public class BlockBasicMeta extends Block implements IMetaBlock, IDetectableResource, IPlantableBlock,
         ITerraformableBlock, IMassiveBlock, IPartialSealableBlock {

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockDoubleslabMeta.java b/src/main/java/de/katzenpapst/amunra/block/BlockDoubleslabMeta.java
@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -19,6 +17,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.item.ItemSlabMulti;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
 
 public class BlockDoubleslabMeta extends BlockBasicMeta {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockGrassMeta.java b/src/main/java/de/katzenpapst/amunra/block/BlockGrassMeta.java
@@ -2,13 +2,13 @@
 
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.IGrowable;
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
+
 public class BlockGrassMeta extends BlockBasicMeta implements IGrowable {
 
     public BlockGrassMeta(String name, Material mat) {

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockLeafMeta.java b/src/main/java/de/katzenpapst/amunra/block/BlockLeafMeta.java
@@ -5,8 +5,6 @@
 import java.util.Map;
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLeaves;
 import net.minecraft.block.material.Material;
@@ -27,6 +25,7 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.item.ItemBlockMulti;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
 
 public class BlockLeafMeta extends BlockLeaves implements IMetaBlock {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockLogMeta.java b/src/main/java/de/katzenpapst/amunra/block/BlockLogMeta.java
@@ -1,7 +1,5 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -12,6 +10,7 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
 
 public class BlockLogMeta extends BlockBasicMeta {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockMachineMeta.java b/src/main/java/de/katzenpapst/amunra/block/BlockMachineMeta.java
@@ -4,11 +4,6 @@
 import java.util.List;
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-import micdoodle8.mods.galacticraft.core.blocks.BlockTileGC;
-import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical;
-import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -31,6 +26,10 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.item.ItemBlockMulti;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
+import micdoodle8.mods.galacticraft.core.blocks.BlockTileGC;
+import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical;
+import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
 
 public class BlockMachineMeta extends BlockTileGC implements ItemBlockDesc.IBlockShiftDesc, IMetaBlock {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockMachineMetaDummyRender.java b/src/main/java/de/katzenpapst/amunra/block/BlockMachineMetaDummyRender.java
@@ -1,14 +1,13 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.api.block.IPartialSealableBlock;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
+import micdoodle8.mods.galacticraft.api.block.IPartialSealableBlock;
 
 public class BlockMachineMetaDummyRender extends BlockMachineMeta implements IPartialSealableBlock {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockMetaFake.java b/src/main/java/de/katzenpapst/amunra/block/BlockMetaFake.java
@@ -1,9 +1,5 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-import micdoodle8.mods.galacticraft.api.vector.BlockVec3;
-import micdoodle8.mods.galacticraft.core.tile.TileEntityMulti;
-
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -15,6 +11,9 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
+import micdoodle8.mods.galacticraft.api.vector.BlockVec3;
+import micdoodle8.mods.galacticraft.core.tile.TileEntityMulti;
 
 public class BlockMetaFake extends BlockBasicMeta implements ITileEntityProvider {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockMetaPairHashable.java b/src/main/java/de/katzenpapst/amunra/block/BlockMetaPairHashable.java
@@ -1,9 +1,9 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.Block;
 
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
+
 /**
  * Like BlockMetaPair, but should work in HashMaps
  * 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockSlabMeta.java b/src/main/java/de/katzenpapst/amunra/block/BlockSlabMeta.java
@@ -4,8 +4,6 @@
 import java.util.List;
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSlab;
 import net.minecraft.block.material.Material;
@@ -26,6 +24,7 @@
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.helper.BlockMassHelper;
 import de.katzenpapst.amunra.item.ItemSlabMulti;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
 
 public class BlockSlabMeta extends BlockSlab implements IMetaBlock, IMassiveBlock {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockStairsAR.java b/src/main/java/de/katzenpapst/amunra/block/BlockStairsAR.java
@@ -2,8 +2,6 @@
 
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
 import net.minecraft.block.material.MapColor;
@@ -24,6 +22,7 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.helper.BlockMassHelper;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
 
 public class BlockStairsAR extends BlockStairs implements IMassiveBlock {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/CraftingBlock.java b/src/main/java/de/katzenpapst/amunra/block/CraftingBlock.java
@@ -1,7 +1,5 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.core.GalacticraftCore;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -12,6 +10,7 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.AmunRa;
 import de.katzenpapst.amunra.GuiIds;
+import micdoodle8.mods.galacticraft.core.GalacticraftCore;
 
 public class CraftingBlock extends SubBlock {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/FakeBlock.java b/src/main/java/de/katzenpapst/amunra/block/FakeBlock.java
@@ -2,10 +2,6 @@
 
 import java.util.Random;
 
-import micdoodle8.mods.galacticraft.api.block.IPartialSealableBlock;
-import micdoodle8.mods.galacticraft.api.vector.BlockVec3;
-import micdoodle8.mods.galacticraft.core.tile.TileEntityMulti;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.particle.EffectRenderer;
 import net.minecraft.creativetab.CreativeTabs;
@@ -21,6 +17,9 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import de.katzenpapst.amunra.tile.TileEntityShuttleDockFake;
+import micdoodle8.mods.galacticraft.api.block.IPartialSealableBlock;
+import micdoodle8.mods.galacticraft.api.vector.BlockVec3;
+import micdoodle8.mods.galacticraft.core.tile.TileEntityMulti;
 
 public class FakeBlock extends SubBlock implements IPartialSealableBlock, IMassiveBlock {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/IMetaBlock.java b/src/main/java/de/katzenpapst/amunra/block/IMetaBlock.java
@@ -1,9 +1,9 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-
 import net.minecraft.block.Block;
 
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
+
 public interface IMetaBlock {
 
     /**

diff --git a/src/main/java/de/katzenpapst/amunra/block/MethaneGrass.java b/src/main/java/de/katzenpapst/amunra/block/MethaneGrass.java
@@ -1,14 +1,13 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
-import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace;
-import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas;
-
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair;
+import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace;
+import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas;
 
 public class MethaneGrass extends SubBlockGrass {
 

diff --git a/src/main/java/de/katzenpapst/amunra/block/SubBlock.java b/src/main/java/de/katzenpapst/amunra/block/SubBlock.java
@@ -1,15 +1,15 @@
 package de.katzenpapst.amunra.block;
 
-import micdoodle8.mods.galacticraft.api.block.IDetectableResource;
-import micdoodle8.mods.galacticraft.api.block.IPlantableBlock;
-import micdoodle8.mods.galacticraft.api.block.ITerraformableBlock;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import micdoodle8.mods.galacticraft.api.block.IDetectableResource;
+import micdoodle8.mods.galacticraft.api.block.IPlantableBlock;
+import micdoodle8.mods.galacticraft.api.block.ITerraformableBlock;
+
 public class SubBlock extends Block implements IDetectableResource, IPlantableBlock, ITerraformableBlock {
     /*
      * public float hardness = 1.5F; public float resistance = 10.0F; public String name = null; public String texture =