Skip to content

Commit c47e745

Browse files
committed
Get 26.1 and 26.2 working
1 parent ba07f5d commit c47e745

8 files changed

Lines changed: 21 additions & 128 deletions

File tree

src/main/java/dev/tr7zw/waveycapes/WaveyCapesConfigScreen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import dev.tr7zw.transition.mc.ComponentProvider;
6+
import dev.tr7zw.transition.mc.*;
77
import dev.tr7zw.trender.gui.client.AbstractConfigScreen;
88
import dev.tr7zw.trender.gui.client.BackgroundPainter;
99
import dev.tr7zw.trender.gui.widget.WButton;
@@ -60,7 +60,7 @@ public CustomConfigScreen(Screen previous) {
6060
WButton doneButton = new WButton(CommonComponents.GUI_DONE);
6161
doneButton.setOnClick(() -> {
6262
save();
63-
Minecraft.getInstance().setScreen(previous);
63+
GeneralUtil.setScreen(previous);
6464
});
6565
root.add(doneButton, 0, 26, 6, 2);
6666

src/main/java/dev/tr7zw/waveycapes/mixin/FeatureRenderDispatcherMixin.java

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/main/java/dev/tr7zw/waveycapes/render/BufferHolder.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/main/java/dev/tr7zw/waveycapes/render/CapeNode.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/main/java/dev/tr7zw/waveycapes/render/CapeNodeCollector.java

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,19 @@
22

33
//? if >= 1.21.9 {
44

5-
import com.mojang.blaze3d.vertex.PoseStack;
5+
import com.mojang.blaze3d.vertex.*;
66
import dev.tr7zw.transition.mc.entitywrapper.*;
7+
import dev.tr7zw.waveycapes.*;
78
import dev.tr7zw.waveycapes.support.*;
8-
import lombok.Getter;
9-
import net.minecraft.client.renderer.entity.state.AvatarRenderState;
10-
11-
import java.util.ArrayList;
12-
import java.util.List;
9+
import net.minecraft.client.renderer.*;
10+
import net.minecraft.client.renderer.entity.state.*;
11+
import net.minecraft.client.renderer.rendertype.*;
1312

1413
public class CapeNodeCollector {
1514

1615
private final VanillaCapeRenderer vanillaCape = new VanillaCapeRenderer();
1716

18-
@Getter
19-
private final List<CapeNode> capes = new ArrayList<>();
20-
21-
public void submitCape(AvatarRenderState state, PoseStack stack, int packedLight) {
17+
public void submitCape(SubmitNodeCollector submitNodeCollector, AvatarRenderState state, PoseStack stack, int packedLight, float delta) {
2218
var playerWrapper = new PlayerWrapper(state);
2319
var renderer = getCapeRenderer(playerWrapper);
2420
if (renderer == null) {
@@ -28,11 +24,19 @@ public void submitCape(AvatarRenderState state, PoseStack stack, int packedLight
2824
if (capeInfo == null) {
2925
return;
3026
}
31-
capes.add(new CapeNode(state, capeInfo, stack.last().copy(), packedLight));
32-
}
27+
if (capeInfo.isGlint()) {
28+
submitNodeCollector.submitCustomGeometry(stack, RenderTypes.entityGlint(), (pose, vertexConsumer) -> {
29+
PoseStack sharedStack = new PoseStack();
30+
sharedStack.last().set(pose);
31+
WaveyCapesBase.getINSTANCE().getRenderer().render(playerWrapper, renderer, vertexConsumer, sharedStack, packedLight, delta);
32+
});
33+
}
3334

34-
public void clear() {
35-
capes.clear();
35+
submitNodeCollector.submitCustomGeometry(stack, capeInfo.renderType(), (pose, vertexConsumer) -> {
36+
PoseStack sharedStack = new PoseStack();
37+
sharedStack.last().set(pose);
38+
WaveyCapesBase.getINSTANCE().getRenderer().render(playerWrapper, renderer, vertexConsumer, sharedStack, packedLight, delta);
39+
});
3640
}
3741

3842
private CapeRenderer getCapeRenderer(PlayerWrapper capeRenderInfo) {

src/main/java/dev/tr7zw/waveycapes/render/CapeRenderUtil.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/main/java/dev/tr7zw/waveycapes/renderlayers/CustomCapeRenderLayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void render(PoseStack poseStack, MultiBufferSource multiBufferSource, int
105105

106106
//? if >= 1.21.9 {
107107

108-
WaveyCapesBase.INSTANCE.getCapeNodeCollector().submitCape(renderState, poseStack, packedLight);
108+
WaveyCapesBase.INSTANCE.getCapeNodeCollector().submitCape(submitNodeCollector, renderState, poseStack, packedLight, delta);
109109
//? } else {
110110
/*
111111
WaveyCapesBase.INSTANCE.getRenderer().render(capeRenderInfo, poseStack, multiBufferSource, packedLight, delta);

src/main/resources/waveycapes.mixins.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"package": "dev.tr7zw.waveycapes.mixin",
55
"mixins": [],
66
"client": [
7-
"FeatureRenderDispatcherMixin",
87
"LivingEntityRendererMixin",
98
"PlayerMixin",
109
"PlayerRendererMixin"

0 commit comments

Comments
 (0)