Skip to content

Commit 559356e

Browse files
tr7zwtr7zw
committed
Fix build for all versions
1 parent c47e745 commit 559356e

15 files changed

Lines changed: 205 additions & 179 deletions

‎replacements.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
stonecutter {
2+
replacements.string(current.parsed >= "1.21.11") {
3+
replace("RenderType.", "RenderTypes.")
4+
}
5+
}

‎src/main/java/dev/tr7zw/waveycapes/WaveyCapesBase.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,8 @@ public abstract class WaveyCapesBase extends ModBase {
1515
@Getter
1616
public static WaveyCapesBase INSTANCE;
1717

18-
//? if >= 1.21.9 {
19-
2018
@Getter
2119
private final CapeNodeCollector capeNodeCollector = new CapeNodeCollector();
22-
//? }
23-
@Getter
24-
private final CustomCapeRenderer renderer = new CustomCapeRenderer();
2520

2621
public void init() {
2722
INSTANCE = this;

‎src/main/java/dev/tr7zw/waveycapes/delegate/PlayerDelegate.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public class PlayerDelegate implements MinecraftPlayer {
1616

1717
private net.minecraft.world.entity.Avatar player;
1818
//? } else {
19-
/*
20-
private AbstractClientPlayer player;
19+
20+
/*private AbstractClientPlayer player;
2121
*///? }
2222

2323
public double getXCloak() {
@@ -32,8 +32,8 @@ public double getXCloak() {
3232
return 0;
3333
}
3434
//? } else {
35-
/*
36-
return player.xCloak;
35+
36+
/*return player.xCloak;
3737
*///? }
3838
}
3939

@@ -49,8 +49,8 @@ public double getZCloak() {
4949
return 0;
5050
}
5151
//? } else {
52-
/*
53-
return player.zCloak;
52+
53+
/*return player.zCloak;
5454
*///? }
5555
}
5656

‎src/main/java/dev/tr7zw/waveycapes/mixin/LivingEntityRendererMixin.java‎

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

2323
public class LivingEntityRendererMixin<S extends LivingEntity, T extends LivingEntityRenderState, M extends EntityModel<? super T>> {
2424
//? } else {
25-
/*
26-
public class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
25+
26+
/*public class LivingEntityRendererMixin<T extends LivingEntity, M extends EntityModel<T>> {
2727
*///? }
2828

2929
@Inject(method = "addLayer", at = @At("HEAD"), cancellable = true)

‎src/main/java/dev/tr7zw/waveycapes/mixin/PlayerMixin.java‎

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

2626
@Mixin(value = LivingEntity.class)
2727
//? } else {
28-
/*
29-
@Mixin(net.minecraft.world.entity.player.Player.class)
28+
29+
/*@Mixin(net.minecraft.world.entity.player.Player.class)
3030
*///? }
3131
public abstract class PlayerMixin extends Entity implements CapeHolder {
3232

@@ -61,11 +61,11 @@ private void moveCloakUpdate(CallbackInfo info) {
6161
}
6262
var entity = (net.minecraft.world.entity.Avatar) (Object) this;
6363
//? } else {
64-
/*
65-
if (!((Object) this instanceof AbstractClientPlayer)) {
66-
return;
67-
}
68-
var entity = (AbstractClientPlayer) (Object) this;
64+
65+
/*if (!((Object) this instanceof AbstractClientPlayer)) {
66+
return;
67+
}
68+
var entity = (AbstractClientPlayer) (Object) this;
6969
*///? }
7070
updateSimulation(16);
7171
PlayerDelegate playerDelegate = new PlayerDelegate(entity);

‎src/main/java/dev/tr7zw/waveycapes/mixin/PlayerRendererMixin.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
import net.minecraft.client.model.player.*;
1414
//? } else {
15-
/*
16-
import net.minecraft.client.model.*;
15+
16+
/*import net.minecraft.client.model.*;
1717
*///? }
1818
import net.minecraft.client.player.AbstractClientPlayer;
1919
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
@@ -35,8 +35,8 @@
3535

3636
@Mixin(net.minecraft.client.renderer.entity.player.AvatarRenderer.class)
3737
//? } else {
38-
/*
39-
@Mixin(net.minecraft.client.renderer.entity.player.PlayerRenderer.class)
38+
39+
/*@Mixin(net.minecraft.client.renderer.entity.player.PlayerRenderer.class)
4040
*///? }
4141
//? if >= 1.21.2 {
4242

@@ -46,14 +46,14 @@ public abstract class PlayerRendererMixin
4646
extends
4747
LivingEntityRenderer<AbstractClientPlayer, net.minecraft.client.renderer.entity.state.AvatarRenderState, PlayerModel> {
4848
//? } else {
49-
/*
50-
extends LivingEntityRenderer<AbstractClientPlayer, net.minecraft.client.renderer.entity.state.AvatarRenderState, PlayerModel> {
49+
50+
/*extends LivingEntityRenderer<AbstractClientPlayer, net.minecraft.client.renderer.entity.state.AvatarRenderState, PlayerModel> {
5151
*///? }
5252
//? } else {
53-
/*
54-
public abstract class PlayerRendererMixin
55-
extends LivingEntityRenderer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
56-
*///? }
53+
54+
/*public abstract class PlayerRendererMixin
55+
extends LivingEntityRenderer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> {
56+
*///? }
5757

5858
@Unique
5959
private boolean injectedCape = false;
@@ -64,10 +64,10 @@ public PlayerRendererMixin(Context context, PlayerModel entityModel, float f) {
6464
super(context, entityModel, f);
6565
}
6666
//? } else if >= 1.17.0 {
67-
/*
68-
public PlayerRendererMixin(Context context, PlayerModel<AbstractClientPlayer> entityModel, float f) {
69-
super(context, entityModel, f);
70-
}
67+
68+
/*public PlayerRendererMixin(Context context, PlayerModel<AbstractClientPlayer> entityModel, float f) {
69+
super(context, entityModel, f);
70+
}
7171
*///? } else {
7272
/*
7373
public PlayerRendererMixin(EntityRenderDispatcher entityRenderDispatcher,

‎src/main/java/dev/tr7zw/waveycapes/render/CapeInfos.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package dev.tr7zw.waveycapes.render;
22

3+
//? if >= 1.21.11 {
4+
35
import net.minecraft.client.renderer.rendertype.*;
6+
//? } else {
7+
8+
/*import net.minecraft.client.renderer.*;
9+
*///? }
410

511
public record CapeInfos(CapeRenderer capeRenderer, RenderType renderType, boolean isGlint) {
612
}

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

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,37 @@
11
package dev.tr7zw.waveycapes.render;
22

3-
//? if >= 1.21.9 {
4-
53
import com.mojang.blaze3d.vertex.*;
64
import dev.tr7zw.transition.mc.entitywrapper.*;
75
import dev.tr7zw.waveycapes.*;
86
import dev.tr7zw.waveycapes.support.*;
7+
import net.minecraft.client.player.*;
98
import net.minecraft.client.renderer.*;
9+
//? if >= 1.21.2 {
1010
import net.minecraft.client.renderer.entity.state.*;
11+
//? }
12+
//? if >= 1.21.11 {
13+
14+
import net.minecraft.client.renderer.feature.*;
1115
import net.minecraft.client.renderer.rendertype.*;
16+
//? } else {
17+
18+
/*import net.minecraft.client.renderer.*;
19+
*///? }
1220

1321
public class CapeNodeCollector {
1422

23+
private final CustomCapeRenderer customCapeRenderer = new CustomCapeRenderer();
1524
private final VanillaCapeRenderer vanillaCape = new VanillaCapeRenderer();
1625

17-
public void submitCape(SubmitNodeCollector submitNodeCollector, AvatarRenderState state, PoseStack stack, int packedLight, float delta) {
18-
var playerWrapper = new PlayerWrapper(state);
26+
public void submitCape(
27+
//? if >= 1.21.9 {
28+
29+
SubmitNodeCollector submitNodeCollector,
30+
//? } else {
31+
32+
/*MultiBufferSource multiBufferSource,
33+
*///? }
34+
PlayerWrapper playerWrapper, PoseStack stack, int packedLight, float delta) {
1935
var renderer = getCapeRenderer(playerWrapper);
2036
if (renderer == null) {
2137
return;
@@ -24,19 +40,30 @@ public void submitCape(SubmitNodeCollector submitNodeCollector, AvatarRenderStat
2440
if (capeInfo == null) {
2541
return;
2642
}
43+
//? if >= 1.21.9 {
2744
if (capeInfo.isGlint()) {
2845
submitNodeCollector.submitCustomGeometry(stack, RenderTypes.entityGlint(), (pose, vertexConsumer) -> {
2946
PoseStack sharedStack = new PoseStack();
3047
sharedStack.last().set(pose);
31-
WaveyCapesBase.getINSTANCE().getRenderer().render(playerWrapper, renderer, vertexConsumer, sharedStack, packedLight, delta);
48+
customCapeRenderer.render(playerWrapper, renderer, vertexConsumer, sharedStack, packedLight, delta);
3249
});
3350
}
3451

3552
submitNodeCollector.submitCustomGeometry(stack, capeInfo.renderType(), (pose, vertexConsumer) -> {
3653
PoseStack sharedStack = new PoseStack();
3754
sharedStack.last().set(pose);
38-
WaveyCapesBase.getINSTANCE().getRenderer().render(playerWrapper, renderer, vertexConsumer, sharedStack, packedLight, delta);
55+
customCapeRenderer.render(playerWrapper, renderer, vertexConsumer, sharedStack, packedLight, delta);
3956
});
57+
//? } else {
58+
59+
/*VertexConsumer vertexConsumer;
60+
if (capeInfo.isGlint()) {
61+
vertexConsumer = net.minecraft.client.renderer.entity.ItemRenderer.getFoilBuffer(multiBufferSource, capeInfo.renderType(), false, true);
62+
} else {
63+
vertexConsumer = multiBufferSource.getBuffer(capeInfo.renderType());
64+
}
65+
customCapeRenderer.render(playerWrapper, renderer, vertexConsumer, stack, packedLight, delta);
66+
*///? }
4067
}
4168

4269
private CapeRenderer getCapeRenderer(PlayerWrapper capeRenderInfo) {
@@ -52,6 +79,4 @@ private CapeRenderer getCapeRenderer(PlayerWrapper capeRenderInfo) {
5279
}
5380
}
5481

55-
5682
}
57-
//? }

0 commit comments

Comments
 (0)