Skip to content

Commit

Permalink
Merge branch '1.20.1' into fork/omergunr100/1.20.1-rendering-cringe
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java
#	src/main/java/com/gregtechceu/gtceu/data/recipe/CraftingComponent.java
#	src/main/java/com/gregtechceu/gtceu/integration/map/GroupingMapRenderer.java
#	src/main/java/com/gregtechceu/gtceu/integration/map/WaypointManager.java
#	src/main/java/com/gregtechceu/gtceu/integration/map/xaeros/XaerosMapPlugin.java
  • Loading branch information
screret committed Jan 4, 2025
2 parents dc66138 + 6eece36 commit e5b2400
Show file tree
Hide file tree
Showing 78 changed files with 2,600 additions and 1,318 deletions.
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
# ChangeLog

## Version [v1.6.2](https://github.com/GregTechCEu/GregTech-Modern/compare/v1.6.1-1.20.1...v1.6.2-1.20.1)
### Added

- Add High Pressure Variation of The Steam Miner Singleblock. by @Ghostipedia in [#2637](https://github.com/GregTechCEu/GregTech-Modern/pull/2637)
- Add Production Efficiency Modifier by @krossgg in [#2621](https://github.com/GregTechCEu/GregTech-Modern/pull/2621)
- Add multiblock constructors to KJS + lang by @krossgg in [#2667](https://github.com/GregTechCEu/GregTech-Modern/pull/2667)
- Updates registrate dependency by @Spicierspace153 in [#2625](https://github.com/GregTechCEu/GregTech-Modern/pull/2625)

### Fixed

- Fix Distillation Tower machines crashing by @krossgg in [#2646](https://github.com/GregTechCEu/GregTech-Modern/pull/2646)
- Fix Machine Recipe Modifiers by @krossgg in [#2647](https://github.com/GregTechCEu/GregTech-Modern/pull/2647)
- Fix Smart Filter not saving mode by @krossgg in [#2648](https://github.com/GregTechCEu/GregTech-Modern/pull/2648)
- Fix builder overwriting values by @krossgg in [#2649](https://github.com/GregTechCEu/GregTech-Modern/pull/2649)
- Add LEVEL state to PotionFluid by @loving2 in [#2650](https://github.com/GregTechCEu/GregTech-Modern/pull/2650)
- Fix KJS replacement order & custom json recipes by @krossgg in [#2653](https://github.com/GregTechCEu/GregTech-Modern/pull/2653)
- Fix Cleanroom floor check by @krossgg in [#2654](https://github.com/GregTechCEu/GregTech-Modern/pull/2654)
- Fix Overclocking Logic not using correct tier for OCs by @Spicierspace153 in [#2661](https://github.com/GregTechCEu/GregTech-Modern/pull/2661)
- Fix Steam and Plasma turbines requiring mufflers by @Luexa in [#2655](https://github.com/GregTechCEu/GregTech-Modern/pull/2655)
- Fix oil spouts not updating the fluid on generation by @screret in [#2659](https://github.com/GregTechCEu/GregTech-Modern/pull/2659)
- Fix furnace recipe serialization by @krossgg in [#2657](https://github.com/GregTechCEu/GregTech-Modern/pull/2657)
- Fix MultiParts not calling on unload by @krossgg in [#2663](https://github.com/GregTechCEu/GregTech-Modern/pull/2663)
- Fix Stone Variant maceration having conflicting recipes by @YoungOnionMC in [#2664](https://github.com/GregTechCEu/GregTech-Modern/pull/2664)
- Fix bucket being voided by TankWidget with not enough space by @Natanaelel in [#2643](https://github.com/GregTechCEu/GregTech-Modern/pull/2643)
- Change pipes to force connections to covers by @krossgg in [#2666](https://github.com/GregTechCEu/GregTech-Modern/pull/2666)

### Changed

- Fix typo in temperature parameter of BlastProperty builder by @Luexa in [#2636](https://github.com/GregTechCEu/GregTech-Modern/pull/2636)
- update ru_ru.json by @marisathewitch in [#2662](https://github.com/GregTechCEu/GregTech-Modern/pull/2662)


## Version [v1.6.1](https://github.com/GregTechCEu/GregTech-Modern/compare/v1.6.0-1.20.1...v1.6.1-1.20.1)
### Added

Expand Down
7 changes: 7 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ dependencies {
// FTB Teams
modCompileOnly(forge.ftbteams)
modCompileOnly(forge.ftblibrary)

// FTB Chunks
modCompileOnly(forge.ftbchunks)

// Argonauts
modCompileOnly(forge.argonauts)
Expand Down Expand Up @@ -101,6 +104,10 @@ dependencies {
modExtraRuntimeOnly(forge.xaerosminimap)
modExtraRuntimeOnly(forge.xaerosworldmap)
modExtraRuntimeOnly(forge.journeymap.forge)

modExtraRuntimeOnly(forge.ftblibrary)
modExtraRuntimeOnly(forge.ftbteams)
modExtraRuntimeOnly(forge.ftbchunks)

modExtraRuntimeOnly("top.theillusivec4.curios:curios-forge:${forge.versions.curios.get()}")
modExtraRuntimeOnly("curse.maven:spark-361579:4738952")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
# Mod Info
mod_id = gtceu
mod_name = GregTech
mod_version = 1.6.2
mod_version = 1.6.3
mod_description = GregTech CE Unofficial, ported from 1.12.2
mod_license = LGPL-3.0 license
mod_url = https://github.com/GregTechCEu/GregTech-Modern/
Expand Down
6 changes: 5 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencyResolutionManagement {

// Forge
def forgeVersion = "47.1.47"
def registrateForgeVersion = "MC1.20-1.3.3"
def registrateForgeVersion = "MC1.20-1.3.11"
def topForgeVersion = "1.20.1-10.0.1-3"
def jadeForgeVersion = "11.6.3"
def curiosForgeVersion = "5.9.1"
Expand All @@ -41,6 +41,7 @@ dependencyResolutionManagement {
def journeyMapApiVersion = "2.0.0"
def ftbteamsForgeFile = "5267190"
def ftblibraryForgeFile = "5567591"
def ftbchunksForgeFile = "5956390"
def argonautsForgeFile = "5263580"
def resourcefulForgeFile = "5659871"
def kffVersion = "4.11.0"
Expand Down Expand Up @@ -134,6 +135,9 @@ dependencyResolutionManagement {

def ftblibrary = version("ftblibrary", ftblibraryForgeFile)
library("ftblibrary", "curse.maven", "ftb-library-forge-404465").versionRef(ftblibrary)

def ftbchunks = version("ftbchunks", ftbchunksForgeFile)
library("ftbchunks", "curse.maven", "ftb-chunks-forge-314906").versionRef(ftbchunks)

def argonautslib = version("argonauts", argonautsForgeFile)
library("argonauts", "curse.maven", "argonauts-845833").versionRef(argonautslib)
Expand Down
9 changes: 9 additions & 0 deletions src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -1755,6 +1755,7 @@
"config.gtceu.option.euToFeRatio": "oıʇɐᴚǝℲo⟘nǝ",
"config.gtceu.option.feToEuRatio": "oıʇɐᴚnƎo⟘ǝɟ",
"config.gtceu.option.flintAndSteelRequireSteel": "ןǝǝʇSǝɹınbǝᴚןǝǝʇSpuⱯʇuıןɟ",
"config.gtceu.option.ftbChunksIntegration": "uoıʇɐɹbǝʇuIsʞunɥƆqʇɟ",
"config.gtceu.option.gameplay": "ʎɐןdǝɯɐb",
"config.gtceu.option.generateLowQualityGems": "sɯǝ⅁ʎʇıןɐnὉʍoꞀǝʇɐɹǝuǝb",
"config.gtceu.option.ghostCircuit": "ʇınɔɹıƆʇsoɥb",
Expand Down Expand Up @@ -1787,6 +1788,7 @@
"config.gtceu.option.inWorldPreviewDuration": "uoıʇɐɹnᗡʍǝıʌǝɹԀpןɹoMuı",
"config.gtceu.option.increaseDungeonLoot": "ʇooꞀuoǝbunᗡǝsɐǝɹɔuı",
"config.gtceu.option.infiniteBedrockOresFluids": "spınןℲsǝɹOʞɔoɹpǝᗺǝʇıuıɟuı",
"config.gtceu.option.journeyMapIntegration": "uoıʇɐɹbǝʇuIdɐWʎǝuɹnoظ",
"config.gtceu.option.largeBoilers": "sɹǝןıoᗺǝbɹɐן",
"config.gtceu.option.ldFluidPipeMinDistance": "ǝɔuɐʇsıᗡuıWǝdıԀpınןℲpן",
"config.gtceu.option.ldItemPipeMinDistance": "ǝɔuɐʇsıᗡuıWǝdıԀɯǝʇIpן",
Expand Down Expand Up @@ -1846,6 +1848,7 @@
"config.gtceu.option.surfaceRockProspectRange": "ǝbuɐᴚʇɔǝdsoɹԀʞɔoᴚǝɔɐɟɹns",
"config.gtceu.option.titaniumBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺɯnıuɐʇıʇ",
"config.gtceu.option.titaniumBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺɯnıuɐʇıʇ",
"config.gtceu.option.toggle": "ǝןbboʇ",
"config.gtceu.option.toolCraftingSounds": "spunoSbuıʇɟɐɹƆןooʇ",
"config.gtceu.option.toolUseSounds": "spunoSǝs∩ןooʇ",
"config.gtceu.option.tools": "sןooʇ",
Expand All @@ -1865,6 +1868,7 @@
"config.gtceu.option.worldAcceleratorBlacklist": "ʇsıןʞɔɐןᗺɹoʇɐɹǝןǝɔɔⱯpןɹoʍ",
"config.gtceu.option.worldgen": "uǝbpןɹoʍ",
"config.gtceu.option.xOffset": "ʇǝsɟɟOx",
"config.gtceu.option.xaerosMapIntegration": "uoıʇɐɹbǝʇuIdɐWsoɹǝɐx",
"config.gtceu.option.yOffset": "ʇǝsɟɟOʎ",
"config.gtceu.option.zombieSpawnWithSabers": "sɹǝqɐSɥʇıMuʍɐdSǝıqɯoz",
"config.jade.plugin_gtceu.auto_output_info": "oɟuI ʇndʇnO oʇnⱯ ]nƎƆ⟘⅁[",
Expand Down Expand Up @@ -2128,6 +2132,8 @@
"gtceu.arc_furnace": "ǝɔɐuɹnℲ ɔɹⱯ",
"gtceu.assembler": "ɹǝןqɯǝssⱯ",
"gtceu.assembly_line": "ǝuıꞀ ʎןqɯǝssⱯ",
"gtceu.auto_decomp.rotor": "ɹoʇoᴚ ǝuıqɹn⟘",
"gtceu.auto_decomp.tool": "ןooʇ ɔıɹʇɔǝןǝ-uoN",
"gtceu.autoclave": "ǝʌɐןɔoʇnⱯ",
"gtceu.battery_buffer.average_input": "ʇ/∩Ǝ %s :ʇnduı ǝbɐɹǝʌⱯ",
"gtceu.battery_buffer.average_output": "ʇ/∩Ǝ %s :ʇndʇno ǝbɐɹǝʌⱯ",
Expand All @@ -2137,7 +2143,9 @@
"gtceu.bus.collapse_false": "sɯǝʇI ǝsdɐןןoɔ ʇou ןןıʍ snᗺ",
"gtceu.bus.collapse_true": "sɯǝʇI ǝsdɐןןoɔ ןןıʍ snᗺ",
"gtceu.button.bedrock_fluids": "suıǝΛ pınןℲ ʞɔoɹpǝᗺ ʍoɥS",
"gtceu.button.hide_depleted": "suıǝΛ pǝʇǝןdǝᗡ ǝpıH",
"gtceu.button.ore_veins": "suıǝΛ ǝɹO ⟘⅁ ʍoɥS",
"gtceu.button.show_depleted": "suıǝΛ pǝʇǝןdǝᗡ ʍoɥS",
"gtceu.cable.amperage": "%dǝ§ :ǝbɐɹǝdɯⱯ xɐW",
"gtceu.cable.loss_per_block": "ʇןoΛ-∩Ǝ ㄥ§%dɔ§ :ǝɹǝdɯⱯ/ɹǝʇǝW/ssoꞀ",
"gtceu.cable.superconductor": "ɹoʇɔnpuoɔɹǝdnS %sp§",
Expand Down Expand Up @@ -2469,6 +2477,7 @@
"gtceu.jei.programmed_circuit": "ǝbɐԀ ʇınɔɹıƆ pǝɯɯɐɹboɹԀ",
"gtceu.journeymap.options.layers": "sɹǝʎɐן uoıʇɔǝdsoɹԀ",
"gtceu.journeymap.options.layers.bedrock_fluids": "suıǝΛ pınןℲ ʞɔoɹpǝᗺ ʍoɥS",
"gtceu.journeymap.options.layers.hide_depleted": "suıǝΛ pǝʇǝןdǝᗡ ǝpıH",
"gtceu.journeymap.options.layers.ore_veins": "suıǝΛ ǝɹO ʍoɥS",
"gtceu.key.armor_charging": "ǝןbbo⟘ ʎɹoʇuǝʌuI oʇ buıbɹɐɥƆ ɹoɯɹⱯ",
"gtceu.key.armor_hover": "ǝןbbo⟘ ɹǝʌoH ɹoɯɹⱯ",
Expand Down
9 changes: 9 additions & 0 deletions src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -1755,6 +1755,7 @@
"config.gtceu.option.euToFeRatio": "euToFeRatio",
"config.gtceu.option.feToEuRatio": "feToEuRatio",
"config.gtceu.option.flintAndSteelRequireSteel": "flintAndSteelRequireSteel",
"config.gtceu.option.ftbChunksIntegration": "ftbChunksIntegration",
"config.gtceu.option.gameplay": "gameplay",
"config.gtceu.option.generateLowQualityGems": "generateLowQualityGems",
"config.gtceu.option.ghostCircuit": "ghostCircuit",
Expand Down Expand Up @@ -1787,6 +1788,7 @@
"config.gtceu.option.inWorldPreviewDuration": "inWorldPreviewDuration",
"config.gtceu.option.increaseDungeonLoot": "increaseDungeonLoot",
"config.gtceu.option.infiniteBedrockOresFluids": "infiniteBedrockOresFluids",
"config.gtceu.option.journeyMapIntegration": "journeyMapIntegration",
"config.gtceu.option.largeBoilers": "largeBoilers",
"config.gtceu.option.ldFluidPipeMinDistance": "ldFluidPipeMinDistance",
"config.gtceu.option.ldItemPipeMinDistance": "ldItemPipeMinDistance",
Expand Down Expand Up @@ -1846,6 +1848,7 @@
"config.gtceu.option.surfaceRockProspectRange": "surfaceRockProspectRange",
"config.gtceu.option.titaniumBoilerHeatSpeed": "titaniumBoilerHeatSpeed",
"config.gtceu.option.titaniumBoilerMaxTemperature": "titaniumBoilerMaxTemperature",
"config.gtceu.option.toggle": "toggle",
"config.gtceu.option.toolCraftingSounds": "toolCraftingSounds",
"config.gtceu.option.toolUseSounds": "toolUseSounds",
"config.gtceu.option.tools": "tools",
Expand All @@ -1865,6 +1868,7 @@
"config.gtceu.option.worldAcceleratorBlacklist": "worldAcceleratorBlacklist",
"config.gtceu.option.worldgen": "worldgen",
"config.gtceu.option.xOffset": "xOffset",
"config.gtceu.option.xaerosMapIntegration": "xaerosMapIntegration",
"config.gtceu.option.yOffset": "yOffset",
"config.gtceu.option.zombieSpawnWithSabers": "zombieSpawnWithSabers",
"config.jade.plugin_gtceu.auto_output_info": "[GTCEu] Auto Output Info",
Expand Down Expand Up @@ -2128,6 +2132,8 @@
"gtceu.arc_furnace": "Arc Furnace",
"gtceu.assembler": "Assembler",
"gtceu.assembly_line": "Assembly Line",
"gtceu.auto_decomp.rotor": "Turbine Rotor",
"gtceu.auto_decomp.tool": "Non-electric tool",
"gtceu.autoclave": "Autoclave",
"gtceu.battery_buffer.average_input": "Average input: %s EU/t",
"gtceu.battery_buffer.average_output": "Average output: %s EU/t",
Expand All @@ -2137,7 +2143,9 @@
"gtceu.bus.collapse_false": "Bus will not collapse Items",
"gtceu.bus.collapse_true": "Bus will collapse Items",
"gtceu.button.bedrock_fluids": "Show Bedrock Fluid Veins",
"gtceu.button.hide_depleted": "Hide Depleted Veins",
"gtceu.button.ore_veins": "Show GT Ore Veins",
"gtceu.button.show_depleted": "Show Depleted Veins",
"gtceu.cable.amperage": "Max Amperage: §e%d",
"gtceu.cable.loss_per_block": "Loss/Meter/Ampere: §c%d§7 EU-Volt",
"gtceu.cable.superconductor": "§d%s Superconductor",
Expand Down Expand Up @@ -2469,6 +2477,7 @@
"gtceu.jei.programmed_circuit": "Programmed Circuit Page",
"gtceu.journeymap.options.layers": "Prospection layers",
"gtceu.journeymap.options.layers.bedrock_fluids": "Show Bedrock Fluid Veins",
"gtceu.journeymap.options.layers.hide_depleted": "Hide Depleted Veins",
"gtceu.journeymap.options.layers.ore_veins": "Show Ore Veins",
"gtceu.key.armor_charging": "Armor Charging to Inventory Toggle",
"gtceu.key.armor_hover": "Armor Hover Toggle",
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/com/gregtechceu/gtceu/api/GTValues.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package com.gregtechceu.gtceu.api;

import com.gregtechceu.gtceu.data.recipe.CraftingComponent;

import net.minecraft.util.RandomSource;

import java.time.LocalDate;
Expand All @@ -15,12 +13,6 @@
*/
public class GTValues {

/**
* Default fallback value used for Map keys.
* Currently only used in {@link CraftingComponent}.
*/
public static final int FALLBACK = -1;

/**
* <p/>
* This is worth exactly one normal Item.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,12 @@ public void setConnection(Direction side, boolean connected, boolean fromNeighbo
pipeTile.getPipeType().getClass() != this.getPipeType().getClass()) {
return;
}

if (!connected) {
var cover = getCoverContainer().getCoverAtSide(side);
if (cover != null && cover.canPipePassThrough()) return;
}

connections = withSideConnection(connections, side, connected);

updateNetworkConnection(side, connected);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
import com.gregtechceu.gtceu.api.data.tag.TagUtil;
import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidVeinSavedData;
import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.FluidVeinWorldEntry;
import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreVeinSavedData;
import com.gregtechceu.gtceu.api.gui.texture.ProspectingTexture;
import com.gregtechceu.gtceu.common.data.GTMaterials;
Expand Down Expand Up @@ -176,7 +177,7 @@ public static FluidInfo fromNbt(CompoundTag tag) {
Fluid fluid = BuiltInRegistries.FLUID.get(new ResourceLocation(tag.getString("fluid")));
int left = tag.getInt("left");
int yield = tag.getInt("yield");
return new FluidInfo(fluid, left, yield);
return new FluidInfo(fluid, yield, left);
}

public CompoundTag toNbt() {
Expand All @@ -186,6 +187,15 @@ public CompoundTag toNbt() {
tag.putInt("yield", yield);
return tag;
}

public static FluidInfo fromVeinWorldEntry(@NotNull FluidVeinWorldEntry savedData) {
if (savedData.getDefinition() == null) {
return null;
}
return new FluidInfo(savedData.getDefinition().getStoredFluid().get(),
savedData.getFluidYield(),
100 * savedData.getOperationsRemaining() / BedrockFluidVeinSavedData.MAXIMUM_VEIN_OPERATIONS);
}
}

public static ProspectorMode<FluidInfo> FLUID = new ProspectorMode<>("metaitem.prospector.mode.fluid", 1) {
Expand All @@ -196,11 +206,8 @@ public void scan(FluidInfo[][][] storage, LevelChunk chunk) {
var fluidVein = BedrockFluidVeinSavedData.getOrCreate(serverLevel)
.getFluidVeinWorldEntry(chunk.getPos().x, chunk.getPos().z);
if (fluidVein.getDefinition() != null) {
var left = 100 * fluidVein.getOperationsRemaining() /
BedrockFluidVeinSavedData.MAXIMUM_VEIN_OPERATIONS;
storage[0][0] = new FluidInfo[] {
new FluidInfo(fluidVein.getDefinition().getStoredFluid().get(), left,
fluidVein.getFluidYield()),
FluidInfo.fromVeinWorldEntry(fluidVein)
};
}
}
Expand Down Expand Up @@ -233,8 +240,8 @@ public String getUniqueID(FluidInfo item) {
@Override
public void serialize(FluidInfo item, FriendlyByteBuf buf) {
buf.writeUtf(BuiltInRegistries.FLUID.getKey(item.fluid).toString());
buf.writeVarInt(item.left);
buf.writeVarInt(item.yield);
buf.writeVarInt(item.left);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@ public void detectAndSendChanges() {
int oz = row - chunkRadius + 1;

var chunk = world.getChunk(playerChunkX + ox, playerChunkZ + oz);
ServerCache.instance.prospectAllInChunk(world.dimension(), chunk.getPos(), (ServerPlayer) player);
if (mode == ProspectorMode.ORE) {
ServerCache.instance.prospectAllInChunk(world.dimension(), chunk.getPos(), (ServerPlayer) player);
}
PacketProspecting packet = new PacketProspecting(playerChunkX + ox, playerChunkZ + oz, this.mode);
mode.scan(packet.data, chunk);
writeUpdateInfo(-1, packet::writePacketData);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -537,11 +537,14 @@ private int tryClickContainer(boolean isShiftKeyDown) {
boolean performedEmptying = false;
ItemStack drainedResult = ItemStack.EMPTY;
for (int i = 0; i < maxAttempts; i++) {
FluidActionResult result = FluidUtil.tryEmptyContainer(currentStack, fluidTank, Integer.MAX_VALUE, null,
int remainingCapacity = fluidTank.getTankCapacity(tank) - fluidTank.getFluidInTank(tank).getAmount();
FluidActionResult result = FluidUtil.tryEmptyContainer(currentStack, fluidTank, remainingCapacity, null,
false);
if (!result.isSuccess()) break;

ItemStack remainingStack = FluidUtil
.tryEmptyContainer(currentStack, fluidTank, Integer.MAX_VALUE, null, true).getResult();
.tryEmptyContainer(currentStack, fluidTank, remainingCapacity, null, true)
.getResult();
performedEmptying = true;

currentStack.shrink(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.gregtechceu.gtceu.api.misc.forge.ThermalFluidHandlerItemStack;
import com.gregtechceu.gtceu.client.TooltipsHandler;
import com.gregtechceu.gtceu.utils.FormattingUtil;
import com.gregtechceu.gtceu.utils.GTUtil;

import net.minecraft.network.chat.Component;
import net.minecraft.world.item.ItemStack;
Expand Down Expand Up @@ -81,5 +82,16 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List<Compone
tooltipComponents.add(Component.translatable("gtceu.universal.tooltip.fluid_storage_capacity",
FormattingUtil.formatNumbers(capacity)));
}
if (GTUtil.isShiftDown()) {
tooltipComponents.add(Component.translatable("gtceu.fluid_pipe.max_temperature",
FormattingUtil.formatNumbers(maxFluidTemperature)));
if (gasProof) tooltipComponents.add(Component.translatable("gtceu.fluid_pipe.gas_proof"));
else tooltipComponents.add(Component.translatable("gtceu.fluid_pipe.not_gas_proof"));
if (plasmaProof) tooltipComponents.add(Component.translatable("gtceu.fluid_pipe.plasma_proof"));
if (cryoProof) tooltipComponents.add(Component.translatable("gtceu.fluid_pipe.cryo_proof"));
if (acidProof) tooltipComponents.add(Component.translatable("gtceu.fluid_pipe.acid_proof"));
} else if (gasProof || cryoProof || plasmaProof || acidProof) {
tooltipComponents.add(Component.translatable("gtceu.tooltip.fluid_pipe_hold_shift"));
}
}
}
Loading

0 comments on commit e5b2400

Please sign in to comment.