Skip to content

Commit 013a3b5

Browse files
ZorbatronZorbatron
committed
Just get it compiling again
1 parent c766a6d commit 013a3b5

19 files changed

Lines changed: 65 additions & 93 deletions

‎src/main/java/gregtech/api/mui/GTGuiTextures.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ private static String id(String path) {
727727
public static final UITexture ARROW_DOUBLE = fullImage("textures/gui/widget/arrow_double.png");
728728
public static final UITexture ARROW_OPPOSITE = fullImage("textures/gui/widget/opposite_arrows.png");
729729
public static final UITexture[] AUTO_PULL = slice("textures/gui/widget/button_me_auto_pull.png",
730-
16, 32, 16, 16, true);
730+
16, 32, 16, 16, ColorType.DEFAULT);
731731

732732
public static void init() {/**/}
733733

‎src/main/java/gregtech/api/mui/GregTechGuiScreen.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import net.minecraftforge.fml.relauncher.Side;
77
import net.minecraftforge.fml.relauncher.SideOnly;
88

9-
import com.cleanroommc.modularui.integration.jei.JeiRecipeTransferHandler;
9+
import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerRecipeTransferHandler;
1010
import com.cleanroommc.modularui.screen.ModularPanel;
1111
import com.cleanroommc.modularui.screen.ModularScreen;
1212
import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
@@ -16,7 +16,7 @@
1616

1717
@SuppressWarnings("UnstableApiUsage")
1818
@SideOnly(Side.CLIENT)
19-
public class GregTechGuiScreen extends ModularScreen implements JeiRecipeTransferHandler {
19+
public class GregTechGuiScreen extends ModularScreen implements RecipeViewerRecipeTransferHandler {
2020

2121
private static final Object2ObjectMap<String, IJEIRecipeReceiver> knownRecipeReceivers = new Object2ObjectOpenHashMap<>();
2222

‎src/main/java/gregtech/api/mui/widget/appeng/AEConfigSlot.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
import appeng.api.storage.data.IAEStack;
88
import com.cleanroommc.modularui.api.IPanelHandler;
9+
import com.cleanroommc.modularui.api.UpOrDown;
910
import com.cleanroommc.modularui.api.drawable.IDrawable;
1011
import com.cleanroommc.modularui.api.drawable.IKey;
1112
import com.cleanroommc.modularui.api.widget.Interactable;
12-
import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider;
13-
import com.cleanroommc.modularui.screen.ModularScreen;
13+
import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerIngredientProvider;
1414
import com.cleanroommc.modularui.screen.RichTooltip;
1515
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
16-
import com.cleanroommc.modularui.theme.WidgetTheme;
16+
import com.cleanroommc.modularui.theme.WidgetThemeEntry;
1717
import com.cleanroommc.modularui.value.LongValue;
1818
import com.cleanroommc.modularui.value.sync.SyncHandler;
1919
import com.cleanroommc.modularui.widget.Widget;
@@ -24,7 +24,7 @@
2424
import java.util.function.BooleanSupplier;
2525

2626
public abstract class AEConfigSlot<T extends IAEStack<T>> extends Widget<AEConfigSlot<T>>
27-
implements JeiIngredientProvider, Interactable {
27+
implements RecipeViewerIngredientProvider, Interactable {
2828

2929
protected final boolean isStocking;
3030
protected final int index;
@@ -75,7 +75,7 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
7575
}
7676

7777
@Override
78-
public void drawOverlay(ModularGuiContext context, WidgetTheme widgetTheme) {
78+
public void drawOverlay(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
7979
super.drawOverlay(context, widgetTheme);
8080

8181
if (selected) {
@@ -104,7 +104,7 @@ public void drawOverlay(ModularGuiContext context, WidgetTheme widgetTheme) {
104104
}
105105

106106
@Override
107-
public boolean onMouseScroll(ModularScreen.UpOrDown scrollDirection, int scrollAmount) {
107+
public boolean onMouseScroll(UpOrDown scrollDirection, int scrollAmount) {
108108
if (!getSyncHandler().hasConfig(index) || isStocking) return false;
109109

110110
long newStackSize = getSyncHandler().getConfigAmount(index);

‎src/main/java/gregtech/api/mui/widget/appeng/AEDisplaySlot.java‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
package gregtech.api.mui.widget.appeng;
22

3-
import net.minecraft.client.renderer.GlStateManager;
4-
53
import appeng.api.storage.data.IAEStack;
6-
import com.cleanroommc.modularui.api.ITheme;
7-
import com.cleanroommc.modularui.drawable.GuiDraw;
8-
import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider;
4+
import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerIngredientProvider;
95
import com.cleanroommc.modularui.screen.RichTooltip;
10-
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
11-
import com.cleanroommc.modularui.theme.WidgetSlotTheme;
12-
import com.cleanroommc.modularui.theme.WidgetTheme;
136
import com.cleanroommc.modularui.widget.Widget;
147
import org.jetbrains.annotations.NotNull;
158

169
public abstract class AEDisplaySlot<T extends IAEStack<T>> extends Widget<AEDisplaySlot<T>>
17-
implements JeiIngredientProvider {
10+
implements RecipeViewerIngredientProvider {
1811

1912
protected final int index;
2013

@@ -25,27 +18,4 @@ public AEDisplaySlot(int index) {
2518
}
2619

2720
protected abstract void buildTooltip(@NotNull RichTooltip tooltip);
28-
29-
@Override
30-
public void drawOverlay(ModularGuiContext context, WidgetTheme widgetTheme) {
31-
super.drawOverlay(context, widgetTheme);
32-
33-
if (isHovering()) {
34-
drawSlotOverlay();
35-
}
36-
}
37-
38-
protected void drawSlotOverlay() {
39-
GlStateManager.colorMask(true, true, true, false);
40-
GuiDraw.drawRect(1, 1, 16, 16, getSlotHoverColor());
41-
GlStateManager.colorMask(true, true, true, true);
42-
}
43-
44-
public int getSlotHoverColor() {
45-
WidgetTheme theme = getWidgetTheme(getContext().getTheme());
46-
if (theme instanceof WidgetSlotTheme slotTheme) {
47-
return slotTheme.getSlotHoverColor();
48-
}
49-
return ITheme.getDefault().getItemSlotTheme().getSlotHoverColor();
50-
}
5121
}

‎src/main/java/gregtech/api/mui/widget/appeng/AEStackPreviewWidget.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package gregtech.api.mui.widget.appeng;
22

33
import appeng.api.storage.data.IAEStack;
4-
import com.cleanroommc.modularui.integration.jei.JeiIngredientProvider;
4+
import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerIngredientProvider;
55
import com.cleanroommc.modularui.screen.RichTooltip;
66
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
7-
import com.cleanroommc.modularui.theme.WidgetTheme;
7+
import com.cleanroommc.modularui.theme.WidgetThemeEntry;
88
import com.cleanroommc.modularui.widget.Widget;
99
import org.jetbrains.annotations.NotNull;
1010
import org.jetbrains.annotations.Nullable;
1111

1212
import java.util.function.Supplier;
1313

1414
public abstract class AEStackPreviewWidget<T extends IAEStack<T>> extends Widget<AEStackPreviewWidget<T>>
15-
implements JeiIngredientProvider {
15+
implements RecipeViewerIngredientProvider {
1616

1717
@NotNull
1818
protected final Supplier<T> stackToDraw;
@@ -26,7 +26,7 @@ public AEStackPreviewWidget(@NotNull Supplier<T> stackToDraw) {
2626
protected abstract void buildTooltip(@NotNull RichTooltip tooltip);
2727

2828
@Override
29-
public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
29+
public void draw(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
3030
draw(stackToDraw.get(), 1, 1, getArea().w() - 2, getArea().h() - 2);
3131
}
3232

‎src/main/java/gregtech/api/mui/widget/appeng/fluid/AEFluidConfigSlot.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import com.cleanroommc.modularui.api.widget.Interactable;
1919
import com.cleanroommc.modularui.drawable.GuiDraw;
2020
import com.cleanroommc.modularui.drawable.text.TextRenderer;
21-
import com.cleanroommc.modularui.integration.jei.JeiGhostIngredientSlot;
21+
import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerGhostIngredientSlot;
2222
import com.cleanroommc.modularui.screen.RichTooltip;
2323
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
24-
import com.cleanroommc.modularui.theme.WidgetTheme;
24+
import com.cleanroommc.modularui.theme.WidgetThemeEntry;
2525
import com.cleanroommc.modularui.utils.Color;
2626
import com.cleanroommc.modularui.value.sync.SyncHandler;
2727
import org.jetbrains.annotations.NotNull;
@@ -30,7 +30,7 @@
3030
import java.util.function.BooleanSupplier;
3131

3232
public class AEFluidConfigSlot extends AEConfigSlot<IAEFluidStack>
33-
implements Interactable, JeiGhostIngredientSlot<FluidStack> {
33+
implements Interactable, RecipeViewerGhostIngredientSlot<FluidStack> {
3434

3535
public AEFluidConfigSlot(boolean isStocking, int index, @NotNull BooleanSupplier isAutoPull) {
3636
super(isStocking, index, isAutoPull);
@@ -40,7 +40,7 @@ public AEFluidConfigSlot(boolean isStocking, int index, @NotNull BooleanSupplier
4040
@Override
4141
public void onInit() {
4242
super.onInit();
43-
getContext().getJeiSettings().addJeiGhostIngredientSlot(this);
43+
getContext().getRecipeViewerSettings().addGhostIngredientSlot(this);
4444
}
4545

4646
@Override
@@ -53,7 +53,9 @@ protected void buildTooltip(@NotNull RichTooltip tooltip) {
5353
tooltip.addLine(FluidTooltipUtil.getFluidModNameKey(stack));
5454
tooltip.addLine((context, x, y, width, height, widgetTheme) -> {
5555
final int color = Color.GREY.darker(2);
56-
codechicken.lib.gui.GuiDraw.drawRect(x, y + 3, (int) TextRenderer.SHARED.getLastWidth(), 2, color);
56+
// TODO: do I need to access the text renderer like this?
57+
codechicken.lib.gui.GuiDraw.drawRect(x, y + 3, (int) TextRenderer.SHARED.getLastActualWidth(), 2,
58+
color);
5759
});
5860
}
5961

@@ -71,7 +73,7 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
7173
}
7274

7375
@Override
74-
public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
76+
public void draw(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
7577
WrappedFluidStack config = (WrappedFluidStack) getSyncHandler().getConfig(index);
7678
if (config != null) {
7779
GuiDraw.drawFluidTexture(config.getDefinition(), 1, 1, getArea().w() - 2, getArea().h() - 2, 0);

‎src/main/java/gregtech/api/mui/widget/appeng/fluid/AEFluidDisplaySlot.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.cleanroommc.modularui.drawable.GuiDraw;
1515
import com.cleanroommc.modularui.screen.RichTooltip;
1616
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
17-
import com.cleanroommc.modularui.theme.WidgetTheme;
17+
import com.cleanroommc.modularui.theme.WidgetThemeEntry;
1818
import com.cleanroommc.modularui.value.sync.SyncHandler;
1919
import org.jetbrains.annotations.NotNull;
2020
import org.jetbrains.annotations.Nullable;
@@ -48,7 +48,7 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
4848
}
4949

5050
@Override
51-
public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
51+
public void draw(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
5252
WrappedFluidStack stock = (WrappedFluidStack) getSyncHandler().getStock(index);
5353
if (stock != null) {
5454
GuiDraw.drawFluidTexture(stock.getDefinition(), 1, 1, getArea().w() - 2, getArea().h() - 2, 0);

‎src/main/java/gregtech/api/mui/widget/appeng/item/AEItemConfigSlot.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
import appeng.api.storage.data.IAEItemStack;
1414
import codechicken.lib.gui.GuiDraw;
1515
import com.cleanroommc.modularui.drawable.text.TextRenderer;
16-
import com.cleanroommc.modularui.integration.jei.JeiGhostIngredientSlot;
16+
import com.cleanroommc.modularui.integration.recipeviewer.RecipeViewerGhostIngredientSlot;
1717
import com.cleanroommc.modularui.screen.RichTooltip;
1818
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
19-
import com.cleanroommc.modularui.theme.WidgetTheme;
19+
import com.cleanroommc.modularui.theme.WidgetThemeEntry;
2020
import com.cleanroommc.modularui.utils.Color;
2121
import com.cleanroommc.modularui.value.sync.SyncHandler;
2222
import org.jetbrains.annotations.NotNull;
2323
import org.jetbrains.annotations.Nullable;
2424

2525
import java.util.function.BooleanSupplier;
2626

27-
public class AEItemConfigSlot extends AEConfigSlot<IAEItemStack> implements JeiGhostIngredientSlot<ItemStack> {
27+
public class AEItemConfigSlot extends AEConfigSlot<IAEItemStack> implements RecipeViewerGhostIngredientSlot<ItemStack> {
2828

2929
public AEItemConfigSlot(boolean isStocking, int index, @NotNull BooleanSupplier isAutoPull) {
3030
super(isStocking, index, isAutoPull);
@@ -34,7 +34,7 @@ public AEItemConfigSlot(boolean isStocking, int index, @NotNull BooleanSupplier
3434
@Override
3535
public void onInit() {
3636
super.onInit();
37-
getContext().getJeiSettings().addJeiGhostIngredientSlot(this);
37+
getContext().getRecipeViewerSettings().addGhostIngredientSlot(this);
3838
}
3939

4040
@Override
@@ -44,7 +44,8 @@ protected void buildTooltip(@NotNull RichTooltip tooltip) {
4444
tooltip.addFromItem(config.getDefinition());
4545
tooltip.addLine((context, x, y, width, height, widgetTheme) -> {
4646
final int color = Color.GREY.darker(2);
47-
GuiDraw.drawRect(x, y + 3, (int) TextRenderer.SHARED.getLastWidth(), 2, color);
47+
// TODO: do I need to access the text renderer like this?
48+
GuiDraw.drawRect(x, y + 3, (int) TextRenderer.SHARED.getLastActualWidth(), 2, color);
4849
});
4950
}
5051

@@ -62,10 +63,10 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
6263
}
6364

6465
@Override
65-
public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
66+
public void draw(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
6667
WrappedItemStack config = (WrappedItemStack) getSyncHandler().getConfig(index);
6768
if (config != null) {
68-
RenderUtil.renderItem(config.getDefinition(), 1, 1, 16f, 16f);
69+
RenderUtil.drawItemStack(config.getDefinition(), 1, 1, false);
6970
if (!isStocking) {
7071
RenderUtil.renderTextFixedCorner(TextFormattingUtil.formatLongToCompactString(config.getStackSize(), 4),
7172
17d, 18d, 0xFFFFFF, true, 0.5f);

‎src/main/java/gregtech/api/mui/widget/appeng/item/AEItemDisplaySlot.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import appeng.api.storage.data.IAEItemStack;
1212
import com.cleanroommc.modularui.screen.RichTooltip;
1313
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
14-
import com.cleanroommc.modularui.theme.WidgetTheme;
14+
import com.cleanroommc.modularui.theme.WidgetThemeEntry;
1515
import com.cleanroommc.modularui.value.sync.SyncHandler;
1616
import org.jetbrains.annotations.NotNull;
1717
import org.jetbrains.annotations.Nullable;
@@ -42,11 +42,11 @@ public boolean isValidSyncHandler(SyncHandler syncHandler) {
4242
}
4343

4444
@Override
45-
public void draw(ModularGuiContext context, WidgetTheme widgetTheme) {
45+
public void draw(ModularGuiContext context, WidgetThemeEntry<?> widgetTheme) {
4646
WrappedItemStack stock = (WrappedItemStack) getSyncHandler().getStock(index);
4747
if (stock != null) {
4848
ItemStack stack = stock.createItemStack();
49-
RenderUtil.renderItem(stack, 1, 1, 16f, 16f);
49+
RenderUtil.drawItemStack(stack, 1, 1, false);
5050
RenderUtil.renderTextFixedCorner(TextFormattingUtil.formatLongToCompactString(stock.getStackSize(), 4), 17d,
5151
18d, 0xFFFFFF, true, 0.5f);
5252
}

‎src/main/java/gregtech/api/mui/widget/appeng/item/AEItemStackPreviewWidget.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package gregtech.api.mui.widget.appeng.item;
22

33
import gregtech.api.mui.widget.appeng.AEStackPreviewWidget;
4+
import gregtech.client.utils.RenderUtil;
45
import gregtech.common.metatileentities.multi.multiblockpart.appeng.stack.WrappedItemStack;
56

67
import appeng.api.storage.data.IAEItemStack;
7-
import com.cleanroommc.modularui.drawable.GuiDraw;
88
import com.cleanroommc.modularui.screen.RichTooltip;
99
import org.jetbrains.annotations.NotNull;
1010
import org.jetbrains.annotations.Nullable;
@@ -27,7 +27,7 @@ protected void buildTooltip(@NotNull RichTooltip tooltip) {
2727
@Override
2828
public void draw(@Nullable IAEItemStack stackToDraw, int x, int y, int width, int height) {
2929
if (stackToDraw instanceof WrappedItemStack wrappedItemStack) {
30-
GuiDraw.drawItem(wrappedItemStack.getDefinition(), x, y, width, height);
30+
RenderUtil.drawItemStack(wrappedItemStack.getDefinition(), x, y, false);
3131
}
3232
}
3333

0 commit comments

Comments
 (0)