PCB Factory Edits (#1544)

* Improve tooltip and flavortext of PCB Factory

* Change roughness to trace size

* spotlessApply (#1545)

Co-authored-by: Sampsa <69092953+S4mpsa@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>

* fix a crash with autobuild

* Fix LanguageManager

* hate these texture bugs and typos from myself

* fix number and unit spacing

* off by 1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>

2 files changed, 69 insertions, 62 deletions

diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java
index 1b2d566fd0..a40f154035 100644
--- a/src/main/java/gregtech/api/util/GT_LanguageManager.java
+++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java
@@ -482,14 +482,14 @@ public class GT_LanguageManager {
         addStringLocalization("Interaction_DESCRIPTION_Index_336", "PCB Factory Tier: ");
         addStringLocalization("Interaction_DESCRIPTION_Index_337", "Upgrade Required: ");
         addStringLocalization("Interaction_DESCRIPTION_Index_338", "Bio");
-        addStringLocalization("Interaction_DESCRIPTION_Index_339", "Bio Upgrade Enabled");
-        addStringLocalization("Interaction_DESCRIPTION_Index_339.1", "Bio Upgrade Disabled");
-        addStringLocalization("Interaction_DESCRIPTION_Index_340", "Rotate Bio Upgrade 90 Degrees Enabled");
-        addStringLocalization("Interaction_DESCRIPTION_Index_340.1", "Rotate Bio Upgrade 90 Degrees Disabled");
-        addStringLocalization("Interaction_DESCRIPTION_Index_341", "OC Tier 1 Enabled");
-        addStringLocalization("Interaction_DESCRIPTION_Index_341.1", "OC Tier 1 Disabled");
-        addStringLocalization("Interaction_DESCRIPTION_Index_342", "OC Tier 2 Enabled");
-        addStringLocalization("Interaction_DESCRIPTION_Index_342.1", "OC Tier 2 Disabled");
+        addStringLocalization("Interaction_DESCRIPTION_Index_339", "Biochamber Upgrade Enabled");
+        addStringLocalization("Interaction_DESCRIPTION_Index_339.1", "Biochamber Upgrade Disabled");
+        addStringLocalization("Interaction_DESCRIPTION_Index_340", "Rotated biochamber enabled");
+        addStringLocalization("Interaction_DESCRIPTION_Index_340.1", "Rotated biochamber disabled");
+        addStringLocalization("Interaction_DESCRIPTION_Index_341", "Tier 1 cooling enabled");
+        addStringLocalization("Interaction_DESCRIPTION_Index_341.1", "Tier 1 cooling disabled");
+        addStringLocalization("Interaction_DESCRIPTION_Index_342", "Tier 2 cooling enabled");
+        addStringLocalization("Interaction_DESCRIPTION_Index_342.1", "Tier 2 cooling disabled");
         addStringLocalization("Interaction_DESCRIPTION_Index_500", "Fitting: Loose - More Flow");
         addStringLocalization("Interaction_DESCRIPTION_Index_501", "Fitting: Tight - More Efficiency");
         addStringLocalization("Interaction_DESCRIPTION_Index_502", "Mining chunk loading enabled");
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
index 8b9cb2c373..d909dd4de7 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java
@@ -303,7 +303,7 @@ public class GT_MetaTileEntity_PCBFactory
                                 false);
             } else {
                 built += survivialBuildPiece(
-                        bioUpgrade, stackSize, mBioOffsets[0], 6, mBioOffsets[2], elementBudget, env, false, true);
+                        bioUpgrade, stackSize, mBioOffsets[0], 6, mBioOffsets[1], elementBudget, env, false, true);
             }
         }
 
@@ -362,7 +362,7 @@ public class GT_MetaTileEntity_PCBFactory
                     BlockIcons.getCasingTextureForId(
                             getTier() < 3
                                     ? GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 11)
-                                    : GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 11)),
+                                    : GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 13)),
                     TextureFactory.builder()
                             .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE)
                             .extFacing()
@@ -377,7 +377,7 @@ public class GT_MetaTileEntity_PCBFactory
                 BlockIcons.getCasingTextureForId(
                         getTier() < 3
                                 ? GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 11)
-                                : GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 11)),
+                                : GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings8, 13)),
                 TextureFactory.builder()
                         .addIcon(OVERLAY_FRONT_ASSEMBLY_LINE)
                         .extFacing()
@@ -737,19 +737,21 @@ public class GT_MetaTileEntity_PCBFactory
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
         tt.addMachineType("Circuit Board Fabricator")
-                .addInfo("Controller block for the PCB Factory")
+                .addInfo("Controller for the PCB Factory")
                 .addInfo(EnumChatFormatting.GOLD.toString() + EnumChatFormatting.BOLD + "IMPORTANT!"
-                        + " Check out the configurations menu before building.")
-                .addInfo("The tier is selected in the controller GUI. Determines avaliable recipes.")
+                        + " Check the configuration menu before building.")
+                .addInfo("Tier of the machine determines the available recipes.")
+                .addInfo("Machine tier (1-3) is set in the controller GUI.")
                 .addInfo("The configuration menu can be used to add upgrades.")
-                .addInfo("The parallel of the current recipe is Log₂(nanites used), rounded up.")
-                .addInfo("Coolant tier determines overclock ability. No cooler allows no overclocking.")
-                .addInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 1 + EnumChatFormatting.GRAY
-                        + " cooler allows regular overclocking, takes 10L/s of coolant.")
-                .addInfo("Tier " + EnumChatFormatting.DARK_PURPLE + 2 + EnumChatFormatting.GRAY
-                        + " allows perfect overclocking, takes 10L/s of space coolant.")
-                .addInfo("Machine power consumption multiplies by sqrt(upgrade count).")
-                .addInfo("I.e. cooler + bio upgrade = sqrt(2) power consumption multiplier.")
+                .addInfo("Each tier and upgrade requires additional structures.")
+                .addInfo("Power consumption is multiplied by Sqrt(structures).")
+                .addInfo("Tier 2 and 3 allow parallel by using extra nanites.")
+                .addInfo("Every doubling of nanites adds one parallel.")
+                .addInfo("1x->1, 2x->2, 4x->3, 8x->4 with no limit.")
+                .addInfo("Recipes require a cooling upgrade to be overclocked.")
+                .addInfo("Liquid Cooling uses 10 L/s of distilled water and enables default overclocks.")
+                .addInfo("Thermosink uses 10 L/s of Space Coolant and enables perfect overclocks.")
+                .addInfo("Trace size can be changed to modify the material usage and machine speed.")
                 .addInfo(AuthorBlueWeabo)
                 .beginStructureBlock(30, 38, 13, false)
                 .addSeparator()
@@ -781,14 +783,14 @@ public class GT_MetaTileEntity_PCBFactory
                         + " Radiation Proof Photolithography Framework Casing")
                 .addStructureInfo(
                         EnumChatFormatting.GOLD + "76" + EnumChatFormatting.GRAY + " Radiant Naquadah Alloy Casing")
-                .addStructureInfo(EnumChatFormatting.BLUE + "Bio Upgrade")
+                .addStructureInfo(EnumChatFormatting.BLUE + "Biochamber Upgrade")
                 .addStructureInfo(EnumChatFormatting.GOLD + "68" + EnumChatFormatting.GRAY
                         + " Clean Stainless Steel Machine Casing")
                 .addStructureInfo(
                         EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Damascus Steel Frame Box")
                 .addStructureInfo(EnumChatFormatting.GOLD + "72" + EnumChatFormatting.GRAY + " Reinforced Glass")
-                .addStructureInfo(EnumChatFormatting.BLUE + "Cooler Upgrade Tier " + EnumChatFormatting.DARK_PURPLE + 1
-                        + EnumChatFormatting.BLUE + ":")
+                .addStructureInfo(EnumChatFormatting.BLUE + "Liquid Cooling Tower (Tier "
+                        + EnumChatFormatting.DARK_PURPLE + 1 + EnumChatFormatting.BLUE + "):")
                 .addStructureInfo(
                         EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Damascus Steel Frame Box")
                 .addStructureInfo(
@@ -799,8 +801,8 @@ public class GT_MetaTileEntity_PCBFactory
                         EnumChatFormatting.GOLD + "20" + EnumChatFormatting.GRAY + " Tungstensteel Pipe Casing")
                 .addStructureInfo(EnumChatFormatting.GOLD + "21" + EnumChatFormatting.GRAY
                         + " Reinforced Photolithography Framework Casing")
-                .addStructureInfo(EnumChatFormatting.BLUE + "Cooler Upgrade Tier " + EnumChatFormatting.DARK_PURPLE + 2
-                        + EnumChatFormatting.BLUE + ":")
+                .addStructureInfo(EnumChatFormatting.BLUE + "Thermosink Radiator(Tier " + EnumChatFormatting.DARK_PURPLE
+                        + 2 + EnumChatFormatting.BLUE + "):")
                 .addStructureInfo(EnumChatFormatting.GOLD + "40" + EnumChatFormatting.GRAY + " Americium Frame Box")
                 .addStructureInfo(EnumChatFormatting.GOLD + "41" + EnumChatFormatting.GRAY
                         + " Reinforced Photolithography Framework Casing")
@@ -887,7 +889,7 @@ public class GT_MetaTileEntity_PCBFactory
                         .setSetterInt(val -> {
                             mSetTier = val;
                         })
-                        .setNumbers(-16, 16)
+                        .setNumbers(1, 3)
                         .setTextColor(Color.WHITE.normal)
                         .setTextAlignment(Alignment.Center)
                         .addTooltip("PCB Factory Tier")
@@ -909,24 +911,29 @@ public class GT_MetaTileEntity_PCBFactory
                 .widget(new DynamicPositionedColumn()
                         .setSynced(false)
                         .widget(new MultiChildWidget()
-                                .addChild(new CycleButtonWidget()
-                                        .setToggle(() -> mBioUpgrade, val -> {
-                                            mBioUpgrade = val;
-                                            if (!mBioUpgrade) {
-                                                GT_Utility.sendChatToPlayer(
-                                                        player, GT_Utility.trans("339.1", "Bio Upgrade Disabled"));
-                                            } else {
-                                                GT_Utility.sendChatToPlayer(
-                                                        player, GT_Utility.trans("339", "Bio Upgrade Enabled"));
-                                            }
-                                        })
-                                        .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
-                                        .setSize(90, 18)
-                                        .addTooltip("Required for Bioware and Wetware boards."))
+                                .addChild(
+                                        new CycleButtonWidget()
+                                                .setToggle(() -> mBioUpgrade, val -> {
+                                                    mBioUpgrade = val;
+                                                    if (!mBioUpgrade) {
+                                                        GT_Utility.sendChatToPlayer(
+                                                                player,
+                                                                GT_Utility.trans(
+                                                                        "339.1", "Biochamber Upgrade Disabled"));
+                                                    } else {
+                                                        GT_Utility.sendChatToPlayer(
+                                                                player,
+                                                                GT_Utility.trans("339", "Biochamber Upgrade Enabled"));
+                                                    }
+                                                })
+                                                .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                                                .setSize(90, 18)
+                                                .addTooltip(
+                                                        "Enables nanites to construct organic circuitry. Required for Bioware and Wetware boards."))
                                 .addChild(new DrawableWidget()
                                         .setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
                                         .setSize(18, 18))
-                                .addChild(new TextWidget("Bio Upgrade")
+                                .addChild(new TextWidget("Biochamber")
                                         .setTextAlignment(Alignment.Center)
                                         .setPos(23, 5))
                                 .setEnabled(widget -> !getBaseMetaTileEntity().isActive()))
@@ -937,18 +944,15 @@ public class GT_MetaTileEntity_PCBFactory
                                             if (!mBioRotate) {
                                                 GT_Utility.sendChatToPlayer(
                                                         player,
-                                                        GT_Utility.trans(
-                                                                "340.1", "Rotate Bio Upgrade 90 Degrees Disabled"));
+                                                        GT_Utility.trans("340.1", "Rotated biochamber disabled"));
                                             } else {
                                                 GT_Utility.sendChatToPlayer(
-                                                        player,
-                                                        GT_Utility.trans(
-                                                                "340", "Rotate Bio Upgrade 90 Degrees Enabled"));
+                                                        player, GT_Utility.trans("340", "Rotated biochamber enabled"));
                                             }
                                         })
                                         .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
                                         .setSize(90, 18)
-                                        .addTooltip("Switches around the X and Z axis, rotates the shape 90 degrees"))
+                                        .addTooltip("Rotates the biochamber by 90 degrees."))
                                 .addChild(new DrawableWidget()
                                         .setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
                                         .setSize(18, 18))
@@ -964,20 +968,21 @@ public class GT_MetaTileEntity_PCBFactory
                                                     if (!mOCTier1) {
                                                         GT_Utility.sendChatToPlayer(
                                                                 player,
-                                                                GT_Utility.trans("341.1", "Tier 1 OC Disabled"));
+                                                                GT_Utility.trans("341.1", "Tier 1 cooling disabled"));
                                                     } else {
                                                         GT_Utility.sendChatToPlayer(
-                                                                player, GT_Utility.trans("341", "Tier 1 OC Enabled"));
+                                                                player,
+                                                                GT_Utility.trans("341", "Tier 1 cooling enabled"));
                                                     }
                                                 })
                                                 .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
                                                 .setSize(90, 18)
                                                 .addTooltip(
-                                                        "Incompatible with Tier 2, Requires a constant supply of distilled water. Allows for overclocking"))
+                                                        "Allows for overclocking. Requires 10 L/s of distilled water. Cooling upgrades are mutually exclusive."))
                                 .addChild(new DrawableWidget()
                                         .setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
                                         .setSize(18, 18))
-                                .addChild(new TextWidget("Cooler Tier 1")
+                                .addChild(new TextWidget("Liquid Cooling")
                                         .setTextAlignment(Alignment.Center)
                                         .setPos(20, 5))
                                 .setEnabled(widget -> !getBaseMetaTileEntity().isActive()))
@@ -989,36 +994,38 @@ public class GT_MetaTileEntity_PCBFactory
                                                     if (!mOCTier2) {
                                                         GT_Utility.sendChatToPlayer(
                                                                 player,
-                                                                GT_Utility.trans("342.1", "Tier 2 OC Disabled"));
+                                                                GT_Utility.trans("342.1", "Tier 2 cooling disabled"));
                                                     } else {
                                                         GT_Utility.sendChatToPlayer(
-                                                                player, GT_Utility.trans("342", "Tier 2 OC Enabled"));
+                                                                player,
+                                                                GT_Utility.trans("342", "Tier 2 cooling enabled"));
                                                     }
                                                 })
                                                 .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
                                                 .setSize(90, 18)
                                                 .addTooltip(
-                                                        "Incompatible with Tier 1, Requires a constant supply of super coolant. Allows for perfect overclocking"))
+                                                        "Enables perfect overclocking by allowing nanites to work with extreme speed and efficiency. Uses 10 L/s of space coolant."))
                                 .addChild(new DrawableWidget()
                                         .setDrawable(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
                                         .setSize(18, 18))
-                                .addChild(new TextWidget("Cooler Tier 2")
+                                .addChild(new TextWidget("Thermosink")
                                         .setTextAlignment(Alignment.Center)
                                         .setPos(20, 5))
                                 .setEnabled(widget -> !getBaseMetaTileEntity().isActive()))
-                        .widget(new TextWidget(new Text("Roughness Multiplier"))
+                        .widget(new TextWidget(new Text("Trace Size"))
                                 .setSize(90, 18)
                                 .setEnabled(widget -> !getBaseMetaTileEntity().isActive())
                                 .setPos(0, 4))
                         .widget(new TextFieldWidget()
-                                .setGetterInt(() -> (int) (mRoughnessMultiplier * 10000))
+                                .setGetterInt(() -> (int) ((1f / mRoughnessMultiplier) * 100f))
                                 .setSetterInt(val -> {
-                                    mRoughnessMultiplier = val / 10000f;
+                                    mRoughnessMultiplier = 100f / val;
                                 })
-                                .setNumbers(100, 20000)
+                                .setNumbers(50, 200)
                                 .setTextColor(Color.WHITE.normal)
                                 .setTextAlignment(Alignment.Center)
-                                .addTooltip("The roughness multiplier is multiplied by 10,000 before displaying!")
+                                .addTooltip(
+                                        "Set the trace size. Smaller traces allow material savings but take longer to fabricate. Larger traces waste material but are fast. 50-200 μm.")
                                 .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD)
                                 .setSize(90, 16))
                         .widget(new DrawableWidget()