Skip to content

Commit 118b0b9

Browse files
author
afroraydude
committed
Commit #24 
1 parent d9c4ded commit 118b0b9

File tree

15 files changed

+510
-8
lines changed

15 files changed

+510
-8
lines changed

‎common/com/emc/block/emcOre.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ public class emcOre extends emcBlock {
1616

1717
public emcOre(int id, Material mat) {
1818
super(id, mat);
19-
// TODO Auto-generated constructor stub
2019
}
2120

2221
public emcOre(int id, Material mat, CreativeTabs tab) {
2322
super(id, mat, tab);
24-
// TODO Auto-generated constructor stub
2523
}
2624

2725
public int idDropped(int i, Random random, int j) { return this.blockID; }

‎common/com/emc/block/emcOreExperience.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ public class emcOreExperience extends emcOre {
2020

2121
public emcOreExperience(int id, Material mat) {
2222
super(id, mat);
23-
// TODO Auto-generated constructor stub
2423
}
2524

2625
public emcOreExperience(int id, Material mat, CreativeTabs tab) {
2726
super(id, mat, tab);
28-
// TODO Auto-generated constructor stub
2927
}
3028

3129
public int idDropped(int i, Random random, int j) { return 0; }

‎common/com/emc/emc.java‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import com.emc.lib.emcLib;
1818
import com.emc.localization.localizationHandler;
1919
import com.emc.mat.matManager;
20+
import com.emc.newthings.common.configManager;
2021
import com.emc.proxy.commonProxy;
2122
import com.emc.world.emcWorldGenerator;
2223

@@ -29,8 +30,8 @@
2930
import cpw.mods.fml.common.network.NetworkMod;
3031
import cpw.mods.fml.common.registry.GameRegistry;
3132

32-
//@NetworkMod(clientSideRequired = true, serverSideRequired = false)
33-
//@Mod(modid = emcLib.ID, name = emcLib.NAME, version = emcLib.VERSION)
33+
@NetworkMod(clientSideRequired = true, serverSideRequired = false)
34+
@Mod(modid = emcLib.ID, name = emcLib.NAME, version = emcLib.VERSION)
3435

3536
public class emc {
3637

@@ -111,7 +112,17 @@ public ItemStack getIconItemStack() {
111112
GameRegistry.registerWorldGenerator(new emcWorldGenerator());
112113
}
113114

114-
115+
116+
}
117+
@EventHandler
118+
public static void preInit (FMLPreInitializationEvent event) {
119+
configManager.init((event.getSuggestedConfigurationFile()));
120+
if (configManager.enableBiomes) {
121+
com.emc.mat.biomeManager.init();
122+
}
123+
if (configManager.enableMobs) {
124+
com.emc.mat.mobManager.init();;
125+
}
115126
}
116127

117128
}

‎common/com/emc/entity/common/EntityMiner.java‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
package com.emc.entity.common;
2+
3+
import net.minecraft.entity.EnumCreatureAttribute;
4+
import net.minecraft.entity.SharedMonsterAttributes;
5+
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
6+
import net.minecraft.entity.ai.EntityAIHurtByTarget;
7+
import net.minecraft.entity.ai.EntityAILookIdle;
8+
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
9+
import net.minecraft.entity.ai.EntityAISwimming;
10+
import net.minecraft.entity.ai.EntityAIWander;
11+
import net.minecraft.entity.ai.EntityAIWatchClosest;
12+
import net.minecraft.entity.monster.EntityCaveSpider;
13+
import net.minecraft.entity.monster.EntityCreeper;
14+
import net.minecraft.entity.monster.EntityMob;
15+
import net.minecraft.entity.monster.EntitySlime;
16+
import net.minecraft.entity.monster.EntitySpider;
17+
import net.minecraft.entity.monster.EntityWitch;
18+
import net.minecraft.entity.monster.EntityZombie;
19+
import net.minecraft.entity.passive.EntityVillager;
20+
import net.minecraft.entity.player.EntityPlayer;
21+
import net.minecraft.item.Item;
22+
import net.minecraft.world.World;
23+
24+
public class EntityMiner extends EntityMob{
25+
26+
public EntityMiner(World par1World) {
27+
super(par1World);
28+
this.experienceValue = 10;
29+
this.tasks.addTask(0, new EntityAISwimming(this));
30+
this.tasks.addTask(1, new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.0D, false));
31+
this.tasks.addTask(2, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));
32+
this.targetTasks.addTask(3, new EntityAINearestAttackableTarget(this, EntityPlayer.class, 0, true));
33+
this.targetTasks.addTask(4, new EntityAINearestAttackableTarget(this, EntityVillager.class, 0, false));
34+
this.targetTasks.addTask(5, new EntityAINearestAttackableTarget(this, EntityZombie.class, 0, false));
35+
this.targetTasks.addTask(6, new EntityAINearestAttackableTarget(this, EntityCreeper.class, 0, false));
36+
this.targetTasks.addTask(7, new EntityAINearestAttackableTarget(this, EntitySpider.class, 0, false));
37+
this.targetTasks.addTask(8, new EntityAINearestAttackableTarget(this, EntityCaveSpider.class, 0, false));
38+
this.targetTasks.addTask(9, new EntityAINearestAttackableTarget(this, EntityWitch.class, 0, false));
39+
this.targetTasks.addTask(10, new EntityAINearestAttackableTarget(this, EntitySlime.class, 0, false));
40+
this.tasks.addTask(11, new EntityAIWander(this, 1.0D));
41+
this.tasks.addTask(12, new EntityAILookIdle(this));
42+
this.targetTasks.addTask(13, new EntityAIHurtByTarget(this, true));
43+
}
44+
protected boolean isAIEnabled()
45+
{
46+
return true;
47+
}
48+
49+
protected void func_110147_ax()
50+
{
51+
super.func_110147_ax();
52+
this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(25.0D);//Health
53+
54+
this.func_110148_a(SharedMonsterAttributes.field_111264_e).func_111128_a(5.0D);//Attack
55+
}
56+
protected String HurtSound() {
57+
return "mob.zombie.death";
58+
}
59+
protected void playStepSound(int par1, int par2, int par3, int par4) {
60+
this.playSound("mob.zombie.step", 0.15F, 1.0F);
61+
}
62+
protected int getDropItemId() {
63+
return Item.pickaxeIron.itemID;
64+
}
65+
protected void dropRareDrop(int par1) {
66+
switch (this.rand.nextInt(3)) {
67+
case 0:
68+
this.dropItem(Item.pickaxeDiamond.itemID, 1);
69+
break;
70+
}
71+
}
72+
public EnumCreatureAttribute getCreatureAttribute() {
73+
return EnumCreatureAttribute.UNDEAD;
74+
}
75+
public void onLivingUpdate() {
76+
super.onLivingUpdate();
77+
}
78+
}

‎common/com/emc/entity/model/ModelMiner.java‎

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
package com.emc.entity.model;
2+
3+
import net.minecraft.client.model.ModelBase;
4+
import net.minecraft.client.model.ModelRenderer;
5+
import net.minecraft.entity.Entity;
6+
import net.minecraft.util.MathHelper;
7+
8+
public class ModelMiner extends ModelBase
9+
{
10+
//fields
11+
ModelRenderer head;
12+
ModelRenderer body;
13+
ModelRenderer rightarm;
14+
ModelRenderer leftarm;
15+
ModelRenderer rightleg;
16+
ModelRenderer leftleg;
17+
public ModelMiner()
18+
{
19+
textureWidth = 64;
20+
textureHeight = 32;
21+
22+
head = new ModelRenderer(this, 0, 0);
23+
head.addBox(-4F, -8F, -4F, 8, 8, 8);
24+
head.setRotationPoint(0F, 0F, 0F);
25+
head.setTextureSize(64, 32);
26+
head.mirror = true;
27+
setRotation(head, 0F, 0F, 0F);
28+
body = new ModelRenderer(this, 16, 16);
29+
body.addBox(-4F, 0F, -2F, 8, 12, 4);
30+
body.setRotationPoint(0F, 0F, 0F);
31+
body.setTextureSize(64, 32);
32+
body.mirror = true;
33+
setRotation(body, 0F, 0F, 0F);
34+
rightarm = new ModelRenderer(this, 40, 16);
35+
rightarm.addBox(-3F, -2F, -2F, 4, 12, 4);
36+
rightarm.setRotationPoint(-5F, 2F, 0F);
37+
rightarm.setTextureSize(64, 32);
38+
rightarm.mirror = true;
39+
setRotation(rightarm, 0F, 0F, 0F);
40+
leftarm = new ModelRenderer(this, 40, 16);
41+
leftarm.addBox(-1F, -2F, -2F, 4, 12, 4);
42+
leftarm.setRotationPoint(5F, 2F, 0F);
43+
leftarm.setTextureSize(64, 32);
44+
leftarm.mirror = true;
45+
setRotation(leftarm, 0F, 0F, 0F);
46+
rightleg = new ModelRenderer(this, 0, 16);
47+
rightleg.addBox(-2F, 0F, -2F, 4, 12, 4);
48+
rightleg.setRotationPoint(-2F, 12F, 0F);
49+
rightleg.setTextureSize(64, 32);
50+
rightleg.mirror = true;
51+
setRotation(rightleg, 0F, 0F, 0F);
52+
leftleg = new ModelRenderer(this, 0, 16);
53+
leftleg.addBox(-2F, 0F, -2F, 4, 12, 4);
54+
leftleg.setRotationPoint(2F, 12F, 0F);
55+
leftleg.setTextureSize(64, 32);
56+
leftleg.mirror = true;
57+
setRotation(leftleg, 0F, 0F, 0F);
58+
}
59+
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
60+
{
61+
super.render(entity, f, f1, f2, f3, f4, f5);
62+
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
63+
head.render(f5);
64+
body.render(f5);
65+
rightarm.render(f5);
66+
leftarm.render(f5);
67+
rightleg.render(f5);
68+
leftleg.render(f5);
69+
}
70+
private void setRotation(ModelRenderer model, float x, float y, float z)
71+
{
72+
model.rotateAngleX = x;
73+
model.rotateAngleY = y;
74+
model.rotateAngleZ = z;
75+
}
76+
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity par6Entity)
77+
{
78+
this.head.rotateAngleY = f3 / (180F / (float)Math.PI);
79+
this.head.rotateAngleX = f4 / (170F / (float)Math.PI);
80+
81+
this.leftleg.rotateAngleX = MathHelper.cos(f * 0.6662F) * 2.0F * f1 * 0.5F;
82+
this.leftleg.rotateAngleY = 0.0F;
83+
84+
this.rightleg.rotateAngleX = MathHelper.cos(f * 0.6662F + (float)Math.PI) * 1.4F * f1;
85+
this.rightleg.rotateAngleY = 0.0F;
86+
87+
this.leftarm.rotateAngleX = MathHelper.cos(f * 0.6662F) * 2.0F * f1 * 0.5F;
88+
this.leftarm.rotateAngleY = 0.0F;
89+
90+
this.rightarm.rotateAngleX = MathHelper.cos(f * 0.6662F + (float)Math.PI) * 2.0F * f1 * 0.5F;
91+
this.rightarm.rotateAngleY = 0.0F;
92+
}
93+
}

‎common/com/emc/entity/model/ModelTESTTESTTEST.java‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
// Date: 8/29/2013 10:58:46 PM
2+
// Template version 1.1
3+
// Java generated by Techne
4+
// Keep in mind that you still need to fill in some blanks
5+
// - ZeuX
6+
7+
8+
9+
10+
11+
12+
package com.emc.entity.model;
13+
14+
import net.minecraft.client.model.ModelBase;
15+
import net.minecraft.client.model.ModelRenderer;
16+
import net.minecraft.entity.Entity;
17+
18+
public class ModelTESTTESTTEST extends ModelBase
19+
{
20+
//fields
21+
ModelRenderer head;
22+
ModelRenderer body;
23+
ModelRenderer rightarm;
24+
ModelRenderer leftarm;
25+
ModelRenderer rightleg;
26+
ModelRenderer leftleg;
27+
28+
public ModelTESTTESTTEST()
29+
{
30+
textureWidth = 64;
31+
textureHeight = 32;
32+
33+
head = new ModelRenderer(this, 0, 0);
34+
head.addBox(-4F, -8F, -4F, 8, 8, 8);
35+
head.setRotationPoint(0F, 0F, 0F);
36+
head.setTextureSize(64, 32);
37+
head.mirror = true;
38+
setRotation(head, 0F, 0F, 0F);
39+
body = new ModelRenderer(this, 16, 16);
40+
body.addBox(-4F, 0F, -2F, 8, 12, 4);
41+
body.setRotationPoint(0F, 0F, 0F);
42+
body.setTextureSize(64, 32);
43+
body.mirror = true;
44+
setRotation(body, 0F, 0F, 0F);
45+
rightarm = new ModelRenderer(this, 40, 16);
46+
rightarm.addBox(-3F, -2F, -2F, 4, 12, 4);
47+
rightarm.setRotationPoint(-5F, 2F, 0F);
48+
rightarm.setTextureSize(64, 32);
49+
rightarm.mirror = true;
50+
setRotation(rightarm, 0F, 0F, 0F);
51+
leftarm = new ModelRenderer(this, 40, 16);
52+
leftarm.addBox(-1F, -2F, -2F, 4, 12, 4);
53+
leftarm.setRotationPoint(5F, 2F, 0F);
54+
leftarm.setTextureSize(64, 32);
55+
leftarm.mirror = true;
56+
setRotation(leftarm, 0F, 0F, 0F);
57+
rightleg = new ModelRenderer(this, 0, 16);
58+
rightleg.addBox(-2F, 0F, -2F, 4, 12, 4);
59+
rightleg.setRotationPoint(-2F, 12F, 0F);
60+
rightleg.setTextureSize(64, 32);
61+
rightleg.mirror = true;
62+
setRotation(rightleg, 0F, 0F, 0F);
63+
leftleg = new ModelRenderer(this, 0, 16);
64+
leftleg.addBox(-2F, 0F, -2F, 4, 12, 4);
65+
leftleg.setRotationPoint(2F, 12F, 0F);
66+
leftleg.setTextureSize(64, 32);
67+
leftleg.mirror = true;
68+
setRotation(leftleg, 0F, 0F, 0F);
69+
}
70+
71+
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
72+
{
73+
super.render(entity, f, f1, f2, f3, f4, f5);
74+
setRotationAngles(f, f1, f2, f3, f4, f5);
75+
head.render(f5);
76+
body.render(f5);
77+
rightarm.render(f5);
78+
leftarm.render(f5);
79+
rightleg.render(f5);
80+
leftleg.render(f5);
81+
}
82+
83+
private void setRotation(ModelRenderer model, float x, float y, float z)
84+
{
85+
model.rotateAngleX = x;
86+
model.rotateAngleY = y;
87+
model.rotateAngleZ = z;
88+
}
89+
90+
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
91+
{
92+
93+
}
94+
95+
}

‎common/com/emc/entity/render/RenderMiner.java‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package com.emc.entity.render;
2+
3+
import com.emc.*;
4+
import com.emc.entity.common.EntityMiner;
5+
import com.emc.entity.model.ModelMiner;
6+
7+
import net.minecraft.client.model.ModelBase;
8+
import net.minecraft.client.renderer.entity.RenderLiving;
9+
import net.minecraft.entity.Entity;
10+
import net.minecraft.entity.EntityLiving;
11+
import net.minecraft.util.ResourceLocation;
12+
13+
public class RenderMiner extends RenderLiving {
14+
protected ModelMiner model;
15+
16+
public RenderMiner(ModelBase par1ModelBase, float par2) {
17+
super(par1ModelBase, par2);
18+
model = ((ModelMiner)mainModel);
19+
}
20+
21+
public void renderMiner(EntityMiner entity, double par2, double par4, double par6, float par8, float par9) {
22+
super.doRenderLiving(entity, par2, par4, par6, par8, par9);
23+
}
24+
25+
public void doRenerLiving(EntityLiving par1EntityLiving, double par2, double par4, double par6, float par8, float par9) {
26+
renderMiner((EntityMiner)par1EntityLiving, par2, par4, par6, par8, par9);
27+
}
28+
29+
@Override
30+
public void doRender(Entity entity, double d0, double d1, double d2, float f, float f1) {
31+
renderMiner((EntityMiner)entity, d0, d1, d2, f, f1);
32+
}
33+
34+
@Override
35+
protected ResourceLocation func_110775_a(Entity entity) {
36+
return new ResourceLocation("crosslib:textures/mobs/Miner.png");
37+
}
38+
}

0 commit comments

Comments
 (0)