diff --git a/Client/src/pixelmon/PixelmonIDList.java b/Client/src/pixelmon/PixelmonIDList.java index fb5410f..2891e3f 100644 --- a/Client/src/pixelmon/PixelmonIDList.java +++ b/Client/src/pixelmon/PixelmonIDList.java @@ -64,7 +64,8 @@ public class PixelmonIDList { public static int mareepId; public static int solrockId; public static int lunatoneId; - + public static int tentacoolId; + public static int tentacruelId; public static int i=0; @@ -128,5 +129,11 @@ public static void load(Configuration configuration) { vibravaId = Integer.parseInt(configuration.getOrCreateIntProperty("Vibrava", "pokemon", i++).value); mareepId = Integer.parseInt(configuration.getOrCreateIntProperty("Mareep", "pokemon", i++).value); dratiniId = Integer.parseInt(configuration.getOrCreateIntProperty("Dratini", "pokemon", i++).value); + lunatoneId = Integer.parseInt(configuration.getOrCreateIntProperty("Lunatone", "pokemon", i++).value); + solrockId = Integer.parseInt(configuration.getOrCreateIntProperty("Solrock", "pokemon", i++).value); + tentacoolId = Integer.parseInt(configuration.getOrCreateIntProperty("Tentacool", "pokemon", i++).value); + //tentacruelId = Integer.parseInt(configuration.getOrCreateIntProperty("Tentacruel", "pokemon", i++).value); + + } } \ No newline at end of file diff --git a/Client/src/pixelmon/Pokemon/EntityLunatone.java b/Client/src/pixelmon/Pokemon/EntityLunatone.java new file mode 100644 index 0000000..5a0f9ca --- /dev/null +++ b/Client/src/pixelmon/Pokemon/EntityLunatone.java @@ -0,0 +1,42 @@ +package pixelmon.Pokemon; + +import pixelmon.entities.BaseEntityPixelmon; +import pixelmon.entities.EntityGroundPixelmon; +import net.minecraft.src.World; + +public class EntityLunatone extends EntityGroundPixelmon +{ + + public EntityLunatone(World world) + { + super(world); + texture = "/pixelmon/image/lunatone.png"; + init(); + } + + public void init() + { + name = "Lunatone"; + isImmuneToFire = false; + doesHover = true; + hoverHeight=1f; + super.init(); + } + + public void evolve() + { + + } + + public boolean getCanSpawnHere() + { + if(!worldObj.isDaytime() ) { + return true; + } + + return false; + } + +} + + \ No newline at end of file diff --git a/Client/src/pixelmon/Pokemon/EntitySolrock.java b/Client/src/pixelmon/Pokemon/EntitySolrock.java new file mode 100644 index 0000000..9e7fccf --- /dev/null +++ b/Client/src/pixelmon/Pokemon/EntitySolrock.java @@ -0,0 +1,47 @@ +package pixelmon.Pokemon; + +import pixelmon.entities.BaseEntityPixelmon; +import pixelmon.entities.EntityGroundPixelmon; +import net.minecraft.src.World; + +public class EntitySolrock extends EntityGroundPixelmon +{ + + public EntitySolrock(World world) + { + super(world); + texture = "/pixelmon/image/solrock.png"; + init(); + } + + public void init() + { + name = "Solrock"; + isImmuneToFire = true; + doesHover = true; + hoverHeight=1f; + super.init(); + } + + public void evolve() + { + + } + + public boolean getCanSpawnHere() + { + if(worldObj.isDaytime() ) { + return true; + } + + return false; + } + + + + + + + + +} diff --git a/Client/src/pixelmon/Pokemon/ModelLunatone.java b/Client/src/pixelmon/Pokemon/ModelLunatone.java new file mode 100644 index 0000000..653798b --- /dev/null +++ b/Client/src/pixelmon/Pokemon/ModelLunatone.java @@ -0,0 +1,647 @@ +// Date: 15/07/2012 1:15:36 PM +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + + + + + + +package pixelmon.Pokemon; + +import net.minecraft.src.Entity; +import net.minecraft.src.ModelBase; +import net.minecraft.src.ModelRenderer; + +public class ModelLunatone extends ModelBase +{ + //fields + ModelRenderer Head; + ModelRenderer Top1; + ModelRenderer Top2; + ModelRenderer Top3; + ModelRenderer Top4; + ModelRenderer Top5; + ModelRenderer Top6; + ModelRenderer Top7; + ModelRenderer Top8; + ModelRenderer Top9; + ModelRenderer Top10; + ModelRenderer Top11; + ModelRenderer Top12; + ModelRenderer Top13; + ModelRenderer Down1; + ModelRenderer Down2; + ModelRenderer Down3; + ModelRenderer Down4; + ModelRenderer Down5; + ModelRenderer Down6; + ModelRenderer Down7; + ModelRenderer Down8; + ModelRenderer Down9; + ModelRenderer Down10; + ModelRenderer Down11; + ModelRenderer Down12; + ModelRenderer Nose1; + ModelRenderer Nose2; + ModelRenderer Nose3; + ModelRenderer Nose4; + ModelRenderer Face1; + ModelRenderer Face2; + ModelRenderer Smooth1; + ModelRenderer Smooth2; + ModelRenderer Smooth3; + ModelRenderer Smooth4; + ModelRenderer Smooth5; + ModelRenderer Smooth6; + ModelRenderer Smooth7; + ModelRenderer Smooth8; + ModelRenderer Smooth9; + ModelRenderer Smooth10; + ModelRenderer Smooth11; + ModelRenderer Smooth12; + ModelRenderer Smooth13; + ModelRenderer Smooth14; + ModelRenderer Smooth15; + ModelRenderer Smooth16; + ModelRenderer Smooth17; + ModelRenderer Smooth18; + ModelRenderer Smooth19; + ModelRenderer Smooth20; + ModelRenderer Smooth21; + ModelRenderer Smooth22; + ModelRenderer Smooth23; + ModelRenderer Smooth24; + ModelRenderer Smooth25; + ModelRenderer Smooth26; + ModelRenderer Smooth27; + ModelRenderer Smooth28; + ModelRenderer Smooth29; + ModelRenderer Smooth30; + ModelRenderer Smooth31; + ModelRenderer Smooth32; + ModelRenderer Smooth33; + ModelRenderer Smooth34; + ModelRenderer Smooth35; + ModelRenderer Smooth36; + ModelRenderer Smooth37; + ModelRenderer Smooth38; + ModelRenderer Nose5; + ModelRenderer Nose6; + ModelRenderer Nose7; + ModelRenderer Nose8; + ModelRenderer Nose9; + + public ModelLunatone() + { + textureWidth = 64; + textureHeight = 128; + + Head = new ModelRenderer(this, 44, 118); + Head.addBox(0F, 0F, 0F, 3, 3, 7); + Head.setRotationPoint(-1F, 0F, 0F); + Head.setTextureSize(64, 128); + Head.mirror = true; + setRotation(Head, 0F, 0F, 0F); + Top1 = new ModelRenderer(this, 0, 108); + Top1.addBox(0F, 0F, 0F, 3, 1, 7); + Top1.setRotationPoint(-1F, 0F, -0.1F); + Top1.setTextureSize(64, 128); + Top1.mirror = true; + setRotation(Top1, 0.1047198F, 0F, 0F); + Top2 = new ModelRenderer(this, 0, 108); + Top2.addBox(0F, 0F, 0F, 3, 1, 7); + Top2.setRotationPoint(-1F, 0F, -0.3F); + Top2.setTextureSize(64, 128); + Top2.mirror = true; + setRotation(Top2, 0.2443461F, 0F, 0F); + Top3 = new ModelRenderer(this, 0, 108); + Top3.addBox(0F, 0F, 0F, 3, 1, 7); + Top3.setRotationPoint(-1F, 0F, -0.5F); + Top3.setTextureSize(64, 128); + Top3.mirror = true; + setRotation(Top3, 0.3839724F, 0F, 0F); + Top4 = new ModelRenderer(this, 0, 98); + Top4.addBox(0F, 0F, 0F, 3, 2, 7); + Top4.setRotationPoint(-1F, -0.5F, -1F); + Top4.setTextureSize(64, 128); + Top4.mirror = true; + setRotation(Top4, 0.5061455F, 0F, 0F); + Top5 = new ModelRenderer(this, 0, 89); + Top5.addBox(0F, 0F, 0F, 3, 2, 6); + Top5.setRotationPoint(-1F, -1F, -0.8F); + Top5.setTextureSize(64, 128); + Top5.mirror = true; + setRotation(Top5, 0.6806784F, 0F, 0F); + Top6 = new ModelRenderer(this, 0, 89); + Top6.addBox(0F, 0F, 0F, 3, 2, 6); + Top6.setRotationPoint(-1F, -0.6F, -1.2F); + Top6.setTextureSize(64, 128); + Top6.mirror = true; + setRotation(Top6, 0.9948377F, 0F, 0F); + Top7 = new ModelRenderer(this, 0, 82); + Top7.addBox(0F, 0F, 0F, 3, 1, 5); + Top7.setRotationPoint(-1F, -1F, -1F); + Top7.setTextureSize(64, 128); + Top7.mirror = true; + setRotation(Top7, 1.151917F, 0F, 0F); + Top8 = new ModelRenderer(this, 0, 82); + Top8.addBox(0F, 0F, 0F, 3, 1, 5); + Top8.setRotationPoint(-1F, -0.6F, -1F); + Top8.setTextureSize(64, 128); + Top8.mirror = true; + setRotation(Top8, 1.32645F, 0F, 0F); + Top9 = new ModelRenderer(this, 0, 75); + Top9.addBox(0F, 0F, 0F, 2, 2, 4); + Top9.setRotationPoint(-0.5F, -1.5F, -2F); + Top9.setTextureSize(64, 128); + Top9.mirror = true; + setRotation(Top9, 1.37881F, 0F, 0F); + Top10 = new ModelRenderer(this, 0, 67); + Top10.addBox(0F, 0F, 0F, 2, 3, 4); + Top10.setRotationPoint(-0.5F, -1.2F, -3F); + Top10.setTextureSize(64, 128); + Top10.mirror = true; + setRotation(Top10, 1.500983F, 0F, 0F); + Top11 = new ModelRenderer(this, 0, 60); + Top11.addBox(0F, 0F, 0F, 2, 3, 3); + Top11.setRotationPoint(-0.5F, -1.5F, -4F); + Top11.setTextureSize(64, 128); + Top11.mirror = true; + setRotation(Top11, 1.727876F, 0F, 0F); + Top12 = new ModelRenderer(this, 0, 54); + Top12.addBox(0F, 0F, 0F, 1, 3, 2); + Top12.setRotationPoint(0F, -1.5F, -5F); + Top12.setTextureSize(64, 128); + Top12.mirror = true; + setRotation(Top12, 1.972222F, 0F, 0F); + Top13 = new ModelRenderer(this, 0, 50); + Top13.addBox(0F, 0F, 0F, 1, 2, 1); + Top13.setRotationPoint(0F, -3F, -5F); + Top13.setTextureSize(64, 128); + Top13.mirror = true; + setRotation(Top13, -0.9075712F, 0F, 0F); + Down1 = new ModelRenderer(this, 44, 108); + Down1.addBox(0F, 0F, 0F, 3, 1, 7); + Down1.setRotationPoint(-1F, 2.2F, 0F); + Down1.setTextureSize(64, 128); + Down1.mirror = true; + setRotation(Down1, -0.1047198F, 0F, 0F); + Down2 = new ModelRenderer(this, 44, 108); + Down2.addBox(0F, 0F, 0F, 3, 1, 7); + Down2.setRotationPoint(-1F, 2.1F, 0F); + Down2.setTextureSize(64, 128); + Down2.mirror = true; + setRotation(Down2, -0.2443461F, 0F, 0F); + Down3 = new ModelRenderer(this, 44, 108); + Down3.addBox(0F, 0F, 0F, 3, 1, 7); + Down3.setRotationPoint(-1F, 2.1F, -0.1F); + Down3.setTextureSize(64, 128); + Down3.mirror = true; + setRotation(Down3, -0.3839724F, 0F, 0F); + Down4 = new ModelRenderer(this, 44, 98); + Down4.addBox(0F, 0F, 0F, 3, 2, 7); + Down4.setRotationPoint(-1F, 2.1F, -0.2F); + Down4.setTextureSize(64, 128); + Down4.mirror = true; + setRotation(Down4, -0.5061455F, 0F, 0F); + Down5 = new ModelRenderer(this, 44, 89); + Down5.addBox(0F, 0F, 0F, 3, 2, 6); + Down5.setRotationPoint(-1F, 3F, 0F); + Down5.setTextureSize(64, 128); + Down5.mirror = true; + setRotation(Down5, -0.6806784F, 0F, 0F); + Down6 = new ModelRenderer(this, 44, 80); + Down6.addBox(0F, 0F, 0F, 3, 2, 6); + Down6.setRotationPoint(-1F, 3F, 0F); + Down6.setTextureSize(64, 128); + Down6.mirror = true; + setRotation(Down6, -0.9948377F, 0F, 0F); + Down7 = new ModelRenderer(this, 44, 73); + Down7.addBox(0F, 0F, 0F, 3, 1, 5); + Down7.setRotationPoint(-1F, 4F, -0.7F); + Down7.setTextureSize(64, 128); + Down7.mirror = true; + setRotation(Down7, -1.151917F, 0F, 0F); + Down8 = new ModelRenderer(this, 44, 73); + Down8.addBox(0F, 0F, 0F, 3, 1, 5); + Down8.setRotationPoint(-1F, 4F, -0.8F); + Down8.setTextureSize(64, 128); + Down8.mirror = true; + setRotation(Down8, -1.32645F, 0F, 0F); + Down9 = new ModelRenderer(this, 44, 66); + Down9.addBox(0F, 0F, 0F, 2, 2, 4); + Down9.setRotationPoint(-0.5F, 4.4F, -0.3F); + Down9.setTextureSize(64, 128); + Down9.mirror = true; + setRotation(Down9, -1.37881F, 0F, 0F); + Down10 = new ModelRenderer(this, 44, 59); + Down10.addBox(0F, 0F, 0F, 2, 3, 3); + Down10.setRotationPoint(-0.5F, 5.1F, -0.3F); + Down10.setTextureSize(64, 128); + Down10.mirror = true; + setRotation(Down10, -1.500983F, 0F, 0F); + Down11 = new ModelRenderer(this, 44, 54); + Down11.addBox(0F, 0F, 0F, 2, 2, 2); + Down11.setRotationPoint(-0.5F, 6F, -2F); + Down11.setTextureSize(64, 128); + Down11.mirror = true; + setRotation(Down11, -1.727876F, 0F, 0F); + Down12 = new ModelRenderer(this, 44, 49); + Down12.addBox(0F, 0F, 0F, 1, 3, 1); + Down12.setRotationPoint(0F, 7.3F, -2F); + Down12.setTextureSize(64, 128); + Down12.mirror = true; + setRotation(Down12, -1.972222F, 0F, 0F); + Nose1 = new ModelRenderer(this, 27, 11); + Nose1.addBox(0F, 0F, 0F, 2, 2, 4); + Nose1.setRotationPoint(-0.5F, 0.5F, -2F); + Nose1.setTextureSize(64, 128); + Nose1.mirror = true; + setRotation(Nose1, 0F, 0F, 0F); + Nose2 = new ModelRenderer(this, 27, 19); + Nose2.addBox(0F, 0F, 0F, 1, 1, 3); + Nose2.setRotationPoint(-0.01F, 1F, -4F); + Nose2.setTextureSize(64, 128); + Nose2.mirror = true; + setRotation(Nose2, 0F, 0F, 0F); + Nose3 = new ModelRenderer(this, 27, 19); + Nose3.addBox(0F, 0F, 0F, 1, 1, 3); + Nose3.setRotationPoint(0.51F, 1F, -2.1F); + Nose3.setTextureSize(64, 128); + Nose3.mirror = true; + setRotation(Nose3, 0F, 0F, 0F); + Nose4 = new ModelRenderer(this, 27, 19); + Nose4.addBox(0F, 0F, 0F, 1, 1, 3); + Nose4.setRotationPoint(-0.51F, 1F, -2.1F); + Nose4.setTextureSize(64, 128); + Nose4.mirror = true; + setRotation(Nose4, 0F, 0F, 0F); + Face1 = new ModelRenderer(this, 0, 118); + Face1.addBox(0F, 0F, 0F, 1, 3, 7); + Face1.setRotationPoint(1.1F, 0F, 0F); + Face1.setTextureSize(64, 128); + Face1.mirror = true; + setRotation(Face1, 0F, 0F, 0F); + Face2 = new ModelRenderer(this, 17, 118); + Face2.addBox(0F, 0F, 0F, 1, 3, 7); + Face2.setRotationPoint(-1.1F, 0F, 0F); + Face2.setTextureSize(64, 128); + Face2.mirror = true; + setRotation(Face2, 0F, 0F, 0F); + Smooth1 = new ModelRenderer(this, 0, 0); + Smooth1.addBox(0F, -3F, 0F, 3, 2, 1); + Smooth1.setRotationPoint(-1F, 1F, 6.4F); + Smooth1.setTextureSize(64, 128); + Smooth1.mirror = true; + setRotation(Smooth1, 0.3316126F, 0F, 0F); + Smooth2 = new ModelRenderer(this, 0, 0); + Smooth2.addBox(0F, 0F, 0F, 3, 2, 1); + Smooth2.setRotationPoint(-1F, -3.3F, 4.5F); + Smooth2.setTextureSize(64, 128); + Smooth2.mirror = true; + setRotation(Smooth2, 0.5585054F, 0F, 0F); + Smooth3 = new ModelRenderer(this, 0, 0); + Smooth3.addBox(0F, 0F, 0F, 3, 2, 1); + Smooth3.setRotationPoint(-1F, -4.2F, 3.2F); + Smooth3.setTextureSize(64, 128); + Smooth3.mirror = true; + setRotation(Smooth3, 0.9250245F, 0F, 0F); + Smooth4 = new ModelRenderer(this, 0, 0); + Smooth4.addBox(0F, -3F, 0F, 3, 1, 2); + Smooth4.setRotationPoint(-1F, -3F, 0.8F); + Smooth4.setTextureSize(64, 128); + Smooth4.mirror = true; + setRotation(Smooth4, -0.4014257F, 0F, 0F); + Smooth5 = new ModelRenderer(this, 0, 0); + Smooth5.addBox(0F, 0F, 0F, 3, 1, 2); + Smooth5.setRotationPoint(-1F, -5.9F, 0F); + Smooth5.setTextureSize(64, 128); + Smooth5.mirror = true; + setRotation(Smooth5, -0.0698132F, 0F, 0F); + Smooth6 = new ModelRenderer(this, 0, 0); + Smooth6.addBox(0F, 0F, 0F, 2, 1, 2); + Smooth6.setRotationPoint(-0.5F, -5.7F, -2F); + Smooth6.setTextureSize(64, 128); + Smooth6.mirror = true; + setRotation(Smooth6, 0.1047198F, 0F, 0F); + Smooth7 = new ModelRenderer(this, 0, 0); + Smooth7.addBox(0F, 0F, 0F, 2, 1, 2); + Smooth7.setRotationPoint(-0.5F, -5F, -3.9F); + Smooth7.setTextureSize(64, 128); + Smooth7.mirror = true; + setRotation(Smooth7, 0.3490659F, 0F, 0F); + Smooth8 = new ModelRenderer(this, 0, 0); + Smooth8.addBox(0F, 0F, 0F, 2, 1, 1); + Smooth8.setRotationPoint(-0.5F, -4.5F, -4.7F); + Smooth8.setTextureSize(64, 128); + Smooth8.mirror = true; + setRotation(Smooth8, 0.5585054F, 0F, 0F); + Smooth9 = new ModelRenderer(this, 0, 0); + Smooth9.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth9.setRotationPoint(0F, -3.8F, -5.4F); + Smooth9.setTextureSize(64, 128); + Smooth9.mirror = true; + setRotation(Smooth9, 0.7679449F, 0F, 0F); + Smooth10 = new ModelRenderer(this, 0, 0); + Smooth10.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth10.setRotationPoint(0F, -4F, -5.2F); + Smooth10.setTextureSize(64, 128); + Smooth10.mirror = true; + setRotation(Smooth10, -0.6806784F, 0F, 0F); + Smooth11 = new ModelRenderer(this, 0, 0); + Smooth11.addBox(0F, 0F, 0F, 1, 2, 1); + Smooth11.setRotationPoint(0F, -3.4F, -5.7F); + Smooth11.setTextureSize(64, 128); + Smooth11.mirror = true; + setRotation(Smooth11, -0.4537856F, 0F, 0F); + Smooth12 = new ModelRenderer(this, 0, 0); + Smooth12.addBox(0F, 0F, 0F, 3, 2, 1); + Smooth12.setRotationPoint(-1F, 3F, 6F); + Smooth12.setTextureSize(64, 128); + Smooth12.mirror = true; + setRotation(Smooth12, -0.1570796F, 0F, 0F); + Smooth13 = new ModelRenderer(this, 0, 0); + Smooth13.addBox(0F, 0F, 0F, 3, 2, 1); + Smooth13.setRotationPoint(-1F, 4.6F, 5.8F); + Smooth13.setTextureSize(64, 128); + Smooth13.mirror = true; + setRotation(Smooth13, -0.5061455F, 0F, 0F); + Smooth14 = new ModelRenderer(this, 0, 0); + Smooth14.addBox(0F, 0F, 0F, 3, 2, 1); + Smooth14.setRotationPoint(-1F, 6F, 5.1F); + Smooth14.setTextureSize(64, 128); + Smooth14.mirror = true; + setRotation(Smooth14, -0.7679449F, 0F, 0F); + Smooth15 = new ModelRenderer(this, 0, 0); + Smooth15.addBox(0F, 0F, 0F, 3, 1, 2); + Smooth15.setRotationPoint(-1F, 8.2F, 2.2F); + Smooth15.setTextureSize(64, 128); + Smooth15.mirror = true; + setRotation(Smooth15, 0.5061455F, 0F, 0F); + Smooth16 = new ModelRenderer(this, 0, 0); + Smooth16.addBox(0F, 0F, 0F, 3, 1, 2); + Smooth16.setRotationPoint(-1F, 8.3F, 0.7F); + Smooth16.setTextureSize(64, 128); + Smooth16.mirror = true; + setRotation(Smooth16, 0.122173F, 0F, 0F); + Smooth17 = new ModelRenderer(this, 0, 0); + Smooth17.addBox(0F, 0F, 0F, 3, 1, 2); + Smooth17.setRotationPoint(-1F, 8F, -1F); + Smooth17.setTextureSize(64, 128); + Smooth17.mirror = true; + setRotation(Smooth17, -0.1396263F, 0F, 0F); + Smooth18 = new ModelRenderer(this, 0, 0); + Smooth18.addBox(0F, 0F, 0F, 2, 1, 2); + Smooth18.setRotationPoint(-0.5F, 7.6F, -2.6F); + Smooth18.setTextureSize(64, 128); + Smooth18.mirror = true; + setRotation(Smooth18, -0.2268928F, 0F, 0F); + Smooth19 = new ModelRenderer(this, 0, 0); + Smooth19.addBox(0F, 0F, 0F, 2, 1, 2); + Smooth19.setRotationPoint(-0.5F, 6.9F, -4.3F); + Smooth19.setTextureSize(64, 128); + Smooth19.mirror = true; + setRotation(Smooth19, -0.3665191F, 0F, 0F); + Smooth20 = new ModelRenderer(this, 0, 0); + Smooth20.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth20.setRotationPoint(0F, 6.4F, -4.5F); + Smooth20.setTextureSize(64, 128); + Smooth20.mirror = true; + setRotation(Smooth20, -0.9075712F, 0F, 0F); + Smooth21 = new ModelRenderer(this, 0, 0); + Smooth21.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth21.setRotationPoint(0F, 6F, -4.7F); + Smooth21.setTextureSize(64, 128); + Smooth21.mirror = true; + setRotation(Smooth21, -0.9773844F, 0F, 0F); + Smooth22 = new ModelRenderer(this, 0, 0); + Smooth22.addBox(0F, 0F, 0F, 3, 2, 1); + Smooth22.setRotationPoint(-1F, -0.3F, 6F); + Smooth22.setTextureSize(64, 128); + Smooth22.mirror = true; + setRotation(Smooth22, 0.0349066F, 0F, 0F); + Smooth23 = new ModelRenderer(this, 0, 0); + Smooth23.addBox(0F, 0F, 0F, 3, 2, 1); + Smooth23.setRotationPoint(-1F, 1.2F, 6F); + Smooth23.setTextureSize(64, 128); + Smooth23.mirror = true; + setRotation(Smooth23, -0.0174533F, 0F, 0F); + Smooth24 = new ModelRenderer(this, 0, 0); + Smooth24.addBox(0F, 0F, 0F, 2, 1, 2); + Smooth24.setRotationPoint(-0.5F, -2F, -2.7F); + Smooth24.setTextureSize(64, 128); + Smooth24.mirror = true; + setRotation(Smooth24, -0.2268928F, 0F, 0F); + Smooth25 = new ModelRenderer(this, 0, 0); + Smooth25.addBox(0F, 0F, 0F, 2, 1, 2); + Smooth25.setRotationPoint(-0.5F, -2F, -4F); + Smooth25.setTextureSize(64, 128); + Smooth25.mirror = true; + setRotation(Smooth25, 0F, 0F, 0F); + Smooth26 = new ModelRenderer(this, 0, 0); + Smooth26.addBox(0F, 0F, 0F, 1, 1, 2); + Smooth26.setRotationPoint(0F, -1.6F, -6F); + Smooth26.setTextureSize(64, 128); + Smooth26.mirror = true; + setRotation(Smooth26, 0.2094395F, 0F, 0F); + Smooth27 = new ModelRenderer(this, 0, 0); + Smooth27.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth27.setRotationPoint(0F, -1.9F, -6.4F); + Smooth27.setTextureSize(64, 128); + Smooth27.mirror = true; + setRotation(Smooth27, -0.3665191F, 0F, 0F); + Smooth28 = new ModelRenderer(this, 0, 0); + Smooth28.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth28.setRotationPoint(0F, -1F, -6.7F); + Smooth28.setTextureSize(64, 128); + Smooth28.mirror = true; + setRotation(Smooth28, -0.1570796F, 0F, 0F); + Smooth29 = new ModelRenderer(this, 0, 0); + Smooth29.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth29.setRotationPoint(0F, -1.4F, -6F); + Smooth29.setTextureSize(64, 128); + Smooth29.mirror = true; + setRotation(Smooth29, -0.6981317F, 0F, 0F); + Smooth30 = new ModelRenderer(this, 0, 0); + Smooth30.addBox(0F, 0F, 0F, 2, 1, 3); + Smooth30.setRotationPoint(-0.5F, 5.7F, -4F); + Smooth30.setTextureSize(64, 128); + Smooth30.mirror = true; + setRotation(Smooth30, 0.5934119F, 0F, 0F); + Smooth31 = new ModelRenderer(this, 0, 0); + Smooth31.addBox(0F, 0F, 0F, 1, 1, 2); + Smooth31.setRotationPoint(0F, 6F, -5F); + Smooth31.setTextureSize(64, 128); + Smooth31.mirror = true; + setRotation(Smooth31, 0.3839724F, 0F, 0F); + Smooth32 = new ModelRenderer(this, 0, 0); + Smooth32.addBox(0F, 0F, 0F, 1, 3, 1); + Smooth32.setRotationPoint(0F, 4.8F, -6.7F); + Smooth32.setTextureSize(64, 128); + Smooth32.mirror = true; + setRotation(Smooth32, 0.5934119F, 0F, 0F); + Smooth33 = new ModelRenderer(this, 0, 0); + Smooth33.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth33.setRotationPoint(0F, 5.7F, -5F); + Smooth33.setTextureSize(64, 128); + Smooth33.mirror = true; + setRotation(Smooth33, 0F, 0F, 0F); + Smooth34 = new ModelRenderer(this, 0, 0); + Smooth34.addBox(0F, 0F, 0F, 1, 2, 1); + Smooth34.setRotationPoint(0F, 5F, -6F); + Smooth34.setTextureSize(64, 128); + Smooth34.mirror = true; + setRotation(Smooth34, 0.8726646F, 0F, 0F); + Smooth35 = new ModelRenderer(this, 0, 0); + Smooth35.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth35.setRotationPoint(0F, 3.8F, -5.8F); + Smooth35.setTextureSize(64, 128); + Smooth35.mirror = true; + setRotation(Smooth35, -0.7679449F, 0F, 0F); + Smooth36 = new ModelRenderer(this, 0, 0); + Smooth36.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth36.setRotationPoint(0F, 5.2F, -4.4F); + Smooth36.setTextureSize(64, 128); + Smooth36.mirror = true; + setRotation(Smooth36, -0.122173F, 0F, 0F); + Smooth37 = new ModelRenderer(this, 0, 0); + Smooth37.addBox(0F, 0F, 0F, 1, 1, 1); + Smooth37.setRotationPoint(0F, 4F, -6.8F); + Smooth37.setTextureSize(64, 128); + Smooth37.mirror = true; + setRotation(Smooth37, 0.2443461F, 0F, 0F); + Smooth38 = new ModelRenderer(this, 0, 0); + Smooth38.addBox(0F, 0F, 0F, 2, 1, 1); + Smooth38.setRotationPoint(-0.5F, 6F, -4F); + Smooth38.setTextureSize(64, 128); + Smooth38.mirror = true; + setRotation(Smooth38, -0.296706F, 0F, 0F); + Nose5 = new ModelRenderer(this, 2, 62); + Nose5.addBox(0F, 0F, 0F, 1, 1, 3); + Nose5.setRotationPoint(0F, 1F, -4F); + Nose5.setTextureSize(64, 128); + Nose5.mirror = true; + setRotation(Nose5, 0.2443461F, 0F, 0F); + Nose6 = new ModelRenderer(this, 27, 19); + Nose6.addBox(0F, 0F, 0F, 1, 1, 3); + Nose6.setRotationPoint(0.01F, 1F, -4F); + Nose6.setTextureSize(64, 128); + Nose6.mirror = true; + setRotation(Nose6, 0F, 0F, 0F); + Nose7 = new ModelRenderer(this, 1, 62); + Nose7.addBox(0F, -1F, 0F, 1, 1, 3); + Nose7.setRotationPoint(0F, 2F, -4F); + Nose7.setTextureSize(64, 128); + Nose7.mirror = true; + setRotation(Nose7, -0.2443461F, 0F, 0F); + Nose8 = new ModelRenderer(this, 0, 0); + Nose8.addBox(0F, 0F, 0F, 2, 1, 2); + Nose8.setRotationPoint(-0.5F, 0.5F, -2F); + Nose8.setTextureSize(64, 128); + Nose8.mirror = true; + setRotation(Nose8, 0.2443461F, 0F, 0F); + Nose9 = new ModelRenderer(this, 0, 0); + Nose9.addBox(0F, -1F, 0F, 2, 1, 2); + Nose9.setRotationPoint(-0.5F, 2.5F, -2F); + Nose9.setTextureSize(64, 128); + Nose9.mirror = true; + setRotation(Nose9, -0.2443461F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5); + Head.render(f5); + Top1.render(f5); + Top2.render(f5); + Top3.render(f5); + Top4.render(f5); + Top5.render(f5); + Top6.render(f5); + Top7.render(f5); + Top8.render(f5); + Top9.render(f5); + Top10.render(f5); + Top11.render(f5); + Top12.render(f5); + Top13.render(f5); + Down1.render(f5); + Down2.render(f5); + Down3.render(f5); + Down4.render(f5); + Down5.render(f5); + Down6.render(f5); + Down7.render(f5); + Down8.render(f5); + Down9.render(f5); + Down10.render(f5); + Down11.render(f5); + Down12.render(f5); + Nose1.render(f5); + Nose2.render(f5); + Nose3.render(f5); + Nose4.render(f5); + Face1.render(f5); + Face2.render(f5); + Smooth1.render(f5); + Smooth2.render(f5); + Smooth3.render(f5); + Smooth4.render(f5); + Smooth5.render(f5); + Smooth6.render(f5); + Smooth7.render(f5); + Smooth8.render(f5); + Smooth9.render(f5); + Smooth10.render(f5); + Smooth11.render(f5); + Smooth12.render(f5); + Smooth13.render(f5); + Smooth14.render(f5); + Smooth15.render(f5); + Smooth16.render(f5); + Smooth17.render(f5); + Smooth18.render(f5); + Smooth19.render(f5); + Smooth20.render(f5); + Smooth21.render(f5); + Smooth22.render(f5); + Smooth23.render(f5); + Smooth24.render(f5); + Smooth25.render(f5); + Smooth26.render(f5); + Smooth27.render(f5); + Smooth28.render(f5); + Smooth29.render(f5); + Smooth30.render(f5); + Smooth31.render(f5); + Smooth32.render(f5); + Smooth33.render(f5); + Smooth34.render(f5); + Smooth35.render(f5); + Smooth36.render(f5); + Smooth37.render(f5); + Smooth38.render(f5); + Nose5.render(f5); + Nose6.render(f5); + Nose7.render(f5); + Nose8.render(f5); + Nose9.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5); + } + +} diff --git a/Client/src/pixelmon/Pokemon/ModelSolrock.java b/Client/src/pixelmon/Pokemon/ModelSolrock.java new file mode 100644 index 0000000..8cf9eb9 --- /dev/null +++ b/Client/src/pixelmon/Pokemon/ModelSolrock.java @@ -0,0 +1,279 @@ +// Date: 15/07/2012 11:52:15 AM +// Template version 1.1 +// Java generated by Techne +// Keep in mind that you still need to fill in some blanks +// - ZeuX + + + + + + +package pixelmon.Pokemon; + +import net.minecraft.src.Entity; +import net.minecraft.src.ModelBase; +import net.minecraft.src.ModelRenderer; + +public class ModelSolrock extends ModelBase +{ + //fields + ModelRenderer Body1; + ModelRenderer Body2; + ModelRenderer Body3; + ModelRenderer Body4; + ModelRenderer TopBlade1; + ModelRenderer TopBlade2; + ModelRenderer TopBlade3; + ModelRenderer TopBlade4; + ModelRenderer LeftBlade1; + ModelRenderer LeftBlade2; + ModelRenderer LeftBlade3; + ModelRenderer RightBlade1; + ModelRenderer RightBlade2; + ModelRenderer RightBlade3; + ModelRenderer DownBlade1; + ModelRenderer DownBlade2; + ModelRenderer DownBlade3; + ModelRenderer TopLeftBlade1; + ModelRenderer TopLeftBlade2; + ModelRenderer TopRightBlade1; + ModelRenderer TopRightBlade2; + ModelRenderer DownLeftBlade1; + ModelRenderer DownLeftBlade2; + ModelRenderer DownLeftBlade3; + ModelRenderer DownRightBlade1; + ModelRenderer DownRightBlade2; + ModelRenderer Nose1; + ModelRenderer Nose2; + ModelRenderer Nose3; + + public ModelSolrock() + { + textureWidth = 64; + textureHeight = 32; + + Body1 = new ModelRenderer(this, 0, 0); + Body1.addBox(0F, 0F, 0F, 9, 7, 7); + Body1.setRotationPoint(-4F, -3F, 0F); + Body1.setTextureSize(64, 32); + Body1.mirror = true; + setRotation(Body1, 0F, 0F, 0F); + Body2 = new ModelRenderer(this, 32, 0); + Body2.addBox(0F, 0F, 0F, 7, 7, 9); + Body2.setRotationPoint(-3F, -3F, -1F); + Body2.setTextureSize(64, 32); + Body2.mirror = true; + setRotation(Body2, 0F, 0F, 0F); + Body3 = new ModelRenderer(this, 0, 15); + Body3.addBox(0F, 0F, 0F, 7, 9, 7); + Body3.setRotationPoint(-3F, -4F, 0F); + Body3.setTextureSize(64, 32); + Body3.mirror = true; + setRotation(Body3, 0F, 0F, 0F); + Body4 = new ModelRenderer(this, 0, 0); + Body4.addBox(0F, 0F, 0F, 8, 8, 8); + Body4.setRotationPoint(-3.5F, -3.5F, -0.5F); + Body4.setTextureSize(64, 32); + Body4.mirror = true; + setRotation(Body4, 0F, 0F, 0F); + TopBlade1 = new ModelRenderer(this, 50, 20); + TopBlade1.addBox(0F, 0F, 0F, 1, 6, 1); + TopBlade1.setRotationPoint(0F, -10F, 2F); + TopBlade1.setTextureSize(64, 32); + TopBlade1.mirror = true; + setRotation(TopBlade1, 0F, 0F, 0F); + TopBlade2 = new ModelRenderer(this, 48, 20); + TopBlade2.addBox(0F, 0F, 0F, 1, 7, 1); + TopBlade2.setRotationPoint(0F, -11F, 3F); + TopBlade2.setTextureSize(64, 32); + TopBlade2.mirror = true; + setRotation(TopBlade2, 0F, 0F, 0F); + TopBlade3 = new ModelRenderer(this, 45, 19); + TopBlade3.addBox(0F, 0F, 0F, 1, 3, 1); + TopBlade3.setRotationPoint(0.2F, -8F, 2.3F); + TopBlade3.setTextureSize(64, 32); + TopBlade3.mirror = true; + setRotation(TopBlade3, 0F, 0F, 0F); + TopBlade4 = new ModelRenderer(this, 45, 19); + TopBlade4.addBox(0F, 0F, 0F, 1, 3, 1); + TopBlade4.setRotationPoint(-0.1F, -8.6F, 2.3F); + TopBlade4.setTextureSize(64, 32); + TopBlade4.mirror = true; + setRotation(TopBlade4, 0F, 0F, 0F); + LeftBlade1 = new ModelRenderer(this, 41, 22); + LeftBlade1.addBox(0F, 0F, 0F, 7, 1, 2); + LeftBlade1.setRotationPoint(5F, 0F, 2F); + LeftBlade1.setTextureSize(64, 32); + LeftBlade1.mirror = true; + setRotation(LeftBlade1, 0F, 0F, 0F); + LeftBlade2 = new ModelRenderer(this, 41, 22); + LeftBlade2.addBox(0F, 0F, 0F, 3, 1, 1); + LeftBlade2.setRotationPoint(6F, 0.2F, 2.3F); + LeftBlade2.setTextureSize(64, 32); + LeftBlade2.mirror = true; + setRotation(LeftBlade2, 0F, 0F, 0F); + LeftBlade3 = new ModelRenderer(this, 39, 28); + LeftBlade3.addBox(0F, 0F, 0F, 3, 1, 1); + LeftBlade3.setRotationPoint(6.7F, -0.2F, 2.8F); + LeftBlade3.setTextureSize(64, 32); + LeftBlade3.mirror = true; + setRotation(LeftBlade3, 0F, 0F, 0F); + RightBlade1 = new ModelRenderer(this, 44, 23); + RightBlade1.addBox(0F, 0F, 0F, 5, 1, 1); + RightBlade1.setRotationPoint(-9F, 0F, 3F); + RightBlade1.setTextureSize(64, 32); + RightBlade1.mirror = true; + setRotation(RightBlade1, 0F, 0F, 0F); + RightBlade2 = new ModelRenderer(this, 45, 22); + RightBlade2.addBox(0F, 0F, 0F, 7, 1, 1); + RightBlade2.setRotationPoint(-11F, 0F, 2F); + RightBlade2.setTextureSize(64, 32); + RightBlade2.mirror = true; + setRotation(RightBlade2, 0F, 0F, 0F); + RightBlade3 = new ModelRenderer(this, 44, 23); + RightBlade3.addBox(0F, 0F, 0F, 3, 1, 1); + RightBlade3.setRotationPoint(-9.4F, -0.2F, 2.5F); + RightBlade3.setTextureSize(64, 32); + RightBlade3.mirror = true; + setRotation(RightBlade3, 0F, 0F, 0F); + DownBlade1 = new ModelRenderer(this, 48, 18); + DownBlade1.addBox(0F, 0F, 0F, 1, 7, 1); + DownBlade1.setRotationPoint(0F, 4F, 3F); + DownBlade1.setTextureSize(64, 32); + DownBlade1.mirror = true; + setRotation(DownBlade1, 0F, 0F, 0F); + DownBlade2 = new ModelRenderer(this, 40, 20); + DownBlade2.addBox(0F, 0F, 0F, 1, 6, 1); + DownBlade2.setRotationPoint(0F, 4F, 2F); + DownBlade2.setTextureSize(64, 32); + DownBlade2.mirror = true; + setRotation(DownBlade2, 0F, 0F, 0F); + DownBlade3 = new ModelRenderer(this, 57, 18); + DownBlade3.addBox(0F, 0F, 0F, 1, 3, 1); + DownBlade3.setRotationPoint(-0.2F, 5.6F, 2.4F); + DownBlade3.setTextureSize(64, 32); + DownBlade3.mirror = true; + setRotation(DownBlade3, 0F, 0F, 0F); + TopLeftBlade1 = new ModelRenderer(this, 56, 23); + TopLeftBlade1.addBox(0F, 0F, 0F, 1, 5, 2); + TopLeftBlade1.setRotationPoint(7F, -7F, 2F); + TopLeftBlade1.setTextureSize(64, 32); + TopLeftBlade1.mirror = true; + setRotation(TopLeftBlade1, 0F, 0F, 0.7853982F); + TopLeftBlade2 = new ModelRenderer(this, 56, 23); + TopLeftBlade2.addBox(0F, 0F, 0F, 1, 2, 1); + TopLeftBlade2.setRotationPoint(7.6F, -7.6F, 2.3F); + TopLeftBlade2.setTextureSize(64, 32); + TopLeftBlade2.mirror = true; + setRotation(TopLeftBlade2, 0F, 0F, 0.7853982F); + TopRightBlade1 = new ModelRenderer(this, 43, 22); + TopRightBlade1.addBox(0F, 0F, 0F, 1, 5, 2); + TopRightBlade1.setRotationPoint(-7F, -6F, 2F); + TopRightBlade1.setTextureSize(64, 32); + TopRightBlade1.mirror = true; + setRotation(TopRightBlade1, 0F, 0F, -0.7853982F); + TopRightBlade2 = new ModelRenderer(this, 43, 22); + TopRightBlade2.addBox(0F, 0F, 0F, 1, 1, 1); + TopRightBlade2.setRotationPoint(-7.2F, -6.2F, 2.6F); + TopRightBlade2.setTextureSize(64, 32); + TopRightBlade2.mirror = true; + setRotation(TopRightBlade2, 0F, 0F, -0.7853982F); + DownLeftBlade1 = new ModelRenderer(this, 42, 28); + DownLeftBlade1.addBox(0F, 0F, 0F, 6, 1, 1); + DownLeftBlade1.setRotationPoint(3F, 3F, 2F); + DownLeftBlade1.setTextureSize(64, 32); + DownLeftBlade1.mirror = true; + setRotation(DownLeftBlade1, 0F, 0F, 0.7853982F); + DownLeftBlade2 = new ModelRenderer(this, 44, 21); + DownLeftBlade2.addBox(0F, 0F, 0F, 5, 1, 1); + DownLeftBlade2.setRotationPoint(3F, 3F, 3F); + DownLeftBlade2.setTextureSize(64, 32); + DownLeftBlade2.mirror = true; + setRotation(DownLeftBlade2, 0F, 0F, 0.7853982F); + DownLeftBlade3 = new ModelRenderer(this, 51, 19); + DownLeftBlade3.addBox(0F, 0F, 0F, 2, 1, 1); + DownLeftBlade3.setRotationPoint(5F, 4.7F, 2.8F); + DownLeftBlade3.setTextureSize(64, 32); + DownLeftBlade3.mirror = true; + setRotation(DownLeftBlade3, 0F, 0F, 0.7853982F); + DownRightBlade1 = new ModelRenderer(this, 38, 25); + DownRightBlade1.addBox(0F, 0F, 1F, 5, 1, 2); + DownRightBlade1.setRotationPoint(-7F, 7F, 1F); + DownRightBlade1.setTextureSize(64, 32); + DownRightBlade1.mirror = true; + setRotation(DownRightBlade1, 0F, 0F, -0.7853982F); + DownRightBlade2 = new ModelRenderer(this, 38, 25); + DownRightBlade2.addBox(0F, 0F, 1F, 2, 1, 1); + DownRightBlade2.setRotationPoint(-5.9F, 5.9F, 2.2F); + DownRightBlade2.setTextureSize(64, 32); + DownRightBlade2.mirror = true; + setRotation(DownRightBlade2, 0F, 0F, -0.7853982F); + Nose1 = new ModelRenderer(this, 40, 18); + Nose1.addBox(0F, 0F, 0F, 1, 1, 1); + Nose1.setRotationPoint(0F, -2F, -1.2F); + Nose1.setTextureSize(64, 32); + Nose1.mirror = true; + setRotation(Nose1, 0F, 0F, 0F); + Nose2 = new ModelRenderer(this, 40, 18); + Nose2.addBox(0F, 0F, 0F, 1, 1, 1); + Nose2.setRotationPoint(0F, 0F, -1.2F); + Nose2.setTextureSize(64, 32); + Nose2.mirror = true; + setRotation(Nose2, 0F, 0F, 0F); + Nose3 = new ModelRenderer(this, 40, 18); + Nose3.addBox(0F, 0F, 0F, 1, 1, 1); + Nose3.setRotationPoint(0F, 2F, -1.2F); + Nose3.setTextureSize(64, 32); + Nose3.mirror = true; + setRotation(Nose3, 0F, 0F, 0F); + } + + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + { + super.render(entity, f, f1, f2, f3, f4, f5); + setRotationAngles(f, f1, f2, f3, f4, f5); + Body1.render(f5); + Body2.render(f5); + Body3.render(f5); + Body4.render(f5); + TopBlade1.render(f5); + TopBlade2.render(f5); + TopBlade3.render(f5); + TopBlade4.render(f5); + LeftBlade1.render(f5); + LeftBlade2.render(f5); + LeftBlade3.render(f5); + RightBlade1.render(f5); + RightBlade2.render(f5); + RightBlade3.render(f5); + DownBlade1.render(f5); + DownBlade2.render(f5); + DownBlade3.render(f5); + TopLeftBlade1.render(f5); + TopLeftBlade2.render(f5); + TopRightBlade1.render(f5); + TopRightBlade2.render(f5); + DownLeftBlade1.render(f5); + DownLeftBlade2.render(f5); + DownLeftBlade3.render(f5); + DownRightBlade1.render(f5); + DownRightBlade2.render(f5); + Nose1.render(f5); + Nose2.render(f5); + Nose3.render(f5); + } + + private void setRotation(ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5) + { + super.setRotationAngles(f, f1, f2, f3, f4, f5); + } + +} diff --git a/Client/src/pixelmon/entities/PixelmonEntityList.java b/Client/src/pixelmon/entities/PixelmonEntityList.java index 35f5d00..e4fc32f 100644 --- a/Client/src/pixelmon/entities/PixelmonEntityList.java +++ b/Client/src/pixelmon/entities/PixelmonEntityList.java @@ -220,6 +220,11 @@ public static ClassType getClassTypeFromID(int par0) { addMapping(EntityVibrava.class, "Vibrava", PixelmonIDList.vibravaId, new RenderPixelmon(new ModelVibrava(), 0.5F), ClassType.Pixelmon); addMapping(EntityMareep.class, "Mareep", PixelmonIDList.mareepId, new RenderPixelmon(new ModelMareep(), 0.5F), ClassType.Pixelmon); addMapping(EntityDratini.class, "Dratini", PixelmonIDList.dratiniId, new RenderFreeWaterPixelmon(new ModelDratini(), 0.5F), ClassType.Pixelmon); + addMapping(EntityLunatone.class, "Lunatone", PixelmonIDList.lunatoneId, new RenderPixelmon(new ModelLunatone(), 0.5F), ClassType.Pixelmon); + addMapping(EntitySolrock.class, "Solrock", PixelmonIDList.solrockId, new RenderPixelmon(new ModelSolrock(), 0.5F), ClassType.Pixelmon); + //addMapping(EntityTentacool.class, "Tentacool", PixelmonIDList.dratiniId, new RenderFreeWaterPixelmon(new ModelTentacool(), 0.5F), ClassType.Pixelmon); + //addMapping(EntityTentacruel.class, "Tentacruel", PixelmonIDList.tentacruelId, new RenderFreeWaterPixelmon(new ModelTentacruel(), 0.5F), ClassType.Pixelmon); + addMapping(EntityTrainerYoungster.class, "Youngster", TrainerIDList.trainerYoungsterId, new RenderTrainer(new ModelYoungster(), 0.5F), ClassType.Trainer); addMapping(EntityTrainerYoungster02.class, "Youngster2", TrainerIDList.trainerYoungster2Id, new RenderTrainer(new ModelYoungster02(), 0.5F), ClassType.Trainer); diff --git a/Server/src/pixelmon/PixelmonIDList.java b/Server/src/pixelmon/PixelmonIDList.java index f4a1da5..7d27091 100644 --- a/Server/src/pixelmon/PixelmonIDList.java +++ b/Server/src/pixelmon/PixelmonIDList.java @@ -64,7 +64,10 @@ public class PixelmonIDList { public static int mareepId; public static int solrockId; public static int lunatoneId; - + public static int tentacoolId; + public static int tentacruelId; + + public static int i=0; public static void load(Configuration configuration) { abraId = Integer.parseInt(configuration.getOrCreateIntProperty("Abra", "pokemon", i++).value); @@ -126,6 +129,10 @@ public static void load(Configuration configuration) { vibravaId = Integer.parseInt(configuration.getOrCreateIntProperty("Vibrava", "pokemon", i++).value); mareepId = Integer.parseInt(configuration.getOrCreateIntProperty("Mareep", "pokemon", i++).value); dratiniId = Integer.parseInt(configuration.getOrCreateIntProperty("Dratini", "pokemon", i++).value); - + lunatoneId = Integer.parseInt(configuration.getOrCreateIntProperty("Luntone", "pokemon", i++).value); + solrockId = Integer.parseInt(configuration.getOrCreateIntProperty("Solrock", "pokemon", i++).value); + tentacoolId = Integer.parseInt(configuration.getOrCreateIntProperty("Tentacool", "pokemon", i++).value); + //tentacruelId = Integer.parseInt(configuration.getOrCreateIntProperty("Tentacruel", "pokemon", i++).value); + } } diff --git a/Server/src/pixelmon/Pokemon/EntityLunatone.java b/Server/src/pixelmon/Pokemon/EntityLunatone.java new file mode 100644 index 0000000..5a0f9ca --- /dev/null +++ b/Server/src/pixelmon/Pokemon/EntityLunatone.java @@ -0,0 +1,42 @@ +package pixelmon.Pokemon; + +import pixelmon.entities.BaseEntityPixelmon; +import pixelmon.entities.EntityGroundPixelmon; +import net.minecraft.src.World; + +public class EntityLunatone extends EntityGroundPixelmon +{ + + public EntityLunatone(World world) + { + super(world); + texture = "/pixelmon/image/lunatone.png"; + init(); + } + + public void init() + { + name = "Lunatone"; + isImmuneToFire = false; + doesHover = true; + hoverHeight=1f; + super.init(); + } + + public void evolve() + { + + } + + public boolean getCanSpawnHere() + { + if(!worldObj.isDaytime() ) { + return true; + } + + return false; + } + +} + + \ No newline at end of file diff --git a/Server/src/pixelmon/Pokemon/EntitySolrock.java b/Server/src/pixelmon/Pokemon/EntitySolrock.java new file mode 100644 index 0000000..a3f7aed --- /dev/null +++ b/Server/src/pixelmon/Pokemon/EntitySolrock.java @@ -0,0 +1,42 @@ +package pixelmon.Pokemon; + +import pixelmon.entities.BaseEntityPixelmon; +import pixelmon.entities.EntityGroundPixelmon; +import net.minecraft.src.World; + +public class EntitySolrock extends EntityGroundPixelmon +{ + + public EntitySolrock(World world) + { + super(world); + texture = "/pixelmon/image/solrock.png"; + init(); + } + + public void init() + { + name = "Solrock"; + isImmuneToFire = true; + doesHover = true; + hoverHeight=1f; + super.init(); + } + + public void evolve() + { + + } + + public boolean getCanSpawnHere() + { + if(worldObj.isDaytime() ) { + return true; + } + + return false; + } + +} + + \ No newline at end of file diff --git a/Server/src/pixelmon/entities/PixelmonEntityList.java b/Server/src/pixelmon/entities/PixelmonEntityList.java index 5601fb0..a7151df 100644 --- a/Server/src/pixelmon/entities/PixelmonEntityList.java +++ b/Server/src/pixelmon/entities/PixelmonEntityList.java @@ -42,6 +42,7 @@ import pixelmon.Pokemon.EntityJigglypuff; import pixelmon.Pokemon.EntityJolteon; import pixelmon.Pokemon.EntityKrokorok; +import pixelmon.Pokemon.EntityLunatone; import pixelmon.Pokemon.EntityMagikarp; import pixelmon.Pokemon.EntityMagnemite; import pixelmon.Pokemon.EntityMagneton; @@ -63,6 +64,7 @@ import pixelmon.Pokemon.EntitySandile; import pixelmon.Pokemon.EntitySeaking; import pixelmon.Pokemon.EntitySnorlax; +import pixelmon.Pokemon.EntitySolrock; import pixelmon.Pokemon.EntitySquirtle; import pixelmon.Pokemon.EntityStarmie; import pixelmon.Pokemon.EntityStaryu; @@ -265,7 +267,12 @@ public static ClassType getClassTypeFromID(int par0) { addMapping(EntityVibrava.class, "Vibrava", PixelmonIDList.vibravaId, ClassType.Pixelmon); addMapping(EntityDratini.class, "Dratini", PixelmonIDList.dratiniId, ClassType.Pixelmon); addMapping(EntityMareep.class, "Mareep", PixelmonIDList.mareepId, ClassType.Pixelmon); - + addMapping(EntityLunatone.class, "Lunatone", PixelmonIDList.lunatoneId, ClassType.Pixelmon); + addMapping(EntitySolrock.class, "Solrock", PixelmonIDList.solrockId, ClassType.Pixelmon); + //addMapping(EntityTentacool.class, "Tentacool", PixelmonIDList.tentacoolId, ClassType.Pixelmon); + //addMapping(EntityTentacruel.class, "Tentacruel", PixelmonIDList.tentacruelId, ClassType.Pixelmon); + + addMapping(EntityTrainerYoungster.class, "Youngster", TrainerIDList.trainerYoungsterId, ClassType.Trainer); addMapping(EntityTrainerYoungster02.class, "Youngster2", TrainerIDList.trainerYoungster2Id, ClassType.Trainer);