MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Continue mapping migration

Browse source
This commit is contained in:
Aleksey 2021-04-12 21:38:22 +03:00
parent 99ade39404
commit f03fd03bd0
499 changed files with 12567 additions and 12723 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/main/java/ru/betterend/entity/render/RendererEntityCubozoa.java
View file

@ -1,57 +1,54 @@
package ru.betterend.entity.render;
import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.render.entity.MobEntityRenderer;
import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;
import net.minecraft.client.util.math.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
import net.minecraft.client.renderer.entity.MobRenderer;
import net.minecraft.client.renderer.entity.layers.EyesLayer;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.resources.ResourceLocation;
import ru.betterend.BetterEnd;
import ru.betterend.entity.CubozoaEntity;
import ru.betterend.entity.model.CubozoaEntityModel;
public class RendererEntityCubozoa extends MobEntityRenderer<CubozoaEntity, CubozoaEntityModel> {
public class RendererEntityCubozoa extends MobRenderer<CubozoaEntity, CubozoaEntityModel> {
private static final ResourceLocation[] TEXTURE = new ResourceLocation[2];
private static final RenderLayer[] GLOW = new RenderLayer[2];
private static final RenderType[] GLOW = new RenderType[2];
public RendererEntityCubozoa(EntityRenderDispatcher entityRenderDispatcher) {
super(entityRenderDispatcher, new CubozoaEntityModel(), 0.5f);
this.addFeature(new EyesFeatureRenderer<CubozoaEntity, CubozoaEntityModel>(this) {
this.addLayer(new EyesLayer<CubozoaEntity, CubozoaEntityModel>(this) {
@Override
public RenderLayer getEyesTexture() {
public RenderType renderType() {
return GLOW[0];
}
@Override
public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
CubozoaEntity entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress,
float headYaw, float headPitch) {
public void render(PoseStack matrices, MultiBufferSource vertexConsumers, int light, CubozoaEntity entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw, float headPitch) {
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(GLOW[entity.getVariant()]);
this.getContextModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F,
1.0F, 1.0F);
this.getParentModel().renderToBuffer(matrices, vertexConsumer, 15728640, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F);
}
});
});
}
@Override
protected void scale(CubozoaEntity entity, MatrixStack matrixStack, float f) {
protected void scale(CubozoaEntity entity, PoseStack matrixStack, float f) {
float scale = entity.getScale();
matrixStack.scale(scale, scale, scale);
}
@Override
public ResourceLocation getTexture(CubozoaEntity entity) {
public ResourceLocation getTextureLocation(CubozoaEntity entity) {
return TEXTURE[entity.getVariant()];
}
static {
TEXTURE[0] = BetterEnd.makeID("textures/entity/cubozoa/cubozoa.png");
TEXTURE[1] = BetterEnd.makeID("textures/entity/cubozoa/cubozoa_sulphur.png");
GLOW[0] = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/cubozoa/cubozoa_glow.png"));
GLOW[1] = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/cubozoa/cubozoa_sulphur_glow.png"));
GLOW[0] = RenderType.eyes(BetterEnd.makeID("textures/entity/cubozoa/cubozoa_glow.png"));
GLOW[1] = RenderType.eyes(BetterEnd.makeID("textures/entity/cubozoa/cubozoa_sulphur_glow.png"));
}
}

18
src/main/java/ru/betterend/entity/render/RendererEntityDragonfly.java
View file

@ -1,30 +1,30 @@
package ru.betterend.entity.render;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.render.entity.MobEntityRenderer;
import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
import net.minecraft.client.renderer.entity.MobRenderer;
import net.minecraft.client.renderer.entity.layers.EyesLayer;
import net.minecraft.resources.ResourceLocation;
import ru.betterend.BetterEnd;
import ru.betterend.entity.DragonflyEntity;
import ru.betterend.entity.model.DragonflyEntityModel;
public class RendererEntityDragonfly extends MobEntityRenderer<DragonflyEntity, DragonflyEntityModel> {
public class RendererEntityDragonfly extends MobRenderer<DragonflyEntity, DragonflyEntityModel> {
private static final ResourceLocation TEXTURE = BetterEnd.makeID("textures/entity/dragonfly.png");
private static final RenderLayer GLOW = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/dragonfly_glow.png"));
private static final RenderType GLOW = RenderType.eyes(BetterEnd.makeID("textures/entity/dragonfly_glow.png"));
public RendererEntityDragonfly(EntityRenderDispatcher entityRenderDispatcher) {
super(entityRenderDispatcher, new DragonflyEntityModel(), 0.5f);
this.addFeature(new EyesFeatureRenderer<DragonflyEntity, DragonflyEntityModel>(this) {
this.addLayer(new EyesLayer<DragonflyEntity, DragonflyEntityModel>(this) {
@Override
public RenderLayer getEyesTexture() {
public RenderType renderType() {
return GLOW;
}
});
}
@Override
public ResourceLocation getTexture(DragonflyEntity entity) {
public ResourceLocation getTextureLocation(DragonflyEntity entity) {
return TEXTURE;
}
}

40
src/main/java/ru/betterend/entity/render/RendererEntityEndFish.java
View file

@ -1,56 +1,56 @@
package ru.betterend.entity.render;
import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.render.entity.MobEntityRenderer;
import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;
import net.minecraft.client.util.math.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
import net.minecraft.client.renderer.entity.MobRenderer;
import net.minecraft.client.renderer.entity.layers.EyesLayer;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.resources.ResourceLocation;
import ru.betterend.BetterEnd;
import ru.betterend.entity.EndFishEntity;
import ru.betterend.entity.model.EndFishEntityModel;
public class RendererEntityEndFish extends MobEntityRenderer<EndFishEntity, EndFishEntityModel> {
public class RendererEntityEndFish extends MobRenderer<EndFishEntity, EndFishEntityModel> {
private static final ResourceLocation[] TEXTURE = new ResourceLocation[EndFishEntity.VARIANTS];
private static final RenderLayer[] GLOW = new RenderLayer[EndFishEntity.VARIANTS];
private static final RenderType[] GLOW = new RenderType[EndFishEntity.VARIANTS];
public RendererEntityEndFish(EntityRenderDispatcher entityRenderDispatcher) {
super(entityRenderDispatcher, new EndFishEntityModel(), 0.5f);
this.addFeature(new EyesFeatureRenderer<EndFishEntity, EndFishEntityModel>(this) {
this.addLayer(new EyesLayer<EndFishEntity, EndFishEntityModel>(this) {
@Override
public RenderLayer getEyesTexture() {
public RenderType renderType() {
return GLOW[0];
}
@Override
public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
EndFishEntity entity, float limbAngle, float limbDistance, float tickDelta, float animationProgress,
float headYaw, float headPitch) {
public void render(PoseStack matrices, MultiBufferSource vertexConsumers, int light, EndFishEntity entity,
float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw,
float headPitch) {
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(GLOW[entity.getVariant()]);
this.getContextModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F,
1.0F, 1.0F);
this.getParentModel().renderToBuffer(matrices, vertexConsumer, 15728640, OverlayTexture.NO_OVERLAY,
1.0F, 1.0F, 1.0F, 1.0F);
}
});
}
@Override
protected void scale(EndFishEntity entity, MatrixStack matrixStack, float f) {
protected void scale(EndFishEntity entity, PoseStack matrixStack, float f) {
float scale = entity.getScale();
matrixStack.scale(scale, scale, scale);
}
@Override
public ResourceLocation getTexture(EndFishEntity entity) {
public ResourceLocation getTextureLocation(EndFishEntity entity) {
return TEXTURE[entity.getVariant()];
}
static {
for (int i = 0; i < EndFishEntity.VARIANTS; i++) {
TEXTURE[i] = BetterEnd.makeID("textures/entity/end_fish/end_fish_" + i + ".png");
GLOW[i] = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/end_fish/end_fish_" + i + "_glow.png"));
GLOW[i] = RenderType.eyes(BetterEnd.makeID("textures/entity/end_fish/end_fish_" + i + "_glow.png"));
}
}
}

92
src/main/java/ru/betterend/entity/render/RendererEntityEndSlime.java
View file

@ -1,103 +1,103 @@
package ru.betterend.entity.render;
import net.minecraft.client.render.OverlayTexture;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.render.entity.LivingEntityRenderer;
import net.minecraft.client.render.entity.MobEntityRenderer;
import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;
import net.minecraft.client.render.entity.feature.FeatureRenderer;
import net.minecraft.client.render.entity.feature.FeatureRendererContext;
import net.minecraft.client.util.math.MatrixStack;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import net.minecraft.client.renderer.entity.MobRenderer;
import net.minecraft.client.renderer.entity.RenderLayerParent;
import net.minecraft.client.renderer.entity.layers.EyesLayer;
import net.minecraft.client.renderer.entity.layers.RenderLayer;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import ru.betterend.BetterEnd;
import ru.betterend.entity.EndSlimeEntity;
import ru.betterend.entity.model.EndSlimeEntityModel;
public class RendererEntityEndSlime extends MobEntityRenderer<EndSlimeEntity, EndSlimeEntityModel<EndSlimeEntity>> {
public class RendererEntityEndSlime extends MobRenderer<EndSlimeEntity, EndSlimeEntityModel<EndSlimeEntity>> {
private static final ResourceLocation TEXTURE[] = new ResourceLocation[4];
private static final RenderLayer GLOW[] = new RenderLayer[4];
private static final RenderType GLOW[] = new RenderType[4];
public RendererEntityEndSlime(EntityRenderDispatcher entityRenderDispatcher) {
super(entityRenderDispatcher, new EndSlimeEntityModel<EndSlimeEntity>(false), 0.25F);
this.addFeature(new OverlayFeatureRenderer<EndSlimeEntity>(this));
this.addFeature(new EyesFeatureRenderer<EndSlimeEntity, EndSlimeEntityModel<EndSlimeEntity>>(this) {
this.addLayer(new OverlayFeatureRenderer<EndSlimeEntity>(this));
this.addLayer(new EyesLayer<EndSlimeEntity, EndSlimeEntityModel<EndSlimeEntity>>(this) {
@Override
public RenderLayer getEyesTexture() {
public RenderType renderType() {
return GLOW[0];
}
@Override
public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
EndSlimeEntity entity, float limbAngle, float limbDistance, float tickDelta,
float animationProgress, float headYaw, float headPitch) {
public void render(PoseStack matrices, MultiBufferSource vertexConsumers, int light, EndSlimeEntity entity,
float limbAngle, float limbDistance, float tickDelta, float animationProgress, float headYaw,
float headPitch) {
VertexConsumer vertexConsumer = vertexConsumers.getBuffer(GLOW[entity.getSlimeType()]);
this.getContextModel().render(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F,
1.0F, 1.0F);
this.getParentModel().renderToBuffer(matrices, vertexConsumer, 15728640, OverlayTexture.NO_OVERLAY,
1.0F, 1.0F, 1.0F, 1.0F);
if (entity.isLake()) {
this.getContextModel().renderFlower(matrices, vertexConsumer, 15728640, OverlayTexture.DEFAULT_UV);
this.getParentModel().renderFlower(matrices, vertexConsumer, 15728640, OverlayTexture.NO_OVERLAY);
}
}
});
}
@Override
public ResourceLocation getTexture(EndSlimeEntity entity) {
public ResourceLocation getTextureLocation(EndSlimeEntity entity) {
return TEXTURE[entity.getSlimeType()];
}
@Override
public void render(EndSlimeEntity slimeEntity, float f, float g, MatrixStack matrixStack,
VertexConsumerProvider vertexConsumerProvider, int i) {
public void render(EndSlimeEntity slimeEntity, float f, float g, PoseStack matrixStack,
MultiBufferSource vertexConsumerProvider, int i) {
this.shadowRadius = 0.25F * (float) slimeEntity.getSize();
super.render(slimeEntity, f, g, matrixStack, vertexConsumerProvider, i);
}
@Override
protected void scale(EndSlimeEntity slimeEntity, MatrixStack matrixStack, float f) {
protected void scale(EndSlimeEntity slimeEntity, PoseStack matrixStack, float f) {
matrixStack.scale(0.999F, 0.999F, 0.999F);
matrixStack.translate(0.0D, 0.0010000000474974513D, 0.0D);
float h = (float) slimeEntity.getSize();
float i = Mth.lerp(f, slimeEntity.lastStretch, slimeEntity.stretch) / (h * 0.5F + 1.0F);
float i = Mth.lerp(f, slimeEntity.oSquish, slimeEntity.squish) / (h * 0.5F + 1.0F);
float j = 1.0F / (i + 1.0F);
matrixStack.scale(j * h, 1.0F / j * h, j * h);
}
private final class OverlayFeatureRenderer<T extends EndSlimeEntity>
extends FeatureRenderer<T, EndSlimeEntityModel<T>> {
extends RenderLayer<T, EndSlimeEntityModel<T>> {
private final EndSlimeEntityModel<T> modelOrdinal = new EndSlimeEntityModel<T>(true);
private final EndSlimeEntityModel<T> modelLake = new EndSlimeEntityModel<T>(true);
public OverlayFeatureRenderer(FeatureRendererContext<T, EndSlimeEntityModel<T>> featureRendererContext) {
public OverlayFeatureRenderer(RenderLayerParent<T, EndSlimeEntityModel<T>> featureRendererContext) {
super(featureRendererContext);
}
public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i,
T livingEntity, float f, float g, float h, float j, float k, float l) {
public void render(PoseStack matrixStack, MultiBufferSource vertexConsumerProvider, int i, T livingEntity,
float f, float g, float h, float j, float k, float l) {
if (!livingEntity.isInvisible()) {
if (livingEntity.isLake()) {
VertexConsumer vertexConsumer = vertexConsumerProvider
.getBuffer(RenderLayer.getEntityCutout(this.getTexture(livingEntity)));
this.getContextModel().renderFlower(matrixStack, vertexConsumer, i,
LivingEntityRenderer.getOverlay(livingEntity, 0.0F));
.getBuffer(RenderType.entityCutout(this.getTextureLocation(livingEntity)));
this.getParentModel().renderFlower(matrixStack, vertexConsumer, i,
LivingEntityRenderer.getOverlayCoords(livingEntity, 0.0F));
} else if (livingEntity.isAmber() || livingEntity.isChorus()) {
VertexConsumer vertexConsumer = vertexConsumerProvider
.getBuffer(RenderLayer.getEntityCutout(this.getTexture(livingEntity)));
this.getContextModel().renderCrop(matrixStack, vertexConsumer, i,
LivingEntityRenderer.getOverlay(livingEntity, 0.0F));
.getBuffer(RenderType.entityCutout(this.getTextureLocation(livingEntity)));
this.getParentModel().renderCrop(matrixStack, vertexConsumer, i,
LivingEntityRenderer.getOverlayCoords(livingEntity, 0.0F));
}
EndSlimeEntityModel<T> model = livingEntity.getSlimeType() == 1 ? modelLake : modelOrdinal;
this.getContextModel().copyStateTo(model);
model.animateModel(livingEntity, f, g, h);
model.setAngles(livingEntity, f, g, j, k, l);
this.getParentModel().copyPropertiesTo(model);
model.prepareMobModel(livingEntity, f, g, h);
model.setupAnim(livingEntity, f, g, j, k, l);
VertexConsumer vertexConsumer = vertexConsumerProvider
.getBuffer(RenderLayer.getEntityTranslucent(this.getTexture(livingEntity)));
model.render(matrixStack, vertexConsumer, i, LivingEntityRenderer.getOverlay(livingEntity, 0.0F), 1.0F,
1.0F, 1.0F, 1.0F);
.getBuffer(RenderType.entityTranslucent(this.getTextureLocation(livingEntity)));
model.renderToBuffer(matrixStack, vertexConsumer, i,
LivingEntityRenderer.getOverlayCoords(livingEntity, 0.0F), 1.0F, 1.0F, 1.0F, 1.0F);
}
}
}
@ -107,9 +107,9 @@ public class RendererEntityEndSlime extends MobEntityRenderer<EndSlimeEntity, En
TEXTURE[1] = BetterEnd.makeID("textures/entity/end_slime/end_slime_mossy.png");
TEXTURE[2] = BetterEnd.makeID("textures/entity/end_slime/end_slime_lake.png");
TEXTURE[3] = BetterEnd.makeID("textures/entity/end_slime/end_slime_amber.png");
GLOW[0] = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/end_slime/end_slime_glow.png"));
GLOW[0] = RenderType.eyes(BetterEnd.makeID("textures/entity/end_slime/end_slime_glow.png"));
GLOW[1] = GLOW[0];
GLOW[2] = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/end_slime/end_slime_lake_glow.png"));
GLOW[3] = RenderLayer.getEyes(BetterEnd.makeID("textures/entity/end_slime/end_slime_amber_glow.png"));
GLOW[2] = RenderType.eyes(BetterEnd.makeID("textures/entity/end_slime/end_slime_lake_glow.png"));
GLOW[3] = RenderType.eyes(BetterEnd.makeID("textures/entity/end_slime/end_slime_amber_glow.png"));
}
}

12
src/main/java/ru/betterend/entity/render/RendererEntityShadowWalker.java
View file

@ -1,22 +1,22 @@
package ru.betterend.entity.render;
import net.minecraft.client.render.entity.BipedEntityRenderer;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.render.entity.model.PlayerEntityModel;
import net.minecraft.client.model.PlayerModel;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
import net.minecraft.client.renderer.entity.HumanoidMobRenderer;
import net.minecraft.resources.ResourceLocation;
import ru.betterend.BetterEnd;
import ru.betterend.entity.ShadowWalkerEntity;
public class RendererEntityShadowWalker
extends BipedEntityRenderer<ShadowWalkerEntity, PlayerEntityModel<ShadowWalkerEntity>> {
extends HumanoidMobRenderer<ShadowWalkerEntity, PlayerModel<ShadowWalkerEntity>> {
private static final ResourceLocation TEXTURE = BetterEnd.makeID("textures/entity/shadow_walker.png");
public RendererEntityShadowWalker(EntityRenderDispatcher entityRenderDispatcher) {
super(entityRenderDispatcher, new PlayerEntityModel<ShadowWalkerEntity>(0.0F, false), 0.5F);
super(entityRenderDispatcher, new PlayerModel<ShadowWalkerEntity>(0.0F, false), 0.5F);
}
@Override
public ResourceLocation getTexture(ShadowWalkerEntity zombieEntity) {
public ResourceLocation getTextureLocation(ShadowWalkerEntity zombieEntity) {
return TEXTURE;
}
}

8
src/main/java/ru/betterend/entity/render/SilkMothEntityRenderer.java
View file

@ -1,13 +1,13 @@
package ru.betterend.entity.render;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
import net.minecraft.client.render.entity.MobEntityRenderer;
import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
import net.minecraft.client.renderer.entity.MobRenderer;
import net.minecraft.resources.ResourceLocation;
import ru.betterend.BetterEnd;
import ru.betterend.entity.SilkMothEntity;
import ru.betterend.entity.model.SilkMothEntityModel;
public class SilkMothEntityRenderer extends MobEntityRenderer<SilkMothEntity, SilkMothEntityModel> {
public class SilkMothEntityRenderer extends MobRenderer<SilkMothEntity, SilkMothEntityModel> {
private static final ResourceLocation TEXTURE = BetterEnd.makeID("textures/entity/silk_moth.png");
public SilkMothEntityRenderer(EntityRenderDispatcher entityRenderDispatcher) {
@ -15,7 +15,7 @@ public class SilkMothEntityRenderer extends MobEntityRenderer<SilkMothEntity, Si
}
@Override
public ResourceLocation getTexture(SilkMothEntity entity) {
public ResourceLocation getTextureLocation(SilkMothEntity entity) {
return TEXTURE;
}
}