Skip to content

Commit beafb76

Browse files
committed
Fix config screen
1 parent b56a1e8 commit beafb76

File tree

7 files changed

+9
-24
lines changed

7 files changed

+9
-24
lines changed

api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/Widget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static Point translateMouse(double x, double y) {
7676

7777
public static Point translateMouse(Matrix3x2f pose) {
7878
Point mouse = mouse();
79-
Vector3f mouseVec = new Vector3f(mouse.x, mouse.y, 0);
79+
Vector3f mouseVec = new Vector3f(mouse.x, mouse.y, 1);
8080
pose.transform(mouseVec);
8181
return pushMouse(new Point(mouseVec.x(), mouseVec.y()));
8282
}

api/src/main/java/me/shedaniel/rei/api/client/util/MatrixUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public static Matrix3x2f inverse(Matrix3x2f matrix) {
6767
}
6868

6969
public static Rectangle transform(Matrix3x2f matrix, Rectangle rectangle) {
70-
Vector3f vec1 = new Vector3f((float) rectangle.x, (float) rectangle.y, 0);
70+
Vector3f vec1 = new Vector3f((float) rectangle.x, (float) rectangle.y, 1);
7171
matrix.transform(vec1);
72-
Vector3f vec2 = new Vector3f((float) rectangle.getMaxX(), (float) rectangle.getMaxY(), 0);
72+
Vector3f vec2 = new Vector3f((float) rectangle.getMaxX(), (float) rectangle.getMaxY(), 1);
7373
matrix.transform(vec2);
7474
int x1 = Math.round(vec1.x());
7575
int x2 = Math.round(vec2.x());
@@ -79,7 +79,7 @@ public static Rectangle transform(Matrix3x2f matrix, Rectangle rectangle) {
7979
}
8080

8181
public static Point transform(Matrix3x2f matrix, Point point) {
82-
Vector3f mouse = new Vector3f((float) point.x, (float) point.y, 0);
82+
Vector3f mouse = new Vector3f((float) point.x, (float) point.y, 1);
8383
matrix.transform(mouse);
8484
return new Point(mouse.x(), mouse.y());
8585
}

runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/REIConfigScreen.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import com.google.common.base.Preconditions;
2727
import com.mojang.blaze3d.platform.InputConstants;
28-
import dev.architectury.platform.Platform;
2928
import dev.architectury.utils.value.IntValue;
3029
import me.shedaniel.clothconfig2.api.Modifier;
3130
import me.shedaniel.clothconfig2.api.ModifierKeyCode;
@@ -57,9 +56,7 @@
5756
import net.minecraft.client.gui.GuiGraphics;
5857
import net.minecraft.client.gui.components.events.GuiEventListener;
5958
import net.minecraft.client.gui.screens.Screen;
60-
import net.minecraft.client.player.LocalPlayer;
6159
import net.minecraft.client.resources.language.I18n;
62-
import net.minecraft.network.chat.ClickEvent;
6360
import net.minecraft.network.chat.Component;
6461
import org.apache.commons.lang3.mutable.Mutable;
6562
import org.apache.commons.lang3.mutable.MutableObject;
@@ -134,18 +131,6 @@ private void cleanRequiresLevel() {
134131
@Override
135132
public void init() {
136133
super.init();
137-
138-
if (true) {
139-
LocalPlayer player = Minecraft.getInstance().player;
140-
if (player != null) {
141-
player.displayClientMessage(Component.literal("Alpha REI Build: Config not yet implemented!"), false);
142-
player.displayClientMessage(Component.literal("Click here to open the config file...").withStyle(ChatFormatting.UNDERLINE, ChatFormatting.AQUA)
143-
.withStyle(style -> style.withClickEvent(new ClickEvent.OpenFile(Platform.getConfigFolder().resolve("roughlyenoughitems")))), false);
144-
}
145-
Minecraft.getInstance().setScreen(null);
146-
return;
147-
}
148-
149134
this.widgets.clear();
150135
this.widgets.add(Widgets.createLabel(new Point(width / 2, 12), this.title));
151136
int sideWidth = (int) Math.round(width / 4.2);

runtime/src/main/java/me/shedaniel/rei/impl/client/gui/error/ErrorsEntryListWidget.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public Entry getEntry() {
195195
}
196196

197197
private Vector3f transformMouse(double mouseX, double mouseY) {
198-
Vector3f mouse = new Vector3f((float) mouseX, (float) mouseY, 0);
198+
Vector3f mouse = new Vector3f((float) mouseX, (float) mouseY, 1);
199199
transform.transform(mouse);
200200
return mouse;
201201
}
@@ -206,7 +206,7 @@ public void render(GuiGraphics graphics, int index, int y, int x, int entryWidth
206206
graphics.pose().pushMatrix();
207207
graphics.pose().mul(transform);
208208

209-
Vector3f pos = new Vector3f(x, y, 0);
209+
Vector3f pos = new Vector3f(x, y, 1);
210210
pos.mul(new Matrix3x2f().scale(1 / scale, 1 / scale));
211211
getEntry().render(graphics, index, Math.round(pos.y()), Math.round(pos.x()), Math.round(entryWidth / scale), Math.round(entryHeight / scale), (int) mouse.x(), (int) mouse.y(), isSelected, delta);
212212
graphics.pose().popMatrix();

runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/DelegateWidgetWithTranslate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
6060
}
6161

6262
private Vector3f transformMouse(double mouseX, double mouseY) {
63-
Vector3f mouse = new Vector3f((float) mouseX, (float) mouseY, 0);
63+
Vector3f mouse = new Vector3f((float) mouseX, (float) mouseY, 1);
6464
inverseTranslate().transform(mouse);
6565
return mouse;
6666
}

runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/favorites/history/DisplayEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
185185
if (stable && target.equals(bounds)) {
186186
graphics.pose().translate((float) this.xOffset, 0);
187187
}
188-
Vector3f mouse = new Vector3f((float) mouseX, (float) mouseY, 0);
188+
Vector3f mouse = new Vector3f((float) mouseX, (float) mouseY, 1);
189189
graphics.pose().transform(mouse);
190190

191191
AutoCraftingEvaluator.AutoCraftingResult result = this.autoCraftingResult.get();

runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/region/RegionEntryWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
7878

7979
access.openOrClose(uuid, getBounds(), menuEntries.get());
8080
}
81-
Vector3f vector3f = new Vector3f(mouseX, mouseY, 0);
81+
Vector3f vector3f = new Vector3f(mouseX, mouseY, 1);
8282
graphics.pose().transform(vector3f);
8383
super.render(graphics, (int) vector3f.x(), (int) vector3f.y(), delta);
8484
}

0 commit comments

Comments
 (0)