change ActiveWidget icons

Team-EnderIO · Nov 26, 2023 · 7966b95 · 7966b95
1 parent d1df19f
commit 7966b95
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/src/machines/java/com/enderio/machines/client/gui/screen/PaintingMachineScreen.java b/src/machines/java/com/enderio/machines/client/gui/screen/PaintingMachineScreen.java
@@ -17,7 +17,7 @@ public class PaintingMachineScreen extends MachineScreen<PaintingMachineMenu> {
     private static final ResourceLocation PAINTING_MACHINE_BG = EnderIO.loc("textures/gui/painting_machine.png");
 
     public PaintingMachineScreen(PaintingMachineMenu pMenu, Inventory pPlayerInventory, Component pTitle) {
-        super(pMenu, pPlayerInventory, pTitle, true);
+        super(pMenu, pPlayerInventory, pTitle);
         this.inventoryLabelY = this.imageHeight - 106;
     }
 

diff --git a/src/machines/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java b/src/machines/java/com/enderio/machines/client/gui/screen/VacuumChestScreen.java
@@ -30,8 +30,7 @@ protected void init() {
         addRenderableWidget(new EnumIconWidget<>(this, leftPos + imageWidth - 8 - 16, topPos + 105 , () -> menu.getBlockEntity().getRedstoneControl(),
             control -> menu.getBlockEntity().setRedstoneControl(control), EIOLang.REDSTONE_MODE));
 
-        // FIX
-        addRenderableWidget(new ToggleImageButton<>(this, leftPos + imageWidth - 8 - 16 * 2 -2, topPos + 105, 16, 16, 0, 0, 16, 0, RANGE_BUTTON_TEXTURE,
+        addRenderableWidget(new ToggleImageButton<>(this, leftPos + imageWidth - 8 - 16 * 2 - 2, topPos + 105, 16, 16, 0, 0, 16, 0, RANGE_BUTTON_TEXTURE,
             () -> menu.getBlockEntity().isRangeVisible(), state -> menu.getBlockEntity().setIsRangeVisible(state),
             () -> menu.getBlockEntity().isRangeVisible() ? EIOLang.HIDE_RANGE : EIOLang.SHOW_RANGE));
 

diff --git a/src/machines/java/com/enderio/machines/client/gui/widget/ActiveWidget.java b/src/machines/java/com/enderio/machines/client/gui/widget/ActiveWidget.java
@@ -1,15 +1,14 @@
 package com.enderio.machines.client.gui.widget;
 
 import com.enderio.EnderIO;
-import com.enderio.api.misc.Vector2i;
-import com.enderio.core.client.gui.screen.EIOScreen;
 import com.enderio.core.client.gui.widgets.EIOWidget;
 import com.enderio.machines.common.blockentity.MachineState;
 import com.enderio.machines.common.blockentity.MachineStateType;
 import com.enderio.machines.common.lang.MachineLang;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 
@@ -19,20 +18,19 @@
 import java.util.function.Supplier;
 
 public class ActiveWidget extends EIOWidget {
-    protected static final ResourceLocation WIDGETS = EnderIO.loc("textures/gui/40/widgetsv2.png");
+    protected static final ResourceLocation WIDGETS = EnderIO.loc("textures/gui/icons/machine_states.png");
 
-    private final EIOScreen<?> displayOn;
+    private final Screen displayOn;
     private final Supplier<Set<MachineState>> state;
 
-    public ActiveWidget(EIOScreen<?> displayOn, Supplier<Set<MachineState>> state, int x, int y) {
+    public ActiveWidget(Screen displayOn, Supplier<Set<MachineState>> state, int x, int y) {
         super(x, y, 16, 16);
         this.displayOn = displayOn;
         this.state = state;
     }
 
     @Override
     protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
-        displayOn.renderSimpleArea(guiGraphics, new Vector2i(getX(), getY()), new Vector2i(getX() + getWidth(), getY() + getHeight()));
         RenderSystem.defaultBlendFunc();
         RenderSystem.enableDepthTest();
         MachineState prio = null;
@@ -41,7 +39,7 @@ protected void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, flo
                 prio = machineState;
             }
         }
-        guiGraphics.blit(WIDGETS, x, y, 0, prio == null ? 16 : prio.type().getPriority()*16, 28*16, width, height, 256, 256);
+        guiGraphics.blit(WIDGETS, x, y, 0, prio == null ? 16 : prio.type().getPriority() * 16, 0, width, height, 64, 16);
 
         RenderSystem.disableDepthTest();
         renderToolTip(guiGraphics, mouseX, mouseY);

diff --git a/src/main/resources/assets/enderio/textures/gui/icons/machine_states.png b/src/main/resources/assets/enderio/textures/gui/icons/machine_states.png