Browse Source

Removed Sheepuff

merge-requests/4/head
Brandon Pearce 4 years ago
parent
commit
4123e1ceea
11 changed files with 0 additions and 149 deletions
  1. +0
    -42
      src/main/java/com/gildedgames/aether/client/models/entities/living/ModelSheepuff.java
  2. +0
    -1
      src/main/java/com/gildedgames/aether/client/renderer/AetherRenderers.java
  3. +0
    -3
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderRam.java
  4. +0
    -27
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderSheepuff.java
  5. +0
    -2
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/layers/LayerRamWool.java
  6. +0
    -49
      src/main/java/com/gildedgames/aether/client/renderer/entities/living/layers/LayerSheepuffFur.java
  7. +0
    -2
      src/main/java/com/gildedgames/aether/common/entities/EntitiesAether.java
  8. +0
    -22
      src/main/java/com/gildedgames/aether/common/entities/living/EntitySheepuff.java
  9. +0
    -1
      src/main/resources/assets/aether/lang/en_US.lang
  10. BIN
      src/main/resources/assets/aether/textures/entities/sheepuff/fur.png
  11. BIN
      src/main/resources/assets/aether/textures/entities/sheepuff/sheepuff.png

+ 0
- 42
src/main/java/com/gildedgames/aether/client/models/entities/living/ModelSheepuff.java View File

@@ -1,42 +0,0 @@
package com.gildedgames.aether.client.models.entities.living;

import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import net.minecraft.client.model.ModelQuadruped;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;

public class ModelSheepuff extends ModelQuadruped
{
private float headRotationAngleX;

public ModelSheepuff()
{
super(12, 0.0F);

this.head = new ModelRenderer(this, 0, 0);
this.head.addBox(-3.0F, -4.0F, -6.0F, 6, 6, 8, 0.0F);
this.head.setRotationPoint(0.0F, 6.0F, -8.0F);

this.body = new ModelRenderer(this, 28, 8);
this.body.addBox(-4.0F, -10.0F, -7.0F, 8, 16, 6, 0.0F);
this.body.setRotationPoint(0.0F, 5.0F, 2.0F);
}

public void setLivingAnimations(EntityLivingBase entity, float p_78086_2_, float p_78086_3_, float p_78086_4_)
{
super.setLivingAnimations(entity, p_78086_2_, p_78086_3_, p_78086_4_);

EntitySheepuff sheepuff = (EntitySheepuff) entity;

this.head.rotationPointY = 6.0F + sheepuff.getHeadRotationPointY(p_78086_4_) * 9.0F;
this.headRotationAngleX = sheepuff.getHeadRotationAngleX(p_78086_4_);
}

public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
{
super.setRotationAngles(p_78087_1_, p_78087_2_, p_78087_3_, p_78087_4_, p_78087_5_, p_78087_6_, p_78087_7_);

this.head.rotateAngleX = this.headRotationAngleX;
}
}

+ 0
- 1
src/main/java/com/gildedgames/aether/client/renderer/AetherRenderers.java View File

@@ -75,7 +75,6 @@ public class AetherRenderers

RenderingRegistry.registerEntityRenderingHandler(EntityPhyg.class, new AetherRenderFactory<>(RenderPhyg.class));
RenderingRegistry.registerEntityRenderingHandler(EntityFlyingCow.class, new AetherRenderFactory<>(RenderFlyingCow.class));
RenderingRegistry.registerEntityRenderingHandler(EntitySheepuff.class, new AetherRenderFactory<>(RenderSheepuff.class));
RenderingRegistry.registerEntityRenderingHandler(EntityAechorPlant.class, new AetherRenderFactory<>(RenderAechorPlant.class));
RenderingRegistry.registerEntityRenderingHandler(EntityAerbunny.class, new AetherRenderFactory<>(RenderAerbunny.class));
RenderingRegistry.registerEntityRenderingHandler(EntityCarrionSprout.class, new AetherRenderFactory<>(RenderCarrionSprout.class));


+ 0
- 3
src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderRam.java View File

@@ -1,12 +1,9 @@
package com.gildedgames.aether.client.renderer.entities.living;

import com.gildedgames.aether.client.models.entities.living.ModelRam;
import com.gildedgames.aether.client.models.entities.living.ModelSheepuff;
import com.gildedgames.aether.client.renderer.entities.living.layers.LayerRamWool;
import com.gildedgames.aether.client.renderer.entities.living.layers.LayerSheepuffFur;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.EntityRam;
import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.util.ResourceLocation;


+ 0
- 27
src/main/java/com/gildedgames/aether/client/renderer/entities/living/RenderSheepuff.java View File

@@ -1,27 +0,0 @@
package com.gildedgames.aether.client.renderer.entities.living;

import com.gildedgames.aether.client.models.entities.living.ModelSheepuff;
import com.gildedgames.aether.client.renderer.entities.living.layers.LayerSheepuffFur;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.util.ResourceLocation;

public class RenderSheepuff extends RenderLiving<EntitySheepuff>
{
private static final ResourceLocation texture = AetherCore.getResource("textures/entities/sheepuff/sheepuff.png");

public RenderSheepuff(RenderManager renderManager)
{
super(renderManager, new ModelSheepuff(), 0.75f);

this.addLayer(new LayerSheepuffFur(this));
}

@Override
protected ResourceLocation getEntityTexture(EntitySheepuff entity)
{
return texture;
}
}

+ 0
- 2
src/main/java/com/gildedgames/aether/client/renderer/entities/living/layers/LayerRamWool.java View File

@@ -2,10 +2,8 @@ package com.gildedgames.aether.client.renderer.entities.living.layers;

import com.gildedgames.aether.client.models.entities.living.ModelRamWool;
import com.gildedgames.aether.client.renderer.entities.living.RenderRam;
import com.gildedgames.aether.client.renderer.entities.living.RenderSheepuff;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.EntityRam;
import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.entity.EntityLivingBase;


+ 0
- 49
src/main/java/com/gildedgames/aether/client/renderer/entities/living/layers/LayerSheepuffFur.java View File

@@ -1,49 +0,0 @@
package com.gildedgames.aether.client.renderer.entities.living.layers;

import com.gildedgames.aether.client.renderer.entities.living.RenderSheepuff;
import com.gildedgames.aether.common.AetherCore;
import com.gildedgames.aether.common.entities.living.EntitySheepuff;
import net.minecraft.client.model.ModelSheep1;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.util.ResourceLocation;

public class LayerSheepuffFur implements LayerRenderer
{
private static final ResourceLocation texture = AetherCore.getResource("textures/entities/sheepuff/fur.png");

private final ModelSheep1 sheepModel = new ModelSheep1();

private final RenderSheepuff render;

public LayerSheepuffFur(RenderSheepuff render)
{
this.render = render;
}

@Override
public void doRenderLayer(EntityLivingBase entity, float p_177141_2_, float p_177141_3_, float p_177141_4_, float p_177141_5_, float p_177141_6_, float p_177141_7_, float p_177141_8_)
{
EntitySheepuff sheepuff = (EntitySheepuff) entity;

if (!sheepuff.getSheared() && !sheepuff.isInvisible())
{
float[] colors = EntitySheep.getDyeRgb(sheepuff.getFleeceColor());
GlStateManager.color(colors[0], colors[1], colors[2]);

this.render.bindTexture(texture);

this.sheepModel.setModelAttributes(this.render.getMainModel());
this.sheepModel.setLivingAnimations(sheepuff, p_177141_2_, p_177141_3_, p_177141_4_);
this.sheepModel.render(sheepuff, p_177141_2_, p_177141_3_, p_177141_5_, p_177141_6_, p_177141_7_, p_177141_8_);
}
}

@Override
public boolean shouldCombineTextures()
{
return true;
}
}

+ 0
- 2
src/main/java/com/gildedgames/aether/common/entities/EntitiesAether.java View File

@@ -33,7 +33,6 @@ public class EntitiesAether
{
registerLivingEntity(EntityPhyg.class, "phyg", 0xCCFFFF, 0xFF9999);
registerLivingEntity(EntityFlyingCow.class, "flying_cow", 0xCCFFFF, 0x0066CC);
registerLivingEntity(EntitySheepuff.class, "sheepuff", 0xCCFFFF, 0xCCCCFF);
registerLivingEntity(EntityAechorPlant.class, "aechor_plant", 0xCCFFFF, 0xC88FE3);
registerLivingEntity(EntityAerbunny.class, "aerbunny", 0xCCFFFF, 0x0066CC);
registerLivingEntity(EntityCarrionSprout.class, "carrion_sprout", 0xCCFFFF, 0x5D8BBB);
@@ -61,7 +60,6 @@ public class EntitiesAether
manager.registerPerTickEntry(new SpawnEntry(EntityFlyingCow.class, 1, 4, 0.65f));
manager.registerPerTickEntry(new SpawnEntry(EntityPhyg.class, 1, 4, 0.35f));
manager.registerPerTickEntry(new SpawnEntry(EntityCarrionSprout.class, 2, 3, 0.4f));
manager.registerPerTickEntry(new SpawnEntry(EntitySheepuff.class, 3, 5, 0.5f));
manager.registerPerTickEntry(new SpawnEntry(EntityRam.class, 3, 5, 0.5f));

manager.registerPerTickEntry(new SpawnEntry(EntityAechorPlant.class, 2, 4, 0.4f));


+ 0
- 22
src/main/java/com/gildedgames/aether/common/entities/living/EntitySheepuff.java View File

@@ -1,22 +0,0 @@
package com.gildedgames.aether.common.entities.living;

import com.gildedgames.aether.common.blocks.BlocksAether;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.world.World;

public class EntitySheepuff extends EntitySheep
{
public EntitySheepuff(World world)
{
super(world);

this.spawnableBlock = BlocksAether.aether_grass;
}

@Override
public EntitySheepuff createChild(EntityAgeable ageable)
{
return new EntitySheepuff(this.worldObj);
}
}

+ 0
- 1
src/main/resources/assets/aether/lang/en_US.lang View File

@@ -344,7 +344,6 @@ item.aether.valkyrie_music_disc.desc=Emile van Krieken - Ascending Dawn
item.aether.recording_892.desc=Emile van Krieken - ???

# Entities
entity.aether.sheepuff.name=Sheepuff
entity.aether.flying_cow.name=Flying Cow
entity.aether.phyg.name=Phyg
entity.aether.aechor_plant.name=Aechor Plant


BIN
src/main/resources/assets/aether/textures/entities/sheepuff/fur.png View File

Before After
Width: 64  |  Height: 32  |  Size: 2.2 KiB

BIN
src/main/resources/assets/aether/textures/entities/sheepuff/sheepuff.png View File

Before After
Width: 64  |  Height: 32  |  Size: 2.4 KiB

Loading…
Cancel
Save