Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ public InteractionResult use(BlockState state, Level world, BlockPos pos, Player
return machine.getDefinition().getUI().tryToOpenUI(player, hand, hit);
} else if (machine instanceof IMuiMachine muiMachine) {
return muiMachine.tryToOpenUI(player, hand, hit);
} else if (machine instanceof IUIMachine uiMachine) {
return uiMachine.tryToOpenUI(player, hand, hit);
}
}
return shouldOpenUi ? InteractionResult.PASS : InteractionResult.CONSUME;
Expand Down

This file was deleted.

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
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
package com.gregtechceu.gtceu.api.capability.recipe;

import com.gregtechceu.gtceu.api.gui.widget.EnumSelectorWidget;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;

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

import lombok.Getter;

/**
* The capability can be input or output or both
*/
public enum IO implements EnumSelectorWidget.SelectableEnum {
public enum IO {

IN("gtceu.io.import", "import"),
OUT("gtceu.io.export", "export"),
Expand All @@ -21,13 +17,10 @@ public enum IO implements EnumSelectorWidget.SelectableEnum {
@Getter
public final String tooltip;
@Getter
public final IGuiTexture icon;
@Getter
public final UITexture uiTexture;

IO(String tooltip, String textureName) {
this.tooltip = tooltip;
this.icon = new ResourceTexture("gtceu:textures/gui/icon/io_mode/" + textureName + ".png");
this.uiTexture = UITexture.fullImage("gtceu:textures/gui/icon/io_mode/" + textureName + ".png");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@

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 @@ -179,10 +177,6 @@ public boolean shouldRenderPlate() {
return coverDefinition.getCoverRenderer();
}

public @Nullable IFancyConfigurator getConfigurator() {
return null;
}

@Override
public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, ItemStack held,
Set<GTToolType> toolTypes) {
Expand All @@ -191,13 +185,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
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,13 @@
import com.gregtechceu.gtceu.client.mui.screen.ModularPanel;
import com.gregtechceu.gtceu.client.mui.screen.UISettings;

import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;

import net.minecraft.nbt.CompoundTag;

import java.util.function.Consumer;
import java.util.function.Predicate;

public interface Filter<T, S extends Filter<T, S>> extends Predicate<T> {

default WidgetGroup openConfigurator(int x, int y) {
return null;
}

/**
* @return Filter panel when opened by itself (including the player inventory)
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import com.gregtechceu.gtceu.GTCEu;
import com.gregtechceu.gtceu.api.cover.CoverBehavior;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.gui.widget.SlotWidget;
import com.gregtechceu.gtceu.api.machine.MachineCoverContainer;
import com.gregtechceu.gtceu.api.machine.MetaMachine;
import com.gregtechceu.gtceu.api.sync_system.ISyncManaged;
Expand All @@ -12,10 +10,6 @@
import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient;
import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler;

import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup;
import com.lowdragmc.lowdraglib.gui.widget.Widget;
import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.world.item.ItemStack;

Expand Down Expand Up @@ -43,7 +37,6 @@ public abstract class FilterHandler<T, F extends Filter<T, F>> implements ISyncM

private @Nullable F filter;
private @Nullable CustomItemStackHandler filterSlot;
private @Nullable WidgetGroup filterGroup;

private @NotNull Consumer<F> onFilterLoaded = (filter) -> {};
private @NotNull Consumer<F> onFilterRemoved = (filter) -> {};
Expand All @@ -63,21 +56,6 @@ public FilterHandler(ISyncManaged container) {

public abstract boolean canInsertFilterItem(ItemStack itemStack);

public Widget createFilterSlotUI(int xPos, int yPos) {
return new SlotWidget(getFilterSlot(), 0, xPos, yPos)
.setChangeListener(this::updateFilter)
.setBackgroundTexture(new GuiTextureGroup(GuiTextures.SLOT, GuiTextures.FILTER_SLOT_OVERLAY));
}

public Widget createFilterConfigUI(int xPos, int yPos, int width, int height) {
this.filterGroup = new WidgetGroup(xPos, yPos, width, height);
if (!this.filterItem.isEmpty()) {
this.filterGroup.addWidget(getFilter().openConfigurator(0, 0));
}

return this.filterGroup;
}

public boolean isFilterPresent() {
return filter != null || !filterItem.isEmpty();
}
Expand Down Expand Up @@ -172,18 +150,6 @@ private void loadFilterFromItem() {
}
this.onFilterLoaded.accept(this.filter);
}
updateFilterGroupUI();
}

private void updateFilterGroupUI() {
if (this.filterGroup == null)
return;

this.filterGroup.clearAllWidgets();

if (!this.filterItem.isEmpty() && this.filter != null) {
this.filterGroup.addWidget(this.filter.openConfigurator(0, 0));
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.gregtechceu.gtceu.GTCEu;
import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability;
import com.gregtechceu.gtceu.api.gui.widget.EnumSelectorWidget;
import com.gregtechceu.gtceu.api.mui.base.drawable.IKey;
import com.gregtechceu.gtceu.api.mui.drawable.ColorType;
import com.gregtechceu.gtceu.api.mui.drawable.UITexture;
Expand All @@ -21,9 +20,6 @@
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.utils.ItemStackHashStrategy;

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

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
Expand Down Expand Up @@ -141,7 +137,7 @@ public void setModeFromMachine(String machineName) {
}

@MethodsReturnNonnullByDefault
private enum SmartFilteringMode implements EnumSelectorWidget.SelectableEnum {
private enum SmartFilteringMode {

ELECTROLYZER("electrolyzer", GTRecipeTypes.ELECTROLYZER_RECIPES),
CENTRIFUGE("centrifuge", GTRecipeTypes.CENTRIFUGE_RECIPES),
Expand All @@ -158,21 +154,11 @@ private enum SmartFilteringMode implements EnumSelectorWidget.SelectableEnum {
this.recipeType = type;
}

@Override
public String getTooltip() {
return "cover.item_smart_filter.filtering_mode." + localeName;
}

public static UITexture[] getTextures() {
return Arrays.stream(VALUES)
.map(v -> UITexture.fullImage(GTCEu.MOD_ID,
"textures/block/machines/" + v.localeName + "/overlay_front.png", ColorType.DEFAULT))
.toArray(UITexture[]::new);
}

@Override
public IGuiTexture getIcon() {
return new ResourceTexture("gtceu:textures/block/machines/" + localeName + "/overlay_front.png");
}
}
}
36 changes: 0 additions & 36 deletions src/main/java/com/gregtechceu/gtceu/api/gui/GuiTextures.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,6 @@ public class GuiTextures {
public static final ResourceTexture GREGTECH_LOGO_XMAS = new ResourceTexture(
"gtceu:textures/gui/icon/gregtech_logo_xmas.png");

// HUD
public static final ResourceTexture TOOL_FRONT_FACING_ROTATION = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_front_facing_rotation.png");
public static final ResourceTexture TOOL_IO_FACING_ROTATION = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_io_facing_rotation.png");
public static final ResourceTexture TOOL_PAUSE = new ResourceTexture("gtceu:textures/gui/overlay/tool_pause.png");
public static final ResourceTexture TOOL_START = new ResourceTexture("gtceu:textures/gui/overlay/tool_start.png");
public static final ResourceTexture TOOL_COVER_SETTINGS = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_cover_settings.png");
public static final ResourceTexture TOOL_MUTE = new ResourceTexture("gtceu:textures/gui/overlay/tool_mute.png");
public static final ResourceTexture TOOL_SOUND = new ResourceTexture("gtceu:textures/gui/overlay/tool_sound.png");
public static final ResourceTexture TOOL_ALLOW_INPUT = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_allow_input.png");
public static final ResourceTexture TOOL_ATTACH_COVER = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_attach_cover.png");
public static final ResourceTexture TOOL_REMOVE_COVER = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_remove_cover.png");
public static final ResourceTexture TOOL_PIPE_BLOCK = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_pipe_block.png");
public static final ResourceTexture TOOL_PIPE_CONNECT = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_pipe_connect.png");
public static final ResourceTexture TOOL_WIRE_BLOCK = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_wire_block.png");
public static final ResourceTexture TOOL_WIRE_CONNECT = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_wire_connect.png");
public static final ResourceTexture TOOL_AUTO_OUTPUT = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_auto_output.png");
public static final ResourceTexture TOOL_DISABLE_AUTO_OUTPUT = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_disable_auto_output.png");
public static final ResourceTexture TOOL_SWITCH_CONVERTER_NATIVE = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_wire_block.png"); // todo switch to tool_switch_converter_native once that
// gets made
public static final ResourceTexture TOOL_SWITCH_CONVERTER_EU = new ResourceTexture(
"gtceu:textures/gui/overlay/tool_wire_connect.png"); // todo switch to tool_switch_converter_eu once that
// gets made

// BASE TEXTURES
public static final ResourceBorderTexture BACKGROUND = new ResourceBorderTexture(
"gtceu:textures/gui/base/background.png", 16, 16, 4, 4);
Expand Down
31 changes: 0 additions & 31 deletions src/main/java/com/gregtechceu/gtceu/api/gui/UITemplate.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.gregtechceu.gtceu.GTCEu;
import com.gregtechceu.gtceu.api.machine.MetaMachine;
import com.gregtechceu.gtceu.api.machine.feature.IUIMachine;

import com.lowdragmc.lowdraglib.gui.factory.UIFactory;
import com.lowdragmc.lowdraglib.gui.modular.ModularUI;
Expand All @@ -24,9 +23,6 @@ public MachineUIFactory() {

@Override
protected ModularUI createUITemplate(MetaMachine holder, Player entityPlayer) {
if (holder instanceof IUIMachine machine) {
return machine.createUI(entityPlayer);
}
return null;
}

Expand Down
Loading
Loading