Skip to content

Commit 580dba0

Browse files
isXanderisXander
committed
minor cleanup
1 parent 12ba40e commit 580dba0

15 files changed

Lines changed: 51 additions & 59 deletions

‎src/main/java/dev/isxander/yacl3/gui/AbstractWidget.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
import net.minecraft.client.gui.components.events.GuiEventListener;
1111
import net.minecraft.client.gui.narration.NarratableEntry;
1212
import net.minecraft.client.gui.narration.NarrationElementOutput;
13-
import net.minecraft.client.input.CharacterEvent;
14-
import net.minecraft.client.input.KeyEvent;
15-
import net.minecraft.client.input.MouseButtonEvent;
1613
import net.minecraft.client.renderer.RenderPipelines;
1714
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
1815
import net.minecraft.sounds.SoundEvents;
@@ -88,13 +85,6 @@ protected void drawButtonRect(GuiGraphicsExtractor graphics, int x1, int y1, int
8885
);
8986
}
9087

91-
protected void drawOutline(GuiGraphicsExtractor graphics, int x1, int y1, int x2, int y2, int width, int color) {
92-
graphics.fill(x1, y1, x2, y1 + width, color);
93-
graphics.fill(x2, y1, x2 - width, y2, color);
94-
graphics.fill(x1, y2, x2, y2 - width, color);
95-
graphics.fill(x1, y1, x1 + width, y2, color);
96-
}
97-
9888
protected void drawRainbowGradient(GuiGraphicsExtractor graphics, int x1, int y1, int x2, int y2) {
9989
//Draws a rainbow gradient, left to right
10090
int[] colors = new int[] {0xFFFF0000, 0xFFFFFF00, 0xFF00FF00, 0xFF00FFFF, 0xFF0000FF, 0xFFFF00FF, 0xFFFF0000}; //all the colors in the gradient

‎src/main/java/dev/isxander/yacl3/gui/OptionListWidget.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ public EmptyListLabel(ListGroupSeparatorEntry parent, ConfigCategory category) {
619619
}
620620

621621
@Override
622-
public void extractContent(GuiGraphicsExtractor graphics, int mouseX, int mouseY, boolean hovered, float deltaTicks) {
622+
public void extractContent(GuiGraphicsExtractor graphics, int mouseX, int mouseY, boolean hovered, float a) {
623623
if (!this.isViewable()) {
624624
return;
625625
}

‎src/main/java/dev/isxander/yacl3/gui/controllers/ActionController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public void executeAction() {
8585
}
8686

8787
@Override
88-
protected void drawValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
89-
super.drawValueText(graphics, mouseX, mouseY, delta);
88+
protected void extractValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
89+
super.extractValueText(graphics, mouseX, mouseY, a);
9090

9191
if (hovered) {
9292
graphics.requestCursor(isAvailable() ? CursorTypes.POINTING_HAND : CursorTypes.NOT_ALLOWED);

‎src/main/java/dev/isxander/yacl3/gui/controllers/BooleanController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ public BooleanControllerElement(BooleanController control, YACLScreen screen, Di
119119
}
120120

121121
@Override
122-
protected void drawHoveredControl(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
122+
protected void extractHoveredControl(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
123123

124124
}
125125

126126
@Override
127-
protected void drawValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
128-
super.drawValueText(graphics, mouseX, mouseY, delta);
127+
protected void extractValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
128+
super.extractValueText(graphics, mouseX, mouseY, a);
129129

130130
if (hovered) {
131131
graphics.requestCursor(isAvailable() ? CursorTypes.POINTING_HAND : CursorTypes.NOT_ALLOWED);

‎src/main/java/dev/isxander/yacl3/gui/controllers/ColorController.java‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ public ColorControllerElement(ColorController control, YACLScreen screen, Dimens
114114
}
115115

116116
@Override
117-
protected void drawValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
117+
protected void extractValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
118118
hovered = isMouseOver(mouseX, mouseY);
119119

120120
if (isHovered()) {
121121
colorPreviewDim.move(-inputFieldBounds.width() - 8, -2);
122122
colorPreviewDim.expand(4, 4);
123123
previewOutlineFadeTicks++;
124-
super.drawValueText(graphics, mouseX, mouseY, delta);
124+
super.extractValueText(graphics, mouseX, mouseY, a);
125125
}
126126

127127
int previewColor = colorController.option().pendingValue().getRGB();
@@ -138,8 +138,13 @@ protected void drawValueText(GuiGraphicsExtractor graphics, int mouseX, int mous
138138
}
139139
graphics.fill(colorPreviewDim.x(), colorPreviewDim.y(), colorPreviewDim.xLimit(), colorPreviewDim.yLimit(), previewColor);
140140
boolean isMouseOverColorPreview = isMouseOverColorPreview(mouseX, mouseY);
141-
Color outlineColor = getPreviewOutlineColor(hoveredOverColorPreview || isMouseOverColorPreview);
142-
drawOutline(graphics, colorPreviewDim.x(), colorPreviewDim.y(), colorPreviewDim.xLimit(), colorPreviewDim.yLimit(), 1, outlineColor.getRGB());
141+
graphics.outline(
142+
colorPreviewDim.x(),
143+
colorPreviewDim.y(),
144+
colorPreviewDim.width(),
145+
colorPreviewDim.height(),
146+
getPreviewOutlineColor(hoveredOverColorPreview || isMouseOverColorPreview).getRGB()
147+
);
143148

144149
if (isMouseOverColorPreview) {
145150
graphics.requestCursor(isAvailable() ? CursorTypes.POINTING_HAND : CursorTypes.NOT_ALLOWED);

‎src/main/java/dev/isxander/yacl3/gui/controllers/ControllerWidget.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public ControllerWidget(T control, YACLScreen screen, Dimension<Integer> dim) {
3737
}
3838

3939
@Override
40-
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
40+
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
4141
hovered = isMouseOver(mouseX, mouseY);
4242

4343
Component name = control.option().changed() ? modifiedOptionName : control.option().name();
@@ -47,17 +47,17 @@ public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mo
4747
graphics.text(textRenderer, shortenedName, getDimension().x() + getXPadding(), getTextY(), getValueColor(), true);
4848

4949

50-
drawValueText(graphics, mouseX, mouseY, delta);
50+
extractValueText(graphics, mouseX, mouseY, a);
5151
if (isHovered()) {
52-
drawHoveredControl(graphics, mouseX, mouseY, delta);
52+
extractHoveredControl(graphics, mouseX, mouseY, a);
5353
}
5454
}
5555

56-
protected void drawHoveredControl(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
56+
protected void extractHoveredControl(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
5757

5858
}
5959

60-
protected void drawValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
60+
protected void extractValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
6161
Component valueText = getValueText();
6262
graphics.text(textRenderer, valueText, getDimension().xLimit() - textRenderer.width(valueText) - getXPadding(), getTextY(), getValueColor(), true);
6363
}

‎src/main/java/dev/isxander/yacl3/gui/controllers/LabelController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public LabelControllerElement(YACLScreen screen, Dimension<Integer> dim) {
6969
}
7070

7171
@Override
72-
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
72+
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
7373
updateText();
7474

7575
int y = getDimension().y();

‎src/main/java/dev/isxander/yacl3/gui/controllers/TickBoxController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public TickBoxControllerElement(TickBoxController control, YACLScreen screen, Di
5555
}
5656

5757
@Override
58-
protected void drawValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
58+
protected void extractValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
5959
int outlineSize = 10;
6060
int outlineX1 = getDimension().xLimit() - getXPadding() - outlineSize;
6161
int outlineY1 = getDimension().centerY() - outlineSize / 2;
@@ -65,8 +65,8 @@ protected void drawValueText(GuiGraphicsExtractor graphics, int mouseX, int mous
6565
int color = getValueColor();
6666
int shadowColor = multiplyColor(color, 0.25f);
6767

68-
drawOutline(graphics, outlineX1 + 1, outlineY1 + 1, outlineX2 + 1, outlineY2 + 1, 1, shadowColor);
69-
drawOutline(graphics, outlineX1, outlineY1, outlineX2, outlineY2, 1, color);
68+
graphics.outline(outlineX1 + 1, outlineY1 + 1, outlineX2 + 1 - (outlineX1 + 1), outlineY2 + 1 - (outlineY1 + 1), shadowColor);
69+
graphics.outline(outlineX1, outlineY1, outlineX2 - outlineX1, outlineY2 - outlineY1, color);
7070
if (control.option().pendingValue()) {
7171
graphics.fill(outlineX1 + 3, outlineY1 + 3, outlineX2 - 1, outlineY2 - 1, shadowColor);
7272
graphics.fill(outlineX1 + 2, outlineY1 + 2, outlineX2 - 2, outlineY2 - 2, color);

‎src/main/java/dev/isxander/yacl3/gui/controllers/cycling/CyclingControllerElement.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import dev.isxander.yacl3.api.utils.Dimension;
66
import dev.isxander.yacl3.gui.YACLScreen;
77
import dev.isxander.yacl3.gui.controllers.ControllerWidget;
8-
import dev.isxander.yacl3.gui.utils.KeyUtils;
98
import net.minecraft.client.gui.GuiGraphicsExtractor;
109
import net.minecraft.client.input.KeyEvent;
1110
import net.minecraft.client.input.MouseButtonEvent;
@@ -18,8 +17,8 @@ public CyclingControllerElement(ICyclingController<?> control, YACLScreen screen
1817
}
1918

2019
@Override
21-
protected void drawValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
22-
super.drawValueText(graphics, mouseX, mouseY, delta);
20+
protected void extractValueText(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
21+
super.extractValueText(graphics, mouseX, mouseY, a);
2322

2423
if (this.hovered) {
2524
graphics.requestCursor(isAvailable() ? CursorTypes.POINTING_HAND : CursorTypes.NOT_ALLOWED);

‎src/main/java/dev/isxander/yacl3/gui/controllers/dropdown/AbstractDropdownControllerElement.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55
import dev.isxander.yacl3.gui.YACLScreen;
66
import dev.isxander.yacl3.gui.controllers.string.StringControllerElement;
77
import dev.isxander.yacl3.gui.utils.GuiUtils;
8-
import dev.isxander.yacl3.gui.utils.KeyUtils;
98
import net.minecraft.ChatFormatting;
109
import net.minecraft.client.gui.GuiGraphicsExtractor;
11-
import net.minecraft.client.gui.screens.Screen;
1210
import net.minecraft.client.input.CharacterEvent;
1311
import net.minecraft.client.input.KeyEvent;
1412
import net.minecraft.client.input.MouseButtonEvent;
@@ -144,16 +142,16 @@ public boolean matchingValue(String value) {
144142
}
145143

146144
@Override
147-
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float delta) {
145+
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float a) {
148146
if (matchingValues == null) matchingValues = computeMatchingValues();
149147

150-
super.extractRenderState(graphics, mouseX, mouseY, delta);
148+
super.extractRenderState(graphics, mouseX, mouseY, a);
151149
}
152150

153-
void renderDropdownEntry(GuiGraphicsExtractor graphics, Dimension<Integer> entryDimension, int index) {
154-
renderDropdownEntry(graphics, entryDimension, matchingValues.get(index));
151+
void extractDropdownEntry(GuiGraphicsExtractor graphics, Dimension<Integer> entryDimension, int index) {
152+
extractDropdownEntry(graphics, entryDimension, matchingValues.get(index));
155153
}
156-
protected void renderDropdownEntry(GuiGraphicsExtractor graphics, Dimension<Integer> entryDimension, U value) {
154+
protected void extractDropdownEntry(GuiGraphicsExtractor graphics, Dimension<Integer> entryDimension, U value) {
157155
String entry = getString(value);
158156
Component text;
159157
if (entry.isBlank()) {

0 commit comments

Comments
 (0)