mirror of
https://github.com/MineLittlePony/MineLittlePony.git
synced 2025-02-13 16:24:23 +01:00
General code cleanup.
Generic types Unnecessary casts Unused imports
This commit is contained in:
parent
2b9eb813b3
commit
d8e1e08df4
7 changed files with 31 additions and 28 deletions
|
@ -17,7 +17,6 @@ import net.fabricmc.fabric.api.client.render.EntityRendererRegistry;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.render.entity.EntityRenderDispatcher;
|
import net.minecraft.client.render.entity.EntityRenderDispatcher;
|
||||||
import net.minecraft.client.render.entity.EntityRenderer;
|
import net.minecraft.client.render.entity.EntityRenderer;
|
||||||
import net.minecraft.client.render.entity.LivingEntityRenderer;
|
|
||||||
import net.minecraft.client.render.entity.PlayerEntityRenderer;
|
import net.minecraft.client.render.entity.PlayerEntityRenderer;
|
||||||
import net.minecraft.client.render.entity.model.EntityModel;
|
import net.minecraft.client.render.entity.model.EntityModel;
|
||||||
import net.minecraft.entity.Entity;
|
import net.minecraft.entity.Entity;
|
||||||
|
@ -100,15 +99,15 @@ public class PonyRenderManager {
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
@Nullable
|
@Nullable
|
||||||
public <T extends LivingEntity, M extends EntityModel<T> & IPonyModel<T>, R extends LivingEntityRenderer<T, M> & IPonyRender<T, M>> R getPonyRenderer(@Nullable Entity entity) {
|
public <T extends LivingEntity, M extends EntityModel<T> & IPonyModel<T>> IPonyRender<T, M> getPonyRenderer(@Nullable T entity) {
|
||||||
if (entity == null || !(entity instanceof LivingEntity)) {
|
if (entity == null) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
EntityRenderer<Entity> renderer = MinecraftClient.getInstance().getEntityRenderManager().getRenderer(entity);
|
EntityRenderer<T> renderer = MinecraftClient.getInstance().getEntityRenderManager().getRenderer(entity);
|
||||||
|
|
||||||
if (renderer instanceof IPonyRender) {
|
if (renderer instanceof IPonyRender) {
|
||||||
return (R)(Object)renderer;
|
return (IPonyRender<T, M>) renderer;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -70,7 +70,7 @@ public class GuiPonySettings extends GameGui {
|
||||||
|
|
||||||
int row = 0;
|
int row = 0;
|
||||||
|
|
||||||
((List<Element>)children()).add(content);
|
children().add(content);
|
||||||
|
|
||||||
addButton(new Label(width / 2, 5).setCentered()).getStyle().setText(getTitle().getString());
|
addButton(new Label(width / 2, 5).setCentered()).getStyle().setText(getTitle().getString());
|
||||||
addButton(new Button(width / 2 - 100, height - 25))
|
addButton(new Button(width / 2 - 100, height - 25))
|
||||||
|
|
|
@ -206,16 +206,22 @@ public class Pony implements IPony {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isRidingInteractive(LivingEntity entity) {
|
public boolean isRidingInteractive(LivingEntity entity) {
|
||||||
return PonyRenderManager.getInstance().getPonyRenderer(entity.getVehicle()) != null;
|
if (entity.hasVehicle() && entity.getVehicle() instanceof LivingEntity) {
|
||||||
|
return PonyRenderManager.getInstance().getPonyRenderer((LivingEntity) entity.getVehicle()) != null;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IPony getMountedPony(LivingEntity entity) {
|
public IPony getMountedPony(LivingEntity entity) {
|
||||||
Entity mount = entity.getVehicle();
|
if (entity.hasVehicle() && entity.getVehicle() instanceof LivingEntity) {
|
||||||
|
LivingEntity mount = (LivingEntity) entity.getVehicle();
|
||||||
|
|
||||||
IPonyRender<LivingEntity, ?> render = PonyRenderManager.getInstance().getPonyRenderer(mount);
|
IPonyRender<LivingEntity, ?> render = PonyRenderManager.getInstance().getPonyRenderer(mount);
|
||||||
|
|
||||||
return render == null ? null : render.getEntityPony((LivingEntity)mount);
|
return render == null ? null : render.getEntityPony(mount);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -68,21 +68,19 @@ public class RenderPony<T extends LivingEntity, M extends EntityModel<T> & IPony
|
||||||
return rotationYaw;
|
return rotationYaw;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void translateRider(LivingEntity entity, float ticks) {
|
protected void translateRider(T entity, float ticks) {
|
||||||
if (entity.hasVehicle()) {
|
if (entity.hasVehicle() && entity.getVehicle() instanceof LivingEntity) {
|
||||||
Entity ridingEntity = entity.getVehicle();
|
|
||||||
|
|
||||||
if (ridingEntity instanceof LivingEntity) {
|
LivingEntity ridingEntity = (LivingEntity) entity.getVehicle();
|
||||||
IPonyRender<LivingEntity, ?> renderer = PonyRenderManager.getInstance().getPonyRenderer((LivingEntity)ridingEntity);
|
IPonyRender<LivingEntity, ?> renderer = PonyRenderManager.getInstance().getPonyRenderer(ridingEntity);
|
||||||
|
|
||||||
if (renderer != null) {
|
if (renderer != null) {
|
||||||
// negate vanilla translations so the rider begins at the ridees feet.
|
// negate vanilla translations so the rider begins at the ridees feet.
|
||||||
GlStateManager.translatef(0, -ridingEntity.getHeight(), 0);
|
GlStateManager.translatef(0, -ridingEntity.getHeight(), 0);
|
||||||
|
|
||||||
IPony riderPony = renderer.getEntityPony((LivingEntity)ridingEntity);
|
IPony riderPony = renderer.getEntityPony(ridingEntity);
|
||||||
|
|
||||||
renderer.translateRider((LivingEntity)ridingEntity, riderPony, entity, pony, ticks);
|
renderer.translateRider(ridingEntity, riderPony, entity, pony, ticks);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,6 @@ public class PostureFlight extends MotionCompositor implements PonyPosture<Playe
|
||||||
|
|
||||||
roll = model.getMetadata().getInterpolator(player.getUuid()).interpolate("pegasusRoll", roll, 10);
|
roll = model.getMetadata().getInterpolator(player.getUuid()).interpolate("pegasusRoll", roll, 10);
|
||||||
|
|
||||||
GlStateManager.rotatef((float)roll, 0, 0, 1);
|
GlStateManager.rotatef(roll, 0, 0, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,6 @@ public enum Wearable implements ITriggerPixelMapped<Wearable> {
|
||||||
for (int i = 0; i < values.length; i++) {
|
for (int i = 0; i < values.length; i++) {
|
||||||
if (flags[i]) wears.add(values[i]);
|
if (flags[i]) wears.add(values[i]);
|
||||||
}
|
}
|
||||||
return wears.stream().toArray(Wearable[]::new);
|
return wears.toArray(new Wearable[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,6 @@ public enum PonyLevel {
|
||||||
if (index < 0) {
|
if (index < 0) {
|
||||||
index = 0;
|
index = 0;
|
||||||
}
|
}
|
||||||
return values[(int)Math.round(index) % values.length];
|
return values[Math.round(index) % values.length];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue