Skip to content

Commit

Permalink
finished multi hitbox stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@ANightDazingZoroark
ANightDazingZoroark committed Jan 31, 2024
1 parent 8653c38 commit 77ea28a
Show file tree
Hide file tree
Showing 8 changed files with 239 additions and 2 deletions.
9 changes: 9 additions & 0 deletions src/main/java/anightdazingzoroark/prift/client/renderer/entity/ApatosaurusRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
import anightdazingzoroark.prift.server.entity.RiftLargeWeaponType;
import anightdazingzoroark.prift.server.entity.creature.Apatosaurus;
import anightdazingzoroark.prift.server.entity.creature.RiftCreature;
import anightdazingzoroark.prift.server.entity.creature.Utahraptor;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.renderer.entity.RenderManager;
import software.bernie.geckolib3.geo.render.built.GeoModel;
import software.bernie.geckolib3.renderers.geo.GeoEntityRenderer;
Expand All @@ -16,6 +19,12 @@ public ApatosaurusRenderer(RenderManager renderManager) {
this.shadowSize = 1.75f;
}

@Override
public boolean shouldRender(RiftCreature livingEntity, ICamera camera, double camX, double camY, double camZ) {
Apatosaurus apatosaurus = (Apatosaurus) livingEntity;
return super.shouldRender(apatosaurus, camera, camX, camY, camZ) || apatosaurus.shouldRender(camera) || Minecraft.getMinecraft().player.isRidingOrBeingRiddenBy(apatosaurus);
}

@Override
public void render(GeoModel model, RiftCreature animatable, float partialTicks, float red, float green, float blue, float alpha) {
float scale = RiftUtil.setModelScale(animatable, 0.35f, 2.25f);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/anightdazingzoroark/prift/client/renderer/entity/ParasaurolophusRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@

import anightdazingzoroark.prift.RiftUtil;
import anightdazingzoroark.prift.client.model.RiftCreatureModel;
import anightdazingzoroark.prift.server.entity.creature.Apatosaurus;
import anightdazingzoroark.prift.server.entity.creature.Parasaurolophus;
import anightdazingzoroark.prift.server.entity.creature.RiftCreature;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.renderer.entity.RenderManager;
import software.bernie.geckolib3.geo.render.built.GeoModel;
import software.bernie.geckolib3.renderers.geo.GeoEntityRenderer;
Expand All @@ -15,6 +19,12 @@ public ParasaurolophusRenderer(RenderManager renderManager) {
this.shadowSize = 1;
}

@Override
public boolean shouldRender(RiftCreature livingEntity, ICamera camera, double camX, double camY, double camZ) {
Parasaurolophus parasaurolophus = (Parasaurolophus) livingEntity;
return super.shouldRender(parasaurolophus, camera, camX, camY, camZ) || parasaurolophus.shouldRender(camera) || Minecraft.getMinecraft().player.isRidingOrBeingRiddenBy(parasaurolophus);
}

@Override
public void render(GeoModel model, RiftCreature animatable, float partialTicks, float red, float green, float blue, float alpha) {
float scale = RiftUtil.setModelScale(animatable, 0.3f, 1.5f);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/anightdazingzoroark/prift/client/renderer/entity/StegosaurusRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import anightdazingzoroark.prift.RiftUtil;
import anightdazingzoroark.prift.client.model.RiftCreatureModel;
import anightdazingzoroark.prift.server.entity.creature.RiftCreature;
import anightdazingzoroark.prift.server.entity.creature.Stegosaurus;
import anightdazingzoroark.prift.server.entity.creature.Tyrannosaurus;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.renderer.entity.RenderManager;
import software.bernie.geckolib3.geo.render.built.GeoModel;
import software.bernie.geckolib3.renderers.geo.GeoEntityRenderer;
Expand All @@ -15,6 +19,12 @@ public StegosaurusRenderer(RenderManager renderManager) {
this.shadowSize = 1.0f;
}

@Override
public boolean shouldRender(RiftCreature livingEntity, ICamera camera, double camX, double camY, double camZ) {
Stegosaurus stegosaurus = (Stegosaurus) livingEntity;
return super.shouldRender(stegosaurus, camera, camX, camY, camZ) || stegosaurus.shouldRender(camera) || Minecraft.getMinecraft().player.isRidingOrBeingRiddenBy(stegosaurus);
}

@Override
public void render(GeoModel model, RiftCreature animatable, float partialTicks, float red, float green, float blue, float alpha) {
float scale = RiftUtil.setModelScale(animatable, 0.3f, 2.125f);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/anightdazingzoroark/prift/client/renderer/entity/TriceratopsRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import anightdazingzoroark.prift.RiftUtil;
import anightdazingzoroark.prift.client.model.RiftCreatureModel;
import anightdazingzoroark.prift.server.entity.creature.RiftCreature;
import anightdazingzoroark.prift.server.entity.creature.Stegosaurus;
import anightdazingzoroark.prift.server.entity.creature.Triceratops;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.renderer.entity.RenderManager;
import software.bernie.geckolib3.geo.render.built.GeoModel;
import software.bernie.geckolib3.renderers.geo.GeoEntityRenderer;
Expand All @@ -14,6 +18,12 @@ public TriceratopsRenderer(RenderManager renderManager) {
this.shadowSize = 1.0f;
}

@Override
public boolean shouldRender(RiftCreature livingEntity, ICamera camera, double camX, double camY, double camZ) {
Triceratops triceratops = (Triceratops) livingEntity;
return super.shouldRender(triceratops, camera, camX, camY, camZ) || triceratops.shouldRender(camera) || Minecraft.getMinecraft().player.isRidingOrBeingRiddenBy(triceratops);
}

@Override
public void render(GeoModel model, RiftCreature animatable, float partialTicks, float red, float green, float blue, float alpha) {
float scale = RiftUtil.setModelScale(animatable, 0.3f, 1.75f);
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/anightdazingzoroark/prift/client/renderer/entity/UtahraptorRenderer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
import anightdazingzoroark.prift.RiftUtil;
import anightdazingzoroark.prift.client.model.RiftCreatureModel;
import anightdazingzoroark.prift.server.entity.creature.RiftCreature;
import anightdazingzoroark.prift.server.entity.creature.Triceratops;
import anightdazingzoroark.prift.server.entity.creature.Utahraptor;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.renderer.entity.RenderManager;
import software.bernie.geckolib3.geo.render.built.GeoModel;
import software.bernie.geckolib3.renderers.geo.GeoEntityRenderer;
Expand All @@ -14,6 +18,12 @@ public UtahraptorRenderer(RenderManager renderManager) {
this.shadowSize = 1.0f;
}

@Override
public boolean shouldRender(RiftCreature livingEntity, ICamera camera, double camX, double camY, double camZ) {
Utahraptor utahraptor = (Utahraptor) livingEntity;
return super.shouldRender(utahraptor, camera, camX, camY, camZ) || utahraptor.shouldRender(camera) || Minecraft.getMinecraft().player.isRidingOrBeingRiddenBy(utahraptor);
}

@Override
public void render(GeoModel model, RiftCreature animatable, float partialTicks, float red, float green, float blue, float alpha) {
float scale = RiftUtil.setModelScale(animatable, 0.3f, 1f);
Expand Down
118 changes: 117 additions & 1 deletion src/main/java/anightdazingzoroark/prift/server/entity/creature/Apatosaurus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import anightdazingzoroark.prift.server.entity.projectile.RiftCannonball;
import anightdazingzoroark.prift.server.entity.projectile.RiftCatapultBoulder;
import anightdazingzoroark.prift.server.entity.projectile.RiftMortarShell;
import anightdazingzoroark.prift.server.enums.TameStatusType;
import anightdazingzoroark.prift.server.items.RiftItems;
import anightdazingzoroark.prift.server.items.RiftLargeWeaponItem;
import anightdazingzoroark.prift.server.message.*;
Expand All @@ -20,6 +21,7 @@
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.culling.ICamera;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.entity.*;
import net.minecraft.entity.passive.EntityTameable;
Expand Down Expand Up @@ -67,6 +69,18 @@ public class Apatosaurus extends RiftCreature {
private EntityLivingBase passengerTwo;
private int launchTick;
public boolean dismount = false;
private RiftCreaturePart neck0Part;
private RiftCreaturePart neck1Part;
private RiftCreaturePart neck2Part;
private RiftCreaturePart neck3Part;
private RiftCreaturePart neck4Part;
private RiftCreaturePart neck5Part;
private RiftCreaturePart leftBackLegPart;
private RiftCreaturePart rightBackLegPart;
private RiftCreaturePart tail0Part;
private RiftCreaturePart tail1Part;
private RiftCreaturePart tail2Part;
private RiftCreaturePart tail3Part;

public Apatosaurus(World worldIn) {
super(worldIn, RiftCreatureType.APATOSAURUS);
Expand Down Expand Up @@ -129,7 +143,104 @@ public void resetParts(float scale) {
if (scale > this.oldScale) {
this.oldScale = scale;
this.removeParts();
this.bodyPart = new RiftMainBodyPart(this, 1.5f, 0, 1, 1 * scale, 1 * scale, 0);
this.headPart = new RiftCreaturePart(this, 6.625f, 0, 4.5125f, 0.625f * scale, 0.5f * scale, 2f);
this.bodyPart = new RiftMainBodyPart(this, -0.75f, 0, 1.35f, 1.65f * scale, scale, 1f);
this.neck0Part = new RiftCreaturePart(this, 5.75f, 0, 4.25f, 0.5f * scale, 0.5f * scale, 1.5f);
this.neck1Part = new RiftCreaturePart(this, 5f, 0, 3.75f, 0.5f * scale, 0.5f * scale, 1.5f);
this.neck2Part = new RiftCreaturePart(this, 4.25f, 0, 3.25f, 0.5f * scale, 0.5f * scale, 1.5f);
this.neck3Part = new RiftCreaturePart(this, 3.5f, 0, 2.75f, 0.5f * scale, 0.625f * scale, 1.5f);
this.neck4Part = new RiftCreaturePart(this, 2.75f, 0, 2.5f, 0.5f * scale, 0.625f * scale, 1.5f);
this.neck5Part = new RiftCreaturePart(this, 1.75f, 0, 2.25f, 0.625f * scale, 0.625f * scale, 1.5f);
this.leftBackLegPart = new RiftCreaturePart(this, 2.375f, -150, 0, 0.625f * scale, 1.25f * scale, 0.5f);
this.rightBackLegPart = new RiftCreaturePart(this, 2.375f, 150, 0, 0.625f * scale, 1.25f * scale, 0.5f);
this.tail0Part = new RiftCreaturePart(this, -3.25f, 0, 1.9f, 0.675f * scale, 0.625f * scale, 0.5f);
this.tail1Part = new RiftCreaturePart(this, -4.75f, 0, 1.8f, 0.625f * scale, 0.6f * scale, 0.5f);
this.tail2Part = new RiftCreaturePart(this, -6f, 0, 1.7f, 0.625f * scale, 0.6f * scale, 0.5f);
this.tail3Part = new RiftCreaturePart(this, -7.25f, 0, 1.7f, 0.625f * scale, 0.45f * scale, 0.5f);
}
}

@Override
public void updateParts() {
super.updateParts();
if (this.neck0Part != null) this.neck0Part.onUpdate();
if (this.neck1Part != null) this.neck1Part.onUpdate();
if (this.neck2Part != null) this.neck2Part.onUpdate();
if (this.neck3Part != null) this.neck3Part.onUpdate();
if (this.neck4Part != null) this.neck4Part.onUpdate();
if (this.neck5Part != null) this.neck5Part.onUpdate();
if (this.leftBackLegPart != null) this.leftBackLegPart.onUpdate();
if (this.rightBackLegPart != null) this.rightBackLegPart.onUpdate();
if (this.tail0Part != null) this.tail0Part.onUpdate();
if (this.tail1Part != null) this.tail1Part.onUpdate();
if (this.tail2Part != null) this.tail2Part.onUpdate();
if (this.tail3Part != null) this.tail3Part.onUpdate();

float sitOffset = (this.getTameStatus().equals(TameStatusType.SIT) && !this.isBeingRidden()) ? -1.125f : 0;
if (this.headPart != null) this.headPart.setPositionAndUpdate(this.headPart.posX, this.headPart.posY + sitOffset, this.headPart.posZ);
if (this.bodyPart != null) this.bodyPart.setPositionAndUpdate(this.bodyPart.posX, this.bodyPart.posY + sitOffset, this.bodyPart.posZ);
if (this.neck0Part != null) this.neck0Part.setPositionAndUpdate(this.neck0Part.posX, this.neck0Part.posY + sitOffset, this.neck0Part.posZ);
if (this.neck1Part != null) this.neck1Part.setPositionAndUpdate(this.neck1Part.posX, this.neck1Part.posY + sitOffset, this.neck1Part.posZ);
if (this.neck2Part != null) this.neck2Part.setPositionAndUpdate(this.neck2Part.posX, this.neck2Part.posY + sitOffset, this.neck2Part.posZ);
if (this.neck3Part != null) this.neck3Part.setPositionAndUpdate(this.neck3Part.posX, this.neck3Part.posY + sitOffset, this.neck3Part.posZ);
if (this.neck4Part != null) this.neck4Part.setPositionAndUpdate(this.neck4Part.posX, this.neck4Part.posY + sitOffset, this.neck4Part.posZ);
if (this.neck5Part != null) this.neck5Part.setPositionAndUpdate(this.neck5Part.posX, this.neck5Part.posY + sitOffset, this.neck5Part.posZ);
if (this.tail0Part != null) this.tail0Part.setPositionAndUpdate(this.tail0Part.posX, this.tail0Part.posY + sitOffset, this.tail0Part.posZ);
if (this.tail1Part != null) this.tail1Part.setPositionAndUpdate(this.tail1Part.posX, this.tail1Part.posY + sitOffset, this.tail1Part.posZ);
if (this.tail2Part != null) this.tail2Part.setPositionAndUpdate(this.tail2Part.posX, this.tail2Part.posY + sitOffset, this.tail2Part.posZ);
if (this.tail3Part != null) this.tail3Part.setPositionAndUpdate(this.tail3Part.posX, this.tail3Part.posY + sitOffset, this.tail3Part.posZ);
}

@Override
public void removeParts() {
super.removeParts();
if (this.neck0Part != null) {
this.world.removeEntityDangerously(this.neck0Part);
this.neck0Part = null;
}
if (this.neck1Part != null) {
this.world.removeEntityDangerously(this.neck1Part);
this.neck1Part = null;
}
if (this.neck2Part != null) {
this.world.removeEntityDangerously(this.neck2Part);
this.neck2Part = null;
}
if (this.neck3Part != null) {
this.world.removeEntityDangerously(this.neck3Part);
this.neck3Part = null;
}
if (this.neck4Part != null) {
this.world.removeEntityDangerously(this.neck4Part);
this.neck4Part = null;
}
if (this.neck5Part != null) {
this.world.removeEntityDangerously(this.neck5Part);
this.neck5Part = null;
}
if (this.leftBackLegPart != null) {
this.world.removeEntityDangerously(this.leftBackLegPart);
this.leftBackLegPart = null;
}
if (this.rightBackLegPart != null) {
this.world.removeEntityDangerously(this.rightBackLegPart);
this.rightBackLegPart = null;
}
if (this.tail0Part != null) {
this.world.removeEntityDangerously(this.tail0Part);
this.tail0Part = null;
}
if (this.tail1Part != null) {
this.world.removeEntityDangerously(this.tail1Part);
this.tail1Part = null;
}
if (this.tail2Part != null) {
this.world.removeEntityDangerously(this.tail2Part);
this.tail2Part = null;
}
if (this.tail3Part != null) {
this.world.removeEntityDangerously(this.tail3Part);
this.tail3Part = null;
}
}

Expand Down Expand Up @@ -331,6 +442,11 @@ public Vec3d passengerPosTwo() {
return new Vec3d(seatTwoX, this.posY + 2.25, seatTwoZ);
}

@SideOnly(Side.CLIENT)
public boolean shouldRender(ICamera camera) {
return super.shouldRender(camera) || this.inFrustrum(camera, this.neck0Part) || this.inFrustrum(camera, this.neck1Part) || this.inFrustrum(camera, this.neck2Part) || this.inFrustrum(camera, this.neck3Part) || this.inFrustrum(camera, this.neck4Part) || this.inFrustrum(camera, this.neck5Part) || this.inFrustrum(camera, this.leftBackLegPart) || this.inFrustrum(camera, this.rightBackLegPart) || this.inFrustrum(camera, this.tail0Part) || this.inFrustrum(camera, this.tail1Part) || this.inFrustrum(camera, this.tail2Part) || this.inFrustrum(camera, this.tail3Part);
}

@Override
public void controlInput(int control, int holdAmount, EntityLivingBase target) {
EntityPlayer rider = (EntityPlayer) this.getControllingPassenger();
Expand Down
Loading

0 comments on commit 77ea28a

Please sign in to comment.