diff --git a/src/main/java/gregtech/api/gui/widgets/ClickButtonWidget.java b/src/main/java/gregtech/api/gui/widgets/ClickButtonWidget.java index a834867fd1e..d4e059d713a 100644 --- a/src/main/java/gregtech/api/gui/widgets/ClickButtonWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/ClickButtonWidget.java @@ -15,7 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; -import com.google.common.base.Preconditions; import org.lwjgl.input.Mouse; import java.util.Arrays; @@ -64,7 +63,6 @@ public ClickButtonWidget setDisplayFunction(Supplier displayFunction) { } public ClickButtonWidget setTooltipText(String tooltipText, Object... args) { - Preconditions.checkNotNull(tooltipText, "tooltipText"); this.tooltipText = tooltipText; this.tooltipArgs = args; return this; diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java index 3ad537ef0bb..5289c567605 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java @@ -7,7 +7,6 @@ import gregtech.api.gui.widgets.ClickButtonWidget; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; -import gregtech.api.util.GTLog; import gregtech.api.util.GTUtility; import gregtech.client.renderer.handler.BlockPosHighlightRenderer; import gregtech.client.renderer.texture.Textures; @@ -195,9 +194,8 @@ public void receiveCustomData(int dataId, PacketBuffer buf) { if (this.connectedIcon != null) { this.connectedIcon.setButtonTexture(GuiTextures.GREGTECH_LOGO); - String pos = String.format("X=%d, Z=%d, Y=%d", controllerPos.getX(), controllerPos.getZ(), - controllerPos.getY()); - this.connectedIcon.setTooltipText("Connected to Quantum Controller at/n" + pos); + this.connectedIcon.setTooltipText("gregtech.machine.quantum_storage.connected", + controllerPos.getX(), controllerPos.getZ(), controllerPos.getY()); } scheduleRenderUpdate(); } else if (dataId == GregtechDataCodes.REMOVE_CONTROLLER) { @@ -234,13 +232,8 @@ public void readFromNBT(NBTTagCompound data) { } protected ClickButtonWidget createConnectedGui(int y) { - // todo do something for rendering a highlight at the controller - // todo look into BlockPosHighlightRenderer - // connectedIcon = new ImageWidget(151, y, 18, 18, - // isConnected() ? GuiTextures.GREGTECH_LOGO : GuiTextures.GREGTECH_LOGO_DARK); - connectedIcon = new ClickButtonWidget(151, y, 18, 18, - "", clickData -> { - GTLog.logger.warn("click"); + connectedIcon = new ClickButtonWidget(151, y, 18, 18, "", + clickData -> { writeCustomData(GregtechDataCodes.LOCATE_CONTROLLER, buffer -> { buffer.writeBoolean(this.isConnected()); }); @@ -248,9 +241,8 @@ protected ClickButtonWidget createConnectedGui(int y) { connectedIcon.setButtonTexture(isConnected() ? GuiTextures.GREGTECH_LOGO : GuiTextures.GREGTECH_LOGO_DARK); if (isConnected()) { - String pos = String.format("X=%d, Z=%d, Y=%d", controllerPos.getX(), controllerPos.getZ(), - controllerPos.getY()); - connectedIcon.setTooltipText("Connected to Quantum Controller at/n" + pos); + connectedIcon.setTooltipText("gregtech.machine.quantum_storage.connected", + controllerPos.getX(), controllerPos.getZ(), controllerPos.getY()); } return connectedIcon; diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 0481a0106a1..2840c85f0e3 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -4378,8 +4378,7 @@ gregtech.machine.quantum_storage_proxy.name=Quantum Storage Proxy gregtech.machine.quantum_storage_proxy.tooltip=Proxies the Quantum Storage Network's inventory gregtech.machine.quantum_storage_extender.name=Quantum Storage Extender gregtech.machine.quantum_storage_extender.tooltip=Extends the Quantum Storage Network to other chests/tanks -gregtech.machine.quantum_energy_acceptor.name=Quantum Energy Acceptor -gregtech.machine.quantum_energy_acceptor.tooltip=Provides EU to the Quantum Storage Network +gregtech.machine.quantum_storage.connected=Connected to Quantum Controller at [%d, %d, %d]/n/nClick to highlight the controller #Buffers gregtech.machine.buffer.tooltip=A Small Buffer to store Items and Fluids