Skip to content

Commit f576c25

Browse files
committed
There were still actually some rendering errors
1 parent b6d3f3b commit f576c25

File tree

3 files changed

+9
-18
lines changed

3 files changed

+9
-18
lines changed

src/main/java/io/github/techstreet/dfscript/screen/widget/CItem.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
import net.minecraft.client.util.math.MatrixStack;
88
import net.minecraft.item.ItemStack;
99
import net.minecraft.sound.SoundEvents;
10-
import org.joml.Matrix4fc;
1110
import org.lwjgl.opengl.GL11;
12-
import org.joml.Vector3f;
1311

1412
import java.awt.*;
1513
import java.util.Optional;
@@ -45,8 +43,7 @@ public void renderOverlay(MatrixStack stack, int mouseX, int mouseY, float tickD
4543
stack.translate(mouseX, mouseY, 0);
4644
stack.scale(0.5f, 0.5f, 1f);
4745
GL11.glDisable(GL11.GL_DEPTH_TEST);
48-
stack.peek().getPositionMatrix().add((Matrix4fc) new Vector3f(0, 0, 600));
49-
// TODO: check this is working
46+
// stack.peek().getPositionMatrix().add((Matrix4fc) new Vector3f(0, 0, 600));
5047
DFScript.MC.currentScreen.renderTooltip(stack, item.getTooltip(
5148
DFScript.MC.player, Default.BASIC
5249
), Optional.empty(), 0, 0);

src/main/java/io/github/techstreet/dfscript/screen/widget/CTextField.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import net.minecraft.client.gui.DrawableHelper;
99
import net.minecraft.client.util.math.MatrixStack;
1010
import org.joml.Vector4f;
11-
import org.joml.Vector4fc;
1211

1312
public class CTextField implements CWidget {
1413

@@ -55,10 +54,10 @@ public void render(MatrixStack stack, int mouseX, int mouseY, float tickDelta) {
5554
DrawableHelper.fill(stack, 1, 1, width - 1, height - 1, 0xFF000000);
5655

5756
float xpos = stack.peek().getPositionMatrix().m30() + x;
58-
float ypos = stack.peek().getPositionMatrix().m31() - y;
57+
float ypos = stack.peek().getPositionMatrix().m31();
5958

60-
Vector4f begin = new Vector4f(xpos, ypos, 1, 1);
61-
Vector4f end = new Vector4f(xpos + (width * 2), ypos + (height * 2), 1, 1);
59+
Vector4f begin = new Vector4f(xpos - 2, ypos + 2, 1, 1);
60+
Vector4f end = new Vector4f((xpos + (width * 2)) - 7, (ypos + (height * 2)), 1, 1);
6261

6362
int guiScale = (int) DFScript.MC.getWindow().getScaleFactor();
6463
RenderUtil.pushScissor(

src/main/java/io/github/techstreet/dfscript/util/RenderUtil.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@
22

33
import com.mojang.blaze3d.systems.RenderSystem;
44
import io.github.techstreet.dfscript.DFScript;
5-
import java.util.ArrayList;
6-
import java.util.List;
75
import net.minecraft.client.MinecraftClient;
8-
import net.minecraft.client.render.BufferBuilder;
9-
import net.minecraft.client.render.GameRenderer;
10-
import net.minecraft.client.render.Tessellator;
11-
import net.minecraft.client.render.VertexFormat;
12-
import net.minecraft.client.render.VertexFormats;
6+
import net.minecraft.client.render.*;
137
import net.minecraft.client.render.item.ItemRenderer;
148
import net.minecraft.client.toast.SystemToast;
159
import net.minecraft.client.util.math.MatrixStack;
@@ -18,9 +12,11 @@
1812
import net.minecraft.text.Text;
1913
import net.minecraft.util.Identifier;
2014
import org.joml.Vector4f;
21-
import org.joml.Vector4fc;
2215
import org.lwjgl.opengl.GL11;
2316

17+
import java.util.ArrayList;
18+
import java.util.List;
19+
2420
public class RenderUtil {
2521

2622
private static final List<Scissor> scissorStack = new ArrayList<>();
@@ -163,8 +159,7 @@ public static void popScissor() {
163159
public static void renderGuiItem(MatrixStack stack, ItemStack item) {
164160
stack.push();
165161
ItemRenderer renderer = DFScript.MC.getItemRenderer();
166-
Vector4f pos = new Vector4f(0, 0, 0, 1);
167-
pos.add((Vector4fc) stack.peek().getPositionMatrix());
162+
Vector4f pos = new Vector4f(stack.peek().getPositionMatrix().m30(), stack.peek().getPositionMatrix().m31(), 0, 1);
168163
renderer.renderGuiItemIcon(item, (int) pos.x(), (int) pos.y());
169164
stack.pop();
170165
}

0 commit comments

Comments
 (0)