Skip to content

Commit b34c7b3

Browse files
isXanderisXander
committed
build: set 1.21.6-fabric as VCS stonecutter target
1 parent 3a754f0 commit b34c7b3

10 files changed

Lines changed: 96 additions & 96 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public static void renderMultilineTooltip(GuiGraphics graphics, Font font, Multi
275275
maxWidth,
276276
height
277277
//? if <1.21.6
278-
,400
278+
/*,400*/
279279
//? if >=1.21.2
280280
,null
281281
);
@@ -333,7 +333,7 @@ public CategoryTab(YACLScreen screen, ConfigCategory category, ScreenRectangle t
333333
.tooltip(Tooltip.create(Component.translatable("yacl.gui.undo.tooltip")))
334334
.build();
335335

336-
searchField = new SearchFieldWidget(
336+
this.searchField = new SearchFieldWidget(
337337
screen,
338338
screen.font,
339339
screen.width / 3 * 2 + screen.width / 6 - paddedWidth / 2 + 1,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
9494
HoverEvent hoverEvent = style.getHoverEvent();
9595

9696
//? if >=1.21.6 {
97-
/*graphics.renderComponentHoverEffect(textRenderer, style, mouseX, mouseY);
98-
*///?} elif >=1.21.5 {
99-
if (hoverEvent instanceof HoverEvent.ShowItem showItem) {
97+
graphics.renderComponentHoverEffect(textRenderer, style, mouseX, mouseY);
98+
//?} elif >=1.21.5 {
99+
/*if (hoverEvent instanceof HoverEvent.ShowItem showItem) {
100100
ItemStack stack = showItem.item();
101101
renderItemStackTooltip(graphics, mouseX, mouseY, stack);
102102
} else if (hoverEvent instanceof HoverEvent.ShowEntity showEntity) {
@@ -106,7 +106,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
106106
Component text = showText.value();
107107
renderTextTooltip(graphics, mouseX, mouseY, text);
108108
}
109-
//?} else {
109+
*///?} else {
110110
/*@Nullable HoverEvent.ItemStackInfo itemStackContent = hoverEvent.getValue(HoverEvent.Action.SHOW_ITEM);
111111
@Nullable HoverEvent.EntityTooltipInfo entityContent = hoverEvent.getValue(HoverEvent.Action.SHOW_ENTITY);
112112
@Nullable Component text = hoverEvent.getValue(HoverEvent.Action.SHOW_TEXT);
@@ -126,7 +126,7 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
126126
}
127127

128128
//? if <=1.21.5 {
129-
private void renderItemStackTooltip(GuiGraphics graphics, int mouseX, int mouseY, ItemStack itemStack) {
129+
/*private void renderItemStackTooltip(GuiGraphics graphics, int mouseX, int mouseY, ItemStack itemStack) {
130130
graphics.renderTooltip(textRenderer, Screen.getTooltipFromItem(client, itemStack), itemStack.getTooltipImage(), mouseX, mouseY);
131131
}
132132
private void renderEntityTooltip(GuiGraphics graphics, int mouseX, int mouseY, HoverEvent.EntityTooltipInfo entity) {
@@ -138,7 +138,7 @@ private void renderTextTooltip(GuiGraphics graphics, int mouseX, int mouseY, Com
138138
MultiLineLabel multilineText = MultiLineLabel.create(textRenderer, text, getDimension().width());
139139
YACLScreen.renderMultilineTooltip(graphics, textRenderer, multilineText, getDimension().centerX(), getDimension().y(), getDimension().yLimit(), screen.width, screen.height);
140140
}
141-
//?}
141+
*///?}
142142

143143
@Override
144144
public boolean mouseClicked(double mouseX, double mouseY, int button) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void renderBackground(
4343
) {
4444
// in 1.21.6+ renderBackground isn't called in render, it's called earlier before the blur pass
4545
//? if >=1.21.6
46-
/*this.backgroundYaclScreen.renderBackground(guiGraphics, mouseX, mouseY, partialTick);*/
46+
this.backgroundYaclScreen.renderBackground(guiGraphics, mouseX, mouseY, partialTick);
4747
}
4848

4949
@Override

‎src/main/java/dev/isxander/yacl3/gui/render/BaseRenderState.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@
77
import org.jetbrains.annotations.Nullable;
88

99
//? if >=1.21.6 {
10-
/*import com.mojang.blaze3d.pipeline.RenderPipeline;
10+
import com.mojang.blaze3d.pipeline.RenderPipeline;
1111
import net.minecraft.client.Minecraft;
1212
import net.minecraft.client.gui.render.TextureSetup;
1313
import net.minecraft.client.gui.navigation.ScreenRectangle;
1414
import net.minecraft.client.renderer.RenderPipelines;
1515
import org.joml.Matrix3x2f;
16-
*///?} else {
17-
import net.minecraft.client.renderer.RenderType;
16+
//?} else {
17+
/*import net.minecraft.client.renderer.RenderType;
1818
import org.joml.Matrix4f;
19-
//?}
19+
*///?}
2020

2121
public record BaseRenderState(
2222
//? if >=1.21.6 {
23-
/*RenderPipeline pipeline,
23+
RenderPipeline pipeline,
2424
TextureSetup textureSetup,
2525
Matrix3x2f pose,
2626
@Nullable ScreenRectangle bounds,
2727
@Nullable ScreenRectangle scissorArea
28-
*///?} else {
29-
net.minecraft.client.renderer.RenderType renderType,
28+
//?} else {
29+
/*net.minecraft.client.renderer.RenderType renderType,
3030
Matrix4f pose
31-
//?}
31+
*///?}
3232
) {
3333
public static BaseRenderState create(GuiGraphics graphics, @Nullable ResourceLocation texture, int x0, int y0, int x1, int y1) {
3434
//? if >=1.21.6 {
35-
/*@Nullable ScreenRectangle scissorArea = GuiRenderStateSink.peekScissorStack(graphics);
35+
@Nullable ScreenRectangle scissorArea = GuiRenderStateSink.peekScissorStack(graphics);
3636
ScreenRectangle bounds = boundsFromMaxPoints(x0, y0, x1, y1, graphics.pose(), scissorArea);
3737

3838
return new BaseRenderState(
@@ -41,29 +41,29 @@ public static BaseRenderState create(GuiGraphics graphics, @Nullable ResourceLoc
4141
new Matrix3x2f(graphics.pose()),
4242
bounds, scissorArea
4343
);
44-
*///?} else {
45-
return create(graphics, texture);
46-
//?}
44+
//?} else {
45+
/*return create(graphics, texture);
46+
*///?}
4747
}
4848

4949
public static BaseRenderState create(GuiGraphics graphics, @Nullable ResourceLocation texture) {
5050
//? if >=1.21.6 {
51-
/*return new BaseRenderState(
51+
return new BaseRenderState(
5252
texture != null ? RenderPipelines.GUI_TEXTURED : RenderPipelines.GUI,
5353
textureSetup(texture),
5454
new Matrix3x2f(graphics.pose()),
5555
null, GuiRenderStateSink.peekScissorStack(graphics)
5656
);
57-
*///?} else {
58-
return new BaseRenderState(
57+
//?} else {
58+
/*return new BaseRenderState(
5959
texture != null ? GuiUtils.guiTextured(false).apply(texture) : RenderType.gui(),
6060
graphics.pose().last().pose()
6161
);
62-
//?}
62+
*///?}
6363
}
6464

6565
//? if >=1.21.6 {
66-
/*private static TextureSetup textureSetup(@Nullable ResourceLocation texture) {
66+
private static TextureSetup textureSetup(@Nullable ResourceLocation texture) {
6767
return texture == null
6868
? TextureSetup.noTexture()
6969
: TextureSetup.singleTexture(Minecraft.getInstance().getTextureManager().getTexture(texture).getTextureView());
@@ -73,5 +73,5 @@ private static ScreenRectangle boundsFromMaxPoints(int x0, int y0, int x1, int y
7373
ScreenRectangle bounds = new ScreenRectangle(x0, y0, x1 - x0, y1 - y0).transformMaxBounds(pose);
7474
return scissorArea != null ? scissorArea.intersection(bounds) : bounds;
7575
}
76-
*///?}
76+
//?}
7777
}

‎src/main/java/dev/isxander/yacl3/gui/render/GuiRenderStateSink.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
import net.minecraft.client.gui.GuiGraphics;
44

55
//? if >=1.21.6 {
6-
/*import net.minecraft.client.gui.render.state.GuiElementRenderState;
6+
import net.minecraft.client.gui.render.state.GuiElementRenderState;
77
import net.minecraft.client.gui.navigation.ScreenRectangle;
8-
*///?} else {
9-
import net.minecraft.client.renderer.MultiBufferSource;
10-
//?}
8+
//?} else {
9+
/*import net.minecraft.client.renderer.MultiBufferSource;
10+
*///?}
1111

1212
public interface GuiRenderStateSink {
1313
//? if >=1.21.6 {
14-
/*void yacl$submit(GuiElementRenderState renderState);
14+
void yacl$submit(GuiElementRenderState renderState);
1515

1616
static void submit(GuiGraphics graphics, GuiElementRenderState renderState) {
1717
((GuiRenderStateSink) graphics).yacl$submit(renderState);
@@ -22,11 +22,11 @@ static void submit(GuiGraphics graphics, GuiElementRenderState renderState) {
2222
static ScreenRectangle peekScissorStack(GuiGraphics graphics) {
2323
return ((GuiRenderStateSink) graphics).yacl$peekScissorStack();
2424
}
25-
*///?} else {
26-
MultiBufferSource yacl$bufferSource();
25+
//?} else {
26+
/*MultiBufferSource yacl$bufferSource();
2727
2828
static MultiBufferSource bufferSource(GuiGraphics graphics) {
2929
return ((GuiRenderStateSink) graphics).yacl$bufferSource();
3030
}
31-
//?}
31+
*///?}
3232
}

‎src/main/java/dev/isxander/yacl3/gui/render/YACLGuiElementRenderState.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
import org.jetbrains.annotations.Nullable;
88

99
//? if >=1.21.6 {
10-
/*import net.minecraft.client.gui.render.TextureSetup;
10+
import net.minecraft.client.gui.render.TextureSetup;
1111
import net.minecraft.client.gui.render.state.GuiElementRenderState;
1212
import com.mojang.blaze3d.pipeline.RenderPipeline;
1313

14-
*///?}
14+
//?}
1515

16-
public interface YACLGuiElementRenderState /*? if >=1.21.6 {*//*extends GuiElementRenderState *//*?}*/ {
16+
public interface YACLGuiElementRenderState /*? if >=1.21.6 {*/extends GuiElementRenderState /*?}*/ {
1717

1818
BaseRenderState baseState();
1919

2020
//? if >=1.21.6 {
21-
/*@Override
21+
@Override
2222
default @NotNull RenderPipeline pipeline() {
2323
return baseState().pipeline();
2424
}
@@ -37,29 +37,29 @@ public interface YACLGuiElementRenderState /*? if >=1.21.6 {*//*extends GuiEleme
3737
default @Nullable ScreenRectangle bounds() {
3838
return baseState().bounds();
3939
}
40-
*///?} else {
41-
void buildVertices(VertexConsumer vertexConsumer, float z);
42-
//?}
40+
//?} else {
41+
/*void buildVertices(VertexConsumer vertexConsumer, float z);
42+
*///?}
4343

4444
default VertexConsumer add2DVertex(
4545
VertexConsumer vertexConsumer,
4646
float x, float y, float z
4747
) {
4848
//? if >=1.21.6 {
49-
/*return vertexConsumer.addVertexWith2DPose(this.baseState().pose(), x, y, z);
50-
*///?} else {
51-
return vertexConsumer.addVertex(this.baseState().pose(), x, y, z);
52-
//?}
49+
return vertexConsumer.addVertexWith2DPose(this.baseState().pose(), x, y, z);
50+
//?} else {
51+
/*return vertexConsumer.addVertex(this.baseState().pose(), x, y, z);
52+
*///?}
5353
}
5454

5555
default void submit(GuiGraphics graphics) {
5656
//? if >=1.21.6 {
57-
/*GuiRenderStateSink.submit(graphics, this);
58-
*///?} else {
59-
// TODO: don't drawSpecial as it finishes the batch
57+
GuiRenderStateSink.submit(graphics, this);
58+
//?} else {
59+
/*// TODO: don't drawSpecial as it finishes the batch
6060
VertexConsumer vertexConsumer = GuiRenderStateSink.bufferSource(graphics).getBuffer(baseState().renderType());
6161
buildVertices(vertexConsumer, 0);
62-
//?}
62+
*///?}
6363
}
6464

6565

‎src/main/java/dev/isxander/yacl3/gui/tab/TabExt.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ default void tick() {}
1515
default void renderBackground(GuiGraphics graphics) {}
1616

1717
//? if >=1.21.6
18-
/*@Override*/
18+
@Override
1919
default @NotNull Component getTabExtraNarration() {
2020
return Component.empty();
2121
}

0 commit comments

Comments
 (0)