From a63158ce51b442dd9c9bf37eba859c342712dd59 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Mon, 16 Sep 2024 00:03:38 +0800 Subject: [PATCH 1/4] add weather-proof tooltip to multiblocks --- .../java/gregtech/api/metatileentity/MetaTileEntity.java | 5 ++++- .../gregtech/api/metatileentity/TieredMetaTileEntity.java | 8 -------- .../metatileentities/electric/MetaTileEntityPump.java | 3 +-- .../storage/MetaTileEntityLongDistanceEndpoint.java | 4 +--- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index 1185fb5ab97..f4f2cffcf0b 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -235,7 +235,10 @@ public void addDebugInfo(List list) {} @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, @Nullable World world, @NotNull List tooltip, - boolean advanced) {} + boolean advanced) { + if (ConfigHolder.machines.doTerrainExplosion && getIsWeatherOrTerrainResistant()) + tooltip.add(I18n.format("gregtech.universal.tooltip.terrain_resist")); + } /** * Override this to add extended tool information to the "Hold SHIFT to show Tool Info" tooltip section. diff --git a/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java index 0c03b3bc794..6128fb7369f 100644 --- a/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java @@ -57,14 +57,6 @@ protected SimpleSidedCubeRenderer getBaseRenderer() { return Textures.VOLTAGE_CASINGS[tier]; } - @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, - boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); - if (ConfigHolder.machines.doTerrainExplosion && getIsWeatherOrTerrainResistant()) - tooltip.add(I18n.format("gregtech.universal.tooltip.terrain_resist")); - } - @Override @SideOnly(Side.CLIENT) public Pair getParticleTexture() { diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java index 454c29bb848..7b17b065ec5 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java @@ -398,9 +398,8 @@ public void readFromNBT(NBTTagCompound data) { @Override public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.machine.pump.tooltip")); - if (ConfigHolder.machines.doTerrainExplosion) - tooltip.add(I18n.format("gregtech.universal.tooltip.terrain_resist")); tooltip.add( I18n.format("gregtech.universal.tooltip.uses_per_op", GTValues.V[getTier()] * 2) + TextFormatting.GRAY + ", " + I18n.format("gregtech.machine.pump.tooltip_buckets", getPumpingCycleLength())); diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLongDistanceEndpoint.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLongDistanceEndpoint.java index 600092ddb2b..fa514e5df49 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLongDistanceEndpoint.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLongDistanceEndpoint.java @@ -213,15 +213,13 @@ protected boolean openGUIOnRightClick() { @Override public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.machine.endpoint.tooltip.1")); tooltip.add(I18n.format("gregtech.machine.endpoint.tooltip.2")); tooltip.add(I18n.format("gregtech.machine.endpoint.tooltip.3")); if (pipeType.getMinLength() > 0) { tooltip.add(I18n.format("gregtech.machine.endpoint.tooltip.min_length", pipeType.getMinLength())); } - if (ConfigHolder.machines.doTerrainExplosion && getIsWeatherOrTerrainResistant()) { - tooltip.add(I18n.format("gregtech.universal.tooltip.terrain_resist")); - } } @Override From f67404923cd97129e2f566217577abad11dc35b7 Mon Sep 17 00:00:00 2001 From: MCTian-mi <35869948+MCTian-mi@users.noreply.github.com> Date: Tue, 17 Sep 2024 10:25:00 +0800 Subject: [PATCH 2/4] add color to the tooltip --- src/main/resources/assets/gregtech/lang/en_us.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 8576e93db24..9147a2fdc2e 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -5370,7 +5370,7 @@ gregtech.universal.tooltip.uses_per_op=Uses §f%,d EU/operation gregtech.universal.tooltip.base_production_eut=§eBase Production: §f%,d EU/t gregtech.universal.tooltip.base_production_fluid=§eBase Production: §f%,d L/t gregtech.universal.tooltip.produces_fluid=§eProduces: §f%,d L/t -gregtech.universal.tooltip.terrain_resist=This Machine will not explode when exposed to the Elements +gregtech.universal.tooltip.terrain_resist=§eThis Machine will not explode when exposed to the Elements gregtech.universal.tooltip.requires_redstone=§4Requires Redstone power gregtech.block.tooltip.no_mob_spawning=§bMobs cannot spawn on this block From d152572b199c637968d49420864dada97b3fa05b Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:24:34 -0500 Subject: [PATCH 3/4] fix: spotless --- .../gregtech/api/metatileentity/TieredMetaTileEntity.java | 8 -------- .../metatileentities/electric/MetaTileEntityPump.java | 1 - .../storage/MetaTileEntityLongDistanceEndpoint.java | 1 - 3 files changed, 10 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java index 6128fb7369f..3cf30dd6480 100644 --- a/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/TieredMetaTileEntity.java @@ -7,13 +7,9 @@ import gregtech.api.util.GTUtility; import gregtech.client.renderer.texture.Textures; import gregtech.client.renderer.texture.cube.SimpleSidedCubeRenderer; -import gregtech.common.ConfigHolder; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.I18n; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -23,10 +19,6 @@ import codechicken.lib.vec.Matrix4; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.tuple.Pair; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; public abstract class TieredMetaTileEntity extends MetaTileEntity implements IEnergyChangeListener, ITieredMetaTileEntity { diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java index 7b17b065ec5..d268521db3c 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityPump.java @@ -11,7 +11,6 @@ import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.api.util.GTUtility; import gregtech.client.renderer.texture.Textures; -import gregtech.common.ConfigHolder; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLongDistanceEndpoint.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLongDistanceEndpoint.java index fa514e5df49..84ce773b017 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLongDistanceEndpoint.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityLongDistanceEndpoint.java @@ -5,7 +5,6 @@ import gregtech.api.pipenet.longdist.ILDEndpoint; import gregtech.api.pipenet.longdist.LongDistanceNetwork; import gregtech.api.pipenet.longdist.LongDistancePipeType; -import gregtech.common.ConfigHolder; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; From 21c904587448c515d189a09e3ebf6ef03f8623fa Mon Sep 17 00:00:00 2001 From: alongstringofnumbers Date: Sat, 23 Nov 2024 20:23:16 -0700 Subject: [PATCH 4/4] Miner ordering fixes --- .../metatileentities/electric/MetaTileEntityBlockBreaker.java | 2 +- .../common/metatileentities/electric/MetaTileEntityFisher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java index b88ca1418d3..52855de6e03 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityBlockBreaker.java @@ -270,6 +270,7 @@ public boolean getIsWeatherOrTerrainResistant() { @Override public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.machine.block_breaker.tooltip")); tooltip.add(I18n.format("gregtech.universal.tooltip.uses_per_op", getEnergyPerBlockBreak())); tooltip.add(I18n.format("gregtech.universal.tooltip.voltage_in", energyContainer.getInputVoltage(), @@ -279,7 +280,6 @@ public void addInformation(ItemStack stack, @Nullable World player, List tooltip.add(I18n.format("gregtech.universal.tooltip.item_storage_capacity", getInventorySize())); tooltip.add(I18n.format("gregtech.machine.block_breaker.speed_bonus", (int) (getEfficiencyMultiplier() * 100))); tooltip.add(I18n.format("gregtech.universal.tooltip.requires_redstone")); - super.addInformation(stack, player, tooltip, advanced); } @Override diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java index 076cc395674..d0c2f925a81 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java @@ -142,6 +142,7 @@ public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation, @Override public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { + super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.machine.fisher.tooltip")); tooltip.add(I18n.format("gregtech.machine.fisher.speed", fishingTicks)); tooltip.add(I18n.format("gregtech.machine.fisher.requirement", (int) Math.sqrt(WATER_CHECK_SIZE), @@ -150,7 +151,6 @@ public void addInformation(ItemStack stack, @Nullable World player, List GTValues.VNF[getTier()])); tooltip.add( I18n.format("gregtech.universal.tooltip.energy_storage_capacity", energyContainer.getEnergyCapacity())); - super.addInformation(stack, player, tooltip, advanced); } @Override