aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorCrystie <50521339+CrystieColon3@users.noreply.github.com>2024-12-01 04:07:47 +0300
committerGitHub <noreply@github.com>2024-12-01 01:07:47 +0000
commitc116c46700c7f7b45b80d75d9ca25b15f3854967 (patch)
tree769f0cd09e4da4616757f266f26f548637bab7ef /src/main/java/gregtech
parentd415a2c816f27fbacaa6a2bcfc297f7dfd892a12 (diff)
downloadGT5-Unofficial-c116c46700c7f7b45b80d75d9ca25b15f3854967.tar.gz
GT5-Unofficial-c116c46700c7f7b45b80d75d9ca25b15f3854967.tar.bz2
GT5-Unofficial-c116c46700c7f7b45b80d75d9ca25b15f3854967.zip
Waterline + Gorge tooltip formatting changes (#3582)
Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java19
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java8
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/PurifiedWaterRecipes.java5
6 files changed, 36 insertions, 10 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java
index 96e1c8e9c9..b510b4a341 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBaryonicPerfection.java
@@ -52,6 +52,7 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gregtech.common.items.IDMetaItem03;
import gregtech.common.items.MetaGeneratedItem03;
import gregtech.common.tileentities.machines.MTEHatchInputBusME;
+import gregtech.loaders.postload.chains.PurifiedWaterRecipes;
public class MTEPurificationUnitBaryonicPerfection
extends MTEPurificationUnitBase<MTEPurificationUnitBaryonicPerfection> implements ISurvivalConstructable {
@@ -311,7 +312,9 @@ public class MTEPurificationUnitBaryonicPerfection
+ CATALYST_BASE_COST
+ "L"
+ EnumChatFormatting.WHITE
- + " Molten Infinity")
+ + " Molten Infinity"
+ + EnumChatFormatting.GRAY
+ + ".")
.addInfo("For every duplicate occurrence of an inserted catalyst in the sequence, this cost is doubled.")
.addSeparator()
.addInfo("Keeps track of the entire sequence of catalysts inserted this recipe.")
@@ -321,8 +324,18 @@ public class MTEPurificationUnitBaryonicPerfection
+ BARYONIC_MATTER_OUTPUT
+ "L "
+ EnumChatFormatting.WHITE
- + "Stabilised Baryonic Matter")
- .addInfo("At the end of the recipe, all incorrectly inserted catalysts are returned in the output bus.")
+ + "Stabilised Baryonic Matter"
+ + EnumChatFormatting.GRAY
+ + ".")
+ .addInfo(
+ "At the end of a successful recipe, outputs additional " + EnumChatFormatting.RED
+ + PurifiedWaterRecipes.extraBaryonicOutput
+ + "L "
+ + EnumChatFormatting.WHITE
+ + "Stabilised Baryonic Matter"
+ + EnumChatFormatting.GRAY
+ + " per parallel.")
+ .addInfo("At the end of the recipe, returns all incorrectly inserted catalysts in the output bus.")
.addSeparator()
.addInfo(
EnumChatFormatting.AQUA + ""
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java
index da0887f84c..59b9be0c17 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitDegasser.java
@@ -411,7 +411,9 @@ public class MTEPurificationUnitDegasser extends MTEPurificationUnitBase<MTEPuri
"If this bit is on, you must insert " + EnumChatFormatting.RED
+ "4608L "
+ EnumChatFormatting.WHITE
- + "Molten Neutronium")
+ + "Molten Neutronium"
+ + EnumChatFormatting.GRAY
+ + ".")
.addSeparator()
.addInfo(
EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java
index f7fd9b041b..9ceb4f8958 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitOzonation.java
@@ -187,14 +187,18 @@ public class MTEPurificationUnitOzonation extends MTEPurificationUnitBase<MTEPur
+ MAX_OZONE_GAS_FOR_EXPLOSION
+ "L "
+ EnumChatFormatting.WHITE
- + "Ozone Gas.")
+ + "Ozone Gas"
+ + EnumChatFormatting.GRAY
+ + ".")
.addInfo(
"Receives a " + EnumChatFormatting.RED
+ "20%"
+ EnumChatFormatting.GRAY
+ " bonus to success chance for every doubling of "
+ EnumChatFormatting.WHITE
- + "Ozone Gas.")
+ + "Ozone Gas"
+ + EnumChatFormatting.GRAY
+ + ".")
.addSeparator()
.addInfo(
EnumChatFormatting.AQUA + ""
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java
index b1301157da..b8a45b810a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitPlasmaHeater.java
@@ -300,7 +300,9 @@ public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase<MTE
// TODO: Refer to heating cycles in another way to avoid confusion
"Each completed heating cycle boosts success chance by " + EnumChatFormatting.RED
+ SUCCESS_PER_CYCLE
- + "%.")
+ + "%"
+ + EnumChatFormatting.GRAY
+ + ".")
.addInfo(
"If the temperature ever reaches " + EnumChatFormatting.RED
+ MAX_TEMP
@@ -322,7 +324,9 @@ public class MTEPurificationUnitPlasmaHeater extends MTEPurificationUnitBase<MTE
+ "L/s "
+ EnumChatFormatting.WHITE
+ coolantMaterial.getFluid(1)
- .getLocalizedName())
+ .getLocalizedName()
+ + EnumChatFormatting.GRAY
+ + ".")
.addInfo(
EnumChatFormatting.RED + "Raises "
+ EnumChatFormatting.GRAY
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java
index eaa5a0d5df..28c5c82c91 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitUVTreatment.java
@@ -253,7 +253,7 @@ public class MTEPurificationUnitUVTreatment extends MTEPurificationUnitBase<MTEP
.addInfo("Removing a lens too early will fail the recipe.")
.addInfo("Find the order of lenses in the recipe in NEI,")
.addInfo("or use a portable scanner to view the currently requested lens.")
- .addInfo("The recipe always starts at the Orundum Lens")
+ .addInfo("The recipe always starts at the Orundum Lens.")
.addSeparator()
.addInfo(
EnumChatFormatting.AQUA + ""
diff --git a/src/main/java/gregtech/loaders/postload/chains/PurifiedWaterRecipes.java b/src/main/java/gregtech/loaders/postload/chains/PurifiedWaterRecipes.java
index d35645769a..2a4b38e7ef 100644
--- a/src/main/java/gregtech/loaders/postload/chains/PurifiedWaterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/PurifiedWaterRecipes.java
@@ -48,6 +48,7 @@ import gtPlusPlus.core.material.Particle;
public class PurifiedWaterRecipes {
static final PurificationPlantBaseChanceKey BASE_CHANCE = PurificationPlantBaseChanceKey.INSTANCE;
+ public static final int extraBaryonicOutput = 500;
public static void run() {
final int duration = MTEPurificationPlant.CYCLE_TIME_TICKS;
@@ -302,7 +303,9 @@ public class PurifiedWaterRecipes {
// real recipe
GTValues.RA.stdBuilder()
.fluidInputs(Materials.Grade7PurifiedWater.getFluid(1000L))
- .fluidOutputs(Materials.Grade8PurifiedWater.getFluid(900L), Materials.StableBaryonicMatter.getFluid(500))
+ .fluidOutputs(
+ Materials.Grade8PurifiedWater.getFluid(900L),
+ Materials.StableBaryonicMatter.getFluid(extraBaryonicOutput))
.itemOutputs(ItemList.Quark_Creation_Catalyst_Unaligned.get(2L), Particle.getBaseParticle(Particle.UNKNOWN))
.outputChances(10000, 100)
.ignoreCollision()