diff --git a/src/main/java/de/katzenpapst/amunra/AmunRa.java b/src/main/java/de/katzenpapst/amunra/AmunRa.java index 6dd509c5..dadef171 100755 --- 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 index 52313698..52f1e972 100755 --- 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 index 582eec27..5bc329a2 100755 --- 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 index 912114db..1a89446f 100755 --- 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 index f3da9ab4..85322b16 100755 --- 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 index 6253bc16..e208aca4 100755 --- 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 index bce9d188..5e3166a0 100755 --- 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 index 9456886d..229254a0 100755 --- 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 index 5789c1d5..5ec0769f 100755 --- 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 index 63690bd1..0d38695d 100755 --- 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 index 8e4cc9a2..858b9aa6 100755 --- a/src/main/java/de/katzenpapst/amunra/block/BlockMachineMetaDummyRender.java +++ b/src/main/java/de/katzenpapst/amunra/block/BlockMachineMetaDummyRender.java @@ -1,7 +1,5 @@ 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; @@ -9,6 +7,7 @@ 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 index 53c2b7bd..9872c649 100755 --- 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 index a1a0d10d..02577475 100755 --- 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 index 8c661cd8..82c751e2 100755 --- 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 index 8ae7f051..54d9a19d 100755 --- 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 index 01b8a657..a2448921 100755 --- 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 index cb36810f..69e39230 100755 --- 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 index f79c2010..8966ee56 100755 --- 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 index 9a3541d7..2c006194 100755 --- 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 index 6b787a9f..e1740e87 100755 --- 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 = diff --git a/src/main/java/de/katzenpapst/amunra/block/SubBlockGrass.java b/src/main/java/de/katzenpapst/amunra/block/SubBlockGrass.java index 7210b5b7..f7f47588 100755 --- a/src/main/java/de/katzenpapst/amunra/block/SubBlockGrass.java +++ b/src/main/java/de/katzenpapst/amunra/block/SubBlockGrass.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.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; @@ -13,6 +11,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class SubBlockGrass extends SubBlock { diff --git a/src/main/java/de/katzenpapst/amunra/block/SubBlockLeaf.java b/src/main/java/de/katzenpapst/amunra/block/SubBlockLeaf.java index 8939041b..2bb64ba6 100755 --- a/src/main/java/de/katzenpapst/amunra/block/SubBlockLeaf.java +++ b/src/main/java/de/katzenpapst/amunra/block/SubBlockLeaf.java @@ -2,8 +2,6 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; @@ -11,6 +9,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.item.ItemDamagePair; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class SubBlockLeaf extends SubBlock { diff --git a/src/main/java/de/katzenpapst/amunra/block/SubBlockMachine.java b/src/main/java/de/katzenpapst/amunra/block/SubBlockMachine.java index 087b2a64..87825304 100755 --- a/src/main/java/de/katzenpapst/amunra/block/SubBlockMachine.java +++ b/src/main/java/de/katzenpapst/amunra/block/SubBlockMachine.java @@ -1,11 +1,11 @@ package de.katzenpapst.amunra.block; -import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; + public class SubBlockMachine extends SubBlock implements ItemBlockDesc.IBlockShiftDesc { public SubBlockMachine(String name, String texture) { diff --git a/src/main/java/de/katzenpapst/amunra/block/SubBlockRock.java b/src/main/java/de/katzenpapst/amunra/block/SubBlockRock.java index 51989edb..f1e4fba1 100755 --- a/src/main/java/de/katzenpapst/amunra/block/SubBlockRock.java +++ b/src/main/java/de/katzenpapst/amunra/block/SubBlockRock.java @@ -2,10 +2,10 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.item.Item; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; + /** * Subblock which drops some kind of cobble when harvested * diff --git a/src/main/java/de/katzenpapst/amunra/block/UnderwaterGrass.java b/src/main/java/de/katzenpapst/amunra/block/UnderwaterGrass.java index 2c589a5d..02180dcd 100755 --- a/src/main/java/de/katzenpapst/amunra/block/UnderwaterGrass.java +++ b/src/main/java/de/katzenpapst/amunra/block/UnderwaterGrass.java @@ -2,12 +2,12 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; + public class UnderwaterGrass extends SubBlockGrass { private BlockMetaPair dirtVersion; diff --git a/src/main/java/de/katzenpapst/amunra/block/VacuumGrass.java b/src/main/java/de/katzenpapst/amunra/block/VacuumGrass.java index 3d94c6ad..78aa8759 100755 --- a/src/main/java/de/katzenpapst/amunra/block/VacuumGrass.java +++ b/src/main/java/de/katzenpapst/amunra/block/VacuumGrass.java @@ -1,13 +1,12 @@ package de.katzenpapst.amunra.block; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace; - 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; public class VacuumGrass extends SubBlockGrass { diff --git a/src/main/java/de/katzenpapst/amunra/block/bush/ARTreeSapling.java b/src/main/java/de/katzenpapst/amunra/block/bush/ARTreeSapling.java index 5c447bea..d6a6db20 100755 --- a/src/main/java/de/katzenpapst/amunra/block/bush/ARTreeSapling.java +++ b/src/main/java/de/katzenpapst/amunra/block/bush/ARTreeSapling.java @@ -2,12 +2,11 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.world.World; import de.katzenpapst.amunra.block.ARBlocks; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class ARTreeSapling extends AbstractSapling { diff --git a/src/main/java/de/katzenpapst/amunra/block/bush/AbstractSapling.java b/src/main/java/de/katzenpapst/amunra/block/bush/AbstractSapling.java index 4defa502..f55f1d59 100755 --- a/src/main/java/de/katzenpapst/amunra/block/bush/AbstractSapling.java +++ b/src/main/java/de/katzenpapst/amunra/block/bush/AbstractSapling.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.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; + abstract public class AbstractSapling extends SubBlockBush { protected BlockMetaPair wood; diff --git a/src/main/java/de/katzenpapst/amunra/block/bush/BlockBushMulti.java b/src/main/java/de/katzenpapst/amunra/block/bush/BlockBushMulti.java index f426befe..af9be5c3 100755 --- a/src/main/java/de/katzenpapst/amunra/block/bush/BlockBushMulti.java +++ b/src/main/java/de/katzenpapst/amunra/block/bush/BlockBushMulti.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.IGrowable; import net.minecraft.block.material.Material; @@ -18,6 +16,7 @@ import de.katzenpapst.amunra.block.BlockBasicMeta; import de.katzenpapst.amunra.block.SubBlock; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; // SEE net.minecraft.block.BlockBush public class BlockBushMulti extends BlockBasicMeta implements IGrowable, IShearable, IPlantable { diff --git a/src/main/java/de/katzenpapst/amunra/block/bush/SubBlockBush.java b/src/main/java/de/katzenpapst/amunra/block/bush/SubBlockBush.java index 12b3260d..67977c94 100755 --- a/src/main/java/de/katzenpapst/amunra/block/bush/SubBlockBush.java +++ b/src/main/java/de/katzenpapst/amunra/block/bush/SubBlockBush.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.IGrowable; import net.minecraft.item.ItemStack; @@ -15,6 +13,7 @@ import net.minecraftforge.common.IShearable; import de.katzenpapst.amunra.block.SubBlock; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class SubBlockBush extends SubBlock implements IGrowable, IShearable, IPlantable { diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/BlockGravitation.java b/src/main/java/de/katzenpapst/amunra/block/machine/BlockGravitation.java index e587bc4f..25b66beb 100755 --- a/src/main/java/de/katzenpapst/amunra/block/machine/BlockGravitation.java +++ b/src/main/java/de/katzenpapst/amunra/block/machine/BlockGravitation.java @@ -2,9 +2,6 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -21,6 +18,8 @@ import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.proxy.ARSidedProxy.ParticleType; import de.katzenpapst.amunra.tile.TileEntityGravitation; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; public class BlockGravitation extends SubBlockMachine { diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/BlockHydroponics.java b/src/main/java/de/katzenpapst/amunra/block/machine/BlockHydroponics.java index 3cbc0147..8f5eb61a 100755 --- a/src/main/java/de/katzenpapst/amunra/block/machine/BlockHydroponics.java +++ b/src/main/java/de/katzenpapst/amunra/block/machine/BlockHydroponics.java @@ -2,8 +2,6 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -16,6 +14,7 @@ import de.katzenpapst.amunra.GuiIds; import de.katzenpapst.amunra.block.SubBlockMachine; import de.katzenpapst.amunra.tile.TileEntityHydroponics; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class BlockHydroponics extends SubBlockMachine { diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/BlockIsotopeGenerator.java b/src/main/java/de/katzenpapst/amunra/block/machine/BlockIsotopeGenerator.java index 4ee6557d..6eb124be 100755 --- a/src/main/java/de/katzenpapst/amunra/block/machine/BlockIsotopeGenerator.java +++ b/src/main/java/de/katzenpapst/amunra/block/machine/BlockIsotopeGenerator.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.block.machine; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -17,6 +15,7 @@ import de.katzenpapst.amunra.block.SubBlockMachine; import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.tile.TileEntityIsotopeGenerator; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class BlockIsotopeGenerator extends SubBlockMachine { diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/BlockShuttleDock.java b/src/main/java/de/katzenpapst/amunra/block/machine/BlockShuttleDock.java index c1848302..954b1640 100755 --- a/src/main/java/de/katzenpapst/amunra/block/machine/BlockShuttleDock.java +++ b/src/main/java/de/katzenpapst/amunra/block/machine/BlockShuttleDock.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.block.machine; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +12,7 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.block.SubBlockMachine; import de.katzenpapst.amunra.tile.TileEntityShuttleDock; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; public class BlockShuttleDock extends SubBlockMachine { diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/BlockMothershipJetMeta.java b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/BlockMothershipJetMeta.java index b7fa6710..25a13653 100755 --- a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/BlockMothershipJetMeta.java +++ b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/BlockMothershipJetMeta.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.block.machine.mothershipEngine; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -14,6 +12,7 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.block.BlockMachineMetaDummyRender; import de.katzenpapst.amunra.block.SubBlock; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class BlockMothershipJetMeta extends BlockMachineMetaDummyRender { diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineBoosterBase.java b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineBoosterBase.java index f497ba6c..dffcd918 100755 --- a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineBoosterBase.java +++ b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineBoosterBase.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.block.machine.mothershipEngine; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -18,6 +16,7 @@ import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract; import de.katzenpapst.amunra.tile.TileEntityMothershipEngineBooster; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class MothershipEngineBoosterBase extends AbstractBlockMothershipRestricted { diff --git a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineJetBase.java b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineJetBase.java index 1962f70c..3f092117 100755 --- a/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineJetBase.java +++ b/src/main/java/de/katzenpapst/amunra/block/machine/mothershipEngine/MothershipEngineJetBase.java @@ -2,8 +2,6 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +17,7 @@ import de.katzenpapst.amunra.block.machine.AbstractBlockMothershipRestricted; import de.katzenpapst.amunra.item.ItemDamagePair; import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public abstract class MothershipEngineJetBase extends AbstractBlockMothershipRestricted { diff --git a/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXGravityDust.java b/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXGravityDust.java index b810777a..5dcdb745 100755 --- a/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXGravityDust.java +++ b/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXGravityDust.java @@ -1,10 +1,10 @@ package de.katzenpapst.amunra.client.fx; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.client.particle.EntityFX; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.vector.Vector3; + public class EntityFXGravityDust extends EntityFX { public EntityFXGravityDust(World par1World, Vector3 position, Vector3 motion) { diff --git a/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXMothershipIonFlame.java b/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXMothershipIonFlame.java index 41bf6dfe..3555f327 100755 --- a/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXMothershipIonFlame.java +++ b/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXMothershipIonFlame.java @@ -2,8 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; @@ -13,6 +11,8 @@ import org.lwjgl.opengl.GL11; +import micdoodle8.mods.galacticraft.api.vector.Vector3; + public class EntityFXMothershipIonFlame extends EntityFX { protected float smokeParticleScale; diff --git a/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXMothershipJetFire.java b/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXMothershipJetFire.java index d09a515a..eb46c3ae 100755 --- a/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXMothershipJetFire.java +++ b/src/main/java/de/katzenpapst/amunra/client/fx/EntityFXMothershipJetFire.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.client.fx; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.MathHelper; @@ -9,6 +7,8 @@ import org.lwjgl.opengl.GL11; +import micdoodle8.mods.galacticraft.api.vector.Vector3; + public class EntityFXMothershipJetFire extends EntityFX { public EntityFXMothershipJetFire(World world, Vector3 pos, Vector3 motion) { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java index f4cca4f9..266ecc47 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiARCelestialSelection.java @@ -7,18 +7,6 @@ import java.util.List; import java.util.Map.Entry; -import micdoodle8.mods.galacticraft.api.event.client.CelestialBodyRenderEvent; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.IChildBody; -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.core.client.gui.screen.GuiCelestialSelection; -import micdoodle8.mods.galacticraft.core.util.ColorUtil; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; @@ -35,6 +23,17 @@ import de.katzenpapst.amunra.mothership.MothershipWorldData; import de.katzenpapst.amunra.tick.TickHandlerServer; import de.katzenpapst.amunra.vec.BoxInt2D; +import micdoodle8.mods.galacticraft.api.event.client.CelestialBodyRenderEvent; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; +import micdoodle8.mods.galacticraft.api.galaxies.IChildBody; +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.core.client.gui.screen.GuiCelestialSelection; +import micdoodle8.mods.galacticraft.core.util.ColorUtil; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiARCelestialSelection extends GuiCelestialSelection { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiArtificialGravity.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiArtificialGravity.java index 95098243..8ca828a2 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiArtificialGravity.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiArtificialGravity.java @@ -3,20 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementCheckbox; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementCheckbox.ICheckBoxCallback; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox.ITextBoxCallback; -import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; -import micdoodle8.mods.galacticraft.core.network.PacketSimple; -import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; -import micdoodle8.mods.galacticraft.core.util.ColorUtil; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -31,6 +17,19 @@ import de.katzenpapst.amunra.inventory.ContainerArtificalGravity; import de.katzenpapst.amunra.network.packet.PacketSimpleAR; import de.katzenpapst.amunra.tile.TileEntityGravitation; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementCheckbox; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementCheckbox.ICheckBoxCallback; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox.ITextBoxCallback; +import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; +import micdoodle8.mods.galacticraft.core.network.PacketSimple; +import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; +import micdoodle8.mods.galacticraft.core.util.ColorUtil; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiArtificialGravity extends GuiContainerGC implements ITextBoxCallback, ICheckBoxCallback { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiAtomBattery.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiAtomBattery.java index e547b686..7dce1364 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiAtomBattery.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiAtomBattery.java @@ -3,15 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; -import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; -import micdoodle8.mods.galacticraft.core.network.PacketSimple; -import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; -import micdoodle8.mods.galacticraft.core.util.EnumColor; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -21,6 +12,14 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.inventory.ContainerAtomBattery; import de.katzenpapst.amunra.tile.TileEntityIsotopeGenerator; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; +import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; +import micdoodle8.mods.galacticraft.core.network.PacketSimple; +import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; +import micdoodle8.mods.galacticraft.core.util.EnumColor; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiAtomBattery extends GuiContainerGC { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiContainerTabbed.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiContainerTabbed.java index 035d97e2..94a2962a 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiContainerTabbed.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiContainerTabbed.java @@ -3,14 +3,13 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.Container; import de.katzenpapst.amunra.client.gui.elements.TabButton; import de.katzenpapst.amunra.client.gui.tabs.AbstractTab; +import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; abstract public class GuiContainerTabbed extends GuiContainerGC { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiHydroponics.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiHydroponics.java index 7e0db71f..f3c0f71f 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiHydroponics.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiHydroponics.java @@ -3,12 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; -import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; -import micdoodle8.mods.galacticraft.core.util.EnumColor; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -20,6 +14,11 @@ import de.katzenpapst.amunra.inventory.ContainerHydroponics; import de.katzenpapst.amunra.network.packet.PacketSimpleAR; import de.katzenpapst.amunra.tile.TileEntityHydroponics; +import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; +import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; +import micdoodle8.mods.galacticraft.core.util.EnumColor; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiHydroponics extends GuiContainerGC { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiIonEngine.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiIonEngine.java index 9706be5f..ef77c41f 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiIonEngine.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiIonEngine.java @@ -3,16 +3,15 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; -import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.inventory.ContainerIonEngine; import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; +import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiIonEngine extends GuiRocketEngine { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiMothershipSelection.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiMothershipSelection.java index 71587e3c..c4bd7998 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiMothershipSelection.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiMothershipSelection.java @@ -4,11 +4,6 @@ import java.util.List; import java.util.Map; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; -import micdoodle8.mods.galacticraft.core.util.ColorUtil; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; @@ -29,6 +24,10 @@ import de.katzenpapst.amunra.network.packet.PacketSimpleAR; import de.katzenpapst.amunra.tile.TileEntityMothershipController; import de.katzenpapst.amunra.vec.BlockVector; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; +import micdoodle8.mods.galacticraft.core.util.ColorUtil; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiMothershipSelection extends GuiARCelestialSelection { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiRocketEngine.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiRocketEngine.java index 9d83a572..214ac50c 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiRocketEngine.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiRocketEngine.java @@ -3,14 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; -import micdoodle8.mods.galacticraft.core.network.PacketSimple; -import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; -import micdoodle8.mods.galacticraft.core.util.EnumColor; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -22,6 +14,13 @@ import de.katzenpapst.amunra.helper.GuiHelper; import de.katzenpapst.amunra.inventory.ContainerRocketEngine; import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; +import micdoodle8.mods.galacticraft.core.network.PacketSimple; +import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; +import micdoodle8.mods.galacticraft.core.util.EnumColor; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiRocketEngine extends GuiContainerGC { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleDock.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleDock.java index 5165c9f5..a20bf880 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleDock.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleDock.java @@ -3,11 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; -import micdoodle8.mods.galacticraft.core.util.EnumColor; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -19,6 +14,10 @@ import de.katzenpapst.amunra.item.ItemShuttle; import de.katzenpapst.amunra.tile.TileEntityShuttleDock; import de.katzenpapst.amunra.tile.TileEntityShuttleDock.DockOperation; +import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementInfoRegion; +import micdoodle8.mods.galacticraft.core.util.EnumColor; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiShuttleDock extends GuiContainerGC { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java b/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java index 55b12d5f..f82cb445 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/GuiShuttleSelection.java @@ -4,14 +4,6 @@ import java.util.List; import java.util.Map; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.IChildBody; -import micdoodle8.mods.galacticraft.api.galaxies.Satellite; -import micdoodle8.mods.galacticraft.api.recipe.SpaceStationRecipe; -import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; -import micdoodle8.mods.galacticraft.core.util.ColorUtil; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; @@ -24,6 +16,13 @@ import de.katzenpapst.amunra.mothership.Mothership; import de.katzenpapst.amunra.network.packet.PacketSimpleAR; import de.katzenpapst.amunra.vec.BoxInt2D; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.IChildBody; +import micdoodle8.mods.galacticraft.api.galaxies.Satellite; +import micdoodle8.mods.galacticraft.api.recipe.SpaceStationRecipe; +import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; +import micdoodle8.mods.galacticraft.core.util.ColorUtil; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiShuttleSelection extends GuiARCelestialSelection { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/elements/StringSelectBox.java b/src/main/java/de/katzenpapst/amunra/client/gui/elements/StringSelectBox.java index 730fb6f1..b9462eca 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/elements/StringSelectBox.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/elements/StringSelectBox.java @@ -3,8 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.client.gui.screen.SmallFontRenderer; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; @@ -13,6 +11,7 @@ import cpw.mods.fml.client.FMLClientHandler; import de.katzenpapst.amunra.AmunRa; +import micdoodle8.mods.galacticraft.core.client.gui.screen.SmallFontRenderer; public class StringSelectBox extends GuiButton { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/schematic/GuiSchematicShuttle.java b/src/main/java/de/katzenpapst/amunra/client/gui/schematic/GuiSchematicShuttle.java index 9495b5f1..0f227dfd 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/schematic/GuiSchematicShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/schematic/GuiSchematicShuttle.java @@ -1,9 +1,5 @@ package de.katzenpapst.amunra.client.gui.schematic; -import micdoodle8.mods.galacticraft.api.recipe.ISchematicResultPage; -import micdoodle8.mods.galacticraft.api.recipe.SchematicRegistry; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -15,6 +11,9 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.inventory.schematic.ContainerSchematicShuttle; import de.katzenpapst.amunra.item.ARItems; +import micdoodle8.mods.galacticraft.api.recipe.ISchematicResultPage; +import micdoodle8.mods.galacticraft.api.recipe.SchematicRegistry; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class GuiSchematicShuttle extends GuiContainer implements ISchematicResultPage { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractPermissionTab.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractPermissionTab.java index 6ef482ba..761fb952 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractPermissionTab.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractPermissionTab.java @@ -5,13 +5,6 @@ import java.util.List; import java.util.Map; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown.IDropboxCallback; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox.ITextBoxCallback; -import micdoodle8.mods.galacticraft.core.util.ColorUtil; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; @@ -23,6 +16,12 @@ import de.katzenpapst.amunra.helper.PlayerID; import de.katzenpapst.amunra.mothership.Mothership; import de.katzenpapst.amunra.tile.TileEntityMothershipSettings; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown.IDropboxCallback; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox.ITextBoxCallback; +import micdoodle8.mods.galacticraft.core.util.ColorUtil; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; abstract public class AbstractPermissionTab extends AbstractTab implements IDropboxCallback, ITextBoxCallback, ISelectBoxCallback, IMothershipSettingsTab { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractTab.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractTab.java index cef52df1..0084af7b 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractTab.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/AbstractTab.java @@ -3,9 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -20,6 +17,9 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; +import micdoodle8.mods.galacticraft.core.client.gui.container.GuiContainerGC; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox; + abstract public class AbstractTab { protected List buttonList = new ArrayList<>(); diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipCustom.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipCustom.java index 73c53fcd..c278db58 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipCustom.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipCustom.java @@ -2,11 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox.ITextBoxCallback; -import micdoodle8.mods.galacticraft.core.util.ColorUtil; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; @@ -18,6 +13,10 @@ import de.katzenpapst.amunra.client.gui.elements.DynamicTexturedButton; import de.katzenpapst.amunra.mothership.Mothership; import de.katzenpapst.amunra.tile.TileEntityMothershipSettings; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementTextBox.ITextBoxCallback; +import micdoodle8.mods.galacticraft.core.util.ColorUtil; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class TabMothershipCustom extends AbstractTab implements ITextBoxCallback, IMothershipSettingsTab { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipLanding.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipLanding.java index 28982239..be8cb561 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipLanding.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipLanding.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.client.gui.tabs; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; @@ -14,6 +11,8 @@ import de.katzenpapst.amunra.network.packet.PacketSimpleAR; import de.katzenpapst.amunra.network.packet.PacketSimpleAR.EnumSimplePacket; import de.katzenpapst.amunra.tile.TileEntityMothershipSettings; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class TabMothershipLanding extends AbstractPermissionTab { diff --git a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java index 972d9710..055d93aa 100755 --- a/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java +++ b/src/main/java/de/katzenpapst/amunra/client/gui/tabs/TabMothershipUsage.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.client.gui.tabs; -import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; @@ -14,6 +11,8 @@ import de.katzenpapst.amunra.network.packet.PacketSimpleAR; import de.katzenpapst.amunra.network.packet.PacketSimpleAR.EnumSimplePacket; import de.katzenpapst.amunra.tile.TileEntityMothershipSettings; +import micdoodle8.mods.galacticraft.core.client.gui.element.GuiElementDropdown; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class TabMothershipUsage extends AbstractPermissionTab { diff --git a/src/main/java/de/katzenpapst/amunra/client/renderer/RenderHydroponics.java b/src/main/java/de/katzenpapst/amunra/client/renderer/RenderHydroponics.java index ac354e70..044e118c 100755 --- a/src/main/java/de/katzenpapst/amunra/client/renderer/RenderHydroponics.java +++ b/src/main/java/de/katzenpapst/amunra/client/renderer/RenderHydroponics.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.client.renderer; -import micdoodle8.mods.galacticraft.api.transmission.tile.IOxygenReceiver; -import micdoodle8.mods.galacticraft.core.util.OxygenUtil; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -12,6 +9,8 @@ import de.katzenpapst.amunra.client.renderer.model.ModelHydroponics; import de.katzenpapst.amunra.tile.TileEntityHydroponics; +import micdoodle8.mods.galacticraft.api.transmission.tile.IOxygenReceiver; +import micdoodle8.mods.galacticraft.core.util.OxygenUtil; public class RenderHydroponics extends TileEntitySpecialRenderer { diff --git a/src/main/java/de/katzenpapst/amunra/client/renderer/RenderLaserArrow.java b/src/main/java/de/katzenpapst/amunra/client/renderer/RenderLaserArrow.java index 51db9235..ef27952e 100755 --- a/src/main/java/de/katzenpapst/amunra/client/renderer/RenderLaserArrow.java +++ b/src/main/java/de/katzenpapst/amunra/client/renderer/RenderLaserArrow.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.client.renderer; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; - import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -14,6 +12,7 @@ import org.lwjgl.opengl.GL12; import de.katzenpapst.amunra.entity.EntityBaseLaserArrow; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; public class RenderLaserArrow extends Render { diff --git a/src/main/java/de/katzenpapst/amunra/client/renderer/RenderShuttle.java b/src/main/java/de/katzenpapst/amunra/client/renderer/RenderShuttle.java index 95128222..678bf0d1 100755 --- a/src/main/java/de/katzenpapst/amunra/client/renderer/RenderShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/client/renderer/RenderShuttle.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.client.renderer; -import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase; - import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; @@ -12,6 +10,7 @@ import org.lwjgl.opengl.GL12; import de.katzenpapst.amunra.AmunRa; +import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase; public class RenderShuttle extends Render { diff --git a/src/main/java/de/katzenpapst/amunra/client/renderer/item/ItemRendererShuttle.java b/src/main/java/de/katzenpapst/amunra/client/renderer/item/ItemRendererShuttle.java index 9762c761..d6e9adf9 100755 --- a/src/main/java/de/katzenpapst/amunra/client/renderer/item/ItemRendererShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/client/renderer/item/ItemRendererShuttle.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.client.renderer.item; -import micdoodle8.mods.galacticraft.core.entities.EntityTier1Rocket; - import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -18,6 +16,7 @@ import cpw.mods.fml.client.FMLClientHandler; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.entity.spaceship.EntityShuttle; +import micdoodle8.mods.galacticraft.core.entities.EntityTier1Rocket; public class ItemRendererShuttle implements IItemRenderer { diff --git a/src/main/java/de/katzenpapst/amunra/command/CommandCelestialBodyInfo.java b/src/main/java/de/katzenpapst/amunra/command/CommandCelestialBodyInfo.java index 4fbb131a..e1390a67 100755 --- a/src/main/java/de/katzenpapst/amunra/command/CommandCelestialBodyInfo.java +++ b/src/main/java/de/katzenpapst/amunra/command/CommandCelestialBodyInfo.java @@ -4,10 +4,6 @@ import java.util.Collection; import java.util.List; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; @@ -16,6 +12,10 @@ import com.google.common.collect.Lists; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; +import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; + public class CommandCelestialBodyInfo extends CommandBase { public CommandCelestialBodyInfo() {} diff --git a/src/main/java/de/katzenpapst/amunra/command/CommandMoveMothership.java b/src/main/java/de/katzenpapst/amunra/command/CommandMoveMothership.java index 150430d3..cec43005 100755 --- a/src/main/java/de/katzenpapst/amunra/command/CommandMoveMothership.java +++ b/src/main/java/de/katzenpapst/amunra/command/CommandMoveMothership.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.command; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; @@ -11,6 +9,7 @@ import de.katzenpapst.amunra.mothership.Mothership; import de.katzenpapst.amunra.mothership.MothershipWorldProvider; import de.katzenpapst.amunra.network.packet.PacketSimpleAR; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; public class CommandMoveMothership extends CommandBase { diff --git a/src/main/java/de/katzenpapst/amunra/command/CommandShuttleTeleport.java b/src/main/java/de/katzenpapst/amunra/command/CommandShuttleTeleport.java index 79f411e3..13227761 100755 --- a/src/main/java/de/katzenpapst/amunra/command/CommandShuttleTeleport.java +++ b/src/main/java/de/katzenpapst/amunra/command/CommandShuttleTeleport.java @@ -1,11 +1,5 @@ package de.katzenpapst.amunra.command; -import micdoodle8.mods.galacticraft.api.entity.IRocketType; -import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; -import micdoodle8.mods.galacticraft.core.items.GCItems; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; -import micdoodle8.mods.galacticraft.core.util.PlayerUtil; - import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; @@ -18,6 +12,11 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.entity.spaceship.EntityShuttle; +import micdoodle8.mods.galacticraft.api.entity.IRocketType; +import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; +import micdoodle8.mods.galacticraft.core.items.GCItems; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; +import micdoodle8.mods.galacticraft.core.util.PlayerUtil; public class CommandShuttleTeleport extends CommandBase { diff --git a/src/main/java/de/katzenpapst/amunra/config/ARConfig.java b/src/main/java/de/katzenpapst/amunra/config/ARConfig.java index d54b09fc..4c90600e 100755 --- a/src/main/java/de/katzenpapst/amunra/config/ARConfig.java +++ b/src/main/java/de/katzenpapst/amunra/config/ARConfig.java @@ -4,12 +4,6 @@ import java.util.HashSet; import java.util.Set; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; @@ -19,6 +13,11 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.client.RingsRenderInfo; import de.katzenpapst.amunra.helper.AstronomyHelper; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule; public class ARConfig { diff --git a/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java b/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java index 5d8af49c..e829da68 100755 --- a/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java +++ b/src/main/java/de/katzenpapst/amunra/crafting/RecipeHelper.java @@ -5,21 +5,6 @@ import java.util.HashSet; import java.util.Vector; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.recipe.CircuitFabricatorRecipes; -import micdoodle8.mods.galacticraft.api.recipe.CompressorRecipes; -import micdoodle8.mods.galacticraft.api.recipe.INasaWorkbenchRecipe; -import micdoodle8.mods.galacticraft.api.recipe.ISchematicPage; -import micdoodle8.mods.galacticraft.api.recipe.SchematicRegistry; -import micdoodle8.mods.galacticraft.api.recipe.SpaceStationRecipe; -import micdoodle8.mods.galacticraft.core.blocks.BlockAirLockFrame; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.items.GCItems; -import micdoodle8.mods.galacticraft.core.recipe.NasaWorkbenchRecipe; -import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; -import micdoodle8.mods.galacticraft.planets.asteroids.items.AsteroidsItems; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; @@ -38,6 +23,20 @@ import de.katzenpapst.amunra.item.ARItems; import de.katzenpapst.amunra.item.ItemDamagePair; import de.katzenpapst.amunra.schematic.SchematicPageShuttle; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.api.recipe.CircuitFabricatorRecipes; +import micdoodle8.mods.galacticraft.api.recipe.CompressorRecipes; +import micdoodle8.mods.galacticraft.api.recipe.INasaWorkbenchRecipe; +import micdoodle8.mods.galacticraft.api.recipe.ISchematicPage; +import micdoodle8.mods.galacticraft.api.recipe.SchematicRegistry; +import micdoodle8.mods.galacticraft.api.recipe.SpaceStationRecipe; +import micdoodle8.mods.galacticraft.core.blocks.BlockAirLockFrame; +import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.items.GCItems; +import micdoodle8.mods.galacticraft.core.recipe.NasaWorkbenchRecipe; +import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; +import micdoodle8.mods.galacticraft.planets.asteroids.items.AsteroidsItems; public class RecipeHelper { diff --git a/src/main/java/de/katzenpapst/amunra/entity/EntityBaseLaserArrow.java b/src/main/java/de/katzenpapst/amunra/entity/EntityBaseLaserArrow.java index 5b3e5e2d..80472eac 100755 --- a/src/main/java/de/katzenpapst/amunra/entity/EntityBaseLaserArrow.java +++ b/src/main/java/de/katzenpapst/amunra/entity/EntityBaseLaserArrow.java @@ -2,10 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.entity.IAntiGrav; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.util.OxygenUtil; - import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -28,6 +24,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.mob.DamageSourceAR; +import micdoodle8.mods.galacticraft.api.entity.IAntiGrav; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.util.OxygenUtil; abstract public class EntityBaseLaserArrow extends Entity implements IProjectile, IThrowableEntity, IAntiGrav { diff --git a/src/main/java/de/katzenpapst/amunra/entity/EntityLaserArrow.java b/src/main/java/de/katzenpapst/amunra/entity/EntityLaserArrow.java index baa67b7c..b5ffe398 100755 --- a/src/main/java/de/katzenpapst/amunra/entity/EntityLaserArrow.java +++ b/src/main/java/de/katzenpapst/amunra/entity/EntityLaserArrow.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.entity; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.util.OxygenUtil; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -20,6 +17,8 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.mob.DamageSourceAR; import de.katzenpapst.amunra.world.WorldHelper; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.util.OxygenUtil; public class EntityLaserArrow extends EntityBaseLaserArrow { diff --git a/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java b/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java index 17c57114..e550a8c7 100755 --- a/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttle.java @@ -5,17 +5,6 @@ import java.util.List; import java.util.Map.Entry; -import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase; -import micdoodle8.mods.galacticraft.api.prefab.entity.EntityTieredRocket; -import micdoodle8.mods.galacticraft.api.tile.IFuelDock; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; -import micdoodle8.mods.galacticraft.api.world.IZeroGDimension; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; -import micdoodle8.mods.galacticraft.core.tile.TileEntityMulti; -import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -38,6 +27,16 @@ import de.katzenpapst.amunra.world.ShuttleDockHandler; import de.katzenpapst.amunra.world.WorldHelper; import io.netty.buffer.ByteBuf; +import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase; +import micdoodle8.mods.galacticraft.api.prefab.entity.EntityTieredRocket; +import micdoodle8.mods.galacticraft.api.tile.IFuelDock; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; +import micdoodle8.mods.galacticraft.api.world.IZeroGDimension; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; +import micdoodle8.mods.galacticraft.core.tile.TileEntityMulti; +import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; public class EntityShuttle extends EntityTieredRocket { diff --git a/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttleFake.java b/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttleFake.java index 5d764587..698c5a1c 100755 --- a/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttleFake.java +++ b/src/main/java/de/katzenpapst/amunra/entity/spaceship/EntityShuttleFake.java @@ -3,8 +3,6 @@ import java.util.HashMap; import java.util.Map.Entry; -import micdoodle8.mods.galacticraft.core.entities.EntityCelestialFake; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; @@ -12,6 +10,7 @@ import de.katzenpapst.amunra.helper.ShuttleTeleportHelper; import de.katzenpapst.amunra.network.packet.PacketSimpleAR; import de.katzenpapst.amunra.network.packet.PacketSimpleAR.EnumSimplePacket; +import micdoodle8.mods.galacticraft.core.entities.EntityCelestialFake; /** * This is my version of EntityCelestialFake, for special stuff diff --git a/src/main/java/de/katzenpapst/amunra/event/CraftingHandler.java b/src/main/java/de/katzenpapst/amunra/event/CraftingHandler.java index 3dda4ccb..451cc7fe 100755 --- a/src/main/java/de/katzenpapst/amunra/event/CraftingHandler.java +++ b/src/main/java/de/katzenpapst/amunra/event/CraftingHandler.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.event; -import micdoodle8.mods.galacticraft.core.items.ItemBattery; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -14,6 +12,7 @@ import de.katzenpapst.amunra.item.ItemCryogun; import de.katzenpapst.amunra.item.ItemNanotool; import de.katzenpapst.amunra.item.ItemRaygun; +import micdoodle8.mods.galacticraft.core.items.ItemBattery; public class CraftingHandler { diff --git a/src/main/java/de/katzenpapst/amunra/event/EventHandlerAR.java b/src/main/java/de/katzenpapst/amunra/event/EventHandlerAR.java index f806618c..2d12fea8 100755 --- a/src/main/java/de/katzenpapst/amunra/event/EventHandlerAR.java +++ b/src/main/java/de/katzenpapst/amunra/event/EventHandlerAR.java @@ -1,12 +1,5 @@ package de.katzenpapst.amunra.event; -import micdoodle8.mods.galacticraft.api.event.ZeroGravityEvent; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerHandler.ThermalArmorEvent; -import micdoodle8.mods.galacticraft.core.util.OxygenUtil; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; @@ -18,6 +11,12 @@ import de.katzenpapst.amunra.item.ItemThermalSuit; import de.katzenpapst.amunra.mob.DamageSourceAR; import de.katzenpapst.amunra.mob.entity.IEntityNonOxygenBreather; +import micdoodle8.mods.galacticraft.api.event.ZeroGravityEvent; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerHandler.ThermalArmorEvent; +import micdoodle8.mods.galacticraft.core.util.OxygenUtil; public class EventHandlerAR { diff --git a/src/main/java/de/katzenpapst/amunra/event/SystemRenderEventHandler.java b/src/main/java/de/katzenpapst/amunra/event/SystemRenderEventHandler.java index 7c07505a..8a22ae67 100755 --- a/src/main/java/de/katzenpapst/amunra/event/SystemRenderEventHandler.java +++ b/src/main/java/de/katzenpapst/amunra/event/SystemRenderEventHandler.java @@ -1,13 +1,5 @@ package de.katzenpapst.amunra.event; -import micdoodle8.mods.galacticraft.api.event.client.CelestialBodyRenderEvent; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.Moon; -import micdoodle8.mods.galacticraft.api.galaxies.Planet; -import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; -import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore.EventSpecialRender; -import micdoodle8.mods.galacticraft.planets.asteroids.client.render.NetworkRenderer; - import org.lwjgl.Sys; import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector3f; @@ -17,6 +9,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.AmunRa; +import micdoodle8.mods.galacticraft.api.event.client.CelestialBodyRenderEvent; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.Moon; +import micdoodle8.mods.galacticraft.api.galaxies.Planet; +import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; +import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore.EventSpecialRender; +import micdoodle8.mods.galacticraft.planets.asteroids.client.render.NetworkRenderer; public class SystemRenderEventHandler { /* diff --git a/src/main/java/de/katzenpapst/amunra/helper/AstronomyHelper.java b/src/main/java/de/katzenpapst/amunra/helper/AstronomyHelper.java index 2917bfb6..51519009 100755 --- a/src/main/java/de/katzenpapst/amunra/helper/AstronomyHelper.java +++ b/src/main/java/de/katzenpapst/amunra/helper/AstronomyHelper.java @@ -1,5 +1,8 @@ package de.katzenpapst.amunra.helper; +import de.katzenpapst.amunra.AmunRa; +import de.katzenpapst.amunra.astronomy.AngleDistance; +import de.katzenpapst.amunra.mothership.Mothership; import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; import micdoodle8.mods.galacticraft.api.galaxies.IChildBody; import micdoodle8.mods.galacticraft.api.galaxies.Moon; @@ -9,9 +12,6 @@ import micdoodle8.mods.galacticraft.api.galaxies.Star; import micdoodle8.mods.galacticraft.api.vector.Vector3; import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; -import de.katzenpapst.amunra.AmunRa; -import de.katzenpapst.amunra.astronomy.AngleDistance; -import de.katzenpapst.amunra.mothership.Mothership; public class AstronomyHelper { diff --git a/src/main/java/de/katzenpapst/amunra/helper/GuiHelper.java b/src/main/java/de/katzenpapst/amunra/helper/GuiHelper.java index 5638214b..d752234f 100755 --- a/src/main/java/de/katzenpapst/amunra/helper/GuiHelper.java +++ b/src/main/java/de/katzenpapst/amunra/helper/GuiHelper.java @@ -4,12 +4,12 @@ import java.util.Arrays; import java.util.List; +import net.minecraft.util.StatCollector; + import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; import micdoodle8.mods.galacticraft.core.util.EnumColor; import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; -import net.minecraft.util.StatCollector; - public class GuiHelper { protected static DecimalFormat numberFormat = new DecimalFormat("#.##"); diff --git a/src/main/java/de/katzenpapst/amunra/helper/ShuttleTeleportHelper.java b/src/main/java/de/katzenpapst/amunra/helper/ShuttleTeleportHelper.java index b06acc16..49280668 100755 --- a/src/main/java/de/katzenpapst/amunra/helper/ShuttleTeleportHelper.java +++ b/src/main/java/de/katzenpapst/amunra/helper/ShuttleTeleportHelper.java @@ -4,28 +4,6 @@ import java.util.List; import java.util.Random; -import micdoodle8.mods.galacticraft.api.GalacticraftRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -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.Satellite; -import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.api.world.IExitHeight; -import micdoodle8.mods.galacticraft.api.world.IOrbitDimension; -import micdoodle8.mods.galacticraft.api.world.ITeleportType; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.dimension.SpaceStationWorldData; -import micdoodle8.mods.galacticraft.core.dimension.WorldProviderOrbit; -import micdoodle8.mods.galacticraft.core.entities.EntityCelestialFake; -import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerHandler; -import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; -import micdoodle8.mods.galacticraft.core.items.ItemParaChute; -import micdoodle8.mods.galacticraft.core.network.PacketSimple; -import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; -import micdoodle8.mods.galacticraft.core.util.WorldUtil; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -54,6 +32,27 @@ import de.katzenpapst.amunra.vec.Vector3int; import de.katzenpapst.amunra.world.ShuttleDockHandler; import de.katzenpapst.amunra.world.WorldHelper; +import micdoodle8.mods.galacticraft.api.GalacticraftRegistry; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +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.Satellite; +import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.api.world.IExitHeight; +import micdoodle8.mods.galacticraft.api.world.IOrbitDimension; +import micdoodle8.mods.galacticraft.api.world.ITeleportType; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.dimension.SpaceStationWorldData; +import micdoodle8.mods.galacticraft.core.dimension.WorldProviderOrbit; +import micdoodle8.mods.galacticraft.core.entities.EntityCelestialFake; +import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerHandler; +import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; +import micdoodle8.mods.galacticraft.core.items.ItemParaChute; +import micdoodle8.mods.galacticraft.core.network.PacketSimple; +import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; +import micdoodle8.mods.galacticraft.core.util.WorldUtil; public class ShuttleTeleportHelper { diff --git a/src/main/java/de/katzenpapst/amunra/inventory/ContainerArtificalGravity.java b/src/main/java/de/katzenpapst/amunra/inventory/ContainerArtificalGravity.java index bee224f3..5bf3e1fb 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/ContainerArtificalGravity.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/ContainerArtificalGravity.java @@ -1,13 +1,13 @@ package de.katzenpapst.amunra.inventory; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntity; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; + public class ContainerArtificalGravity extends ContainerWithPlayerInventory { public ContainerArtificalGravity(InventoryPlayer playerInv, IInventory tile) { diff --git a/src/main/java/de/katzenpapst/amunra/inventory/ContainerAtomBattery.java b/src/main/java/de/katzenpapst/amunra/inventory/ContainerAtomBattery.java index 759a2284..ad08360d 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/ContainerAtomBattery.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/ContainerAtomBattery.java @@ -1,12 +1,11 @@ package de.katzenpapst.amunra.inventory; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import de.katzenpapst.amunra.tile.TileEntityIsotopeGenerator; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; public class ContainerAtomBattery extends ContainerWithPlayerInventory { diff --git a/src/main/java/de/katzenpapst/amunra/inventory/ContainerHydroponics.java b/src/main/java/de/katzenpapst/amunra/inventory/ContainerHydroponics.java index ae2ba3ab..d2175bca 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/ContainerHydroponics.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/ContainerHydroponics.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.inventory; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; @@ -10,6 +7,8 @@ import net.minecraft.item.ItemStack; import de.katzenpapst.amunra.tile.TileEntityHydroponics; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; public class ContainerHydroponics extends ContainerWithPlayerInventory { diff --git a/src/main/java/de/katzenpapst/amunra/inventory/ContainerIonEngine.java b/src/main/java/de/katzenpapst/amunra/inventory/ContainerIonEngine.java index 6b89109c..28b5203d 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/ContainerIonEngine.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/ContainerIonEngine.java @@ -1,11 +1,10 @@ package de.katzenpapst.amunra.inventory; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; - import net.minecraft.entity.player.InventoryPlayer; import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; public class ContainerIonEngine extends ContainerRocketEngine { diff --git a/src/main/java/de/katzenpapst/amunra/inventory/ContainerRocketEngine.java b/src/main/java/de/katzenpapst/amunra/inventory/ContainerRocketEngine.java index c5f7600d..d6f6b3db 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/ContainerRocketEngine.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/ContainerRocketEngine.java @@ -1,13 +1,12 @@ package de.katzenpapst.amunra.inventory; -import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemBucket; import net.minecraftforge.fluids.ItemFluidContainer; import de.katzenpapst.amunra.tile.TileEntityMothershipEngineAbstract; +import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; public class ContainerRocketEngine extends ContainerWithPlayerInventory { diff --git a/src/main/java/de/katzenpapst/amunra/inventory/ContainerShuttleDock.java b/src/main/java/de/katzenpapst/amunra/inventory/ContainerShuttleDock.java index 5533012e..76979bd7 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/ContainerShuttleDock.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/ContainerShuttleDock.java @@ -1,13 +1,12 @@ package de.katzenpapst.amunra.inventory; -import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import de.katzenpapst.amunra.item.ItemShuttle; import de.katzenpapst.amunra.tile.TileEntityShuttleDock; +import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; public class ContainerShuttleDock extends ContainerWithPlayerInventory { diff --git a/src/main/java/de/katzenpapst/amunra/inventory/ContainerWithPlayerInventory.java b/src/main/java/de/katzenpapst/amunra/inventory/ContainerWithPlayerInventory.java index 36d32994..c5c15316 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/ContainerWithPlayerInventory.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/ContainerWithPlayerInventory.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.inventory; -import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -9,6 +7,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; + abstract public class ContainerWithPlayerInventory extends Container { protected IInventory tileEntity; diff --git a/src/main/java/de/katzenpapst/amunra/inventory/schematic/ContainerSchematicShuttle.java b/src/main/java/de/katzenpapst/amunra/inventory/schematic/ContainerSchematicShuttle.java index ffdba512..6c124848 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/schematic/ContainerSchematicShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/schematic/ContainerSchematicShuttle.java @@ -3,9 +3,6 @@ import java.util.HashMap; import java.util.HashSet; -import micdoodle8.mods.galacticraft.core.inventory.SlotRocketBenchResult; -import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -20,6 +17,8 @@ import de.katzenpapst.amunra.item.ARItems; import de.katzenpapst.amunra.item.ItemDamagePair; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.core.inventory.SlotRocketBenchResult; +import micdoodle8.mods.galacticraft.core.inventory.SlotSpecific; public class ContainerSchematicShuttle extends Container { diff --git a/src/main/java/de/katzenpapst/amunra/inventory/schematic/SlotSchematicShuttle.java b/src/main/java/de/katzenpapst/amunra/inventory/schematic/SlotSchematicShuttle.java index 87777198..5dbb4a4a 100755 --- a/src/main/java/de/katzenpapst/amunra/inventory/schematic/SlotSchematicShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/inventory/schematic/SlotSchematicShuttle.java @@ -1,9 +1,5 @@ package de.katzenpapst.amunra.inventory.schematic; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.network.PacketSimple; -import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; @@ -12,6 +8,9 @@ import de.katzenpapst.amunra.item.ItemDamagePair; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.network.PacketSimple; +import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; public class SlotSchematicShuttle extends Slot { diff --git a/src/main/java/de/katzenpapst/amunra/item/ARItems.java b/src/main/java/de/katzenpapst/amunra/item/ARItems.java index 15bb4015..7cb968be 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ARItems.java +++ b/src/main/java/de/katzenpapst/amunra/item/ARItems.java @@ -1,9 +1,5 @@ package de.katzenpapst.amunra.item; -import micdoodle8.mods.galacticraft.core.items.GCItems; -import micdoodle8.mods.galacticraft.planets.asteroids.items.AsteroidsItems; -import micdoodle8.mods.galacticraft.planets.mars.items.MarsItems; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -12,6 +8,9 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.block.SubBlockDropItem; +import micdoodle8.mods.galacticraft.core.items.GCItems; +import micdoodle8.mods.galacticraft.planets.asteroids.items.AsteroidsItems; +import micdoodle8.mods.galacticraft.planets.mars.items.MarsItems; public class ARItems { diff --git a/src/main/java/de/katzenpapst/amunra/item/ItemAbstractBatteryUser.java b/src/main/java/de/katzenpapst/amunra/item/ItemAbstractBatteryUser.java index 94dedc60..da70185f 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ItemAbstractBatteryUser.java +++ b/src/main/java/de/katzenpapst/amunra/item/ItemAbstractBatteryUser.java @@ -2,9 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.items.GCItems; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -13,6 +10,9 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.items.GCItems; + public class ItemAbstractBatteryUser extends ItemElectricBase { @Override diff --git a/src/main/java/de/katzenpapst/amunra/item/ItemBaseBattery.java b/src/main/java/de/katzenpapst/amunra/item/ItemBaseBattery.java index 16b0ef1f..f08f103d 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ItemBaseBattery.java +++ b/src/main/java/de/katzenpapst/amunra/item/ItemBaseBattery.java @@ -1,11 +1,10 @@ package de.katzenpapst.amunra.item; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import de.katzenpapst.amunra.AmunRa; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; public class ItemBaseBattery extends ItemElectricBase { diff --git a/src/main/java/de/katzenpapst/amunra/item/ItemBasicMulti.java b/src/main/java/de/katzenpapst/amunra/item/ItemBasicMulti.java index 8782f7eb..e5e056c4 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ItemBasicMulti.java +++ b/src/main/java/de/katzenpapst/amunra/item/ItemBasicMulti.java @@ -4,10 +4,6 @@ import java.util.HashMap; import java.util.List; -import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc; -import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -24,6 +20,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.AmunRa; +import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc; +import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class ItemBasicMulti extends Item implements ItemBlockDesc.IBlockShiftDesc { // public static final String[] names = { "solar_module_0", "solar_module_1", "rawSilicon", "ingotCopper", diff --git a/src/main/java/de/katzenpapst/amunra/item/ItemBlockMulti.java b/src/main/java/de/katzenpapst/amunra/item/ItemBlockMulti.java index 3fd80e09..6db30ea9 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ItemBlockMulti.java +++ b/src/main/java/de/katzenpapst/amunra/item/ItemBlockMulti.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.item; -import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc; -import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; - import net.minecraft.block.Block; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -11,6 +8,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.block.IMetaBlock; +import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc; +import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; /** * Item for multiblocks diff --git a/src/main/java/de/katzenpapst/amunra/item/ItemJet.java b/src/main/java/de/katzenpapst/amunra/item/ItemJet.java index 99cc426d..a12072f5 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ItemJet.java +++ b/src/main/java/de/katzenpapst/amunra/item/ItemJet.java @@ -2,9 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; @@ -24,6 +21,8 @@ import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.block.BlockMachineMeta; import de.katzenpapst.amunra.block.machine.mothershipEngine.MothershipEngineJetBase; +import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class ItemJet extends ItemBlockMulti { diff --git a/src/main/java/de/katzenpapst/amunra/item/ItemShuttle.java b/src/main/java/de/katzenpapst/amunra/item/ItemShuttle.java index 4ee8cfa6..47b95a61 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ItemShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/item/ItemShuttle.java @@ -2,15 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.entity.IRocketType.EnumRocketType; -import micdoodle8.mods.galacticraft.api.item.IHoldableItem; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; -import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; -import micdoodle8.mods.galacticraft.core.tile.TileEntityLandingPad; -import micdoodle8.mods.galacticraft.core.util.EnumColor; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -25,6 +16,14 @@ import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.entity.spaceship.EntityShuttle; +import micdoodle8.mods.galacticraft.api.entity.IRocketType.EnumRocketType; +import micdoodle8.mods.galacticraft.api.item.IHoldableItem; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; +import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; +import micdoodle8.mods.galacticraft.core.tile.TileEntityLandingPad; +import micdoodle8.mods.galacticraft.core.util.EnumColor; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class ItemShuttle extends Item implements IHoldableItem { diff --git a/src/main/java/de/katzenpapst/amunra/item/ItemThermalSuit.java b/src/main/java/de/katzenpapst/amunra/item/ItemThermalSuit.java index eeeec010..be81311a 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ItemThermalSuit.java +++ b/src/main/java/de/katzenpapst/amunra/item/ItemThermalSuit.java @@ -2,10 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.item.IItemThermal; -import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -18,6 +14,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.AmunRa; +import micdoodle8.mods.galacticraft.api.item.IItemThermal; +import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class ItemThermalSuit extends Item implements IItemThermal { diff --git a/src/main/java/de/katzenpapst/amunra/item/ItemTricorder.java b/src/main/java/de/katzenpapst/amunra/item/ItemTricorder.java index e53b63b7..6a7e3210 100755 --- a/src/main/java/de/katzenpapst/amunra/item/ItemTricorder.java +++ b/src/main/java/de/katzenpapst/amunra/item/ItemTricorder.java @@ -4,19 +4,18 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace; -import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; -import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; -import micdoodle8.mods.galacticraft.api.world.ISolarLevel; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import de.katzenpapst.amunra.helper.GuiHelper; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace; +import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; +import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; +import micdoodle8.mods.galacticraft.api.world.ISolarLevel; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; public class ItemTricorder extends SubItem { diff --git a/src/main/java/de/katzenpapst/amunra/item/SubItem.java b/src/main/java/de/katzenpapst/amunra/item/SubItem.java index d1e4764e..04cadee1 100755 --- a/src/main/java/de/katzenpapst/amunra/item/SubItem.java +++ b/src/main/java/de/katzenpapst/amunra/item/SubItem.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.item; -import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -10,6 +8,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.AmunRa; +import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; public class SubItem extends Item { diff --git a/src/main/java/de/katzenpapst/amunra/mob/DamageSourceAR.java b/src/main/java/de/katzenpapst/amunra/mob/DamageSourceAR.java index aa48d9ad..0a2c5ea2 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/DamageSourceAR.java +++ b/src/main/java/de/katzenpapst/amunra/mob/DamageSourceAR.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.mob; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ChatComponentTranslation; @@ -10,6 +8,7 @@ import net.minecraft.util.IChatComponent; import de.katzenpapst.amunra.entity.EntityBaseLaserArrow; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; public class DamageSourceAR { diff --git a/src/main/java/de/katzenpapst/amunra/mob/MobHelper.java b/src/main/java/de/katzenpapst/amunra/mob/MobHelper.java index 955b807c..2ee3ccad 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/MobHelper.java +++ b/src/main/java/de/katzenpapst/amunra/mob/MobHelper.java @@ -1,11 +1,11 @@ package de.katzenpapst.amunra.mob; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.entity.EntityCreature; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; + public class MobHelper { public static boolean canAnimalSpawnHere(World world, EntityCreature ent, BlockMetaPair blockToSpawnOn) { diff --git a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityARVillager.java b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityARVillager.java index b22ca08c..96ef474f 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityARVillager.java +++ b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityARVillager.java @@ -2,9 +2,6 @@ import java.util.ArrayList; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; -import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.EntityLiving; @@ -33,6 +30,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; +import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; public class EntityARVillager extends EntityAgeable implements IEntityBreathable, IEntityNonOxygenBreather { diff --git a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityAlienBug.java b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityAlienBug.java index 2800ca1d..674b7749 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityAlienBug.java +++ b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityAlienBug.java @@ -2,9 +2,6 @@ import java.util.ArrayList; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; -import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureAttribute; @@ -17,6 +14,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; +import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; + public class EntityAlienBug extends EntityMob implements IEntityNonOxygenBreather, IEntityBreathable { public EntityAlienBug(World world) { diff --git a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityFlyingMob.java b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityFlyingMob.java index 8d8c583d..da4be009 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityFlyingMob.java +++ b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityFlyingMob.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.mob.entity; -import micdoodle8.mods.galacticraft.api.entity.IAntiGrav; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityFlying; import net.minecraft.entity.monster.IMob; @@ -15,6 +12,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import micdoodle8.mods.galacticraft.api.entity.IAntiGrav; +import micdoodle8.mods.galacticraft.api.vector.Vector3; public abstract class EntityFlyingMob extends EntityFlying implements IMob, IAntiGrav { diff --git a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityMummyBoss.java b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityMummyBoss.java index 0cae9d8e..7dda642b 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityMummyBoss.java +++ b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityMummyBoss.java @@ -4,14 +4,6 @@ import java.util.List; import java.util.Random; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.entities.EntityAIArrowAttack; -import micdoodle8.mods.galacticraft.core.network.PacketSimple; -import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; -import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -48,6 +40,13 @@ import de.katzenpapst.amunra.mob.DamageSourceAR; import de.katzenpapst.amunra.tile.ITileDungeonSpawner; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.entities.EntityAIArrowAttack; +import micdoodle8.mods.galacticraft.core.network.PacketSimple; +import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket; +import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class EntityMummyBoss extends EntityMob implements IBossDisplayData, IRangedAttackMob, IEntityBreathable, IAmunRaBoss { diff --git a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityPorcodon.java b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityPorcodon.java index bd74d55c..d277f58f 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityPorcodon.java +++ b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityPorcodon.java @@ -2,9 +2,6 @@ import java.util.ArrayList; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; -import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; - import net.minecraft.block.Block; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.SharedMonsterAttributes; @@ -24,6 +21,8 @@ import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.item.ARItems; import de.katzenpapst.amunra.mob.MobHelper; +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; +import micdoodle8.mods.galacticraft.api.world.IAtmosphericGas; public class EntityPorcodon extends EntityAnimal implements IEntityBreathable, IEntityNonOxygenBreather { diff --git a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityRobotVillager.java b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityRobotVillager.java index 670742db..d71c379b 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/entity/EntityRobotVillager.java +++ b/src/main/java/de/katzenpapst/amunra/mob/entity/EntityRobotVillager.java @@ -4,8 +4,6 @@ import java.util.HashMap; import java.util.Iterator; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.EntityLiving; @@ -42,6 +40,7 @@ import cpw.mods.fml.relauncher.SideOnly; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.mob.RobotVillagerProfession; +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; public class EntityRobotVillager extends EntityAgeable implements IEntityBreathable, INpc, IMerchant { diff --git a/src/main/java/de/katzenpapst/amunra/mob/entity/EntitySentry.java b/src/main/java/de/katzenpapst/amunra/mob/entity/EntitySentry.java index fbf69e16..ca151b80 100755 --- a/src/main/java/de/katzenpapst/amunra/mob/entity/EntitySentry.java +++ b/src/main/java/de/katzenpapst/amunra/mob/entity/EntitySentry.java @@ -1,9 +1,5 @@ package de.katzenpapst.amunra.mob.entity; -import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.items.GCItems; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -14,6 +10,9 @@ import de.katzenpapst.amunra.entity.EntityLaserArrow; import de.katzenpapst.amunra.item.ARItems; import de.katzenpapst.amunra.item.ItemDamagePair; +import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.items.GCItems; public class EntitySentry extends EntityFlyingMob implements IEntityBreathable { diff --git a/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java b/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java index c43bbbf2..49ec0f6b 100755 --- a/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java +++ b/src/main/java/de/katzenpapst/amunra/mothership/Mothership.java @@ -6,15 +6,6 @@ import java.util.UUID; import java.util.regex.Pattern; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -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.Satellite; -import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; -import micdoodle8.mods.galacticraft.api.galaxies.Star; -import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -32,6 +23,14 @@ import de.katzenpapst.amunra.helper.AstronomyHelper; import de.katzenpapst.amunra.helper.PlayerID; import de.katzenpapst.amunra.tick.TickHandlerServer; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +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.Satellite; +import micdoodle8.mods.galacticraft.api.galaxies.SolarSystem; +import micdoodle8.mods.galacticraft.api.galaxies.Star; +import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore; public class Mothership extends CelestialBody { diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipChunkProvider.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipChunkProvider.java index de479d0e..878e73b4 100755 --- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipChunkProvider.java +++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipChunkProvider.java @@ -3,8 +3,6 @@ import java.util.Arrays; import java.util.Random; -import micdoodle8.mods.galacticraft.core.world.gen.BiomeGenBaseOrbit; - import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.init.Blocks; @@ -14,6 +12,8 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderGenerate; +import micdoodle8.mods.galacticraft.core.world.gen.BiomeGenBaseOrbit; + public class MothershipChunkProvider extends ChunkProviderGenerate { // for now, just like this protected final Random rand; diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldChunkManager.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldChunkManager.java index 8a730377..d03c3e68 100755 --- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldChunkManager.java +++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldChunkManager.java @@ -1,10 +1,10 @@ package de.katzenpapst.amunra.mothership; +import net.minecraft.world.biome.BiomeGenBase; + import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldChunkManagerSpace; import micdoodle8.mods.galacticraft.core.world.gen.BiomeGenBaseOrbit; -import net.minecraft.world.biome.BiomeGenBase; - public class MothershipWorldChunkManager extends WorldChunkManagerSpace { @Override diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java index 91c63ebd..3987277d 100755 --- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java +++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldData.java @@ -7,13 +7,6 @@ import java.util.Map; import java.util.Random; -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.Satellite; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -26,6 +19,12 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.helper.PlayerID; import de.katzenpapst.amunra.network.packet.PacketSimpleAR; +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.Satellite; public class MothershipWorldData extends WorldSavedData { diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldGen.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldGen.java index 98c3aa90..da1f25f5 100755 --- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldGen.java +++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldGen.java @@ -2,14 +2,13 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; - import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import de.katzenpapst.amunra.block.ARBlocks; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; public class MothershipWorldGen extends WorldGenerator { diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java index a4c83f87..d76e247c 100755 --- a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java @@ -2,17 +2,6 @@ import java.util.HashSet; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.Moon; -import micdoodle8.mods.galacticraft.api.galaxies.Star; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.api.world.IExitHeight; -import micdoodle8.mods.galacticraft.api.world.ISolarLevel; -import micdoodle8.mods.galacticraft.api.world.IZeroGDimension; -import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; -import micdoodle8.mods.galacticraft.core.util.WorldUtil; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -47,6 +36,16 @@ import de.katzenpapst.amunra.tile.ITileMothershipEngine; import de.katzenpapst.amunra.vec.Vector2int; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.Moon; +import micdoodle8.mods.galacticraft.api.galaxies.Star; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.api.world.IExitHeight; +import micdoodle8.mods.galacticraft.api.world.ISolarLevel; +import micdoodle8.mods.galacticraft.api.world.IZeroGDimension; +import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; +import micdoodle8.mods.galacticraft.core.util.WorldUtil; public class MothershipWorldProvider extends WorldProviderSpace implements IZeroGDimension, ISolarLevel, IExitHeight { diff --git a/src/main/java/de/katzenpapst/amunra/mothership/SkyProviderMothership.java b/src/main/java/de/katzenpapst/amunra/mothership/SkyProviderMothership.java index a4239142..21822855 100755 --- a/src/main/java/de/katzenpapst/amunra/mothership/SkyProviderMothership.java +++ b/src/main/java/de/katzenpapst/amunra/mothership/SkyProviderMothership.java @@ -2,12 +2,6 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.Moon; -import micdoodle8.mods.galacticraft.api.galaxies.Planet; -import micdoodle8.mods.galacticraft.api.galaxies.Star; -import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; - import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.Tessellator; @@ -17,6 +11,11 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.world.SkyProviderDynamic; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.Moon; +import micdoodle8.mods.galacticraft.api.galaxies.Planet; +import micdoodle8.mods.galacticraft.api.galaxies.Star; +import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; public class SkyProviderMothership extends SkyProviderDynamic { diff --git a/src/main/java/de/katzenpapst/amunra/mothership/fueldisplay/MothershipFuelDisplayEnergy.java b/src/main/java/de/katzenpapst/amunra/mothership/fueldisplay/MothershipFuelDisplayEnergy.java index 86f5261e..2122a024 100755 --- a/src/main/java/de/katzenpapst/amunra/mothership/fueldisplay/MothershipFuelDisplayEnergy.java +++ b/src/main/java/de/katzenpapst/amunra/mothership/fueldisplay/MothershipFuelDisplayEnergy.java @@ -1,12 +1,12 @@ package de.katzenpapst.amunra.mothership.fueldisplay; -import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; -import micdoodle8.mods.galacticraft.core.items.GCItems; - import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import micdoodle8.mods.galacticraft.core.energy.EnergyDisplayHelper; +import micdoodle8.mods.galacticraft.core.items.GCItems; + public class MothershipFuelDisplayEnergy extends MothershipFuelDisplay { protected ItemStack stack; diff --git a/src/main/java/de/katzenpapst/amunra/nei/NEIAmunRaConfig.java b/src/main/java/de/katzenpapst/amunra/nei/NEIAmunRaConfig.java index 81912fe2..9bac0cb6 100755 --- a/src/main/java/de/katzenpapst/amunra/nei/NEIAmunRaConfig.java +++ b/src/main/java/de/katzenpapst/amunra/nei/NEIAmunRaConfig.java @@ -7,8 +7,6 @@ import java.util.Set; import java.util.Vector; -import micdoodle8.mods.galacticraft.api.recipe.INasaWorkbenchRecipe; - import net.minecraft.item.ItemStack; import codechicken.nei.PositionedStack; @@ -21,6 +19,7 @@ import de.katzenpapst.amunra.item.ARItems; import de.katzenpapst.amunra.nei.recipehandler.ARCircuitFab; import de.katzenpapst.amunra.nei.recipehandler.ARNasaWorkbenchShuttle; +import micdoodle8.mods.galacticraft.api.recipe.INasaWorkbenchRecipe; public class NEIAmunRaConfig implements IConfigureNEI { diff --git a/src/main/java/de/katzenpapst/amunra/nei/recipehandler/ARCircuitFab.java b/src/main/java/de/katzenpapst/amunra/nei/recipehandler/ARCircuitFab.java index 1d1d127e..6b617774 100755 --- a/src/main/java/de/katzenpapst/amunra/nei/recipehandler/ARCircuitFab.java +++ b/src/main/java/de/katzenpapst/amunra/nei/recipehandler/ARCircuitFab.java @@ -6,9 +6,9 @@ import java.util.Map.Entry; import java.util.Set; -import micdoodle8.mods.galacticraft.core.nei.CircuitFabricatorRecipeHandler; import codechicken.nei.PositionedStack; import de.katzenpapst.amunra.nei.NEIAmunRaConfig; +import micdoodle8.mods.galacticraft.core.nei.CircuitFabricatorRecipeHandler; public class ARCircuitFab extends CircuitFabricatorRecipeHandler { diff --git a/src/main/java/de/katzenpapst/amunra/nei/recipehandler/ARNasaWorkbenchShuttle.java b/src/main/java/de/katzenpapst/amunra/nei/recipehandler/ARNasaWorkbenchShuttle.java index b7b00854..d53f4caa 100755 --- a/src/main/java/de/katzenpapst/amunra/nei/recipehandler/ARNasaWorkbenchShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/nei/recipehandler/ARNasaWorkbenchShuttle.java @@ -5,8 +5,6 @@ import java.util.Map.Entry; import java.util.Set; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; @@ -17,6 +15,7 @@ import codechicken.nei.recipe.TemplateRecipeHandler; import de.katzenpapst.amunra.client.gui.schematic.GuiSchematicShuttle; import de.katzenpapst.amunra.nei.NEIAmunRaConfig; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class ARNasaWorkbenchShuttle extends TemplateRecipeHandler { diff --git a/src/main/java/de/katzenpapst/amunra/network/ARChannelHandler.java b/src/main/java/de/katzenpapst/amunra/network/ARChannelHandler.java index 2d412b31..5934ca4c 100755 --- a/src/main/java/de/katzenpapst/amunra/network/ARChannelHandler.java +++ b/src/main/java/de/katzenpapst/amunra/network/ARChannelHandler.java @@ -2,8 +2,6 @@ import java.util.EnumMap; -import micdoodle8.mods.galacticraft.core.network.IPacket; - import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.network.FMLEmbeddedChannel; @@ -17,6 +15,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; +import micdoodle8.mods.galacticraft.core.network.IPacket; public class ARChannelHandler extends FMLIndexedMessageToMessageCodec { diff --git a/src/main/java/de/katzenpapst/amunra/network/ARPacketHandler.java b/src/main/java/de/katzenpapst/amunra/network/ARPacketHandler.java index e77ac32e..a711309c 100755 --- a/src/main/java/de/katzenpapst/amunra/network/ARPacketHandler.java +++ b/src/main/java/de/katzenpapst/amunra/network/ARPacketHandler.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.network; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.network.IPacket; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetHandler; @@ -11,6 +8,8 @@ import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.network.IPacket; @Sharable public class ARPacketHandler extends SimpleChannelInboundHandler { diff --git a/src/main/java/de/katzenpapst/amunra/network/packet/ConnectionPacketAR.java b/src/main/java/de/katzenpapst/amunra/network/packet/ConnectionPacketAR.java index edee530f..11e7f34e 100755 --- a/src/main/java/de/katzenpapst/amunra/network/packet/ConnectionPacketAR.java +++ b/src/main/java/de/katzenpapst/amunra/network/packet/ConnectionPacketAR.java @@ -2,8 +2,6 @@ import java.io.IOException; -import micdoodle8.mods.galacticraft.core.network.NetworkUtil; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -21,6 +19,7 @@ import de.katzenpapst.amunra.tick.TickHandlerServer; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; +import micdoodle8.mods.galacticraft.core.network.NetworkUtil; public class ConnectionPacketAR { diff --git a/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java b/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java index 314e5b2d..10e37b4e 100755 --- a/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java +++ b/src/main/java/de/katzenpapst/amunra/network/packet/PacketSimpleAR.java @@ -6,20 +6,6 @@ import java.util.List; import java.util.Map; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; -import micdoodle8.mods.galacticraft.api.galaxies.Satellite; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; -import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection.MapMode; -import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; -import micdoodle8.mods.galacticraft.core.network.IPacket; -import micdoodle8.mods.galacticraft.core.network.NetworkUtil; -import micdoodle8.mods.galacticraft.core.network.PacketSimple; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; -import micdoodle8.mods.galacticraft.core.util.PlayerUtil; - import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -58,6 +44,19 @@ import de.katzenpapst.amunra.tile.TileEntityShuttleDock; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry; +import micdoodle8.mods.galacticraft.api.galaxies.Satellite; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection; +import micdoodle8.mods.galacticraft.core.client.gui.screen.GuiCelestialSelection.MapMode; +import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; +import micdoodle8.mods.galacticraft.core.network.IPacket; +import micdoodle8.mods.galacticraft.core.network.NetworkUtil; +import micdoodle8.mods.galacticraft.core.network.PacketSimple; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; +import micdoodle8.mods.galacticraft.core.util.PlayerUtil; public class PacketSimpleAR extends Packet implements IPacket { diff --git a/src/main/java/de/katzenpapst/amunra/proxy/ARSidedProxy.java b/src/main/java/de/katzenpapst/amunra/proxy/ARSidedProxy.java index 68b02bc3..587815e9 100755 --- a/src/main/java/de/katzenpapst/amunra/proxy/ARSidedProxy.java +++ b/src/main/java/de/katzenpapst/amunra/proxy/ARSidedProxy.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.proxy; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -10,6 +8,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import micdoodle8.mods.galacticraft.api.vector.Vector3; public class ARSidedProxy { diff --git a/src/main/java/de/katzenpapst/amunra/proxy/ClientProxy.java b/src/main/java/de/katzenpapst/amunra/proxy/ClientProxy.java index a7c6e770..6f04481f 100755 --- a/src/main/java/de/katzenpapst/amunra/proxy/ClientProxy.java +++ b/src/main/java/de/katzenpapst/amunra/proxy/ClientProxy.java @@ -1,9 +1,5 @@ package de.katzenpapst.amunra.proxy; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.api.world.IZeroGDimension; -import micdoodle8.mods.galacticraft.core.client.render.entities.RenderEntityFake; - import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.particle.EntityFX; @@ -81,6 +77,9 @@ import de.katzenpapst.amunra.tile.TileEntityMothershipEngineIon; import de.katzenpapst.amunra.tile.TileEntityMothershipEngineJet; import de.katzenpapst.amunra.tile.TileEntityShuttleDock; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.api.world.IZeroGDimension; +import micdoodle8.mods.galacticraft.core.client.render.entities.RenderEntityFake; public class ClientProxy extends ARSidedProxy { diff --git a/src/main/java/de/katzenpapst/amunra/schematic/SchematicPageShuttle.java b/src/main/java/de/katzenpapst/amunra/schematic/SchematicPageShuttle.java index 79413493..838d93d5 100755 --- a/src/main/java/de/katzenpapst/amunra/schematic/SchematicPageShuttle.java +++ b/src/main/java/de/katzenpapst/amunra/schematic/SchematicPageShuttle.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.schematic; -import micdoodle8.mods.galacticraft.api.recipe.ISchematicPage; - import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -13,6 +11,7 @@ import de.katzenpapst.amunra.client.gui.schematic.GuiSchematicShuttle; import de.katzenpapst.amunra.inventory.schematic.ContainerSchematicShuttle; import de.katzenpapst.amunra.item.ARItems; +import micdoodle8.mods.galacticraft.api.recipe.ISchematicPage; public class SchematicPageShuttle implements ISchematicPage { diff --git a/src/main/java/de/katzenpapst/amunra/tick/ConnectionEvents.java b/src/main/java/de/katzenpapst/amunra/tick/ConnectionEvents.java index 5c1400a0..95808d69 100755 --- a/src/main/java/de/katzenpapst/amunra/tick/ConnectionEvents.java +++ b/src/main/java/de/katzenpapst/amunra/tick/ConnectionEvents.java @@ -1,11 +1,11 @@ package de.katzenpapst.amunra.tick; -import micdoodle8.mods.galacticraft.core.util.MapUtil; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientDisconnectionFromServerEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ServerConnectionFromClientEvent; import de.katzenpapst.amunra.network.packet.ConnectionPacketAR; +import micdoodle8.mods.galacticraft.core.util.MapUtil; public class ConnectionEvents { diff --git a/src/main/java/de/katzenpapst/amunra/tick/TickHandlerClient.java b/src/main/java/de/katzenpapst/amunra/tick/TickHandlerClient.java index 824db125..9d731567 100755 --- a/src/main/java/de/katzenpapst/amunra/tick/TickHandlerClient.java +++ b/src/main/java/de/katzenpapst/amunra/tick/TickHandlerClient.java @@ -1,10 +1,5 @@ package de.katzenpapst.amunra.tick; -import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; -import micdoodle8.mods.galacticraft.core.client.CloudRenderer; -import micdoodle8.mods.galacticraft.core.client.SkyProviderOrbit; -import micdoodle8.mods.galacticraft.planets.asteroids.client.SkyProviderAsteroids; - import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; @@ -20,6 +15,10 @@ import de.katzenpapst.amunra.world.AmunraWorldProvider; import de.katzenpapst.amunra.world.SkyProviderDynamic; import de.katzenpapst.amunra.world.asteroidWorld.AmunRaAsteroidWorldProvider; +import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; +import micdoodle8.mods.galacticraft.core.client.CloudRenderer; +import micdoodle8.mods.galacticraft.core.client.SkyProviderOrbit; +import micdoodle8.mods.galacticraft.planets.asteroids.client.SkyProviderAsteroids; public class TickHandlerClient { diff --git a/src/main/java/de/katzenpapst/amunra/tick/TickHandlerServer.java b/src/main/java/de/katzenpapst/amunra/tick/TickHandlerServer.java index bf09338f..084a0711 100755 --- a/src/main/java/de/katzenpapst/amunra/tick/TickHandlerServer.java +++ b/src/main/java/de/katzenpapst/amunra/tick/TickHandlerServer.java @@ -1,10 +1,5 @@ package de.katzenpapst.amunra.tick; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket; -import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase.EnumLaunchPhase; -import micdoodle8.mods.galacticraft.core.util.WorldUtil; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; @@ -27,6 +22,10 @@ import de.katzenpapst.amunra.mothership.MothershipWorldData; import de.katzenpapst.amunra.mothership.MothershipWorldProvider; import de.katzenpapst.amunra.world.ShuttleDockHandler; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket; +import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase.EnumLaunchPhase; +import micdoodle8.mods.galacticraft.core.util.WorldUtil; public class TickHandlerServer { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityARChest.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityARChest.java index cd36ebfb..f1404ba1 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityARChest.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityARChest.java @@ -3,8 +3,6 @@ import java.util.Iterator; import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +17,7 @@ import net.minecraft.world.World; import de.katzenpapst.amunra.block.BlockARChest; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class TileEntityARChest extends TileEntity implements IInventory { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityBlockScale.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityBlockScale.java index 9208bbd2..746b0b1f 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityBlockScale.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityBlockScale.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.tile; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -11,6 +9,7 @@ import de.katzenpapst.amunra.block.IMetaBlock; import de.katzenpapst.amunra.helper.BlockMassHelper; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class TileEntityBlockScale extends TileEntity { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityBossDungeonSpawner.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityBossDungeonSpawner.java index 44c1ac2a..2af8346a 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityBossDungeonSpawner.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityBossDungeonSpawner.java @@ -4,13 +4,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSpider; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie; -import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -24,6 +17,12 @@ import de.katzenpapst.amunra.mob.entity.EntityMummyBoss; import de.katzenpapst.amunra.mob.entity.IAmunRaBoss; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSpider; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie; +import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; public class TileEntityBossDungeonSpawner extends TileEntityAdvanced implements ITileDungeonSpawner { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityGravitation.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityGravitation.java index 82058480..ec2cd6ff 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityGravitation.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityGravitation.java @@ -2,13 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.entity.IAntiGrav; -import micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseElectricBlock; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -23,6 +16,12 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.helper.NbtHelper; +import micdoodle8.mods.galacticraft.api.entity.IAntiGrav; +import micdoodle8.mods.galacticraft.api.power.IEnergyHandlerGC; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseElectricBlock; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class TileEntityGravitation extends TileBaseElectricBlock implements IInventory, IEnergyHandlerGC { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityHydroponics.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityHydroponics.java index bc750d55..777e1c2f 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityHydroponics.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityHydroponics.java @@ -2,14 +2,6 @@ import java.util.EnumSet; -import micdoodle8.mods.galacticraft.api.tile.IDisableableMachine; -import micdoodle8.mods.galacticraft.api.transmission.tile.IConnector; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.network.IPacketReceiver; -import micdoodle8.mods.galacticraft.core.tile.TileEntityOxygen; -import micdoodle8.mods.galacticraft.core.util.Annotations.NetworkedField; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; @@ -24,6 +16,13 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.item.ItemDamagePair; import de.katzenpapst.amunra.world.WorldHelper; +import micdoodle8.mods.galacticraft.api.tile.IDisableableMachine; +import micdoodle8.mods.galacticraft.api.transmission.tile.IConnector; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.network.IPacketReceiver; +import micdoodle8.mods.galacticraft.core.tile.TileEntityOxygen; +import micdoodle8.mods.galacticraft.core.util.Annotations.NetworkedField; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class TileEntityHydroponics extends TileEntityOxygen implements IPacketReceiver, IDisableableMachine, IInventory, ISidedInventory, IConnector { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityIsotopeGenerator.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityIsotopeGenerator.java index d7c837c9..fa9a1a97 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityIsotopeGenerator.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityIsotopeGenerator.java @@ -2,16 +2,6 @@ import java.util.EnumSet; -import micdoodle8.mods.galacticraft.api.tile.IDisableableMachine; -import micdoodle8.mods.galacticraft.api.transmission.NetworkType; -import micdoodle8.mods.galacticraft.api.transmission.tile.IConnector; -import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectricalSource; -import micdoodle8.mods.galacticraft.core.network.IPacketReceiver; -import micdoodle8.mods.galacticraft.core.util.Annotations.NetworkedField; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -25,6 +15,15 @@ import de.katzenpapst.amunra.block.SubBlockMachine; import de.katzenpapst.amunra.block.machine.BlockIsotopeGenerator; import de.katzenpapst.amunra.helper.CoordHelper; +import micdoodle8.mods.galacticraft.api.tile.IDisableableMachine; +import micdoodle8.mods.galacticraft.api.transmission.NetworkType; +import micdoodle8.mods.galacticraft.api.transmission.tile.IConnector; +import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectricalSource; +import micdoodle8.mods.galacticraft.core.network.IPacketReceiver; +import micdoodle8.mods.galacticraft.core.util.Annotations.NetworkedField; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class TileEntityIsotopeGenerator extends TileBaseUniversalElectricalSource implements IPacketReceiver, IDisableableMachine, IInventory, ISidedInventory, IConnector { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipController.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipController.java index 07904cf8..65b3ad70 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipController.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipController.java @@ -1,10 +1,10 @@ package de.katzenpapst.amunra.tile; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; import de.katzenpapst.amunra.block.BlockMachineMeta; import de.katzenpapst.amunra.block.SubBlockMachine; import de.katzenpapst.amunra.mothership.Mothership; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; public class TileEntityMothershipController extends TileEntityAdvanced { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineAbstract.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineAbstract.java index 4b821825..6cb203ac 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineAbstract.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineAbstract.java @@ -2,11 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseElectricBlockWithInventory; -import micdoodle8.mods.galacticraft.core.util.Annotations.NetworkedField; - import net.minecraft.block.Block; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.entity.Entity; @@ -36,6 +31,10 @@ import de.katzenpapst.amunra.mob.DamageSourceAR; import de.katzenpapst.amunra.mothership.fueldisplay.MothershipFuelRequirements; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseElectricBlockWithInventory; +import micdoodle8.mods.galacticraft.core.util.Annotations.NetworkedField; public abstract class TileEntityMothershipEngineAbstract extends TileBaseElectricBlockWithInventory implements ITileMothershipEngine, IFluidHandler, ISidedInventory, IInventory, ISoundableTile { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineBooster.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineBooster.java index aa099efa..b6f1213d 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineBooster.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineBooster.java @@ -2,11 +2,6 @@ import java.util.EnumSet; -import micdoodle8.mods.galacticraft.api.transmission.NetworkType; -import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; -import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -27,6 +22,10 @@ import cpw.mods.fml.common.Optional.Interface; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.api.transmission.NetworkType; +import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; +import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule; /** * This is supposed to be an universal booster TileEntity, used by all booster blocks diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java index 215a70b4..754e563a 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineIon.java @@ -2,13 +2,6 @@ import java.util.EnumSet; -import micdoodle8.mods.galacticraft.api.transmission.NetworkType; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; -import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; @@ -26,6 +19,12 @@ import de.katzenpapst.amunra.mothership.fueldisplay.MothershipFuelDisplayFluid; import de.katzenpapst.amunra.mothership.fueldisplay.MothershipFuelRequirements; import de.katzenpapst.amunra.proxy.ARSidedProxy.ParticleType; +import micdoodle8.mods.galacticraft.api.transmission.NetworkType; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.energy.item.ItemElectricBase; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; +import micdoodle8.mods.galacticraft.planets.asteroids.AsteroidsModule; public class TileEntityMothershipEngineIon extends TileEntityMothershipEngineAbstract { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineJet.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineJet.java index d4224aba..12ff23ce 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineJet.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipEngineJet.java @@ -1,10 +1,5 @@ package de.katzenpapst.amunra.tile; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.util.FluidUtil; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; @@ -20,6 +15,10 @@ import de.katzenpapst.amunra.mothership.fueldisplay.MothershipFuelDisplayFluid; import de.katzenpapst.amunra.mothership.fueldisplay.MothershipFuelRequirements; import de.katzenpapst.amunra.proxy.ARSidedProxy.ParticleType; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.util.FluidUtil; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; /** * This is supposed to be used for any jet blocks diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipSettings.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipSettings.java index 22e7923f..d360eb53 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipSettings.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityMothershipSettings.java @@ -1,13 +1,12 @@ package de.katzenpapst.amunra.tile; -import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import de.katzenpapst.amunra.mothership.Mothership; import de.katzenpapst.amunra.mothership.MothershipWorldProvider; +import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; public class TileEntityMothershipSettings extends TileEntityAdvanced implements IInventory { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDock.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDock.java index e3d43404..246babdb 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDock.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDock.java @@ -3,21 +3,6 @@ import java.util.HashSet; import java.util.List; -import micdoodle8.mods.galacticraft.api.entity.ICargoEntity; -import micdoodle8.mods.galacticraft.api.entity.IDockable; -import micdoodle8.mods.galacticraft.api.entity.IFuelable; -import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase.EnumLaunchPhase; -import micdoodle8.mods.galacticraft.api.tile.IFuelDock; -import micdoodle8.mods.galacticraft.api.tile.ILandingPadAttachable; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.core.GalacticraftCore; -import micdoodle8.mods.galacticraft.core.network.IPacketReceiver; -import micdoodle8.mods.galacticraft.core.network.PacketSimple; -import micdoodle8.mods.galacticraft.core.tile.IMultiBlock; -import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; -import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -44,6 +29,20 @@ import de.katzenpapst.amunra.item.ItemShuttle; import de.katzenpapst.amunra.network.packet.PacketSimpleAR; import de.katzenpapst.amunra.world.ShuttleDockHandler; +import micdoodle8.mods.galacticraft.api.entity.ICargoEntity; +import micdoodle8.mods.galacticraft.api.entity.IDockable; +import micdoodle8.mods.galacticraft.api.entity.IFuelable; +import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase.EnumLaunchPhase; +import micdoodle8.mods.galacticraft.api.tile.IFuelDock; +import micdoodle8.mods.galacticraft.api.tile.ILandingPadAttachable; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.core.GalacticraftCore; +import micdoodle8.mods.galacticraft.core.network.IPacketReceiver; +import micdoodle8.mods.galacticraft.core.network.PacketSimple; +import micdoodle8.mods.galacticraft.core.tile.IMultiBlock; +import micdoodle8.mods.galacticraft.core.tile.TileEntityAdvanced; +import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; public class TileEntityShuttleDock extends TileEntityAdvanced implements IFuelable, IFuelDock, ICargoEntity, IMultiBlock, IInventory, IPacketReceiver { diff --git a/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDockFake.java b/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDockFake.java index 26d37713..a2dd2322 100755 --- a/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDockFake.java +++ b/src/main/java/de/katzenpapst/amunra/tile/TileEntityShuttleDockFake.java @@ -2,6 +2,11 @@ import java.util.HashSet; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.fluids.FluidStack; + import micdoodle8.mods.galacticraft.api.entity.ICargoEntity; import micdoodle8.mods.galacticraft.api.entity.IDockable; import micdoodle8.mods.galacticraft.api.entity.IFuelable; @@ -9,11 +14,6 @@ import micdoodle8.mods.galacticraft.api.tile.ILandingPadAttachable; import micdoodle8.mods.galacticraft.core.tile.TileEntityMulti; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fluids.FluidStack; - public class TileEntityShuttleDockFake extends TileEntityMulti implements IFuelable, IFuelDock, ICargoEntity { public TileEntityShuttleDockFake() {} diff --git a/src/main/java/de/katzenpapst/amunra/vec/BlockVector.java b/src/main/java/de/katzenpapst/amunra/vec/BlockVector.java index b1b4000b..133fe055 100755 --- a/src/main/java/de/katzenpapst/amunra/vec/BlockVector.java +++ b/src/main/java/de/katzenpapst/amunra/vec/BlockVector.java @@ -1,9 +1,9 @@ package de.katzenpapst.amunra.vec; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; + /** * This is supposed to hold everything necessary to find a block * diff --git a/src/main/java/de/katzenpapst/amunra/vec/Vector3int.java b/src/main/java/de/katzenpapst/amunra/vec/Vector3int.java index 0acc1362..c275705f 100755 --- a/src/main/java/de/katzenpapst/amunra/vec/Vector3int.java +++ b/src/main/java/de/katzenpapst/amunra/vec/Vector3int.java @@ -1,11 +1,11 @@ package de.katzenpapst.amunra.vec; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; +import micdoodle8.mods.galacticraft.api.vector.Vector3; + public class Vector3int { public int x; diff --git a/src/main/java/de/katzenpapst/amunra/world/AmunraBiomeDecorator.java b/src/main/java/de/katzenpapst/amunra/world/AmunraBiomeDecorator.java index 50e8d58f..9dab8d07 100755 --- a/src/main/java/de/katzenpapst/amunra/world/AmunraBiomeDecorator.java +++ b/src/main/java/de/katzenpapst/amunra/world/AmunraBiomeDecorator.java @@ -3,10 +3,10 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; - import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; + public class AmunraBiomeDecorator extends BiomeDecoratorSpace { protected World mWorld; diff --git a/src/main/java/de/katzenpapst/amunra/world/AmunraChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/AmunraChunkProvider.java index 20931781..66c4c133 100755 --- a/src/main/java/de/katzenpapst/amunra/world/AmunraChunkProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/AmunraChunkProvider.java @@ -1,10 +1,10 @@ package de.katzenpapst.amunra.world; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.ChunkProviderSpace; - import net.minecraft.block.Block; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.ChunkProviderSpace; + abstract public class AmunraChunkProvider extends ChunkProviderSpace { public static final int CHUNK_SIZE_X = 16; diff --git a/src/main/java/de/katzenpapst/amunra/world/AmunraWorldChunkManager.java b/src/main/java/de/katzenpapst/amunra/world/AmunraWorldChunkManager.java index c45b7c9b..7cef2aa6 100755 --- a/src/main/java/de/katzenpapst/amunra/world/AmunraWorldChunkManager.java +++ b/src/main/java/de/katzenpapst/amunra/world/AmunraWorldChunkManager.java @@ -1,9 +1,9 @@ package de.katzenpapst.amunra.world; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldChunkManagerSpace; - import net.minecraft.world.biome.BiomeGenBase; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldChunkManagerSpace; + public class AmunraWorldChunkManager extends WorldChunkManagerSpace { @Override diff --git a/src/main/java/de/katzenpapst/amunra/world/AmunraWorldProvider.java b/src/main/java/de/katzenpapst/amunra/world/AmunraWorldProvider.java index 3116403a..f73e6352 100755 --- a/src/main/java/de/katzenpapst/amunra/world/AmunraWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/AmunraWorldProvider.java @@ -1,13 +1,5 @@ package de.katzenpapst.amunra.world; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.Moon; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace; -import micdoodle8.mods.galacticraft.api.vector.Vector3; -import micdoodle8.mods.galacticraft.api.world.IExitHeight; -import micdoodle8.mods.galacticraft.api.world.ISolarLevel; -import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; - import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; @@ -17,6 +9,13 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.astronomy.AngleDistance; import de.katzenpapst.amunra.helper.AstronomyHelper; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.Moon; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.WorldProviderSpace; +import micdoodle8.mods.galacticraft.api.vector.Vector3; +import micdoodle8.mods.galacticraft.api.world.IExitHeight; +import micdoodle8.mods.galacticraft.api.world.ISolarLevel; +import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore; public abstract class AmunraWorldProvider extends WorldProviderSpace implements IExitHeight, ISolarLevel { diff --git a/src/main/java/de/katzenpapst/amunra/world/SkyProviderDynamic.java b/src/main/java/de/katzenpapst/amunra/world/SkyProviderDynamic.java index 82933041..a9c96e54 100755 --- a/src/main/java/de/katzenpapst/amunra/world/SkyProviderDynamic.java +++ b/src/main/java/de/katzenpapst/amunra/world/SkyProviderDynamic.java @@ -5,15 +5,6 @@ import java.util.List; import java.util.Random; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -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.IGalacticraftWorldProvider; - import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GLAllocation; @@ -32,6 +23,14 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.client.RingsRenderInfo; import de.katzenpapst.amunra.helper.AstronomyHelper; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +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.IGalacticraftWorldProvider; public class SkyProviderDynamic extends IRenderHandler { diff --git a/src/main/java/de/katzenpapst/amunra/world/TerrainGenerator.java b/src/main/java/de/katzenpapst/amunra/world/TerrainGenerator.java index 2463ea80..a2424550 100755 --- a/src/main/java/de/katzenpapst/amunra/world/TerrainGenerator.java +++ b/src/main/java/de/katzenpapst/amunra/world/TerrainGenerator.java @@ -2,12 +2,11 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.core.perlin.generator.Gradient; - import net.minecraft.block.Block; import de.katzenpapst.amunra.helper.CoordHelper; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.core.perlin.generator.Gradient; /** * Basically this thing is just one wrapper for a copy of ChunkProviderSpace::generateTerrain, just that it isn't inside diff --git a/src/main/java/de/katzenpapst/amunra/world/WorldGenTallgrassMeta.java b/src/main/java/de/katzenpapst/amunra/world/WorldGenTallgrassMeta.java index fb1073df..ed497f35 100755 --- a/src/main/java/de/katzenpapst/amunra/world/WorldGenTallgrassMeta.java +++ b/src/main/java/de/katzenpapst/amunra/world/WorldGenTallgrassMeta.java @@ -2,14 +2,13 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import de.katzenpapst.amunra.block.bush.BlockBushMulti; import de.katzenpapst.amunra.block.bush.SubBlockBush; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class WorldGenTallgrassMeta extends WorldGenerator { diff --git a/src/main/java/de/katzenpapst/amunra/world/WorldGenTreeBySapling.java b/src/main/java/de/katzenpapst/amunra/world/WorldGenTreeBySapling.java index e350c6ab..04e95fe8 100755 --- a/src/main/java/de/katzenpapst/amunra/world/WorldGenTreeBySapling.java +++ b/src/main/java/de/katzenpapst/amunra/world/WorldGenTreeBySapling.java @@ -2,13 +2,12 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import de.katzenpapst.amunra.block.BlockBasicMeta; import de.katzenpapst.amunra.block.bush.AbstractSapling; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class WorldGenTreeBySapling extends WorldGenAbstractTree { diff --git a/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java b/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java index aff98cb3..1e1875bf 100755 --- a/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java +++ b/src/main/java/de/katzenpapst/amunra/world/WorldHelper.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.world; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -11,6 +9,7 @@ import net.minecraft.world.World; import de.katzenpapst.amunra.vec.Vector3int; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class WorldHelper { diff --git a/src/main/java/de/katzenpapst/amunra/world/anubis/AnubisChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/anubis/AnubisChunkProvider.java index 1685611a..478c3b02 100755 --- a/src/main/java/de/katzenpapst/amunra/world/anubis/AnubisChunkProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/anubis/AnubisChunkProvider.java @@ -3,13 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -22,6 +15,12 @@ import de.katzenpapst.amunra.world.mapgen.village.DomedHouseComponent; import de.katzenpapst.amunra.world.mapgen.village.GridVillageGenerator; import de.katzenpapst.amunra.world.mapgen.village.SolarField; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie; public class AnubisChunkProvider extends AmunraChunkProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/anubis/AnubisWorldProvider.java b/src/main/java/de/katzenpapst/amunra/world/anubis/AnubisWorldProvider.java index f39e479e..e54d2d88 100755 --- a/src/main/java/de/katzenpapst/amunra/world/anubis/AnubisWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/anubis/AnubisWorldProvider.java @@ -1,14 +1,13 @@ package de.katzenpapst.amunra.world.anubis; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.world.AmunraWorldChunkManager; import de.katzenpapst.amunra.world.AmunraWorldProvider; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.vector.Vector3; public class AnubisWorldProvider extends AmunraWorldProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidWorldProvider.java b/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidWorldProvider.java index 7466b928..4b96679a 100755 --- a/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidWorldProvider.java @@ -4,12 +4,6 @@ import java.util.HashSet; import java.util.TreeMap; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.galaxies.Moon; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; -import micdoodle8.mods.galacticraft.planets.asteroids.dimension.WorldProviderAsteroids; -import micdoodle8.mods.galacticraft.planets.asteroids.entities.EntityAstroMiner; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.MathHelper; @@ -22,6 +16,11 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.astronomy.AngleDistance; import de.katzenpapst.amunra.helper.AstronomyHelper; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.galaxies.Moon; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; +import micdoodle8.mods.galacticraft.planets.asteroids.dimension.WorldProviderAsteroids; +import micdoodle8.mods.galacticraft.planets.asteroids.entities.EntityAstroMiner; abstract public class AmunRaAsteroidWorldProvider extends WorldProviderAsteroids { diff --git a/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidsChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidsChunkProvider.java index db599518..5b500069 100755 --- a/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidsChunkProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/asteroidWorld/AmunRaAsteroidsChunkProvider.java @@ -6,18 +6,6 @@ import java.util.List; import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; -import micdoodle8.mods.galacticraft.core.perlin.NoiseModule; -import micdoodle8.mods.galacticraft.core.perlin.generator.Billowed; -import micdoodle8.mods.galacticraft.core.perlin.generator.Gradient; -import micdoodle8.mods.galacticraft.planets.asteroids.blocks.AsteroidBlocks; -import micdoodle8.mods.galacticraft.planets.asteroids.dimension.WorldProviderAsteroids; -import micdoodle8.mods.galacticraft.planets.asteroids.world.gen.BiomeGenBaseAsteroids; -import micdoodle8.mods.galacticraft.planets.asteroids.world.gen.SpecialAsteroidBlock; -import micdoodle8.mods.galacticraft.planets.asteroids.world.gen.SpecialAsteroidBlockHandler; - import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.block.BlockFalling; @@ -36,6 +24,17 @@ import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.world.WorldGenTallgrassMeta; import de.katzenpapst.amunra.world.WorldGenTreeBySapling; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; +import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; +import micdoodle8.mods.galacticraft.core.perlin.NoiseModule; +import micdoodle8.mods.galacticraft.core.perlin.generator.Billowed; +import micdoodle8.mods.galacticraft.core.perlin.generator.Gradient; +import micdoodle8.mods.galacticraft.planets.asteroids.blocks.AsteroidBlocks; +import micdoodle8.mods.galacticraft.planets.asteroids.dimension.WorldProviderAsteroids; +import micdoodle8.mods.galacticraft.planets.asteroids.world.gen.BiomeGenBaseAsteroids; +import micdoodle8.mods.galacticraft.planets.asteroids.world.gen.SpecialAsteroidBlock; +import micdoodle8.mods.galacticraft.planets.asteroids.world.gen.SpecialAsteroidBlockHandler; /** * This is copypaste from ChunkProviderAsteroids. I would have extended that class, but everything there is private diff --git a/src/main/java/de/katzenpapst/amunra/world/horus/HorusBiomeDecorator.java b/src/main/java/de/katzenpapst/amunra/world/horus/HorusBiomeDecorator.java index d6e18df0..229f90e8 100755 --- a/src/main/java/de/katzenpapst/amunra/world/horus/HorusBiomeDecorator.java +++ b/src/main/java/de/katzenpapst/amunra/world/horus/HorusBiomeDecorator.java @@ -2,13 +2,12 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.init.Blocks; import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.world.AmunraBiomeDecorator; import de.katzenpapst.amunra.world.WorldGenOre; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class HorusBiomeDecorator extends AmunraBiomeDecorator { diff --git a/src/main/java/de/katzenpapst/amunra/world/horus/HorusChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/horus/HorusChunkProvider.java index 3a321dc3..186a78fe 100755 --- a/src/main/java/de/katzenpapst/amunra/world/horus/HorusChunkProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/horus/HorusChunkProvider.java @@ -3,13 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -25,6 +18,12 @@ import de.katzenpapst.amunra.world.mapgen.pyramid.PyramidGenerator; import de.katzenpapst.amunra.world.mapgen.pyramid.PyramidRoom; import de.katzenpapst.amunra.world.mapgen.volcano.VolcanoGenerator; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie; public class HorusChunkProvider extends AmunraChunkProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/horus/HorusWorldProvider.java b/src/main/java/de/katzenpapst/amunra/world/horus/HorusWorldProvider.java index 3b48db54..9a94f6a0 100755 --- a/src/main/java/de/katzenpapst/amunra/world/horus/HorusWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/horus/HorusWorldProvider.java @@ -1,14 +1,13 @@ package de.katzenpapst.amunra.world.horus; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.world.AmunraWorldChunkManager; import de.katzenpapst.amunra.world.AmunraWorldProvider; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.vector.Vector3; public class HorusWorldProvider extends AmunraWorldProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesChunkProvider.java index c6782dc4..b88e2ac9 100755 --- a/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesChunkProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesChunkProvider.java @@ -3,10 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -17,6 +13,9 @@ import de.katzenpapst.amunra.mob.entity.EntityAlienBug; import de.katzenpapst.amunra.mob.entity.EntityPorcodon; import de.katzenpapst.amunra.world.AmunraChunkProvider; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; public class MaahesChunkProvider extends AmunraChunkProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesWorldProvider.java b/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesWorldProvider.java index d0b6934c..5976a1d7 100755 --- a/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/maahes/MaahesWorldProvider.java @@ -1,14 +1,13 @@ package de.katzenpapst.amunra.world.maahes; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.world.AmunraWorldChunkManager; import de.katzenpapst.amunra.world.AmunraWorldProvider; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.vector.Vector3; public class MaahesWorldProvider extends AmunraWorldProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/BaseStructureComponent.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/BaseStructureComponent.java index 403d7426..21ba11f3 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/BaseStructureComponent.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/BaseStructureComponent.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.world.mapgen; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -9,6 +7,7 @@ import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.world.mapgen.populator.SetSignText; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; abstract public class BaseStructureComponent { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/BaseStructureStart.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/BaseStructureStart.java index 824a06e5..7c73c0de 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/BaseStructureStart.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/BaseStructureStart.java @@ -3,8 +3,6 @@ import java.util.HashMap; import java.util.Random; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.world.ChunkCoordIntPair; @@ -14,6 +12,7 @@ import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.world.mapgen.populator.AbstractPopulator; import de.katzenpapst.amunra.world.mapgen.populator.SpawnEntity; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; abstract public class BaseStructureStart extends BaseStructureComponent { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/CrystalFormation.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/CrystalFormation.java index 80fa5851..dfd82a96 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/CrystalFormation.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/CrystalFormation.java @@ -2,14 +2,13 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.util.ForgeDirection; import de.katzenpapst.amunra.world.WorldHelper; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class CrystalFormation extends WorldGenerator { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/StructureGenerator.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/StructureGenerator.java index 5489ddb6..cd7bbb9a 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/StructureGenerator.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/StructureGenerator.java @@ -7,8 +7,6 @@ import java.util.Random; import java.util.stream.Collectors; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; - import net.minecraft.block.Block; import net.minecraft.util.MathHelper; import net.minecraft.world.ChunkCoordIntPair; @@ -16,6 +14,7 @@ import net.minecraft.world.chunk.IChunkProvider; import de.katzenpapst.amunra.AmunRa; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; /** * I'll do a subdivision now: StructureGenerator and Structure For each StructureGenerator there is a subclass of diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/AbstractPopulator.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/AbstractPopulator.java index 16ed5765..bd4e2223 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/AbstractPopulator.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/AbstractPopulator.java @@ -1,11 +1,10 @@ package de.katzenpapst.amunra.world.mapgen.populator; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; - import net.minecraft.world.World; import net.minecraft.world.gen.structure.StructureBoundingBox; import de.katzenpapst.amunra.helper.CoordHelper; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; abstract public class AbstractPopulator { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/FillChest.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/FillChest.java index 715ca350..ee32860b 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/FillChest.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/FillChest.java @@ -1,12 +1,12 @@ package de.katzenpapst.amunra.world.mapgen.populator; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.inventory.IInventory; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraftforge.common.ChestGenHooks; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; + public class FillChest extends AbstractPopulator { protected BlockMetaPair chestBlock; diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/TouchSolarPanel.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/TouchSolarPanel.java index 29ca2cad..20d74bba 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/TouchSolarPanel.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/populator/TouchSolarPanel.java @@ -1,11 +1,11 @@ package de.katzenpapst.amunra.world.mapgen.populator; -import micdoodle8.mods.galacticraft.api.vector.BlockVec3; -import micdoodle8.mods.galacticraft.core.tile.TileEntitySolar; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import micdoodle8.mods.galacticraft.api.vector.BlockVec3; +import micdoodle8.mods.galacticraft.core.tile.TileEntitySolar; + public class TouchSolarPanel extends AbstractPopulator { /** diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/BossRoom.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/BossRoom.java index ef1b7c39..40d54bbe 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/BossRoom.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/BossRoom.java @@ -1,13 +1,12 @@ package de.katzenpapst.amunra.world.mapgen.pyramid; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.util.AxisAlignedBB; import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.mob.entity.EntityMummyBoss; import de.katzenpapst.amunra.world.mapgen.populator.InitBossSpawner; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class BossRoom extends PyramidRoom { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/ChestRoom.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/ChestRoom.java index 27534142..5e883678 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/ChestRoom.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/ChestRoom.java @@ -2,13 +2,12 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import de.katzenpapst.amunra.world.mapgen.populator.FillChest; import de.katzenpapst.amunra.world.mapgen.populator.SetSpawnerEntity; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class ChestRoom extends PyramidRoom { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PitRoom.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PitRoom.java index f8793577..fac8b15c 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PitRoom.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PitRoom.java @@ -1,10 +1,10 @@ package de.katzenpapst.amunra.world.mapgen.pyramid; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; + public class PitRoom extends PyramidRoom { protected int pitSize = 7; diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/Pyramid.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/Pyramid.java index ac6c0c0d..1bb595aa 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/Pyramid.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/Pyramid.java @@ -4,9 +4,6 @@ import java.util.List; import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.planets.mars.items.MarsItems; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -22,6 +19,8 @@ import de.katzenpapst.amunra.item.ARItems; import de.katzenpapst.amunra.world.mapgen.BaseStructureComponent; import de.katzenpapst.amunra.world.mapgen.BaseStructureStart; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.planets.mars.items.MarsItems; public class Pyramid extends BaseStructureStart { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PyramidGenerator.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PyramidGenerator.java index 223ddf3c..adfef754 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PyramidGenerator.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PyramidGenerator.java @@ -4,14 +4,13 @@ import java.util.List; import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.util.MathHelper; import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.world.mapgen.BaseStructureComponent; import de.katzenpapst.amunra.world.mapgen.BaseStructureStart; import de.katzenpapst.amunra.world.mapgen.StructureGenerator; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class PyramidGenerator extends StructureGenerator { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PyramidRoom.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PyramidRoom.java index b2347d05..a5f5171b 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PyramidRoom.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/pyramid/PyramidRoom.java @@ -1,7 +1,5 @@ package de.katzenpapst.amunra.world.mapgen.pyramid; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.gen.structure.StructureBoundingBox; @@ -9,6 +7,7 @@ import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.world.mapgen.BaseStructureComponent; import de.katzenpapst.amunra.world.mapgen.populator.TouchBlock; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class PyramidRoom extends BaseStructureComponent { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/BoxHouseComponent.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/BoxHouseComponent.java index 36126df1..bb38a0fd 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/BoxHouseComponent.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/BoxHouseComponent.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.world.mapgen.village; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; - import net.minecraft.block.Block; import net.minecraft.entity.EntityCreature; import net.minecraft.init.Blocks; @@ -10,6 +7,8 @@ import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.mob.entity.EntityRobotVillager; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; public class BoxHouseComponent extends GridVillageComponent { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/DomedHouseComponent.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/DomedHouseComponent.java index f5b5ff5c..21d2f1a4 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/DomedHouseComponent.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/DomedHouseComponent.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.world.mapgen.village; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; - import net.minecraft.block.Block; import net.minecraft.entity.EntityCreature; import net.minecraft.init.Blocks; @@ -10,6 +7,8 @@ import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.mob.entity.EntityRobotVillager; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; public class DomedHouseComponent extends GridVillageComponent { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/GridVillageStart.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/GridVillageStart.java index a19a8d75..0eb81874 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/GridVillageStart.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/GridVillageStart.java @@ -5,8 +5,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.world.World; import net.minecraft.world.gen.structure.StructureBoundingBox; @@ -16,6 +14,7 @@ import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.world.mapgen.BaseStructureComponent; import de.katzenpapst.amunra.world.mapgen.BaseStructureStart; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class GridVillageStart extends BaseStructureStart { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/PyramidHouseComponent.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/PyramidHouseComponent.java index 448a1716..7a44050b 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/PyramidHouseComponent.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/PyramidHouseComponent.java @@ -1,11 +1,10 @@ package de.katzenpapst.amunra.world.mapgen.village; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.block.Block; import net.minecraft.world.gen.structure.StructureBoundingBox; import de.katzenpapst.amunra.helper.CoordHelper; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class PyramidHouseComponent extends GridVillageComponent { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/SolarField.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/SolarField.java index b7e2b723..74a7ffad 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/village/SolarField.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/village/SolarField.java @@ -1,9 +1,5 @@ package de.katzenpapst.amunra.world.mapgen.village; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.core.blocks.BlockSolar; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.gen.structure.StructureBoundingBox; @@ -11,6 +7,9 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.world.mapgen.populator.TouchSolarPanel; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.core.blocks.BlockSolar; +import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; public class SolarField extends GridVillageComponent { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/volcano/Volcano.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/volcano/Volcano.java index 77797ae4..570ab5f9 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/volcano/Volcano.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/volcano/Volcano.java @@ -2,9 +2,6 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.core.perlin.generator.Gradient; - import net.minecraft.block.Block; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -13,6 +10,8 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.helper.CoordHelper; import de.katzenpapst.amunra.world.mapgen.BaseStructureStart; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.core.perlin.generator.Gradient; public class Volcano extends BaseStructureStart { diff --git a/src/main/java/de/katzenpapst/amunra/world/mapgen/volcano/VolcanoGenerator.java b/src/main/java/de/katzenpapst/amunra/world/mapgen/volcano/VolcanoGenerator.java index 8bec5b0a..f21aaf54 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mapgen/volcano/VolcanoGenerator.java +++ b/src/main/java/de/katzenpapst/amunra/world/mapgen/volcano/VolcanoGenerator.java @@ -2,12 +2,11 @@ import java.util.Random; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.util.MathHelper; import de.katzenpapst.amunra.world.mapgen.BaseStructureStart; import de.katzenpapst.amunra.world.mapgen.StructureGenerator; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class VolcanoGenerator extends StructureGenerator { diff --git a/src/main/java/de/katzenpapst/amunra/world/mehen/MehenWorldProvider.java b/src/main/java/de/katzenpapst/amunra/world/mehen/MehenWorldProvider.java index dfc4e76c..4ac9a9df 100755 --- a/src/main/java/de/katzenpapst/amunra/world/mehen/MehenWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/mehen/MehenWorldProvider.java @@ -1,13 +1,12 @@ package de.katzenpapst.amunra.world.mehen; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.planets.asteroids.world.gen.WorldChunkManagerAsteroids; - import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.world.asteroidWorld.AmunRaAsteroidWorldProvider; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.planets.asteroids.world.gen.WorldChunkManagerAsteroids; public class MehenWorldProvider extends AmunRaAsteroidWorldProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/neper/NeperBiomeDecorator.java b/src/main/java/de/katzenpapst/amunra/world/neper/NeperBiomeDecorator.java index efe2ad36..b3272d53 100755 --- a/src/main/java/de/katzenpapst/amunra/world/neper/NeperBiomeDecorator.java +++ b/src/main/java/de/katzenpapst/amunra/world/neper/NeperBiomeDecorator.java @@ -2,8 +2,6 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.init.Blocks; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -11,6 +9,7 @@ import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.world.AmunraBiomeDecorator; import de.katzenpapst.amunra.world.WorldGenOre; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class NeperBiomeDecorator extends AmunraBiomeDecorator { diff --git a/src/main/java/de/katzenpapst/amunra/world/neper/NeperChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/neper/NeperChunkProvider.java index f7d8555f..5da08475 100755 --- a/src/main/java/de/katzenpapst/amunra/world/neper/NeperChunkProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/neper/NeperChunkProvider.java @@ -3,13 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton; -import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie; - import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.passive.EntityCow; @@ -23,6 +16,12 @@ import net.minecraft.world.chunk.IChunkProvider; import de.katzenpapst.amunra.world.AmunraChunkProvider; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedCreeper; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedSkeleton; +import micdoodle8.mods.galacticraft.core.entities.EntityEvolvedZombie; public class NeperChunkProvider extends AmunraChunkProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/neper/NeperWorldProvider.java b/src/main/java/de/katzenpapst/amunra/world/neper/NeperWorldProvider.java index 870346a9..81b97113 100755 --- a/src/main/java/de/katzenpapst/amunra/world/neper/NeperWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/neper/NeperWorldProvider.java @@ -1,14 +1,13 @@ package de.katzenpapst.amunra.world.neper; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.world.AmunraWorldChunkManager; import de.katzenpapst.amunra.world.AmunraWorldProvider; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.vector.Vector3; public class NeperWorldProvider extends AmunraWorldProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/seth/SethBiomeDecorator.java b/src/main/java/de/katzenpapst/amunra/world/seth/SethBiomeDecorator.java index 5569c652..468d697d 100755 --- a/src/main/java/de/katzenpapst/amunra/world/seth/SethBiomeDecorator.java +++ b/src/main/java/de/katzenpapst/amunra/world/seth/SethBiomeDecorator.java @@ -2,13 +2,12 @@ import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; - import net.minecraft.init.Blocks; import de.katzenpapst.amunra.block.ARBlocks; import de.katzenpapst.amunra.world.AmunraBiomeDecorator; import de.katzenpapst.amunra.world.WorldGenOre; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; public class SethBiomeDecorator extends AmunraBiomeDecorator { diff --git a/src/main/java/de/katzenpapst/amunra/world/seth/SethChunkProvider.java b/src/main/java/de/katzenpapst/amunra/world/seth/SethChunkProvider.java index 619adc3d..70b51da7 100755 --- a/src/main/java/de/katzenpapst/amunra/world/seth/SethChunkProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/seth/SethChunkProvider.java @@ -3,10 +3,6 @@ import java.util.ArrayList; import java.util.List; -import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; -import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; @@ -20,6 +16,9 @@ import de.katzenpapst.amunra.world.TerrainGenerator; import de.katzenpapst.amunra.world.mapgen.CrystalFormation; import de.katzenpapst.amunra.world.mapgen.volcano.VolcanoGenerator; +import micdoodle8.mods.galacticraft.api.prefab.core.BlockMetaPair; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.BiomeDecoratorSpace; +import micdoodle8.mods.galacticraft.api.prefab.world.gen.MapGenBaseMeta; public class SethChunkProvider extends AmunraChunkProvider { diff --git a/src/main/java/de/katzenpapst/amunra/world/seth/SethWorldProvider.java b/src/main/java/de/katzenpapst/amunra/world/seth/SethWorldProvider.java index 7a08c7f8..23b6daa8 100755 --- a/src/main/java/de/katzenpapst/amunra/world/seth/SethWorldProvider.java +++ b/src/main/java/de/katzenpapst/amunra/world/seth/SethWorldProvider.java @@ -1,8 +1,5 @@ package de.katzenpapst.amunra.world.seth; -import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; -import micdoodle8.mods.galacticraft.api.vector.Vector3; - import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.chunk.IChunkProvider; @@ -11,6 +8,8 @@ import de.katzenpapst.amunra.AmunRa; import de.katzenpapst.amunra.world.AmunraWorldChunkManager; import de.katzenpapst.amunra.world.AmunraWorldProvider; +import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody; +import micdoodle8.mods.galacticraft.api.vector.Vector3; public class SethWorldProvider extends AmunraWorldProvider {