Final touchups before merging into GT5u

gradle.properties

@@ -1,6 +1,6 @@
 # ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
 # LOCAL to test local config updates.
-gtnh.settings.blowdryerTag = 0.2.0
+gtnh.settings.blowdryerTag = 0.2.2
 
 # Human-readable mod name, available for mcmod.info population.
 modName = GTNH-Intergalactic

src/main/java/com/gtnewhorizons/gtnhintergalactic/GTNHIntergalactic.java

@@ -21,22 +21,22 @@
 import cpw.mods.fml.common.registry.GameRegistry;
 
 @Mod(
-        modid = GTNHIntergalactic.MODID,
-        version = Tags.VERSION,
-        name = GTNHIntergalactic.MODNAME,
-        acceptedMinecraftVersions = "[1.7.10]",
-        dependencies = "required-after:GalacticraftCore@[3.0.36,);" + "required-after:GalacticraftMars;"
-                + "required-after:gregtech;"
-                + "required-after:gtnhlib@[0.5.21,);"
-                + "required-after:tectech;"
-                + "required-after:structurelib;"
-                + "after:GalaxySpace;"
-                + "after:bartworks;"
-                + "after:GoodGenerator;"
-                + "after:miscutils;"
-                + "after:dreamcraft;"
-                + "after:openmodularturrets;"
-                + "after:IronChest;")
+    modid = GTNHIntergalactic.MODID,
+    version = Tags.VERSION,
+    name = GTNHIntergalactic.MODNAME,
+    acceptedMinecraftVersions = "[1.7.10]",
+    dependencies = "required-after:GalacticraftCore@[3.0.36,);" + "required-after:GalacticraftMars;"
+        + "required-after:gregtech;"
+        + "required-after:gtnhlib@[0.5.21,);"
+        + "required-after:tectech;"
+        + "required-after:structurelib;"
+        + "after:GalaxySpace;"
+        + "after:bartworks;"
+        + "after:GoodGenerator;"
+        + "after:miscutils;"
+        + "after:dreamcraft;"
+        + "after:openmodularturrets;"
+        + "after:IronChest;")
 public class GTNHIntergalactic {
 
     static {
@@ -57,8 +57,8 @@ public class GTNHIntergalactic {
     public static CreativeTabs tab;
     /** Proxy used for loading */
     @SidedProxy(
-            clientSide = "com.gtnewhorizons.gtnhintergalactic.proxy.ClientProxy",
-            serverSide = "com.gtnewhorizons.gtnhintergalactic.proxy.CommonProxy")
+        clientSide = "com.gtnewhorizons.gtnhintergalactic.proxy.ClientProxy",
+        serverSide = "com.gtnewhorizons.gtnhintergalactic.proxy.CommonProxy")
     public static CommonProxy proxy;
 
     @Mod.EventHandler
@@ -97,13 +97,13 @@ public void onMissingMapping(FMLMissingMappingsEvent event) {
             } else if (mapping.type == GameRegistry.Type.ITEM) {
                 switch (mapping.name) {
                     case "GalaxySpace:spaceelevatorparts" -> mapping
-                            .remap(Item.getItemFromBlock(IGBlocks.SpaceElevatorCasing));
+                        .remap(Item.getItemFromBlock(IGBlocks.SpaceElevatorCasing));
                     case "GalaxySpace:spaceelevatormotors" -> mapping
-                            .remap(Item.getItemFromBlock(IGBlocks.SpaceElevatorMotor));
+                        .remap(Item.getItemFromBlock(IGBlocks.SpaceElevatorMotor));
                     case "GalaxySpace:spaceelevatorcable" -> mapping
-                            .remap(Item.getItemFromBlock(IGBlocks.SpaceElevatorCable));
+                        .remap(Item.getItemFromBlock(IGBlocks.SpaceElevatorCable));
                     case "GalaxySpace:dysonswarmparts" -> mapping
-                            .remap(Item.getItemFromBlock(IGBlocks.DysonSwarmCasing));
+                        .remap(Item.getItemFromBlock(IGBlocks.DysonSwarmCasing));
                     case "GalaxySpace:machineframes" -> mapping.remap(Item.getItemFromBlock(IGBlocks.GasSiphonCasing));
                     case "GalaxySpace:item.SpaceElevatorParts" -> mapping.remap(IGItems.SpaceElevatorItems);
                     case "GalaxySpace:item.MiningDrone" -> mapping.remap(IGItems.MiningDrones);

src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockCasingDysonSwarm.java

@@ -18,8 +18,8 @@ public class BlockCasingDysonSwarm extends Block {
 
     private IIcon[][] textures;
     public static final String[] names = { "ReceiverCasing", "ReceiverDish", "DeploymentUnitCasing",
-            "DeploymentUnitCore", "DeploymentUnitMagnet", "ControlCasing", "ControlPrimary", "ControlSecondary",
-            "ControlToroid", "Floor" };
+        "DeploymentUnitCore", "DeploymentUnitMagnet", "ControlCasing", "ControlPrimary", "ControlSecondary",
+        "ControlToroid", "Floor" };
 
     public BlockCasingDysonSwarm() {
         super(Material.iron);
@@ -33,7 +33,7 @@ public void registerBlockIcons(IIconRegister register) {
         textures = new IIcon[names.length][2];
         for (int i = 0; i < names.length; i++) {
             textures[i][0] = register
-                    .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":dysonSwarm/" + names[i] + "_Side");
+                .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":dysonSwarm/" + names[i] + "_Side");
             textures[i][1] = register.registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":dysonSwarm/" + names[i]);
         }
     }
@@ -52,7 +52,7 @@ public void getSubBlocks(Item item, CreativeTabs tab, List variants) {
 
     @Override
     public float getExplosionResistance(Entity entity, World world, int x, int y, int z, double explosionX,
-            double explosionY, double explosionZ) {
+        double explosionY, double explosionZ) {
         if (world.getBlockMetadata(x, y, z) == 9) {
             return 1500.0f;
         }

src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockCasingSpaceElevator.java

@@ -65,13 +65,13 @@ public BlockCasingSpaceElevator() {
     public void registerBlockIcons(IIconRegister iconRegister) {
         IconSECasing0 = iconRegister.registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/BaseCasing");
         IconSECasing1[0] = iconRegister
-                .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/SupportStructure");
+            .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/SupportStructure");
         IconSECasing1[1] = iconRegister
-                .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/SupportStructure_Side");
+            .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/SupportStructure_Side");
         IconSECasing2[0] = iconRegister
-                .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/InternalStructure");
+            .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/InternalStructure");
         IconSECasing2[1] = iconRegister
-                .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/InternalStructure_Side");
+            .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/InternalStructure_Side");
     }
 
     /**

src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockSpaceElevatorCable.java

@@ -51,7 +51,7 @@ public void registerBlockIcons(IIconRegister register) {
         motorGlow = register.registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/motorGlow");
         for (int i = 1; i < LIGHT_STEPS + 1; i++) {
             textures[i + 1] = register
-                    .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/cable/CableLightBlinking" + i);
+                .registerIcon(GTNHIntergalactic.ASSET_PREFIX + ":spaceElevator/cable/CableLightBlinking" + i);
         }
     }
 

src/main/java/com/gtnewhorizons/gtnhintergalactic/client/TooltipUtil.java

@@ -28,32 +28,32 @@ public class TooltipUtil {
      */
     public static void postInit() {
         Supplier<String> AUTHOR_GLOWREDMAN = chain(
-                translatedText("ig.structure.author"),
-                text(": "),
-                animatedText(
-                        "glowredman",
-                        1,
-                        300,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE,
-                        DARK_BLUE + OBFUSCATED));
+            translatedText("ig.structure.author"),
+            text(": "),
+            animatedText(
+                "glowredman",
+                1,
+                300,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE,
+                DARK_BLUE + OBFUSCATED));
 
         addItemTooltip(IGItems.PlanetaryGasSiphon, AUTHOR_GLOWREDMAN);
         addItemTooltip(IGItems.DysonSwarmController, AUTHOR_GLOWREDMAN);

src/main/java/com/gtnewhorizons/gtnhintergalactic/config/IGConfig.java

@@ -30,22 +30,22 @@ public static class SpaceElevator {
     public static class DysonSwarm {
 
         @Config.Comment({ "Each hour, n of m modules are destroyed according to this formula:",
-                " n = m * (2 * base_chance) / (exp(-a * (m - 1))+exp(b * cps)), where cps is computation per second.",
-                "This sets the parameter a." })
+            " n = m * (2 * base_chance) / (exp(-a * (m - 1))+exp(b * cps)), where cps is computation per second.",
+            "This sets the parameter a." })
         @Config.DefaultDouble(0.00005)
         @Config.RangeDouble(min = 0, max = 1)
         @Config.RequiresMcRestart
         public double destroyModuleA;
         @Config.Comment({ "Each hour, n of m modules are destroyed according to this formula:",
-                " n = m * (2 * base_chance) / (exp(-a * (m - 1))+exp(b * cps)), where cps is computation per second.",
-                "This sets the parameter b." })
+            " n = m * (2 * base_chance) / (exp(-a * (m - 1))+exp(b * cps)), where cps is computation per second.",
+            "This sets the parameter b." })
         @Config.DefaultDouble(0.00003)
         @Config.RangeDouble(min = 0, max = 1)
         @Config.RequiresMcRestart
         public double destroyModuleB;
         @Config.Comment({ "Each hour, n of m modules are destroyed according to this formula:",
-                " n = m * (2 * base_chance) / (exp(-a * (m - 1))+exp(b * cps)), where cps is computation per second.",
-                "This sets the parameter base_chance." })
+            " n = m * (2 * base_chance) / (exp(-a * (m - 1))+exp(b * cps)), where cps is computation per second.",
+            "This sets the parameter base_chance." })
         @Config.DefaultDouble(0.066)
         @Config.RangeDouble(min = 0, max = 1)
         @Config.RequiresMcRestart
@@ -66,54 +66,54 @@ public static class DysonSwarm {
         @Config.RequiresMcRestart
         public int euPerModule;
         @Config.Comment({ "Define a power factor for each dimension ID.",
-                "The total energy output of Dyson Swarm multiblocks is multiplied by these values.",
-                "Format is \"DIMID:FACTOR\"", "DIMIDs for Space Stations are \"SS_unlocalizedNameOfBodyToOrbit\"",
-                "DIMIDs for Utility Worlds dimensions are \"UW_Garden\", \"UW_Mining\" and \"UW_Void\"" })
+            "The total energy output of Dyson Swarm multiblocks is multiplied by these values.",
+            "Format is \"DIMID:FACTOR\"", "DIMIDs for Space Stations are \"SS_unlocalizedNameOfBodyToOrbit\"",
+            "DIMIDs for Utility Worlds dimensions are \"UW_Garden\", \"UW_Mining\" and \"UW_Void\"" })
         @Config.DefaultStringList({ "0:1.0", // Overworld
-                "25:0.15", // Makemake
-                "28:1.0", // Moon
-                "29:0.81", // Mars
-                "30:0.61", // Asteroids
-                "31:2.28", // A Centauri Bb
-                "32:2.31", // Barnarda C
-                "33:0.16", // Kuiper Belt
-                "35:0.44", // Europa
-                "36:0.44", // Io
-                "37:1.61", // Mercury
-                "38:0.81", // Phobos
-                "39:1.76", // Venus
-                "40:0.81", // Deimos
-                "41:0.32", // Enceladus
-                "42:0.6", // Ceres
-                "43:0.44", // Ganymede
-                "44:0.32", // Titan
-                "45:0.32", // Callisto
-                "46:0.23", // Oberon
-                "47:0.23", // Proteus
-                "48:0.18", // Triton
-                "49:0.16", // Pluto
-                "63:1.12", // Ross128ba
-                "64:1.12", // Ross128b
-                "81:1.41", // Barnarda E
-                "82:1.26", // Barnarda F
-                "83:0.15", // Haumea
-                "84:1.98", // Vega B
-                "85:1.34", // T Ceti E
-                "86:0.23", // Miranda
-                "90:2.28", // Neper
-                "91:1.98", // Maahes
-                "92:1.81", // Anubis
-                "93:3.37", // Horus
-                "94:1.98", // Seth
-                "95:2.11", // Mehen
-                "SS_Overworld:1.1", // Earth Space Station
-                "SS_planet.mars:0.89", // Mars Space Station
-                "SS_planet.venus:1.94", // Venus Space Station
-                "SS_planet.jupiter:0.48", // Jupiter Space Station
-                "SS_planet.saturn:0.36", // Saturn Space Station
-                "SS_planet.uranus:0.25", // Uranus Space Station
-                "SS_planet.neptune:0.2", // Neptune Space Station
-                "PS:0.01", // Personal Space dimensions
+            "25:0.15", // Makemake
+            "28:1.0", // Moon
+            "29:0.81", // Mars
+            "30:0.61", // Asteroids
+            "31:2.28", // A Centauri Bb
+            "32:2.31", // Barnarda C
+            "33:0.16", // Kuiper Belt
+            "35:0.44", // Europa
+            "36:0.44", // Io
+            "37:1.61", // Mercury
+            "38:0.81", // Phobos
+            "39:1.76", // Venus
+            "40:0.81", // Deimos
+            "41:0.32", // Enceladus
+            "42:0.6", // Ceres
+            "43:0.44", // Ganymede
+            "44:0.32", // Titan
+            "45:0.32", // Callisto
+            "46:0.23", // Oberon
+            "47:0.23", // Proteus
+            "48:0.18", // Triton
+            "49:0.16", // Pluto
+            "63:1.12", // Ross128ba
+            "64:1.12", // Ross128b
+            "81:1.41", // Barnarda E
+            "82:1.26", // Barnarda F
+            "83:0.15", // Haumea
+            "84:1.98", // Vega B
+            "85:1.34", // T Ceti E
+            "86:0.23", // Miranda
+            "90:2.28", // Neper
+            "91:1.98", // Maahes
+            "92:1.81", // Anubis
+            "93:3.37", // Horus
+            "94:1.98", // Seth
+            "95:2.11", // Mehen
+            "SS_Overworld:1.1", // Earth Space Station
+            "SS_planet.mars:0.89", // Mars Space Station
+            "SS_planet.venus:1.94", // Venus Space Station
+            "SS_planet.jupiter:0.48", // Jupiter Space Station
+            "SS_planet.saturn:0.36", // Saturn Space Station
+            "SS_planet.uranus:0.25", // Uranus Space Station
+            "SS_planet.neptune:0.2", // Neptune Space Station
+            "PS:0.01", // Personal Space dimensions
         })
         @Config.RequiresMcRestart
         public String[] powerFactors;

src/main/java/com/gtnewhorizons/gtnhintergalactic/gui/IG_UITextures.java

@@ -12,53 +12,53 @@
 public class IG_UITextures {
 
     public static final UITexture PROGRESSBAR_SPACE_MINING_MODULE_ARROW = UITexture
-            .fullImage(ASSET_PREFIX, "gui/progressbar/space_mining_module_arrow.png");
+        .fullImage(ASSET_PREFIX, "gui/progressbar/space_mining_module_arrow.png");
 
     public static final UITexture OVERLAY_BUTTON_PLANET_TELEPORT = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/planet_teleport.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/planet_teleport.png");
 
     public static final UITexture OVERLAY_BUTTON_PROJECTS = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/projects.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/projects.png");
 
     public static final UITexture OVERLAY_BUTTON_CROSS = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/cross.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/cross.png");
 
     public static final UITexture OVERLAY_BUTTON_OPTIONS = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/options.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/options.png");
 
     public static final UITexture OVERLAY_BUTTON_CONFIGURE = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/configure.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/configure.png");
 
     public static final UITexture OVERLAY_BUTTON_BLACKLIST = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/blacklist.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/blacklist.png");
 
     public static final UITexture OVERLAY_BUTTON_WHITELIST = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/whitelist.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/whitelist.png");
 
     public static final UITexture OVERLAY_BUTTON_SPACE_ELEVATOR_EXTENSION_ENABLED = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/space_elevator_extension_enabled.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/space_elevator_extension_enabled.png");
 
     public static final UITexture OVERLAY_BUTTON_SPACE_ELEVATOR_EXTENSION_DISABLED = UITexture
-            .fullImage(ASSET_PREFIX, "gui/overlay_button/space_elevator_extension_disabled.png");
+        .fullImage(ASSET_PREFIX, "gui/overlay_button/space_elevator_extension_disabled.png");
 
     public static final UITexture PICTURE_ELEVATOR_LOGO = UITexture
-            .fullImage(ASSET_PREFIX, "gui/picture/space_elevator_logo.png");
+        .fullImage(ASSET_PREFIX, "gui/picture/space_elevator_logo.png");
 
     public static final UITexture PICTURE_ELEVATOR_LOGO_DARK = UITexture
-            .fullImage(ASSET_PREFIX, "gui/picture/space_elevator_logo_dark.png");
+        .fullImage(ASSET_PREFIX, "gui/picture/space_elevator_logo_dark.png");
 
     public static final UITexture BACKGROUND_SPACE_WITH_STARS = UITexture
-            .fullImage(ASSET_PREFIX, "gui/background/space_with_stars.png");
+        .fullImage(ASSET_PREFIX, "gui/background/space_with_stars.png");
 
     public static final UITexture PICTURE_CELESTIAL_BODY_NEPTUNE = UITexture
-            .fullImage("galaxyspace", "gui/celestialbodies/neptune.png");
+        .fullImage("galaxyspace", "gui/celestialbodies/neptune.png");
 
     public static final UITexture PICTURE_CELESTIAL_BODY_PROTEUS = UITexture
-            .fullImage("galaxyspace", "gui/celestialbodies/proteus.png");
+        .fullImage("galaxyspace", "gui/celestialbodies/proteus.png");
 
     public static final UITexture PICTURE_SPACE_PROJECT_PLANETARY_SCAN = UITexture
-            .fullImage(ASSET_PREFIX, "gui/solarsystem/space_project_planetary_scan.png");
+        .fullImage(ASSET_PREFIX, "gui/solarsystem/space_project_planetary_scan.png");
 
     public static final UITexture PICTURE_SPACE_PROJECT_ASTEROID_OUTPOST = UITexture
-            .fullImage(ASSET_PREFIX, "gui/solarsystem/space_project_asteroid_outpost.png");
+        .fullImage(ASSET_PREFIX, "gui/solarsystem/space_project_asteroid_outpost.png");
 }