djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

➕ Update to Minecraft 1.20

Browse Source
This commit is contained in:
isXander
2023-05-16 20:30:56 +01:00
parent d81b1f59cc
commit 0adbccc498
41 changed files with 259 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dev/isxander/controlify/gui/layout/ColumnLayoutComponent.java
View File

@ -1,6 +1,6 @@
package dev.isxander.controlify.gui.layout;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.GuiGraphics;
import org.apache.commons.lang3.Validate;
import org.joml.Vector2i;
import org.joml.Vector2ic;
@ -35,7 +35,7 @@ public class ColumnLayoutComponent<T extends RenderComponent> extends AbstractLa
}
@Override
public void render(PoseStack stack, int x, int y, float deltaTime) {
public void render(GuiGraphics graphics, int x, int y, float deltaTime) {
int width = getMaxChildWidth();
if (width == -1)
@ -47,7 +47,7 @@ public class ColumnLayoutComponent<T extends RenderComponent> extends AbstractLa
continue;
element.render(
stack,
graphics,
x + colPaddingLeft + elementPosition.positionFunction.apply(width, element.size().x()),
y + colPaddingTop + yOffset,
deltaTime

10
src/main/java/dev/isxander/controlify/gui/layout/PositionedComponent.java
View File

@ -1,7 +1,7 @@
package dev.isxander.controlify.gui.layout;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.Renderable;
import org.joml.Vector2ic;
@ -33,12 +33,12 @@ public class PositionedComponent<T extends RenderComponent> implements Renderabl
}
@Override
public void render(PoseStack matrices, int mouseX, int mouseY, float delta) {
this.renderComponent(matrices, delta);
public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
this.renderComponent(graphics, delta);
}
public void renderComponent(PoseStack stack, float deltaTime) {
component.render(stack, x, y, deltaTime);
public void renderComponent(GuiGraphics graphics, float deltaTime) {
component.render(graphics, x, y, deltaTime);
}
public int x() {

4
src/main/java/dev/isxander/controlify/gui/layout/RenderComponent.java
View File

@ -1,9 +1,9 @@
package dev.isxander.controlify.gui.layout;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.GuiGraphics;
import org.joml.Vector2ic;
public interface RenderComponent {
void render(PoseStack stack, int x, int y, float deltaTime);
void render(GuiGraphics graphics, int x, int y, float deltaTime);
Vector2ic size();

6
src/main/java/dev/isxander/controlify/gui/layout/RowLayoutComponent.java
View File

@ -1,6 +1,6 @@
package dev.isxander.controlify.gui.layout;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.GuiGraphics;
import org.apache.commons.lang3.Validate;
import org.joml.Vector2i;
import org.joml.Vector2ic;
@ -32,7 +32,7 @@ public class RowLayoutComponent<T extends RenderComponent> extends AbstractLayou
}
@Override
public void render(PoseStack stack, int x, int y, float deltaTime) {
public void render(GuiGraphics graphics, int x, int y, float deltaTime) {
int height = getMaxChildHeight();
if (height == -1)
@ -44,7 +44,7 @@ public class RowLayoutComponent<T extends RenderComponent> extends AbstractLayou
continue;
element.render(
stack,
graphics,
x + rowPaddingLeft + xOffset,
y + rowPaddingTop + elementPosition.positionFunction.apply(height, element.size().y()),
deltaTime