Skip to content
Merged
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
5 changes: 4 additions & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ dependencies {
// TODO: remove MUI1 dep when the implicit dependency
// TODO: in IItemHandlerModifiable is removed
api("com.github.GTNewHorizons:ModularUI:1.3.1:dev")
api("com.github.GTNewHorizons:ModularUI2:2.3.23-1.7.10:dev")
api("com.github.GTNewHorizons:ModularUI2:2.3.73-1.7.10:dev")
api("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev")
api('curse.maven:cofh-lib-220333:2388748')
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
Expand All @@ -56,6 +56,9 @@ dependencies {
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev")
runtimeOnlyNonPublishable('com.github.GTNewHorizons:Angelica:2.1.4:dev')

// Deobf Extra Utilities, allows hodgepodge mixins to not crash. For testing feature parity and postea only.
runtimeOnlyNonPublishable("curse.maven:extrautilities-225561:2264384")

// Misc testing utilities
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:ServerUtilities:2.2.6:dev") // (/nbtedit)
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:worldedit-gtnh:v0.0.8:dev")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
import com.cleanroommc.modularui.theme.WidgetThemeEntry;
import com.cleanroommc.modularui.value.StringValue;
import com.cleanroommc.modularui.widgets.layout.Row;
import com.cleanroommc.modularui.widgets.layout.Flow;
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess;
import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityTradingPost;

public class SearchBar extends TextFieldWidget {

Row villagerParent;
Flow villagerParent;

static protected String prevText = "";

Expand All @@ -36,13 +36,13 @@ public SearchBar() {

@Override
public void drawBackground(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
IDrawable bg = getCurrentBackground(context.getTheme(), widgetTheme);
IDrawable bg = getCurrentBackground(widgetTheme);
if (bg != null) {
bg.draw(context, 2, -1, getArea().width - 4, getArea().height + 1, widgetTheme.getTheme());
}
}

public SearchBar villagerParent(Row parent) {
public SearchBar villagerParent(Flow parent) {
villagerParent = parent;
return this;
}
Expand Down