diff --git a/gradle.properties b/gradle.properties index 213e42c..e74c319 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/GTNHIntergalactic.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/GTNHIntergalactic.java index b57c216..0377938 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/GTNHIntergalactic.java +++ b/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); diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockCasingDysonSwarm.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockCasingDysonSwarm.java index 023f7ed..a47dc13 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockCasingDysonSwarm.java +++ b/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; } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockCasingSpaceElevator.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockCasingSpaceElevator.java index a8a32e2..61cf958 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockCasingSpaceElevator.java +++ b/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"); } /** diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockSpaceElevatorCable.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockSpaceElevatorCable.java index 8b45943..159b315 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/block/BlockSpaceElevatorCable.java +++ b/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); } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/client/TooltipUtil.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/client/TooltipUtil.java index 1c692c2..4aa28fe 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/client/TooltipUtil.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/client/TooltipUtil.java @@ -28,32 +28,32 @@ public class TooltipUtil { */ public static void postInit() { Supplier 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); diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/config/IGConfig.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/config/IGConfig.java index 65d5009..ca15f1a 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/config/IGConfig.java +++ b/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; diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/gui/IG_UITextures.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/gui/IG_UITextures.java index f87c701..31dc10f 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/gui/IG_UITextures.java +++ b/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"); } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemBlockSpaceElevatorCable.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemBlockSpaceElevatorCable.java index c608e51..1d8098d 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemBlockSpaceElevatorCable.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemBlockSpaceElevatorCable.java @@ -50,7 +50,7 @@ public String getUnlocalizedName(ItemStack stack) { public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean f3_h) { tooltip.add(GCCoreUtil.translate("gt.blockcasings.ig.cable.desc0")); tooltip.add( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockcasings.ig.cable.desc1")); + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockcasings.ig.cable.desc1")); } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingDysonSwarm.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingDysonSwarm.java index 4fd1586..9c69b12 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingDysonSwarm.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingDysonSwarm.java @@ -19,7 +19,7 @@ public ItemCasingDysonSwarm(Block block) { @Override public String getUnlocalizedName(ItemStack stack) { return "tile.DysonSwarm" - + BlockCasingDysonSwarm.names[stack.getItemDamage() % BlockCasingDysonSwarm.names.length]; + + BlockCasingDysonSwarm.names[stack.getItemDamage() % BlockCasingDysonSwarm.names.length]; } @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingSpaceElevator.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingSpaceElevator.java index 5286b1d..6ac393a 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingSpaceElevator.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingSpaceElevator.java @@ -37,10 +37,10 @@ public ItemCasingSpaceElevator(Block block) { @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List tooltip, - boolean f3_h) { + boolean f3_h) { tooltip.add(GCCoreUtil.translate("gt.blockcasings.ig." + stack.getItemDamage() + ".desc0")); tooltip.add( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockcasings.ig." + stack.getItemDamage() + ".desc1")); + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockcasings.ig." + stack.getItemDamage() + ".desc1")); } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingSpaceElevatorMotor.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingSpaceElevatorMotor.java index cc7f81e..d36970f 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingSpaceElevatorMotor.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemCasingSpaceElevatorMotor.java @@ -39,14 +39,14 @@ public ItemCasingSpaceElevatorMotor(Block block) { @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack stack, EntityPlayer player, @SuppressWarnings("rawtypes") List tooltip, - boolean f3_h) { + boolean f3_h) { tooltip.add(GCCoreUtil.translate("gt.blockcasings.ig.motor.desc0")); tooltip.add( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockcasings.ig.motor.t" + (stack.getItemDamage() + 1) + ".desc1")); + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockcasings.ig.motor.t" + (stack.getItemDamage() + 1) + ".desc1")); tooltip.add( - String.format( - GCCoreUtil.translate("gt.blockcasings.ig.motor.desc2"), - ElevatorUtil.getModuleSlotsUnlocked(stack.getItemDamage() + 1))); + String.format( + GCCoreUtil.translate("gt.blockcasings.ig.motor.desc2"), + ElevatorUtil.getModuleSlotsUnlocked(stack.getItemDamage() + 1))); } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemDysonSwarmParts.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemDysonSwarmParts.java index 9ebe3aa..7261b79 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemDysonSwarmParts.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemDysonSwarmParts.java @@ -13,7 +13,7 @@ public class ItemDysonSwarmParts extends Item { private static final String[] names = { "dysonSwarmModule", "TaHfCNanofibers", "NtNanofibers", "UHTResistantMesh", - "TaHfNanoparticles", "NtNanoparticles" }; + "TaHfNanoparticles", "NtNanoparticles" }; private static final IIcon[] icons = new IIcon[names.length]; public ItemDysonSwarmParts() { diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemMiningDrones.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemMiningDrones.java index 6aa3cc9..8104c86 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemMiningDrones.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/item/ItemMiningDrones.java @@ -22,8 +22,8 @@ public class ItemMiningDrones extends Item { /** Names of the mining drones */ private static final String[] NAMES = new String[] { "MiningDroneLV", "MiningDroneMV", "MiningDroneHV", - "MiningDroneEV", "MiningDroneIV", "MiningDroneLuV", "MiningDroneZPM", "MiningDroneUV", "MiningDroneUHV", - "MiningDroneUEV", "MiningDroneUIV", "MiningDroneUMV", "MiningDroneUXV", "MiningDroneMAX" }; + "MiningDroneEV", "MiningDroneIV", "MiningDroneLuV", "MiningDroneZPM", "MiningDroneUV", "MiningDroneUHV", + "MiningDroneUEV", "MiningDroneUIV", "MiningDroneUMV", "MiningDroneUXV", "MiningDroneMAX" }; /** Icons of the mining drones */ private static final IIcon[] ICONS = new IIcon[NAMES.length]; diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/loader/MachineLoader.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/loader/MachineLoader.java index 1d67d6b..34503c4 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/loader/MachineLoader.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/loader/MachineLoader.java @@ -42,69 +42,69 @@ public class MachineLoader implements Runnable { public void run() { IGItems.PlanetaryGasSiphon = new TileEntityPlanetaryGasSiphon( - PlanetaryGasSiphonController.ID, - "PlanetaryGasSiphon", - GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.name")).getStackForm(1); + PlanetaryGasSiphonController.ID, + "PlanetaryGasSiphon", + GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.name")).getStackForm(1); IGItems.DysonSwarmController = new TileEntityDysonSwarm( - DysonSwarmController.ID, - "DysonSwarm", - GCCoreUtil.translate("gt.blockmachines.multimachine.ig.dyson.name")).getStackForm(1); + DysonSwarmController.ID, + "DysonSwarm", + GCCoreUtil.translate("gt.blockmachines.multimachine.ig.dyson.name")).getStackForm(1); // TODO populate ItemList field for this (and Siphon above)? IGItems.SpaceElevatorController = new TileEntitySpaceElevator( - SpaceElevatorController.ID, - "SpaceElevator", - GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.name")).getStackForm(1); + SpaceElevatorController.ID, + "SpaceElevator", + GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.name")).getStackForm(1); ItemList.SpaceElevatorController.set(IGItems.SpaceElevatorController); IGItems.SpaceElevatorModuleAssemblerT1 = new TileEntityModuleAssembler.TileEntityModuleAssemblerT1( - SpaceElevatorModuleAssemblerT1.ID, - "ProjectModuleAssemblerT1", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t1.name")).getStackForm(1); + SpaceElevatorModuleAssemblerT1.ID, + "ProjectModuleAssemblerT1", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t1.name")).getStackForm(1); IGItems.SpaceElevatorModuleAssemblerT2 = new TileEntityModuleAssembler.TileEntityModuleAssemblerT2( - SpaceElevatorModuleAssemblerT2.ID, - "ProjectModuleAssemblerT2", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t2.name")).getStackForm(1); + SpaceElevatorModuleAssemblerT2.ID, + "ProjectModuleAssemblerT2", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t2.name")).getStackForm(1); IGItems.SpaceElevatorModuleAssemblerT3 = new TileEntityModuleAssembler.TileEntityModuleAssemblerT3( - SpaceElevatorModuleAssemblerT3.ID, - "ProjectModuleAssemblerT3", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t3.name")).getStackForm(1); + SpaceElevatorModuleAssemblerT3.ID, + "ProjectModuleAssemblerT3", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t3.name")).getStackForm(1); IGItems.SpaceElevatorModuleMinerT1 = new TileEntityModuleMiner.TileEntityModuleMinerT1( - SpaceElevatorModuleMinerT1.ID, - "ProjectModuleMinerT1", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t1.name")).getStackForm(1); + SpaceElevatorModuleMinerT1.ID, + "ProjectModuleMinerT1", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t1.name")).getStackForm(1); IGItems.SpaceElevatorModuleMinerT2 = new TileEntityModuleMiner.TileEntityModuleMinerT2( - SpaceElevatorModuleMinerT2.ID, - "ProjectModuleMinerT2", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t2.name")).getStackForm(1); + SpaceElevatorModuleMinerT2.ID, + "ProjectModuleMinerT2", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t2.name")).getStackForm(1); IGItems.SpaceElevatorModuleMinerT3 = new TileEntityModuleMiner.TileEntityModuleMinerT3( - SpaceElevatorModuleMinerT3.ID, - "ProjectModuleMinerT3", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t3.name")).getStackForm(1); + SpaceElevatorModuleMinerT3.ID, + "ProjectModuleMinerT3", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t3.name")).getStackForm(1); IGItems.SpaceElevatorModulePumpT1 = new TileEntityModulePump.TileEntityModulePumpT1( - SpaceElevatorModulePumpT1.ID, - "ProjectModulePumpT1", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t1.name")).getStackForm(1); + SpaceElevatorModulePumpT1.ID, + "ProjectModulePumpT1", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t1.name")).getStackForm(1); IGItems.SpaceElevatorModulePumpT2 = new TileEntityModulePump.TileEntityModulePumpT2( - SpaceElevatorModulePumpT2.ID, - "ProjectModulePumpT2", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.name")).getStackForm(1); + SpaceElevatorModulePumpT2.ID, + "ProjectModulePumpT2", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.name")).getStackForm(1); IGItems.SpaceElevatorModulePumpT3 = new TileEntityModulePump.TileEntityModulePumpT3( - SpaceElevatorModulePumpT3.ID, - "ProjectModulePumpT3", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t3.name")).getStackForm(1); + SpaceElevatorModulePumpT3.ID, + "ProjectModulePumpT3", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t3.name")).getStackForm(1); IGItems.SpaceElevatorModuleManager = new TileEntityModuleManager( - SpaceElevatorModuleManager.ID, - "ProjectModuleManager", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.manager.t1.name")).getStackForm(1); + SpaceElevatorModuleManager.ID, + "ProjectModuleManager", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.manager.t1.name")).getStackForm(1); IGItems.SpaceElevatorModuleResearch = new TileEntityModuleResearch( - SpaceElevatorModuleResearch.ID, - "ProjectModuleResearch", - GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.research.t1.name")).getStackForm(1); + SpaceElevatorModuleResearch.ID, + "ProjectModuleResearch", + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.research.t1.name")).getStackForm(1); } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/GasSiphonRecipeHandler.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/GasSiphonRecipeHandler.java index b751850..eda0fcf 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/GasSiphonRecipeHandler.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/GasSiphonRecipeHandler.java @@ -58,11 +58,13 @@ public class GasSiphonRecipeHandler extends TemplateRecipeHandler { * Initialize the handler for gas siphons recipes */ public GasSiphonRecipeHandler() { - modularWindow = ModularWindow.builder(170, 82).setBackground(GTUITextures.BACKGROUND_NEI_SINGLE_RECIPE) - .widget( - new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO).setSize(17, 17) - .setPos(new Pos2d(147, 52))) - .build(); + modularWindow = ModularWindow.builder(170, 82) + .setBackground(GTUITextures.BACKGROUND_NEI_SINGLE_RECIPE) + .widget( + new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO) + .setSize(17, 17) + .setPos(new Pos2d(147, 52))) + .build(); UIInfos.initializeWindow(Minecraft.getMinecraft().thePlayer, modularWindow); } @@ -93,9 +95,9 @@ public String getGuiTexture() { public void loadTransferRects() { int stringLength = GuiDraw.getStringWidth(I18n.format(SEE_ALL)); transferRects.add( - new RecipeTransferRect( - new Rectangle(getGuiWidth() - stringLength - 3, 10 + 16, stringLength, 9), - getOutputId())); + new RecipeTransferRect( + new Rectangle(getGuiWidth() - stringLength - 3, 10 + 16, stringLength, 9), + getOutputId())); } /** @@ -117,13 +119,15 @@ public int getGuiWidth() { public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals(getOutputId())) { for (Map.Entry> entry : GasSiphonRecipes.RECIPES.entrySet()) { - for (Map.Entry innerEntry : entry.getValue().entrySet()) { + for (Map.Entry innerEntry : entry.getValue() + .entrySet()) { arecipes.add( - new CachedSiphonRecipe( - entry.getKey(), - innerEntry.getKey(), - innerEntry.getValue().getFluid(), - innerEntry.getValue().amount)); + new CachedSiphonRecipe( + entry.getKey(), + innerEntry.getKey(), + innerEntry.getValue() + .getFluid(), + innerEntry.getValue().amount)); } } } else { @@ -179,14 +183,16 @@ public void loadCraftingRecipes(ItemStack result) { if (fluid == null) return; for (Map.Entry> entry : GasSiphonRecipes.RECIPES.entrySet()) { - for (Map.Entry innerEntry : entry.getValue().entrySet()) { - if (innerEntry.getValue().isFluidEqual(new FluidStack(fluid, 0))) { + for (Map.Entry innerEntry : entry.getValue() + .entrySet()) { + if (innerEntry.getValue() + .isFluidEqual(new FluidStack(fluid, 0))) { arecipes.add( - new CachedSiphonRecipe( - entry.getKey(), - innerEntry.getKey(), - fluid, - innerEntry.getValue().amount)); + new CachedSiphonRecipe( + entry.getKey(), + innerEntry.getKey(), + fluid, + innerEntry.getValue().amount)); } } } @@ -199,19 +205,15 @@ public void loadCraftingRecipes(ItemStack result) { */ @Override public void drawExtras(int recipeIndex) { - GuiDraw.drawStringC( - I18n.format("ig.nei.siphon.planet") + ":", - CATEGORY_TITLE_X, - PLANET_TYPE_Y, - TEXT_COLOR, - false); + GuiDraw + .drawStringC(I18n.format("ig.nei.siphon.planet") + ":", CATEGORY_TITLE_X, PLANET_TYPE_Y, TEXT_COLOR, false); GuiDraw.drawStringC(I18n.format("ig.nei.siphon.depth") + ":", CATEGORY_TITLE_X, GAS_TYPE_Y, TEXT_COLOR, false); GuiDraw.drawStringC( - I18n.format("ig.nei.elevatorpump.amount") + ":", - CATEGORY_TITLE_X, - OUT_AMOUNT_Y, - TEXT_COLOR, - false); + I18n.format("ig.nei.elevatorpump.amount") + ":", + CATEGORY_TITLE_X, + OUT_AMOUNT_Y, + TEXT_COLOR, + false); CachedSiphonRecipe recipe = (CachedSiphonRecipe) this.arecipes.get(recipeIndex); GuiDraw.drawStringC(GCCoreUtil.translate(recipe.planet), CATEGORY_VALUE_X, PLANET_TYPE_Y, TEXT_COLOR, false); @@ -219,11 +221,11 @@ public void drawExtras(int recipeIndex) { GuiDraw.drawStringC(GTUtility.formatNumbers(recipe.amount), CATEGORY_VALUE_X, OUT_AMOUNT_Y, TEXT_COLOR, false); GuiDraw.drawStringR( - EnumChatFormatting.BOLD + I18n.format(SEE_ALL), - getGuiWidth() - 3, - OUT_AMOUNT_Y, - TEXT_COLOR, - false); + EnumChatFormatting.BOLD + I18n.format(SEE_ALL), + getGuiWidth() - 3, + OUT_AMOUNT_Y, + TEXT_COLOR, + false); } /** diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/NEI_IG_Config.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/NEI_IG_Config.java index bd25efa..55a3fcb 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/NEI_IG_Config.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/NEI_IG_Config.java @@ -26,14 +26,14 @@ public void loadConfig() { API.registerUsageHandler(new GasSiphonRecipeHandler()); for (ItemStack pump : Arrays.asList( - IGItems.SpaceElevatorModulePumpT1, - IGItems.SpaceElevatorModulePumpT2, - IGItems.SpaceElevatorModulePumpT3)) { + IGItems.SpaceElevatorModulePumpT1, + IGItems.SpaceElevatorModulePumpT2, + IGItems.SpaceElevatorModulePumpT3)) { API.addRecipeCatalyst(pump, "com.gtnewhorizons.gtnhintergalactic.nei.SpacePumpModuleRecipeHandler"); } API.addRecipeCatalyst( - IGItems.PlanetaryGasSiphon, - "com.gtnewhorizons.gtnhintergalactic.nei.GasSiphonRecipeHandler"); + IGItems.PlanetaryGasSiphon, + "com.gtnewhorizons.gtnhintergalactic.nei.GasSiphonRecipeHandler"); executed = true; } @@ -41,17 +41,25 @@ public void loadConfig() { @SubscribeEvent public void registerHandlerInfo(NEIRegisterHandlerInfosEvent event) { event.registerHandlerInfo( - new HandlerInfo.Builder( - "com.gtnewhorizons.gtnhintergalactic.nei.SpacePumpModuleRecipeHandler", - GTNHIntergalactic.MODNAME, - GTNHIntergalactic.MODID).setDisplayStack(IGItems.SpaceElevatorModulePumpT1).setShiftY(6) - .setWidth(160).setHeight(90).setMaxRecipesPerPage(3).build()); + new HandlerInfo.Builder( + "com.gtnewhorizons.gtnhintergalactic.nei.SpacePumpModuleRecipeHandler", + GTNHIntergalactic.MODNAME, + GTNHIntergalactic.MODID).setDisplayStack(IGItems.SpaceElevatorModulePumpT1) + .setShiftY(6) + .setWidth(160) + .setHeight(90) + .setMaxRecipesPerPage(3) + .build()); event.registerHandlerInfo( - new HandlerInfo.Builder( - "com.gtnewhorizons.gtnhintergalactic.nei.GasSiphonRecipeHandler", - GTNHIntergalactic.MODNAME, - GTNHIntergalactic.MODID).setDisplayStack(IGItems.PlanetaryGasSiphon).setShiftY(6).setWidth(160) - .setHeight(90).setMaxRecipesPerPage(3).build()); + new HandlerInfo.Builder( + "com.gtnewhorizons.gtnhintergalactic.nei.GasSiphonRecipeHandler", + GTNHIntergalactic.MODNAME, + GTNHIntergalactic.MODID).setDisplayStack(IGItems.PlanetaryGasSiphon) + .setShiftY(6) + .setWidth(160) + .setHeight(90) + .setMaxRecipesPerPage(3) + .build()); } @Override diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/SpacePumpModuleRecipeHandler.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/SpacePumpModuleRecipeHandler.java index db16c8a..aa37377 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/SpacePumpModuleRecipeHandler.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/nei/SpacePumpModuleRecipeHandler.java @@ -59,11 +59,13 @@ public class SpacePumpModuleRecipeHandler extends TemplateRecipeHandler { * Initialize the handler for space pumping recipes */ public SpacePumpModuleRecipeHandler() { - modularWindow = ModularWindow.builder(170, 82).setBackground(GTUITextures.BACKGROUND_NEI_SINGLE_RECIPE) - .widget( - new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO).setSize(17, 17) - .setPos(new Pos2d(147, 52))) - .build(); + modularWindow = ModularWindow.builder(170, 82) + .setBackground(GTUITextures.BACKGROUND_NEI_SINGLE_RECIPE) + .widget( + new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO) + .setSize(17, 17) + .setPos(new Pos2d(147, 52))) + .build(); UIInfos.initializeWindow(Minecraft.getMinecraft().thePlayer, modularWindow); } @@ -94,9 +96,9 @@ public String getGuiTexture() { public void loadTransferRects() { int stringLength = GuiDraw.getStringWidth(I18n.format(SEE_ALL)); transferRects.add( - new RecipeTransferRect( - new Rectangle(getGuiWidth() - stringLength - 3, 10 + 16, stringLength, 9), - getOutputId())); + new RecipeTransferRect( + new Rectangle(getGuiWidth() - stringLength - 3, 10 + 16, stringLength, 9), + getOutputId())); } /** @@ -119,11 +121,14 @@ public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals(getOutputId())) { for (Map.Entry, FluidStack> entry : SpacePumpingRecipes.RECIPES.entrySet()) { arecipes.add( - new CachedPumpRecipe( - entry.getKey().getLeft(), - entry.getKey().getRight(), - entry.getValue().getFluid(), - entry.getValue().amount)); + new CachedPumpRecipe( + entry.getKey() + .getLeft(), + entry.getKey() + .getRight(), + entry.getValue() + .getFluid(), + entry.getValue().amount)); } } else { super.loadCraftingRecipes(outputId, results); @@ -178,13 +183,16 @@ public void loadCraftingRecipes(ItemStack result) { if (fluid == null) return; for (Map.Entry, FluidStack> entry : SpacePumpingRecipes.RECIPES.entrySet()) { - if (entry.getValue().isFluidEqual(new FluidStack(fluid, 0))) { + if (entry.getValue() + .isFluidEqual(new FluidStack(fluid, 0))) { arecipes.add( - new CachedPumpRecipe( - entry.getKey().getLeft(), - entry.getKey().getRight(), - fluid, - entry.getValue().amount)); + new CachedPumpRecipe( + entry.getKey() + .getLeft(), + entry.getKey() + .getRight(), + fluid, + entry.getValue().amount)); } } } @@ -197,23 +205,23 @@ public void loadCraftingRecipes(ItemStack result) { @Override public void drawExtras(int recipeIndex) { GuiDraw.drawStringC( - I18n.format("ig.nei.elevatorpump.planettype") + ":", - CATEGORY_TITLE_X, - PLANET_TYPE_Y, - TEXT_COLOR, - false); + I18n.format("ig.nei.elevatorpump.planettype") + ":", + CATEGORY_TITLE_X, + PLANET_TYPE_Y, + TEXT_COLOR, + false); GuiDraw.drawStringC( - I18n.format("ig.nei.elevatorpump.gastype") + ":", - CATEGORY_TITLE_X, - GAS_TYPE_Y, - TEXT_COLOR, - false); + I18n.format("ig.nei.elevatorpump.gastype") + ":", + CATEGORY_TITLE_X, + GAS_TYPE_Y, + TEXT_COLOR, + false); GuiDraw.drawStringC( - I18n.format("ig.nei.elevatorpump.amount") + ":", - CATEGORY_TITLE_X, - OUT_AMOUNT_Y, - TEXT_COLOR, - false); + I18n.format("ig.nei.elevatorpump.amount") + ":", + CATEGORY_TITLE_X, + OUT_AMOUNT_Y, + TEXT_COLOR, + false); CachedPumpRecipe recipe = (CachedPumpRecipe) this.arecipes.get(recipeIndex); GuiDraw.drawStringC(Integer.toString(recipe.planetType), CATEGORY_VALUE_X, PLANET_TYPE_Y, TEXT_COLOR, false); @@ -221,11 +229,11 @@ public void drawExtras(int recipeIndex) { GuiDraw.drawStringC(GTUtility.formatNumbers(recipe.amount), CATEGORY_VALUE_X, OUT_AMOUNT_Y, TEXT_COLOR, false); GuiDraw.drawStringR( - EnumChatFormatting.BOLD + I18n.format(SEE_ALL), - getGuiWidth() - 3, - OUT_AMOUNT_Y, - TEXT_COLOR, - false); + EnumChatFormatting.BOLD + I18n.format(SEE_ALL), + getGuiWidth() - 3, + OUT_AMOUNT_Y, + TEXT_COLOR, + false); } /** diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/proxy/ClientProxy.java index 9ebb36f..dcb6b27 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/proxy/ClientProxy.java @@ -33,7 +33,7 @@ public void init(FMLInitializationEvent event) { BlockSpaceElevatorCable.setRenderID(RenderingRegistry.getNextAvailableRenderId()); RenderingRegistry.registerBlockHandler(BlockSpaceElevatorCable.getRenderID(), new RenderSpaceElevatorCable()); ClientRegistry - .bindTileEntitySpecialRenderer(TileEntitySpaceElevatorCable.class, new RenderSpaceElevatorCable()); + .bindTileEntitySpecialRenderer(TileEntitySpaceElevatorCable.class, new RenderSpaceElevatorCable()); new IGTextures().run(); MinecraftForge.EVENT_BUS.register(new NEI_IG_Config()); } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/GasSiphonRecipes.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/GasSiphonRecipes.java index 9b0a395..1280641 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/GasSiphonRecipes.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/GasSiphonRecipes.java @@ -6,7 +6,6 @@ import net.minecraftforge.fluids.FluidStack; import bartworks.system.material.WerkstoffLoader; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.Materials; /** @@ -39,19 +38,16 @@ public static void addPumpingRecipes() { // T5 (-> 0.5 to 2A of LuV) Map uranusRecipes = new HashMap<>(); uranusRecipes.put(1, Materials.Deuterium.getGas(5000)); + uranusRecipes.put(2, WerkstoffLoader.Neon.getFluidOrGas(450)); uranusRecipes.put(3, Materials.Argon.getGas(250)); + uranusRecipes.put(4, WerkstoffLoader.Krypton.getFluidOrGas(100)); // T6 (-> 0.5 to 2A of ZPM) Map neptuneRecipes = new HashMap<>(); neptuneRecipes.put(1, Materials.Tritium.getGas(3000)); neptuneRecipes.put(2, Materials.Helium_3.getGas(500)); neptuneRecipes.put(3, Materials.Ammonia.getGas(400)); - - if (Loader.isModLoaded("bartworks")) { - uranusRecipes.put(2, WerkstoffLoader.Neon.getFluidOrGas(450)); - uranusRecipes.put(4, WerkstoffLoader.Krypton.getFluidOrGas(100)); - neptuneRecipes.put(4, WerkstoffLoader.Xenon.getFluidOrGas(350)); - } + neptuneRecipes.put(4, WerkstoffLoader.Xenon.getFluidOrGas(350)); RECIPES.put("planet.jupiter", jupiterRecipes); RECIPES.put("planet.saturn", saturnRecipes); diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/IGRecipeMaps.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/IGRecipeMaps.java index d83ef01..564c3fc 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/IGRecipeMaps.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/IGRecipeMaps.java @@ -17,36 +17,56 @@ public class IGRecipeMaps { public static final RecipeMetadataKey MODULE_TIER = SimpleRecipeMetadataKey - .create(Integer.class, "space_elevator_module_tier"); + .create(Integer.class, "space_elevator_module_tier"); public static final RecipeMetadataKey SPACE_PROJECT = SimpleRecipeMetadataKey - .create(String.class, "space_project"); + .create(String.class, "space_project"); public static final RecipeMetadataKey SPACE_LOCATION = SimpleRecipeMetadataKey - .create(String.class, "space_project_location"); + .create(String.class, "space_project_location"); public static final RecipeMetadataKey SPACE_MINING_DATA = SimpleRecipeMetadataKey - .create(SpaceMiningData.class, "space_mining_data"); + .create(SpaceMiningData.class, "space_mining_data"); /** Recipe map for recipes in the Space Research Module */ public static final RecipeMap spaceResearchRecipes = RecipeMapBuilder - .of("gt.recipe.spaceResearch").maxIO(7, 1, 3, 0).minInputs(1, 0).logo(IG_UITextures.PICTURE_ELEVATOR_LOGO) - .logoSize(18, 18).neiTransferRect(110, 35, 18, 18).progressBarPos(110, 35) - .frontend(SpaceResearchFrontend::new).build(); + .of("gt.recipe.spaceResearch") + .maxIO(7, 1, 3, 0) + .minInputs(1, 0) + .logo(IG_UITextures.PICTURE_ELEVATOR_LOGO) + .logoSize(18, 18) + .neiTransferRect(110, 35, 18, 18) + .progressBarPos(110, 35) + .frontend(SpaceResearchFrontend::new) + .build(); /** Recipe map for recipes in the Space Assembler Module */ public static final RecipeMap spaceAssemblerRecipes = RecipeMapBuilder - .of("gt.recipe.spaceAssembler").maxIO(16, 1, 4, 0).minInputs(1, 0).logo(IG_UITextures.PICTURE_ELEVATOR_LOGO) - .logoSize(18, 18).neiTransferRect(124, 8, 16, 16) - .neiRecipeComparator( - Comparator.comparing(recipe -> recipe.getMetadataOrDefault(MODULE_TIER, 1)) - .thenComparing(GTRecipe::compareTo)) - .neiTransferRect(88, 8, 18, 72).neiTransferRect(124, 8, 18, 72).useCustomFilterForNEI() - .frontend(SpaceAssemblerFrontend::new).build(); + .of("gt.recipe.spaceAssembler") + .maxIO(16, 1, 4, 0) + .minInputs(1, 0) + .logo(IG_UITextures.PICTURE_ELEVATOR_LOGO) + .logoSize(18, 18) + .neiTransferRect(124, 8, 16, 16) + .neiRecipeComparator( + Comparator.comparing(recipe -> recipe.getMetadataOrDefault(MODULE_TIER, 1)) + .thenComparing(GTRecipe::compareTo)) + .neiTransferRect(88, 8, 18, 72) + .neiTransferRect(124, 8, 18, 72) + .useCustomFilterForNEI() + .frontend(SpaceAssemblerFrontend::new) + .build(); /** Recipe map for recipes in the Space Mining Module */ public static final RecipeMap spaceMiningRecipes = RecipeMapBuilder.of("gt.recipe.spaceMining") - .maxIO(5, 16, 2, 0).minInputs(1, 0) - .neiRecipeComparator( - Comparator.comparing(recipe -> recipe.getMetadataOrDefault(MODULE_TIER, 1)) - .thenComparing(GTRecipe::compareTo)) - .logo(IG_UITextures.PICTURE_ELEVATOR_LOGO).logoPos(151, 58).logoSize(18, 18) - .neiRecipeBackgroundSize(170, 78).neiTransferRect(46, 6, 23, 63).dontUseProgressBar() - .addSpecialTexture(46, 6, 23, 63, IG_UITextures.PROGRESSBAR_SPACE_MINING_MODULE_ARROW) - .useCustomFilterForNEI().frontend(SpaceMiningFrontend::new).build(); + .maxIO(5, 16, 2, 0) + .minInputs(1, 0) + .neiRecipeComparator( + Comparator.comparing(recipe -> recipe.getMetadataOrDefault(MODULE_TIER, 1)) + .thenComparing(GTRecipe::compareTo)) + .logo(IG_UITextures.PICTURE_ELEVATOR_LOGO) + .logoPos(151, 58) + .logoSize(18, 18) + .neiRecipeBackgroundSize(170, 78) + .neiTransferRect(46, 6, 23, 63) + .dontUseProgressBar() + .addSpecialTexture(46, 6, 23, 63, IG_UITextures.PROGRESSBAR_SPACE_MINING_MODULE_ARROW) + .useCustomFilterForNEI() + .frontend(SpaceMiningFrontend::new) + .build(); } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/IG_RecipeAdder.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/IG_RecipeAdder.java index 720f21a..7475b1d 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/IG_RecipeAdder.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/IG_RecipeAdder.java @@ -45,8 +45,8 @@ public static void postInit() { */ @Deprecated public static boolean addSpaceResearchRecipe(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, ItemStack output, - int computationRequiredPerSec, int duration, int EUt, String neededSpaceProject, - String neededSpaceProjectLocation) { + int computationRequiredPerSec, int duration, int EUt, String neededSpaceProject, + String neededSpaceProjectLocation) { GTRecipeBuilder builder = GTValues.RA.stdBuilder(); if (aItemInputs != null) { @@ -56,7 +56,10 @@ public static boolean addSpaceResearchRecipe(ItemStack[] aItemInputs, FluidStack builder.fluidInputs(aFluidInputs); } - builder.itemOutputs(output).specialValue(computationRequiredPerSec).duration(duration).eut(EUt); + builder.itemOutputs(output) + .specialValue(computationRequiredPerSec) + .duration(duration) + .eut(EUt); if (neededSpaceProject != null && !neededSpaceProject.isEmpty()) { builder.metadata(IGRecipeMaps.SPACE_PROJECT, neededSpaceProject); @@ -84,8 +87,7 @@ public static boolean addSpaceResearchRecipe(ItemStack[] aItemInputs, FluidStack */ @Deprecated public static boolean addSpaceAssemblerRecipe(ItemStack[] aItemInputs, FluidStack[] aFluidInputs, ItemStack output, - int requiredModuleTier, int duration, int EUt, String neededSpaceProject, - String neededSpaceProjectLocation) { + int requiredModuleTier, int duration, int EUt, String neededSpaceProject, String neededSpaceProjectLocation) { GTRecipeBuilder builder = GTValues.RA.stdBuilder(); if (aItemInputs != null) { @@ -95,7 +97,10 @@ public static boolean addSpaceAssemblerRecipe(ItemStack[] aItemInputs, FluidStac builder.fluidInputs(aFluidInputs); } - builder.itemOutputs(output).specialValue(requiredModuleTier).duration(duration).eut(EUt); + builder.itemOutputs(output) + .specialValue(requiredModuleTier) + .duration(duration) + .eut(EUt); if (neededSpaceProject != null && !neededSpaceProject.isEmpty()) { builder.metadata(IGRecipeMaps.SPACE_PROJECT, neededSpaceProject); @@ -128,9 +133,8 @@ public static boolean addSpaceAssemblerRecipe(ItemStack[] aItemInputs, FluidStac * @return True if recipes could be added, else false */ public static boolean addSpaceMiningRecipe(String asteroidName, ItemStack[] aItemInputs, FluidStack[] aFluidInputs, - int[] aChances, Materials[] ores, OrePrefixes orePrefixes, int minSize, int maxSize, int minDistance, - int maxDistance, int computationRequiredPerSec, int minModuleTier, int duration, int EUt, - int recipeWeight) { + int[] aChances, Materials[] ores, OrePrefixes orePrefixes, int minSize, int maxSize, int minDistance, + int maxDistance, int computationRequiredPerSec, int minModuleTier, int duration, int EUt, int recipeWeight) { if (ores == null) return false; // Map ores to actual items with stack minSize 64 @@ -140,25 +144,25 @@ public static boolean addSpaceMiningRecipe(String asteroidName, ItemStack[] aIte } return addSpaceMiningRecipe( - asteroidName, - aItemInputs, - aFluidInputs, - aChances, - outputs, - minSize, - maxSize, - minDistance, - maxDistance, - computationRequiredPerSec, - minModuleTier, - duration, - EUt, - recipeWeight); + asteroidName, + aItemInputs, + aFluidInputs, + aChances, + outputs, + minSize, + maxSize, + minDistance, + maxDistance, + computationRequiredPerSec, + minModuleTier, + duration, + EUt, + recipeWeight); } public static boolean addSpaceMiningRecipe(String asteroidName, ItemStack[] aItemInputs, FluidStack[] aFluidInputs, - int[] aChances, ItemStack[] aItemOutputs, int minSize, int maxSize, int minDistance, int maxDistance, - int computationRequiredPerSec, int minModuleTier, int duration, int EUt, int recipeWeight) { + int[] aChances, ItemStack[] aItemOutputs, int minSize, int maxSize, int minDistance, int maxDistance, + int computationRequiredPerSec, int minModuleTier, int duration, int EUt, int recipeWeight) { if ((aItemInputs == null && aFluidInputs == null) || aItemOutputs == null) { return false; } @@ -166,21 +170,22 @@ public static boolean addSpaceMiningRecipe(String asteroidName, ItemStack[] aIte return false; } if (recipeWeight <= 0) { - GTLog.err.println( - "Weight of mining recipe for main material " + aItemOutputs[0].getUnlocalizedName() + " is 0"); + GTLog.err + .println("Weight of mining recipe for main material " + aItemOutputs[0].getUnlocalizedName() + " is 0"); } if (aChances != null) { if (aChances.length < aItemOutputs.length) { return false; } else if (aChances.length > aItemOutputs.length) { GTLog.err.println( - "Chances and outputs of mining recipe for main material " + aItemOutputs[0].getUnlocalizedName() - + " have different length!"); + "Chances and outputs of mining recipe for main material " + aItemOutputs[0].getUnlocalizedName() + + " have different length!"); } - if (Arrays.stream(aChances).sum() != 10000) { + if (Arrays.stream(aChances) + .sum() != 10000) { GTLog.err.println( - "Sum of chances in mining recipe for main material " + aItemOutputs[0].getUnlocalizedName() - + " is not 100%! This will lead to no issue but might be unintentional"); + "Sum of chances in mining recipe for main material " + aItemOutputs[0].getUnlocalizedName() + + " is not 100%! This will lead to no issue but might be unintentional"); } } else { aChances = new int[aItemOutputs.length]; @@ -189,13 +194,13 @@ public static boolean addSpaceMiningRecipe(String asteroidName, ItemStack[] aIte // Create space mining data storage SpaceMiningData miningData = new SpaceMiningData( - asteroidName, - minDistance, - maxDistance, - minSize, - maxSize, - computationRequiredPerSec, - recipeWeight); + asteroidName, + minDistance, + maxDistance, + minSize, + maxSize, + computationRequiredPerSec, + recipeWeight); GTRecipeBuilder builder = GTValues.RA.stdBuilder(); @@ -206,9 +211,13 @@ public static boolean addSpaceMiningRecipe(String asteroidName, ItemStack[] aIte builder.fluidInputs(aFluidInputs); } - builder.itemOutputs(aItemOutputs).outputChances(aChances).metadata(IGRecipeMaps.MODULE_TIER, minModuleTier) - .metadata(IGRecipeMaps.SPACE_MINING_DATA, miningData).duration(duration).eut(EUt) - .addTo(IGRecipeMaps.spaceMiningRecipes); + builder.itemOutputs(aItemOutputs) + .outputChances(aChances) + .metadata(IGRecipeMaps.MODULE_TIER, minModuleTier) + .metadata(IGRecipeMaps.SPACE_MINING_DATA, miningData) + .duration(duration) + .eut(EUt) + .addTo(IGRecipeMaps.spaceMiningRecipes); return true; } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/MachineRecipes.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/MachineRecipes.java index 33091d0..6a9d860 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/MachineRecipes.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/MachineRecipes.java @@ -1,6 +1,9 @@ package com.gtnewhorizons.gtnhintergalactic.recipe; import static gregtech.api.enums.GTValues.RA; +import static gregtech.api.enums.Mods.GalacticraftAmunRa; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.OpenBlocks; import static gregtech.api.enums.TickTime.MINUTE; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; @@ -14,7 +17,6 @@ import com.gtnewhorizons.gtnhintergalactic.item.ItemMiningDrones; import bartworks.common.loaders.ItemRegistry; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.items.GGMaterial; import goodgenerator.util.ItemRefer; @@ -38,17 +40,17 @@ public class MachineRecipes implements Runnable { Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null - ? FluidRegistry.getFluid("molten.mutatedlivingsolder") - : FluidRegistry.getFluid("molten.solderingalloy"); + ? FluidRegistry.getFluid("molten.mutatedlivingsolder") + : FluidRegistry.getFluid("molten.solderingalloy"); Fluid solderLuV = FluidRegistry.getFluid("molten.indalloy140") != null - ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); @Override public void run() { // exit early if not in pack - if (!Loader.isModLoaded("dreamcraft")) return; + if (!NewHorizonsCoreMod.isModLoaded()) return; ItemStack hypogenFrameBox_8 = MaterialsElements.STANDALONE.HYPOGEN.getFrameBox(8); ItemStack hypogenScrew_32 = MaterialsElements.STANDALONE.HYPOGEN.getScrew(32); @@ -66,684 +68,686 @@ public void run() { // Planetary Gas Siphon Controller RecipeUtil.addRecipe( - IGItems.PlanetaryGasSiphon, - new Object[] { "MPM", "CTC", "HTH", 'M', ItemList.Electric_Motor_IV.get(1), 'P', - ItemList.Electric_Pump_IV.get(1), 'C', "circuitElite", 'T', - GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1), 'H', - ItemList.Hull_IV.get(1) }); + IGItems.PlanetaryGasSiphon, + new Object[] { "MPM", "CTC", "HTH", 'M', ItemList.Electric_Motor_IV.get(1), 'P', + ItemList.Electric_Pump_IV.get(1), 'C', "circuitElite", 'T', + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1), 'H', + ItemList.Hull_IV.get(1) }); // Space Elevator Controller TTRecipeAdder.addResearchableAssemblylineRecipe( - GTModHandler.getModItem("OpenBlocks", "elevator", 1, 0), - 256000, - 256, - 1000000, - 4, - new Object[] { GTModHandler.getModItem("OpenBlocks", "elevator", 1), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 64), - ItemList.Field_Generator_UV.get(16), - new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 }, - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier7", 32), - ItemList.Circuit_Chip_PPIC.get(64), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 64), - ItemList.Electric_Motor_UV.get(32), new ItemStack(IGBlocks.SpaceElevatorCasing, 8) }, - new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(16000), - Materials.Lubricant.getFluid(32000), Materials.Neutronium.getMolten(1440) }, - IGItems.SpaceElevatorController, - 5 * MINUTE, - (int) TierEU.RECIPE_UHV); + GTModHandler.getModItem(OpenBlocks.ID, "elevator", 1, 0), + 256000, + 256, + 1000000, + 4, + new Object[] { GTModHandler.getModItem(OpenBlocks.ID, "elevator", 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 64), + ItemList.Field_Generator_UV.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier7", 32), + ItemList.Circuit_Chip_PPIC.get(64), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 64), + ItemList.Electric_Motor_UV.get(32), new ItemStack(IGBlocks.SpaceElevatorCasing, 8) }, + new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(16000), + Materials.Lubricant.getFluid(32000), Materials.Neutronium.getMolten(1440) }, + IGItems.SpaceElevatorController, + 5 * MINUTE, + (int) TierEU.RECIPE_UHV); // Nanotube spool RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.Graphene, 64), - GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.Graphene, 64), - GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.Graphene, 64), - GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.Graphene, 64)) - .itemOutputs(new ItemStack(IGItems.SpaceElevatorItems, 1, 0)) - .fluidInputs(Materials.AdvancedGlue.getFluid(720)).duration(1 * MINUTE).eut(TierEU.RECIPE_ZPM) - .requiresCleanRoom().addTo(assemblerRecipes); + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.Graphene, 64), + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.Graphene, 64), + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.Graphene, 64), + GTOreDictUnificator.get(OrePrefixes.wireGt16, Materials.Graphene, 64)) + .itemOutputs(new ItemStack(IGItems.SpaceElevatorItems, 1, 0)) + .fluidInputs(Materials.AdvancedGlue.getFluid(720)) + .duration(1 * MINUTE) + .eut(TierEU.RECIPE_ZPM) + .requiresCleanRoom() + .addTo(assemblerRecipes); // Space Elevator Cable RA.stdBuilder() - .itemInputs( - new ItemStack(IGItems.SpaceElevatorItems, 64, 0), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 4)) - .fluidInputs(FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 8000)) - .itemOutputs(new ItemStack(IGBlocks.SpaceElevatorCable)).duration(2 * MINUTE).eut(TierEU.RECIPE_UHV) - .addTo(assemblerRecipes); + .itemInputs( + new ItemStack(IGItems.SpaceElevatorItems, 64, 0), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 4)) + .fluidInputs(FluidRegistry.getFluidStack("molten.ethylcyanoacrylatesuperglue", 8000)) + .itemOutputs(new ItemStack(IGBlocks.SpaceElevatorCable)) + .duration(2 * MINUTE) + .eut(TierEU.RECIPE_UHV) + .addTo(assemblerRecipes); // Space Elevator Base Casing TTRecipeAdder.addResearchableAssemblylineRecipe( - GTOreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 1), - 64000, - 128, - (int) TierEU.RECIPE_UV, - 2, - new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Palladium, 32), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 64), - new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, ItemList.Electric_Piston_UV.get(2), - GTOreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8), }, - new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(2000), - Materials.Iridium.getMolten(1152) }, - new ItemStack(IGBlocks.SpaceElevatorCasing, 8, 0), - 1 * MINUTE, - (int) TierEU.RECIPE_UV); + GTOreDictUnificator.get(OrePrefixes.block, Materials.Neutronium, 1), + 64000, + 128, + (int) TierEU.RECIPE_UV, + 2, + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Palladium, 32), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 64), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, ItemList.Electric_Piston_UV.get(2), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8), }, + new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(2000), + Materials.Iridium.getMolten(1152) }, + new ItemStack(IGBlocks.SpaceElevatorCasing, 8, 0), + 1 * MINUTE, + (int) TierEU.RECIPE_UV); // Space Elevator Support Structure TTRecipeAdder.addResearchableAssemblylineRecipe( - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), - 64000, - 128, - (int) TierEU.RECIPE_UV, - 2, - new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), - GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 16), - GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 8), - GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 8), }, - new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(1000), - Materials.Iridium.getMolten(1440) }, - new ItemStack(IGBlocks.SpaceElevatorCasing, 8, 1), - 1 * MINUTE, - (int) TierEU.RECIPE_UV); + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), + 64000, + 128, + (int) TierEU.RECIPE_UV, + 2, + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), + GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Naquadria, 16), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Neutronium, 8), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Osmiridium, 8), }, + new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(1000), + Materials.Iridium.getMolten(1440) }, + new ItemStack(IGBlocks.SpaceElevatorCasing, 8, 1), + 1 * MINUTE, + (int) TierEU.RECIPE_UV); // Space Elevator Internal Structure TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(TTCasingsContainer.sBlockCasingsTT, 1, 0), - 64000, - 128, - (int) TierEU.RECIPE_UV, - 2, - new Object[] { new ItemStack(TTCasingsContainer.sBlockCasingsTT, 8, 0), - GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Palladium, 16), - GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), }, - new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(8000), - Materials.Concrete.getMolten(1440) }, - new ItemStack(IGBlocks.SpaceElevatorCasing, 8, 2), - 1 * MINUTE, - (int) TierEU.RECIPE_UV); + new ItemStack(TTCasingsContainer.sBlockCasingsTT, 1, 0), + 64000, + 128, + (int) TierEU.RECIPE_UV, + 2, + new Object[] { new ItemStack(TTCasingsContainer.sBlockCasingsTT, 8, 0), + GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Palladium, 16), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 8), }, + new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(8000), + Materials.Concrete.getMolten(1440) }, + new ItemStack(IGBlocks.SpaceElevatorCasing, 8, 2), + 1 * MINUTE, + (int) TierEU.RECIPE_UV); // Space Elevator Motor MK-I TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), - 64000, - 128, - (int) TierEU.RECIPE_UV, - 2, - new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UV.get(4), - GTOreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 8), - GTOreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4), - new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, - GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 16), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16), }, - new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(8000), - Materials.Naquadria.getMolten(1440), Materials.Lubricant.getFluid(16000) }, - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 0), - 1 * MINUTE, - (int) TierEU.RECIPE_UV); + new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), + 64000, + 128, + (int) TierEU.RECIPE_UV, + 2, + new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UV.get(4), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Neutronium, 8), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 4), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 16), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16), }, + new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(8000), + Materials.Naquadria.getMolten(1440), Materials.Lubricant.getFluid(16000) }, + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 0), + 1 * MINUTE, + (int) TierEU.RECIPE_UV); // Space Elevator Motor MK-II TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 0), - 128000, - 256, - (int) TierEU.RECIPE_UHV, - 2, - new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UHV.get(4), - GTOreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8), - GTOreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 4), - new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16), }, - new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(8000), - Materials.Naquadria.getMolten(1440), Materials.Lubricant.getFluid(16000) }, - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 1), - 1 * MINUTE, - (int) TierEU.RECIPE_UHV); + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 0), + 128000, + 256, + (int) TierEU.RECIPE_UHV, + 2, + new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UHV.get(4), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 4), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16), }, + new FluidStack[] { new FluidStack(solderLuV, 5760), Materials.UUMatter.getFluid(8000), + Materials.Naquadria.getMolten(1440), Materials.Lubricant.getFluid(16000) }, + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 1), + 1 * MINUTE, + (int) TierEU.RECIPE_UHV); // Space Elevator Motor MK-III TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 1), - 128000, - 256, - (int) TierEU.RECIPE_UHV, - 2, - new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UEV.get(4), - GTOreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8), - GTOreDictUnificator.get(OrePrefixes.stick, Materials.Infinity, 4), - new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1 }, - GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 16), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16), }, - new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.UUMatter.getFluid(8000), - Materials.Naquadria.getMolten(1440), - MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(24000) }, - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 2), - 1 * MINUTE, - (int) TierEU.RECIPE_UEV); + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 1), + 128000, + 256, + (int) TierEU.RECIPE_UHV, + 2, + new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UEV.get(4), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8), + GTOreDictUnificator.get(OrePrefixes.stick, Materials.Infinity, 4), + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1 }, + GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 16), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16), }, + new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.UUMatter.getFluid(8000), + Materials.Naquadria.getMolten(1440), MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(24000) }, + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 2), + 1 * MINUTE, + (int) TierEU.RECIPE_UEV); // Space Elevator Motor MK-IV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 2), - 128000, - 256, - (int) TierEU.RECIPE_UHV, - 2, - new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UIV.get(4), - GTOreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8), - GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 4), - new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1 }, - GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 16), - GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.ProtoHalkonite, 16), }, - new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.UUMatter.getFluid(8000), - Materials.Naquadria.getMolten(1440), - MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(24000) }, - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 3), - 1 * MINUTE, - (int) TierEU.RECIPE_UIV); + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 2), + 128000, + 256, + (int) TierEU.RECIPE_UHV, + 2, + new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UIV.get(4), + GTOreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8), + GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 4), + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1 }, + GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 16), + GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.ProtoHalkonite, 16), }, + new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.UUMatter.getFluid(8000), + Materials.Naquadria.getMolten(1440), MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(24000) }, + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 3), + 1 * MINUTE, + (int) TierEU.RECIPE_UIV); // Space Elevator Motor MK-V TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 3), - 128000, - 256, - (int) TierEU.RECIPE_UHV, - 2, - new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UMV.get(4), - GTOreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8), - GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.SpaceTime, 4), - new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1L }, - GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.Universium, 16), - GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16), }, - new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.UUMatter.getFluid(8000), - Materials.Naquadria.getMolten(1440), - MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(24000) }, - new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 4), - 1 * MINUTE, - (int) TierEU.RECIPE_UIV); + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 3), + 128000, + 256, + (int) TierEU.RECIPE_UHV, + 2, + new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), ItemList.Electric_Motor_UMV.get(4), + GTOreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8), + GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.SpaceTime, 4), + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1L }, + GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.Universium, 16), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16), }, + new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.UUMatter.getFluid(8000), + Materials.Naquadria.getMolten(1440), MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(24000) }, + new ItemStack(IGBlocks.SpaceElevatorMotor, 1, 4), + 1 * MINUTE, + (int) TierEU.RECIPE_UIV); // Space Elevator Modules // Pump Module MK-I TTRecipeAdder.addResearchableAssemblylineRecipe( - IGItems.PlanetaryGasSiphon, - 16777216, - 2048, - (int) TierEU.RECIPE_UHV, - 4, - new Object[] { ItemList.OilDrillInfinite.get(1), IGItems.PlanetaryGasSiphon, - CustomItemList.enderLinkFluidCover.get(2), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4), - new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, ItemList.Electric_Pump_UEV.get(2), - GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 32), }, - new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.Infinity.getMolten(576) }, - IGItems.SpaceElevatorModulePumpT1, - 2 * MINUTE, - (int) TierEU.RECIPE_UEV); + IGItems.PlanetaryGasSiphon, + 16777216, + 2048, + (int) TierEU.RECIPE_UHV, + 4, + new Object[] { ItemList.OilDrillInfinite.get(1), IGItems.PlanetaryGasSiphon, + CustomItemList.enderLinkFluidCover.get(2), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4), + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, ItemList.Electric_Pump_UEV.get(2), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 32), }, + new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.Infinity.getMolten(576) }, + IGItems.SpaceElevatorModulePumpT1, + 2 * MINUTE, + (int) TierEU.RECIPE_UEV); // Pump Module MK-II TTRecipeAdder.addResearchableAssemblylineRecipe( - IGItems.SpaceElevatorModulePumpT1, - 33554432, - 8192, - 64000000, - 4, - new Object[] { ItemList.OilDrillInfinite.get(4), GTUtility.copyAmount(4, IGItems.PlanetaryGasSiphon), - CustomItemList.enderLinkFluidCover.get(8), - GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), - new Object[] { OrePrefixes.circuit.get(Materials.UIV), 16 }, ItemList.Electric_Pump_UIV.get(8), - GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4), - metaStableOgScrew_64, }, - new FluidStack[] { new FluidStack(solderUEV, 4608), - MaterialsUEVplus.MoltenProtoHalkoniteBase.getFluid(2304) }, - IGItems.SpaceElevatorModulePumpT2, - 2 * MINUTE, - (int) TierEU.RECIPE_UIV); + IGItems.SpaceElevatorModulePumpT1, + 33554432, + 8192, + 64000000, + 4, + new Object[] { ItemList.OilDrillInfinite.get(4), GTUtility.copyAmount(4, IGItems.PlanetaryGasSiphon), + CustomItemList.enderLinkFluidCover.get(8), + GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 16 }, ItemList.Electric_Pump_UIV.get(8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4), metaStableOgScrew_64, }, + new FluidStack[] { new FluidStack(solderUEV, 4608), + MaterialsUEVplus.MoltenProtoHalkoniteBase.getFluid(2304) }, + IGItems.SpaceElevatorModulePumpT2, + 2 * MINUTE, + (int) TierEU.RECIPE_UIV); // Pump Module MK-II - Assembler alt RA.stdBuilder() - .itemInputs( - GTUtility.copyAmount(4, IGItems.SpaceElevatorModulePumpT1), - GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 8), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 16), - ItemList.Electric_Pump_UIV.get(8), - GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 8), - metaStableOgScrew_64, - GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.ProtoHalkonite, 16)) - .itemOutputs(IGItems.SpaceElevatorModulePumpT2).fluidInputs(new FluidStack(solderUEV, 4608)) - .duration(2 * MINUTE).eut(TierEU.RECIPE_UIV).addTo(assemblerRecipes); + .itemInputs( + GTUtility.copyAmount(4, IGItems.SpaceElevatorModulePumpT1), + GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 8), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 16), + ItemList.Electric_Pump_UIV.get(8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 8), + metaStableOgScrew_64, + GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.ProtoHalkonite, 16)) + .itemOutputs(IGItems.SpaceElevatorModulePumpT2) + .fluidInputs(new FluidStack(solderUEV, 4608)) + .duration(2 * MINUTE) + .eut(TierEU.RECIPE_UIV) + .addTo(assemblerRecipes); // Pump Module MK-III TTRecipeAdder.addResearchableAssemblylineRecipe( - IGItems.SpaceElevatorModulePumpT2, - 67108864, - 32767, - 256000000, - 4, - new Object[] { ItemList.OilDrillInfinite.get(16), GTUtility.copyAmount(16, IGItems.PlanetaryGasSiphon), - CustomItemList.enderLinkFluidCover.get(32), - GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.BlackDwarfMatter, 4), - new Object[] { OrePrefixes.circuit.get(Materials.UMV), 16 }, ItemList.Electric_Pump_UMV.get(8), - GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.BlackDwarfMatter, 4), - GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.WhiteDwarfMatter, 64) }, - new FluidStack[] { new FluidStack(solderUEV, 9216), MaterialsUEVplus.Eternity.getMolten(2304) }, - IGItems.SpaceElevatorModulePumpT3, - 2 * MINUTE, - (int) TierEU.RECIPE_UMV); + IGItems.SpaceElevatorModulePumpT2, + 67108864, + 32767, + 256000000, + 4, + new Object[] { ItemList.OilDrillInfinite.get(16), GTUtility.copyAmount(16, IGItems.PlanetaryGasSiphon), + CustomItemList.enderLinkFluidCover.get(32), + GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.BlackDwarfMatter, 4), + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 16 }, ItemList.Electric_Pump_UMV.get(8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.BlackDwarfMatter, 4), + GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.WhiteDwarfMatter, 64) }, + new FluidStack[] { new FluidStack(solderUEV, 9216), MaterialsUEVplus.Eternity.getMolten(2304) }, + IGItems.SpaceElevatorModulePumpT3, + 2 * MINUTE, + (int) TierEU.RECIPE_UMV); // Pump Module MK-III - Assembler alt RA.stdBuilder() - .itemInputs( - GTUtility.copyAmount(4, IGItems.SpaceElevatorModulePumpT2), - GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.BlackDwarfMatter, 8), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 16), - ItemList.Electric_Pump_UMV.get(8), - GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.BlackDwarfMatter, 8), - GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.WhiteDwarfMatter, 64), - GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.Eternity, 16)) - .itemOutputs(IGItems.SpaceElevatorModulePumpT3).fluidInputs(new FluidStack(solderUEV, 9216)) - .duration(2 * MINUTE).eut(TierEU.RECIPE_UIV).addTo(assemblerRecipes); + .itemInputs( + GTUtility.copyAmount(4, IGItems.SpaceElevatorModulePumpT2), + GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.BlackDwarfMatter, 8), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 16), + ItemList.Electric_Pump_UMV.get(8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.BlackDwarfMatter, 8), + GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.WhiteDwarfMatter, 64), + GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.Eternity, 16)) + .itemOutputs(IGItems.SpaceElevatorModulePumpT3) + .fluidInputs(new FluidStack(solderUEV, 9216)) + .duration(2 * MINUTE) + .eut(TierEU.RECIPE_UIV) + .addTo(assemblerRecipes); // Assembler Module MK-I TTRecipeAdder.addResearchableAssemblylineRecipe( - preciseAssembler_1, - 256000, - 256, - 4000000, - 4, - new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), - new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 10782), - new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 1187), - GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 8), - GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), - ItemList.Robot_Arm_UHV.get(8), ItemList.Conveyor_Module_UHV.get(16), - highComputationStationT3_32, new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 }, - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), - GTOreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 32) }, - new FluidStack[] { new FluidStack(solderLuV, 1296), Materials.Naquadria.getMolten(1296), - Materials.Lubricant.getFluid(16000) }, - IGItems.SpaceElevatorModuleAssemblerT1, - 2 * MINUTE, - (int) TierEU.RECIPE_UEV); + preciseAssembler_1, + 256000, + 256, + 4000000, + 4, + new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), + new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 10782), + new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 1187), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 8), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), + ItemList.Robot_Arm_UHV.get(8), ItemList.Conveyor_Module_UHV.get(16), highComputationStationT3_32, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 }, + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 32) }, + new FluidStack[] { new FluidStack(solderLuV, 1296), Materials.Naquadria.getMolten(1296), + Materials.Lubricant.getFluid(16000) }, + IGItems.SpaceElevatorModuleAssemblerT1, + 2 * MINUTE, + (int) TierEU.RECIPE_UEV); // Assembler Module MK-II TTRecipeAdder.addResearchableAssemblylineRecipe( - IGItems.SpaceElevatorModuleAssemblerT1, - 2048000, - 2048, - 64000000, - 4, - new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), - new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 10784), - new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 12091), - GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 8), - GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.ProtoHalkonite, 16), - ItemList.Robot_Arm_UIV.get(8), ItemList.Conveyor_Module_UIV.get(16), - highComputationStationT4_32, new Object[] { OrePrefixes.circuit.get(Materials.UIV), 16 }, - hypogenFrameBox_8, hypogenScrew_32 }, - new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.Infinity.getMolten(1296), - Materials.UUMatter.getFluid(16000) }, - IGItems.SpaceElevatorModuleAssemblerT2, - 2 * MINUTE, - (int) TierEU.RECIPE_UIV); + IGItems.SpaceElevatorModuleAssemblerT1, + 2048000, + 2048, + 64000000, + 4, + new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), + new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 10784), + new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 12091), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 8), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.ProtoHalkonite, 16), + ItemList.Robot_Arm_UIV.get(8), ItemList.Conveyor_Module_UIV.get(16), highComputationStationT4_32, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 16 }, hypogenFrameBox_8, hypogenScrew_32 }, + new FluidStack[] { new FluidStack(solderUEV, 1296), Materials.Infinity.getMolten(1296), + Materials.UUMatter.getFluid(16000) }, + IGItems.SpaceElevatorModuleAssemblerT2, + 2 * MINUTE, + (int) TierEU.RECIPE_UIV); // Assembler Module MK-III TTRecipeAdder.addResearchableAssemblylineRecipe( - IGItems.SpaceElevatorModuleAssemblerT2, - 32768000, - 4096, - 256000000, - 4, - new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), - new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 10786), - new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 12093), - GTOreDictUnificator.get( - OrePrefixes.gearGt, - MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, - 8), - GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.MagMatter, 8), - GTOreDictUnificator.get( - OrePrefixes.gearGtSmall, - MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, - 16), - GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagMatter, 16), - ItemList.Robot_Arm_UXV.get(8), ItemList.Conveyor_Module_UXV.get(16), - highComputationStationT5_32, new Object[] { OrePrefixes.circuit.get(Materials.UXV), 16 }, - GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.Universium, 8), - GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.Universium, 32) }, - new FluidStack[] { new FluidStack(solderUEV, 5184), MaterialsUEVplus.BlackDwarfMatter.getMolten(1296), - MaterialsUEVplus.WhiteDwarfMatter.getMolten(1296), MaterialsUEVplus.SpaceTime.getMolten(1296) }, - IGItems.SpaceElevatorModuleAssemblerT3, - 2 * MINUTE, - (int) TierEU.RECIPE_UXV); + IGItems.SpaceElevatorModuleAssemblerT2, + 32768000, + 4096, + 256000000, + 4, + new Object[] { new ItemStack(IGBlocks.SpaceElevatorCasing, 1, 0), + new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 10786), + new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 4, 12093), + GTOreDictUnificator + .get(OrePrefixes.gearGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.MagMatter, 8), + GTOreDictUnificator + .get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 16), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagMatter, 16), + ItemList.Robot_Arm_UXV.get(8), ItemList.Conveyor_Module_UXV.get(16), highComputationStationT5_32, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 16 }, + GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.Universium, 8), + GTOreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.Universium, 32) }, + new FluidStack[] { new FluidStack(solderUEV, 5184), MaterialsUEVplus.BlackDwarfMatter.getMolten(1296), + MaterialsUEVplus.WhiteDwarfMatter.getMolten(1296), MaterialsUEVplus.SpaceTime.getMolten(1296) }, + IGItems.SpaceElevatorModuleAssemblerT3, + 2 * MINUTE, + (int) TierEU.RECIPE_UXV); // Research Module TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 1, 11012), - 512000, - 512, - 16000000, - 4, - new Object[] { CustomItemList.Machine_Multi_Research.get(4), ItemList.Sensor_UHV.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 }, - GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64), - GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64), - metaStableOgScrew_64, - GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32) }, - new FluidStack[] { new FluidStack(solderLuV, 4608), Materials.Infinity.getMolten(2304), - Materials.UUMatter.getFluid(8000), Materials.SuperCoolant.getFluid(4000) }, - IGItems.SpaceElevatorModuleResearch, - 2 * MINUTE, - (int) TierEU.RECIPE_UEV); + new ItemStack(GameRegistry.findItem("gregtech", "gt.blockmachines"), 1, 11012), + 512000, + 512, + 16000000, + 4, + new Object[] { CustomItemList.Machine_Multi_Research.get(4), ItemList.Sensor_UHV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 }, + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 4), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.CosmicNeutronium, 64), metaStableOgScrew_64, + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32) }, + new FluidStack[] { new FluidStack(solderLuV, 4608), Materials.Infinity.getMolten(2304), + Materials.UUMatter.getFluid(8000), Materials.SuperCoolant.getFluid(4000) }, + IGItems.SpaceElevatorModuleResearch, + 2 * MINUTE, + (int) TierEU.RECIPE_UEV); // Project Manager Module TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(GameRegistry.findItem("miscutils", "blockProjectBench"), 1), - 256000, - 512, - 1000000, - 4, - new Object[] { new ItemStack(GameRegistry.findItem("miscutils", "blockProjectBench"), 4), - ItemList.Emitter_UV.get(2), ItemList.Sensor_UV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 }, - GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), - new ItemStack( - GameRegistry.findItem("structurelib", "item.structurelib.constructableTrigger"), - 64), - titaniumBetaCScrew_64, }, - new FluidStack[] { new FluidStack(solderLuV, 4608), Materials.Iridium.getMolten(2304), - Materials.UUMatter.getFluid(2000) }, - IGItems.SpaceElevatorModuleManager, - 2 * MINUTE, - (int) TierEU.RECIPE_UHV); + new ItemStack(GameRegistry.findItem("miscutils", "blockProjectBench"), 1), + 256000, + 512, + 1000000, + 4, + new Object[] { new ItemStack(GameRegistry.findItem("miscutils", "blockProjectBench"), 4), + ItemList.Emitter_UV.get(2), ItemList.Sensor_UV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 }, + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), + new ItemStack(GameRegistry.findItem("structurelib", "item.structurelib.constructableTrigger"), 64), + titaniumBetaCScrew_64, }, + new FluidStack[] { new FluidStack(solderLuV, 4608), Materials.Iridium.getMolten(2304), + Materials.UUMatter.getFluid(2000) }, + IGItems.SpaceElevatorModuleManager, + 2 * MINUTE, + (int) TierEU.RECIPE_UHV); // Miner Module MK-I TTRecipeAdder.addResearchableAssemblylineRecipe( - voidMiner, - 2000000, - 512, - (int) TierEU.RECIPE_UHV, - 8, - new Object[] { ItemList.OreDrill4.get(1), ItemList.Robot_Arm_UV.get(8), - ItemList.Field_Generator_UV.get(4), new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 }, - ItemList.Sensor_UV.get(16), - GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16) }, - new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Naquadria.getMolten(1440), - Materials.Lubricant.getFluid(8000) }, - IGItems.SpaceElevatorModuleMinerT1, - 2 * MINUTE, - (int) TierEU.RECIPE_UHV); + voidMiner, + 2000000, + 512, + (int) TierEU.RECIPE_UHV, + 8, + new Object[] { ItemList.OreDrill4.get(1), ItemList.Robot_Arm_UV.get(8), ItemList.Field_Generator_UV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 }, ItemList.Sensor_UV.get(16), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 32), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16) }, + new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Naquadria.getMolten(1440), + Materials.Lubricant.getFluid(8000) }, + IGItems.SpaceElevatorModuleMinerT1, + 2 * MINUTE, + (int) TierEU.RECIPE_UHV); // Miner Module MK-II TTRecipeAdder.addResearchableAssemblylineRecipe( - IGItems.SpaceElevatorModuleMinerT1, - 3000000, - 1024, - 3000000, - 12, - new Object[] { IGItems.SpaceElevatorModuleMinerT1, ItemList.Robot_Arm_UHV.get(8), - ItemList.Field_Generator_UHV.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 }, ItemList.Sensor_UHV.get(16), - GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 16) }, - new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Naquadria.getMolten(2880), - Materials.Lubricant.getFluid(16000) }, - IGItems.SpaceElevatorModuleMinerT2, - 2 * MINUTE, - (int) TierEU.RECIPE_UEV); + IGItems.SpaceElevatorModuleMinerT1, + 3000000, + 1024, + 3000000, + 12, + new Object[] { IGItems.SpaceElevatorModuleMinerT1, ItemList.Robot_Arm_UHV.get(8), + ItemList.Field_Generator_UHV.get(4), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 16 }, + ItemList.Sensor_UHV.get(16), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 16) }, + new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Naquadria.getMolten(2880), + Materials.Lubricant.getFluid(16000) }, + IGItems.SpaceElevatorModuleMinerT2, + 2 * MINUTE, + (int) TierEU.RECIPE_UEV); // Miner Module MK-III TTRecipeAdder.addResearchableAssemblylineRecipe( - IGItems.SpaceElevatorModuleMinerT2, - 4000000, - 2048, - 4000000, - 16, - new Object[] { IGItems.SpaceElevatorModuleMinerT2, ItemList.Robot_Arm_UEV.get(8), - ItemList.Field_Generator_UEV.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.UEV), 16 }, ItemList.Sensor_UEV.get(16), - GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 32), - GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16) }, - new FluidStack[] { new FluidStack(solderUEV, 2880), MaterialsUEVplus.TranscendentMetal.getMolten(1440), - Materials.UUMatter.getFluid(2000) }, - IGItems.SpaceElevatorModuleMinerT3, - 2 * MINUTE, - (int) TierEU.RECIPE_UIV); + IGItems.SpaceElevatorModuleMinerT2, + 4000000, + 2048, + 4000000, + 16, + new Object[] { IGItems.SpaceElevatorModuleMinerT2, ItemList.Robot_Arm_UEV.get(8), + ItemList.Field_Generator_UEV.get(4), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 16 }, + ItemList.Sensor_UEV.get(16), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 32), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 16) }, + new FluidStack[] { new FluidStack(solderUEV, 2880), MaterialsUEVplus.TranscendentMetal.getMolten(1440), + Materials.UUMatter.getFluid(2000) }, + IGItems.SpaceElevatorModuleMinerT3, + 2 * MINUTE, + (int) TierEU.RECIPE_UIV); // Mining drones // LV RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Titanium, 8), - ItemList.Robot_Arm_LV.get(8), - ItemList.Field_Generator_LV.get(2), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), - new ItemStack(GCItems.heavyPlatingTier1, 16), - new ItemStack(GCItems.rocketEngine, 2), - ItemList.Sensor_LV.get(8)) - .itemOutputs(new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.LV.ordinal())) - .fluidInputs(Materials.SolderingAlloy.getMolten(720)).duration(1 * MINUTE).eut(TierEU.RECIPE_LV) - .addTo(assemblerRecipes); + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Titanium, 8), + ItemList.Robot_Arm_LV.get(8), + ItemList.Field_Generator_LV.get(2), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), + new ItemStack(GCItems.heavyPlatingTier1, 16), + new ItemStack(GCItems.rocketEngine, 2), + ItemList.Sensor_LV.get(8)) + .itemOutputs(new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.LV.ordinal())) + .fluidInputs(Materials.SolderingAlloy.getMolten(720)) + .duration(1 * MINUTE) + .eut(TierEU.RECIPE_LV) + .addTo(assemblerRecipes); // MV RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.TungstenSteel, 8), - ItemList.Robot_Arm_MV.get(8), - ItemList.Field_Generator_MV.get(2), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), - new ItemStack(GCItems.heavyPlatingTier1, 32), - new ItemStack(GCItems.rocketEngine, 4), - ItemList.Sensor_MV.get(8)) - .itemOutputs(new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.MV.ordinal())) - .fluidInputs(Materials.SolderingAlloy.getMolten(1440)).duration(1 * MINUTE).eut(TierEU.RECIPE_MV) - .addTo(assemblerRecipes); + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.TungstenSteel, 8), + ItemList.Robot_Arm_MV.get(8), + ItemList.Field_Generator_MV.get(2), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), + new ItemStack(GCItems.heavyPlatingTier1, 32), + new ItemStack(GCItems.rocketEngine, 4), + ItemList.Sensor_MV.get(8)) + .itemOutputs(new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.MV.ordinal())) + .fluidInputs(Materials.SolderingAlloy.getMolten(1440)) + .duration(1 * MINUTE) + .eut(TierEU.RECIPE_MV) + .addTo(assemblerRecipes); // HV RA.stdBuilder() - .itemInputs( - GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Iridium, 8), - ItemList.Robot_Arm_HV.get(8), - ItemList.Field_Generator_HV.get(2), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), - new ItemStack(MarsItems.marsItemBasic, 32, 3), - new ItemStack(GCItems.rocketEngine, 4), - ItemList.Sensor_HV.get(8)) - .itemOutputs(new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.HV.ordinal())) - .fluidInputs(Materials.SolderingAlloy.getMolten(1440)).duration(1 * MINUTE).eut(TierEU.RECIPE_HV) - .addTo(assemblerRecipes); + .itemInputs( + GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Iridium, 8), + ItemList.Robot_Arm_HV.get(8), + ItemList.Field_Generator_HV.get(2), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 4), + new ItemStack(MarsItems.marsItemBasic, 32, 3), + new ItemStack(GCItems.rocketEngine, 4), + ItemList.Sensor_HV.get(8)) + .itemOutputs(new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.HV.ordinal())) + .fluidInputs(Materials.SolderingAlloy.getMolten(1440)) + .duration(1 * MINUTE) + .eut(TierEU.RECIPE_HV) + .addTo(assemblerRecipes); // EV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.HV.ordinal()), - 50000, - 128, - 1000000, - 4, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Trinium, 8), - ItemList.Robot_Arm_EV.get(8), ItemList.Field_Generator_EV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 }, - new ItemStack(AsteroidsItems.basicItem, 32, 0), new ItemStack(AsteroidsItems.basicItem, 4, 1), - ItemList.Sensor_EV.get(8) }, - new FluidStack[] { new FluidStack(solderLuV, 720), Materials.Iridium.getMolten(720), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 16000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.EV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_EV); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.HV.ordinal()), + 50000, + 128, + 1000000, + 4, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Trinium, 8), + ItemList.Robot_Arm_EV.get(8), ItemList.Field_Generator_EV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 }, + new ItemStack(AsteroidsItems.basicItem, 32, 0), new ItemStack(AsteroidsItems.basicItem, 4, 1), + ItemList.Sensor_EV.get(8) }, + new FluidStack[] { new FluidStack(solderLuV, 720), Materials.Iridium.getMolten(720), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 16000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.EV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_EV); // IV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.EV.ordinal()), - 75000, - 128, - 1000000, - 8, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.NaquadahAlloy, 8), - ItemList.Robot_Arm_IV.get(8), ItemList.Field_Generator_IV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier4", 32), - new ItemStack(AsteroidsItems.basicItem, 4, 1), ItemList.Sensor_IV.get(8) }, - new FluidStack[] { new FluidStack(solderLuV, 1440), Materials.Iridium.getMolten(1440), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 32000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.IV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_IV); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.EV.ordinal()), + 75000, + 128, + 1000000, + 8, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.NaquadahAlloy, 8), + ItemList.Robot_Arm_IV.get(8), ItemList.Field_Generator_IV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier4", 32), + new ItemStack(AsteroidsItems.basicItem, 4, 1), ItemList.Sensor_IV.get(8) }, + new FluidStack[] { new FluidStack(solderLuV, 1440), Materials.Iridium.getMolten(1440), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 32000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.IV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_IV); // LuV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.IV.ordinal()), - 100000, - 256, - (int) TierEU.RECIPE_UHV, - 4, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Naquadria, 8), - ItemList.Robot_Arm_LuV.get(8), ItemList.Field_Generator_LuV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier5", 32), - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyRocketEngineTier3", 4), - ItemList.Sensor_LuV.get(8) }, - new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Osmiridium.getMolten(1440), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 64000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.LuV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_LuV); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.IV.ordinal()), + 100000, + 256, + (int) TierEU.RECIPE_UHV, + 4, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Naquadria, 8), + ItemList.Robot_Arm_LuV.get(8), ItemList.Field_Generator_LuV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier5", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4), + ItemList.Sensor_LuV.get(8) }, + new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Osmiridium.getMolten(1440), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 64000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.LuV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_LuV); // ZPM TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.LuV.ordinal()), - 125000, - 256, - (int) TierEU.RECIPE_UHV, - 8, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Neutronium, 8), - ItemList.Robot_Arm_ZPM.get(8), ItemList.Field_Generator_ZPM.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier6", 32), - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyRocketEngineTier3", 4), - ItemList.Sensor_ZPM.get(8) }, - new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Osmiridium.getMolten(1440), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 128000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.ZPM.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_ZPM); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.LuV.ordinal()), + 125000, + 256, + (int) TierEU.RECIPE_UHV, + 8, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Neutronium, 8), + ItemList.Robot_Arm_ZPM.get(8), ItemList.Field_Generator_ZPM.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier6", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4), + ItemList.Sensor_ZPM.get(8) }, + new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Osmiridium.getMolten(1440), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 128000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.ZPM.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_ZPM); // UV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.ZPM.ordinal()), - 150000, - 512, - 4000000, - 4, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), - ItemList.Robot_Arm_UV.get(8), ItemList.Field_Generator_UV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier7", 32), - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyRocketEngineTier4", 4), - ItemList.Sensor_UV.get(8) }, - new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Naquadria.getMolten(1440), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 256000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_UV); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.ZPM.ordinal()), + 150000, + 512, + 4000000, + 4, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), + ItemList.Robot_Arm_UV.get(8), ItemList.Field_Generator_UV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier7", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 4), + ItemList.Sensor_UV.get(8) }, + new FluidStack[] { new FluidStack(solderLuV, 2880), Materials.Naquadria.getMolten(1440), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 256000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_UV); // UHV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UV.ordinal()), - 175000, - 512, - 4000000, - 8, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Infinity, 8), - ItemList.Robot_Arm_UHV.get(8), ItemList.Field_Generator_UHV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyPlateTier8", 32), - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyRocketEngineTier4", 4), - ItemList.Sensor_UHV.get(8) }, - new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.Neutronium.getMolten(1440), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UHV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_UHV); - - ItemStack t9Plate = GTModHandler.getModItem("GalacticraftAmunRa", "item.baseItem", 1, 15); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UV.ordinal()), + 175000, + 512, + 4000000, + 8, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.Infinity, 8), + ItemList.Robot_Arm_UHV.get(8), ItemList.Field_Generator_UHV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyPlateTier8", 32), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 4), + ItemList.Sensor_UHV.get(8) }, + new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.Neutronium.getMolten(1440), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UHV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_UHV); + + ItemStack t9Plate = GTModHandler.getModItem(GalacticraftAmunRa.ID, "item.baseItem", 1, 15); // UEV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UHV.ordinal()), - 200000, - 512, - 4000000, - 8, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), - ItemList.Robot_Arm_UEV.get(8), ItemList.Field_Generator_UEV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4 }, GTUtility.copyAmount(32, t9Plate), - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyRocketEngineTier4", 8), - ItemList.Sensor_UEV.get(8) }, - new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.Quantium.getMolten(1440), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UEV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_UEV); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UHV.ordinal()), + 200000, + 512, + 4000000, + 8, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), + ItemList.Robot_Arm_UEV.get(8), ItemList.Field_Generator_UEV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4 }, GTUtility.copyAmount(32, t9Plate), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 8), + ItemList.Sensor_UEV.get(8) }, + new FluidStack[] { new FluidStack(solderUEV, 2880), Materials.Quantium.getMolten(1440), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UEV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_UEV); // UIV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UEV.ordinal()), - 225000, - 512, - (int) TierEU.RECIPE_UEV, - 4, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), - ItemList.Robot_Arm_UIV.get(8), ItemList.Field_Generator_UIV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4 }, GTUtility.copyAmount(64, t9Plate), - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyRocketEngineTier4", 16), - ItemList.Sensor_UIV.get(8) }, - new FluidStack[] { new FluidStack(solderUEV, 5760), Materials.Quantium.getMolten(2880), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UIV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_UIV); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UEV.ordinal()), + 225000, + 512, + (int) TierEU.RECIPE_UEV, + 4, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, Materials.CosmicNeutronium, 8), + ItemList.Robot_Arm_UIV.get(8), ItemList.Field_Generator_UIV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4 }, GTUtility.copyAmount(64, t9Plate), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 16), + ItemList.Sensor_UIV.get(8) }, + new FluidStack[] { new FluidStack(solderUEV, 5760), Materials.Quantium.getMolten(2880), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UIV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_UIV); // UMV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UIV.ordinal()), - 250000, - 512, - (int) TierEU.RECIPE_UEV, - 8, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, MaterialsUEVplus.SpaceTime, 8), - ItemList.Robot_Arm_UMV.get(8), ItemList.Field_Generator_UMV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, GTUtility.copyAmount(64, t9Plate), - GTUtility.copyAmount(64, t9Plate), - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyRocketEngineTier4", 32), - ItemList.Sensor_UMV.get(8) }, - new FluidStack[] { new FluidStack(hypogenFluid, 576), new FluidStack(celestialTungstenFluid, 576), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UMV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_UMV); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UIV.ordinal()), + 250000, + 512, + (int) TierEU.RECIPE_UEV, + 8, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, MaterialsUEVplus.SpaceTime, 8), + ItemList.Robot_Arm_UMV.get(8), ItemList.Field_Generator_UMV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, GTUtility.copyAmount(64, t9Plate), + GTUtility.copyAmount(64, t9Plate), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 32), + ItemList.Sensor_UMV.get(8) }, + new FluidStack[] { new FluidStack(hypogenFluid, 576), new FluidStack(celestialTungstenFluid, 576), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UMV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_UMV); // UXV TTRecipeAdder.addResearchableAssemblylineRecipe( - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UMV.ordinal()), - 275000, - 512, - 16000000, - 4, - new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, MaterialsUEVplus.Eternity, 8), - ItemList.Robot_Arm_UXV.get(8), ItemList.Field_Generator_UXV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.UXV), 8 }, GTUtility.copyAmount(64, t9Plate), - GTUtility.copyAmount(64, t9Plate), GTUtility.copyAmount(64, t9Plate), - GTUtility.copyAmount(64, t9Plate), - GTModHandler.getModItem("dreamcraft", "item.HeavyDutyRocketEngineTier4", 64), - ItemList.Sensor_UXV.get(8) }, - new FluidStack[] { MaterialsUEVplus.Space.getMolten(576), MaterialsUEVplus.Universium.getMolten(576), - new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, - new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UXV.ordinal()), - 1 * MINUTE, - (int) TierEU.RECIPE_UXV); + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UMV.ordinal()), + 275000, + 512, + 16000000, + 4, + new Object[] { GTOreDictUnificator.get(OrePrefixes.toolHeadDrill, MaterialsUEVplus.Eternity, 8), + ItemList.Robot_Arm_UXV.get(8), ItemList.Field_Generator_UXV.get(2), + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 8 }, GTUtility.copyAmount(64, t9Plate), + GTUtility.copyAmount(64, t9Plate), GTUtility.copyAmount(64, t9Plate), GTUtility.copyAmount(64, t9Plate), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier4", 64), + ItemList.Sensor_UXV.get(8) }, + new FluidStack[] { MaterialsUEVplus.Space.getMolten(576), MaterialsUEVplus.Universium.getMolten(576), + new FluidStack(FluidRegistry.getFluid("liquid_drillingfluid"), 512000) }, + new ItemStack(IGItems.MiningDrones, 1, ItemMiningDrones.DroneTiers.UXV.ordinal()), + 1 * MINUTE, + (int) TierEU.RECIPE_UXV); } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/ResultNoSpaceProject.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/ResultNoSpaceProject.java index 09c3f19..f1d3dc9 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/ResultNoSpaceProject.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/ResultNoSpaceProject.java @@ -58,9 +58,9 @@ public boolean wasSuccessful() { @Override public String getDisplayString() { return StatCollector.translateToLocalFormatted( - "GT5U.gui.text.missing_project", - StatCollector.translateToLocal(neededProject), - StatCollector.translateToLocal(neededLocation)); + "GT5U.gui.text.missing_project", + StatCollector.translateToLocal(neededProject), + StatCollector.translateToLocal(neededLocation)); } @Override diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceMiningData.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceMiningData.java index 3836094..97dab09 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceMiningData.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceMiningData.java @@ -15,7 +15,7 @@ public class SpaceMiningData { public final int recipeWeight; public SpaceMiningData(String asteroidName, int minDistance, int maxDistance, int minSize, int maxSize, - int computation, int recipeWeight) { + int computation, int recipeWeight) { this.asteroidName = asteroidName; this.minDistance = minDistance; this.maxDistance = maxDistance; @@ -48,8 +48,13 @@ public boolean equals(Object o) { @Override public String toString() { - return new ToStringBuilder(this).append("asteroidName", asteroidName).append("minDistance", minDistance) - .append("maxDistance", maxDistance).append("minSize", minSize).append("maxSize", maxSize) - .append("computation", computation).append("recipeWeight", recipeWeight).toString(); + return new ToStringBuilder(this).append("asteroidName", asteroidName) + .append("minDistance", minDistance) + .append("maxDistance", maxDistance) + .append("minSize", minSize) + .append("maxSize", maxSize) + .append("computation", computation) + .append("recipeWeight", recipeWeight) + .toString(); } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceMiningRecipes.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceMiningRecipes.java index 33fd0a7..7c0b1e9 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceMiningRecipes.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceMiningRecipes.java @@ -1,5 +1,7 @@ package com.gtnewhorizons.gtnhintergalactic.recipe; +import static gregtech.api.enums.Mods.DraconicEvolution; +import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import java.util.ArrayList; @@ -17,8 +19,6 @@ import com.gtnewhorizons.gtnhintergalactic.item.ItemMiningDrones; import bartworks.system.material.WerkstoffLoader; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.items.GGMaterial; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -28,6 +28,9 @@ import gregtech.api.util.GTOreDictUnificator; import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; +import gtPlusPlus.core.material.MaterialMisc; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsOres; /** * Available asteroids for space mining are defined here @@ -65,862 +68,845 @@ public static void addAsteroids() { // Coal Asteroid addRecipesToDrones( - "coalAsteroid", - null, - null, - new int[] { 7000, 1000, 2000 }, - new Materials[] { Materials.Coal, Materials.Lignite, Materials.Graphite }, - OrePrefixes.oreEndstone, - 30, - 120, - 1, - 40, - 20, - 1, - 10 * SECONDS, - (int) TierEU.RECIPE_EV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - 200); + "coalAsteroid", + null, + null, + new int[] { 7000, 1000, 2000 }, + new Materials[] { Materials.Coal, Materials.Lignite, Materials.Graphite }, + OrePrefixes.oreEndstone, + 30, + 120, + 1, + 40, + 20, + 1, + 10 * SECONDS, + (int) TierEU.RECIPE_EV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + 200); // Salt Asteroid addRecipesToDrones( - "saltAsteroid", - null, - null, - new int[] { 4000, 2000, 4000 }, - new Materials[] { Materials.Salt, Materials.RockSalt, Materials.Saltpeter }, - OrePrefixes.oreEndstone, - 30, - 120, - 1, - 250, - 20, - 1, - 10 * SECONDS, - (int) TierEU.RECIPE_EV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.IV.ordinal(), - 300); + "saltAsteroid", + null, + null, + new int[] { 4000, 2000, 4000 }, + new Materials[] { Materials.Salt, Materials.RockSalt, Materials.Saltpeter }, + OrePrefixes.oreEndstone, + 30, + 120, + 1, + 250, + 20, + 1, + 10 * SECONDS, + (int) TierEU.RECIPE_EV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.IV.ordinal(), + 300); // Iron Asteroid addRecipesToDrones( - "ironAsteroid", - null, - null, - new int[] { 4000, 2000, 1000, 1000, 500, 500 }, - new Materials[] { Materials.Iron, Materials.Gold, Materials.Magnetite, Materials.Pyrite, - Materials.BasalticMineralSand, Materials.GraniticMineralSand }, - OrePrefixes.oreEndstone, - 30, - 150, - 1, - 180, - 10, - 1, - 10 * SECONDS, - (int) TierEU.RECIPE_EV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - 600); + "ironAsteroid", + null, + null, + new int[] { 4000, 2000, 1000, 1000, 500, 500 }, + new Materials[] { Materials.Iron, Materials.Gold, Materials.Magnetite, Materials.Pyrite, + Materials.BasalticMineralSand, Materials.GraniticMineralSand }, + OrePrefixes.oreEndstone, + 30, + 150, + 1, + 180, + 10, + 1, + 10 * SECONDS, + (int) TierEU.RECIPE_EV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + 600); // Copper Asteroid addRecipesToDrones( - "copperAsteroid", - null, - null, - new int[] { 5000, 3000, 2000 }, - new Materials[] { Materials.Copper, Materials.Chalcopyrite, Materials.Malachite }, - OrePrefixes.oreEndstone, - 30, - 150, - 3, - 12, - 10, - 1, - 10 * SECONDS, - (int) TierEU.RECIPE_EV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.LuV.ordinal(), - 500); + "copperAsteroid", + null, + null, + new int[] { 5000, 3000, 2000 }, + new Materials[] { Materials.Copper, Materials.Chalcopyrite, Materials.Malachite }, + OrePrefixes.oreEndstone, + 30, + 150, + 3, + 12, + 10, + 1, + 10 * SECONDS, + (int) TierEU.RECIPE_EV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.LuV.ordinal(), + 500); // Tin Asteroid addRecipesToDrones( - "tinAsteroid", - null, - null, - new int[] { 2000, 1500, 6000, 500 }, - new Materials[] { Materials.Cassiterite, Materials.CassiteriteSand, Materials.Tin, Materials.Asbestos }, - OrePrefixes.oreEndstone, - 50, - 200, - 2, - 100, - 10, - 1, - 50, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.IV.ordinal(), - 400); + "tinAsteroid", + null, + null, + new int[] { 2000, 1500, 6000, 500 }, + new Materials[] { Materials.Cassiterite, Materials.CassiteriteSand, Materials.Tin, Materials.Asbestos }, + OrePrefixes.oreEndstone, + 50, + 200, + 2, + 100, + 10, + 1, + 50, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.IV.ordinal(), + 400); // Aluminium Asteroid addRecipesToDrones( - "aluminiumAsteroid", - null, - null, - new int[] { 5000, 3500, 1500 }, - new Materials[] { Materials.Aluminium, Materials.Bauxite, Materials.Rutile }, - OrePrefixes.oreEndstone, - 10, - 20, - 5, - 20, - 20, - 1, - 50, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.MV.ordinal(), - ItemMiningDrones.DroneTiers.EV.ordinal(), - 120); + "aluminiumAsteroid", + null, + null, + new int[] { 5000, 3500, 1500 }, + new Materials[] { Materials.Aluminium, Materials.Bauxite, Materials.Rutile }, + OrePrefixes.oreEndstone, + 10, + 20, + 5, + 20, + 20, + 1, + 50, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.MV.ordinal(), + ItemMiningDrones.DroneTiers.EV.ordinal(), + 120); // Nickel Asteroid addRecipesToDrones( - "nickelAsteroid", - null, - null, - new int[] { 4000, 3000, 3000 }, - new Materials[] { Materials.Nickel, Materials.Pentlandite, Materials.Garnierite }, - OrePrefixes.oreEndstone, - 20, - 40, - 5, - 20, - 20, - 1, - 50, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.IV.ordinal(), - 170); + "nickelAsteroid", + null, + null, + new int[] { 4000, 3000, 3000 }, + new Materials[] { Materials.Nickel, Materials.Pentlandite, Materials.Garnierite }, + OrePrefixes.oreEndstone, + 20, + 40, + 5, + 20, + 20, + 1, + 50, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.IV.ordinal(), + 170); // Chrome Asteroid addRecipesToDrones( - "chromeAsteroid", - null, - null, - new int[] { 5000, 3000, 2000 }, - new Materials[] { Materials.Chrome, Materials.Ruby, Materials.Chromite }, - OrePrefixes.oreEndstone, - 16, - 32, - 10, - 20, - 40, - 1, - 50, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.MV.ordinal(), - ItemMiningDrones.DroneTiers.LuV.ordinal(), - 100); + "chromeAsteroid", + null, + null, + new int[] { 5000, 3000, 2000 }, + new Materials[] { Materials.Chrome, Materials.Ruby, Materials.Chromite }, + OrePrefixes.oreEndstone, + 16, + 32, + 10, + 20, + 40, + 1, + 50, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.MV.ordinal(), + ItemMiningDrones.DroneTiers.LuV.ordinal(), + 100); // PlatLine Ore Asteroid addRecipesToDrones( - "platlineOreAsteroid", - null, - null, - new int[] { 6000, 2000, 1500, 500 }, - new Materials[] { Materials.Platinum, Materials.Palladium, Materials.Iridium, Materials.Osmium }, - OrePrefixes.oreEndstone, - 20, - 40, - 10, - 50, - 60, - 1, - 50, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.HV.ordinal(), - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - 130); + "platlineOreAsteroid", + null, + null, + new int[] { 6000, 2000, 1500, 500 }, + new Materials[] { Materials.Platinum, Materials.Palladium, Materials.Iridium, Materials.Osmium }, + OrePrefixes.oreEndstone, + 20, + 40, + 10, + 50, + 60, + 1, + 50, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.HV.ordinal(), + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + 130); // Gem Asteroid addRecipesToDrones( - "gemAsteroid", - null, - null, - new int[] { 1500, 1500, 1500, 1500, 750, 750, 750, 1000, 500, 500, 400, 100 }, - new Materials[] { Materials.Ruby, Materials.Emerald, Materials.Sapphire, Materials.GreenSapphire, - Materials.Diamond, Materials.Opal, Materials.Amethyst, Materials.Topaz, Materials.BlueTopaz, - Materials.Bauxite, Materials.Vinteum, Materials.NetherStar }, - OrePrefixes.oreEndstone, - 30, - 160, - 17, - 40, - 60, - 1, - 100, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.LuV.ordinal(), - 180); + "gemAsteroid", + null, + null, + new int[] { 1500, 1500, 1500, 1500, 750, 750, 750, 1000, 500, 500, 400, 100 }, + new Materials[] { Materials.Ruby, Materials.Emerald, Materials.Sapphire, Materials.GreenSapphire, + Materials.Diamond, Materials.Opal, Materials.Amethyst, Materials.Topaz, Materials.BlueTopaz, + Materials.Bauxite, Materials.Vinteum, Materials.NetherStar }, + OrePrefixes.oreEndstone, + 30, + 160, + 17, + 40, + 60, + 1, + 100, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.LuV.ordinal(), + 180); // Indium Asteroid addRecipesToDrones( - "indiumAsteroid", - null, - null, - new int[] { 6000, 2000, 1000, 1000 }, - new Materials[] { Materials.Indium, Materials.Sphalerite, Materials.Zinc, Materials.Cadmium }, - OrePrefixes.oreEndstone, - 30, - 120, - 50, - 90, - 120, - 2, - 500, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.IV.ordinal(), - ItemMiningDrones.DroneTiers.UEV.ordinal(), - 170); + "indiumAsteroid", + null, + null, + new int[] { 6000, 2000, 1000, 1000 }, + new Materials[] { Materials.Indium, Materials.Sphalerite, Materials.Zinc, Materials.Cadmium }, + OrePrefixes.oreEndstone, + 30, + 120, + 50, + 90, + 120, + 2, + 500, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.IV.ordinal(), + ItemMiningDrones.DroneTiers.UEV.ordinal(), + 170); // Thaumium Asteroid addRecipesToDrones( - "thaumiumAsteroid", - null, - null, - new int[] { 6000, 4000 }, - new Materials[] { Materials.Thaumium, Materials.Void }, - OrePrefixes.dust, - 20, - 50, - 10, - 70, - 120, - 1, - 30 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.HV.ordinal(), - ItemMiningDrones.DroneTiers.LuV.ordinal(), - 150); + "thaumiumAsteroid", + null, + null, + new int[] { 6000, 4000 }, + new Materials[] { Materials.Thaumium, Materials.Void }, + OrePrefixes.dust, + 20, + 50, + 10, + 70, + 120, + 1, + 30 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.HV.ordinal(), + ItemMiningDrones.DroneTiers.LuV.ordinal(), + 150); // Basic Magic Asteroid addRecipesToDrones( - "basicMagicAsteroid", - null, - null, - new int[] { 3500, 3500, 500, 500, 500, 500, 500, 500 }, - new Materials[] { Materials.InfusedGold, Materials.Shadow, Materials.InfusedAir, Materials.InfusedEarth, - Materials.InfusedFire, Materials.InfusedWater, Materials.InfusedEntropy, - Materials.InfusedOrder }, - OrePrefixes.oreEndstone, - 24, - 60, - 8, - 24, - 120, - 1, - 100, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.HV.ordinal(), - ItemMiningDrones.DroneTiers.LuV.ordinal(), - 200); + "basicMagicAsteroid", + null, + null, + new int[] { 3500, 3500, 500, 500, 500, 500, 500, 500 }, + new Materials[] { Materials.InfusedGold, Materials.Shadow, Materials.InfusedAir, Materials.InfusedEarth, + Materials.InfusedFire, Materials.InfusedWater, Materials.InfusedEntropy, Materials.InfusedOrder }, + OrePrefixes.oreEndstone, + 24, + 60, + 8, + 24, + 120, + 1, + 100, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.HV.ordinal(), + ItemMiningDrones.DroneTiers.LuV.ordinal(), + 200); // Niobium Asteroid addRecipesToDrones( - "niobiumAsteroid", - null, - null, - new int[] { 3000, 2000, 1500, 3500 }, - new Materials[] { Materials.Niobium, Materials.Quantium, Materials.Ytterbium, Materials.Yttrium }, - OrePrefixes.oreEndstone, - 30, - 120, - 30, - 160, - 120, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.IV.ordinal(), - ItemMiningDrones.DroneTiers.UHV.ordinal(), - 160); + "niobiumAsteroid", + null, + null, + new int[] { 3000, 2000, 1500, 3500 }, + new Materials[] { Materials.Niobium, Materials.Quantium, Materials.Ytterbium, Materials.Yttrium }, + OrePrefixes.oreEndstone, + 30, + 120, + 30, + 160, + 120, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.IV.ordinal(), + ItemMiningDrones.DroneTiers.UHV.ordinal(), + 160); // Quartz Asteroid addRecipesToDrones( - "quartzAsteroid", - null, - null, - new int[] { 3000, 2250, 2250, 2500 }, - new Materials[] { Materials.Quartzite, Materials.CertusQuartz, Materials.NetherQuartz, - Materials.Vanadium }, - OrePrefixes.oreEndstone, - 20, - 80, - 20, - 120, - 50, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.MV.ordinal(), - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - 230); + "quartzAsteroid", + null, + null, + new int[] { 3000, 2250, 2250, 2500 }, + new Materials[] { Materials.Quartzite, Materials.CertusQuartz, Materials.NetherQuartz, Materials.Vanadium }, + OrePrefixes.oreEndstone, + 20, + 80, + 20, + 120, + 50, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.MV.ordinal(), + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + 230); // Lutetium Asteroid addRecipesToDrones( - "lutetiumAsteroid", - null, - null, - new int[] { 1500, 1000, 1500, 500, 5500 }, - new Materials[] { Materials.Tellurium, Materials.Thulium, Materials.Tantalum, Materials.Lutetium, - Materials.Redstone }, - OrePrefixes.oreEndstone, - 20, - 80, - 40, - 240, - 90, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.IV.ordinal(), - ItemMiningDrones.DroneTiers.UHV.ordinal(), - 100); + "lutetiumAsteroid", + null, + null, + new int[] { 1500, 1000, 1500, 500, 5500 }, + new Materials[] { Materials.Tellurium, Materials.Thulium, Materials.Tantalum, Materials.Lutetium, + Materials.Redstone }, + OrePrefixes.oreEndstone, + 20, + 80, + 40, + 240, + 90, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.IV.ordinal(), + ItemMiningDrones.DroneTiers.UHV.ordinal(), + 100); // Silicon Asteroid addRecipesToDrones( - "siliconAsteroid", - null, - null, - new int[] { 2000, 4500, 2500 }, - new Materials[] { Materials.Mica, Materials.Silicon, Materials.SiliconSG }, - OrePrefixes.oreEndstone, - 20, - 80, - 50, - 250, - 60, - 2, - 25 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.HV.ordinal(), - ItemMiningDrones.DroneTiers.LuV.ordinal(), - 200); + "siliconAsteroid", + null, + null, + new int[] { 2000, 4500, 2500 }, + new Materials[] { Materials.Mica, Materials.Silicon, Materials.SiliconSG }, + OrePrefixes.oreEndstone, + 20, + 80, + 50, + 250, + 60, + 2, + 25 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.HV.ordinal(), + ItemMiningDrones.DroneTiers.LuV.ordinal(), + 200); // Phosphate Asteroid addRecipesToDrones( - "phosphateAsteroid", - null, - null, - new int[] { 4500, 2500, 3000 }, - new Materials[] { Materials.Phosphate, Materials.TricalciumPhosphate, Materials.Sulfur }, - OrePrefixes.oreEndstone, - 20, - 150, - 60, - 250, - 60, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.IV.ordinal(), - ItemMiningDrones.DroneTiers.UIV.ordinal(), - 150); + "phosphateAsteroid", + null, + null, + new int[] { 4500, 2500, 3000 }, + new Materials[] { Materials.Phosphate, Materials.TricalciumPhosphate, Materials.Sulfur }, + OrePrefixes.oreEndstone, + 20, + 150, + 60, + 250, + 60, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.IV.ordinal(), + ItemMiningDrones.DroneTiers.UIV.ordinal(), + 150); // Lead Asteroid addRecipesToDrones( - "leadAsteroid", - null, - null, - new int[] { 3000, 2500, 2500, 2000 }, - new Materials[] { Materials.Lead, Materials.Arsenic, Materials.Barium, Materials.Lepidolite }, - OrePrefixes.oreEndstone, - 30, - 100, - 5, - 150, - 20, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_EV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.UV.ordinal(), - 220); + "leadAsteroid", + null, + null, + new int[] { 3000, 2500, 2500, 2000 }, + new Materials[] { Materials.Lead, Materials.Arsenic, Materials.Barium, Materials.Lepidolite }, + OrePrefixes.oreEndstone, + 30, + 100, + 5, + 150, + 20, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_EV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.UV.ordinal(), + 220); // Adamantium Asteroid addRecipesToDrones( - "adamantiumAsteroid", - null, - null, - new int[] { 2500, 2000, 2000, 2000, 1500 }, - new Materials[] { Materials.Adamantium, Materials.Bismuth, Materials.Antimony, Materials.Gallium, - Materials.Lithium }, - OrePrefixes.oreEndstone, - 30, - 120, - 5, - 120, - 20, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_EV, - ItemMiningDrones.DroneTiers.EV.ordinal(), - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - 300); + "adamantiumAsteroid", + null, + null, + new int[] { 2500, 2000, 2000, 2000, 1500 }, + new Materials[] { Materials.Adamantium, Materials.Bismuth, Materials.Antimony, Materials.Gallium, + Materials.Lithium }, + OrePrefixes.oreEndstone, + 30, + 120, + 5, + 120, + 20, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_EV, + ItemMiningDrones.DroneTiers.EV.ordinal(), + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + 300); // Tungsten-Titanium Asteroid addRecipesToDrones( - "tungstenTitaniumAsteroid", - null, - null, - new int[] { 3000, 3000, 2000, 1500, 500 }, - new Materials[] { Materials.Tungsten, Materials.Titanium, Materials.Neodymium, Materials.Molybdenum, - Materials.Tungstate }, - OrePrefixes.oreEndstone, - 30, - 70, - 60, - 200, - 120, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.LuV.ordinal(), - 100); + "tungstenTitaniumAsteroid", + null, + null, + new int[] { 3000, 3000, 2000, 1500, 500 }, + new Materials[] { Materials.Tungsten, Materials.Titanium, Materials.Neodymium, Materials.Molybdenum, + Materials.Tungstate }, + OrePrefixes.oreEndstone, + 30, + 70, + 60, + 200, + 120, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.LuV.ordinal(), + 100); // Blue Asteroid addRecipesToDrones( - "blueAsteroid", - null, - null, - new int[] { 6000, 2000, 1000, 1000 }, - new Materials[] { Materials.Lapis, Materials.Calcite, Materials.Lazurite, Materials.Sodalite }, - OrePrefixes.oreEndstone, - 10, - 50, - 20, - 200, - 60, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.HV.ordinal(), - ItemMiningDrones.DroneTiers.UV.ordinal(), - 250); + "blueAsteroid", + null, + null, + new int[] { 6000, 2000, 1000, 1000 }, + new Materials[] { Materials.Lapis, Materials.Calcite, Materials.Lazurite, Materials.Sodalite }, + OrePrefixes.oreEndstone, + 10, + 50, + 20, + 200, + 60, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.HV.ordinal(), + ItemMiningDrones.DroneTiers.UV.ordinal(), + 250); // Aluminium-LanthLine Asteroid addRecipesToDrones( - "aluminiumLanthlineAsteroid", - null, - null, - new int[] { 3500, 1500, 2500, 2500 }, - new Materials[] { Materials.Aluminium, Materials.Bauxite, Materials.Monazite, Materials.Bastnasite }, - OrePrefixes.oreEndstone, - 10, - 80, - 40, - 120, - 60, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.MV.ordinal(), - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - 250); + "aluminiumLanthlineAsteroid", + null, + null, + new int[] { 3500, 1500, 2500, 2500 }, + new Materials[] { Materials.Aluminium, Materials.Bauxite, Materials.Monazite, Materials.Bastnasite }, + OrePrefixes.oreEndstone, + 10, + 80, + 40, + 120, + 60, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.MV.ordinal(), + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + 250); - if (Loader.isModLoaded("miscutils")) { - // Everglades Asteroid - addRecipesToDrones( - "evergladesAsteroid", - null, - null, - new int[] { 600, 400, 1500, 1500, 1000, 400, 1000, 600, 1000, 1000, 1000 }, - new ItemStack[] { new ItemStack(GameRegistry.findItem("miscutils", "oreKoboldite"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreCrocoite"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreGadoliniteY"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreLepersonnite"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreZircon"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreLautarite"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreHoneaite"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreAlburnite"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreRareEarthI"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreRareEarthII"), 64), - new ItemStack(GameRegistry.findItem("miscutils", "oreRareEarthIII"), 64) }, - 10, - 20, - 110, - 230, - 200, - 1, - 25 * SECONDS, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - ItemMiningDrones.DroneTiers.UHV.ordinal(), - 100); - } + // Everglades Asteroid + addRecipesToDrones( + "evergladesAsteroid", + null, + null, + new int[] { 600, 400, 1500, 1500, 1000, 400, 1000, 600, 1000, 1000, 1000 }, + new ItemStack[] { MaterialsAlloy.KOBOLDITE.getOre(64), MaterialsOres.CROCROITE.getOre(64), + MaterialsOres.GADOLINITE_Y.getOre(64), MaterialsOres.LEPERSONNITE.getOre(64), + MaterialsOres.ZIRCON.getOre(64), MaterialsOres.LAUTARITE.getOre(64), MaterialsOres.HONEAITE.getOre(64), + MaterialsOres.ALBURNITE.getOre(64), MaterialMisc.RARE_EARTH_LOW.getOre(64), + MaterialMisc.RARE_EARTH_MID.getOre(64), MaterialMisc.RARE_EARTH_HIGH.getOre(64) }, + 10, + 20, + 110, + 230, + 200, + 1, + 25 * SECONDS, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + ItemMiningDrones.DroneTiers.UHV.ordinal(), + 100); // Draconic Asteroid addRecipesToDrones( - "draconicAsteroid", - null, - null, - new int[] { 6500, 2500, 1000 }, - new Materials[] { Materials.Draconium, Materials.DraconiumAwakened, Materials.ElectrumFlux }, - OrePrefixes.oreEndstone, - 15, - 60, - 60, - 200, - 360, - 2, - 30 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.LuV.ordinal(), - ItemMiningDrones.DroneTiers.UHV.ordinal(), - 190); + "draconicAsteroid", + null, + null, + new int[] { 6500, 2500, 1000 }, + new Materials[] { Materials.Draconium, Materials.DraconiumAwakened, Materials.ElectrumFlux }, + OrePrefixes.oreEndstone, + 15, + 60, + 60, + 200, + 360, + 2, + 30 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.LuV.ordinal(), + ItemMiningDrones.DroneTiers.UHV.ordinal(), + 190); // CHEEEEEESEEE Asteroid addRecipesToDrones( - "cheeseAsteroid", - null, - null, - new int[] { 10000 }, - new Materials[] { Materials.Cheese }, - OrePrefixes.oreEndstone, - 1, - 30, - 90, - 200, - 240, - 2, - 50 * SECONDS, - (int) TierEU.RECIPE_ZPM, - ItemMiningDrones.DroneTiers.IV.ordinal(), - ItemMiningDrones.DroneTiers.UXV.ordinal(), - 10); + "cheeseAsteroid", + null, + null, + new int[] { 10000 }, + new Materials[] { Materials.Cheese }, + OrePrefixes.oreEndstone, + 1, + 30, + 90, + 200, + 240, + 2, + 50 * SECONDS, + (int) TierEU.RECIPE_ZPM, + ItemMiningDrones.DroneTiers.IV.ordinal(), + ItemMiningDrones.DroneTiers.UXV.ordinal(), + 10); // Ardite/Cobalt Asteroid addRecipesToDrones( - "arditeCobaltAsteroid", - null, - null, - new int[] { 3750, 3750, 2500 }, - new Materials[] { Materials.Cobalt, Materials.Ardite, Materials.Manyullyn }, - OrePrefixes.ore, - 20, - 90, - 30, - 100, - 180, - 1, - 50 * SECONDS, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.EV.ordinal(), - ItemMiningDrones.DroneTiers.UHV.ordinal(), - 150); + "arditeCobaltAsteroid", + null, + null, + new int[] { 3750, 3750, 2500 }, + new Materials[] { Materials.Cobalt, Materials.Ardite, Materials.Manyullyn }, + OrePrefixes.ore, + 20, + 90, + 30, + 100, + 180, + 1, + 50 * SECONDS, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.EV.ordinal(), + ItemMiningDrones.DroneTiers.UHV.ordinal(), + 150); // Europium Asteroid addRecipesToDrones( - "europiumAsteroid", - null, - null, - new int[] { 4000, 4000, 1500, 500 }, - new Materials[] { Materials.Ledox, Materials.CallistoIce, Materials.Borax, Materials.Europium }, - OrePrefixes.oreEndstone, - 40, - 120, - 40, - 60, - 240, - 2, - 50 * SECONDS, - (int) TierEU.RECIPE_ZPM, - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - ItemMiningDrones.DroneTiers.UXV.ordinal(), - 150); + "europiumAsteroid", + null, + null, + new int[] { 4000, 4000, 1500, 500 }, + new Materials[] { Materials.Ledox, Materials.CallistoIce, Materials.Borax, Materials.Europium }, + OrePrefixes.oreEndstone, + 40, + 120, + 40, + 60, + 240, + 2, + 50 * SECONDS, + (int) TierEU.RECIPE_ZPM, + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + ItemMiningDrones.DroneTiers.UXV.ordinal(), + 150); // Cosmic Asteroid addRecipesToDrones( - "cosmicAsteroid", - null, - null, - new int[] { 2500, 2500, 2500, 2500 }, - new Materials[] { Materials.CosmicNeutronium, Materials.Neutronium, Materials.BlackPlutonium, - Materials.Bedrockium }, - OrePrefixes.oreEndstone, - 10, - 70, - 60, - 100, - 240, - 2, - 500, - (int) TierEU.RECIPE_UV, - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - ItemMiningDrones.DroneTiers.UXV.ordinal(), - 170); + "cosmicAsteroid", + null, + null, + new int[] { 2500, 2500, 2500, 2500 }, + new Materials[] { Materials.CosmicNeutronium, Materials.Neutronium, Materials.BlackPlutonium, + Materials.Bedrockium }, + OrePrefixes.oreEndstone, + 10, + 70, + 60, + 100, + 240, + 2, + 500, + (int) TierEU.RECIPE_UV, + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + ItemMiningDrones.DroneTiers.UXV.ordinal(), + 170); // Infinity Catalyst Asteroid addRecipesToDrones( - "infinityCatalystAsteroid", - null, - null, - new int[] { 5000, 3000, 2000 }, - new Materials[] { Materials.InfinityCatalyst, Materials.CosmicNeutronium, Materials.Neutronium }, - OrePrefixes.oreEndstone, - 30, - 120, - 70, - 100, - 320, - 2, - 1000, - (int) TierEU.RECIPE_UV, - ItemMiningDrones.DroneTiers.UV.ordinal(), - ItemMiningDrones.DroneTiers.UXV.ordinal(), - 150); + "infinityCatalystAsteroid", + null, + null, + new int[] { 5000, 3000, 2000 }, + new Materials[] { Materials.InfinityCatalyst, Materials.CosmicNeutronium, Materials.Neutronium }, + OrePrefixes.oreEndstone, + 30, + 120, + 70, + 100, + 320, + 2, + 1000, + (int) TierEU.RECIPE_UV, + ItemMiningDrones.DroneTiers.UV.ordinal(), + ItemMiningDrones.DroneTiers.UXV.ordinal(), + 150); // Ichorium Asteroid addRecipesToDrones( - "ichoriumAsteroid", - null, - null, - new int[] { 4500, 3000, 1500, 500, 500 }, - new Materials[] { Materials.ShadowIron, Materials.MeteoricIron, Materials.Ichorium, Materials.Desh, - Materials.Americium }, - OrePrefixes.oreEndstone, - 30, - 120, - 70, - 100, - 320, - 3, - 1000, - (int) TierEU.RECIPE_UV, - ItemMiningDrones.DroneTiers.UEV.ordinal(), - ItemMiningDrones.DroneTiers.UXV.ordinal(), - 150); + "ichoriumAsteroid", + null, + null, + new int[] { 4500, 3000, 1500, 500, 500 }, + new Materials[] { Materials.ShadowIron, Materials.MeteoricIron, Materials.Ichorium, Materials.Desh, + Materials.Americium }, + OrePrefixes.oreEndstone, + 30, + 120, + 70, + 100, + 320, + 3, + 1000, + (int) TierEU.RECIPE_UV, + ItemMiningDrones.DroneTiers.UEV.ordinal(), + ItemMiningDrones.DroneTiers.UXV.ordinal(), + 150); // Clay asteroid addRecipesToDrones( - "clayAsteroid", + "clayAsteroid", + null, + null, + new int[] { 10000 }, + new ItemStack[] { new ItemStack(Blocks.clay, 64) }, + 30, + 60, + 20, + 100, + 30, + 1, + 40 * SECONDS, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.LV.ordinal(), + ItemMiningDrones.DroneTiers.LuV.ordinal(), + 200); + + if (HardcoreEnderExpansion.isModLoaded()) { + // Mysterious Crystal Asteroid + addRecipesToDrones( + "mysteriousCrystalAsteroid", null, null, - new int[] { 10000 }, - new ItemStack[] { new ItemStack(Blocks.clay, 64) }, + new int[] { 7400, 2000, 500, 98, 2 }, + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.MysteriousCrystal, 64), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Mytryl, 64), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Oriharukon, 64), + GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.HeeEndium, 64), + GTModHandler.getModItem(HardcoreEnderExpansion.ID, "end_powder_ore", 64) }, 30, 60, - 20, - 100, - 30, + 65, + 120, + 300, 1, - 40 * SECONDS, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.LV.ordinal(), - ItemMiningDrones.DroneTiers.LuV.ordinal(), - 200); - - if (Loader.isModLoaded("HardcoreEnderExpansion")) { - // Mysterious Crystal Asteroid - addRecipesToDrones( - "mysteriousCrystalAsteroid", - null, - null, - new int[] { 7400, 2000, 500, 98, 2 }, - new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.MysteriousCrystal, 64), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Mytryl, 64), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.Oriharukon, 64), - GTOreDictUnificator.get(OrePrefixes.oreEndstone, Materials.HeeEndium, 64), - new ItemStack(GameRegistry.findItem("HardcoreEnderExpansion", "end_powder_ore"), 64) }, - 30, - 60, - 65, - 120, - 300, - 1, - 500, - (int) TierEU.RECIPE_ZPM, - ItemMiningDrones.DroneTiers.IV.ordinal(), - ItemMiningDrones.DroneTiers.UXV.ordinal(), - 220); + 500, + (int) TierEU.RECIPE_ZPM, + ItemMiningDrones.DroneTiers.IV.ordinal(), + ItemMiningDrones.DroneTiers.UXV.ordinal(), + 220); } - if (Loader.isModLoaded("bartworks")) { - // Uranium-Plutonium Asteroid - addRecipesToDrones( - "uraniumPlutoniumAsteroid", - null, - null, - new int[] { 3000, 2450, 2450, 2000, 100 }, - new Materials[] { Materials.Uranium, Materials.Uranium235, Materials.Plutonium, - Materials.Plutonium241, WerkstoffLoader.Thorianit.getBridgeMaterial() }, - OrePrefixes.ore, - 40, - 180, - 30, - 70, - 120, - 1, - 20 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.HV.ordinal(), - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - 150); + // Uranium-Plutonium Asteroid + addRecipesToDrones( + "uraniumPlutoniumAsteroid", + null, + null, + new int[] { 3000, 2450, 2450, 2000, 100 }, + new Materials[] { Materials.Uranium, Materials.Uranium235, Materials.Plutonium, Materials.Plutonium241, + WerkstoffLoader.Thorianit.getBridgeMaterial() }, + OrePrefixes.ore, + 40, + 180, + 30, + 70, + 120, + 1, + 20 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.HV.ordinal(), + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + 150); - // Holmium/Samarium Asteroid - addRecipesToDrones( - "holmiumSamariumAsteroid", - null, - null, - new int[] { 2000, 3000, 3000, 2000 }, - new Materials[] { Materials.Holmium, Materials.Samarium, - WerkstoffLoader.Tiberium.getBridgeMaterial(), Materials.Strontium }, - OrePrefixes.ore, - 15, - 50, - 40, - 80, - 260, - 2, - 25 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.UV.ordinal(), - ItemMiningDrones.DroneTiers.UXV.ordinal(), - 75); + // Holmium/Samarium Asteroid + addRecipesToDrones( + "holmiumSamariumAsteroid", + null, + null, + new int[] { 2000, 3000, 3000, 2000 }, + new Materials[] { Materials.Holmium, Materials.Samarium, WerkstoffLoader.Tiberium.getBridgeMaterial(), + Materials.Strontium }, + OrePrefixes.ore, + 15, + 50, + 40, + 80, + 260, + 2, + 25 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.UV.ordinal(), + ItemMiningDrones.DroneTiers.UXV.ordinal(), + 75); - // PlatLine Pure Asteroid - addRecipesToDrones( - "platlinePureAsteroid", - null, - null, - new int[] { 3800, 2000, 1500, 500, 1200, 1000 }, - new Materials[] { Materials.Platinum, Materials.Palladium, Materials.Iridium, Materials.Osmium, - WerkstoffLoader.Ruthenium.getBridgeMaterial(), - WerkstoffLoader.Rhodium.getBridgeMaterial() }, - OrePrefixes.dust, - 10, - 30, - 25, - 200, - 360, - 3, - 500, - (int) TierEU.RECIPE_ZPM, - ItemMiningDrones.DroneTiers.ZPM.ordinal(), - ItemMiningDrones.DroneTiers.UEV.ordinal(), - 60); + // PlatLine Pure Asteroid + addRecipesToDrones( + "platlinePureAsteroid", + null, + null, + new int[] { 3800, 2000, 1500, 500, 1200, 1000 }, + new Materials[] { Materials.Platinum, Materials.Palladium, Materials.Iridium, Materials.Osmium, + WerkstoffLoader.Ruthenium.getBridgeMaterial(), WerkstoffLoader.Rhodium.getBridgeMaterial() }, + OrePrefixes.dust, + 10, + 30, + 25, + 200, + 360, + 3, + 500, + (int) TierEU.RECIPE_ZPM, + ItemMiningDrones.DroneTiers.ZPM.ordinal(), + ItemMiningDrones.DroneTiers.UEV.ordinal(), + 60); - // Magnesium Asteroid - addRecipesToDrones( - "magnesiumAsteroid", - null, - null, - new int[] { 4000, 3000, 3000 }, - new Materials[] { Materials.Magnesium, Materials.Manganese, - WerkstoffLoader.Fluorspar.getBridgeMaterial() }, - OrePrefixes.ore, - 10, - 80, - 10, - 200, - 60, - 1, - 20 * SECONDS, - (int) TierEU.RECIPE_IV, - ItemMiningDrones.DroneTiers.EV.ordinal(), - ItemMiningDrones.DroneTiers.UHV.ordinal(), - 250); - } + // Magnesium Asteroid + addRecipesToDrones( + "magnesiumAsteroid", + null, + null, + new int[] { 4000, 3000, 3000 }, + new Materials[] { Materials.Magnesium, Materials.Manganese, WerkstoffLoader.Fluorspar.getBridgeMaterial() }, + OrePrefixes.ore, + 10, + 80, + 10, + 200, + 60, + 1, + 20 * SECONDS, + (int) TierEU.RECIPE_IV, + ItemMiningDrones.DroneTiers.EV.ordinal(), + ItemMiningDrones.DroneTiers.UHV.ordinal(), + 250); - if (Loader.isModLoaded("GoodGenerator")) { - // Lanthanum Asteroid - addRecipesToDrones( - "lanthanumAsteroid", - null, - null, - new int[] { 1500, 2000, 3000, 3500 }, - new Materials[] { Materials.Trinium, Materials.Lanthanum, GGMaterial.orundum.getBridgeMaterial(), - Materials.Silver }, - OrePrefixes.ore, - 30, - 120, - 30, - 230, - 120, - 2, - 25 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.IV.ordinal(), - ItemMiningDrones.DroneTiers.UIV.ordinal(), - 150); + // Lanthanum Asteroid + addRecipesToDrones( + "lanthanumAsteroid", + null, + null, + new int[] { 1500, 2000, 3000, 3500 }, + new Materials[] { Materials.Trinium, Materials.Lanthanum, GGMaterial.orundum.getBridgeMaterial(), + Materials.Silver }, + OrePrefixes.ore, + 30, + 120, + 30, + 230, + 120, + 2, + 25 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.IV.ordinal(), + ItemMiningDrones.DroneTiers.UIV.ordinal(), + 150); - // Tengam Asteroid - addRecipesToDrones( - "tengamAsteroid", - null, - null, - new int[] { 100, 1650, 3500, 2250, 2500 }, - new Materials[] { Materials.Dilithium, GGMaterial.orundum.getBridgeMaterial(), Materials.Vanadium, - Materials.Ytterbium, Materials.TengamRaw }, - OrePrefixes.ore, - 5, - 100, - 20, - 100, - 120, - 3, - 25 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.UEV.ordinal(), - ItemMiningDrones.DroneTiers.UXV.ordinal(), - 50); + // Tengam Asteroid + addRecipesToDrones( + "tengamAsteroid", + null, + null, + new int[] { 100, 1650, 3500, 2250, 2500 }, + new Materials[] { Materials.Dilithium, GGMaterial.orundum.getBridgeMaterial(), Materials.Vanadium, + Materials.Ytterbium, Materials.TengamRaw }, + OrePrefixes.ore, + 5, + 100, + 20, + 100, + 120, + 3, + 25 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.UEV.ordinal(), + ItemMiningDrones.DroneTiers.UXV.ordinal(), + 50); - // Naquadah Asteroid - addRecipesToDrones( - "naquadahAsteroid", - null, - null, - new int[] { 4000, 3500, 2500 }, - new Materials[] { GGMaterial.naquadahEarth.getBridgeMaterial(), - GGMaterial.enrichedNaquadahEarth.getBridgeMaterial(), - GGMaterial.naquadriaEarth.getBridgeMaterial() }, - OrePrefixes.ore, - 20, - 80, - 50, - 150, - 240, - 1, - 50 * SECONDS, - (int) TierEU.RECIPE_LuV, - ItemMiningDrones.DroneTiers.IV.ordinal(), - ItemMiningDrones.DroneTiers.UV.ordinal(), - 200); - } + // Naquadah Asteroid + addRecipesToDrones( + "naquadahAsteroid", + null, + null, + new int[] { 4000, 3500, 2500 }, + new Materials[] { GGMaterial.naquadahEarth.getBridgeMaterial(), + GGMaterial.enrichedNaquadahEarth.getBridgeMaterial(), GGMaterial.naquadriaEarth.getBridgeMaterial() }, + OrePrefixes.ore, + 20, + 80, + 50, + 150, + 240, + 1, + 50 * SECONDS, + (int) TierEU.RECIPE_LuV, + ItemMiningDrones.DroneTiers.IV.ordinal(), + ItemMiningDrones.DroneTiers.UV.ordinal(), + 200); - if (Loader.isModLoaded("kubatech")) { - // Draconic Core Ruin + // Draconic Core Ruin + if (DraconicEvolution.isModLoaded()) { addRecipesToDrones( - "draconicCoreRuin", - null, - null, - new int[] { 100, 100, 9800 }, - new ItemStack[] { GTModHandler.getModItem("kubatech", "kubaitems", 1, 38), - GTModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0), - ItemList.ZPM.getWithCharge(1, Integer.MAX_VALUE - 1) }, - 1, - 1, - 50, - 200, - 1000, - 3, - 100 * SECONDS, - (int) TierEU.RECIPE_UEV, - ItemMiningDrones.DroneTiers.UHV.ordinal(), - ItemMiningDrones.DroneTiers.UIV.ordinal(), - 1); + "draconicCoreRuin", + null, + null, + new int[] { 100, 100, 9800 }, + new ItemStack[] { kubatech.api.enums.ItemList.DEFCDraconicSchematic.get(1), + GTModHandler.getModItem(DraconicEvolution.ID, "draconicCore", 1, 0), + ItemList.ZPM.getWithCharge(1, Integer.MAX_VALUE - 1) }, + 1, + 1, + 50, + 200, + 1000, + 3, + 100 * SECONDS, + (int) TierEU.RECIPE_UEV, + ItemMiningDrones.DroneTiers.UHV.ordinal(), + ItemMiningDrones.DroneTiers.UIV.ordinal(), + 1); } } @@ -937,9 +923,9 @@ public static Optional getTierFromDrone(ItemStack drone) { } private static void addRecipesToDrones(String asteroidName, ItemStack[] aItemInputs, FluidStack[] aFluidInputs, - int[] aChances, ItemStack[] aItemOutputs, int minSize, int maxSize, int minDistance, int maxDistance, - int computationRequiredPerSec, int minModuleTier, int duration, int EUt, int startDroneTier, - int endDroneTier, int recipeWeight) { + int[] aChances, ItemStack[] aItemOutputs, int minSize, int maxSize, int minDistance, int maxDistance, + int computationRequiredPerSec, int minModuleTier, int duration, int EUt, int startDroneTier, int endDroneTier, + int recipeWeight) { ItemStack[] tItemInputs; if (aItemInputs == null) { tItemInputs = new ItemStack[3]; @@ -952,27 +938,27 @@ private static void addRecipesToDrones(String asteroidName, ItemStack[] aItemInp tItemInputs[1] = MINING_DRILLS[i]; tItemInputs[2] = MINING_RODS[i]; IG_RecipeAdder.addSpaceMiningRecipe( - asteroidName, - tItemInputs, - aFluidInputs, - aChances, - aItemOutputs, - minSize + (int) Math.pow(2, i - startDroneTier) - 1, - maxSize + (int) Math.pow(2, i - startDroneTier) - 1, - minDistance, - maxDistance, - computationRequiredPerSec, - minModuleTier, - (int) Math.ceil(duration / Math.sqrt(i - startDroneTier + 1)), - EUt, - recipeWeight); + asteroidName, + tItemInputs, + aFluidInputs, + aChances, + aItemOutputs, + minSize + (int) Math.pow(2, i - startDroneTier) - 1, + maxSize + (int) Math.pow(2, i - startDroneTier) - 1, + minDistance, + maxDistance, + computationRequiredPerSec, + minModuleTier, + (int) Math.ceil(duration / Math.sqrt(i - startDroneTier + 1)), + EUt, + recipeWeight); } } private static void addRecipesToDrones(String asteroidName, ItemStack[] aItemInputs, FluidStack[] aFluidInputs, - int[] aChances, Materials[] ores, OrePrefixes orePrefixes, int minSize, int maxSize, int minDistance, - int maxDistance, int computationRequiredPerSec, int minModuleTier, int duration, int EUt, - int startDroneTier, int endDroneTier, int recipeWeight) { + int[] aChances, Materials[] ores, OrePrefixes orePrefixes, int minSize, int maxSize, int minDistance, + int maxDistance, int computationRequiredPerSec, int minModuleTier, int duration, int EUt, int startDroneTier, + int endDroneTier, int recipeWeight) { ItemStack[] tItemInputs; if (aItemInputs == null) { tItemInputs = new ItemStack[3]; @@ -985,21 +971,21 @@ private static void addRecipesToDrones(String asteroidName, ItemStack[] aItemInp tItemInputs[1] = MINING_DRILLS[i]; tItemInputs[2] = MINING_RODS[i]; IG_RecipeAdder.addSpaceMiningRecipe( - asteroidName, - tItemInputs, - aFluidInputs, - aChances, - ores, - orePrefixes, - minSize + (int) Math.pow(2, i - startDroneTier) - 1, - maxSize + (int) Math.pow(2, i - startDroneTier) - 1, - minDistance, - maxDistance, - computationRequiredPerSec, - minModuleTier, - (int) Math.ceil(duration / Math.sqrt(i - startDroneTier + 1)), - (int) Math.ceil(EUt * Math.sqrt(i - startDroneTier + 1)), - recipeWeight); + asteroidName, + tItemInputs, + aFluidInputs, + aChances, + ores, + orePrefixes, + minSize + (int) Math.pow(2, i - startDroneTier) - 1, + maxSize + (int) Math.pow(2, i - startDroneTier) - 1, + minDistance, + maxDistance, + computationRequiredPerSec, + minModuleTier, + (int) Math.ceil(duration / Math.sqrt(i - startDroneTier + 1)), + (int) Math.ceil(EUt * Math.sqrt(i - startDroneTier + 1)), + recipeWeight); } } @@ -1031,7 +1017,8 @@ public GTRecipe getRandom() { int i = 0; double r = Math.random() * totalWeight; while (i < recipes.size() - 1) { - SpaceMiningData data = recipes.get(i).getMetadata(IGRecipeMaps.SPACE_MINING_DATA); + SpaceMiningData data = recipes.get(i) + .getMetadata(IGRecipeMaps.SPACE_MINING_DATA); if (data == null) throw new IllegalStateException("Illegal space miner recipe found"); r -= data.recipeWeight; if (r <= 0) { diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceProjectRegistration.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceProjectRegistration.java index 495150c..8de1840 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceProjectRegistration.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpaceProjectRegistration.java @@ -1,9 +1,9 @@ package com.gtnewhorizons.gtnhintergalactic.recipe; +import static gregtech.api.enums.Mods.OpenComputers; +import static gregtech.api.enums.Mods.SuperSolarPanels; import static gregtech.api.util.GTModHandler.getModItem; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -14,7 +14,6 @@ import com.gtnewhorizons.gtnhintergalactic.spaceprojects.ProjectAsteroidOutpost; import bartworks.common.loaders.ItemRegistry; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.ItemList; import gregtech.api.enums.TierEU; import gregtech.common.misc.spaceprojects.SpaceProjectManager; @@ -33,14 +32,12 @@ public class SpaceProjectRegistration implements Runnable { Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null - ? FluidRegistry.getFluid("molten.mutatedlivingsolder") - : FluidRegistry.getFluid("molten.solderingalloy"); + ? FluidRegistry.getFluid("molten.mutatedlivingsolder") + : FluidRegistry.getFluid("molten.solderingalloy"); Fluid solderLuV = FluidRegistry.getFluid("molten.indalloy140") != null - ? FluidRegistry.getFluid("molten.indalloy140") - : FluidRegistry.getFluid("molten.solderingalloy"); - - Block glass = Loader.isModLoaded("bartworks") ? ItemRegistry.bw_realglas : Blocks.glass; + ? FluidRegistry.getFluid("molten.indalloy140") + : FluidRegistry.getFluid("molten.solderingalloy"); /** * Register space projects @@ -56,45 +53,52 @@ public void run() { */ private void registerAsteroidOutpost() { ISpaceProject.ISP_Upgrade reinforcedStructure = new SPUpgrade().setUpgradeName("ReinforcedStructure") - .setUpgradeUnlocalizedName("ig.sp.upgrade.reinforcedstructure").setUpgradeTotalStages(40) - .setUpgradeVoltage(TierEU.RECIPE_UHV).setUpgradeBuildTime(500 * 20) - .setUpgradeItemsCost( - getModItem("supersolarpanel", "AdminSolarPanel", 1L, 0), - // Neutronium Borosilicate Glass - new ItemStack(glass, 24, 5), - getModItem("OpenComputers", "item", 8, 103), - CustomItemList.Machine_Multi_Computer.get(1), - ItemList.Sensor_UHV.get(1), - ItemList.Emitter_UHV.get(1)) - .setUpgradeFluidsCost(new FluidStack(solderLuV, 144 * 30)); + .setUpgradeUnlocalizedName("ig.sp.upgrade.reinforcedstructure") + .setUpgradeTotalStages(40) + .setUpgradeVoltage(TierEU.RECIPE_UHV) + .setUpgradeBuildTime(500 * 20) + .setUpgradeItemsCost( + getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1L, 0), + // Neutronium Borosilicate Glass + new ItemStack(ItemRegistry.bw_realglas, 24, 5), + getModItem(OpenComputers.ID, "item", 8, 103), + CustomItemList.Machine_Multi_Computer.get(1), + ItemList.Sensor_UHV.get(1), + ItemList.Emitter_UHV.get(1)) + .setUpgradeFluidsCost(new FluidStack(solderLuV, 144 * 30)); ISpaceProject.ISP_Upgrade improvedComputation = new SPUpgrade().setUpgradeName("ImprovedComputation") - .setUpgradeUnlocalizedName("ig.sp.upgrade.improvedcomputation").setUpgradeTotalStages(20) - .setUpgradeVoltage(TierEU.RECIPE_UEV).setUpgradeBuildTime(750 * 20) - .setUpgradeRequirements(new SPRequirements().setUpgrades(reinforcedStructure)) - .setUpgradeItemsCost( - getModItem("supersolarpanel", "PhotonicSolarPanel", 1L, 0), - getModItem("OpenComputers", "item", 32, 103), - // Cosmic Neutronium Borosilicate Glass - new ItemStack(glass, 32, 14), - CustomItemList.Machine_Multi_Computer.get(16), - ItemList.Sensor_UEV.get(1), - ItemList.Emitter_UEV.get(1)) - .setUpgradeFluidsCost(new FluidStack(solderUEV, 144 * 10)); + .setUpgradeUnlocalizedName("ig.sp.upgrade.improvedcomputation") + .setUpgradeTotalStages(20) + .setUpgradeVoltage(TierEU.RECIPE_UEV) + .setUpgradeBuildTime(750 * 20) + .setUpgradeRequirements(new SPRequirements().setUpgrades(reinforcedStructure)) + .setUpgradeItemsCost( + getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1L, 0), + getModItem(OpenComputers.ID, "item", 32, 103), + // Cosmic Neutronium Borosilicate Glass + new ItemStack(ItemRegistry.bw_realglas, 32, 14), + CustomItemList.Machine_Multi_Computer.get(16), + ItemList.Sensor_UEV.get(1), + ItemList.Emitter_UEV.get(1)) + .setUpgradeFluidsCost(new FluidStack(solderUEV, 144 * 10)); ISpaceProject asteroidOutpost = new ProjectAsteroidOutpost().setProjectName("AsteroidOutpost") - .setProjectUnlocalizedName("ig.spaceproject.asteroidoutpost") - .setProjectUpgrades(reinforcedStructure, improvedComputation) - .setProjectRequirements(new SPRequirements().setSpaceBodyType(SolarSystem.KuiperBelt.getType())) - .setProjectBuildTime(250 * 20).setProjectStages(40).setProjectVoltage(TierEU.RECIPE_UV) - .setProjectTexture(IG_UITextures.PICTURE_SPACE_PROJECT_ASTEROID_OUTPOST).setProjectItemsCost( - // Osmium Borosilicate Glass - new ItemStack(glass, 16, 5), - // Ultra High Strength Concrete - new ItemStack(IGBlocks.DysonSwarmCasing, 32, 9), - ItemList.Machine_LuV_SolarPanel.get(1), - ItemList.Block_NeutroniumPlate.get(16), - ItemList.Sensor_UV.get(1), - ItemList.Emitter_UV.get(1)) - .setProjectFluidsCost(new FluidStack(solderLuV, 144 * 20)); + .setProjectUnlocalizedName("ig.spaceproject.asteroidoutpost") + .setProjectUpgrades(reinforcedStructure, improvedComputation) + .setProjectRequirements(new SPRequirements().setSpaceBodyType(SolarSystem.KuiperBelt.getType())) + .setProjectBuildTime(250 * 20) + .setProjectStages(40) + .setProjectVoltage(TierEU.RECIPE_UV) + .setProjectTexture(IG_UITextures.PICTURE_SPACE_PROJECT_ASTEROID_OUTPOST) + .setProjectItemsCost( + // Osmium Borosilicate Glass + new ItemStack(ItemRegistry.bw_realglas, 16, 5), + // Ultra High Strength Concrete + new ItemStack(IGBlocks.DysonSwarmCasing, 32, 9), + ItemList.Machine_LuV_SolarPanel.get(1), + ItemList.Block_NeutroniumPlate.get(16), + ItemList.Sensor_UV.get(1), + ItemList.Emitter_UV.get(1)) + .setProjectFluidsCost(new FluidStack(solderLuV, 144 * 20)); SpaceProjectManager.addProject(asteroidOutpost); } @@ -104,15 +108,18 @@ private void registerAsteroidOutpost() { */ private void registerPlanetScan() { ISpaceProject planetScan = new SpaceProject().setProjectName("PlanetScan") - .setProjectUnlocalizedName("ig.spaceproject.planetscan").setProjectBuildTime(250 * 20) - .setProjectTexture(IG_UITextures.PICTURE_SPACE_PROJECT_PLANETARY_SCAN).setProjectStages(8) - .setProjectVoltage(TierEU.RECIPE_UV).setProjectItemsCost( - // Osmium Borosilicate Glass - new ItemStack(glass, 8, 5), - ItemList.Block_NeutroniumPlate.get(4), - ItemList.Sensor_UV.get(2), - ItemList.Emitter_UV.get(2)) - .setProjectFluidsCost(new FluidStack(solderLuV, 144 * 20)); + .setProjectUnlocalizedName("ig.spaceproject.planetscan") + .setProjectBuildTime(250 * 20) + .setProjectTexture(IG_UITextures.PICTURE_SPACE_PROJECT_PLANETARY_SCAN) + .setProjectStages(8) + .setProjectVoltage(TierEU.RECIPE_UV) + .setProjectItemsCost( + // Osmium Borosilicate Glass + new ItemStack(ItemRegistry.bw_realglas, 8, 5), + ItemList.Block_NeutroniumPlate.get(4), + ItemList.Sensor_UV.get(2), + ItemList.Emitter_UV.get(2)) + .setProjectFluidsCost(new FluidStack(solderLuV, 144 * 20)); SpaceProjectManager.addProject(planetScan); } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpacePumpingRecipes.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpacePumpingRecipes.java index f6e1fb2..e439009 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpacePumpingRecipes.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/SpacePumpingRecipes.java @@ -51,7 +51,9 @@ public static void addPumpingRecipes() { RECIPES.put(Pair.of(5, 3), Materials.SaltWater.getFluid(2800000)); RECIPES.put(Pair.of(5, 4), Materials.Helium.getGas(1400000)); RECIPES.put(Pair.of(5, 5), Materials.LiquidOxygen.getGas(896000)); + RECIPES.put(Pair.of(5, 6), WerkstoffLoader.Neon.getFluidOrGas(32000)); RECIPES.put(Pair.of(5, 7), Materials.Argon.getGas(32000)); + RECIPES.put(Pair.of(5, 8), WerkstoffLoader.Krypton.getFluidOrGas(8000)); RECIPES.put(Pair.of(5, 9), Materials.Methane.getGas(1792000)); RECIPES.put(Pair.of(5, 10), FluidRegistry.getFluidStack("liquid_hydricsulfur", 392000)); RECIPES.put(Pair.of(5, 11), Materials.Ethane.getGas(1194000)); @@ -60,6 +62,7 @@ public static void addPumpingRecipes() { RECIPES.put(Pair.of(6, 1), Materials.Deuterium.getGas(1568000)); RECIPES.put(Pair.of(6, 2), Materials.Tritium.getGas(240000)); RECIPES.put(Pair.of(6, 3), Materials.Ammonia.getGas(240000)); + RECIPES.put(Pair.of(6, 4), WerkstoffLoader.Xenon.getFluidOrGas(16000)); RECIPES.put(Pair.of(6, 5), Materials.Ethylene.getGas(1792000)); // T7 @@ -76,15 +79,6 @@ public static void addPumpingRecipes() { RECIPES.put(Pair.of(8, 6), Materials.Radon.getGas(64000)); RECIPES.put(Pair.of(8, 7), Materials.Tin.getMolten(672000)); - if (Mods.BartWorks.isModLoaded()) { - // T5 - RECIPES.put(Pair.of(5, 6), WerkstoffLoader.Neon.getFluidOrGas(32000)); - RECIPES.put(Pair.of(5, 8), WerkstoffLoader.Krypton.getFluidOrGas(8000)); - - // T6 - RECIPES.put(Pair.of(6, 4), WerkstoffLoader.Xenon.getFluidOrGas(16000)); - } - if (Mods.GalaxySpace.isModLoaded()) { // T8 RECIPES.put(Pair.of(8, 4), FluidRegistry.getFluidStack("unknowwater", 672000)); diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceAssemblerFrontend.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceAssemblerFrontend.java index ff86f55..389a6a9 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceAssemblerFrontend.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceAssemblerFrontend.java @@ -28,10 +28,10 @@ public class SpaceAssemblerFrontend extends RecipeMapFrontend { public SpaceAssemblerFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super( - uiPropertiesBuilder, - neiPropertiesBuilder.neiSpecialInfoFormatter(new SpaceAssemblerSpecialValueFormatter())); + uiPropertiesBuilder, + neiPropertiesBuilder.neiSpecialInfoFormatter(new SpaceAssemblerSpecialValueFormatter())); } @Override @@ -55,13 +55,19 @@ public void addProgressBar(ModularWindow.Builder builder, Supplier progre int bar2Width = 18; List> splitProgress = splitProgress(progressSupplier, bar1Width, bar2Width); builder.widget( - new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_1, 17) - .setDirection(ProgressBar.Direction.RIGHT).setProgress(splitProgress.get(0)) - .setSynced(false, false).setPos(new Pos2d(88, 8).add(windowOffset)).setSize(bar1Width, 72)); + new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_1, 17) + .setDirection(ProgressBar.Direction.RIGHT) + .setProgress(splitProgress.get(0)) + .setSynced(false, false) + .setPos(new Pos2d(88, 8).add(windowOffset)) + .setSize(bar1Width, 72)); builder.widget( - new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_2, 18) - .setDirection(ProgressBar.Direction.RIGHT).setProgress(splitProgress.get(1)) - .setSynced(false, false).setPos(new Pos2d(124, 8).add(windowOffset)).setSize(bar2Width, 72)); + new ProgressBar().setTexture(GTUITextures.PROGRESSBAR_ASSEMBLY_LINE_2, 18) + .setDirection(ProgressBar.Direction.RIGHT) + .setProgress(splitProgress.get(1)) + .setSynced(false, false) + .setPos(new Pos2d(124, 8).add(windowOffset)) + .setSize(bar2Width, 72)); } private static class SpaceAssemblerSpecialValueFormatter implements INEISpecialInfoFormatter { @@ -76,17 +82,18 @@ public List format(RecipeDisplayInfo recipeInfo) { String neededProjectLocation = recipeInfo.recipe.getMetadata(IGRecipeMaps.SPACE_LOCATION); if (neededProject != null && !neededProject.isEmpty()) { specialInfo.add( - String.format( - GCCoreUtil.translate("ig.nei.spaceassembler.project"), - SpaceProjectManager.getProject(neededProject).getLocalizedName())); + String.format( + GCCoreUtil.translate("ig.nei.spaceassembler.project"), + SpaceProjectManager.getProject(neededProject) + .getLocalizedName())); specialInfo.add( - String.format( - GCCoreUtil.translate("ig.nei.spaceassembler.projectAt"), - neededProjectLocation == null || neededProjectLocation.isEmpty() - ? GCCoreUtil.translate("ig.nei.spaceassembler.projectAnyLocation") - : GCCoreUtil.translate( - SpaceProjectManager.getLocation(neededProjectLocation) - .getUnlocalizedName()))); + String.format( + GCCoreUtil.translate("ig.nei.spaceassembler.projectAt"), + neededProjectLocation == null || neededProjectLocation.isEmpty() + ? GCCoreUtil.translate("ig.nei.spaceassembler.projectAnyLocation") + : GCCoreUtil.translate( + SpaceProjectManager.getLocation(neededProjectLocation) + .getUnlocalizedName()))); } return specialInfo; } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceMiningFrontend.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceMiningFrontend.java index ce7500a..e9f404d 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceMiningFrontend.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceMiningFrontend.java @@ -24,10 +24,10 @@ public class SpaceMiningFrontend extends RecipeMapFrontend { public SpaceMiningFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super( - uiPropertiesBuilder, - neiPropertiesBuilder.neiSpecialInfoFormatter(new SpaceMiningSpecialValueFormatter())); + uiPropertiesBuilder, + neiPropertiesBuilder.neiSpecialInfoFormatter(new SpaceMiningSpecialValueFormatter())); } @Override @@ -60,15 +60,15 @@ public List format(RecipeDisplayInfo recipeInfo) { SpaceMiningData data = recipeInfo.recipe.getMetadata(IGRecipeMaps.SPACE_MINING_DATA); if (data != null) { result.add( - GCCoreUtil.translate("ig.nei.spacemining.distance") + " " - + data.minDistance - + "-" - + data.maxDistance); + GCCoreUtil.translate("ig.nei.spacemining.distance") + " " + + data.minDistance + + "-" + + data.maxDistance); result.add(GCCoreUtil.translate("ig.nei.spacemining.size") + " " + data.minSize + "-" + data.maxSize); result.add( - GCCoreUtil.translateWithFormat( - "tt.nei.research.min_computation", - GTUtility.formatNumbers(data.computation))); + GCCoreUtil.translateWithFormat( + "tt.nei.research.min_computation", + GTUtility.formatNumbers(data.computation))); result.add(GCCoreUtil.translate("ig.nei.spacemining.weight") + " " + data.recipeWeight); } return result; diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceResearchFrontend.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceResearchFrontend.java index bd90961..5d01dad 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceResearchFrontend.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/recipe/maps/SpaceResearchFrontend.java @@ -24,10 +24,10 @@ public class SpaceResearchFrontend extends RecipeMapFrontend { public SpaceResearchFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super( - uiPropertiesBuilder, - neiPropertiesBuilder.neiSpecialInfoFormatter(new SpaceResearchSpecialValueFormatter())); + uiPropertiesBuilder, + neiPropertiesBuilder.neiSpecialInfoFormatter(new SpaceResearchSpecialValueFormatter())); } @Override @@ -59,23 +59,24 @@ private static class SpaceResearchSpecialValueFormatter implements INEISpecialIn public List format(RecipeDisplayInfo recipeInfo) { List specialInfo = new ArrayList<>(); specialInfo.add( - GCCoreUtil.translateWithFormat("tt.nei.research.min_computation", recipeInfo.recipe.mSpecialValue)); + GCCoreUtil.translateWithFormat("tt.nei.research.min_computation", recipeInfo.recipe.mSpecialValue)); String neededProject = recipeInfo.recipe.getMetadata(IGRecipeMaps.SPACE_PROJECT); String neededProjectLocation = recipeInfo.recipe.getMetadata(IGRecipeMaps.SPACE_LOCATION); if (neededProject != null && !neededProject.isEmpty()) { specialInfo.add( - String.format( - GCCoreUtil.translate("ig.nei.spaceassembler.project"), - SpaceProjectManager.getProject(neededProject).getLocalizedName())); + String.format( + GCCoreUtil.translate("ig.nei.spaceassembler.project"), + SpaceProjectManager.getProject(neededProject) + .getLocalizedName())); specialInfo.add( - String.format( - GCCoreUtil.translate("ig.nei.spaceassembler.projectAt"), - neededProjectLocation == null || neededProjectLocation.isEmpty() - ? GCCoreUtil.translate("ig.nei.spaceassembler.projectAnyLocation") - : GCCoreUtil.translate( - SpaceProjectManager.getLocation(neededProjectLocation) - .getUnlocalizedName()))); + String.format( + GCCoreUtil.translate("ig.nei.spaceassembler.projectAt"), + neededProjectLocation == null || neededProjectLocation.isEmpty() + ? GCCoreUtil.translate("ig.nei.spaceassembler.projectAnyLocation") + : GCCoreUtil.translate( + SpaceProjectManager.getLocation(neededProjectLocation) + .getUnlocalizedName()))); } return specialInfo; } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/render/RenderSpaceElevatorCable.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/render/RenderSpaceElevatorCable.java index 9ff2d8f..d3eea0b 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/render/RenderSpaceElevatorCable.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/render/RenderSpaceElevatorCable.java @@ -43,8 +43,8 @@ public class RenderSpaceElevatorCable extends TileEntitySpecialRenderer implemen /** Location of the climber texture */ private static final ResourceLocation climberTexture = new ResourceLocation( - GTNHIntergalactic.ASSET_PREFIX, - "textures/models/climber.png"); + GTNHIntergalactic.ASSET_PREFIX, + "textures/models/climber.png"); /** Model of the climber */ private static IModelCustom modelCustom; @@ -64,10 +64,10 @@ public class RenderSpaceElevatorCable extends TileEntitySpecialRenderer implemen private static final double CABLE_HEIGHT = 512.0; /** X edges of the helix */ private static final float[] edgeX = { LONG_DISTANCE, LONG_DISTANCE, SHORT_DISTANCE, -SHORT_DISTANCE, - -LONG_DISTANCE, -LONG_DISTANCE, -SHORT_DISTANCE, SHORT_DISTANCE }; + -LONG_DISTANCE, -LONG_DISTANCE, -SHORT_DISTANCE, SHORT_DISTANCE }; /** Z edges of the helix */ private static final float[] edgeZ = { SHORT_DISTANCE, -SHORT_DISTANCE, -LONG_DISTANCE, -LONG_DISTANCE, - -SHORT_DISTANCE, SHORT_DISTANCE, LONG_DISTANCE, LONG_DISTANCE }; + -SHORT_DISTANCE, SHORT_DISTANCE, LONG_DISTANCE, LONG_DISTANCE }; private static ShaderProgram cableProgram; private static int uModelProjectionMatrix; @@ -94,7 +94,7 @@ public class RenderSpaceElevatorCable extends TileEntitySpecialRenderer implemen */ public RenderSpaceElevatorCable() { modelCustom = AdvancedModelLoader - .loadModel(new ResourceLocation(GTNHIntergalactic.ASSET_PREFIX, "models/climber.obj")); + .loadModel(new ResourceLocation(GTNHIntergalactic.ASSET_PREFIX, "models/climber.obj")); } /** @@ -121,12 +121,11 @@ public void renderTileEntityAt(TileEntity tile, double x, double y, double z, fl GL11.glPushMatrix(); // If the Space Elevator is build on a low Y level the climber should reach a minimum height GL11.glTranslated( - x + 0.5, - y + 0.5 - + cableTile.getClimberHeight() - + ((CLIMBER_OFFSET + cableTile.yCoord) < MIN_CLIMBER_HEIGHT ? MIN_CLIMBER_HEIGHT - : CLIMBER_OFFSET), - z + 0.5); + x + 0.5, + y + 0.5 + + cableTile.getClimberHeight() + + ((CLIMBER_OFFSET + cableTile.yCoord) < MIN_CLIMBER_HEIGHT ? MIN_CLIMBER_HEIGHT : CLIMBER_OFFSET), + z + 0.5); GL11.glRotated(cableTile.getClimberRotation(), 0.0, 1.0, 0.0); renderClimber(); GL11.glPopMatrix(); @@ -176,9 +175,9 @@ private void renderCable(TileEntity tile, double x, double y, double z, float ti final float glowMaxV = Math.lerp(minV, maxV, 9f / 16f); cableProgram = new ShaderProgram( - "gtnhintergalactic", - "shaders/spacecable.vert.glsl", - "shaders/spacecable.frag.glsl"); + "gtnhintergalactic", + "shaders/spacecable.vert.glsl", + "shaders/spacecable.frag.glsl"); cableProgram.use(); aVertexID = cableProgram.getAttribLocation("vertexId"); @@ -223,8 +222,10 @@ private void renderCable(TileEntity tile, double x, double y, double z, float ti cableProgram.use(); GL20.glUniform1f( - uTime, - ((tile.getWorldObj().getWorldInfo().getWorldTotalTime() % 60) + timeSinceLastTick) / 60f); + uTime, + ((tile.getWorldObj() + .getWorldInfo() + .getWorldTotalTime() % 60) + timeSinceLastTick) / 60f); GL20.glUniform1i(uBaseY, (int) y - 23); modelProjection.identity(); @@ -305,7 +306,7 @@ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderB */ @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { TileEntity te = world.getTileEntity(x, y, z); if (te instanceof TileEntitySpaceElevatorCable) { if (!((TileEntitySpaceElevatorCable) te).shouldRender()) { diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/TileEntityDysonSwarm.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/TileEntityDysonSwarm.java index 27c8eb0..afbdcd1 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/TileEntityDysonSwarm.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/TileEntityDysonSwarm.java @@ -239,10 +239,10 @@ public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBu @Override public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { return structureCheck_EM(STRUCTURE_PIECE_MAIN, 10, 18, 3) && mMaintenanceHatches.size() <= 1 - && mInputBusses.size() > 0 - && mInputHatches.size() > 0 - && eInputData.size() > 0 - && (mDynamoHatches.size() > 0 || eDynamoMulti.size() > 0); + && mInputBusses.size() > 0 + && mInputHatches.size() > 0 + && eInputData.size() > 0 + && (mDynamoHatches.size() > 0 || eDynamoMulti.size() > 0); } @Override @@ -256,11 +256,13 @@ public boolean explodesOnComponentBreak(ItemStack aStack) { @Override public boolean checkRecipe_EM(ItemStack aStack) { for (MTEHatchInputBus bus : filterValidMTEs(mInputBusses)) { - for (int i = 0; i < bus.getBaseMetaTileEntity().getSizeInventory(); i++) { - ItemStack stack = bus.getBaseMetaTileEntity().getStackInSlot(i); + for (int i = 0; i < bus.getBaseMetaTileEntity() + .getSizeInventory(); i++) { + ItemStack stack = bus.getBaseMetaTileEntity() + .getStackInSlot(i); if (stack != null && stack.getItem() == IGItems.DysonSwarmItems - && stack.getItemDamage() == 0 - && moduleCount < IGConfig.dysonSwarm.maxModules + 1) { + && stack.getItemDamage() == 0 + && moduleCount < IGConfig.dysonSwarm.maxModules + 1) { int usedStackSize = Math.min(stack.stackSize, IGConfig.dysonSwarm.maxModules - moduleCount); moduleCount += usedStackSize; stack.stackSize -= usedStackSize; @@ -288,9 +290,9 @@ private void destroyModules() { } moduleCount -= moduleCount * (2 * IGConfig.dysonSwarm.destroyModuleChance) - / (Math.exp(-IGConfig.dysonSwarm.destroyModuleA * (moduleCount - 1)) + Math.exp( - IGConfig.dysonSwarm.destroyModuleB - * Math.min(eAvailableData, (long) IGConfig.dysonSwarm.destroyModuleMaxCPS))); + / (Math.exp(-IGConfig.dysonSwarm.destroyModuleA * (moduleCount - 1)) + Math.exp( + IGConfig.dysonSwarm.destroyModuleB + * Math.min(eAvailableData, (long) IGConfig.dysonSwarm.destroyModuleMaxCPS))); if (moduleCount < 0) { moduleCount = 0; @@ -323,10 +325,13 @@ public boolean addEnergyOutput_EM(long EU, long Amperes, boolean allowMixedVolta if (tHatch.maxEUOutput() < euVar && !allowMixedVoltages) { explodeMultiblock(); } - diff = tHatch.maxEUStore() - tHatch.getBaseMetaTileEntity().getStoredEU(); + diff = tHatch.maxEUStore() - tHatch.getBaseMetaTileEntity() + .getStoredEU(); if (diff > 0) { if (euVar <= diff) { - tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar); + tHatch.setEUVar( + tHatch.getBaseMetaTileEntity() + .getStoredEU() + euVar); return true; } tHatch.setEUVar(tHatch.maxEUStore()); @@ -337,10 +342,13 @@ public boolean addEnergyOutput_EM(long EU, long Amperes, boolean allowMixedVolta if (tHatch.maxEUOutput() < euVar && !allowMixedVoltages) { explodeMultiblock(); } - diff = tHatch.maxEUStore() - tHatch.getBaseMetaTileEntity().getStoredEU(); + diff = tHatch.maxEUStore() - tHatch.getBaseMetaTileEntity() + .getStoredEU(); if (diff > 0) { if (euVar <= diff) { - tHatch.setEUVar(tHatch.getBaseMetaTileEntity().getStoredEU() + euVar); + tHatch.setEUVar( + tHatch.getBaseMetaTileEntity() + .getStoredEU() + euVar); return true; } tHatch.setEUVar(tHatch.maxEUStore()); @@ -353,20 +361,20 @@ public boolean addEnergyOutput_EM(long EU, long Amperes, boolean allowMixedVolta @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side, - float aX, float aY, float aZ) { + float aX, float aY, float aZ) { ItemStack heldItem = aPlayer.getHeldItem(); // Check if the player is holding a plunger if (heldItem == null || heldItem.getItem() != MetaGeneratedTool01.INSTANCE - || heldItem.getItemDamage() != IDMetaTool01.PLUNGER.ID) { + || heldItem.getItemDamage() != IDMetaTool01.PLUNGER.ID) { return super.onRightclick(aBaseMetaTileEntity, aPlayer); } // Setup int prevCount = this.moduleCount; int maxReduction = (int) Math.min( - this.moduleCount, - MetaGeneratedTool01.getToolMaxDamage(heldItem) - MetaGeneratedTool01.getToolDamage(heldItem)); + this.moduleCount, + MetaGeneratedTool01.getToolMaxDamage(heldItem) - MetaGeneratedTool01.getToolDamage(heldItem)); ItemStack modules = new ItemStack(IGItems.DysonSwarmItems, maxReduction); // Fill player inventory @@ -376,7 +384,7 @@ public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlaye // front of the controller if (modules.stackSize > 0 && aPlayer.isSneaking()) { aPlayer.worldObj.spawnEntityInWorld( - new EntityItem(aPlayer.worldObj, aPlayer.posX, aPlayer.posY + 0.5, aPlayer.posZ, modules)); + new EntityItem(aPlayer.worldObj, aPlayer.posX, aPlayer.posY + 0.5, aPlayer.posZ, modules)); // Set moduleCount based on the number of ejected modules and damage the plunger this.moduleCount = 0; @@ -399,15 +407,19 @@ public boolean getDefaultHasMaintenanceChecks() { ****************/ @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { + int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_RECEIVER), - TextureFactory.of(IGTextures.DYSON_OVERLAY_FRONT_ACTIVE), - TextureFactory.builder().addIcon(IGTextures.DYSON_OVERLAY_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.of(IGTextures.DYSON_OVERLAY_FRONT_ACTIVE), TextureFactory.builder() + .addIcon(IGTextures.DYSON_OVERLAY_FRONT_ACTIVE_GLOW) + .glow() + .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_RECEIVER), - TextureFactory.of(IGTextures.DYSON_OVERLAY_FRONT), - TextureFactory.builder().addIcon(IGTextures.DYSON_OVERLAY_FRONT_GLOW).glow().build() }; + TextureFactory.of(IGTextures.DYSON_OVERLAY_FRONT), TextureFactory.builder() + .addIcon(IGTextures.DYSON_OVERLAY_FRONT_GLOW) + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_RECEIVER) }; } @@ -419,77 +431,84 @@ protected MultiblockTooltipBuilder createTooltip() { if (TooltipUtil.dysonLoreText != null) tt.addInfo(ITALIC + TooltipUtil.dysonLoreText); tt.addInfo(translateToLocal("gt.blockmachines.multimachine.ig.dyson.desc1")) - .addInfo( - translateToLocalFormatted( - "gt.blockmachines.multimachine.ig.dyson.desc2", - getDecimalFormat().format(IGConfig.dysonSwarm.euPerModule))) - .addInfo(translateToLocal("gt.blockmachines.multimachine.ig.dyson.desc3")) - .addInfo( - translateToLocalFormatted( - "gt.blockmachines.multimachine.ig.dyson.desc4", - getDecimalFormat().format(IGConfig.dysonSwarm.destroyModuleChance), - getDecimalFormat().format(IGConfig.dysonSwarm.destroyModuleA), - IGConfig.dysonSwarm.destroyModuleB)) - .addInfo( - translateToLocalFormatted( - "gt.blockmachines.multimachine.ig.dyson.desc5", - getDecimalFormat().format(IGConfig.dysonSwarm.coolantConsumption), - IGConfig.dysonSwarm.getCoolantStack().getLocalizedName())) - .addInfo(translateToLocal("gt.blockmachines.multimachine.ig.dyson.desc6")) - .addInfo(translateToLocal("gt.blockmachines.multimachine.ig.dyson.desc7")).addTecTechHatchInfo() - .beginStructureBlock(16, 20, 16, false).addDynamoHatch(translateToLocal("ig.dyson.structure.dynamo"), 1) - .addInputBus("1 - 11", 2).addInputHatch("1 - 11", 2) - .addOtherStructurePart(translateToLocal("ig.dyson.structure.optical"), "1 - 24", 4).addStructureInfo("") - .addStructureInfo(ITALIC + translateToLocal("ig.dyson.structure.additionally")) - .addCasingInfoRange(translateToLocal("ig.dyson.structure.receiver.base"), 53, 64, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.receiver.dish"), 81, false) - .addCasingInfoRange(translateToLocal("ig.dyson.structure.deployment.base"), 62, 72, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.deployment.core"), 1, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.deployment.magnet"), 32, false) - .addCasingInfoRange(translateToLocal("ig.dyson.structure.control.base"), 115, 138, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.control.primary"), 20, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.control.secondary"), 12, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.control.toroid"), 128, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.floor"), 256, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.coil"), 9, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.hermetic"), 1, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.frameTitanium"), 16, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.frameHSSS"), 23, false) - .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.frameUHVBase"), 64, false) - .toolTipFinisher(); + .addInfo( + translateToLocalFormatted( + "gt.blockmachines.multimachine.ig.dyson.desc2", + getDecimalFormat().format(IGConfig.dysonSwarm.euPerModule))) + .addInfo(translateToLocal("gt.blockmachines.multimachine.ig.dyson.desc3")) + .addInfo( + translateToLocalFormatted( + "gt.blockmachines.multimachine.ig.dyson.desc4", + getDecimalFormat().format(IGConfig.dysonSwarm.destroyModuleChance), + getDecimalFormat().format(IGConfig.dysonSwarm.destroyModuleA), + IGConfig.dysonSwarm.destroyModuleB)) + .addInfo( + translateToLocalFormatted( + "gt.blockmachines.multimachine.ig.dyson.desc5", + getDecimalFormat().format(IGConfig.dysonSwarm.coolantConsumption), + IGConfig.dysonSwarm.getCoolantStack() + .getLocalizedName())) + .addInfo(translateToLocal("gt.blockmachines.multimachine.ig.dyson.desc6")) + .addInfo(translateToLocal("gt.blockmachines.multimachine.ig.dyson.desc7")) + .addTecTechHatchInfo() + .beginStructureBlock(16, 20, 16, false) + .addDynamoHatch(translateToLocal("ig.dyson.structure.dynamo"), 1) + .addInputBus("1 - 11", 2) + .addInputHatch("1 - 11", 2) + .addOtherStructurePart(translateToLocal("ig.dyson.structure.optical"), "1 - 24", 4) + .addStructureInfo("") + .addStructureInfo(ITALIC + translateToLocal("ig.dyson.structure.additionally")) + .addCasingInfoRange(translateToLocal("ig.dyson.structure.receiver.base"), 53, 64, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.receiver.dish"), 81, false) + .addCasingInfoRange(translateToLocal("ig.dyson.structure.deployment.base"), 62, 72, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.deployment.core"), 1, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.deployment.magnet"), 32, false) + .addCasingInfoRange(translateToLocal("ig.dyson.structure.control.base"), 115, 138, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.control.primary"), 20, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.control.secondary"), 12, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.control.toroid"), 128, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.floor"), 256, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.coil"), 9, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.hermetic"), 1, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.frameTitanium"), 16, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.frameHSSS"), 23, false) + .addCasingInfoExactly(translateToLocal("ig.dyson.structure.base.frameUHVBase"), 64, false) + .toolTipFinisher(); return tt; } @Override public String[] getInfoData() { return new String[] { LIGHT_PURPLE + "Operational Data:" + RESET, - "Modules: " + YELLOW + GTUtility.formatNumbers(moduleCount) + RESET, - "Power Factor: " + (powerFactor < 1.0f ? RED : GREEN) - + GTUtility.formatNumbers(powerFactor * 100.0) - + "%" - + RESET, - "Theoretical Output: " + YELLOW - + GTUtility.formatNumbers((long) moduleCount * IGConfig.dysonSwarm.euPerModule * powerFactor) - + RESET - + " EU/t", - "Current Output: " + YELLOW + GTUtility.formatNumbers(euPerTick) + RESET + " EU/t", - "Computation required: " + YELLOW + GTUtility.formatNumbers(eRequiredData) + RESET + "/t", - "Maintenance Status: " + (getRepairStatus() == getIdealStatus() ? GREEN + "Working perfectly" + RESET - : RED + "Has problems" + RESET), - "---------------------------------------------" }; + "Modules: " + YELLOW + GTUtility.formatNumbers(moduleCount) + RESET, + "Power Factor: " + (powerFactor < 1.0f ? RED : GREEN) + + GTUtility.formatNumbers(powerFactor * 100.0) + + "%" + + RESET, + "Theoretical Output: " + YELLOW + + GTUtility.formatNumbers((long) moduleCount * IGConfig.dysonSwarm.euPerModule * powerFactor) + + RESET + + " EU/t", + "Current Output: " + YELLOW + GTUtility.formatNumbers(euPerTick) + RESET + " EU/t", + "Computation required: " + YELLOW + GTUtility.formatNumbers(eRequiredData) + RESET + "/t", + "Maintenance Status: " + (getRepairStatus() == getIdealStatus() ? GREEN + "Working perfectly" + RESET + : RED + "Has problems" + RESET), + "---------------------------------------------" }; } /****************** * HELPER METHODS * ******************/ public double getPowerFactor() { - WorldProvider provider = this.getBaseMetaTileEntity().getWorld().provider; + WorldProvider provider = this.getBaseMetaTileEntity() + .getWorld().provider; if (provider instanceof IOrbitDimension orbitDimension) { return IGConfig.dysonSwarm.getPowerFactor(orbitDimension.getPlanetToOrbit()); } - String className = provider.getClass().getName(); + String className = provider.getClass() + .getName(); return switch (className) { case "me.eigenraven.personalspace.world.PersonalWorldProvider" -> IGConfig.dysonSwarm.getPowerFactor("PS"); default -> IGConfig.dysonSwarm.getPowerFactor(String.valueOf(provider.dimensionId)); diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/TileEntityPlanetaryGasSiphon.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/TileEntityPlanetaryGasSiphon.java index ed7e44e..dc8536e 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/TileEntityPlanetaryGasSiphon.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/TileEntityPlanetaryGasSiphon.java @@ -65,7 +65,7 @@ * @author glowredman */ public class TileEntityPlanetaryGasSiphon extends MTEEnhancedMultiBlockBase - implements IChunkLoader, ISurvivalConstructable { + implements IChunkLoader, ISurvivalConstructable { /** Main structure of the machine */ private static final String STRUCTURE_PIECE_MAIN = "main"; @@ -73,24 +73,25 @@ public class TileEntityPlanetaryGasSiphon extends MTEEnhancedMultiBlockBase STRUCTURE_DEFINITION = StructureDefinition - .builder() - .addShape( - STRUCTURE_PIECE_MAIN, - StructureUtility.transpose( - new String[][] { { " ", " f ", " " }, { " ", " f ", " " }, { " ", " f ", " " }, - { " f ", "fcf", " f " }, { " f ", "fcf", " f " }, { " f ", "fcf", " f " }, - { "b~b", "bcb", "bbb" } })) - .addElement('f', GTStructureUtility.ofFrame(Materials.TungstenSteel)) - .addElement( - 'c', - StructureUtility - .ofBlock(WerkstoffLoader.BWBlockCasingsAdvanced, WerkstoffLoader.LuVTierMaterial.getmID())) - .addElement( - 'b', - GTStructureUtility.buildHatchAdder(TileEntityPlanetaryGasSiphon.class) - .atLeast(Maintenance, InputBus, OutputHatch, Energy).dot(1) - .casingIndex(IGTextures.CASING_INDEX_SIPHON).buildAndChain(IGBlocks.GasSiphonCasing, 0)) - .build(); + .builder() + .addShape( + STRUCTURE_PIECE_MAIN, + StructureUtility.transpose( + new String[][] { { " ", " f ", " " }, { " ", " f ", " " }, { " ", " f ", " " }, + { " f ", "fcf", " f " }, { " f ", "fcf", " f " }, { " f ", "fcf", " f " }, + { "b~b", "bcb", "bbb" } })) + .addElement('f', GTStructureUtility.ofFrame(Materials.TungstenSteel)) + .addElement( + 'c', + StructureUtility.ofBlock(WerkstoffLoader.BWBlockCasingsAdvanced, WerkstoffLoader.LuVTierMaterial.getmID())) + .addElement( + 'b', + GTStructureUtility.buildHatchAdder(TileEntityPlanetaryGasSiphon.class) + .atLeast(Maintenance, InputBus, OutputHatch, Energy) + .dot(1) + .casingIndex(IGTextures.CASING_INDEX_SIPHON) + .buildAndChain(IGBlocks.GasSiphonCasing, 0)) + .build(); /** * Create a new planetary gas siphon @@ -165,25 +166,26 @@ protected MultiblockTooltipBuilder createTooltip() { tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.type")); if (TooltipUtil.siphonLoreText != null) tt.addInfo(ITALIC + TooltipUtil.siphonLoreText); tt.addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc3")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc4")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc5")) - .beginStructureBlock(3, 7, 3, false) - .addController(GCCoreUtil.translate("ig.siphon.structure.ControllerPos")) - .addOtherStructurePart( - GCCoreUtil.translate("ig.siphon.structure.SiphonCasing"), - GCCoreUtil.translate("ig.siphon.structure.Base")) - .addOtherStructurePart( - GCCoreUtil.translate("ig.siphon.structure.ReboltedRhodiumPalladiumCasing"), - GCCoreUtil.translate("ig.siphon.structure.PillarMiddle")) - .addOtherStructurePart( - GCCoreUtil.translate("ig.siphon.structure.FrameTungstensteel"), - GCCoreUtil.translate("ig.siphon.structure.Sides")) - .addEnergyHatch(GCCoreUtil.translate("ig.siphon.structure.AnySiphonCasing"), 1) - .addMaintenanceHatch(GCCoreUtil.translate("ig.siphon.structure.AnySiphonCasing"), 1) - .addInputBus(GCCoreUtil.translate("ig.siphon.structure.AnySiphonCasing"), 1) - .addOutputHatch(GCCoreUtil.translate("ig.siphon.structure.AnySiphonCasing"), 1).toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc3")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc4")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.siphon.desc5")) + .beginStructureBlock(3, 7, 3, false) + .addController(GCCoreUtil.translate("ig.siphon.structure.ControllerPos")) + .addOtherStructurePart( + GCCoreUtil.translate("ig.siphon.structure.SiphonCasing"), + GCCoreUtil.translate("ig.siphon.structure.Base")) + .addOtherStructurePart( + GCCoreUtil.translate("ig.siphon.structure.ReboltedRhodiumPalladiumCasing"), + GCCoreUtil.translate("ig.siphon.structure.PillarMiddle")) + .addOtherStructurePart( + GCCoreUtil.translate("ig.siphon.structure.FrameTungstensteel"), + GCCoreUtil.translate("ig.siphon.structure.Sides")) + .addEnergyHatch(GCCoreUtil.translate("ig.siphon.structure.AnySiphonCasing"), 1) + .addMaintenanceHatch(GCCoreUtil.translate("ig.siphon.structure.AnySiphonCasing"), 1) + .addInputBus(GCCoreUtil.translate("ig.siphon.structure.AnySiphonCasing"), 1) + .addOutputHatch(GCCoreUtil.translate("ig.siphon.structure.AnySiphonCasing"), 1) + .toolTipFinisher(); return tt; } @@ -219,15 +221,19 @@ public ChunkCoordIntPair getActiveChunk() { */ @Override public ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean active, boolean redstone) { + int colorIndex, boolean active, boolean redstone) { if (side == facing) { if (active) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_SIPHON), - TextureFactory.of(IGTextures.SIPHON_OVERLAY_FRONT), - TextureFactory.builder().addIcon(IGTextures.SIPHON_OVERLAY_FRONT_ACTIVE_GLOW).glow().build() }; + TextureFactory.of(IGTextures.SIPHON_OVERLAY_FRONT), TextureFactory.builder() + .addIcon(IGTextures.SIPHON_OVERLAY_FRONT_ACTIVE_GLOW) + .glow() + .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_SIPHON), - TextureFactory.of(IGTextures.SIPHON_OVERLAY_FRONT), - TextureFactory.builder().addIcon(IGTextures.SIPHON_OVERLAY_FRONT_GLOW).glow().build() }; + TextureFactory.of(IGTextures.SIPHON_OVERLAY_FRONT), TextureFactory.builder() + .addIcon(IGTextures.SIPHON_OVERLAY_FRONT_GLOW) + .glow() + .build() }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(IGTextures.CASING_INDEX_SIPHON) }; } @@ -253,12 +259,14 @@ public boolean isCorrectMachinePart(ItemStack stack) { depth = 0; // return early if no input busses are present, the first bus is invalid or the TE is not on a space station - if (mInputBusses.isEmpty() || !mInputBusses.get(0).isValid()) { + if (mInputBusses.isEmpty() || !mInputBusses.get(0) + .isValid()) { resetMachine(); return SimpleCheckRecipeResult.ofFailure("no_mining_pipe"); } - if (!(this.getBaseMetaTileEntity().getWorld().provider instanceof IOrbitDimension provider)) { + if (!(this.getBaseMetaTileEntity() + .getWorld().provider instanceof IOrbitDimension provider)) { resetMachine(); return SimpleCheckRecipeResult.ofFailure("no_space_station"); } @@ -284,13 +292,18 @@ public boolean isCorrectMachinePart(ItemStack stack) { depth = stack.getItemDamage(); continue; } - if (Objects.equals(stack.getItem(), GTModHandler.getIC2Item("miningPipe", 0).getItem())) { + if (Objects.equals( + stack.getItem(), + GTModHandler.getIC2Item("miningPipe", 0) + .getItem())) { numPipes += stack.stackSize; } } - for (int i = 0; i < bus.getBaseMetaTileEntity().getSizeInventory(); i++) { - ItemStack stack = bus.getBaseMetaTileEntity().getStackInSlot(i); + for (int i = 0; i < bus.getBaseMetaTileEntity() + .getSizeInventory(); i++) { + ItemStack stack = bus.getBaseMetaTileEntity() + .getStackInSlot(i); if (stack == null) { continue; } @@ -298,7 +311,10 @@ public boolean isCorrectMachinePart(ItemStack stack) { depth = stack.getItemDamage(); continue; } - if (Objects.equals(stack.getItem(), GTModHandler.getIC2Item("miningPipe", 0).getItem())) { + if (Objects.equals( + stack.getItem(), + GTModHandler.getIC2Item("miningPipe", 0) + .getItem())) { numPipes += stack.stackSize; } } @@ -327,9 +343,10 @@ public boolean isCorrectMachinePart(ItemStack stack) { } // calculate overclockedness - int recipeEUt = depth * (4 << (2 * provider.getCelestialBody().getTierRequirement() + 2)); + int recipeEUt = depth * (4 << (2 * provider.getCelestialBody() + .getTierRequirement() + 2)); int ocLevel = MathHelper - .floor_double(Math.log10((double) this.getMaxInputVoltage() / (double) recipeEUt) / LOG4); + .floor_double(Math.log10((double) this.getMaxInputVoltage() / (double) recipeEUt) / LOG4); // apply recipe if (ocLevel < 0) { @@ -366,11 +383,11 @@ public boolean isCorrectMachinePart(ItemStack stack) { @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack stack) { return checkPiece(STRUCTURE_PIECE_MAIN, 1, 6, 0) && mMaintenanceHatches.size() == 1 - && mInputBusses.size() == 1 - && mOutputHatches.size() == 1 - && mEnergyHatches.size() == 1 - && mInputHatches.isEmpty() - && mOutputBusses.isEmpty(); + && mInputBusses.size() == 1 + && mOutputHatches.size() == 1 + && mEnergyHatches.size() == 1 + && mInputHatches.isEmpty() + && mOutputBusses.isEmpty(); } /** @@ -433,8 +450,8 @@ public void loadNBTData(NBTTagCompound aNBT) { if (aNBT.hasKey("chunkLoadingEnabled")) mChunkLoadingEnabled = aNBT.getBoolean("chunkLoadingEnabled"); if (aNBT.getBoolean("isChunkloading")) { mCurrentChunk = new ChunkCoordIntPair( - aNBT.getInteger("loadedChunkXPos"), - aNBT.getInteger("loadedChunkZPos")); + aNBT.getInteger("loadedChunkXPos"), + aNBT.getInteger("loadedChunkZPos")); } } @@ -451,13 +468,13 @@ public void loadNBTData(NBTTagCompound aNBT) { */ @Override public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer player, - float x, float y, float z, ItemStack aTool) { + float x, float y, float z, ItemStack aTool) { if (side == getBaseMetaTileEntity().getFrontFacing()) { mChunkLoadingEnabled = !mChunkLoadingEnabled; GTUtility.sendChatToPlayer( - player, - mChunkLoadingEnabled ? GTUtility.trans("502", "Mining chunk loading enabled") - : GTUtility.trans("503", "Mining chunk loading disabled")); + player, + mChunkLoadingEnabled ? GTUtility.trans("502", "Mining chunk loading enabled") + : GTUtility.trans("503", "Mining chunk loading disabled")); return true; } return super.onSolderingToolRightClick(side, wrenchingSide, player, x, y, z, aTool); @@ -490,8 +507,8 @@ public void onRemoval() { public void onPostTick(IGregTechTileEntity baseMetaTileEntity, long tick) { super.onPostTick(baseMetaTileEntity, tick); if (baseMetaTileEntity.isServerSide() && mCurrentChunk != null - && !mWorkChunkNeedsReload - && !baseMetaTileEntity.isAllowedToWork()) { + && !mWorkChunkNeedsReload + && !baseMetaTileEntity.isAllowedToWork()) { // if machine has stopped, stop chunk loading GTChunkManager.releaseTicket((TileEntity) baseMetaTileEntity); mWorkChunkNeedsReload = true; @@ -504,11 +521,11 @@ public void onPostTick(IGregTechTileEntity baseMetaTileEntity, long tick) { @Override public String[] getInfoData() { return new String[] { LIGHT_PURPLE + "Operational Data:" + RESET, "Depth: " + YELLOW + depth + RESET, - "Fluid: " + YELLOW + fluid.amount + RESET + "L/s " + BLUE + fluid.getLocalizedName() + RESET, - "EU/t required: " + YELLOW + GTUtility.formatNumbers(-mEUt) + RESET + " EU/t", - "Maintenance Status: " + (getRepairStatus() == getIdealStatus() ? GREEN + "Working perfectly" + RESET - : RED + "Has problems" + RESET), - "---------------------------------------------" }; + "Fluid: " + YELLOW + fluid.amount + RESET + "L/s " + BLUE + fluid.getLocalizedName() + RESET, + "EU/t required: " + YELLOW + GTUtility.formatNumbers(-mEUt) + RESET + " EU/t", + "Maintenance Status: " + (getRepairStatus() == getIdealStatus() ? GREEN + "Working perfectly" + RESET + : RED + "Has problems" + RESET), + "---------------------------------------------" }; } @Override diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/ElevatorUtil.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/ElevatorUtil.java index 41e8459..16666e7 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/ElevatorUtil.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/ElevatorUtil.java @@ -54,15 +54,17 @@ public static boolean isProjectAvailable(UUID machineOwner, String neededProject if (neededProject != null && !neededProject.isEmpty()) { if (neededLocation != null && !neededLocation.isEmpty()) { ISpaceProject project = SpaceProjectManager - .getTeamProject(machineOwner, SpaceProjectManager.getLocation(neededLocation), neededProject); + .getTeamProject(machineOwner, SpaceProjectManager.getLocation(neededLocation), neededProject); return project != null && project.isFinished(); } else { ArrayList projects = new ArrayList<>( - SpaceProjectManager.getTeamSpaceProjects(machineOwner)); + SpaceProjectManager.getTeamSpaceProjects(machineOwner)); for (ISpaceProject project : projects) { if (project != null && project.isFinished() - && neededLocation != null - && neededLocation.equals(project.getProjectLocation().getName())) { + && neededLocation != null + && neededLocation.equals( + project.getProjectLocation() + .getName())) { return true; } } @@ -125,7 +127,7 @@ public interface IBlockAdder { * @return Structure element */ public static IStructureElement ofBlockAdder(IBlockAdder iBlockAdder, Block defaultBlock, - int defaultMeta) { + int defaultMeta) { if (iBlockAdder == null || defaultBlock == null) { throw new IllegalArgumentException(); } @@ -152,31 +154,31 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge @Override public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, - IItemSource s, EntityPlayerMP actor, Consumer chatter) { + IItemSource s, EntityPlayerMP actor, Consumer chatter) { return survivalPlaceBlock( - t, - world, - x, - y, - z, - trigger, - AutoPlaceEnvironment.fromLegacy(s, actor, chatter)); + t, + world, + x, + y, + z, + trigger, + AutoPlaceEnvironment.fromLegacy(s, actor, chatter)); } @Override public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, - AutoPlaceEnvironment env) { + AutoPlaceEnvironment env) { if (check(t, world, x, y, z)) return PlaceResult.SKIP; return StructureUtility.survivalPlaceBlock( - defaultBlock, - defaultMeta, - world, - x, - y, - z, - env.getSource(), - env.getActor(), - env.getChatter()); + defaultBlock, + defaultMeta, + world, + x, + y, + z, + env.getSource(), + env.getActor(), + env.getChatter()); } }; } else { @@ -202,31 +204,31 @@ public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigge @Override public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, - IItemSource s, EntityPlayerMP actor, Consumer chatter) { + IItemSource s, EntityPlayerMP actor, Consumer chatter) { return survivalPlaceBlock( - t, - world, - x, - y, - z, - trigger, - AutoPlaceEnvironment.fromLegacy(s, actor, chatter)); + t, + world, + x, + y, + z, + trigger, + AutoPlaceEnvironment.fromLegacy(s, actor, chatter)); } @Override public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger, - AutoPlaceEnvironment env) { + AutoPlaceEnvironment env) { if (check(t, world, x, y, z)) return PlaceResult.SKIP; return StructureUtility.survivalPlaceBlock( - defaultBlock, - defaultMeta, - world, - x, - y, - z, - env.getSource(), - env.getActor(), - env.getChatter()); + defaultBlock, + defaultMeta, + world, + x, + y, + z, + env.getSource(), + env.getActor(), + env.getChatter()); } }; } @@ -239,11 +241,11 @@ public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, Ite */ public static List> getMotorTiers() { return ImmutableList.of( - Pair.of(IGBlocks.SpaceElevatorMotor, 0), - Pair.of(IGBlocks.SpaceElevatorMotor, 1), - Pair.of(IGBlocks.SpaceElevatorMotor, 2), - Pair.of(IGBlocks.SpaceElevatorMotor, 3), - Pair.of(IGBlocks.SpaceElevatorMotor, 4)); + Pair.of(IGBlocks.SpaceElevatorMotor, 0), + Pair.of(IGBlocks.SpaceElevatorMotor, 1), + Pair.of(IGBlocks.SpaceElevatorMotor, 2), + Pair.of(IGBlocks.SpaceElevatorMotor, 3), + Pair.of(IGBlocks.SpaceElevatorMotor, 4)); } /** @@ -282,7 +284,7 @@ public long count(TileEntitySpaceElevator tileEntity) { @SafeVarargs ProjectModuleElement(IGTHatchAdder adder, - Class... mteClasses) { + Class... mteClasses) { this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses)); this.adder = adder; } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/TileEntitySpaceElevator.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/TileEntitySpaceElevator.java index c01991c..c91d6ac 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/TileEntitySpaceElevator.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevator/TileEntitySpaceElevator.java @@ -359,8 +359,13 @@ public IStructureDefinition getStructure_EM() { @Override public IAlignmentLimits getAlignmentLimits() { // The elevator should only be buildable upright - return IAlignmentLimits.Builder.allowAll().deny(ForgeDirection.DOWN).deny(ForgeDirection.UP) - .deny(Rotation.UPSIDE_DOWN).deny(Rotation.CLOCKWISE).deny(Rotation.COUNTER_CLOCKWISE).build(); + return IAlignmentLimits.Builder.allowAll() + .deny(ForgeDirection.DOWN) + .deny(ForgeDirection.UP) + .deny(Rotation.UPSIDE_DOWN) + .deny(Rotation.CLOCKWISE) + .deny(Rotation.COUNTER_CLOCKWISE) + .build(); } /** @@ -372,20 +377,20 @@ public IAlignmentLimits getAlignmentLimits() { @Override public void construct(ItemStack stackSize, boolean hintsOnly) { structureBuild_EM( - STRUCTURE_PIECE_MAIN, - STRUCTURE_PIECE_MAIN_HOR_OFFSET, - STRUCTURE_PIECE_MAIN_VERT_OFFSET, - STRUCTURE_PIECE_MAIN_DEPTH_OFFSET, - stackSize, - hintsOnly); + STRUCTURE_PIECE_MAIN, + STRUCTURE_PIECE_MAIN_HOR_OFFSET, + STRUCTURE_PIECE_MAIN_VERT_OFFSET, + STRUCTURE_PIECE_MAIN_DEPTH_OFFSET, + stackSize, + hintsOnly); if (isExtensionEnabled) { structureBuild_EM( - STRUCTURE_PIECE_EXTENDED, - STRUCTURE_PIECE_EXTENDED_HOR_OFFSET, - STRUCTURE_PIECE_EXTENDED_VERT_OFFSET, - STRUCTURE_PIECE_EXTENDED_DEPTH_OFFSET, - stackSize, - hintsOnly); + STRUCTURE_PIECE_EXTENDED, + STRUCTURE_PIECE_EXTENDED_HOR_OFFSET, + STRUCTURE_PIECE_EXTENDED_VERT_OFFSET, + STRUCTURE_PIECE_EXTENDED_DEPTH_OFFSET, + stackSize, + hintsOnly); } } @@ -393,26 +398,26 @@ public void construct(ItemStack stackSize, boolean hintsOnly) { public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) { if (mMachine) return -1; int consumedBudget = survivialBuildPiece( - STRUCTURE_PIECE_MAIN, + STRUCTURE_PIECE_MAIN, + stackSize, + STRUCTURE_PIECE_MAIN_HOR_OFFSET, + STRUCTURE_PIECE_MAIN_VERT_OFFSET, + STRUCTURE_PIECE_MAIN_DEPTH_OFFSET, + elementBudget, + env, + false, + true); + if (isExtensionEnabled) { + consumedBudget += survivialBuildPiece( + STRUCTURE_PIECE_EXTENDED, stackSize, - STRUCTURE_PIECE_MAIN_HOR_OFFSET, - STRUCTURE_PIECE_MAIN_VERT_OFFSET, - STRUCTURE_PIECE_MAIN_DEPTH_OFFSET, + STRUCTURE_PIECE_EXTENDED_HOR_OFFSET, + STRUCTURE_PIECE_EXTENDED_VERT_OFFSET, + STRUCTURE_PIECE_EXTENDED_DEPTH_OFFSET, elementBudget, env, false, true); - if (isExtensionEnabled) { - consumedBudget += survivialBuildPiece( - STRUCTURE_PIECE_EXTENDED, - stackSize, - STRUCTURE_PIECE_EXTENDED_HOR_OFFSET, - STRUCTURE_PIECE_EXTENDED_VERT_OFFSET, - STRUCTURE_PIECE_EXTENDED_DEPTH_OFFSET, - elementBudget, - env, - false, - true); } return consumedBudget; } @@ -432,10 +437,10 @@ public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStac motorTier = 0; // Check structure if (!structureCheck_EM( - STRUCTURE_PIECE_MAIN, - STRUCTURE_PIECE_MAIN_HOR_OFFSET, - STRUCTURE_PIECE_MAIN_VERT_OFFSET, - STRUCTURE_PIECE_MAIN_DEPTH_OFFSET)) { + STRUCTURE_PIECE_MAIN, + STRUCTURE_PIECE_MAIN_HOR_OFFSET, + STRUCTURE_PIECE_MAIN_VERT_OFFSET, + STRUCTURE_PIECE_MAIN_DEPTH_OFFSET)) { if (elevatorCable != null) { elevatorCable.setShouldRender(false); } @@ -443,10 +448,10 @@ public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStac } if (motorTier > 2 && isExtensionEnabled) { if (!structureCheck_EM( - STRUCTURE_PIECE_EXTENDED, - STRUCTURE_PIECE_EXTENDED_HOR_OFFSET, - STRUCTURE_PIECE_EXTENDED_VERT_OFFSET, - STRUCTURE_PIECE_EXTENDED_DEPTH_OFFSET)) { + STRUCTURE_PIECE_EXTENDED, + STRUCTURE_PIECE_EXTENDED_HOR_OFFSET, + STRUCTURE_PIECE_EXTENDED_VERT_OFFSET, + STRUCTURE_PIECE_EXTENDED_DEPTH_OFFSET)) { if (elevatorCable != null) { elevatorCable.setShouldRender(false); } @@ -563,8 +568,8 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isAllowedToWork()) { if (elevatorCable != null && IGConfig.spaceElevator.isCableRenderingEnabled - && elevatorCable.getAnimation() == TileEntitySpaceElevatorCable.ClimberAnimation.NO_ANIMATION - && aTick % 2000 == 0) { + && elevatorCable.getAnimation() == TileEntitySpaceElevatorCable.ClimberAnimation.NO_ANIMATION + && aTick % 2000 == 0) { elevatorCable.startAnimation(TileEntitySpaceElevatorCable.ClimberAnimation.DELIVER_ANIMATION); } @@ -578,10 +583,10 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { long tAvailableEnergy = getEUVar(); if (tAvailableEnergy > 0) { setEUVar( - Math.max( - 0, - tAvailableEnergy - projectModule - .increaseStoredEU(Math.min(tEnergy, tAvailableEnergy)))); + Math.max( + 0, + tAvailableEnergy + - projectModule.increaseStoredEU(Math.min(tEnergy, tAvailableEnergy)))); } } } @@ -641,25 +646,26 @@ protected MultiblockTooltipBuilder createTooltip() { tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.name")); if (TooltipUtil.elevatorLoreText != null) tt.addInfo(ITALIC + TooltipUtil.elevatorLoreText); tt.addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc3")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc4")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc6")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc7")).addTecTechHatchInfo() - .beginStructureBlock(35, 43, 35, false) - .addOtherStructurePart( - GCCoreUtil.translate("ig.elevator.structure.ProjectModule"), - GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith2Dot"), - 2) - .addCasingInfoExactly(GCCoreUtil.translate("tile.DysonSwarmFloor.name"), 800, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 593, 785, false) - .addCasingInfoExactly(GCCoreUtil.translate("gt.blockcasings.ig.1.name"), 620, false) - .addCasingInfoExactly(GCCoreUtil.translate("gt.blockcasings.ig.2.name"), 360, false) - .addCasingInfoExactly(GCCoreUtil.translate("gt.blockcasings.ig.cable.name"), 1, false) - .addCasingInfoExactly(GCCoreUtil.translate("ig.elevator.structure.FrameNeutronium"), 56, false) - .addCasingInfoExactly(GCCoreUtil.translate("ig.elevator.structure.Motor"), 88, true) - .addEnergyHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(GTValues.Authorminecraft7771); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc3")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc4")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc6")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.ig.elevator.desc7")) + .addTecTechHatchInfo() + .beginStructureBlock(35, 43, 35, false) + .addOtherStructurePart( + GCCoreUtil.translate("ig.elevator.structure.ProjectModule"), + GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith2Dot"), + 2) + .addCasingInfoExactly(GCCoreUtil.translate("tile.DysonSwarmFloor.name"), 800, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 593, 785, false) + .addCasingInfoExactly(GCCoreUtil.translate("gt.blockcasings.ig.1.name"), 620, false) + .addCasingInfoExactly(GCCoreUtil.translate("gt.blockcasings.ig.2.name"), 360, false) + .addCasingInfoExactly(GCCoreUtil.translate("gt.blockcasings.ig.cable.name"), 1, false) + .addCasingInfoExactly(GCCoreUtil.translate("ig.elevator.structure.FrameNeutronium"), 56, false) + .addCasingInfoExactly(GCCoreUtil.translate("ig.elevator.structure.Motor"), 88, true) + .addEnergyHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(GTValues.Authorminecraft7771); return tt; } @@ -676,11 +682,10 @@ protected MultiblockTooltipBuilder createTooltip() { */ @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { + int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX_BASE), - new TTRenderedExtendedFacingTexture( - aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; + new TTRenderedExtendedFacingTexture(aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX_BASE) }; } @@ -696,9 +701,9 @@ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirec @Override public String[] getInfoData() { return new String[] { LIGHT_PURPLE + "Operational Data:" + RESET, - "Maintenance Status: " + (getRepairStatus() == getIdealStatus() ? GREEN + "Working perfectly" + RESET - : RED + "Has problems" + RESET), - "---------------------------------------------" }; + "Maintenance Status: " + (getRepairStatus() == getIdealStatus() ? GREEN + "Working perfectly" + RESET + : RED + "Has problems" + RESET), + "---------------------------------------------" }; } /** @@ -725,8 +730,9 @@ public boolean doesBindPlayerInventory() { @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO_DARK).setSize(18, 18) - .setPos(150, 154)); + new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO_DARK) + .setSize(18, 18) + .setPos(150, 154)); } /** @@ -737,25 +743,28 @@ public void addGregTechLogo(ModularWindow.Builder builder) { */ @Override protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inventorySlot) { - screenElements.setSynced(false).setSpace(0); + screenElements.setSynced(false) + .setSpace(0); screenElements - .widget( - new TextWidget(GTUtility.trans("138", "Incomplete Structure.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mMachine)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)); + .widget( + new TextWidget(GTUtility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mMachine)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)); screenElements.widget( - new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.ready")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine)); + new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.ready")) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> mMachine)); - screenElements.widget( + screenElements + .widget( TextWidget - .dynamicString( - () -> StatCollector.translateToLocal( - "gt.blockmachines.multimachine.ig.elevator.gui.numOfModules") + ": " - + getNumberOfModules()) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> getErrorDisplayID() == 0)); + .dynamicString( + () -> StatCollector.translateToLocal( + "gt.blockmachines.multimachine.ig.elevator.gui.numOfModules") + ": " + getNumberOfModules()) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> getErrorDisplayID() == 0)); } /** @@ -770,80 +779,100 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont // Extension button builder.widget( - new CycleButtonWidget().setToggle(() -> isExtensionEnabled, val -> isExtensionEnabled = val) - .setPlayClickSound(true) - .setTextureGetter( - (state) -> state > 0 ? IG_UITextures.OVERLAY_BUTTON_SPACE_ELEVATOR_EXTENSION_ENABLED - : IG_UITextures.OVERLAY_BUTTON_SPACE_ELEVATOR_EXTENSION_DISABLED) - .setPos(115, 155).setSize(16, 16) - .addTooltip(StatCollector.translateToLocal("ig.button.extension")) - .setTooltipShowUpDelay(TOOLTIP_DELAY)); + new CycleButtonWidget().setToggle(() -> isExtensionEnabled, val -> isExtensionEnabled = val) + .setPlayClickSound(true) + .setTextureGetter( + (state) -> state > 0 ? IG_UITextures.OVERLAY_BUTTON_SPACE_ELEVATOR_EXTENSION_ENABLED + : IG_UITextures.OVERLAY_BUTTON_SPACE_ELEVATOR_EXTENSION_DISABLED) + .setPos(115, 155) + .setSize(16, 16) + .addTooltip(StatCollector.translateToLocal("ig.button.extension")) + .setTooltipShowUpDelay(TOOLTIP_DELAY)); // Teleportation button builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (!widget.getContext().isClient()) { + if (!widget.getContext() + .isClient()) { if (getBaseMetaTileEntity().isAllowedToWork() && motorTier > 0) { - EntityPlayer player = widget.getContext().getPlayer(); + EntityPlayer player = widget.getContext() + .getPlayer(); if (player instanceof EntityPlayerMP playerBase) { final GCPlayerStats stats = GCPlayerStats.get(playerBase); stats.coordsTeleportedFromX = playerBase.posX; stats.coordsTeleportedFromZ = playerBase.posZ; try { WorldUtil.toCelestialSelection( - playerBase, - stats, - ElevatorUtil.getPlanetaryTravelTier(motorTier), - GuiCelestialSelection.MapMode.TELEPORTATION); + playerBase, + stats, + ElevatorUtil.getPlanetaryTravelTier(motorTier), + GuiCelestialSelection.MapMode.TELEPORTATION); } catch (final Exception e) { e.printStackTrace(); } } } } - }).setPlayClickSound(false).setBackground(() -> { - List ret = new ArrayList<>(); - ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - ret.add(IG_UITextures.OVERLAY_BUTTON_PLANET_TELEPORT); - return ret.toArray(new IDrawable[0]); - }).setPos(174, doesBindPlayerInventory() ? 132 : 156).setSize(16, 16) - .addTooltip(GCCoreUtil.translate("ig.button.travel")).setTooltipShowUpDelay(TOOLTIP_DELAY)); + }) + .setPlayClickSound(false) + .setBackground(() -> { + List ret = new ArrayList<>(); + ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); + ret.add(IG_UITextures.OVERLAY_BUTTON_PLANET_TELEPORT); + return ret.toArray(new IDrawable[0]); + }) + .setPos(174, doesBindPlayerInventory() ? 132 : 156) + .setSize(16, 16) + .addTooltip(GCCoreUtil.translate("ig.button.travel")) + .setTooltipShowUpDelay(TOOLTIP_DELAY)); // Open contributor window button builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (!widget.getContext().isClient()) { - widget.getContext().openSyncedWindow(CONTRIBUTORS_WINDOW_ID); + if (!widget.getContext() + .isClient()) { + widget.getContext() + .openSyncedWindow(CONTRIBUTORS_WINDOW_ID); } - }).addTooltip(StatCollector.translateToLocal("ig.structure.contributors")) - .setBackground(ModularUITextures.ICON_INFO).setPos(133, 155).setSize(16, 16)); + }) + .addTooltip(StatCollector.translateToLocal("ig.structure.contributors")) + .setBackground(ModularUITextures.ICON_INFO) + .setPos(133, 155) + .setSize(16, 16)); // Contributor window buildContext.addSyncedWindow(CONTRIBUTORS_WINDOW_ID, (player) -> { DynamicPositionedColumn texts = new DynamicPositionedColumn(); - texts.setSynced(false).setSpace(2).setPos(10, 7); + texts.setSynced(false) + .setSpace(2) + .setPos(10, 7); texts.widget( - new TextWidget(StatCollector.translateToLocal("ig.structure.contributors")) - .setDefaultColor(Color.PURPLE.normal)); + new TextWidget(StatCollector.translateToLocal("ig.structure.contributors")) + .setDefaultColor(Color.PURPLE.normal)); texts.widget( - new TextWidget(StatCollector.translateToLocal("ig.structure.programming")) - .setDefaultColor(Color.PINK.normal)); + new TextWidget(StatCollector.translateToLocal("ig.structure.programming")) + .setDefaultColor(Color.PINK.normal)); texts.widget(new TextWidget("minecraft7771").setDefaultColor(Color.GRAY.bright(1))); texts.widget(new TextWidget("BlueWeabo").setDefaultColor(Color.GRAY.bright(1))); texts.widget( - new TextWidget(StatCollector.translateToLocal("ig.structure.design")) - .setDefaultColor(Color.PINK.normal)); + new TextWidget(StatCollector.translateToLocal("ig.structure.design")) + .setDefaultColor(Color.PINK.normal)); texts.widget(new TextWidget("Sampsa").setDefaultColor(Color.GRAY.bright(1))); texts.widget(new TextWidget("Jimbno").setDefaultColor(Color.GRAY.bright(1))); texts.widget(new TextWidget("Adam").setDefaultColor(Color.GRAY.bright(1))); texts.widget(new TextWidget("Baunti").setDefaultColor(Color.GRAY.bright(1))); texts.widget( - new TextWidget(StatCollector.translateToLocal("ig.structure.specialThanks")) - .setDefaultColor(Color.PINK.normal)); + new TextWidget(StatCollector.translateToLocal("ig.structure.specialThanks")) + .setDefaultColor(Color.PINK.normal)); texts.widget(new TextWidget("glowredman").setDefaultColor(Color.GRAY.bright(1))); texts.widget(new TextWidget("miozune").setDefaultColor(Color.GRAY.bright(1))); - return ModularWindow.builder(120, 130).setBackground(TecTechUITextures.BACKGROUND_SCREEN_BLUE) - .widget(ButtonWidget.closeWindowButton(true).setPos(100, 7)).widget(texts).build(); + return ModularWindow.builder(120, 130) + .setBackground(TecTechUITextures.BACKGROUND_SCREEN_BLUE) + .widget( + ButtonWidget.closeWindowButton(true) + .setPos(100, 7)) + .widget(texts) + .build(); }); } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleAssembler.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleAssembler.java index 9ed9235..c5a9299 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleAssembler.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleAssembler.java @@ -44,10 +44,10 @@ public abstract class TileEntityModuleAssembler extends TileEntityModuleBase imp /** Name of the parallel setting */ private static final INameFunction PARALLEL_SETTING_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.assembler.cfgi.0"); // Parallels + .translate("gt.blockmachines.multimachine.project.ig.assembler.cfgi.0"); // Parallels /** Status of the parallel setting */ private static final IStatusFunction PARALLEL_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 100, base.getMaxParallels()); + .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 100, base.getMaxParallels()); /** Power object used for displaying in NEI */ protected final OverclockDescriber overclockDescriber; @@ -66,7 +66,7 @@ public abstract class TileEntityModuleAssembler extends TileEntityModuleBase imp * @param bufferSizeMultiplier Multiplier for the EU buffer size, if the standard buffer is too small */ public TileEntityModuleAssembler(int aID, String aName, String aNameRegional, int tTier, int tModuleTier, - int tMinMotorTier, int bufferSizeMultiplier) { + int tMinMotorTier, int bufferSizeMultiplier) { super(aID, aName, aNameRegional, tTier, tModuleTier, tMinMotorTier, bufferSizeMultiplier); overclockDescriber = new ModuleOverclockDescriber((byte) tTier, tModuleTier); } @@ -81,7 +81,7 @@ public TileEntityModuleAssembler(int aID, String aName, String aNameRegional, in * @param bufferSizeMultiplier Multiplier for the EU buffer size, if the standard buffer is too small */ public TileEntityModuleAssembler(String aName, int tTier, int tModuleTier, int tMinMotorTier, - int bufferSizeMultiplier) { + int bufferSizeMultiplier) { super(aName, tTier, tModuleTier, tMinMotorTier, bufferSizeMultiplier); overclockDescriber = new ModuleOverclockDescriber((byte) tTier, tModuleTier); } @@ -131,10 +131,8 @@ protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (lastRecipe != recipe) { String neededProject = recipe.getMetadata(IGRecipeMaps.SPACE_PROJECT); String neededLocation = recipe.getMetadata(IGRecipeMaps.SPACE_LOCATION); - if (!ElevatorUtil.isProjectAvailable( - getBaseMetaTileEntity().getOwnerUuid(), - neededProject, - neededLocation)) { + if (!ElevatorUtil + .isProjectAvailable(getBaseMetaTileEntity().getOwnerUuid(), neededProject, neededLocation)) { return new ResultNoSpaceProject(neededProject, neededLocation); } } @@ -146,7 +144,8 @@ protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { return CheckRecipeResultRegistry.SUCCESSFUL; } - }.setAmperageOC(false).setMaxParallelSupplier(() -> Math.min(getMaxParallels(), (int) parallelSetting.get())); + }.setAmperageOC(false) + .setMaxParallelSupplier(() -> Math.min(getMaxParallels(), (int) parallelSetting.get())); } /** @@ -175,16 +174,15 @@ protected void parametersInstantiation_EM() { */ @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { + int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), - new TTRenderedExtendedFacingTexture( - aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; + Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), + new TTRenderedExtendedFacingTexture(aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; } else if (facing.getRotation(ForgeDirection.UP) == side || facing.getRotation(ForgeDirection.DOWN) == side) { return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), - new TTRenderedExtendedFacingTexture(engraving) }; + Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), + new TTRenderedExtendedFacingTexture(engraving) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE) }; } @@ -267,19 +265,18 @@ protected int getMaxParallels() { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.desc0")) - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.assembler.t1.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t1.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT1")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoMin(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, false) - .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.desc0")) + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t1.desc1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t1.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT1")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoMin(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, false) + .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(); return tt; } } @@ -345,19 +342,18 @@ protected int getMaxParallels() { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.desc0")) - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.assembler.t2.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t2.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT3")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.desc0")) + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t2.desc1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t2.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT3")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(); return tt; } } @@ -423,19 +419,18 @@ protected int getMaxParallels() { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.desc0")) - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.assembler.t3.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t3.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT5")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoMin(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, false) - .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.desc0")) + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t3.desc1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.assembler.t3.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT5")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoMin(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, false) + .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(); return tt; } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleBase.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleBase.java index 8add8c8..cba2059 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleBase.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleBase.java @@ -56,34 +56,34 @@ public abstract class TileEntityModuleBase extends TTMultiblockBase { /** Name of the stored energy display */ private static final INameFunction ENERGY_DISPLAY_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.cfgo.0"); // Stored Energy + .translate("gt.blockmachines.multimachine.project.ig.cfgo.0"); // Stored Energy /** Status of the stored energy display */ private static final IStatusFunction ENERGY_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary( - p.get(), - 1, - (double) base.maxEUStore() / 2D, - (double) base.maxEUStore() * 2D, - (double) base.maxEUStore() * 2D); + .fromLimitsInclusiveOuterBoundary( + p.get(), + 1, + (double) base.maxEUStore() / 2D, + (double) base.maxEUStore() * 2D, + (double) base.maxEUStore() * 2D); /** Name of the main structure piece */ private static final String STRUCTURE_PIECE_MAIN = "main"; /** Structure definition of this machine */ private static final IStructureDefinition STRUCTURE_DEFINITION = StructureDefinition - .builder() - .addShape( - STRUCTURE_PIECE_MAIN, - StructureUtility.transpose( - new String[][] { { "H", "H" }, { "~", "H" }, { "H", "H" }, { "H", "H" }, { "H", "H" } })) - .addElement( - 'H', - GTStructureUtility.ofHatchAdderOptional( - TileEntityModuleBase::addClassicToMachineList, - TileEntitySpaceElevator.CASING_INDEX_BASE, - 1, - IGBlocks.SpaceElevatorCasing, - 0)) - .build(); + .builder() + .addShape( + STRUCTURE_PIECE_MAIN, + StructureUtility + .transpose(new String[][] { { "H", "H" }, { "~", "H" }, { "H", "H" }, { "H", "H" }, { "H", "H" } })) + .addElement( + 'H', + GTStructureUtility.ofHatchAdderOptional( + TileEntityModuleBase::addClassicToMachineList, + TileEntitySpaceElevator.CASING_INDEX_BASE, + 1, + IGBlocks.SpaceElevatorCasing, + 0)) + .build(); /** * Create new project module base @@ -95,7 +95,7 @@ public abstract class TileEntityModuleBase extends TTMultiblockBase { * @param tMinMotorTier Minimum needed motor tier */ protected TileEntityModuleBase(int aID, String aName, String aNameRegional, int tTier, int tModuleTier, - int tMinMotorTier) { + int tMinMotorTier) { super(aID, aName, aNameRegional); this.tTier = tTier; this.tModuleTier = tModuleTier; @@ -115,7 +115,7 @@ protected TileEntityModuleBase(int aID, String aName, String aNameRegional, int * @param bufferSizeMultiplier Multiplier for the EU buffer size, if the standard buffer is too small */ protected TileEntityModuleBase(int aID, String aName, String aNameRegional, int tTier, int tModuleTier, - int tMinMotorTier, int bufferSizeMultiplier) { + int tMinMotorTier, int bufferSizeMultiplier) { super(aID, aName, aNameRegional); this.tTier = tTier; this.tModuleTier = tModuleTier; @@ -149,7 +149,7 @@ protected TileEntityModuleBase(String aName, int tTier, int tModuleTier, int tMi * @param bufferSizeMultiplier Multiplier for the EU buffer size, if the standard buffer is too small */ protected TileEntityModuleBase(String aName, int tTier, int tModuleTier, int tMinMotorTier, - int bufferSizeMultiplier) { + int bufferSizeMultiplier) { super(aName); this.tTier = tTier; this.tModuleTier = tModuleTier; @@ -232,7 +232,7 @@ public long increaseStoredEU(long maximumIncrease) { } connect(); long increasedEU = Math - .min(getBaseMetaTileEntity().getEUCapacity() - getBaseMetaTileEntity().getStoredEU(), maximumIncrease); + .min(getBaseMetaTileEntity().getEUCapacity() - getBaseMetaTileEntity().getStoredEU(), maximumIncrease); return getBaseMetaTileEntity().increaseStoredEnergyUnits(increasedEU, false) ? increasedEU : 0; } @@ -349,12 +349,11 @@ public boolean willExplodeInRain() { */ @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { + int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), - new TTRenderedExtendedFacingTexture( - aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; + Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), + new TTRenderedExtendedFacingTexture(aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE) }; } @@ -362,8 +361,9 @@ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirec @Override public void addGregTechLogo(ModularWindow.Builder builder) { builder.widget( - new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO_DARK).setSize(18, 18) - .setPos(173, 74)); + new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO_DARK) + .setSize(18, 18) + .setPos(173, 74)); } /** @@ -374,27 +374,29 @@ public void addGregTechLogo(ModularWindow.Builder builder) { */ @Override protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inventorySlot) { - screenElements.setSynced(false).setSpace(0); + screenElements.setSynced(false) + .setSpace(0); screenElements - .widget( - new TextWidget(GTUtility.trans("138", "Incomplete Structure.")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> !mMachine)) - .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)); + .widget( + new TextWidget(GTUtility.trans("138", "Incomplete Structure.")).setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> !mMachine)) + .widget(new FakeSyncWidget.BooleanSyncer(() -> mMachine, val -> mMachine = val)); screenElements.widget( - new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.ready")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine)); + new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.ready")) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> mMachine)); screenElements.widget( - new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.noRecipe")) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> mMachine && !getBaseMetaTileEntity().isActive())); + new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.noRecipe")) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> mMachine && !getBaseMetaTileEntity().isActive())); screenElements.widget( - new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.recipe")) - .setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> mMachine && getBaseMetaTileEntity().isActive())); + new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.recipe")) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> mMachine && getBaseMetaTileEntity().isActive())); } /** diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleManager.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleManager.java index 5b8565f..8102c79 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleManager.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleManager.java @@ -121,19 +121,19 @@ public TileEntityModuleManager(String aName) { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.manager.desc0")) - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.manager.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT1")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.manager.desc0")) + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.manager.desc1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT1")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(); return tt; } @@ -165,31 +165,32 @@ public RecipeMap getRecipeMap() { GTRecipe recipe = null; if (projectWorkingOn.isFinished() && projectWorkingOn.getUpgradeBeingBuilt() != null - && !projectWorkingOn.getUpgradeBeingBuilt().isFinished()) { + && !projectWorkingOn.getUpgradeBeingBuilt() + .isFinished()) { ISpaceProject.ISP_Upgrade upgrade = projectWorkingOn.getUpgradeBeingBuilt(); recipe = new GTRecipe( - false, - upgrade.getItemsCostPerStage(), - null, - null, - null, - upgrade.getFluidsCostPerStage(), - null, - upgrade.getUpgradeBuildTime(), - (int) upgrade.getVoltage(), - 0); + false, + upgrade.getItemsCostPerStage(), + null, + null, + null, + upgrade.getFluidsCostPerStage(), + null, + upgrade.getUpgradeBuildTime(), + (int) upgrade.getVoltage(), + 0); } else if (!projectWorkingOn.isFinished()) { recipe = new GTRecipe( - false, - projectWorkingOn.getItemsCostPerStage(), - null, - null, - null, - projectWorkingOn.getFluidsCostPerStage(), - null, - projectWorkingOn.getProjectBuildTime(), - (int) projectWorkingOn.getProjectVoltage(), - 0); + false, + projectWorkingOn.getItemsCostPerStage(), + null, + null, + null, + projectWorkingOn.getFluidsCostPerStage(), + null, + projectWorkingOn.getProjectBuildTime(), + (int) projectWorkingOn.getProjectVoltage(), + 0); } if (recipe == null) { @@ -197,9 +198,9 @@ public RecipeMap getRecipeMap() { } if (!recipe.isRecipeInputEqual( - true, - getStoredFluids().toArray(new FluidStack[0]), - getStoredInputs().toArray(new ItemStack[0]))) { + true, + getStoredFluids().toArray(new FluidStack[0]), + getStoredInputs().toArray(new ItemStack[0]))) { return CheckRecipeResultRegistry.NO_RECIPE; } @@ -218,8 +219,10 @@ public void outputAfterRecipe_EM() { private void upgradeProjectOrUpgrade() { if (projectWorkingOn != null) { if (projectWorkingOn.isFinished() && projectWorkingOn.getUpgradeBeingBuilt() != null - && !projectWorkingOn.getUpgradeBeingBuilt().isFinished()) { - projectWorkingOn.getUpgradeBeingBuilt().goToNextStage(); + && !projectWorkingOn.getUpgradeBeingBuilt() + .isFinished()) { + projectWorkingOn.getUpgradeBeingBuilt() + .goToNextStage(); } else if (!projectWorkingOn.isFinished()) { projectWorkingOn.goToNextStage(); } @@ -239,17 +242,15 @@ public void loadNBTData(NBTTagCompound aNBT) { if (aNBT.hasKey("mWorkingProject")) { projectWorkingOn = SpaceProjectManager.getTeamProject( - getBaseMetaTileEntity().getOwnerUuid(), - SpaceProjectManager.getLocation(aNBT.getString("workingLocation")), - aNBT.getString("mWorkingProject")); + getBaseMetaTileEntity().getOwnerUuid(), + SpaceProjectManager.getLocation(aNBT.getString("workingLocation")), + aNBT.getString("mWorkingProject")); } if (aNBT.hasKey("mProject")) { selectedProjectName = aNBT.getString("mProject"); - selectedProject = SpaceProjectManager.getTeamProjectOrCopy( - getBaseMetaTileEntity().getOwnerUuid(), - selectedProjectName, - selectedLocation); + selectedProject = SpaceProjectManager + .getTeamProjectOrCopy(getBaseMetaTileEntity().getOwnerUuid(), selectedProjectName, selectedLocation); upgradeFromProject = new ArrayList<>(selectedProject.getAllUpgrades()); selectedUpgrade = selectedProject.getUpgradeBeingBuilt(); } @@ -272,7 +273,10 @@ public void saveNBTData(NBTTagCompound aNBT) { if (projectWorkingOn != null) { aNBT.setString("mWorkingProject", projectWorkingOn.getProjectName()); - aNBT.setString("workingLocation", projectWorkingOn.getProjectLocation().getName()); + aNBT.setString( + "workingLocation", + projectWorkingOn.getProjectLocation() + .getName()); } aNBT.setBoolean("projectMode", projectMode); @@ -286,10 +290,10 @@ public void saveNBTData(NBTTagCompound aNBT) { private static final IDrawable buttonUp = GTUITextures.BUTTON_STANDARD_TOGGLE.getSubArea(0f, 0f, 0.5f, 0.5f); private static final IDrawable buttonUpDisabled = GTUITextures.BUTTON_STANDARD_TOGGLE_DISABLED - .getSubArea(0f, 0f, 0.5f, 0.5f); + .getSubArea(0f, 0f, 0.5f, 0.5f); private static final IDrawable buttonDown = GTUITextures.BUTTON_STANDARD_TOGGLE.getSubArea(0.5f, 0.5f, 1f, 1f); private static final IDrawable buttonDownDisabled = GTUITextures.BUTTON_STANDARD_TOGGLE_DISABLED - .getSubArea(0.5f, 0.5f, 1f, 1f); + .getSubArea(0.5f, 0.5f, 1f, 1f); /** * Add the UI widgets to the GUI of this controller @@ -309,13 +313,18 @@ private ModularWindow createPopUp() { ModularWindow.Builder builder = ModularWindow.builder(300, 150); builder.setBackground(GTUITextures.BACKGROUND_SINGLEBLOCK_DEFAULT); builder.widget( - // Text for displaying the popup message - TextWidget.dynamicString(() -> popupText).setTextAlignment(Alignment.Center).setSize(280, 130) - .setPos(0, 20)) - // Button to close the popup - .widget(ButtonWidget.closeWindowButton(true).setSize(20, 20).setPos(280, 0)) - // Syncer for the popup text - .widget(new FakeSyncWidget.StringSyncer(() -> popupText, val -> popupText = val)); + // Text for displaying the popup message + TextWidget.dynamicString(() -> popupText) + .setTextAlignment(Alignment.Center) + .setSize(280, 130) + .setPos(0, 20)) + // Button to close the popup + .widget( + ButtonWidget.closeWindowButton(true) + .setSize(20, 20) + .setPos(280, 0)) + // Syncer for the popup text + .widget(new FakeSyncWidget.StringSyncer(() -> popupText, val -> popupText = val)); return builder.build(); } @@ -326,14 +335,18 @@ private ModularWindow createPopUp() { */ @Override protected ButtonWidget createSafeVoidButton() { - Widget button = ButtonWidget.openSyncedWindowButton(PROJECT_WINDOW_ID).setPlayClickSound(false) - .setBackground(() -> { - List ret = new ArrayList<>(); - ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - ret.add(IG_UITextures.OVERLAY_BUTTON_PROJECTS); - return ret.toArray(new IDrawable[0]); - }).setPos(174, doesBindPlayerInventory() ? 132 : 156).setSize(16, 16); - button.addTooltip(GCCoreUtil.translate("ig.button.projects")).setTooltipShowUpDelay(TOOLTIP_DELAY); + Widget button = ButtonWidget.openSyncedWindowButton(PROJECT_WINDOW_ID) + .setPlayClickSound(false) + .setBackground(() -> { + List ret = new ArrayList<>(); + ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); + ret.add(IG_UITextures.OVERLAY_BUTTON_PROJECTS); + return ret.toArray(new IDrawable[0]); + }) + .setPos(174, doesBindPlayerInventory() ? 132 : 156) + .setSize(16, 16); + button.addTooltip(GCCoreUtil.translate("ig.button.projects")) + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } @@ -350,260 +363,267 @@ protected ModularWindow createProjectWindow() { } final Scrollable projectListScrollable = new Scrollable().setVerticalScroll(); projectListScrollable.widget( - projects.setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width, - SpaceProjectManager.getAllProjects().size() * 40))); + projects.setSizeProvider( + (screenSize, window, parent) -> new Size( + parent.getSize().width, + SpaceProjectManager.getAllProjects() + .size() * 40))); // Display for the details of the selected project final MultiChildWidget activeProjectDetail = new MultiChildWidget(); - activeProjectDetail.addChild( - generateCustomButton(StatCollector.translateToLocal("ig.text.project"), (tClickData, tWidget) -> { - projectMode = true; - upgradeMode = false; + activeProjectDetail + .addChild(generateCustomButton(StatCollector.translateToLocal("ig.text.project"), (tClickData, tWidget) -> { + projectMode = true; + upgradeMode = false; + }, + () -> projectMode, + () -> true, + (screenSize, window, parent) -> new Size(parent.getSize().width * 0.5, parent.getSize().height * 0.05), + (screenSize, window, parent) -> new Pos2d(0, 0))) + .addChild( + generateCustomButton(StatCollector.translateToLocal("ig.text.upgrades"), (tClickData, tWidget) -> { + if (isUpgradeButtonClickable()) { + projectMode = false; + upgradeMode = true; + } }, - () -> projectMode, - () -> true, - (screenSize, window, - parent) -> new Size(parent.getSize().width * 0.5, parent.getSize().height * 0.05), - (screenSize, window, parent) -> new Pos2d(0, 0))) - .addChild( - generateCustomButton( - StatCollector.translateToLocal("ig.text.upgrades"), - (tClickData, tWidget) -> { - if (isUpgradeButtonClickable()) { - projectMode = false; - upgradeMode = true; - } - }, - () -> upgradeMode, - this::isUpgradeButtonClickable, - (screenSize, window, parent) -> new Size( - parent.getSize().width * 0.5, - parent.getSize().height * 0.05), - (screenSize, window, parent) -> new Pos2d(parent.getSize().width * 0.5, 0))) - .addChild(generateCustomButton(StatCollector.translateToLocal("ig.text.start"), (clickData, widget) -> { - if (widget.getContext().isClient()) return; - if (selectedLocation != null && !selectedLocation.getName().equals(LOCATON_UNSELECTED)) { - if (selectedProject != null) { - selectedProject.setProjectLocation(selectedLocation); - if (!selectedProject.isFinished()) { - if (selectedProject.meetsRequirements(getBaseMetaTileEntity().getOwnerUuid())) { - SpaceProjectManager.addTeamProject( - getBaseMetaTileEntity().getOwnerUuid(), - selectedLocation, - selectedProject.getProjectName(), - selectedProject); - projectWorkingOn = selectedProject; - popupText = StatCollector.translateToLocal("ig.text.started"); - widget.getContext().openSyncedWindow(POP_UP_WINDOW_ID); - } else { - popupText = StatCollector.translateToLocal("ig.text.projectrequirements"); - widget.getContext().openSyncedWindow(POP_UP_WINDOW_ID); - } - } else if (selectedUpgrade != null) { - if (selectedUpgrade.meetsRequirements(getBaseMetaTileEntity().getOwnerUuid())) { - selectedProject.setCurrentUpgradeBeingBuilt(selectedUpgrade); - projectWorkingOn = selectedProject; - popupText = StatCollector.translateToLocal("ig.text.started"); - widget.getContext().openSyncedWindow(POP_UP_WINDOW_ID); - } else { - popupText = StatCollector.translateToLocal("ig.text.upgraderequirements"); - widget.getContext().openSyncedWindow(POP_UP_WINDOW_ID); - } + () -> upgradeMode, + this::isUpgradeButtonClickable, + (screenSize, window, + parent) -> new Size(parent.getSize().width * 0.5, parent.getSize().height * 0.05), + (screenSize, window, parent) -> new Pos2d(parent.getSize().width * 0.5, 0))) + .addChild(generateCustomButton(StatCollector.translateToLocal("ig.text.start"), (clickData, widget) -> { + if (widget.getContext() + .isClient()) return; + if (selectedLocation != null && !selectedLocation.getName() + .equals(LOCATON_UNSELECTED)) { + if (selectedProject != null) { + selectedProject.setProjectLocation(selectedLocation); + if (!selectedProject.isFinished()) { + if (selectedProject.meetsRequirements(getBaseMetaTileEntity().getOwnerUuid())) { + SpaceProjectManager.addTeamProject( + getBaseMetaTileEntity().getOwnerUuid(), + selectedLocation, + selectedProject.getProjectName(), + selectedProject); + projectWorkingOn = selectedProject; + popupText = StatCollector.translateToLocal("ig.text.started"); + widget.getContext() + .openSyncedWindow(POP_UP_WINDOW_ID); + } else { + popupText = StatCollector.translateToLocal("ig.text.projectrequirements"); + widget.getContext() + .openSyncedWindow(POP_UP_WINDOW_ID); + } + } else if (selectedUpgrade != null) { + if (selectedUpgrade.meetsRequirements(getBaseMetaTileEntity().getOwnerUuid())) { + selectedProject.setCurrentUpgradeBeingBuilt(selectedUpgrade); + projectWorkingOn = selectedProject; + popupText = StatCollector.translateToLocal("ig.text.started"); + widget.getContext() + .openSyncedWindow(POP_UP_WINDOW_ID); } else { - popupText = StatCollector.translateToLocal("ig.text.finishedproject"); - widget.getContext().openSyncedWindow(POP_UP_WINDOW_ID); + popupText = StatCollector.translateToLocal("ig.text.upgraderequirements"); + widget.getContext() + .openSyncedWindow(POP_UP_WINDOW_ID); } } else { - popupText = StatCollector.translateToLocal("ig.text.noproject"); - widget.getContext().openSyncedWindow(POP_UP_WINDOW_ID); + popupText = StatCollector.translateToLocal("ig.text.finishedproject"); + widget.getContext() + .openSyncedWindow(POP_UP_WINDOW_ID); } } else { - popupText = StatCollector.translateToLocal("ig.text.nolocation"); - widget.getContext().openSyncedWindow(POP_UP_WINDOW_ID); + popupText = StatCollector.translateToLocal("ig.text.noproject"); + widget.getContext() + .openSyncedWindow(POP_UP_WINDOW_ID); } - }, - () -> false, - () -> true, - (screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.05), - (screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.95))); + } else { + popupText = StatCollector.translateToLocal("ig.text.nolocation"); + widget.getContext() + .openSyncedWindow(POP_UP_WINDOW_ID); + } + }, + () -> false, + () -> true, + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.05), + (screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.95))); generateProjectDetails(activeProjectDetail); // Display for the project. Will render a stellar body with the project orbiting it final MultiChildWidget activeProjectDisplay = new MultiChildWidget().addChild( - // Background - // TODO: Background picture size should be dependent on GUI scale or else it looks bad on small scale - new RepeatingDrawable().setDrawable(IG_UITextures.BACKGROUND_SPACE_WITH_STARS).setDrawableSize(64, 64) - .asWidget().setSizeProvider( - ((screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height)))) - // Celestial body - .addChild( - new DrawableWidget() - .setDrawable( - () -> selectedLocation != null && selectedLocation.getTexture() != null - ? selectedLocation.getTexture().withRotationDegree(340) - : IG_UITextures.PICTURE_CELESTIAL_BODY_NEPTUNE.withRotationDegree(340)) - .setEnabled( - (widget -> selectedLocation != null - && !selectedLocation.getName().equals(LOCATON_UNSELECTED))) - .setPosProvider( - (screenSize, window, parent) -> new Pos2d( - (parent.getSize().width - parent.getSize().width * 0.5) / 2, - (parent.getSize().height - parent.getSize().width * 0.5) / 2)) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width * 0.5, - parent.getSize().width * 0.5))) - // Project icon - .addChild( - new DrawableWidget() - .setDrawable( - () -> selectedProject != null && selectedProject.getTexture() != null - ? selectedProject.getTexture() - : IG_UITextures.PICTURE_CELESTIAL_BODY_PROTEUS) - .setPosProvider( - (screenSize, window, parent) -> new Pos2d( - (parent.getSize().width) / 2f, - (parent.getSize().height - parent.getSize().width * 0.5) / 2f)) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width * 0.2, - parent.getSize().width * 0.2))); + // Background + // TODO: Background picture size should be dependent on GUI scale or else it looks bad on small scale + new RepeatingDrawable().setDrawable(IG_UITextures.BACKGROUND_SPACE_WITH_STARS) + .setDrawableSize(64, 64) + .asWidget() + .setSizeProvider( + ((screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height)))) + // Celestial body + .addChild( + new DrawableWidget() + .setDrawable( + () -> selectedLocation != null && selectedLocation.getTexture() != null + ? selectedLocation.getTexture() + .withRotationDegree(340) + : IG_UITextures.PICTURE_CELESTIAL_BODY_NEPTUNE.withRotationDegree(340)) + .setEnabled( + (widget -> selectedLocation != null && !selectedLocation.getName() + .equals(LOCATON_UNSELECTED))) + .setPosProvider( + (screenSize, window, parent) -> new Pos2d( + (parent.getSize().width - parent.getSize().width * 0.5) / 2, + (parent.getSize().height - parent.getSize().width * 0.5) / 2)) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().width * 0.5, parent.getSize().width * 0.5))) + // Project icon + .addChild( + new DrawableWidget().setDrawable( + () -> selectedProject != null && selectedProject.getTexture() != null ? selectedProject.getTexture() + : IG_UITextures.PICTURE_CELESTIAL_BODY_PROTEUS) + .setPosProvider( + (screenSize, window, parent) -> new Pos2d( + (parent.getSize().width) / 2f, + (parent.getSize().height - parent.getSize().width * 0.5) / 2f)) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().width * 0.2, parent.getSize().width * 0.2))); // Actual project window - return ModularWindow.builderFullScreen().setDraggable(false) - .setBackground(TecTechUITextures.BACKGROUND_SCREEN_BLUE) - // Scrollable list of available projects - .widget( - projectListScrollable.setPos(20, 20).setSizeProvider( - (screenSize, window, - parent) -> new Size(screenSize.width * 0.2, screenSize.height - 70))) - // Select project detail view in the middle of the window - .widget( - activeProjectDetail - .setPosProvider( - (screenSize, window, parent) -> new Pos2d(screenSize.width * 0.2 + 40, 20)) - .setSizeProvider( - (screenSize, window, - parent) -> new Size(screenSize.width * 0.2, screenSize.height - 40))) - // Selected project display on the right side of the window - .widget( - activeProjectDisplay - .setSizeProvider( - (screenSize, window, - parent) -> new Size(screenSize.width / 2 - 20, screenSize.height - 40)) - .setPosProvider((screenSize, window, parent) -> new Pos2d(screenSize.width / 2, 20))) - // Elevator logo in bottom right corner - .widget( - new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO_DARK).setSize(36, 36) - .setPosProvider( - (screenSize, mainWindow, - parent) -> new Pos2d(screenSize.width - 40, screenSize.height - 40))) - // Drop down to select location - .widget( - new DropDownWidget().addDropDownItemsSimple( - new ArrayList<>(SpaceProjectManager.getLocationNames()), - (buttonWidget, index, label, setSelected) -> buttonWidget - .setOnClick((clickData, widget) -> { - selectedLocation = SpaceProjectManager.getLocation(label); - locationIndex = index; - projectMode = true; - upgradeMode = false; - if (!widget.getContext().isClient()) { - selectedProject = SpaceProjectManager.getTeamProjectOrCopy( - getBaseMetaTileEntity().getOwnerUuid(), - selectedProject != null ? selectedProject.getProjectName() - : selectedProjectName, - selectedLocation); - } - setSelected.run(); - }), - true).setDirection(DropDownWidget.Direction.UP).setTextUnselected(LOCATON_UNSELECTED) - .setSelected(locationIndex).setPos(20, 259).setSize(128, 20) - .setBackground(GTUITextures.BUTTON_STANDARD)) - // Syncer for selected location - .widget( - new FakeSyncWidget.StringSyncer( - () -> selectedLocation != null ? selectedLocation.getName() : "", - val -> { - selectedLocation = SpaceProjectManager.getLocation(val); - if (selectedProject != null) { - projectMode = true; - upgradeMode = false; - } - })) - // Syncer for selected project - .widget( - new FakeSyncWidget.StringSyncer( - () -> selectedProject != null ? selectedProject.getProjectName() : "", - val -> { - selectedProjectName = val; - selectedProject = SpaceProjectManager.getProject(val); - if (selectedProject != null) { - upgradeFromProject = new ArrayList<>(selectedProject.getAllUpgrades()); - projectMode = true; - upgradeMode = false; - } - })) - // Syncer for selected project upgrade - .widget( - new FakeSyncWidget.StringSyncer( - () -> selectedUpgrade != null ? selectedUpgrade.getUpgradeName() : "", - val -> { - if (selectedProject != null) { - selectedUpgrade = selectedProject.getUpgrade(val); - selectedProject.setCurrentUpgradeBeingBuilt(selectedUpgrade); - } - })) - // Syncer for upgrade being build - .widget( - new FakeSyncWidget.StringSyncer( - () -> selectedProject != null && selectedProject.getUpgradeBeingBuilt() != null - ? selectedProject.getUpgradeBeingBuilt().getUpgradeName() - : "", - val -> { - if (selectedProject != null) - selectedProject.setCurrentUpgradeBeingBuilt(selectedProject.getUpgrade(val)); - })) - // Syncer for selected project stage - .widget( - new FakeSyncWidget.IntegerSyncer( - () -> selectedProject != null ? selectedProject.getCurrentStage() : 0, - val -> { - if (selectedProject != null) { - selectedProject.setProjectCurrentStage(val); - } - })) - // Syncer for selected upgrade stage - .widget(new FakeSyncWidget.IntegerSyncer(() -> { - if (selectedProject != null && selectedUpgrade != null) { - ISpaceProject.ISP_Upgrade upgradeFromProject = selectedProject.getUpgradeBeingBuilt(); + return ModularWindow.builderFullScreen() + .setDraggable(false) + .setBackground(TecTechUITextures.BACKGROUND_SCREEN_BLUE) + // Scrollable list of available projects + .widget( + projectListScrollable.setPos(20, 20) + .setSizeProvider( + (screenSize, window, parent) -> new Size(screenSize.width * 0.2, screenSize.height - 70))) + // Select project detail view in the middle of the window + .widget( + activeProjectDetail + .setPosProvider((screenSize, window, parent) -> new Pos2d(screenSize.width * 0.2 + 40, 20)) + .setSizeProvider( + (screenSize, window, parent) -> new Size(screenSize.width * 0.2, screenSize.height - 40))) + // Selected project display on the right side of the window + .widget( + activeProjectDisplay + .setSizeProvider( + (screenSize, window, parent) -> new Size(screenSize.width / 2 - 20, screenSize.height - 40)) + .setPosProvider((screenSize, window, parent) -> new Pos2d(screenSize.width / 2, 20))) + // Elevator logo in bottom right corner + .widget( + new DrawableWidget().setDrawable(IG_UITextures.PICTURE_ELEVATOR_LOGO_DARK) + .setSize(36, 36) + .setPosProvider( + (screenSize, mainWindow, parent) -> new Pos2d(screenSize.width - 40, screenSize.height - 40))) + // Drop down to select location + .widget( + new DropDownWidget().addDropDownItemsSimple( + new ArrayList<>(SpaceProjectManager.getLocationNames()), + (buttonWidget, index, label, setSelected) -> buttonWidget.setOnClick((clickData, widget) -> { + selectedLocation = SpaceProjectManager.getLocation(label); + locationIndex = index; + projectMode = true; + upgradeMode = false; + if (!widget.getContext() + .isClient()) { + selectedProject = SpaceProjectManager.getTeamProjectOrCopy( + getBaseMetaTileEntity().getOwnerUuid(), + selectedProject != null ? selectedProject.getProjectName() : selectedProjectName, + selectedLocation); + } + setSelected.run(); + }), + true) + .setDirection(DropDownWidget.Direction.UP) + .setTextUnselected(LOCATON_UNSELECTED) + .setSelected(locationIndex) + .setPos(20, 259) + .setSize(128, 20) + .setBackground(GTUITextures.BUTTON_STANDARD)) + // Syncer for selected location + .widget( + new FakeSyncWidget.StringSyncer( + () -> selectedLocation != null ? selectedLocation.getName() : "", + val -> { + selectedLocation = SpaceProjectManager.getLocation(val); + if (selectedProject != null) { + projectMode = true; + upgradeMode = false; + } + })) + // Syncer for selected project + .widget( + new FakeSyncWidget.StringSyncer( + () -> selectedProject != null ? selectedProject.getProjectName() : "", + val -> { + selectedProjectName = val; + selectedProject = SpaceProjectManager.getProject(val); + if (selectedProject != null) { + upgradeFromProject = new ArrayList<>(selectedProject.getAllUpgrades()); + projectMode = true; + upgradeMode = false; + } + })) + // Syncer for selected project upgrade + .widget( + new FakeSyncWidget.StringSyncer( + () -> selectedUpgrade != null ? selectedUpgrade.getUpgradeName() : "", + val -> { + if (selectedProject != null) { + selectedUpgrade = selectedProject.getUpgrade(val); + selectedProject.setCurrentUpgradeBeingBuilt(selectedUpgrade); + } + })) + // Syncer for upgrade being build + .widget( + new FakeSyncWidget.StringSyncer( + () -> selectedProject != null && selectedProject.getUpgradeBeingBuilt() != null + ? selectedProject.getUpgradeBeingBuilt() + .getUpgradeName() + : "", + val -> { + if (selectedProject != null) + selectedProject.setCurrentUpgradeBeingBuilt(selectedProject.getUpgrade(val)); + })) + // Syncer for selected project stage + .widget( + new FakeSyncWidget.IntegerSyncer( + () -> selectedProject != null ? selectedProject.getCurrentStage() : 0, + val -> { + if (selectedProject != null) { + selectedProject.setProjectCurrentStage(val); + } + })) + // Syncer for selected upgrade stage + .widget(new FakeSyncWidget.IntegerSyncer(() -> { + if (selectedProject != null && selectedUpgrade != null) { + ISpaceProject.ISP_Upgrade upgradeFromProject = selectedProject.getUpgradeBeingBuilt(); + if (upgradeFromProject != null) { + return upgradeFromProject.getCurrentStage(); + } else { + upgradeFromProject = selectedProject.getUpgrade(selectedUpgrade.getUpgradeName()); if (upgradeFromProject != null) { - return upgradeFromProject.getCurrentStage(); - } else { - upgradeFromProject = selectedProject.getUpgrade(selectedUpgrade.getUpgradeName()); - if (upgradeFromProject != null) { - upgradeFromProject.getCurrentStage(); - } else if (selectedProject.hasUpgrade(selectedUpgrade.getUpgradeName())) { - return selectedProject.getTotalStages(); - } + upgradeFromProject.getCurrentStage(); + } else if (selectedProject.hasUpgrade(selectedUpgrade.getUpgradeName())) { + return selectedProject.getTotalStages(); } - } else if (selectedUpgrade != null) { - return selectedUpgrade.getCurrentStage(); - } - return 0; - }, val -> { - if (selectedProject != null && selectedProject.getUpgradeBeingBuilt() != null) { - selectedProject.getUpgradeBeingBuilt().setUpgradeCurrentStage(val); } - if (selectedUpgrade != null) { - selectedUpgrade.setUpgradeCurrentStage(val); - } - })) - // Syncer for if the project detail page is enabled - .widget(new FakeSyncWidget.BooleanSyncer(() -> projectMode, val -> projectMode = val)) - // Syncer for if the upgrade detail page is enabled - .widget(new FakeSyncWidget.BooleanSyncer(() -> upgradeMode, val -> upgradeMode = val)).build(); + } else if (selectedUpgrade != null) { + return selectedUpgrade.getCurrentStage(); + } + return 0; + }, val -> { + if (selectedProject != null && selectedProject.getUpgradeBeingBuilt() != null) { + selectedProject.getUpgradeBeingBuilt() + .setUpgradeCurrentStage(val); + } + if (selectedUpgrade != null) { + selectedUpgrade.setUpgradeCurrentStage(val); + } + })) + // Syncer for if the project detail page is enabled + .widget(new FakeSyncWidget.BooleanSyncer(() -> projectMode, val -> projectMode = val)) + // Syncer for if the upgrade detail page is enabled + .widget(new FakeSyncWidget.BooleanSyncer(() -> upgradeMode, val -> upgradeMode = val)) + .build(); } /** @@ -613,29 +633,26 @@ protected ModularWindow createProjectWindow() { */ private void generateProjectDetails(final MultiChildWidget projectDetails) { projectDetails.addChild( - // Name of the project as title - TextWidget.dynamicString(() -> selectedProject != null ? selectedProject.getLocalizedName() : "") - .setScale(2).setDefaultColor(WHITE).setTextAlignment(Alignment.Center) - .setPosProvider(((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.05))) - .setSizeProvider( - ((screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.15)))) - // Description of project - .addChild( - TextWidget - .dynamicString( - () -> selectedProject != null - ? StatCollector.translateToLocal( - selectedProject.getUnlocalizedName() + ".description") - : "") - .setDefaultColor(WHITE) - .setPosProvider( - ((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.2))) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width, - parent.getSize().height * 0.4)) - .setEnabled(widget -> projectMode)); + // Name of the project as title + TextWidget.dynamicString(() -> selectedProject != null ? selectedProject.getLocalizedName() : "") + .setScale(2) + .setDefaultColor(WHITE) + .setTextAlignment(Alignment.Center) + .setPosProvider(((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.05))) + .setSizeProvider( + ((screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.15)))) + // Description of project + .addChild( + TextWidget + .dynamicString( + () -> selectedProject != null + ? StatCollector.translateToLocal(selectedProject.getUnlocalizedName() + ".description") + : "") + .setDefaultColor(WHITE) + .setPosProvider(((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.2))) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.4)) + .setEnabled(widget -> projectMode)); generateProjectCosts(projectDetails); generateUpgradeCost(projectDetails); generateUpgrades(projectDetails); @@ -652,117 +669,113 @@ private void generateProjectCosts(final MultiChildWidget projectDetails) { for (int i = 0; i < 12; i++) { int index = i; activeProjectItemsAndFluids.addChild( - new ItemDrawable(() -> selectedProject != null ? selectedProject.getItemCostPerStage(index) : null) - .asWidget().dynamicTooltip(() -> { - List tTooltip = new ArrayList<>(); - if (selectedProject != null) { - tTooltip.add( - selectedProject.getItemCostPerStage(index) != null - ? selectedProject.getItemCostPerStage(index).getDisplayName() - : ""); - } else { - tTooltip.add(""); - } - return tTooltip; - }) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().height / 16, - parent.getSize().height / 16)) - .setBackground(GTUITextures.BUTTON_STANDARD).setEnabled( - widget -> selectedProject != null - && selectedProject.getItemCostPerStage(index) != null)); + new ItemDrawable(() -> selectedProject != null ? selectedProject.getItemCostPerStage(index) : null) + .asWidget() + .dynamicTooltip(() -> { + List tTooltip = new ArrayList<>(); + if (selectedProject != null) { + tTooltip.add( + selectedProject.getItemCostPerStage(index) != null + ? selectedProject.getItemCostPerStage(index) + .getDisplayName() + : ""); + } else { + tTooltip.add(""); + } + return tTooltip; + }) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().height / 16, parent.getSize().height / 16)) + .setBackground(GTUITextures.BUTTON_STANDARD) + .setEnabled( + widget -> selectedProject != null && selectedProject.getItemCostPerStage(index) != null)); } for (int i = 0; i < 4; i++) { int index = i; activeProjectItemsAndFluids.addChild( - new FluidDrawable() - .setFluid( - () -> selectedProject != null ? selectedProject.getFluidCostPerStage(index) : null) - .asWidget() - .dynamicTooltip( - () -> Collections.singletonList( - selectedProject != null - ? selectedProject.getFluidCostPerStage(index).getLocalizedName() - : "")) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().height / 16, - parent.getSize().height / 16)) - .setBackground(GTUITextures.BUTTON_STANDARD).setEnabled( - widget -> selectedProject != null - && selectedProject.getFluidCostPerStage(index) != null)); + new FluidDrawable() + .setFluid(() -> selectedProject != null ? selectedProject.getFluidCostPerStage(index) : null) + .asWidget() + .dynamicTooltip( + () -> Collections.singletonList( + selectedProject != null ? selectedProject.getFluidCostPerStage(index) + .getLocalizedName() : "")) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().height / 16, parent.getSize().height / 16)) + .setBackground(GTUITextures.BUTTON_STANDARD) + .setEnabled( + widget -> selectedProject != null && selectedProject.getFluidCostPerStage(index) != null)); } for (int i = 0; i < 12; i++) { int index = i; activeProjectCosts.addChild( - TextWidget.dynamicString( - () -> (selectedProject != null && selectedProject.getItemCostPerStage(index) != null - ? selectedProject.getItemCostPerStage(index).stackSize - : "") - + " Per Stage (" - + (selectedProject != null && selectedProject.getCurrentItemProgress(index) != null - ? selectedProject.getCurrentItemProgress(index).stackSize - : "") - + "/" - + (selectedProject != null && selectedProject.getTotalItemCost(index) != null - ? selectedProject.getTotalItemCost(index).stackSize - : "") - + ")") - .setDefaultColor(WHITE).setTextAlignment(Alignment.CenterRight) - .setSizeProvider( - (screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height / 16)) - .setEnabled( - widget -> selectedProject != null - && selectedProject.getItemCostPerStage(index) != null)); + TextWidget + .dynamicString( + () -> (selectedProject != null && selectedProject.getItemCostPerStage(index) != null + ? selectedProject.getItemCostPerStage(index).stackSize + : "") + + " Per Stage (" + + (selectedProject != null && selectedProject.getCurrentItemProgress(index) != null + ? selectedProject.getCurrentItemProgress(index).stackSize + : "") + + "/" + + (selectedProject != null && selectedProject.getTotalItemCost(index) != null + ? selectedProject.getTotalItemCost(index).stackSize + : "") + + ")") + .setDefaultColor(WHITE) + .setTextAlignment(Alignment.CenterRight) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height / 16)) + .setEnabled( + widget -> selectedProject != null && selectedProject.getItemCostPerStage(index) != null)); } for (int i = 0; i < 4; i++) { int index = i; activeProjectCosts.addChild( - TextWidget.dynamicString( - () -> (selectedProject != null && selectedProject.getCurrentFluidProgress(index) != null - ? selectedProject.getFluidCostPerStage(index).amount - : "") - + " Per Stage (" - + (selectedProject != null && selectedProject.getCurrentFluidProgress(index) != null - ? selectedProject.getCurrentFluidProgress(index).amount - : "") - + "/" - + (selectedProject != null && selectedProject.getTotalFluidCost(index) != null - ? selectedProject.getTotalFluidCost(index).amount - : "") - + ")") - .setDefaultColor(WHITE).setTextAlignment(Alignment.CenterRight) - .setSizeProvider( - (screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height / 16)) - .setEnabled( - widget -> selectedProject != null - && selectedProject.getFluidCostPerStage(index) != null)); + TextWidget + .dynamicString( + () -> (selectedProject != null && selectedProject.getCurrentFluidProgress(index) != null + ? selectedProject.getFluidCostPerStage(index).amount + : "") + + " Per Stage (" + + (selectedProject != null && selectedProject.getCurrentFluidProgress(index) != null + ? selectedProject.getCurrentFluidProgress(index).amount + : "") + + "/" + + (selectedProject != null && selectedProject.getTotalFluidCost(index) != null + ? selectedProject.getTotalFluidCost(index).amount + : "") + + ")") + .setDefaultColor(WHITE) + .setTextAlignment(Alignment.CenterRight) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height / 16)) + .setEnabled( + widget -> selectedProject != null && selectedProject.getFluidCostPerStage(index) != null)); } projectDetails.addChild( - new Scrollable().setVerticalScroll() - .widget( - activeProjectCosts.setPos(0, 0).setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width * 0.85, - parent.getSize().height * 0.2 * 16))) - .widget( - activeProjectItemsAndFluids - .setPosProvider( - (screenSize, window, parent) -> new Pos2d( - parent.getSize().width * 0.85, - -((Scrollable) parent).getVerticalScrollOffset())) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width * 0.15, - parent.getSize().height * 0.2 * 16))) + new Scrollable().setVerticalScroll() + .widget( + activeProjectCosts.setPos(0, 0) .setSizeProvider( - (screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.3)) - .setPosProvider((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.6)) - .setEnabled(widget -> projectMode)); + (screenSize, window, + parent) -> new Size(parent.getSize().width * 0.85, parent.getSize().height * 0.2 * 16))) + .widget( + activeProjectItemsAndFluids + .setPosProvider( + (screenSize, window, parent) -> new Pos2d( + parent.getSize().width * 0.85, + -((Scrollable) parent).getVerticalScrollOffset())) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().width * 0.15, parent.getSize().height * 0.2 * 16))) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.3)) + .setPosProvider((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.6)) + .setEnabled(widget -> projectMode)); } /** @@ -775,42 +788,38 @@ private void generateUpgrades(MultiChildWidget projectDetails) { for (int i = 0; i < 12; i++) { int index = i; activeProjectUpgrades.addChild( - generateCustomButton( - () -> upgradeFromProject != null && upgradeFromProject.size() > index - ? upgradeFromProject.get(index) - : null)); + generateCustomButton( + () -> upgradeFromProject != null && upgradeFromProject.size() > index + ? upgradeFromProject.get(index) + : null)); } - projectDetails - .addChild( - new Scrollable().setVerticalScroll().widget( - activeProjectUpgrades.setSizeProvider( - (screenSize, window, parent) -> new Size(parent.getSize().width, 25 * 12))) - .setPosProvider( - (screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.2)) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width * 0.5, - parent.getSize().height * 0.4)) - .setEnabled(widget -> upgradeMode)) - .addChild( - new Scrollable().setVerticalScroll().widget( - TextWidget - .dynamicString( - () -> selectedUpgrade != null - ? StatCollector.translateToLocal( - selectedUpgrade.getUnlocalizedName() + ".description") - : "") - .setDefaultColor(WHITE).setSizeProvider( - (screenSize, window, parent) -> new Size(parent.getSize().width, 200))) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width, - parent.getSize().height * 0.4)) - .setPosProvider( - (screenSize, window, parent) -> new Pos2d( - parent.getSize().width * 0.5, - parent.getSize().height * 0.2)) - .setEnabled(widget -> upgradeMode)); + projectDetails.addChild( + new Scrollable().setVerticalScroll() + .widget( + activeProjectUpgrades + .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 25 * 12))) + .setPosProvider((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.2)) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().width * 0.5, parent.getSize().height * 0.4)) + .setEnabled(widget -> upgradeMode)) + .addChild( + new Scrollable().setVerticalScroll() + .widget( + TextWidget + .dynamicString( + () -> selectedUpgrade != null + ? StatCollector + .translateToLocal(selectedUpgrade.getUnlocalizedName() + ".description") + : "") + .setDefaultColor(WHITE) + .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 200))) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.4)) + .setPosProvider( + (screenSize, window, + parent) -> new Pos2d(parent.getSize().width * 0.5, parent.getSize().height * 0.2)) + .setEnabled(widget -> upgradeMode)); } /** @@ -821,117 +830,116 @@ private void generateUpgrades(MultiChildWidget projectDetails) { private void generateUpgradeCost(MultiChildWidget projectDetails) { final DynamicPositionedColumn activeUpgradeItemsAndFluids = new DynamicPositionedColumn(); final DynamicPositionedColumn activeUpgradeCosts = new DynamicPositionedColumn(); - for (int i = 0; i < RecipeMaps.spaceProjectFakeRecipes.getFrontend().getUIProperties().maxItemInputs; i++) { + for (int i = 0; i < RecipeMaps.spaceProjectFakeRecipes.getFrontend() + .getUIProperties().maxItemInputs; i++) { int index = i; activeUpgradeItemsAndFluids.addChild( - new ItemDrawable(() -> selectedUpgrade != null ? selectedUpgrade.getItemCostPerStage(index) : null) - .asWidget().dynamicTooltip(() -> { - List tTooltip = new ArrayList<>(); - if (selectedUpgrade != null) { - tTooltip.add( - selectedUpgrade.getItemCostPerStage(index) != null - ? selectedUpgrade.getItemCostPerStage(index).getDisplayName() - : ""); - } else { - tTooltip.add(""); - } - return tTooltip; - }) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().height / 16, - parent.getSize().height / 16)) - .setBackground(GTUITextures.BUTTON_STANDARD).setEnabled( - widget -> selectedUpgrade != null - && selectedUpgrade.getItemCostPerStage(index) != null)); + new ItemDrawable(() -> selectedUpgrade != null ? selectedUpgrade.getItemCostPerStage(index) : null) + .asWidget() + .dynamicTooltip(() -> { + List tTooltip = new ArrayList<>(); + if (selectedUpgrade != null) { + tTooltip.add( + selectedUpgrade.getItemCostPerStage(index) != null + ? selectedUpgrade.getItemCostPerStage(index) + .getDisplayName() + : ""); + } else { + tTooltip.add(""); + } + return tTooltip; + }) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().height / 16, parent.getSize().height / 16)) + .setBackground(GTUITextures.BUTTON_STANDARD) + .setEnabled( + widget -> selectedUpgrade != null && selectedUpgrade.getItemCostPerStage(index) != null)); } - for (int i = 0; i < RecipeMaps.spaceProjectFakeRecipes.getFrontend().getUIProperties().maxFluidInputs; i++) { + for (int i = 0; i < RecipeMaps.spaceProjectFakeRecipes.getFrontend() + .getUIProperties().maxFluidInputs; i++) { int index = i; activeUpgradeItemsAndFluids.addChild( - new FluidDrawable() - .setFluid( - () -> selectedUpgrade != null ? selectedUpgrade.getFluidCostPerStage(index) : null) - .asWidget() - .dynamicTooltip( - () -> Collections.singletonList( - selectedUpgrade != null - ? selectedUpgrade.getFluidCostPerStage(index).getLocalizedName() - : "")) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().height / 16, - parent.getSize().height / 16)) - .setBackground(GTUITextures.BUTTON_STANDARD).setEnabled( - widget -> selectedUpgrade != null - && selectedUpgrade.getFluidCostPerStage(index) != null)); + new FluidDrawable() + .setFluid(() -> selectedUpgrade != null ? selectedUpgrade.getFluidCostPerStage(index) : null) + .asWidget() + .dynamicTooltip( + () -> Collections.singletonList( + selectedUpgrade != null ? selectedUpgrade.getFluidCostPerStage(index) + .getLocalizedName() : "")) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().height / 16, parent.getSize().height / 16)) + .setBackground(GTUITextures.BUTTON_STANDARD) + .setEnabled( + widget -> selectedUpgrade != null && selectedUpgrade.getFluidCostPerStage(index) != null)); } - for (int i = 0; i < RecipeMaps.spaceProjectFakeRecipes.getFrontend().getUIProperties().maxItemInputs; i++) { + for (int i = 0; i < RecipeMaps.spaceProjectFakeRecipes.getFrontend() + .getUIProperties().maxItemInputs; i++) { int index = i; activeUpgradeCosts.addChild( - TextWidget.dynamicString( - () -> (selectedUpgrade != null && selectedUpgrade.getItemCostPerStage(index) != null - ? selectedUpgrade.getItemCostPerStage(index).stackSize - : "") - + " Per Stage (" - + (selectedUpgrade != null && selectedUpgrade.getCurrentItemProgress(index) != null - ? selectedUpgrade.getCurrentItemProgress(index).stackSize - : "") - + "/" - + (selectedUpgrade != null && selectedUpgrade.getTotalItemCost(index) != null - ? selectedUpgrade.getTotalItemCost(index).stackSize - : "") - + ")") - .setDefaultColor(WHITE).setTextAlignment(Alignment.CenterRight) - .setSizeProvider( - (screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height / 16)) - .setEnabled( - widget -> selectedUpgrade != null - && selectedUpgrade.getItemCostPerStage(index) != null)); + TextWidget + .dynamicString( + () -> (selectedUpgrade != null && selectedUpgrade.getItemCostPerStage(index) != null + ? selectedUpgrade.getItemCostPerStage(index).stackSize + : "") + + " Per Stage (" + + (selectedUpgrade != null && selectedUpgrade.getCurrentItemProgress(index) != null + ? selectedUpgrade.getCurrentItemProgress(index).stackSize + : "") + + "/" + + (selectedUpgrade != null && selectedUpgrade.getTotalItemCost(index) != null + ? selectedUpgrade.getTotalItemCost(index).stackSize + : "") + + ")") + .setDefaultColor(WHITE) + .setTextAlignment(Alignment.CenterRight) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height / 16)) + .setEnabled( + widget -> selectedUpgrade != null && selectedUpgrade.getItemCostPerStage(index) != null)); } for (int i = 0; i < 4; i++) { int index = i; activeUpgradeCosts.addChild( - TextWidget.dynamicString( - () -> (selectedUpgrade != null && selectedUpgrade.getCurrentFluidProgress(index) != null - ? selectedUpgrade.getFluidCostPerStage(index).amount - : "") - + " Per Stage (" - + (selectedUpgrade != null && selectedUpgrade.getCurrentFluidProgress(index) != null - ? selectedUpgrade.getCurrentFluidProgress(index).amount - : "") - + "/" - + (selectedUpgrade != null && selectedUpgrade.getTotalFluidCost(index) != null - ? selectedUpgrade.getTotalFluidCost(index).amount - : "") - + ")") - .setDefaultColor(WHITE).setTextAlignment(Alignment.CenterRight) - .setSizeProvider( - (screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height / 16)) - .setEnabled( - widget -> selectedUpgrade != null - && selectedUpgrade.getFluidCostPerStage(index) != null)); + TextWidget + .dynamicString( + () -> (selectedUpgrade != null && selectedUpgrade.getCurrentFluidProgress(index) != null + ? selectedUpgrade.getFluidCostPerStage(index).amount + : "") + + " Per Stage (" + + (selectedUpgrade != null && selectedUpgrade.getCurrentFluidProgress(index) != null + ? selectedUpgrade.getCurrentFluidProgress(index).amount + : "") + + "/" + + (selectedUpgrade != null && selectedUpgrade.getTotalFluidCost(index) != null + ? selectedUpgrade.getTotalFluidCost(index).amount + : "") + + ")") + .setDefaultColor(WHITE) + .setTextAlignment(Alignment.CenterRight) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height / 16)) + .setEnabled( + widget -> selectedUpgrade != null && selectedUpgrade.getFluidCostPerStage(index) != null)); } projectDetails.addChild( - new Scrollable().setVerticalScroll() - .widget( - activeUpgradeCosts.setPos(0, 0).setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width * 0.85, - parent.getSize().height * 0.2 * 16))) - .widget( - activeUpgradeItemsAndFluids.setPosProvider( - (screenSize, window, parent) -> new Pos2d(parent.getSize().width * 0.85, 0)) - .setSizeProvider( - (screenSize, window, parent) -> new Size( - parent.getSize().width * 0.15, - parent.getSize().height * 0.2 * 16))) + new Scrollable().setVerticalScroll() + .widget( + activeUpgradeCosts.setPos(0, 0) .setSizeProvider( - (screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.3)) - .setPosProvider((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.6)) - .setEnabled(widget -> upgradeMode)); + (screenSize, window, + parent) -> new Size(parent.getSize().width * 0.85, parent.getSize().height * 0.2 * 16))) + .widget( + activeUpgradeItemsAndFluids + .setPosProvider((screenSize, window, parent) -> new Pos2d(parent.getSize().width * 0.85, 0)) + .setSizeProvider( + (screenSize, window, + parent) -> new Size(parent.getSize().width * 0.15, parent.getSize().height * 0.2 * 16))) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height * 0.3)) + .setPosProvider((screenSize, window, parent) -> new Pos2d(0, parent.getSize().height * 0.6)) + .setEnabled(widget -> upgradeMode)); } /** @@ -947,26 +955,31 @@ private Widget generateCustomButton(ISpaceProject project) { customButton.addChild(button.setOnClick((clickData, widget) -> { projectMode = true; upgradeMode = false; - if (widget.getContext().isClient()) { + if (widget.getContext() + .isClient()) { selectedProject = SpaceProjectManager.getProject(widget.getInternalName()); } else { selectedProject = SpaceProjectManager.getTeamProjectOrCopy( - getBaseMetaTileEntity().getOwnerUuid(), - widget.getInternalName(), - selectedLocation); + getBaseMetaTileEntity().getOwnerUuid(), + widget.getInternalName(), + selectedLocation); } if (selectedProject != null) { upgradeFromProject = new ArrayList<>(selectedProject.getAllUpgrades()); } - }).setBackground(() -> { - if (selectedProject != null && selectedProject.getProjectName().equals(button.getInternalName())) { - return new IDrawable[] { buttonDown }; - } - return new IDrawable[] { buttonUp }; - }).setInternalName(project.getProjectName()) - .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 40))).addChild( - new TextWidget(project.getLocalizedName()).setTextAlignment(Alignment.Center) - .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 40))); + }) + .setBackground(() -> { + if (selectedProject != null && selectedProject.getProjectName() + .equals(button.getInternalName())) { + return new IDrawable[] { buttonDown }; + } + return new IDrawable[] { buttonUp }; + }) + .setInternalName(project.getProjectName()) + .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 40))) + .addChild( + new TextWidget(project.getLocalizedName()).setTextAlignment(Alignment.Center) + .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 40))); return customButton.setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 45)); } @@ -982,8 +995,9 @@ private Widget generateCustomButton(Supplier supplier ButtonWidget button = new ButtonWidget(); customButton.addChild(button.setOnClick((clickData, widget) -> { - if (selectedProject.getUpgradeBeingBuilt() != null - && selectedProject.getUpgradeBeingBuilt().getUpgradeName().equals(widget.getInternalName())) { + if (selectedProject.getUpgradeBeingBuilt() != null && selectedProject.getUpgradeBeingBuilt() + .getUpgradeName() + .equals(widget.getInternalName())) { selectedUpgrade = selectedProject.getUpgradeBeingBuilt(); } else { selectedUpgrade = selectedProject.getUpgrade(widget.getInternalName()); @@ -991,18 +1005,28 @@ private Widget generateCustomButton(Supplier supplier selectedUpgrade.setUpgradeCurrentStage(selectedUpgrade.getTotalStages()); } } - }).setBackground(() -> { - if (selectedUpgrade != null && selectedUpgrade.getUpgradeName().equals(button.getInternalName())) { - return new IDrawable[] { buttonDown }; - } - return new IDrawable[] { buttonUp }; - }).setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 35)) - .setInternalName(() -> supplier.get() != null ? supplier.get().getUpgradeName() : "")).addChild( - TextWidget.dynamicString(() -> supplier.get() != null ? supplier.get().getLocalizedName() : "") - .setTextAlignment(Alignment.Center) - .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 35))); + }) + .setBackground(() -> { + if (selectedUpgrade != null && selectedUpgrade.getUpgradeName() + .equals(button.getInternalName())) { + return new IDrawable[] { buttonDown }; + } + return new IDrawable[] { buttonUp }; + }) + .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 35)) + .setInternalName( + () -> supplier.get() != null ? supplier.get() + .getUpgradeName() : "")) + .addChild( + TextWidget.dynamicString( + () -> supplier.get() != null ? supplier.get() + .getLocalizedName() : "") + .setTextAlignment(Alignment.Center) + .setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 35))); return customButton.setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, 40)) - .setEnabled(widget -> !button.getInternalName().equals("")); + .setEnabled( + widget -> !button.getInternalName() + .equals("")); } /** @@ -1017,26 +1041,31 @@ private Widget generateCustomButton(Supplier supplier * @return Button */ private Widget generateCustomButton(String text, BiConsumer consumer, - Supplier isToggledSupplier, Supplier isClickableSupplier, Widget.SizeProvider buttonSize, - Widget.PosProvider buttonPos) { + Supplier isToggledSupplier, Supplier isClickableSupplier, Widget.SizeProvider buttonSize, + Widget.PosProvider buttonPos) { MultiChildWidget customButton = new MultiChildWidget(); - customButton.addChild(new ButtonWidget().setOnClick(consumer).setBackground(() -> { - if (!isClickableSupplier.get()) { - if (isToggledSupplier.get()) { - return new IDrawable[] { buttonDownDisabled }; - } - return new IDrawable[] { buttonUpDisabled }; - } - if (isToggledSupplier.get()) { - return new IDrawable[] { buttonDown }; - } - return new IDrawable[] { buttonUp }; - }).setSizeProvider((screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height))) - .addChild( - new TextWidget(text).setTextAlignment(Alignment.Center).setSizeProvider( - (screenSize, window, - parent) -> new Size(parent.getSize().width, parent.getSize().height))); - return customButton.setSizeProvider(buttonSize).setPosProvider(buttonPos); + customButton.addChild( + new ButtonWidget().setOnClick(consumer) + .setBackground(() -> { + if (!isClickableSupplier.get()) { + if (isToggledSupplier.get()) { + return new IDrawable[] { buttonDownDisabled }; + } + return new IDrawable[] { buttonUpDisabled }; + } + if (isToggledSupplier.get()) { + return new IDrawable[] { buttonDown }; + } + return new IDrawable[] { buttonUp }; + }) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height))) + .addChild( + new TextWidget(text).setTextAlignment(Alignment.Center) + .setSizeProvider( + (screenSize, window, parent) -> new Size(parent.getSize().width, parent.getSize().height))); + return customButton.setSizeProvider(buttonSize) + .setPosProvider(buttonPos); } /** @@ -1045,9 +1074,10 @@ private Widget generateCustomButton(String text, BiConsumer 0 - && selectedProject != null - && selectedProject.isFinished() - && selectedProject.getAllUpgrades().size() > 0; + && selectedProject != null + && selectedProject.isFinished() + && selectedProject.getAllUpgrades() + .size() > 0; } else { return true; } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleMiner.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleMiner.java index 3f53a13..7dd2b30 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleMiner.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleMiner.java @@ -128,46 +128,46 @@ public abstract class TileEntityModuleMiner extends TileEntityModuleBase impleme /** Input parameters */ Parameters.Group.ParameterIn distanceSetting, parallelSetting, overdriveSetting, modeSetting, rangeSetting, - stepSetting; + stepSetting; Parameters.Group.ParameterOut distanceDisplay; /** Name of the distance setting */ private static final INameFunction DISTANCE_SETTING_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.0"); // Distance + .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.0"); // Distance /** Status of the distance setting */ private static final IStatusFunction DISTANCE_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 200, MAX_DISTANCE); + .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 200, MAX_DISTANCE); /** Name of the parallel setting */ private static final INameFunction PARALLEL_SETTING_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.1"); // Max parallels + .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.1"); // Max parallels /** Status of the parallel setting */ private static final IStatusFunction PARALLEL_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 100, base.getMaxParallels()); + .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 100, base.getMaxParallels()); /** Name of the overdrive setting */ private static final INameFunction OVERDRIVE_SETTING_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.2"); // Overdrive + .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.2"); // Overdrive /** Status of the overdrive setting */ private static final IStatusFunction OVERDRIVE_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 1.5, 2); + .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 1.5, 2); /** Name of the mode setting */ private static final INameFunction MODE_SETTING_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.4"); // Mode + .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.4"); // Mode /** Status of the mode setting */ private static final IStatusFunction MODE_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 0, 0, 1.1, 1.1); + .fromLimitsInclusiveOuterBoundary(p.get(), 0, 0, 1.1, 1.1); /** Name of the mode setting */ private static final INameFunction RANGE_SETTING_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.5"); // Range + .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.5"); // Range /** Status of the mode setting */ private static final IStatusFunction RANGE_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 0, 0, 50, 150); + .fromLimitsInclusiveOuterBoundary(p.get(), 0, 0, 50, 150); /** Name of the step setting */ private static final INameFunction STEP_SETTING_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.6"); // Step + .translate("gt.blockmachines.multimachine.project.ig.miner.cfgi.6"); // Step /** Status of the step setting */ private static final IStatusFunction STEP_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 0, 0, 10, 20); + .fromLimitsInclusiveOuterBoundary(p.get(), 0, 0, 10, 20); // endregion @@ -204,7 +204,7 @@ public abstract class TileEntityModuleMiner extends TileEntityModuleBase impleme * @param tMinMotorTier Minimum needed motor tier */ public TileEntityModuleMiner(int aID, String aName, String aNameRegional, int tTier, int tModuleTier, - int tMinMotorTier) { + int tMinMotorTier) { super(aID, aName, aNameRegional, tTier, tModuleTier, tMinMotorTier); overclockDescriber = new ModuleOverclockDescriber((byte) tTier, tModuleTier); } @@ -294,11 +294,11 @@ public RecipeMap getRecipeMap() { if (availablePlasmaTier > 0) { // Check if valid inputs for a mining operation are present CheckRecipeResult result = process( - itemInputs, - inputFluids.toArray(new FluidStack[0]), - availablePlasmaTier, - fluidStack, - getParallels(fluidStack, getPlasmaUsageFromTier(availablePlasmaTier))); + itemInputs, + inputFluids.toArray(new FluidStack[0]), + availablePlasmaTier, + fluidStack, + getParallels(fluidStack, getPlasmaUsageFromTier(availablePlasmaTier))); if (result.wasSuccessful()) { cycleDistance(); return result; @@ -352,7 +352,7 @@ protected ItemStack[] validInputs() { * @return Multiblock control structure that contains all process data or null if nothing can be processed */ public CheckRecipeResult process(ItemStack[] inputs, FluidStack[] fluidInputs, int availablePlasmaTier, - FluidStack plasma, int maxParallels) { + FluidStack plasma, int maxParallels) { // Check inputs if ((inputs == null && fluidInputs == null)) { return CheckRecipeResultRegistry.NO_RECIPE; @@ -371,17 +371,22 @@ public CheckRecipeResult process(ItemStack[] inputs, FluidStack[] fluidInputs, i recipes = prevRecipes; } else { recipes = new WeightedAsteroidList( - IGRecipeMaps.spaceMiningRecipes.findRecipeQuery().items(inputs).fluids(fluidInputs) - .voltage(tVoltage).findAll().filter(r -> { - // Check module tier - int recipeTier = r.getMetadataOrDefault(IGRecipeMaps.MODULE_TIER, 1); - if (recipeTier > tModuleTier) return false; - - // Check mining recipe distance - SpaceMiningData data = r.getMetadata(IGRecipeMaps.SPACE_MINING_DATA); - if (data == null) return false; - return data.minDistance <= distance && data.maxDistance >= distance; - }).distinct()); + IGRecipeMaps.spaceMiningRecipes.findRecipeQuery() + .items(inputs) + .fluids(fluidInputs) + .voltage(tVoltage) + .findAll() + .filter(r -> { + // Check module tier + int recipeTier = r.getMetadataOrDefault(IGRecipeMaps.MODULE_TIER, 1); + if (recipeTier > tModuleTier) return false; + + // Check mining recipe distance + SpaceMiningData data = r.getMetadata(IGRecipeMaps.SPACE_MINING_DATA); + if (data == null) return false; + return data.minDistance <= distance && data.maxDistance >= distance; + }) + .distinct()); // The original implementation had each recipe added multiple times redundantly, so I implemented // hashCode/equals // and use .distinct() here @@ -428,9 +433,14 @@ public CheckRecipeResult process(ItemStack[] inputs, FluidStack[] fluidInputs, i } // Check how many parallels we can actually do, return if none - ParallelHelper helper = new ParallelHelper().setMaxParallel(maxParallels).setRecipe(tRecipe) - .setFluidInputs(fluidInputs).setItemInputs(inputs).setAvailableEUt(GTValues.V[tTier]) - .setMachine(this, false, false).setConsumption(true).build(); + ParallelHelper helper = new ParallelHelper().setMaxParallel(maxParallels) + .setRecipe(tRecipe) + .setFluidInputs(fluidInputs) + .setItemInputs(inputs) + .setAvailableEUt(GTValues.V[tTier]) + .setMachine(this, false, false) + .setConsumption(true) + .build(); int parallels = helper.getCurrentParallel(); if (parallels <= 0) { return CheckRecipeResultRegistry.NO_RECIPE; @@ -438,7 +448,8 @@ public CheckRecipeResult process(ItemStack[] inputs, FluidStack[] fluidInputs, i // Randomly generate ore stacks with the given chances, ores and size Map outputs = new HashMap<>(); - int totalChance = Arrays.stream(tRecipe.mChances).sum(); + int totalChance = Arrays.stream(tRecipe.mChances) + .sum(); try { for (int i = 0; i < data.maxSize * parallels; i++) { int bonusStackChance = 0; @@ -453,11 +464,11 @@ public CheckRecipeResult process(ItemStack[] inputs, FluidStack[] fluidInputs, i if (random <= currentChance) { ItemStack generatedOre = tRecipe.mOutputs[j]; if (configuredOres == null || configuredOres.isEmpty() - || isWhitelisted == configuredOres.contains(getOreString(generatedOre))) { + || isWhitelisted == configuredOres.contains(getOreString(generatedOre))) { outputs.merge( - GTUtility.ItemId.createNoCopy(generatedOre), - (long) generatedOre.stackSize, - Long::sum); + GTUtility.ItemId.createNoCopy(generatedOre), + (long) generatedOre.stackSize, + Long::sum); } break; } @@ -469,13 +480,17 @@ public CheckRecipeResult process(ItemStack[] inputs, FluidStack[] fluidInputs, i } plasma.amount = (int) Math.max( - 0, - Math.ceil(plasma.amount - parallels * getPlasmaUsageFromTier(availablePlasmaTier) * plasmaModifier)); + 0, + Math.ceil(plasma.amount - parallels * getPlasmaUsageFromTier(availablePlasmaTier) * plasmaModifier)); // Assign recipe parameters ArrayList outputItems = new ArrayList<>(); for (Map.Entry entry : outputs.entrySet()) { - ParallelHelper.addItemsLong(outputItems, entry.getKey().getItemStack(), entry.getValue()); + ParallelHelper.addItemsLong( + outputItems, + entry.getKey() + .getItemStack(), + entry.getValue()); } mOutputItems = outputItems.toArray(new ItemStack[0]); @@ -501,10 +516,11 @@ protected int getAvailDroneMask(ItemStack[] inputs) { } int res = 0; for (int tier = ItemMiningDrones.DroneTiers.LV.ordinal(); tier - <= ItemMiningDrones.DroneTiers.UXV.ordinal(); ++tier) { - if (Arrays.stream(SpaceMiningRecipes.getTieredInputs(tier)).allMatch( + <= ItemMiningDrones.DroneTiers.UXV.ordinal(); ++tier) { + if (Arrays.stream(SpaceMiningRecipes.getTieredInputs(tier)) + .allMatch( input -> itemCounts.getOrDefault(GTUtility.ItemId.createWithoutNBT(input), 0l) - >= Math.max(input.stackSize, 1))) { + >= Math.max(input.stackSize, 1))) { res |= 1 << tier; } } @@ -522,22 +538,21 @@ protected int getTierFromPlasma(FluidStack fluidStack) { return 0; } if ((fluidStack.isFluidEqual(Materials.Plutonium241.getPlasma(1)) - && fluidStack.amount >= PLASMA_PLUTONIUM241_USAGE)) { + && fluidStack.amount >= PLASMA_PLUTONIUM241_USAGE)) { return 5; } else if ((fluidStack.isFluidEqual(new FluidStack(MaterialsElements.getInstance().TECHNETIUM.getPlasma(), 1)) - && fluidStack.amount >= PLASMA_TECHNETIUM_USAGE)) { - return 4; - } else + && fluidStack.amount >= PLASMA_TECHNETIUM_USAGE)) { + return 4; + } else if (fluidStack.isFluidEqual(Materials.Radon.getPlasma(1)) && fluidStack.amount >= PLASMA_RADON_USAGE) { return 3; } else if (fluidStack.isFluidEqual(Materials.Bismuth.getPlasma(1)) - && fluidStack.amount >= PLASMA_BISMUTH_USAGE) { - return 2; - } else - if (fluidStack.isFluidEqual(Materials.Helium.getPlasma(1)) - && fluidStack.amount >= PLASMA_HELIUM_USAGE) { - return 1; - } + && fluidStack.amount >= PLASMA_BISMUTH_USAGE) { + return 2; + } else if (fluidStack.isFluidEqual(Materials.Helium.getPlasma(1)) + && fluidStack.amount >= PLASMA_HELIUM_USAGE) { + return 1; + } return 0; } @@ -576,8 +591,8 @@ protected int getBonusStackChance(int plasmaTier) { // T5: 0.578 // The whole chance is multiplied by 2 - overdrive setting return Math.min( - (int) ((Math.pow((double) plasmaTier / 6, 3) * 10000) * (2.0D - overdriveSetting.get())), - BONUS_STACK_MAX_CHANCE); + (int) ((Math.pow((double) plasmaTier / 6, 3) * 10000) * (2.0D - overdriveSetting.get())), + BONUS_STACK_MAX_CHANCE); } /** @@ -607,10 +622,15 @@ protected String getOreString(ItemStack oreStack) { return null; } // For GT ores we want to save the ore independent of its stone type - if (oreStack.getUnlocalizedName().startsWith("gt.blockores")) { - return oreStack.getItem().getUnlocalizedName() + ":" + oreStack.getItemDamage() % 1000; + if (oreStack.getUnlocalizedName() + .startsWith("gt.blockores")) { + return oreStack.getItem() + .getUnlocalizedName() + ":" + + oreStack.getItemDamage() % 1000; } else { - return oreStack.getItem().getUnlocalizedName() + ":" + oreStack.getItemDamage(); + return oreStack.getItem() + .getUnlocalizedName() + ":" + + oreStack.getItemDamage(); } } @@ -634,8 +654,8 @@ protected int getParallels(FluidStack plasma, int plasmaUsage) { } float plasmaModifier = asteroidOutpost != null ? 1f - asteroidOutpost.getPlasmaDiscount() : 1f; return Math.min( - (int) Math.min(getMaxParallels(), parallelSetting.get()), - (int) (plasma.amount / (plasmaUsage * plasmaModifier))); + (int) Math.min(getMaxParallels(), parallelSetting.get()), + (int) (plasma.amount / (plasmaUsage * plasmaModifier))); } /** @@ -647,9 +667,9 @@ protected int getParallels(FluidStack plasma, int plasmaUsage) { protected int getRecipeTime(int unboostedTime, int plasmaTier) { // Reduce recipe time by 10% for every plasma tier above T1 and divide recipe time by the overdrive value return plasmaTier > 0 - ? (int) ((double) unboostedTime - * Math.max((1D - 0.1D * (plasmaTier - 1)) / overdriveSetting.get(), MIN_RECIPE_TIME_MODIFIER)) - : unboostedTime; + ? (int) ((double) unboostedTime + * Math.max((1D - 0.1D * (plasmaTier - 1)) / overdriveSetting.get(), MIN_RECIPE_TIME_MODIFIER)) + : unboostedTime; } /** @@ -660,7 +680,7 @@ protected void cycleDistance() { // cycle distanceDisplay from (distance - range) // to (distance + range) in increments of step. if (distanceDisplay.get() + stepSetting.get() - <= Math.min(MAX_DISTANCE, distanceSetting.get() + rangeSetting.get())) { + <= Math.min(MAX_DISTANCE, distanceSetting.get() + rangeSetting.get())) { distanceDisplay.set(distanceDisplay.get() + stepSetting.get()); } else { distanceDisplay.set(Math.max(0, distanceSetting.get() - rangeSetting.get())); @@ -705,15 +725,17 @@ protected List getAsteroidSummaries(int maxParallels, float eff } float totalWeight = prevRecipes.totalWeight; // save to float, so we don't have to cast in the following loop float totalTimedensity = prevRecipes.totalTimedensity; - return prevRecipes.recipes.stream().map(r -> { - SpaceMiningData data = r.getMetadata(IGRecipeMaps.SPACE_MINING_DATA); - if (data == null) throw new IllegalStateException("Illegal space miner recipe found"); - return new AsteroidSummary( + return prevRecipes.recipes.stream() + .map(r -> { + SpaceMiningData data = r.getMetadata(IGRecipeMaps.SPACE_MINING_DATA); + if (data == null) throw new IllegalStateException("Illegal space miner recipe found"); + return new AsteroidSummary( data.asteroidName, data.recipeWeight / totalWeight, data.recipeWeight * r.mDuration / totalTimedensity, Math.min(maxParallels, Math.min((int) (effectiveComp / data.computation), (int) (power / r.mEUt)))); - }).collect(Collectors.toList()); + }) + .collect(Collectors.toList()); } /** @@ -743,12 +765,16 @@ protected ButtonWidget createSafeVoidButton() { Widget button = new ButtonWidget().setOnClick((clickData, widget) -> { TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); if (!widget.isClient()) { - widget.getContext().openSyncedWindow(WHITELIST_WINDOW_ID); + widget.getContext() + .openSyncedWindow(WHITELIST_WINDOW_ID); } - }).setPlayClickSound(false) - .setBackground(TecTechUITextures.BUTTON_STANDARD_16x16, IG_UITextures.OVERLAY_BUTTON_OPTIONS) - .setPos(174, 132).setSize(16, 16); - button.addTooltip("Configure Filter").setTooltipShowUpDelay(TOOLTIP_DELAY); + }) + .setPlayClickSound(false) + .setBackground(TecTechUITextures.BUTTON_STANDARD_16x16, IG_UITextures.OVERLAY_BUTTON_OPTIONS) + .setPos(174, 132) + .setSize(16, 16); + button.addTooltip("Configure Filter") + .setTooltipShowUpDelay(TOOLTIP_DELAY); return (ButtonWidget) button; } @@ -772,14 +798,17 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont * @return Window object */ protected ModularWindow createWhitelistConfigWindow(final EntityPlayer player) { - return ModularWindow.builder(158, 180).setBackground(TecTechUITextures.BACKGROUND_SCREEN_BLUE) - .setGuiTint(getGUIColorization()) - // Toggle white-/blacklist - .widget(new ButtonWidget().setOnClick((clickData, widget) -> { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - isWhitelisted = !isWhitelisted; - wasFilterModified = true; - }).setPlayClickSound(false).setBackground(() -> { + return ModularWindow.builder(158, 180) + .setBackground(TecTechUITextures.BACKGROUND_SCREEN_BLUE) + .setGuiTint(getGUIColorization()) + // Toggle white-/blacklist + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + isWhitelisted = !isWhitelisted; + wasFilterModified = true; + }) + .setPlayClickSound(false) + .setBackground(() -> { List ret = new ArrayList<>(); ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); if (isWhitelisted) { @@ -788,46 +817,62 @@ protected ModularWindow createWhitelistConfigWindow(final EntityPlayer player) { ret.add(IG_UITextures.OVERLAY_BUTTON_BLACKLIST); } return ret.toArray(new IDrawable[0]); - }).setPos(7, 9).setSize(16, 16).addTooltip("Mode").setTooltipShowUpDelay(TOOLTIP_DELAY)) - // Clear list - .widget(new ButtonWidget().setOnClick((clickData, widget) -> { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - wasFilterModified = true; - if (!widget.isClient()) { - if (whiteListHandler != null) { - for (int i = 0; i < whiteListHandler.getSlots(); i++) { - whiteListHandler.setStackInSlot(i, null); - } + }) + .setPos(7, 9) + .setSize(16, 16) + .addTooltip("Mode") + .setTooltipShowUpDelay(TOOLTIP_DELAY)) + // Clear list + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + wasFilterModified = true; + if (!widget.isClient()) { + if (whiteListHandler != null) { + for (int i = 0; i < whiteListHandler.getSlots(); i++) { + whiteListHandler.setStackInSlot(i, null); } } - }).setPlayClickSound(false) - .setBackground(TecTechUITextures.BUTTON_STANDARD_16x16, IG_UITextures.OVERLAY_BUTTON_CROSS) - .setPos(25, 9).setSize(16, 16).addTooltip("Clear").setTooltipShowUpDelay(TOOLTIP_DELAY)) - // Configure from bus - .widget(new ButtonWidget().setOnClick((clickData, widget) -> { - TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); - wasFilterModified = true; - if (!widget.isClient()) { - int i = 0; - for (ItemStack itemStack : getStoredInputs()) { - if (i < WHITELIST_SIZE) { - ItemStack copy = itemStack.copy(); - copy.stackSize = 1; - whiteListHandler.setStackInSlot(i++, copy); - } + } + }) + .setPlayClickSound(false) + .setBackground(TecTechUITextures.BUTTON_STANDARD_16x16, IG_UITextures.OVERLAY_BUTTON_CROSS) + .setPos(25, 9) + .setSize(16, 16) + .addTooltip("Clear") + .setTooltipShowUpDelay(TOOLTIP_DELAY)) + // Configure from bus + .widget(new ButtonWidget().setOnClick((clickData, widget) -> { + TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click"); + wasFilterModified = true; + if (!widget.isClient()) { + int i = 0; + for (ItemStack itemStack : getStoredInputs()) { + if (i < WHITELIST_SIZE) { + ItemStack copy = itemStack.copy(); + copy.stackSize = 1; + whiteListHandler.setStackInSlot(i++, copy); } - } - }).setPlayClickSound(false) - .setBackground(TecTechUITextures.BUTTON_STANDARD_16x16, IG_UITextures.OVERLAY_BUTTON_CONFIGURE) - .setPos(43, 9).setSize(16, 16).addTooltip("Load from Bus").setTooltipShowUpDelay(TOOLTIP_DELAY)) - // List - .widget( - SlotGroup.ofItemHandler(whiteListHandler, 8).startFromSlot(0).endAtSlot(WHITELIST_SIZE - 1) - .applyForWidget( - slotWidget -> slotWidget.setChangeListener(() -> wasFilterModified = true)) - .phantom(true).background(getGUITextureSet().getItemSlot()).build().setPos(7, 27)) - .build(); + + } + }) + .setPlayClickSound(false) + .setBackground(TecTechUITextures.BUTTON_STANDARD_16x16, IG_UITextures.OVERLAY_BUTTON_CONFIGURE) + .setPos(43, 9) + .setSize(16, 16) + .addTooltip("Load from Bus") + .setTooltipShowUpDelay(TOOLTIP_DELAY)) + // List + .widget( + SlotGroup.ofItemHandler(whiteListHandler, 8) + .startFromSlot(0) + .endAtSlot(WHITELIST_SIZE - 1) + .applyForWidget(slotWidget -> slotWidget.setChangeListener(() -> wasFilterModified = true)) + .phantom(true) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(7, 27)) + .build(); } /** @@ -845,14 +890,13 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve res.append(StatCollector.translateToLocal("gt.blockmachines.multimachine.project.ig.miner.cfgi.4")); res.append(": "); res.append( - StatCollector.translateToLocal( - (int) modeSetting.get() == 0 ? "gt.blockmachines.multimachine.project.ig.miner.cfgi.4.1" - : "gt.blockmachines.multimachine.project.ig.miner.cfgi.4.2")); + StatCollector.translateToLocal( + (int) modeSetting.get() == 0 ? "gt.blockmachines.multimachine.project.ig.miner.cfgi.4.1" + : "gt.blockmachines.multimachine.project.ig.miner.cfgi.4.2")); res.append('\n'); if (prevRecipes != null) { res.append( - StatCollector - .translateToLocal("gt.blockmachines.multimachine.project.ig.miner.activedronetiers")); + StatCollector.translateToLocal("gt.blockmachines.multimachine.project.ig.miner.activedronetiers")); res.append(": "); boolean found = false; for (ItemMiningDrones.DroneTiers tier : ItemMiningDrones.DroneTiers.values()) { @@ -869,39 +913,42 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve } res.append('\n'); res.append( - StatCollector.translateToLocal( - "gt.blockmachines.multimachine.project.ig.miner.asteroidsummaries.0")); + StatCollector + .translateToLocal("gt.blockmachines.multimachine.project.ig.miner.asteroidsummaries.0")); res.append(":\n"); float effectiveComp = getAvailableData_EM() - / (asteroidOutpost == null ? 1f : 1f - asteroidOutpost.getComputationDiscount()); + / (asteroidOutpost == null ? 1f : 1f - asteroidOutpost.getComputationDiscount()); for (AsteroidSummary summ : getAsteroidSummaries( - Math.min(getMaxParallels(), (int) parallelSetting.get()), - effectiveComp)) { + Math.min(getMaxParallels(), (int) parallelSetting.get()), + effectiveComp)) { res.append(StatCollector.translateToLocal("ig.asteroid." + summ.name)); res.append( - String.format( - ": %.3f%% / %s, %.3f%% / %s, %s %dx", - summ.chance * 100f, - StatCollector.translateToLocal( - "gt.blockmachines.multimachine.project.ig.miner.asteroidchance"), - summ.timeDensity * 100f, - StatCollector.translateToLocal( - "gt.blockmachines.multimachine.project.ig.miner.asteroidtimedensity"), - StatCollector.translateToLocal( - "gt.blockmachines.multimachine.project.ig.miner.asteroidmaxparallels"), - summ.maxParallels)); + String.format( + ": %.3f%% / %s, %.3f%% / %s, %s %dx", + summ.chance * 100f, + StatCollector + .translateToLocal("gt.blockmachines.multimachine.project.ig.miner.asteroidchance"), + summ.timeDensity * 100f, + StatCollector + .translateToLocal("gt.blockmachines.multimachine.project.ig.miner.asteroidtimedensity"), + StatCollector.translateToLocal( + "gt.blockmachines.multimachine.project.ig.miner.asteroidmaxparallels"), + summ.maxParallels)); res.append('\n'); } } return res.toString(); - }).setSynced(true).setTextAlignment(Alignment.TopLeft).setScale(0.5f).setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> mMachine)).widget( - new FakeSyncWidget.IntegerSyncer( - () -> (int) modeSetting.get(), - val -> parametrization.trySetParameters( - modeSetting.id % 10, - modeSetting.id / 10, - modeSetting.get()))); + }) + .setSynced(true) + .setTextAlignment(Alignment.TopLeft) + .setScale(0.5f) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> mMachine)) + .widget( + new FakeSyncWidget.IntegerSyncer( + () -> (int) modeSetting.get(), + val -> parametrization + .trySetParameters(modeSetting.id % 10, modeSetting.id / 10, modeSetting.get()))); } /** Texture that will be displayed on the side of the module */ @@ -920,16 +967,15 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve */ @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { + int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), - new TTRenderedExtendedFacingTexture( - aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; + Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), + new TTRenderedExtendedFacingTexture(aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; } else if (facing.getRotation(ForgeDirection.UP) == side || facing.getRotation(ForgeDirection.DOWN) == side) { return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), - new TTRenderedExtendedFacingTexture(engraving) }; + Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), + new TTRenderedExtendedFacingTexture(engraving) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE) }; } @@ -952,7 +998,7 @@ public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStac } if (SpaceProjectManager.teamHasProject(getBaseMetaTileEntity().getOwnerUuid(), ASTEROID_OUTPOST)) { ISpaceProject proj = SpaceProjectManager - .getTeamProject(getBaseMetaTileEntity().getOwnerUuid(), SolarSystem.KuiperBelt, "AsteroidOutpost"); + .getTeamProject(getBaseMetaTileEntity().getOwnerUuid(), SolarSystem.KuiperBelt, "AsteroidOutpost"); if (proj.isFinished()) { asteroidOutpost = (ProjectAsteroidOutpost) proj; } @@ -1025,35 +1071,35 @@ protected int getMaxParallels() { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc0")) // Module - // that - // adds Space - // Mining - // Operations to the - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t1.desc1")) // Does - // this - // violate - // drone rights? - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t1.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOtherStructurePart( - GCCoreUtil.translate("ig.elevator.structure.OpticalConnector"), - GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), - 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc0")) // Module + // that + // adds Space + // Mining + // Operations to the + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t1.desc1")) // Does + // this + // violate + // drone rights? + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t1.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOtherStructurePart( + GCCoreUtil.translate("ig.elevator.structure.OpticalConnector"), + GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), + 1) + .toolTipFinisher(); return tt; } } @@ -1123,35 +1169,35 @@ protected int getMaxParallels() { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc0")) // Module - // that - // adds Space - // Mining - // Operations to the - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t2.desc1")) // This - // definitely - // violates - // drone rights. - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t2.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOtherStructurePart( - GCCoreUtil.translate("ig.elevator.structure.OpticalConnector"), - GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), - 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc0")) // Module + // that + // adds Space + // Mining + // Operations to the + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t2.desc1")) // This + // definitely + // violates + // drone rights. + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t2.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOtherStructurePart( + GCCoreUtil.translate("ig.elevator.structure.OpticalConnector"), + GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), + 1) + .toolTipFinisher(); return tt; } } @@ -1221,35 +1267,35 @@ protected int getMaxParallels() { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc0")) // Module - // that - // adds Space - // Mining - // Operations to the - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t3.desc1")) // Great - // treasures - // beyond - // your imagination await! - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t3.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT3")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOtherStructurePart( - GCCoreUtil.translate("ig.elevator.structure.OpticalConnector"), - GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), - 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc0")) // Module + // that + // adds Space + // Mining + // Operations to the + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t3.desc1")) // Great + // treasures + // beyond + // your imagination await! + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc3")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc4")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc5.1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.t3.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT3")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.miner.desc6")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOtherStructurePart( + GCCoreUtil.translate("ig.elevator.structure.OpticalConnector"), + GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), + 1) + .toolTipFinisher(); return tt; } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModulePump.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModulePump.java index 26f97c3..9bf4627 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModulePump.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModulePump.java @@ -59,31 +59,31 @@ public abstract class TileEntityModulePump extends TileEntityModuleBase { /** Name of the planet type setting */ private static final INameFunction PLANET_TYPE_SETTING_NAME = (base, - p) -> GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.cfgi.0") + " " - + (p.hatchId() / 2 + 1); // Planet Type + p) -> GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.cfgi.0") + " " + + (p.hatchId() / 2 + 1); // Planet Type /** Status of the planet type setting */ private static final IStatusFunction PLANET_TYPE_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 100, 100); + .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 100, 100); /** Name of the gas type setting */ private static final INameFunction GAS_TYPE_SETTING_NAME = (base, - p) -> GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.cfgi.1") + " " - + (p.hatchId() / 2 + 1); // Gas Type + p) -> GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.cfgi.1") + " " + + (p.hatchId() / 2 + 1); // Gas Type /** Status of the gas type setting */ private static final IStatusFunction GAS_TYPE_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 100, 100); + .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 100, 100); /** Name of the parallel setting */ private static final INameFunction PARALLEL_SETTING_NAME = (base, - p) -> GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.cfgi.2") + " " - + (p.hatchId() / 2 + 1); // Parallels + p) -> GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.cfgi.2") + " " + + (p.hatchId() / 2 + 1); // Parallels /** Status of the parallel setting */ private static final IStatusFunction PARALLEL_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 100, base.getParallels()); + .fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 100, base.getParallels()); /** Name of the batch setting */ private static final INameFunction BATCH_SETTING_NAME = (base, p) -> GCCoreUtil - .translate("gt.blockmachines.multimachine.project.ig.pump.cfgi.3"); // Batch size + .translate("gt.blockmachines.multimachine.project.ig.pump.cfgi.3"); // Batch size /** Status of the batch setting */ private static final IStatusFunction BATCH_STATUS = (base, p) -> LedStatus - .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 32, 128); + .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 32, 128); /** Flag if this machine has an ME output hatch, will be updated in the structure check */ protected boolean hasMeOutputHatch = false; @@ -99,7 +99,7 @@ public abstract class TileEntityModulePump extends TileEntityModuleBase { * @param tMinMotorTier Minimum needed motor tier */ public TileEntityModulePump(int aID, String aName, String aNameRegional, int tTier, int tModuleTier, - int tMinMotorTier) { + int tMinMotorTier) { super(aID, aName, aNameRegional, tTier, tModuleTier, tMinMotorTier); } @@ -124,7 +124,7 @@ public TileEntityModulePump(String aName, int tTier, int tModuleTier, int tMinMo public @NotNull CheckRecipeResult checkProcessing_EM() { if (ENERGY_CONSUMPTION * getParallelRecipes() * getParallels() > getEUVar()) { return CheckRecipeResultRegistry - .insufficientPower(ENERGY_CONSUMPTION * getParallelRecipes() * getParallels()); + .insufficientPower(ENERGY_CONSUMPTION * getParallelRecipes() * getParallels()); } ArrayList outputs = new ArrayList<>(); @@ -133,16 +133,20 @@ public TileEntityModulePump(String aName, int tTier, int tModuleTier, int tMinMo int maxBatchSize = (int) Math.min(Math.max(batchSetting.get(), 1.0D), 128.0D); for (int i = 0; i < getParallelRecipes(); i++) { FluidStack fluid = SpacePumpingRecipes.RECIPES - .get(Pair.of((int) planetTypeSettings[i].get(), (int) gasTypeSettings[i].get())); + .get(Pair.of((int) planetTypeSettings[i].get(), (int) gasTypeSettings[i].get())); if (fluid != null) { int batchSize = (int) Math.min(Math.max(batchSetting.get(), 1.0D), 128.0D); MTEHatchOutput targetOutput = null; if (!hasMeOutputHatch && !eSafeVoid) { for (MTEHatchOutput output : mOutputHatches) { if (output.mFluid != null && output.mFluid.getFluid() != null - && output.getLockedFluidName() != null - && output.getLockedFluidName().equals(fluid.getFluid().getName()) - && output.mFluid.getFluid().equals(fluid.getFluid())) { + && output.getLockedFluidName() != null + && output.getLockedFluidName() + .equals( + fluid.getFluid() + .getName()) + && output.mFluid.getFluid() + .equals(fluid.getFluid())) { targetOutput = output; break; } @@ -224,13 +228,14 @@ protected void parametersInstantiation_EM() { parallelSettings = new Parameters.Group.ParameterIn[parallels]; for (int i = 0; i < getParallelRecipes(); i++) { planetTypeSettings[i] = parametrization.getGroup(i * 2, false) - .makeInParameter(0, 1, PLANET_TYPE_SETTING_NAME, PLANET_TYPE_STATUS); + .makeInParameter(0, 1, PLANET_TYPE_SETTING_NAME, PLANET_TYPE_STATUS); gasTypeSettings[i] = parametrization.getGroup(i * 2, false) - .makeInParameter(1, 1, GAS_TYPE_SETTING_NAME, GAS_TYPE_STATUS); + .makeInParameter(1, 1, GAS_TYPE_SETTING_NAME, GAS_TYPE_STATUS); parallelSettings[i] = parametrization.getGroup(i * 2 + 1, false) - .makeInParameter(0, getParallels(), PARALLEL_SETTING_NAME, PARALLEL_STATUS); + .makeInParameter(0, getParallels(), PARALLEL_SETTING_NAME, PARALLEL_STATUS); } - batchSetting = parametrization.getGroup(9, false).makeInParameter(1, 1, BATCH_SETTING_NAME, BATCH_STATUS); + batchSetting = parametrization.getGroup(9, false) + .makeInParameter(1, 1, BATCH_SETTING_NAME, BATCH_STATUS); } /** @@ -244,8 +249,9 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve super.drawTexts(screenElements, inventorySlot); screenElements.widget( - new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.config")) - .setDefaultColor(COLOR_TEXT_WHITE.get()).setEnabled(widget -> mMachine)); + new TextWidget(StatCollector.translateToLocal("gt.blockmachines.multimachine.ig.elevator.gui.config")) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> mMachine)); for (int i = 0; i < getParallelRecipes(); i++) { final int fluidIndex = i; @@ -255,22 +261,24 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve return " - " + fluidName; } return ""; - }).setSynced(false).setDefaultColor(COLOR_TEXT_WHITE.get()) - .setEnabled(widget -> mMachine && getPumpedFluid(fluidIndex) != null)) - .widget( - new FakeSyncWidget.IntegerSyncer( - () -> (int) planetTypeSettings[fluidIndex].get(), - val -> parametrization.trySetParameters( - planetTypeSettings[fluidIndex].id % 10, - planetTypeSettings[fluidIndex].id / 10, - planetTypeSettings[fluidIndex].get()))) - .widget( - new FakeSyncWidget.IntegerSyncer( - () -> (int) planetTypeSettings[fluidIndex].get(), - val -> parametrization.trySetParameters( - gasTypeSettings[fluidIndex].id % 10, - gasTypeSettings[fluidIndex].id / 10, - gasTypeSettings[fluidIndex].get()))); + }) + .setSynced(false) + .setDefaultColor(COLOR_TEXT_WHITE.get()) + .setEnabled(widget -> mMachine && getPumpedFluid(fluidIndex) != null)) + .widget( + new FakeSyncWidget.IntegerSyncer( + () -> (int) planetTypeSettings[fluidIndex].get(), + val -> parametrization.trySetParameters( + planetTypeSettings[fluidIndex].id % 10, + planetTypeSettings[fluidIndex].id / 10, + planetTypeSettings[fluidIndex].get()))) + .widget( + new FakeSyncWidget.IntegerSyncer( + () -> (int) planetTypeSettings[fluidIndex].get(), + val -> parametrization.trySetParameters( + gasTypeSettings[fluidIndex].id % 10, + gasTypeSettings[fluidIndex].id / 10, + gasTypeSettings[fluidIndex].get()))); } } @@ -290,16 +298,15 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve */ @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, - int colorIndex, boolean aActive, boolean aRedstone) { + int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), - new TTRenderedExtendedFacingTexture( - aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; + Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), + new TTRenderedExtendedFacingTexture(aActive ? TTMultiblockBase.ScreenON : TTMultiblockBase.ScreenOFF) }; } else if (facing.getRotation(ForgeDirection.UP) == side || facing.getRotation(ForgeDirection.DOWN) == side) { return new ITexture[] { - Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), - new TTRenderedExtendedFacingTexture(engraving) }; + Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE), + new TTRenderedExtendedFacingTexture(engraving) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(TileEntitySpaceElevator.CASING_INDEX_BASE) }; } @@ -322,7 +329,7 @@ private String getPumpedFluid(int index) { return null; } FluidStack fluid = SpacePumpingRecipes.RECIPES - .get(Pair.of((int) planetTypeSettings[index].get(), (int) gasTypeSettings[index].get())); + .get(Pair.of((int) planetTypeSettings[index].get(), (int) gasTypeSettings[index].get())); if (fluid == null) { return null; } @@ -400,20 +407,20 @@ public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc0")) - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t1.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc3")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc4")) - - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t1.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT2")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc0")) + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t1.desc1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc3")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc4")) + + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t1.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT2")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(); return tt; } } @@ -489,21 +496,21 @@ public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc0")) - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc3")) - - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc4")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.desc6")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT3")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc0")) + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.desc1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc3")) + + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc4")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.desc6")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT3")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(); return tt; } } @@ -579,21 +586,21 @@ public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc0")) - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t3.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc3")) - - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc4")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t3.desc5")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.desc6")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT4")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc0")) + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t3.desc1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc3")) + + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.desc4")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t3.desc5")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.pump.t2.desc6")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT4")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(); return tt; } } diff --git a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleResearch.java b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleResearch.java index 6b46893..60423b2 100644 --- a/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleResearch.java +++ b/src/main/java/com/gtnewhorizons/gtnhintergalactic/tile/multi/elevatormodules/TileEntityModuleResearch.java @@ -63,19 +63,19 @@ public TileEntityModuleResearch(String aName) { protected MultiblockTooltipBuilder createTooltip() { final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType(GCCoreUtil.translate("gt.blockmachines.module.name")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.research.desc0")) - .addInfo( - EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD - + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.research.desc1")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) - .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT2")) - .beginStructureBlock(1, 5, 2, false) - .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) - .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) - .toolTipFinisher(); + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.research.desc0")) + .addInfo( + EnumChatFormatting.LIGHT_PURPLE.toString() + EnumChatFormatting.BOLD + + GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.research.desc1")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.desc2")) + .addInfo(GCCoreUtil.translate("gt.blockmachines.multimachine.project.ig.motorT2")) + .beginStructureBlock(1, 5, 2, false) + .addCasingInfoRange(GCCoreUtil.translate("gt.blockcasings.ig.0.name"), 0, 9, false) + .addInputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputBus(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addInputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .addOutputHatch(GCCoreUtil.translate("ig.elevator.structure.AnyBaseCasingWith1Dot"), 1) + .toolTipFinisher(); return tt; } @@ -122,10 +122,8 @@ protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (lastRecipe != recipe) { String neededProject = recipe.getMetadata(IGRecipeMaps.SPACE_PROJECT); String neededLocation = recipe.getMetadata(IGRecipeMaps.SPACE_LOCATION); - if (!ElevatorUtil.isProjectAvailable( - getBaseMetaTileEntity().getOwnerUuid(), - neededProject, - neededLocation)) { + if (!ElevatorUtil + .isProjectAvailable(getBaseMetaTileEntity().getOwnerUuid(), neededProject, neededLocation)) { return new ResultNoSpaceProject(neededProject, neededLocation); } }