forked from ACGaming/Spackenmobs
Sound overhaul and entity adjustments
This commit is contained in:
parent
61f70a43be
commit
2246a3f120
|
@ -56,17 +56,24 @@ public class Spackenmobs
|
|||
public static final SoundEvent ENTITY_JENS_AMBIENT = new SoundEvent(new ResourceLocation("spackenmobs:entities.jens.ambient"));
|
||||
public static final SoundEvent ENTITY_JENS_HURT = new SoundEvent(new ResourceLocation("spackenmobs:entities.jens.hurt"));
|
||||
public static final SoundEvent ENTITY_JENS_DEATH = new SoundEvent(new ResourceLocation("spackenmobs:entities.jens.death"));
|
||||
public static final SoundEvent ENTITY_JENS_EAT = new SoundEvent(new ResourceLocation("spackenmobs:entities.jens.eat"));
|
||||
|
||||
@Instance
|
||||
public static Spackenmobs instance;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event)
|
||||
public void preInitClient(FMLPreInitializationEvent event)
|
||||
{
|
||||
ModEntities.initModels();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void init(FMLInitializationEvent event)
|
||||
{
|
||||
|
|
|
@ -4,6 +4,8 @@ import java.util.Set;
|
|||
import com.google.common.collect.Sets;
|
||||
|
||||
import mod.acgaming.spackenmobs.Spackenmobs;
|
||||
import mod.acgaming.spackenmobs.items.ModItems;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityAgeable;
|
||||
import net.minecraft.entity.ai.EntityAIFollowParent;
|
||||
import net.minecraft.entity.ai.EntityAILookIdle;
|
||||
|
@ -15,7 +17,6 @@ import net.minecraft.entity.ai.EntityAIWanderAvoidWater;
|
|||
import net.minecraft.entity.ai.EntityAIWatchClosest;
|
||||
import net.minecraft.entity.passive.EntityPig;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.DamageSource;
|
||||
|
@ -24,12 +25,12 @@ import net.minecraft.world.World;
|
|||
|
||||
public class EntityJens extends EntityPig
|
||||
{
|
||||
private static final Set<Item> TEMPTATION_ITEMS = Sets.newHashSet(Items.CARROT, Items.POTATO, Items.BEETROOT);
|
||||
private static final Set<Item> TEMPTATION_ITEMS = Sets.newHashSet(ModItems.RAM);
|
||||
|
||||
public EntityJens(World worldIn)
|
||||
{
|
||||
super(worldIn);
|
||||
setSize(0.6F, 1.8F);
|
||||
setSize(0.6F, 2.2F);
|
||||
}
|
||||
|
||||
protected void initEntityAI()
|
||||
|
@ -37,7 +38,7 @@ public class EntityJens extends EntityPig
|
|||
this.tasks.addTask(0, new EntityAISwimming(this));
|
||||
this.tasks.addTask(1, new EntityAIPanic(this, 1.25D));
|
||||
this.tasks.addTask(3, new EntityAIMate(this, 1.0D));
|
||||
this.tasks.addTask(4, new EntityAITempt(this, 1.2D, Items.CARROT_ON_A_STICK, false));
|
||||
this.tasks.addTask(4, new EntityAITempt(this, 1.2D, ModItems.RAM_ON_A_STICK, false));
|
||||
this.tasks.addTask(4, new EntityAITempt(this, 1.2D, false, TEMPTATION_ITEMS));
|
||||
this.tasks.addTask(5, new EntityAIFollowParent(this, 1.1D));
|
||||
this.tasks.addTask(6, new EntityAIWanderAvoidWater(this, 1.0D));
|
||||
|
@ -50,6 +51,21 @@ public class EntityJens extends EntityPig
|
|||
return TEMPTATION_ITEMS.contains(stack.getItem());
|
||||
}
|
||||
|
||||
public boolean canBeSteered()
|
||||
{
|
||||
Entity entity = this.getControllingPassenger();
|
||||
|
||||
if (!(entity instanceof EntityPlayer))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
EntityPlayer entityplayer = (EntityPlayer)entity;
|
||||
return entityplayer.getHeldItemMainhand().getItem() == ModItems.RAM_ON_A_STICK || entityplayer.getHeldItemOffhand().getItem() == ModItems.RAM_ON_A_STICK;
|
||||
}
|
||||
}
|
||||
|
||||
public EntityJens createChild(EntityAgeable ageable)
|
||||
{
|
||||
return new EntityJens(this.world);
|
||||
|
|
|
@ -78,10 +78,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
this.experienceValue = 5;
|
||||
}
|
||||
|
||||
/**
|
||||
* Called only once on an entity when first time spawned, via egg, mob spawner, natural spawning etc, but not called
|
||||
* when entity is reloaded from nbt. Mainly used for initializing attributes and inventory
|
||||
*/
|
||||
@Nullable
|
||||
public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, @Nullable IEntityLivingData livingdata)
|
||||
{
|
||||
|
@ -105,10 +101,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
this.targetTasks.addTask(3, new EntitySchalker.AIDefenseAttack(this));
|
||||
}
|
||||
|
||||
/**
|
||||
* returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to
|
||||
* prevent them from trampling crops
|
||||
*/
|
||||
protected boolean canTriggerWalking()
|
||||
{
|
||||
return false;
|
||||
|
@ -124,9 +116,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
return Spackenmobs.ENTITY_SCHALKER_AMBIENT;
|
||||
}
|
||||
|
||||
/**
|
||||
* Plays living's sound at its position
|
||||
*/
|
||||
public void playLivingSound()
|
||||
{
|
||||
if (!this.isClosed())
|
||||
|
@ -142,7 +131,7 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
|
||||
protected SoundEvent getHurtSound(DamageSource damageSourceIn)
|
||||
{
|
||||
return this.isClosed() ? SoundEvents.ENTITY_SHULKER_HURT_CLOSED : Spackenmobs.ENTITY_SCHALKER_HURT;
|
||||
return this.isClosed() ? SoundEvents.ENTITY_SHULKER_HURT_CLOSED : SoundEvents.ENTITY_SHULKER_HURT;
|
||||
}
|
||||
|
||||
protected void entityInit()
|
||||
|
@ -170,9 +159,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
EntityLiving.registerFixesMob(fixer, EntitySchalker.class);
|
||||
}
|
||||
|
||||
/**
|
||||
* (abstract) Protected helper method to read subclass entity data from NBT.
|
||||
*/
|
||||
public void readEntityFromNBT(NBTTagCompound compound)
|
||||
{
|
||||
super.readEntityFromNBT(compound);
|
||||
|
@ -193,9 +179,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* (abstract) Protected helper method to write subclass entity data to NBT.
|
||||
*/
|
||||
public void writeEntityToNBT(NBTTagCompound compound)
|
||||
{
|
||||
super.writeEntityToNBT(compound);
|
||||
|
@ -212,9 +195,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called to update the entity's position/logic.
|
||||
*/
|
||||
public void onUpdate()
|
||||
{
|
||||
super.onUpdate();
|
||||
|
@ -396,9 +376,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Tries to move the entity towards the specified location.
|
||||
*/
|
||||
public void move(MoverType type, double x, double y, double z)
|
||||
{
|
||||
if (type == MoverType.SHULKER_BOX)
|
||||
|
@ -411,9 +388,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the x,y,z of the entity from the given parameters. Also seems to set up a bounding box.
|
||||
*/
|
||||
public void setPosition(double x, double y, double z)
|
||||
{
|
||||
super.setPosition(x, y, z);
|
||||
|
@ -482,10 +456,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons
|
||||
* use this to react to sunlight and start to burn.
|
||||
*/
|
||||
public void onLivingUpdate()
|
||||
{
|
||||
super.onLivingUpdate();
|
||||
|
@ -529,18 +499,12 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
super.notifyDataManagerChange(key);
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the position and rotation values directly without any clamping.
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void setPositionAndRotationDirect(double x, double y, double z, float yaw, float pitch, int posRotationIncrements, boolean teleport)
|
||||
{
|
||||
this.newPosRotationIncrements = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the entity is attacked.
|
||||
*/
|
||||
public boolean attackEntityFrom(DamageSource source, float amount)
|
||||
{
|
||||
if (this.isClosed())
|
||||
|
@ -573,14 +537,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
return this.getPeekTick() == 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the <b>solid</b> collision bounding box for this entity. Used to make (e.g.) boats solid. Return null if
|
||||
* this entity is not solid.
|
||||
*
|
||||
* For general purposes, use {@link #width} and {@link #height}.
|
||||
*
|
||||
* @see getEntityBoundingBox
|
||||
*/
|
||||
@Nullable
|
||||
public AxisAlignedBB getCollisionBoundingBox()
|
||||
{
|
||||
|
@ -608,9 +564,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
return ((Byte)this.dataManager.get(PEEK_TICK)).byteValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Applies or removes armor modifier
|
||||
*/
|
||||
public void updateArmorModifier(int p_184691_1_)
|
||||
{
|
||||
if (!this.world.isRemote)
|
||||
|
@ -654,10 +607,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
return 0.5F;
|
||||
}
|
||||
|
||||
/**
|
||||
* The speed it takes to move the entityliving's rotationPitch through the faceEntity method. This is only currently
|
||||
* use in wolves.
|
||||
*/
|
||||
public int getVerticalFaceSpeed()
|
||||
{
|
||||
return 180;
|
||||
|
@ -668,9 +617,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
return 180;
|
||||
}
|
||||
|
||||
/**
|
||||
* Applies a velocity to the entities, to push them away from eachother.
|
||||
*/
|
||||
public void applyEntityCollision(Entity entityIn)
|
||||
{
|
||||
}
|
||||
|
@ -707,9 +653,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
this.setMutexBits(3);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether the EntityAIBase should begin execution.
|
||||
*/
|
||||
public boolean shouldExecute()
|
||||
{
|
||||
EntityLivingBase entitylivingbase = EntitySchalker.this.getAttackTarget();
|
||||
|
@ -724,26 +667,17 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute a one shot task or start executing a continuous task
|
||||
*/
|
||||
public void startExecuting()
|
||||
{
|
||||
this.attackTime = 20;
|
||||
EntitySchalker.this.updateArmorModifier(100);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset the task's internal state. Called when this task is interrupted by another one
|
||||
*/
|
||||
public void resetTask()
|
||||
{
|
||||
EntitySchalker.this.updateArmorModifier(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Keep ticking a continuous task that has already been started
|
||||
*/
|
||||
public void updateTask()
|
||||
{
|
||||
if (EntitySchalker.this.world.getDifficulty() != EnumDifficulty.PEACEFUL)
|
||||
|
@ -780,9 +714,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
super(schalker, EntityPlayer.class, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether the EntityAIBase should begin execution.
|
||||
*/
|
||||
public boolean shouldExecute()
|
||||
{
|
||||
return EntitySchalker.this.world.getDifficulty() == EnumDifficulty.PEACEFUL ? false : super.shouldExecute();
|
||||
|
@ -816,9 +747,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether the EntityAIBase should begin execution.
|
||||
*/
|
||||
public boolean shouldExecute()
|
||||
{
|
||||
return this.taskOwner.getTeam() == null ? false : super.shouldExecute();
|
||||
|
@ -847,34 +775,22 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether the EntityAIBase should begin execution.
|
||||
*/
|
||||
public boolean shouldExecute()
|
||||
{
|
||||
return EntitySchalker.this.getAttackTarget() == null && EntitySchalker.this.rand.nextInt(40) == 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether an in-progress EntityAIBase should continue executing
|
||||
*/
|
||||
public boolean shouldContinueExecuting()
|
||||
{
|
||||
return EntitySchalker.this.getAttackTarget() == null && this.peekTime > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute a one shot task or start executing a continuous task
|
||||
*/
|
||||
public void startExecuting()
|
||||
{
|
||||
this.peekTime = 20 * (1 + EntitySchalker.this.rand.nextInt(3));
|
||||
EntitySchalker.this.updateArmorModifier(30);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset the task's internal state. Called when this task is interrupted by another one
|
||||
*/
|
||||
public void resetTask()
|
||||
{
|
||||
if (EntitySchalker.this.getAttackTarget() == null)
|
||||
|
@ -883,9 +799,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Keep ticking a continuous task that has already been started
|
||||
*/
|
||||
public void updateTask()
|
||||
{
|
||||
--this.peekTime;
|
||||
|
@ -899,9 +812,6 @@ public class EntitySchalker extends EntityGolem implements IMob
|
|||
super(theEntity);
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the Head and Body rendenring angles
|
||||
*/
|
||||
public void updateRenderAngles()
|
||||
{
|
||||
}
|
||||
|
|
|
@ -82,9 +82,6 @@ public class RegHandler
|
|||
@SubscribeEvent
|
||||
public static void registerSounds(Register<SoundEvent> event)
|
||||
{
|
||||
/*
|
||||
* CREEPERS
|
||||
*/
|
||||
// Smava Creeper
|
||||
Spackenmobs.ENTITY_SMAVACREEPER_FUSE.setRegistryName(new ResourceLocation("spackenmobs:entities.smava_creeper.fuse"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_SMAVACREEPER_FUSE);
|
||||
|
@ -101,9 +98,6 @@ public class RegHandler
|
|||
Spackenmobs.ENTITY_ISLAMIST_HURT.setRegistryName(new ResourceLocation("spackenmobs:entities.islamist.hurt"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_ISLAMIST_HURT);
|
||||
|
||||
/*
|
||||
* ZOMBIES
|
||||
*/
|
||||
// Marcell D'Avis
|
||||
Spackenmobs.ENTITY_MARCELLDAVIS_AMBIENT.setRegistryName(new ResourceLocation("spackenmobs:entities.marcell_davis.ambient"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_MARCELLDAVIS_AMBIENT);
|
||||
|
@ -120,9 +114,6 @@ public class RegHandler
|
|||
Spackenmobs.ENTITY_MRBEAN_DEATH.setRegistryName(new ResourceLocation("spackenmobs:entities.mr_bean.death"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_MRBEAN_DEATH);
|
||||
|
||||
/*
|
||||
* SKELETONS
|
||||
*/
|
||||
// ApoRed
|
||||
Spackenmobs.ENTITY_APORED_AMBIENT.setRegistryName(new ResourceLocation("spackenmobs:entities.apored.ambient"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_APORED_AMBIENT);
|
||||
|
@ -131,9 +122,6 @@ public class RegHandler
|
|||
Spackenmobs.ENTITY_APORED_DEATH.setRegistryName(new ResourceLocation("spackenmobs:entities.apored.death"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_APORED_DEATH);
|
||||
|
||||
/*
|
||||
* ZOMBIE PIGMEN
|
||||
*/
|
||||
// Drachenlord
|
||||
Spackenmobs.ENTITY_DRACHENLORD_AMBIENT.setRegistryName(new ResourceLocation("spackenmobs:entities.drachenlord.ambient"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_DRACHENLORD_AMBIENT);
|
||||
|
@ -144,9 +132,7 @@ public class RegHandler
|
|||
Spackenmobs.ENTITY_DRACHENLORD_ANGRY.setRegistryName(new ResourceLocation("spackenmobs:entities.drachenlord.angry"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_DRACHENLORD_ANGRY);
|
||||
|
||||
/*
|
||||
* SHULKER
|
||||
*/
|
||||
// Schalker
|
||||
Spackenmobs.ENTITY_SCHALKER_AMBIENT.setRegistryName(new ResourceLocation("spackenmobs:entities.schalker.ambient"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_SCHALKER_AMBIENT);
|
||||
Spackenmobs.ENTITY_SCHALKER_HURT.setRegistryName(new ResourceLocation("spackenmobs:entities.schalker.hurt"));
|
||||
|
@ -158,14 +144,14 @@ public class RegHandler
|
|||
Spackenmobs.ENTITY_SCHALKER_SHOOT.setRegistryName(new ResourceLocation("spackenmobs:entities.schalker.shoot"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_SCHALKER_SHOOT);
|
||||
|
||||
/*
|
||||
* BIPEDS
|
||||
*/
|
||||
// Jens
|
||||
Spackenmobs.ENTITY_JENS_AMBIENT.setRegistryName(new ResourceLocation("spackenmobs:entities.jens.ambient"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_JENS_AMBIENT);
|
||||
Spackenmobs.ENTITY_JENS_HURT.setRegistryName(new ResourceLocation("spackenmobs:entities.jens.hurt"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_JENS_HURT);
|
||||
Spackenmobs.ENTITY_JENS_DEATH.setRegistryName(new ResourceLocation("spackenmobs:entities.jens.death"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_JENS_DEATH);
|
||||
Spackenmobs.ENTITY_JENS_EAT.setRegistryName(new ResourceLocation("spackenmobs:entities.jens.eat"));
|
||||
event.getRegistry().register((SoundEvent)Spackenmobs.ENTITY_JENS_EAT);
|
||||
}
|
||||
}
|
|
@ -16,7 +16,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
|||
@SideOnly(Side.CLIENT)
|
||||
public class RenderApoRed extends RenderSkeleton
|
||||
{
|
||||
private static final ResourceLocation APORED_TEXTURES = new ResourceLocation("spackenmobs:textures/entities/apored.png");
|
||||
private static final ResourceLocation APORED_TEXTURE = new ResourceLocation("spackenmobs:textures/entities/apored.png");
|
||||
public static final Factory FACTORY = new Factory();
|
||||
|
||||
public RenderApoRed(RenderManager renderManagerIn)
|
||||
|
@ -40,7 +40,7 @@ public class RenderApoRed extends RenderSkeleton
|
|||
|
||||
protected ResourceLocation getEntityTexture(AbstractSkeleton entity)
|
||||
{
|
||||
return APORED_TEXTURES;
|
||||
return APORED_TEXTURE;
|
||||
}
|
||||
|
||||
public static class Factory implements IRenderFactory<EntityApoRed>
|
||||
|
|
|
@ -13,7 +13,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
|||
@SideOnly(Side.CLIENT)
|
||||
public class RenderIslamist extends RenderCreeper
|
||||
{
|
||||
private static final ResourceLocation ISLAMIST_TEXTURES = new ResourceLocation("spackenmobs:textures/entities/islamist.png");
|
||||
private static final ResourceLocation ISLAMIST_TEXTURE = new ResourceLocation("spackenmobs:textures/entities/islamist.png");
|
||||
public static final Factory FACTORY = new Factory();
|
||||
|
||||
public RenderIslamist(RenderManager renderManagerIn)
|
||||
|
@ -24,7 +24,7 @@ public class RenderIslamist extends RenderCreeper
|
|||
|
||||
protected ResourceLocation getEntityTexture(EntityCreeper entity)
|
||||
{
|
||||
return ISLAMIST_TEXTURES;
|
||||
return ISLAMIST_TEXTURE;
|
||||
}
|
||||
|
||||
public static class Factory implements IRenderFactory<EntityIslamist>
|
||||
|
|
|
@ -14,7 +14,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
|||
@SideOnly(Side.CLIENT)
|
||||
public class RenderMrBean extends RenderZombie
|
||||
{
|
||||
private static final ResourceLocation MRBEAN_TEXTURES = new ResourceLocation("spackenmobs:textures/entities/mr_bean.png");
|
||||
private static final ResourceLocation MRBEAN_TEXTURE = new ResourceLocation("spackenmobs:textures/entities/mr_bean.png");
|
||||
public static final Factory FACTORY = new Factory();
|
||||
|
||||
public RenderMrBean(RenderManager renderManagerIn)
|
||||
|
@ -33,7 +33,7 @@ public class RenderMrBean extends RenderZombie
|
|||
|
||||
protected ResourceLocation getEntityTexture(EntityZombie entity)
|
||||
{
|
||||
return MRBEAN_TEXTURES;
|
||||
return MRBEAN_TEXTURE;
|
||||
}
|
||||
|
||||
public static class Factory implements IRenderFactory<EntityMrBean>
|
||||
|
|
|
@ -33,9 +33,6 @@ public class RenderSchalker extends RenderLiving<EntitySchalker>
|
|||
return (ModelShulker)super.getMainModel();
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders the desired {@code T} type Entity.
|
||||
*/
|
||||
public void doRender(EntitySchalker entity, double x, double y, double z, float entityYaw, float partialTicks)
|
||||
{
|
||||
int i = entity.getClientTeleportInterp();
|
||||
|
@ -82,9 +79,6 @@ public class RenderSchalker extends RenderLiving<EntitySchalker>
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
|
||||
*/
|
||||
protected ResourceLocation getEntityTexture(EntitySchalker entity)
|
||||
{
|
||||
return SCHALKER_TEXTURE[entity.getColor().getMetadata()];
|
||||
|
@ -124,9 +118,6 @@ public class RenderSchalker extends RenderLiving<EntitySchalker>
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Allows the render to do state modifications necessary before the model is rendered.
|
||||
*/
|
||||
protected void preRenderCallback(EntitySchalker entitylivingbaseIn, float partialTickTime)
|
||||
{
|
||||
float f = 0.999F;
|
||||
|
|
|
@ -6,3 +6,5 @@ entity.mr_bean.name=Mr. Bean
|
|||
entity.drachenlord.name=Drachenlord
|
||||
entity.schalker.name=Schalker
|
||||
entity.jens.name=Jens
|
||||
item.spackenmobs.ram.name=RAM
|
||||
item.spackenmobs.ram_on_a_stick.name=RAM-Rute
|
|
@ -6,3 +6,5 @@ entity.mr_bean.name=Mr. Bean
|
|||
entity.drachenlord.name=Drachenlord
|
||||
entity.schalker.name=Schalker
|
||||
entity.jens.name=Jens
|
||||
item.spackenmobs.ram.name=RAM
|
||||
item.spackenmobs.ram_on_a_stick.name=RAM on a Stick
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"parent": "item/handheld_rod",
|
||||
"textures": {
|
||||
"layer0": "spackenmobs:items/ram_on_a_stick"
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue