wind-explorer/effortless-building
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'port/1.20' into 1.20-alternative

Browse Source
This commit is contained in:
Christian Knaapen
2023-11-18 20:57:39 +01:00
parent 1607aa35ce b75cfc45d8
commit 0d6613c3ba
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java
View File

@@ -14,6 +14,7 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget; import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
import nl.requios.effortlessbuilding.create.foundation.utility.Components; import nl.requios.effortlessbuilding.create.foundation.utility.Components;
import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreenList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -156,6 +157,11 @@ public abstract class AbstractSimiScreen extends Screen {
int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY(); int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY();
graphics.renderComponentTooltip(font, tooltip, ttx, tty); graphics.renderComponentTooltip(font, tooltip, ttx, tty);
} }
//Added
if (widget instanceof ModifiersScreenList list) {
list.renderWindowForeground(graphics, mouseX, mouseY, partialTicks);
}
} }
} }

5
src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java
View File

@@ -118,6 +118,8 @@ public class ScrollInput extends AbstractSimiWidget {
@Override @Override
public boolean mouseScrolled(double mouseX, double mouseY, double delta) { public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
if (!this.visible || !this.isHovered) return false; //Added
if (inverted) if (inverted)
delta *= -1; delta *= -1;
@@ -147,7 +149,8 @@ public class ScrollInput extends AbstractSimiWidget {
onChanged(); onChanged();
} }
return priorState != state; // return priorState != state;
return true; //Changed
} }
protected void clampState() { protected void clampState() {

4
src/main/java/nl/requios/effortlessbuilding/gui/elements/LabeledScrollInput.java
View File

@@ -31,8 +31,8 @@ public class LabeledScrollInput extends ScrollInput {
//TODO: Check if this works //TODO: Check if this works
@Override @Override
public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { public void doRender(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) {
super.render(guiGraphics, mouseX, mouseY, partialTicks); super.doRender(guiGraphics, mouseX, mouseY, partialTicks);
label.setX(getX() + width / 2 - Minecraft.getInstance().font.width(label.text) / 2); label.setX(getX() + width / 2 - Minecraft.getInstance().font.width(label.text) / 2);
label.setY(getY() + height / 2 - Minecraft.getInstance().font.lineHeight / 2); label.setY(getY() + height / 2 - Minecraft.getInstance().font.lineHeight / 2);