Skip to content

switch grid overlays to UITexture #4719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gustovafing merged 1 commit into from
Mar 7, 2026
Merged

switch grid overlays to UITexture #4719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/main/java/com/gregtechceu/gtceu/api/blockentity/PipeBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,20 @@
import com.gregtechceu.gtceu.api.cover.CoverBehavior;
import com.gregtechceu.gtceu.api.data.chemical.material.Material;
import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
import com.gregtechceu.gtceu.api.item.tool.IToolGridHighlight;
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
import com.gregtechceu.gtceu.api.pipenet.*;
import com.gregtechceu.gtceu.api.sync_system.ManagedSyncBlockEntity;
import com.gregtechceu.gtceu.api.sync_system.annotations.RerenderOnChanged;
import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient;
import com.gregtechceu.gtceu.common.data.GTMaterialBlocks;
import com.gregtechceu.gtceu.common.data.GTMaterials;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.utils.GTUtil;

import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand Down Expand Up @@ -329,13 +328,13 @@ public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, I
return false;
}

public ResourceTexture getPipeTexture(boolean isBlock) {
return isBlock ? GuiTextures.TOOL_PIPE_CONNECT : GuiTextures.TOOL_PIPE_BLOCK;
public UITexture getPipeTexture(boolean isBlock) {
return isBlock ? GTGuiTextures.TOOL_PIPE_CONNECT : GTGuiTextures.TOOL_PIPE_BLOCK;
}

@Override
public @Nullable ResourceTexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
public @Nullable UITexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
if (toolTypes.contains(getPipeTuneTool())) {
if (player.isShiftKeyDown() && this.canHaveBlockedFaces()) {
return getPipeTexture(isBlocked(side));
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/com/gregtechceu/gtceu/api/cover/CoverBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@

import com.gregtechceu.gtceu.api.blockentity.ICopyable;
import com.gregtechceu.gtceu.api.capability.ICoverable;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.gui.fancy.IFancyConfigurator;
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
import com.gregtechceu.gtceu.api.item.tool.IToolGridHighlight;
import com.gregtechceu.gtceu.api.machine.MetaMachine;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
import com.gregtechceu.gtceu.api.sync_system.ISyncManaged;
import com.gregtechceu.gtceu.api.sync_system.SyncDataHolder;
import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient;
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
import com.gregtechceu.gtceu.client.renderer.cover.ICoverRenderer;
import com.gregtechceu.gtceu.client.renderer.cover.IDynamicCoverRenderer;

import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.BlockPos;
Expand Down Expand Up @@ -191,13 +190,13 @@ public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, I
}

@Override
public @Nullable ResourceTexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
public @Nullable UITexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
if (toolTypes.contains(GTToolType.CROWBAR)) {
return GuiTextures.TOOL_REMOVE_COVER;
return GTGuiTextures.TOOL_REMOVE_COVER;
}
if ((toolTypes.isEmpty() || toolTypes.contains(GTToolType.SCREWDRIVER)) && this instanceof IMuiCover) {
return GuiTextures.TOOL_COVER_SETTINGS;
return GTGuiTextures.TOOL_COVER_SETTINGS;
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/api/item/tool/IToolGridHighlight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.gregtechceu.gtceu.api.item.tool;

import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;

import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand All @@ -19,8 +19,8 @@ default boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state,
return true;
}

default @Nullable ResourceTexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
default @Nullable UITexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
return null;
}
}
21 changes: 9 additions & 12 deletions src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import com.gregtechceu.gtceu.api.machine.trait.feature.IInteractionTrait;
import com.gregtechceu.gtceu.api.machine.trait.feature.IRenderingTrait;
import com.gregtechceu.gtceu.api.misc.*;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection;
import com.gregtechceu.gtceu.api.sync_system.ManagedSyncBlockEntity;
import com.gregtechceu.gtceu.api.sync_system.SyncDataHolder;
Expand All @@ -44,11 +45,11 @@
import com.gregtechceu.gtceu.common.cover.data.ManualIOMode;
import com.gregtechceu.gtceu.common.machine.owner.MachineOwner;
import com.gregtechceu.gtceu.common.machine.owner.PlayerOwner;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.utils.GTUtil;
import com.gregtechceu.gtceu.utils.data.TagCompatibilityFixer;

import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
import com.lowdragmc.lowdraglib.utils.DummyWorld;

import net.minecraft.ChatFormatting;
Expand Down Expand Up @@ -80,7 +81,6 @@
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.model.data.ModelData;
import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
Expand All @@ -103,9 +103,6 @@
public class MetaMachine extends ManagedSyncBlockEntity implements IGregtechBlockEntity, IToolable, IToolGridHighlight,
IFancyTooltip, IPaintable, IMachineFeature, ICopyable {

public static final ModelProperty<BlockAndTintGetter> MODEL_DATA_LEVEL = new ModelProperty<>();
public static final ModelProperty<BlockPos> MODEL_DATA_POS = new ModelProperty<>();

@Getter
protected final SyncDataHolder syncDataHolder = new SyncDataHolder(this);

Expand Down Expand Up @@ -511,8 +508,8 @@ public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, I
}

@Override
public @Nullable ResourceTexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
public @Nullable UITexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
var cover = coverContainer.getCoverAtSide(side);
if (cover != null) {
var tips = cover.sideTips(player, pos, state, toolTypes, side);
Expand All @@ -522,16 +519,16 @@ public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, I
if (toolTypes.contains(GTToolType.WRENCH)) {
if (player.isShiftKeyDown()) {
if (isFacingValid(side) || (allowExtendedFacing() && hasFrontFacing() && side == getFrontFacing())) {
return GuiTextures.TOOL_FRONT_FACING_ROTATION;
return GTGuiTextures.TOOL_FRONT_FACING_ROTATION;
}
}
} else if (toolTypes.contains(GTToolType.SOFT_MALLET)) {
if (this instanceof IControllable controllable) {
return controllable.isWorkingEnabled() ? GuiTextures.TOOL_START : GuiTextures.TOOL_PAUSE;
return controllable.isWorkingEnabled() ? GTGuiTextures.TOOL_START : GTGuiTextures.TOOL_PAUSE;
}
} else if (toolTypes.contains(GTToolType.HARD_HAMMER)) {
if (this instanceof IMufflableMachine mufflableMachine) {
return mufflableMachine.isMuffled() ? GuiTextures.TOOL_SOUND : GuiTextures.TOOL_MUTE;
return mufflableMachine.isMuffled() ? GTGuiTextures.TOOL_SOUND : GTGuiTextures.TOOL_MUTE;
}
}

Expand Down Expand Up @@ -630,7 +627,7 @@ public void setFrontFacing(Direction facing) {
}

@Override
public @NotNull ModelData getModelData() {
public ModelData getModelData() {
ModelData.Builder data = super.getModelData().derive();
updateModelData(data);
return data.build();
Expand All @@ -641,7 +638,7 @@ public Direction getUpwardsFacing() {
Direction.NORTH;
}

public void setUpwardsFacing(@NotNull Direction upwardsFacing) {
public void setUpwardsFacing(Direction upwardsFacing) {
if (!getDefinition().isAllowExtendedFacing()) {
return;
}
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamWorkableMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@
import com.gregtechceu.gtceu.api.capability.recipe.IO;
import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler;
import com.gregtechceu.gtceu.api.capability.recipe.RecipeCapability;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
import com.gregtechceu.gtceu.api.machine.feature.IMufflableMachine;
import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine;
import com.gregtechceu.gtceu.api.machine.trait.*;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
import com.gregtechceu.gtceu.api.sync_system.annotations.RerenderOnChanged;
import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.utils.ISubscription;

import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand Down Expand Up @@ -192,12 +191,12 @@ public void clientTick() {
// ******* Rendering ********//
//////////////////////////////////////
@Override
public @Nullable ResourceTexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
public @Nullable UITexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
Direction side) {
if (toolTypes.contains(GTToolType.WRENCH)) {
if (!player.isShiftKeyDown()) {
if (!hasFrontFacing() || side != getFrontFacing()) {
return GuiTextures.TOOL_IO_FACING_ROTATION;
return GTGuiTextures.TOOL_IO_FACING_ROTATION;
}
}
}
Expand Down
15 changes: 7 additions & 8 deletions src/main/java/com/gregtechceu/gtceu/api/machine/trait/AutoOutputTrait.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
package com.gregtechceu.gtceu.api.machine.trait;

import com.gregtechceu.gtceu.api.capability.recipe.IO;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
import com.gregtechceu.gtceu.api.machine.MetaMachine;
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
import com.gregtechceu.gtceu.api.machine.trait.feature.IFrontFacingTrait;
import com.gregtechceu.gtceu.api.machine.trait.feature.IInteractionTrait;
import com.gregtechceu.gtceu.api.machine.trait.feature.IRenderingTrait;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
import com.gregtechceu.gtceu.api.sync_system.annotations.RerenderOnChanged;
import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient;
import com.gregtechceu.gtceu.common.item.tool.behavior.ToolModeSwitchBehavior;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.utils.GTTransferUtils;
import com.gregtechceu.gtceu.utils.ISubscription;

import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;

import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
Expand Down Expand Up @@ -300,8 +299,8 @@ public boolean shouldRenderGridOverlay(Player player, BlockPos pos, BlockState s
}

@Override
public @Nullable ResourceTexture getGridOverlayIcon(Player player, BlockPos pos, BlockState state,
Set<GTToolType> toolTypes, Direction side) {
public @Nullable UITexture getGridOverlayIcon(Player player, BlockPos pos, BlockState state,
Set<GTToolType> toolTypes, Direction side) {
if (toolTypes.contains(GTToolType.WRENCH)) {
if (!player.isShiftKeyDown()) {
if (!machine.hasFrontFacing() || side != machine.getFrontFacing()) {
Expand All @@ -310,14 +309,14 @@ public boolean shouldRenderGridOverlay(Player player, BlockPos pos, BlockState s
var canSwitchFluidOutputToSide = supportsAutoOutputFluids() &&
fluidOutputDirectionValidator.test(side) && side != getFluidOutputDirection();
if (canSwitchItemOutputToSide || canSwitchFluidOutputToSide)
return GuiTextures.TOOL_IO_FACING_ROTATION;
return GTGuiTextures.TOOL_IO_FACING_ROTATION;
}
}
}
if (toolTypes.contains(GTToolType.SCREWDRIVER)) {
if (side == getItemOutputDirection() || side == getFluidOutputDirection()) {
if (player.isShiftKeyDown()) return GuiTextures.TOOL_ALLOW_INPUT;
return GuiTextures.TOOL_AUTO_OUTPUT;
if (player.isShiftKeyDown()) return GTGuiTextures.TOOL_ALLOW_INPUT;
return GTGuiTextures.TOOL_AUTO_OUTPUT;
}
}
return null;
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/com/gregtechceu/gtceu/api/machine/trait/feature/IRenderingTrait.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.gregtechceu.gtceu.api.machine.trait.feature;

import com.gregtechceu.gtceu.api.item.tool.GTToolType;

import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;

import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
Expand Down Expand Up @@ -35,9 +34,9 @@ default boolean shouldRenderGridOverlay(Player player, BlockPos pos, BlockState
* Called when the machine grid overlay is being rendered to determine the icon to be rendered within the grid
* segment on a specifc side.
*/
default @Nullable ResourceTexture getGridOverlayIcon(Player player, BlockPos pos, BlockState state,
Set<GTToolType> toolTypes,
Direction side) {
default @Nullable UITexture getGridOverlayIcon(Player player, BlockPos pos, BlockState state,
Set<GTToolType> toolTypes,
Direction side) {
return null;
}

Expand Down
Loading
Loading