GregTechCEu
diff --git a/‎src/main/java/gregtech/api/block/machines/BlockMachine.java‎
Lines changed: 0 additions & 1 deletion b/‎src/main/java/gregtech/api/block/machines/BlockMachine.java‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/main/java/gregtech/api/cover/ICoverable.java‎
Lines changed: 4 additions & 0 deletions b/‎src/main/java/gregtech/api/cover/ICoverable.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/main/java/gregtech/api/gui/GuiTextures.java‎
Lines changed: 6 additions & 0 deletions b/‎src/main/java/gregtech/api/gui/GuiTextures.java‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/main/java/gregtech/api/gui/Widget.java‎
Lines changed: 9 additions & 9 deletions b/‎src/main/java/gregtech/api/gui/Widget.java‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎src/main/java/gregtech/api/gui/impl/FakeModularGui.java‎
Lines changed: 123 additions & 0 deletions b/‎src/main/java/gregtech/api/gui/impl/FakeModularGui.java‎
Lines changed: 123 additions & 0 deletions
diff --git a/‎src/main/java/gregtech/api/gui/widgets/ImageCycleButtonWidget.java‎
Lines changed: 149 additions & 0 deletions b/‎src/main/java/gregtech/api/gui/widgets/ImageCycleButtonWidget.java‎
Lines changed: 149 additions & 0 deletions
@@ -84,7 +84,6 @@ public BlockMachine() {
         setHardness(6.0f);
         setResistance(6.0f);
         setTranslationKey("unnamed");
-        setHarvestLevel("wrench", 1);
         setDefaultState(getDefaultState().withProperty(OPAQUE, true));
     }
 
 
@@ -198,4 +198,8 @@ static Cuboid6 getCoverPlateBox(EnumFacing side, double plateThickness) {
                 throw new UnsupportedOperationException();
         }
     }
+
+    public default boolean canRenderMachineGrid() {
+        return true;
+    }
 }
@@ -15,13 +15,15 @@ public class GuiTextures {
     public static final TextureArea BORDERED_BACKGROUND = AdoptableTextureArea.fullImage("textures/gui/base/bordered_background.png", 195, 136, 4, 4);
     public static final TextureArea BOXED_BACKGROUND = AdoptableTextureArea.fullImage("textures/gui/base/boxed_background.png", 256, 174, 11, 11);
 
+    public static final TextureArea BLANK = AdoptableTextureArea.fullImage("textures/gui/base/blank.png", 1, 1, 0, 0);
     public static final TextureArea DISPLAY = TextureArea.fullImage("textures/gui/base/display.png");
     public static final TextureArea FLUID_SLOT = AdoptableTextureArea.fullImage("textures/gui/base/fluid_slot.png", 18, 18, 1, 1);
     public static final TextureArea FLUID_TANK_BACKGROUND = TextureArea.fullImage("textures/gui/base/fluid_tank_background.png");
     public static final TextureArea FLUID_TANK_OVERLAY = TextureArea.fullImage("textures/gui/base/fluid_tank_overlay.png");
     public static final TextureArea SLOT = AdoptableTextureArea.fullImage("textures/gui/base/slot.png", 18, 18, 1, 1);
     public static final TextureArea SLOT_DARKENED = TextureArea.fullImage("textures/gui/base/darkened_slot.png");
 
+
     //FLUID & ITEM OUTPUT BUTTONS
     public static final TextureArea BLOCKS_INPUT = TextureArea.fullImage("textures/gui/widget/button_blocks_input.png");
     public static final TextureArea BUTTON = TextureArea.fullImage("textures/gui/widget/button.png");
@@ -32,8 +34,12 @@ public class GuiTextures {
     public static final TextureArea BUTTON_FILTER_NBT = TextureArea.fullImage("textures/gui/widget/button_filter_nbt.png");
     public static final TextureArea BUTTON_FLUID_OUTPUT = TextureArea.fullImage("textures/gui/widget/button_fluid_output.png");
     public static final TextureArea BUTTON_ITEM_OUTPUT = TextureArea.fullImage("textures/gui/widget/button_item_output.png");
+    public static final TextureArea BUTTON_LEFT = TextureArea.fullImage("textures/gui/widget/left.png");
     public static final TextureArea BUTTON_OVERCLOCK = TextureArea.fullImage("textures/gui/widget/button_overclock.png");
+    public static final TextureArea BUTTON_RIGHT = TextureArea.fullImage("textures/gui/widget/right.png");
     public static final TextureArea BUTTON_SWITCH_VIEW = TextureArea.fullImage("textures/gui/widget/button_switch_view.png");
+    public static final TextureArea CLIPBOARD_BUTTON = TextureArea.fullImage("textures/gui/widget/clipboard_button.png");
+    public static final SizedTextureArea CLIPBOARD_TEXT_BOX = AdoptableTextureArea.fullImage("textures/gui/widget/clipboard_text_box.png", 9, 18, 1, 1);
     public static final TextureArea DISTRIBUTION_MODE = TextureArea.fullImage("textures/gui/widget/button_distribution_mode.png");
     public static final TextureArea LOCK = TextureArea.fullImage("textures/gui/widget/lock.png");
     public static final TextureArea SWITCH = TextureArea.fullImage("textures/gui/widget/switch.png");
 
@@ -275,23 +275,23 @@ protected void writeClientAction(int id, Consumer<PacketBuffer> packetBufferWrit
     }
 
     @SideOnly(Side.CLIENT)
-    protected void drawBorder(int x, int y, int width, int height, int stroke, int stroke_width) {
+    public void drawBorder(int x, int y, int width, int height, int stroke, int stroke_width) {
         drawGradientRect(x - stroke_width, y - stroke_width, width + 2 * stroke_width, stroke_width, stroke, stroke);
         drawGradientRect(x - stroke_width, y + height, width + 2 * stroke_width, stroke_width, stroke, stroke);
         drawGradientRect(x - stroke_width, y - stroke_width, stroke_width, height + 2 * stroke_width, stroke, stroke);
         drawGradientRect(x + width, y - stroke_width, stroke_width, height + 2 * stroke_width, stroke, stroke);
     }
 
     @SideOnly(Side.CLIENT)
-    protected void drawHoveringText(ItemStack itemStack, List<String> tooltip, int maxTextWidth, int mouseX, int mouseY) {
+    public void drawHoveringText(ItemStack itemStack, List<String> tooltip, int maxTextWidth, int mouseX, int mouseY) {
         Minecraft mc = Minecraft.getMinecraft();
         GuiUtils.drawHoveringText(itemStack, tooltip, mouseX, mouseY,
                 sizes.getScreenWidth(),
                 sizes.getScreenHeight(), maxTextWidth, mc.fontRenderer);
     }
 
     @SideOnly(Side.CLIENT)
-    protected void drawStringSized(String text, double x, double y, int color, boolean dropShadow, float scale, boolean center) {
+    public void drawStringSized(String text, double x, double y, int color, boolean dropShadow, float scale, boolean center) {
         GlStateManager.pushMatrix();
         FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
         double scaledTextWidth = center ? fontRenderer.getStringWidth(text) * scale : 0.0;
@@ -302,15 +302,15 @@ protected void drawStringSized(String text, double x, double y, int color, boole
     }
 
     @SideOnly(Side.CLIENT)
-    protected void drawStringFixedCorner(String text, double x, double y, int color, boolean dropShadow, float scale) {
+    public void drawStringFixedCorner(String text, double x, double y, int color, boolean dropShadow, float scale) {
         FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
         double scaledWidth = fontRenderer.getStringWidth(text) * scale;
         double scaledHeight = fontRenderer.FONT_HEIGHT * scale;
         drawStringSized(text, x - scaledWidth, y - scaledHeight, color, dropShadow, scale, false);
     }
 
     @SideOnly(Side.CLIENT)
-    protected static void drawItemStack(ItemStack itemStack, int x, int y, @Nullable String altTxt) {
+    public static void drawItemStack(ItemStack itemStack, int x, int y, @Nullable String altTxt) {
         GlStateManager.pushMatrix();
         GlStateManager.translate(0.0F, 0.0F, 32.0F);
         GlStateManager.color(1F, 1F, 1F, 1F);
@@ -331,7 +331,7 @@ protected static void drawItemStack(ItemStack itemStack, int x, int y, @Nullable
     }
 
     @SideOnly(Side.CLIENT)
-    protected static List<String> getItemToolTip(ItemStack itemStack) {
+    public static List<String> getItemToolTip(ItemStack itemStack) {
         Minecraft mc = Minecraft.getMinecraft();
         ITooltipFlag flag = mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL;
         List<String> tooltip = itemStack.getTooltip(mc.player, flag);
@@ -346,7 +346,7 @@ protected static List<String> getItemToolTip(ItemStack itemStack) {
     }
 
     @SideOnly(Side.CLIENT)
-    protected static void drawSelectionOverlay(int x, int y, int width, int height) {
+    public static void drawSelectionOverlay(int x, int y, int width, int height) {
         GlStateManager.disableDepth();
         GlStateManager.colorMask(true, true, true, false);
         drawGradientRect(x, y, width, height, -2130706433, -2130706433);
@@ -356,14 +356,14 @@ protected static void drawSelectionOverlay(int x, int y, int width, int height)
     }
 
     @SideOnly(Side.CLIENT)
-    protected static void drawSolidRect(int x, int y, int width, int height, int color) {
+    public static void drawSolidRect(int x, int y, int width, int height, int color) {
         Gui.drawRect(x, y, x + width, y + height, color);
         GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
         GlStateManager.enableBlend();
     }
 
     @SideOnly(Side.CLIENT)
-    protected static void drawGradientRect(int x, int y, int width, int height, int startColor, int endColor) {
+    public static void drawGradientRect(int x, int y, int width, int height, int startColor, int endColor) {
         drawGradientRect(x, y, width, height, startColor, endColor, false);
     }
 
 
@@ -0,0 +1,123 @@
+package gregtech.api.gui.impl;
+
+import gregtech.api.gui.IRenderContext;
+import gregtech.api.gui.ModularUI;
+import gregtech.api.gui.Widget;
+import gregtech.api.util.RenderUtil;
+import gregtech.common.gui.impl.FakeModularUIContainerClipboard;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.fml.client.config.GuiUtils;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import java.util.List;
+import java.util.Optional;
+
+import static gregtech.api.gui.impl.ModularUIGui.*;
+
+@SideOnly(Side.CLIENT)
+public class FakeModularGui implements IRenderContext {
+    public final ModularUI modularUI;
+    public FakeModularUIContainerClipboard container;
+    protected Minecraft mc;
+    protected FontRenderer fr;
+
+    public FakeModularGui(ModularUI modularUI, FakeModularUIContainerClipboard fakeModularUIContainer){
+        this.modularUI = modularUI;
+        this.container = fakeModularUIContainer;
+        this.modularUI.updateScreenSize(this.modularUI.getWidth(), this.modularUI.getHeight());
+        this.mc = Minecraft.getMinecraft();
+        this.fr = mc.fontRenderer;
+    }
+
+    public void updateScreen() {
+        modularUI.guiWidgets.values().forEach(Widget::updateScreen);
+    }
+
+    public void handleWidgetUpdate(int windowId, int widgetId, PacketBuffer updateData) {
+        if (windowId == container.windowId) {
+            Widget widget = modularUI.guiWidgets.get(Optional.of(widgetId));
+            int updateId = updateData.readVarInt();
+            if (widget != null) {
+                widget.readUpdateInfo(updateId, updateData);
+            }
+        }
+    }
+
+    public void drawScreen(double x, double y, float partialTicks) {
+        float halfW = modularUI.getWidth() / 2f;
+        float halfH = modularUI.getHeight() / 2f;
+        float scale = 0.5f / Math.max(halfW, halfH);
+        int mouseX = (int) ((x / scale) + (halfW > halfH? 0: (halfW - halfH)));
+        int mouseY = (int) ((y / scale) + (halfH > halfW? 0: (halfH - halfW)));
+
+        GlStateManager.translate(-scale * halfW, -scale * halfH, 0.01);
+        GlStateManager.scale(scale, scale, 1);
+        GlStateManager.depthMask(false);
+
+        drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY);
+
+        GlStateManager.scale(1, 1, 0);
+        drawGuiContainerForegroundLayer(mouseX, mouseY);
+
+        for (int i = 0; i < this.container.inventorySlots.size(); ++i) {
+            Slot slot = this.container.inventorySlots.get(i);
+            if (!slot.getStack().isEmpty() && slot.xPos < mouseX && mouseX < slot.xPos + 18 && slot.yPos < mouseY && mouseY < slot.yPos + 18) {
+                Widget.drawSolidRect(slot.xPos, slot.yPos, 18, 18, 0X8fffffff);
+                renderToolTip(slot.getStack(), slot.xPos, slot.yPos);
+            }
+        }
+
+        GlStateManager.depthMask(true);
+        GlStateManager.color(1.0f, 1.0f, 1.0f);
+        GlStateManager.disableLighting();
+    }
+
+    protected void renderToolTip(ItemStack stack, int x, int y) {
+        FontRenderer font = stack.getItem().getFontRenderer(stack);
+        GuiUtils.preItemToolTip(stack);
+        GuiUtils.drawHoveringText(this.getItemToolTip(stack), x, y, modularUI.getScreenWidth(), modularUI.getScreenHeight(), -1, (font == null ? fr : font));
+        net.minecraftforge.fml.client.config.GuiUtils.postItemToolTip();
+    }
+
+    protected List<String> getItemToolTip(ItemStack itemStack) {
+        List<String> list = itemStack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL);
+        list.set(0, itemStack.getItem().getForgeRarity(itemStack).getColor() + list.get(0));
+        for (int i = 1; i < list.size(); ++i) {
+            list.set(i, TextFormatting.GRAY + list.get(i));
+        }
+        return list;
+    }
+
+    public void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
+        GlStateManager.color(rColorForOverlay, gColorForOverlay, bColorForOverlay, 1.0F);
+        modularUI.backgroundPath.draw(0, 0, modularUI.getWidth(), modularUI.getHeight());
+        for (Widget widget : modularUI.guiWidgets.values()) {
+            GlStateManager.pushMatrix();
+            GlStateManager.color(1.0f, 1.0f, 1.0f);
+            GlStateManager.enableBlend();
+            widget.drawInBackground(mouseX, mouseY, this);
+            GlStateManager.popMatrix();
+        }
+    }
+
+    public void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
+        for (Widget widget : modularUI.guiWidgets.values()) {
+            GlStateManager.pushMatrix();
+            GlStateManager.color(1.0f, 1.0f, 1.0f);
+            widget.drawInForeground(mouseX, mouseY);
+            GlStateManager.popMatrix();
+        }
+    }
+
+    public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) {
+        return modularUI.guiWidgets.values().stream().anyMatch(widget -> widget.mouseClicked(mouseX, mouseY, mouseButton));
+    }
+}
@@ -0,0 +1,149 @@
+package gregtech.api.gui.widgets;
+
+import gregtech.api.gui.GuiTextures;
+import gregtech.api.gui.IRenderContext;
+import gregtech.api.gui.Widget;
+import gregtech.api.gui.resources.SizedTextureArea;
+import gregtech.api.gui.resources.TextureArea;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.Position;
+import gregtech.api.util.Size;
+import gregtech.api.util.function.BooleanConsumer;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.item.ItemStack;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.IStringSerializable;
+import net.minecraft.util.math.MathHelper;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.*;
+
+public class ImageCycleButtonWidget extends Widget {
+
+    protected TextureArea buttonTexture;
+    private int textColor = 0xFFFFFF;
+    private IntSupplier currentOptionSupplier;
+    private IntConsumer setOptionExecutor;
+    private int optionCount;
+    private final int RIGHT_MOUSE = 1;
+    protected int currentOption;
+    protected String tooltipHoverString;
+    protected long hoverStartTime = -1L;
+    protected boolean isMouseHovered;
+
+    public ImageCycleButtonWidget(int xPosition, int yPosition, int width, int height, TextureArea buttonTexture, int optionCount, IntSupplier currentOptionSupplier, IntConsumer setOptionExecutor) {
+        super(new Position(xPosition, yPosition), new Size(width, height));
+        this.buttonTexture = buttonTexture;
+        this.currentOptionSupplier = currentOptionSupplier;
+        this.setOptionExecutor = setOptionExecutor;
+        this.optionCount = optionCount;
+    }
+
+
+    public ImageCycleButtonWidget(int xPosition, int yPosition, int width, int height, TextureArea buttonTexture, int optionCount, BooleanSupplier supplier, BooleanConsumer updater) {
+        super(new Position(xPosition, yPosition), new Size(width, height));
+        this.buttonTexture = buttonTexture;
+        this.currentOptionSupplier = () -> supplier.getAsBoolean() ? 1 : 0;
+        this.setOptionExecutor = (value) -> updater.apply(value >= 1);
+        this.optionCount = optionCount;
+    }
+
+    public ImageCycleButtonWidget setTooltipHoverString(String hoverString) {
+        this.tooltipHoverString = hoverString;
+        return this;
+    }
+
+    public ImageCycleButtonWidget setButtonTexture(TextureArea texture) {
+        this.buttonTexture = texture;
+        return this;
+    }
+
+    public ImageCycleButtonWidget setTextColor(int textColor) {
+        this.textColor = textColor;
+        return this;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void drawInBackground(int mouseX, int mouseY, IRenderContext context) {
+        Position pos = getPosition();
+        Size size = getSize();
+        if (buttonTexture instanceof SizedTextureArea) {
+            ((SizedTextureArea) buttonTexture).drawHorizontalCutSubArea(pos.x, pos.y, size.width, size.height, (float)currentOption / optionCount, (float)1 / optionCount);
+        } else {
+            buttonTexture.drawSubArea(pos.x, pos.y, size.width, size.height, 0.0, (float)currentOption / optionCount, 1.0, (float)1 / optionCount);
+        }
+    }
+
+    @Override
+    public void drawInForeground(int mouseX, int mouseY) {
+        boolean isHovered = isMouseOverElement(mouseX, mouseY);
+        boolean wasHovered = isMouseHovered;
+        if (isHovered && !wasHovered) {
+            this.isMouseHovered = true;
+            this.hoverStartTime = System.currentTimeMillis();
+        } else if (!isHovered && wasHovered) {
+            this.isMouseHovered = false;
+            this.hoverStartTime = 0L;
+        } else if (isHovered) {
+            long timeSinceHover = System.currentTimeMillis() - hoverStartTime;
+            if (timeSinceHover > 1000L && tooltipHoverString != null) {
+                List<String> hoverList = Arrays.asList(I18n.format(tooltipHoverString).split("/n"));
+                drawHoveringText(ItemStack.EMPTY, hoverList, 300, mouseX, mouseY);
+            }
+        }
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if (currentOptionSupplier.getAsInt() != currentOption) {
+            this.currentOption = currentOptionSupplier.getAsInt();
+            writeUpdateInfo(1, buf -> buf.writeVarInt(currentOption));
+        }
+    }
+
+    @Override
+    public void readUpdateInfo(int id, PacketBuffer buffer) {
+        super.readUpdateInfo(id, buffer);
+        if (id == 1) {
+            this.currentOption = buffer.readVarInt();
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public boolean mouseClicked(int mouseX, int mouseY, int button) {
+        super.mouseClicked(mouseX, mouseY, button);
+        if (isMouseOverElement(mouseX, mouseY)) {
+            //Allow only the RMB to reverse cycle
+            if(button == RIGHT_MOUSE) {
+                //Wrap from the first option to the last if needed
+                this.currentOption = currentOption == 0 ? optionCount - 1 : currentOption - 1;
+            } else {
+                this.currentOption = (currentOption + 1) % optionCount;
+            }
+            writeClientAction(1, buf -> buf.writeVarInt(currentOption));
+            playButtonClickSound();
+            return true;
+        }
+        return false;
+    }
+
+
+    @Override
+    public void handleClientAction(int id, PacketBuffer buffer) {
+        super.handleClientAction(id, buffer);
+        if (id == 1) {
+            this.currentOption = MathHelper.clamp(buffer.readVarInt(), 0, optionCount);
+            setOptionExecutor.accept(currentOption);
+        }
+    }
+
+}
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ public BlockMachine() {`
`84`	`84`	`setHardness(6.0f);`
`85`	`85`	`setResistance(6.0f);`
`86`	`86`	`setTranslationKey("unnamed");`
`87`		`- setHarvestLevel("wrench", 1);`
`88`	`87`	`setDefaultState(getDefaultState().withProperty(OPAQUE, true));`
`89`	`88`	`}`
`90`	`89`
Original file line number	Diff line number	Diff line change
`@@ -198,4 +198,8 @@ static Cuboid6 getCoverPlateBox(EnumFacing side, double plateThickness) {`
`198`	`198`	`throw new UnsupportedOperationException();`
`199`	`199`	`}`
`200`	`200`	`}`
	`201`	`+`
	`202`	`+ public default boolean canRenderMachineGrid() {`
	`203`	`+ return true;`
	`204`	`+ }`
`201`	`205`	`}`