Skip to content

Commit a57797b

Browse files
ROMVoid95ROMVoid95
committed
style: import ordering changes
1 parent 2912677 commit a57797b

File tree

328 files changed

+2547
-1761
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

328 files changed

+2547
-1761
lines changed

‎src/main/java/micdoodle8/mods/galacticraft/api/GalacticraftRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import java.util.List;
1414
import java.util.Map;
1515

16-
import com.google.common.collect.Lists;
17-
1816
import net.minecraft.block.Block;
1917
import net.minecraft.item.Item;
2018
import net.minecraft.item.ItemStack;
@@ -35,6 +33,8 @@
3533
import micdoodle8.mods.galacticraft.api.world.SpaceStationType;
3634
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
3735

36+
import com.google.common.collect.Lists;
37+
3838
public class GalacticraftRegistry
3939
{
4040

‎src/main/java/micdoodle8/mods/galacticraft/api/galaxies/CelestialObject.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
package micdoodle8.mods.galacticraft.api.galaxies;
99

1010
import java.util.function.Predicate;
11-
import lombok.Setter;
11+
12+
//import lombok.Setter;
1213
import net.minecraft.util.text.translation.I18n;
1314

15+
import lombok.Setter;
16+
1417
public abstract class CelestialObject implements ICelestial
1518
{
1619

@@ -42,6 +45,7 @@ public String getTranslationKey()
4245
return this.getCelestialType().toString() + "." + bodyName;
4346
}
4447

48+
@Override
4549
public CelestialType getCelestialType()
4650
{
4751
return this.type;
@@ -57,6 +61,11 @@ public String getTranslatedName()
5761
return I18n.translateToLocal(this.getTranslationKey());
5862
}
5963

64+
public boolean isEqualTo(CelestialType celestialType, String name)
65+
{
66+
return type.equals(celestialType) && bodyName.equalsIgnoreCase(name);
67+
}
68+
6069
public static Predicate<CelestialObject> filter(String modId)
6170
{
6271
return new Predicate<CelestialObject>()

‎src/main/java/micdoodle8/mods/galacticraft/api/galaxies/CelestialType.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
import java.util.Map;
1414
import java.util.stream.Collectors;
1515

16+
import lombok.EqualsAndHashCode;
17+
18+
@EqualsAndHashCode
1619
public final class CelestialType
1720
{
1821

‎src/main/java/micdoodle8/mods/galacticraft/api/galaxies/ICelestial.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ public interface ICelestial
1212

1313
public String getName();
1414

15+
public CelestialType getCelestialType();
16+
1517
public void setOwnerId(String ownerId);
1618
}

‎src/main/java/micdoodle8/mods/galacticraft/core/GalacticraftCore.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@
6767
import micdoodle8.mods.galacticraft.api.GalacticraftRegistry;
6868
import micdoodle8.mods.galacticraft.api.client.IGameScreen;
6969
import micdoodle8.mods.galacticraft.api.galaxies.CelestialBody;
70+
import micdoodle8.mods.galacticraft.api.galaxies.CelestialObject;
71+
import micdoodle8.mods.galacticraft.api.galaxies.CelestialType;
7072
import micdoodle8.mods.galacticraft.api.galaxies.GalaxyRegistry;
7173
import micdoodle8.mods.galacticraft.api.galaxies.Moon;
7274
import micdoodle8.mods.galacticraft.api.galaxies.Planet;
@@ -830,9 +832,9 @@ private Planet makeDummyPlanet(String name, SolarSystem system)
830832
{
831833
// Loop through all planets to make sure it's not registered as a
832834
// reachable dimension first
833-
for (CelestialBody body : new ArrayList<>(GalaxyRegistry.getPlanets()))
835+
for (CelestialObject body : new ArrayList<>(GalaxyRegistry.getPlanets()))
834836
{
835-
if (body instanceof Planet && name.equalsIgnoreCase(body.getName()))
837+
if (body.isEqualTo(CelestialType.PLANET, name))
836838
{
837839
if (((Planet) body).getParentSolarSystem() == system)
838840
{

‎src/main/java/micdoodle8/mods/galacticraft/core/TransformerHooks.java

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
package micdoodle8.mods.galacticraft.core;
99

10-
import static micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore.PLAYER_Y_OFFSET;
11-
import static micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore.submergedTextures;
12-
1310
import java.lang.reflect.Field;
1411
import java.lang.reflect.Method;
1512
import java.util.Collection;
@@ -18,30 +15,7 @@
1815
import java.util.Map;
1916
import java.util.Random;
2017
import java.util.Set;
21-
import micdoodle8.mods.galacticraft.api.entity.IAntiGrav;
22-
import micdoodle8.mods.galacticraft.api.entity.ICameraZoomEntity;
23-
import micdoodle8.mods.galacticraft.api.item.IArmorGravity;
24-
import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase;
25-
import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider;
26-
import micdoodle8.mods.galacticraft.api.world.IOrbitDimension;
27-
import micdoodle8.mods.galacticraft.api.world.IWeatherProvider;
28-
import micdoodle8.mods.galacticraft.api.world.IZeroGDimension;
29-
import micdoodle8.mods.galacticraft.core.blocks.BlockGrating;
30-
import micdoodle8.mods.galacticraft.core.client.BubbleRenderer;
31-
import micdoodle8.mods.galacticraft.core.client.FootprintRenderer;
32-
import micdoodle8.mods.galacticraft.core.client.SkyProviderOverworld;
33-
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderMoon;
34-
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderSpaceStation;
35-
import micdoodle8.mods.galacticraft.core.entities.player.EnumGravity;
36-
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats;
37-
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStatsClient;
38-
import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore;
39-
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
40-
import micdoodle8.mods.galacticraft.core.util.FluidUtil;
41-
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
42-
import micdoodle8.mods.galacticraft.core.util.OxygenUtil;
43-
import micdoodle8.mods.galacticraft.core.util.WorldUtil;
44-
import micdoodle8.mods.galacticraft.planets.venus.VenusItems;
18+
4519
import net.minecraft.block.Block;
4620
import net.minecraft.block.material.Material;
4721
import net.minecraft.block.state.IBlockState;
@@ -69,6 +43,7 @@
6943
import net.minecraft.world.biome.Biome;
7044
import net.minecraft.world.chunk.IChunkProvider;
7145
import net.minecraft.world.gen.IChunkGenerator;
46+
7247
import net.minecraftforge.client.ForgeHooksClient;
7348
import net.minecraftforge.client.MinecraftForgeClient;
7449
import net.minecraftforge.common.MinecraftForge;
@@ -78,8 +53,37 @@
7853
import net.minecraftforge.fml.common.registry.GameRegistry;
7954
import net.minecraftforge.fml.relauncher.Side;
8055
import net.minecraftforge.fml.relauncher.SideOnly;
56+
57+
import micdoodle8.mods.galacticraft.api.entity.IAntiGrav;
58+
import micdoodle8.mods.galacticraft.api.entity.ICameraZoomEntity;
59+
import micdoodle8.mods.galacticraft.api.item.IArmorGravity;
60+
import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase;
61+
import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider;
62+
import micdoodle8.mods.galacticraft.api.world.IOrbitDimension;
63+
import micdoodle8.mods.galacticraft.api.world.IWeatherProvider;
64+
import micdoodle8.mods.galacticraft.api.world.IZeroGDimension;
65+
import micdoodle8.mods.galacticraft.core.blocks.BlockGrating;
66+
import micdoodle8.mods.galacticraft.core.client.BubbleRenderer;
67+
import micdoodle8.mods.galacticraft.core.client.FootprintRenderer;
68+
import micdoodle8.mods.galacticraft.core.client.SkyProviderOverworld;
69+
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderMoon;
70+
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderSpaceStation;
71+
import micdoodle8.mods.galacticraft.core.entities.player.EnumGravity;
72+
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats;
73+
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStatsClient;
74+
import micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore;
75+
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
76+
import micdoodle8.mods.galacticraft.core.util.FluidUtil;
77+
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
78+
import micdoodle8.mods.galacticraft.core.util.OxygenUtil;
79+
import micdoodle8.mods.galacticraft.core.util.WorldUtil;
80+
import micdoodle8.mods.galacticraft.planets.venus.VenusItems;
81+
8182
import org.lwjgl.opengl.GL11;
8283

84+
import static micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore.PLAYER_Y_OFFSET;
85+
import static micdoodle8.mods.galacticraft.core.proxy.ClientProxyCore.submergedTextures;
86+
8387
/**
8488
* These methods are called from vanilla minecraft through bytecode injection done in MicdoodleCore See https://github.com/micdoodle8/MicdoodleCore
8589
*/

‎src/main/java/micdoodle8/mods/galacticraft/core/advancement/GCTriggers.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,22 @@
77

88
package micdoodle8.mods.galacticraft.core.advancement;
99

10-
import com.google.gson.JsonDeserializationContext;
11-
import com.google.gson.JsonObject;
1210
import java.lang.reflect.Method;
13-
import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase;
14-
import micdoodle8.mods.galacticraft.core.advancement.criterion.GenericTrigger;
15-
import micdoodle8.mods.galacticraft.core.entities.EntitySkeletonBoss;
16-
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats;
11+
1712
import net.minecraft.advancements.CriteriaTriggers;
1813
import net.minecraft.advancements.ICriterionInstance;
1914
import net.minecraft.advancements.ICriterionTrigger;
2015
import net.minecraft.entity.Entity;
2116
import net.minecraft.entity.player.EntityPlayerMP;
2217

18+
import micdoodle8.mods.galacticraft.api.prefab.entity.EntitySpaceshipBase;
19+
import micdoodle8.mods.galacticraft.core.advancement.criterion.GenericTrigger;
20+
import micdoodle8.mods.galacticraft.core.entities.EntitySkeletonBoss;
21+
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats;
22+
23+
import com.google.gson.JsonDeserializationContext;
24+
import com.google.gson.JsonObject;
25+
2326
public class GCTriggers
2427
{
2528

‎src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockAdvanced.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
package micdoodle8.mods.galacticraft.core.blocks;
99

1010
import java.lang.reflect.Method;
11-
import micdoodle8.mods.galacticraft.core.GCItems;
12-
import micdoodle8.mods.galacticraft.core.util.CompatibilityManager;
11+
1312
import net.minecraft.block.Block;
1413
import net.minecraft.block.material.Material;
1514
import net.minecraft.block.state.IBlockState;
@@ -22,6 +21,9 @@
2221
import net.minecraft.world.IBlockAccess;
2322
import net.minecraft.world.World;
2423

24+
import micdoodle8.mods.galacticraft.core.GCItems;
25+
import micdoodle8.mods.galacticraft.core.util.CompatibilityManager;
26+
2527
/**
2628
* An advanced block class that is to be extended for wrenching capabilities.
2729
*/

‎src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockAdvancedTile.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
package micdoodle8.mods.galacticraft.core.blocks;
99

1010
import java.util.Random;
11-
import micdoodle8.mods.galacticraft.api.tile.ILockable;
12-
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
11+
1312
import net.minecraft.block.ITileEntityProvider;
1413
import net.minecraft.block.material.Material;
1514
import net.minecraft.block.state.IBlockState;
@@ -20,6 +19,9 @@
2019
import net.minecraft.util.math.BlockPos;
2120
import net.minecraft.world.World;
2221

22+
import micdoodle8.mods.galacticraft.api.tile.ILockable;
23+
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
24+
2325
public abstract class BlockAdvancedTile extends BlockAdvanced implements ITileEntityProvider
2426
{
2527

‎src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockAirLockFrame.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77

88
package micdoodle8.mods.galacticraft.core.blocks;
99

10-
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
11-
import micdoodle8.mods.galacticraft.core.items.IShiftDescription;
12-
import micdoodle8.mods.galacticraft.core.tile.TileEntityAirLock;
13-
import micdoodle8.mods.galacticraft.core.tile.TileEntityAirLockController;
14-
import micdoodle8.mods.galacticraft.core.util.EnumSortCategoryBlock;
15-
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
16-
import micdoodle8.mods.galacticraft.core.util.PlayerUtil;
1710
import net.minecraft.block.SoundType;
1811
import net.minecraft.block.material.Material;
1912
import net.minecraft.block.properties.PropertyEnum;
@@ -32,6 +25,14 @@
3225
import net.minecraft.world.IBlockAccess;
3326
import net.minecraft.world.World;
3427

28+
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
29+
import micdoodle8.mods.galacticraft.core.items.IShiftDescription;
30+
import micdoodle8.mods.galacticraft.core.tile.TileEntityAirLock;
31+
import micdoodle8.mods.galacticraft.core.tile.TileEntityAirLockController;
32+
import micdoodle8.mods.galacticraft.core.util.EnumSortCategoryBlock;
33+
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
34+
import micdoodle8.mods.galacticraft.core.util.PlayerUtil;
35+
3536
public class BlockAirLockFrame extends BlockAdvancedTile implements IShiftDescription, ISortableBlock
3637
{
3738

‎src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockAirLockWall.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
package micdoodle8.mods.galacticraft.core.blocks;
99

1010
import java.util.Random;
11-
import micdoodle8.mods.galacticraft.api.block.IPartialSealableBlock;
12-
import micdoodle8.mods.galacticraft.core.GCBlocks;
13-
import micdoodle8.mods.galacticraft.core.util.EnumSortCategoryBlock;
11+
1412
import net.minecraft.block.Block;
1513
import net.minecraft.block.BlockBreakable;
1614
import net.minecraft.block.SoundType;
@@ -25,9 +23,14 @@
2523
import net.minecraft.util.math.BlockPos;
2624
import net.minecraft.world.IBlockAccess;
2725
import net.minecraft.world.World;
26+
2827
import net.minecraftforge.fml.relauncher.Side;
2928
import net.minecraftforge.fml.relauncher.SideOnly;
3029

30+
import micdoodle8.mods.galacticraft.api.block.IPartialSealableBlock;
31+
import micdoodle8.mods.galacticraft.core.GCBlocks;
32+
import micdoodle8.mods.galacticraft.core.util.EnumSortCategoryBlock;
33+
3134
public class BlockAirLockWall extends BlockBreakable implements IPartialSealableBlock, ISortableBlock
3235
{
3336

‎src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockAluminumWire.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77

88
package micdoodle8.mods.galacticraft.core.blocks;
99

10-
import micdoodle8.mods.galacticraft.api.transmission.NetworkType;
11-
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
12-
import micdoodle8.mods.galacticraft.core.items.IShiftDescription;
13-
import micdoodle8.mods.galacticraft.core.tile.TileEntityAluminumWire;
14-
import micdoodle8.mods.galacticraft.core.tile.TileEntityAluminumWireSwitch;
15-
import micdoodle8.mods.galacticraft.core.util.EnumSortCategoryBlock;
16-
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
1710
import net.minecraft.block.ITileEntityProvider;
1811
import net.minecraft.block.SoundType;
1912
import net.minecraft.block.material.Material;
@@ -31,9 +24,18 @@
3124
import net.minecraft.util.math.BlockPos;
3225
import net.minecraft.world.IBlockAccess;
3326
import net.minecraft.world.World;
27+
3428
import net.minecraftforge.fml.relauncher.Side;
3529
import net.minecraftforge.fml.relauncher.SideOnly;
3630

31+
import micdoodle8.mods.galacticraft.api.transmission.NetworkType;
32+
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
33+
import micdoodle8.mods.galacticraft.core.items.IShiftDescription;
34+
import micdoodle8.mods.galacticraft.core.tile.TileEntityAluminumWire;
35+
import micdoodle8.mods.galacticraft.core.tile.TileEntityAluminumWireSwitch;
36+
import micdoodle8.mods.galacticraft.core.util.EnumSortCategoryBlock;
37+
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
38+
3739
public class BlockAluminumWire extends BlockTransmitter implements ITileEntityProvider, IShiftDescription, ISortableBlock
3840
{
3941

‎src/main/java/micdoodle8/mods/galacticraft/core/blocks/BlockBasic.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
package micdoodle8.mods.galacticraft.core.blocks;
99

1010
import java.util.Random;
11-
import micdoodle8.mods.galacticraft.api.block.IDetectableResource;
12-
import micdoodle8.mods.galacticraft.core.GCItems;
13-
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
14-
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
15-
import micdoodle8.mods.galacticraft.core.util.EnumSortCategoryBlock;
11+
1612
import net.minecraft.block.Block;
1713
import net.minecraft.block.material.Material;
1814
import net.minecraft.block.properties.PropertyEnum;
@@ -31,9 +27,16 @@
3127
import net.minecraft.world.Explosion;
3228
import net.minecraft.world.IBlockAccess;
3329
import net.minecraft.world.World;
30+
3431
import net.minecraftforge.fml.relauncher.Side;
3532
import net.minecraftforge.fml.relauncher.SideOnly;
3633

34+
import micdoodle8.mods.galacticraft.api.block.IDetectableResource;
35+
import micdoodle8.mods.galacticraft.core.GCItems;
36+
import micdoodle8.mods.galacticraft.core.GalacticraftCore;
37+
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
38+
import micdoodle8.mods.galacticraft.core.util.EnumSortCategoryBlock;
39+
3740
/**
3841
* Metadata: 3 = Tin Decoration Block 1; 4 = Tin Decoration Block 2; 5 = Copper
3942
* Ore; 6 = Tin Ore; 7 = Aluminium Ore; 8 = Silicon Ore; 9 = Copper Block; 10 =

0 commit comments

Comments
 (0)