Skip to content

Commit 6e43754

Browse files
committed
update to vampirism beta 2
1 parent e6e58ca commit 6e43754

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ type="test"
3737
classification="test"
3838

3939
#vampirism settings
40-
vampirism_version=1.10.0-beta.1
41-
vampirism_version_range=[1.10.0-beta.1,1.11.0)
40+
vampirism_version=1.10.0-beta.2
41+
vampirism_version_range=[1.10.0-beta.2,1.11.0)
4242

4343
#jei setting
4444
include_jei=true

src/main/java/de/teamlapen/werewolves/client/render/HumanWerewolfRenderer.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraft.client.model.geom.ModelLayers;
1010
import net.minecraft.client.renderer.entity.EntityRendererProvider;
1111
import net.minecraft.client.renderer.entity.MobRenderer;
12+
import net.minecraft.client.resources.PlayerSkin;
1213
import net.minecraft.resources.ResourceLocation;
1314
import org.apache.commons.lang3.tuple.Pair;
1415
import org.jetbrains.annotations.NotNull;
@@ -19,21 +20,21 @@
1920

2021
public class HumanWerewolfRenderer extends DualBipedRenderer<HumanWerewolfEntity, PlayerModel<HumanWerewolfEntity>> {
2122

22-
private final Pair<ResourceLocation, PlayerModelType>[] textures;
23+
private final PlayerSkin[] textures;
2324

2425
public HumanWerewolfRenderer(EntityRendererProvider.Context context) {
2526
super(context, new PlayerModel<>(context.bakeLayer(ModelLayers.PLAYER), false), new PlayerModel<>(context.bakeLayer(ModelLayers.PLAYER_SLIM), true),0.5f);
2627
this.textures = gatherTextures("textures/entity/human", true);
2728
}
2829

2930
@Override
30-
protected Pair<ResourceLocation, PlayerModelType> determineTextureAndModel(HumanWerewolfEntity entity) {
31+
protected PlayerSkin determineTextureAndModel(HumanWerewolfEntity entity) {
3132
return textures[entity.getSkinType() % textures.length];
3233
}
3334

34-
protected Pair<ResourceLocation, PlayerModelType> @NotNull [] gatherTextures(@NotNull String dirPath, boolean required) {
35+
protected PlayerSkin @NotNull [] gatherTextures(@NotNull String dirPath, boolean required) {
3536
Collection<ResourceLocation> hunterTextures = new ArrayList<>(Minecraft.getInstance().getResourceManager().listResources(dirPath, s -> s.getPath().endsWith(".png")).keySet());
36-
Pair<ResourceLocation, PlayerModelType>[] textures = separateSlimTextures(hunterTextures.stream().filter(r -> REFERENCE.MODID.equals(r.getNamespace())));
37+
PlayerSkin[] textures = separateSlimTextures(hunterTextures.stream().filter(r -> REFERENCE.MODID.equals(r.getNamespace())));
3738
if (textures.length == 0 && required) {
3839
throw new IllegalStateException("Must have at least one hunter texture: " + REFERENCE.MODID + ":" + dirPath + "/texture.png");
3940
}

0 commit comments

Comments
 (0)