Skip to content

Commit

Permalink
updated parameter names
Browse files Browse the repository at this point in the history
  • Loading branch information
NewJumper committed Aug 4, 2024
1 parent 51293d2 commit 7f5679a
Show file tree
Hide file tree
Showing 79 changed files with 638 additions and 640 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@ public static LayerDefinition createBodyModel() {
}

@Override
public void setupAnim(AnglerFish pEntity, float pLimbSwing, float pLimbSwingAmount, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) {
public void setupAnim(AnglerFish entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
this.root.getAllParts().forEach(ModelPart::resetPose);
float f = 1;
float f1 = 1;
if (!pEntity.isInWater()) {
if (!entity.isInWater()) {
f = 1.3f;
f1 = 1.7f;
}

this.root.getChild("root").getChild("body").yRot = -f * 0.25f * Mth.sin(f1 * 0.6f * pAgeInTicks);
this.animate(pEntity.attackState, AnglerFishAnimation.BITE, pAgeInTicks);
this.root.getChild("root").getChild("body").yRot = -f * 0.25f * Mth.sin(f1 * 0.6f * ageInTicks);
this.animate(entity.attackState, AnglerFishAnimation.BITE, ageInTicks);
}

@Override
public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, int pColor) {
root.getChild("root").render(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pColor);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
root.getChild("root").render(poseStack, buffer, packedLight, packedOverlay, color);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ private void applyHeadRotation(float netHeadYaw, float headPitch) {
}

@Override
public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, int pColor) {
root.getChild("root").render(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pColor);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
root.getChild("root").render(poseStack, buffer, packedLight, packedOverlay, color);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ public void setupAnim(SculkLeech entity, float limbSwing, float limbSwingAmount,
}

@Override
public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, int pColor) {
root.getChild("root").render(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pColor);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
root.getChild("root").render(poseStack, buffer, packedLight, packedOverlay, color);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ private void applyHeadRotation(float netHeadYaw, float headPitch) {
}

@Override
public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, int pColor) {
root.getChild("root").render(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pColor);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
root.getChild("root").render(poseStack, buffer, packedLight, packedOverlay, color);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ private void applyHeadRotation(float netHeadYaw, float headPitch) {
}

@Override
public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, int pColor) {
root.getChild("root").render(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pColor);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
root.getChild("root").render(poseStack, buffer, packedLight, packedOverlay, color);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ public void setupAnim(ShriekWorm entity, float limbSwing, float limbSwingAmount,
}

@Override
public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, int pColor) {
root.getChild("root").render(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pColor);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
root.getChild("root").render(poseStack, buffer, packedLight, packedOverlay, color);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ private void applyHeadRotation(float netHeadYaw, float headPitch) {
}

@Override
public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, int pColor) {
root.getChild("root").render(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pColor);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
root.getChild("root").render(poseStack, buffer, packedLight, packedOverlay, color);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ public static LayerDefinition createBodyModel() {
}

@Override
public void setupAnim(E pEntity, float pLimbSwing, float pLimbSwingAmount, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) {
pNetHeadYaw = Mth.clamp(pNetHeadYaw, -30, 30);
pHeadPitch = Mth.clamp(pHeadPitch, -25, 45);
this.head.yRot = pNetHeadYaw * ((float)Math.PI / 180f);
this.head.xRot = pHeadPitch * ((float)Math.PI / 180f);
public void setupAnim(E entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
netHeadYaw = Mth.clamp(netHeadYaw, -30, 30);
headPitch = Mth.clamp(headPitch, -25, 45);
this.head.yRot = netHeadYaw * ((float)Math.PI / 180f);
this.head.xRot = headPitch * ((float)Math.PI / 180f);
}

@Override
public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, int pColor) {
head.getChild("root").render(pPoseStack, pBuffer, pPackedLight, pPackedOverlay, pColor);
public void renderToBuffer(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, int color) {
head.getChild("root").render(poseStack, buffer, packedLight, packedOverlay, color);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
public class AnglerFishGlowRenderer extends EyesLayer<AnglerFish, AnglerFishModel> {
private static final RenderType FISH_GLOW = RenderType.entityTranslucentEmissive(DeeperDarker.rl("textures/entity/angler_fish_glow.png"));

public AnglerFishGlowRenderer(RenderLayerParent<AnglerFish, AnglerFishModel> pRenderer) {
super(pRenderer);
public AnglerFishGlowRenderer(RenderLayerParent<AnglerFish, AnglerFishModel> renderer) {
super(renderer);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,32 @@ public class AnglerFishRenderer extends MobRenderer<AnglerFish, AnglerFishModel>
public static final ModelLayerLocation MODEL = new ModelLayerLocation(DeeperDarker.rl("angler_fish_layer"), "main");
private static final ResourceLocation TEXTURE = DeeperDarker.rl("textures/entity/angler_fish.png");

public AnglerFishRenderer(EntityRendererProvider.Context pContext) {
super(pContext, new AnglerFishModel(pContext.bakeLayer(MODEL)), 0.4f);
public AnglerFishRenderer(EntityRendererProvider.Context context) {
super(context, new AnglerFishModel(context.bakeLayer(MODEL)), 0.4f);
this.addLayer(new AnglerFishGlowRenderer(this));
}


@Override
public ResourceLocation getTextureLocation(AnglerFish pEntity) {
public ResourceLocation getTextureLocation(AnglerFish entity) {
return TEXTURE;
}

@Override
protected void setupRotations(AnglerFish pEntity, PoseStack pPoseStack, float pBob, float pYBodyRot, float pPartialTick, float pScale) {
super.setupRotations(pEntity, pPoseStack, pBob, pYBodyRot, pPartialTick, pScale);
protected void setupRotations(AnglerFish entity, PoseStack poseStack, float bob, float yBodyRot, float partialTick, float scale) {
super.setupRotations(entity, poseStack, bob, yBodyRot, partialTick, scale);
float f = 1f;
float f1 = 1f;
if (!pEntity.isInWater()) {
if (!entity.isInWater()) {
f = 1.3f;
f1 = 1.7f;
}

float f2 = f * 4.3f * Mth.sin(f1 * 0.6f * pBob);
pPoseStack.mulPose(Axis.YP.rotationDegrees(f2));
pPoseStack.translate(0, 0, -0.4f);
if (!pEntity.isInWater()) {
pPoseStack.translate(0.2f, 0.1f, 0f);
pPoseStack.mulPose(Axis.ZP.rotationDegrees(90f));
float f2 = f * 4.3f * Mth.sin(f1 * 0.6f * bob);
poseStack.mulPose(Axis.YP.rotationDegrees(f2));
poseStack.translate(0, 0, -0.4f);
if (!entity.isInWater()) {
poseStack.translate(0.2f, 0.1f, 0f);
poseStack.mulPose(Axis.ZP.rotationDegrees(90f));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@ public CrystallizedAmberBlockRenderer(BlockEntityRendererProvider.Context contex
}

@Override
public void render(CrystallizedAmberBlockEntity pBlockEntity, float pPartialTick, @NotNull PoseStack pPoseStack, @NotNull MultiBufferSource pBuffer, int pPackedLight, int pPackedOverlay) {
if(!pBlockEntity.getBlockState().getValue(CrystallizedAmberBlock.FOSSILIZED)) return;
public void render(CrystallizedAmberBlockEntity blockEntity, float partialTick, @NotNull PoseStack poseStack, @NotNull MultiBufferSource bufferSource, int packedLight, int packedOverlay) {
if(!blockEntity.getBlockState().getValue(CrystallizedAmberBlock.FOSSILIZED)) return;

pPoseStack.pushPose();
pPoseStack.translate(0.5f, 0.5f, 0.5f);
pPoseStack.mulPose(Axis.XP.rotationDegrees(-40f));
RandomSource random = RandomSource.create(pBlockEntity.getBlockPos().asLong() / (pBlockEntity.getBlockPos().getX() + pBlockEntity.getBlockPos().getZ()));
pPoseStack.mulPose(Axis.YP.rotationDegrees(random.nextFloat() * 180f));
if(pBlockEntity.fossilizedEntity) {
pPoseStack.scale(0.9f, 0.9f, 0.9f);
SculkLeech leech = new SculkLeech(DDEntities.SCULK_LEECH.get(), pBlockEntity.getLevel());
entityRenderer.render(leech, 0, 0, 0, 0, pPartialTick, pPoseStack, pBuffer, pPackedLight);
poseStack.pushPose();
poseStack.translate(0.5f, 0.5f, 0.5f);
poseStack.mulPose(Axis.XP.rotationDegrees(-40f));
RandomSource random = RandomSource.create(blockEntity.getBlockPos().asLong() / (blockEntity.getBlockPos().getX() + blockEntity.getBlockPos().getZ()));
poseStack.mulPose(Axis.YP.rotationDegrees(random.nextFloat() * 180f));
if(blockEntity.fossilizedEntity) {
poseStack.scale(0.9f, 0.9f, 0.9f);
SculkLeech leech = new SculkLeech(DDEntities.SCULK_LEECH.get(), blockEntity.getLevel());
entityRenderer.render(leech, 0, 0, 0, 0, partialTick, poseStack, bufferSource, packedLight);
} else {
pPoseStack.scale(0.6f, 0.6f, 0.6f);
itemRenderer.renderStatic(pBlockEntity.getLoot(), ItemDisplayContext.FIXED, pPackedLight, pPackedOverlay, pPoseStack, pBuffer, pBlockEntity.getLevel(), 0);
poseStack.scale(0.6f, 0.6f, 0.6f);
itemRenderer.renderStatic(blockEntity.getLoot(), ItemDisplayContext.FIXED, packedLight, packedOverlay, poseStack, bufferSource, blockEntity.getLevel(), 0);
}

pPoseStack.popPose();
poseStack.popPose();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ public class DDBoatRenderer extends BoatRenderer {
private final Map<String, ModelLayerLocation> chestBoatModels;
private final Map<String, ModelLayerLocation> boatModels;

public DDBoatRenderer(EntityRendererProvider.Context pContext, boolean pChestBoat) {
super(pContext, pChestBoat);
this.HAS_CHEST = pChestBoat;
public DDBoatRenderer(EntityRendererProvider.Context context, boolean chest) {
super(context, chest);
this.HAS_CHEST = chest;
this.chestBoatModels = Map.of(DDBlocks.ECHO.name(), ECHO_CHEST_BOAT_MODEL, DDBlocks.BLOOM.name(), BLOOM_CHEST_BOAT_MODEL);
this.boatModels = Map.of(DDBlocks.ECHO.name(), ECHO_BOAT_MODEL, DDBlocks.BLOOM.name(), BLOOM_BOAT_MODEL);
this.BOAT_RESOURCES = ImmutableMap.of(DDBlocks.ECHO.name(), Pair.of(DeeperDarker.rl("textures/entity/" + (pChestBoat ? "chest_boat" : "boat") + "/" + DDBlocks.ECHO.name() + ".png"), this.createBoatModel(pContext, DDBlocks.ECHO.name())),
DDBlocks.BLOOM.name(), Pair.of(DeeperDarker.rl("textures/entity/" + (pChestBoat ? "chest_boat" : "boat") + "/" + DDBlocks.BLOOM.name() + ".png"), this.createBoatModel(pContext, DDBlocks.BLOOM.name())));
this.BOAT_RESOURCES = ImmutableMap.of(
DDBlocks.ECHO.name(), Pair.of(DeeperDarker.rl("textures/entity/" + (chest ? "chest_boat" : "boat") + "/" + DDBlocks.ECHO.name() + ".png"), this.createBoatModel(context, DDBlocks.ECHO.name())),
DDBlocks.BLOOM.name(), Pair.of(DeeperDarker.rl("textures/entity/" + (chest ? "chest_boat" : "boat") + "/" + DDBlocks.BLOOM.name() + ".png"), this.createBoatModel(context, DDBlocks.BLOOM.name()))
);
}

private ListModel<Boat> createBoatModel(EntityRendererProvider.Context context, String boatType) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public class SculkCentipedeRenderer extends MobRenderer<SculkCentipede, SculkCen
public static final ModelLayerLocation MODEL = new ModelLayerLocation(DeeperDarker.rl("sculk_centipede_layer"), "main");
private static final ResourceLocation TEXTURE = DeeperDarker.rl("textures/entity/sculk_centipede.png");

public SculkCentipedeRenderer(EntityRendererProvider.Context pContext) {
super(pContext, new SculkCentipedeModel(pContext.bakeLayer(MODEL)), 0.6f);
public SculkCentipedeRenderer(EntityRendererProvider.Context context) {
super(context, new SculkCentipedeModel(context.bakeLayer(MODEL)), 0.6f);
}

@Override
public ResourceLocation getTextureLocation(SculkCentipede pEntity) {
public ResourceLocation getTextureLocation(SculkCentipede entity) {
return TEXTURE;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public class SculkLeechRenderer extends MobRenderer<SculkLeech, SculkLeechModel>
public static final ModelLayerLocation MODEL = new ModelLayerLocation(DeeperDarker.rl("sculk_leech_layer"), "main");
private static final ResourceLocation TEXTURE = DeeperDarker.rl("textures/entity/sculk_leech.png");

public SculkLeechRenderer(EntityRendererProvider.Context pContext) {
super(pContext, new SculkLeechModel(pContext.bakeLayer(MODEL)), 0.4f);
public SculkLeechRenderer(EntityRendererProvider.Context context) {
super(context, new SculkLeechModel(context.bakeLayer(MODEL)), 0.4f);
}

@Override
public ResourceLocation getTextureLocation(SculkLeech pEntity) {
public ResourceLocation getTextureLocation(SculkLeech entity) {
return TEXTURE;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public class SculkSnapperRenderer extends MobRenderer<SculkSnapper, SculkSnapper
public static final ModelLayerLocation MODEL = new ModelLayerLocation(DeeperDarker.rl("sculk_snapper_layer"), "main");
private static final ResourceLocation TEXTURE = DeeperDarker.rl("textures/entity/sculk_snapper.png");

public SculkSnapperRenderer(EntityRendererProvider.Context pContext) {
super(pContext, new SculkSnapperModel(pContext.bakeLayer(MODEL)), 0.5f);
public SculkSnapperRenderer(EntityRendererProvider.Context context) {
super(context, new SculkSnapperModel(context.bakeLayer(MODEL)), 0.5f);
}

@Override
public ResourceLocation getTextureLocation(SculkSnapper pEntity) {
public ResourceLocation getTextureLocation(SculkSnapper entity) {
return TEXTURE;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public class ShatteredRenderer extends MobRenderer<Shattered, ShatteredModel> {
public static final ModelLayerLocation MODEL = new ModelLayerLocation(DeeperDarker.rl("shattered_layer"), "main");
private static final ResourceLocation TEXTURE = DeeperDarker.rl("textures/entity/shattered.png");

public ShatteredRenderer(EntityRendererProvider.Context pContext) {
super(pContext, new ShatteredModel(pContext.bakeLayer(MODEL)), 0.5f);
public ShatteredRenderer(EntityRendererProvider.Context context) {
super(context, new ShatteredModel(context.bakeLayer(MODEL)), 0.5f);
}

@Override
public ResourceLocation getTextureLocation(Shattered pEntity) {
public ResourceLocation getTextureLocation(Shattered entity) {
return TEXTURE;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ public class ShriekWormRenderer extends MobRenderer<ShriekWorm, ShriekWormModel>
public static final ModelLayerLocation MODEL = new ModelLayerLocation(DeeperDarker.rl("shriek_worm"), "main");
private static final ResourceLocation TEXTURE = DeeperDarker.rl("textures/entity/shriek_worm.png");

public ShriekWormRenderer(EntityRendererProvider.Context pContext) {
super(pContext, new ShriekWormModel(pContext.bakeLayer(MODEL)), 1.2f);
public ShriekWormRenderer(EntityRendererProvider.Context context) {
super(context, new ShriekWormModel(context.bakeLayer(MODEL)), 1.2f);
}

@Override
public ResourceLocation getTextureLocation(ShriekWorm pEntity) {
public ResourceLocation getTextureLocation(ShriekWorm entity) {
return TEXTURE;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ public class SoulElytraRenderer<E extends LivingEntity, M extends EntityModel<E>
private static final ResourceLocation TEXTURE = DeeperDarker.rl("textures/entity/soul_elytra.png");
private final ElytraModel<E> model;

public SoulElytraRenderer(RenderLayerParent<E, M> pRenderer, EntityModelSet pModelSet) {
super(pRenderer, pModelSet);
this.model = new ElytraModel<>(pModelSet.bakeLayer(ModelLayers.ELYTRA));
public SoulElytraRenderer(RenderLayerParent<E, M> renderer, EntityModelSet modelSet) {
super(renderer, modelSet);
this.model = new ElytraModel<>(modelSet.bakeLayer(ModelLayers.ELYTRA));
}

@Override
public void render(PoseStack pMatrixStack, MultiBufferSource pBuffer, int pPackedLight, E pLivingEntity, float pLimbSwing, float pLimbSwingAmount, float pPartialTicks, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) {
ItemStack itemStack = pLivingEntity.getItemBySlot(EquipmentSlot.CHEST);
public void render(PoseStack poseStack, MultiBufferSource buffer, int packedLight, E livingEntity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
ItemStack itemStack = livingEntity.getItemBySlot(EquipmentSlot.CHEST);
if(itemStack.is(DDItems.SOUL_ELYTRA.get())) {
pMatrixStack.pushPose();
pMatrixStack.translate(0, 0, 0.125f);
poseStack.pushPose();
poseStack.translate(0, 0, 0.125f);
this.getParentModel().copyPropertiesTo(this.model);
this.model.setupAnim(pLivingEntity, pLimbSwing, pLimbSwingAmount, pAgeInTicks, pNetHeadYaw, pHeadPitch);
VertexConsumer vertexConsumer = ItemRenderer.getArmorFoilBuffer(pBuffer, RenderType.armorCutoutNoCull(TEXTURE), false);
this.model.renderToBuffer(pMatrixStack, vertexConsumer, pPackedLight, OverlayTexture.NO_OVERLAY);
pMatrixStack.popPose();
this.model.setupAnim(livingEntity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
VertexConsumer vertexConsumer = ItemRenderer.getArmorFoilBuffer(buffer, RenderType.armorCutoutNoCull(TEXTURE), false);
this.model.renderToBuffer(poseStack, vertexConsumer, packedLight, OverlayTexture.NO_OVERLAY);
poseStack.popPose();
}
}
}
Loading

0 comments on commit 7f5679a

Please sign in to comment.