PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

General code cleanup.

Browse source 
Generic types
Unnecessary casts
Unused imports
This commit is contained in:
Matthew Messinger 2019-07-07 17:20:50 -04:00
parent 2b9eb813b3
commit d8e1e08df4
7 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/com/minelittlepony/client/PonyRenderManager.java
View file

@ -17,7 +17,6 @@ import net.fabricmc.fabric.api.client.render.EntityRendererRegistry;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.entity.EntityRenderDispatcher;
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.model.EntityModel;
import net.minecraft.entity.Entity;
@ -100,15 +99,15 @@ public class PonyRenderManager {
@SuppressWarnings("unchecked")
@Nullable
public <T extends LivingEntity, M extends EntityModel<T> & IPonyModel<T>, R extends LivingEntityRenderer<T, M> & IPonyRender<T, M>> R getPonyRenderer(@Nullable Entity entity) {
if (entity == null || !(entity instanceof LivingEntity)) {
public <T extends LivingEntity, M extends EntityModel<T> & IPonyModel<T>> IPonyRender<T, M> getPonyRenderer(@Nullable T entity) {
if (entity == null) {
return null;
}
EntityRenderer<Entity> renderer = MinecraftClient.getInstance().getEntityRenderManager().getRenderer(entity);
EntityRenderer<T> renderer = MinecraftClient.getInstance().getEntityRenderManager().getRenderer(entity);
if (renderer instanceof IPonyRender) {
return (R)(Object)renderer;
return (IPonyRender<T, M>) renderer;
}
return null;

2
src/main/java/com/minelittlepony/client/gui/GuiPonySettings.java
View file

@ -70,7 +70,7 @@ public class GuiPonySettings extends GameGui {
int row = 0;
((List<Element>)children()).add(content);
children().add(content);
addButton(new Label(width / 2, 5).setCentered()).getStyle().setText(getTitle().getString());
addButton(new Button(width / 2 - 100, height - 25))

14
src/main/java/com/minelittlepony/client/pony/Pony.java
View file

@ -206,16 +206,22 @@ public class Pony implements IPony {
@Override
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
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

28
src/main/java/com/minelittlepony/client/render/RenderPony.java
View file

@ -60,41 +60,39 @@ public class RenderPony<T extends LivingEntity, M extends EntityModel<T> & IPony
public float getRenderYaw(T entity, float rotationYaw, float partialTicks) {
if (entity.hasVehicle()) {
Entity mount = entity.getVehicle();
if (mount instanceof LivingEntity) {
return MathUtil.interpolateDegress(((LivingEntity)mount).field_6220, ((LivingEntity)mount).field_6283, partialTicks);
if (mount instanceof LivingEntity) {
return MathUtil.interpolateDegress(((LivingEntity) mount).field_6220, ((LivingEntity) mount).field_6283, partialTicks);
}
}
return rotationYaw;
}
protected void translateRider(LivingEntity entity, float ticks) {
if (entity.hasVehicle()) {
Entity ridingEntity = entity.getVehicle();
protected void translateRider(T entity, float ticks) {
if (entity.hasVehicle() && entity.getVehicle() instanceof LivingEntity) {
if (ridingEntity instanceof LivingEntity) {
IPonyRender<LivingEntity, ?> renderer = PonyRenderManager.getInstance().getPonyRenderer((LivingEntity)ridingEntity);
LivingEntity ridingEntity = (LivingEntity) entity.getVehicle();
IPonyRender<LivingEntity, ?> renderer = PonyRenderManager.getInstance().getPonyRenderer(ridingEntity);
if (renderer != null) {
// negate vanilla translations so the rider begins at the ridees feet.
GlStateManager.translatef(0, -ridingEntity.getHeight(), 0);
if (renderer != null) {
// negate vanilla translations so the rider begins at the ridees feet.
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);
}
}
}
@SuppressWarnings("unchecked")
public void applyPostureTransform(T player, float yaw, float ticks) {
((PonyPosture<T>)getPosture(player)).apply(player, getModel(), yaw, ticks, 1);
((PonyPosture<T>) getPosture(player)).apply(player, getModel(), yaw, ticks, 1);
}
@SuppressWarnings("unchecked")
public void applyPostureRiding(T player, float yaw, float ticks) {
((PonyPosture<T>)getPosture(player)).apply(player, getModel(), yaw, ticks, -1);
((PonyPosture<T>) getPosture(player)).apply(player, getModel(), yaw, ticks, -1);
}
@Nonnull

2
src/main/java/com/minelittlepony/client/transform/PostureFlight.java
View file

@ -23,6 +23,6 @@ public class PostureFlight extends MotionCompositor implements PonyPosture<Playe
roll = model.getMetadata().getInterpolator(player.getUuid()).interpolate("pegasusRoll", roll, 10);
GlStateManager.rotatef((float)roll, 0, 0, 1);
GlStateManager.rotatef(roll, 0, 0, 1);
}
}

2
src/main/java/com/minelittlepony/pony/meta/Wearable.java
View file

@ -30,6 +30,6 @@ public enum Wearable implements ITriggerPixelMapped<Wearable> {
for (int i = 0; i < values.length; i++) {
if (flags[i]) wears.add(values[i]);
}
return wears.stream().toArray(Wearable[]::new);
return wears.toArray(new Wearable[0]);
}
}

2
src/main/java/com/minelittlepony/settings/PonyLevel.java
View file

@ -10,6 +10,6 @@ public enum PonyLevel {
if (index < 0) {
index = 0;
}
return values[(int)Math.round(index) % values.length];
return values[Math.round(index) % values.length];
}
}