Skip to content

Commit 148263d

Browse files
tr7zwtr7zw
committed
Update to 1.21.11 fabric/neo
1 parent aa1473b commit 148263d

11 files changed

Lines changed: 100 additions & 38 deletions

File tree

‎gradle-compose.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source: "https://github.com/tr7zw/ProcessedModTemplate/tree/stonecutter"
33
replacements:
44
name: "WaveyCapes"
55
id: "waveycapes"
6-
version: "1.8.0"
6+
version: "1.8.1"
77
description: "The cape shouldn't be a static slab!"
88
homepageUrl: "https://modrinth.com/mod/wavey-capes"
99
sourcesUrl: "https://github.com/tr7zw/WaveyCapes"
@@ -28,7 +28,11 @@ replacements:
2828
modCompileOnly 'maven.modrinth:shoulder-surfing-reloaded:ZAtuVliv'\n
2929
"
3030
neoforge_dependencies: "
31+
if (stonecutter.eval(\"${project.minecraft_version}\", \"<= 1.21.10\")) {\n
3132
modCompileOnly 'curse.maven:minecraftcapes-mod-359836:4562670'\n
33+
} else {\n
34+
modCompileOnly 'curse.maven:minecraftcapes-mod-359836:7318376'\n
35+
}\n
3236
modCompileOnly 'maven.modrinth:playeranimator:1.0.2-rc1+1.20.4-forge'\n
3337
modCompileOnly 'maven.modrinth:ears:1.4.6+fabric-1.20.2'\n
3438
modCompileOnly 'maven.modrinth:shoulder-surfing-reloaded:DKEyLO9H'\n

‎settings.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
"1.21.8-fabric",
3636
"1.21.10-forge",
3737
"1.21.10-neoforge",
38-
"1.21.10-fabric"
38+
"1.21.10-fabric",
39+
"1.21.11-neoforge",
40+
"1.21.11-fabric"
3941
]
4042
}

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,28 @@
44

55
import dev.tr7zw.transition.mc.entitywrapper.PlayerWrapper;
66
import net.minecraft.client.renderer.MultiBufferSource;
7-
import net.minecraft.client.renderer.RenderType;
8-
import net.minecraft.resources.ResourceLocation;
7+
//? if >= 1.21.11 {
8+
9+
import net.minecraft.client.renderer.rendertype.*;
10+
//? } else {
11+
/*
12+
import net.minecraft.client.renderer.*;
13+
*///? }
14+
import net.minecraft.resources.*;
915

1016
public class VanillaCapeRenderer implements CapeRenderer {
1117

1218
@Override
1319
public VertexConsumer getVertexConsumer(MultiBufferSource multiBufferSource, PlayerWrapper capeRenderInfo) {
14-
ResourceLocation cape = capeRenderInfo.getCapeTexture();
20+
/*? >= 1.21.11 {*/ Identifier /*?} else {*//* ResourceLocation *//*?}*/ cape = capeRenderInfo.getCapeTexture();
1521
if (cape != null) {
22+
//? if >= 1.21.11 {
23+
24+
return multiBufferSource.getBuffer(RenderTypes.entityTranslucent(cape));
25+
//? } else {
26+
/*
1627
return multiBufferSource.getBuffer(RenderType.entityTranslucent(cape));
28+
*///? }
1729
}
1830
return null;
1931
}

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ public WaveyCapesBootstrap() {
2424
}
2525
*///? } else if neoforge {
2626
/*
27-
package dev.tr7zw.waveycapes;
27+
package dev.tr7zw.waveycapes;
2828
29-
import net.neoforged.api.distmarker.Dist;
30-
import net.neoforged.fml.loading.FMLEnvironment;
31-
import net.neoforged.fml.common.Mod;
32-
import dev.tr7zw.transition.loader.ModLoaderEventUtil;
29+
import net.neoforged.api.distmarker.Dist;
30+
import net.neoforged.fml.loading.FMLEnvironment;
31+
import net.neoforged.fml.common.Mod;
32+
import dev.tr7zw.transition.loader.ModLoaderEventUtil;
3333
34-
@Mod("waveycapes")
35-
public class WaveyCapesBootstrap {
34+
@Mod("waveycapes")
35+
public class WaveyCapesBootstrap {
3636
3737
public WaveyCapesBootstrap() {
38-
//? if < 1.21.9 {
39-
/^
38+
//? if < 1.21.9 {
39+
/^
4040
if(FMLEnvironment.dist == Dist.CLIENT) {
41-
^///? } else {
41+
^///? } else {
4242
43-
if(FMLEnvironment.getDist() == Dist.CLIENT) {
44-
//? }
45-
ModLoaderEventUtil.registerClientSetupListener(() -> new WaveyCapesMod().init());
46-
}
43+
if (FMLEnvironment.getDist() == Dist.CLIENT) {
44+
//? }
45+
ModLoaderEventUtil.registerClientSetupListener(() -> new WaveyCapesMod().init());
46+
}
4747
}
4848
49-
}
49+
}
5050
*///? }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public void onInitializeClient() {
1414
init();
1515
}
1616
//? } else {
17-
/*
18-
public class WaveyCapesMod extends WaveyCapesBase{
17+
/*
18+
public class WaveyCapesMod extends WaveyCapesBase {
1919
*///? }
2020

2121
@Override

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@
88

99
import dev.tr7zw.waveycapes.versionless.CapeHolder;
1010
import dev.tr7zw.waveycapes.renderlayers.CustomCapeRenderLayer;
11-
import net.minecraft.client.model.PlayerModel;
11+
//? if >= 1.21.11 {
12+
13+
import net.minecraft.client.model.player.*;
14+
//? } else {
15+
/*
16+
import net.minecraft.client.model.*;
17+
*///? }
1218
import net.minecraft.client.player.AbstractClientPlayer;
1319
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
1420

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
import dev.tr7zw.transition.mc.entitywrapper.PlayerWrapper;
55
import dev.tr7zw.waveycapes.WaveyCapesBase;
66
import net.minecraft.client.Minecraft;
7-
import net.minecraft.client.model.PlayerModel;
7+
//? if >= 1.21.11 {
8+
9+
import net.minecraft.client.model.player.*;
10+
//? } else {
11+
/*
12+
import net.minecraft.client.model.*;
13+
*///? }
814
import net.minecraft.client.renderer.entity.RenderLayerParent;
915
import net.minecraft.client.renderer.entity.layers.RenderLayer;
1016

‎src/main/java/dev/tr7zw/waveycapes/support/EarsSupport.java‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,16 @@
1717
import dev.tr7zw.waveycapes.NMSUtil;
1818
import net.minecraft.client.model.geom.ModelPart;
1919
import net.minecraft.client.renderer.MultiBufferSource;
20-
import net.minecraft.client.renderer.RenderType;
20+
//? if >= 1.21.11 {
21+
22+
import net.minecraft.client.renderer.rendertype.*;
23+
//? } else {
24+
/*
25+
import net.minecraft.client.renderer.*;
26+
*///? }
2127
import net.minecraft.client.renderer.entity.ItemRenderer;
2228
import net.minecraft.client.renderer.texture.OverlayTexture;
23-
import net.minecraft.resources.ResourceLocation;
29+
import net.minecraft.resources.*;
2430

2531
public class EarsSupport implements ModSupport, EarsInhibitor {
2632

@@ -52,8 +58,9 @@ public CapeRenderer getRenderer() {
5258
return render;
5359
}
5460

55-
private ResourceLocation getPlayerCape(PlayerWrapper capeRenderInfo, EarsFeatures playerFeatures) {
56-
ResourceLocation skin = capeRenderInfo.getCapeTexture();
61+
private /*? >= 1.21.11 {*/ Identifier /*?} else {*//* ResourceLocation *//*?}*/ getPlayerCape(
62+
PlayerWrapper capeRenderInfo, EarsFeatures playerFeatures) {
63+
var skin = capeRenderInfo.getCapeTexture();
5764
if (skin != null) {
5865
return GeneralUtil.getResourceLocation(skin.getNamespace(), TexSource.CAPE.addSuffix(skin.getPath()));
5966
}
@@ -78,13 +85,17 @@ public VertexConsumer getVertexConsumer(MultiBufferSource multiBufferSource, Pla
7885
EarsFeatures playerFeatures = EarsFeatures.getById(capeRenderInfo.getEntity().getUUID());
7986

8087
if (playerFeatures != null && playerFeatures.capeEnabled) {
81-
ResourceLocation cape = getPlayerCape(capeRenderInfo, playerFeatures);
88+
var cape = getPlayerCape(capeRenderInfo, playerFeatures);
8289
if (cape != null) {
83-
//? if >= 1.21.9 {
90+
//? if >= 1.21.11 {
8491

92+
return ItemRenderer.getFoilBuffer(multiBufferSource, RenderTypes.armorCutoutNoCull(cape), false,
93+
false);
94+
//? } else if >= 1.21.9 {
95+
/*
8596
return ItemRenderer.getFoilBuffer(multiBufferSource, RenderType.armorCutoutNoCull(cape), false,
8697
false);
87-
//? } else if >= 1.21.0 {
98+
*///? } else if >= 1.21.0 {
8899
/*
89100
return ItemRenderer.getArmorFoilBuffer(multiBufferSource,
90101
RenderType.armorCutoutNoCull(cape), false);

‎src/main/java/dev/tr7zw/waveycapes/support/MinecraftCapesSupport.java‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@
88
import dev.tr7zw.waveycapes.CapeRenderer;
99
import dev.tr7zw.waveycapes.versionless.ModBase;
1010
import net.minecraft.client.renderer.MultiBufferSource;
11-
import net.minecraft.client.renderer.RenderType;
11+
//? if >= 1.21.11 {
12+
13+
import net.minecraft.client.renderer.rendertype.*;
14+
//? } else {
15+
/*
16+
import net.minecraft.client.renderer.*;
17+
*///? }
1218
import net.minecraft.client.renderer.entity.ItemRenderer;
1319
import net.minecraftcapes.config.MinecraftCapesConfig;
1420
import net.minecraftcapes.player.PlayerHandler;
@@ -86,12 +92,17 @@ private class MinecraftCapesRenderer implements CapeRenderer {
8692
public VertexConsumer getVertexConsumer(MultiBufferSource multiBufferSource, PlayerWrapper capeRenderInfo) {
8793
PlayerHandler playerHandler = getCape.apply(capeRenderInfo);
8894
if (MinecraftCapesConfig.isCapeVisible() && playerHandler.getCapeLocation() != null) {
89-
//? if >= 1.21.9 {
95+
//? if >= 1.21.11 {
9096

97+
return ItemRenderer.getFoilBuffer(multiBufferSource,
98+
RenderTypes.entityTranslucent(playerHandler.getCapeLocation()), false,
99+
playerHandler.getHasCapeGlint());
100+
//? } else if >= 1.21.9 {
101+
/*
91102
return ItemRenderer.getFoilBuffer(multiBufferSource,
92103
RenderType.entityTranslucent(playerHandler.getCapeLocation()), false,
93104
playerHandler.getHasCapeGlint());
94-
//? } else if >= 1.21.0 {
105+
*///? } else if >= 1.21.0 {
95106
/*
96107
return ItemRenderer.getArmorFoilBuffer(multiBufferSource,
97108
RenderType.entityTranslucent(playerHandler.getCapeLocation()), playerHandler.getHasCapeGlint());
@@ -102,11 +113,15 @@ public VertexConsumer getVertexConsumer(MultiBufferSource multiBufferSource, Pla
102113
playerHandler.getHasCapeGlint());
103114
*///? }
104115
} else {
105-
//? if >= 1.21.9 {
116+
//? if >= 1.21.11 {
106117

118+
return ItemRenderer.getFoilBuffer(multiBufferSource,
119+
RenderTypes.entityTranslucent(capeRenderInfo.getCapeTexture()), false, false);
120+
//? } else if >= 1.21.9 {
121+
/*
107122
return ItemRenderer.getFoilBuffer(multiBufferSource,
108123
RenderType.entityTranslucent(capeRenderInfo.getCapeTexture()), false, false);
109-
//? } else if >= 1.21.0 {
124+
*///? } else if >= 1.21.0 {
110125
/*
111126
return ItemRenderer.getArmorFoilBuffer(multiBufferSource,
112127
RenderType.entityTranslucent(capeRenderInfo.getCapeTexture()), false);

‎src/test/java/dev/tr7zw/tests/MixinTests.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@
66
import org.objenesis.ObjenesisStd;
77

88
import net.minecraft.SharedConstants;
9-
import net.minecraft.client.model.PlayerModel;
9+
//? if >= 1.21.11 {
10+
11+
import net.minecraft.client.model.player.*;
12+
//? } else {
13+
/*
14+
import net.minecraft.client.model.*;
15+
*///? }
1016
import net.minecraft.client.player.LocalPlayer;
1117
import net.minecraft.server.Bootstrap;
1218

0 commit comments

Comments
 (0)