lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up a lot of different inspections

Browse source
This commit is contained in:
Nicholas Ignoffo 2018-03-01 19:27:38 -08:00
parent 0dd0854bd9
commit 70d98455b7
207 changed files with 603 additions and 731 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedChicken.java
View file

@ -16,7 +16,7 @@ public class RenderCorruptedChicken extends RenderLiving<EntityCorruptedChicken>
public RenderCorruptedChicken(RenderManager renderManagerIn) {
super(renderManagerIn, new ModelCorruptedChicken(0), 0.3f);
this.addLayer(new LayerWill<EntityCorruptedChicken>(this, new ModelCorruptedChicken(1.1f)));
this.addLayer(new LayerWill<>(this, new ModelCorruptedChicken(1.1f)));
}
@Override

6
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSheep.java
View file

@ -19,9 +19,9 @@ public class RenderCorruptedSheep extends RenderLiving<EntityCorruptedSheep> {
public RenderCorruptedSheep(RenderManager renderManagerIn) {
super(renderManagerIn, new ModelCorruptedSheep2(0), 0.7F);
this.addLayer(new LayerCorruptedSheepWool(this));
this.addLayer(new LayerWill<EntityCorruptedSheep>(this, new ModelCorruptedSheep(1.1f)));
this.addLayer(new LayerWill<EntityCorruptedSheep>(this, new ModelCorruptedSheep2(1.1f)));
this.addLayer(new LayerAlchemyCircle<EntityCorruptedSheep>());
this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep(1.1f)));
this.addLayer(new LayerWill<>(this, new ModelCorruptedSheep2(1.1f)));
this.addLayer(new LayerAlchemyCircle<>());
}
@Override

2
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedSpider.java
View file

@ -18,7 +18,7 @@ public class RenderCorruptedSpider extends RenderLiving<EntityCorruptedSpider> {
public RenderCorruptedSpider(RenderManager renderManagerIn) {
super(renderManagerIn, new ModelSpider(), 1.0F);
this.addLayer(new LayerCorruptedSpiderEyes(this));
this.addLayer(new LayerWill<EntityCorruptedSpider>(this, new ModelCorruptedSpider(1.1f)));
this.addLayer(new LayerWill<>(this, new ModelCorruptedSpider(1.1f)));
}
protected float getDeathMaxRotation(EntityCorruptedSpider entityLivingBaseIn) {

2
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderCorruptedZombie.java
View file

@ -38,7 +38,7 @@ public class RenderCorruptedZombie extends RenderBiped<EntityCorruptedZombie> {
}
this.layerRenderers.remove(layerbipedarmor);
this.addLayer(new LayerWill<EntityCorruptedZombie>(this, new ModelZombie(1.2f, false)));
this.addLayer(new LayerWill<>(this, new ModelZombie(1.2f, false)));
}
/**

25
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMeteor.java
View file

@ -10,9 +10,11 @@ import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.util.ResourceLocation;
public class RenderEntityMeteor extends Render<EntityMeteor> {
private static final ResourceLocation resource = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png");
private static final ResourceLocation TEXTURE = new ResourceLocation(BloodMagic.MODID, "textures/models/Meteor.png");
private static final float SCALE = 1;
public ModelBase model = new ModelMeteor();
private float scale = 1;
public RenderEntityMeteor(RenderManager renderManagerIn) {
super(renderManagerIn);
@ -20,24 +22,11 @@ public class RenderEntityMeteor extends Render<EntityMeteor> {
@Override
public void doRender(EntityMeteor entity, double x, double y, double z, float entityYaw, float partialTicks) {
// GlStateManager.pushMatrix();
// GlStateManager.translate((float) x, (float) y, (float) z);
// GlStateManager.enableRescaleNormal();
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
// GlStateManager.rotate(-this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F);
// GlStateManager.rotate(this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F);
// this.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
// this.renderItem.renderItem(ItemComponent.getStack(ItemComponent.REAGENT_BLOODLIGHT), ItemCameraTransforms.TransformType.GROUND);
// GlStateManager.disableRescaleNormal();
// GlStateManager.popMatrix();
GlStateManager.pushMatrix();
GlStateManager.translate((float) x, (float) y, (float) z);
GlStateManager.enableRescaleNormal();
GlStateManager.scale(scale, scale, scale);
this.bindTexture(this.getEntityTexture(entity));
// GL11.glRotatef(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * f1, 0.0F, 1.0F, 0.0F);
// GL11.glRotatef(180.0f - entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * f1, 1.0F, 0.0F, 0.0f);
GlStateManager.scale(SCALE, SCALE, SCALE);
this.bindTexture(TEXTURE);
model.render(entity, 0, (float) x, (float) y, (float) z, entityYaw, partialTicks);
GlStateManager.disableRescaleNormal();
GlStateManager.popMatrix();
@ -47,6 +36,6 @@ public class RenderEntityMeteor extends Render<EntityMeteor> {
@Override
protected ResourceLocation getEntityTexture(EntityMeteor entity) {
return resource;
return TEXTURE;
}
}

2
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntitySentientArrow.java
View file

@ -37,7 +37,7 @@ public class RenderEntitySentientArrow extends Render<EntitySentientArrow> {
int i = 0;
float f = 0.0F;
float f1 = 0.5F;
float f2 = (float) (0 + i * 10) / 32.0F;
float f2 = (float) (i * 10) / 32.0F;
float f3 = (float) (5 + i * 10) / 32.0F;
float f4 = 0.0F;
float f5 = 0.15625F;