Skip to content

Commit

Permalink
Finished zombies, Split into two missiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarkGuardsman
DarkGuardsman committed Dec 31, 2018
1 parent f4f67a1 commit a137fa5
Show file tree
Hide file tree
Showing 17 changed files with 671 additions and 279 deletions.
14 changes: 8 additions & 6 deletions src/main/java/icbm/classic/ICBMClassic.java
View file
Expand Up @@ -5,10 +5,7 @@
import icbm.classic.config.ConfigItems;
import icbm.classic.content.blocks.*;
import icbm.classic.content.entity.*;
import icbm.classic.content.entity.mobs.EntityXmasRPG;
import icbm.classic.content.entity.mobs.EntityXmasSkeleton;
import icbm.classic.content.entity.mobs.EntityXmasSkeletonBoss;
import icbm.classic.content.entity.mobs.EntityXmasSnowman;
import icbm.classic.content.entity.mobs.*;
import icbm.classic.content.explosive.Explosives;
import icbm.classic.content.explosive.thread2.WorkerThreadManager;
import icbm.classic.content.explosive.tile.BlockExplosive;
Expand Down Expand Up @@ -309,10 +306,15 @@ public static void registerEntity(RegistryEvent.Register<EntityEntry> event)
event.getRegistry().register(buildEntityEntry(EntityBombCart.class, "cart.bomb", 50, 2));
event.getRegistry().register(buildEntityEntry(EntityPlayerSeat.class, "holder.seat", 50, 2));


//Green team
event.getRegistry().register(buildMobEntry(EntityXmasSkeleton.class, "skeleton.xmas.elf", Color.GREEN, Color.CYAN));
event.getRegistry().register(buildMobEntry(EntityXmasSkeletonBoss.class, "skeleton.xmas.boss", Color.GREEN, Color.CYAN));
event.getRegistry().register(buildMobEntry(EntityXmasSnowman.class, "skeleton.snowman", Color.BLACK, Color.CYAN));
event.getRegistry().register(buildMobEntry(EntityXmasSnowman.class, "skeleton.xmas.snowman", Color.BLACK, Color.CYAN));

//Red team
event.getRegistry().register(buildMobEntry(EntityXmasZombie.class, "zombie.xmas.elf", Color.RED, Color.CYAN));
event.getRegistry().register(buildMobEntry(EntityXmasZombieBoss.class, "zombie.xmas.boss", Color.RED, Color.CYAN));


event.getRegistry().register(buildEntityEntry(EntityXmasRPG.class, "skeleton.snowman.rocket", 64, 1));
}
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/icbm/classic/client/ClientProxy.java
View file
Expand Up @@ -5,9 +5,7 @@
import icbm.classic.client.fx.ParticleSmokeICBM;
import icbm.classic.client.render.entity.*;
import icbm.classic.content.entity.*;
import icbm.classic.content.entity.mobs.EntityXmasSkeleton;
import icbm.classic.content.entity.mobs.EntityXmasSkeletonBoss;
import icbm.classic.content.entity.mobs.EntityXmasSnowman;
import icbm.classic.content.entity.mobs.*;
import icbm.classic.content.machines.launcher.cruise.TESRCruiseLauncher;
import icbm.classic.content.machines.launcher.cruise.TileCruiseLauncher;
import icbm.classic.content.missile.EntityMissile;
Expand Down Expand Up @@ -125,10 +123,14 @@ public void doLoadModels()
RenderingRegistry.registerEntityRenderingHandler(EntityFragments.class, manager -> new RenderFragments(manager));
RenderingRegistry.registerEntityRenderingHandler(EntityPlayerSeat.class, manager -> new RenderSeat(manager));
RenderingRegistry.registerEntityRenderingHandler(EntityMissile.class, manager -> RenderMissile.INSTANCE = new RenderMissile(manager));

RenderingRegistry.registerEntityRenderingHandler(EntityXmasSkeleton.class, manager -> new RenderSkeletonXmas(manager));
RenderingRegistry.registerEntityRenderingHandler(EntityXmasSkeletonBoss.class, manager -> new RenderSkeletonXmas(manager));
RenderingRegistry.registerEntityRenderingHandler(EntityXmasSnowman.class, manager -> new RenderSnowmanXmas(manager));

RenderingRegistry.registerEntityRenderingHandler(EntityXmasZombie.class, manager -> new RenderZombieXmas(manager));
RenderingRegistry.registerEntityRenderingHandler(EntityXmasZombieBoss.class, manager -> new RenderZombieXmas(manager));

ClientRegistry.bindTileEntitySpecialRenderer(TileEMPTower.class, new TESREMPTower());
ClientRegistry.bindTileEntitySpecialRenderer(TileRadarStation.class, new TESRRadarStation());
ClientRegistry.bindTileEntitySpecialRenderer(TileLauncherFrame.class, new TESRLauncherFrame());
Expand Down
278 changes: 278 additions & 0 deletions src/main/java/icbm/classic/client/models/mobs/ModelSnowmanXmas.java
View file
@@ -0,0 +1,278 @@
package icbm.classic.client.models.mobs;

import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;

/**
* ModelSnowMan - Either Mojang or a mod author
* Created using Tabula 7.0.0
*/
public class ModelSnowmanXmas extends ModelBase {
public ModelRenderer bipedbody;
public ModelRenderer bipedleftarm;
public ModelRenderer BipedHead;
public ModelRenderer bipedrightarm;
public ModelRenderer bipedlowerbody;
public ModelRenderer shape9;
public ModelRenderer extendedarm;
public ModelRenderer shape10;
public ModelRenderer shape11;
public ModelRenderer shape12;
public ModelRenderer shape13;
public ModelRenderer shape14;
public ModelRenderer shape15;
public ModelRenderer shape10_1;
public ModelRenderer shape16;
public ModelRenderer shape1;
public ModelRenderer shape20;
public ModelRenderer shape21;
public ModelRenderer shape23;
public ModelRenderer shape22;
public ModelRenderer shape17;
public ModelRenderer shape18;
public ModelRenderer shape19;
public ModelRenderer shape2;
public ModelRenderer shape2_1;
public ModelRenderer shape4;
public ModelRenderer shape4_1;
public ModelRenderer shape11_1;
public ModelRenderer shape38;
public ModelRenderer shape13_1;
public ModelRenderer shape24;
public ModelRenderer shape14_1;
public ModelRenderer shape15_1;
public ModelRenderer shape25;
public ModelRenderer shape1_1;
public ModelRenderer shape2_2;
public ModelRenderer shape2_3;
public ModelRenderer shape4_2;
public ModelRenderer shape4_3;
public ModelRenderer shape11_2;
public ModelRenderer shape12_1;
public ModelRenderer shape6;
public ModelRenderer shape6_1;
public ModelRenderer shape9_1;
public ModelRenderer shape8;

public ModelSnowmanXmas() {
this.textureWidth = 64;
this.textureHeight = 150;
this.shape6_1 = new ModelRenderer(this, 0, 68);
this.shape6_1.setRotationPoint(0.0F, 0.0F, 5.0F);
this.shape6_1.addBox(0.0F, -1.0F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape6_1, 0.5462880558742251F, 0.0F, 0.0F);
this.shape17 = new ModelRenderer(this, 55, 68);
this.shape17.setRotationPoint(0.0F, -0.5F, -2.0F);
this.shape17.addBox(0.0F, 0.0F, 0.0F, 1, 1, 2, 0.0F);
this.shape9 = new ModelRenderer(this, 0, 140);
this.shape9.setRotationPoint(0.0F, -5.0F, 0.0F);
this.shape9.addBox(-4.0F, 0.0F, -4.0F, 8, 2, 8, 0.0F);
this.shape16 = new ModelRenderer(this, 30, 90);
this.shape16.setRotationPoint(-4.700000000000001F, 0.9999999999999993F, -9.399999999999974F);
this.shape16.addBox(0.0F, 0.0F, 0.0F, 1, 5, 2, 0.0F);
this.shape2_3 = new ModelRenderer(this, 0, 68);
this.shape2_3.setRotationPoint(0.0F, 1.0F, 0.25F);
this.shape2_3.addBox(0.0F, -1.0F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape2_3, -0.27314402793711257F, 0.0F, 0.0F);
this.extendedarm = new ModelRenderer(this, 38, 1);
this.extendedarm.setRotationPoint(10.5F, 1.0F, -0.5F);
this.extendedarm.addBox(0.0F, -0.5F, 0.0F, 5, 1, 1, 0.0F);
this.setRotateAngle(extendedarm, 0.0F, 0.18203784098300857F, -0.7740535232594852F);
this.shape6 = new ModelRenderer(this, 0, 68);
this.shape6.setRotationPoint(0.0F, 0.0F, 5.0F);
this.shape6.addBox(0.0F, 0.0F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape6, -0.5462880558742251F, 0.0F, 0.0F);
this.shape4_3 = new ModelRenderer(this, 0, 68);
this.shape4_3.setRotationPoint(1.0F, 0.5F, 0.25F);
this.shape4_3.addBox(-1.0F, -0.5F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape4_3, 0.0F, 0.27314402793711257F, 0.0F);
this.shape15_1 = new ModelRenderer(this, 58, 68);
this.shape15_1.setRotationPoint(0.0F, 1.0F, 0.5F);
this.shape15_1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 2, 0.0F);
this.setRotateAngle(shape15_1, 0.7853981633974483F, 0.0F, 0.0F);
this.shape14 = new ModelRenderer(this, 12, 131);
this.shape14.setRotationPoint(2.0F, 0.5F, -0.5F);
this.shape14.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F);
this.shape4_1 = new ModelRenderer(this, 53, 68);
this.shape4_1.setRotationPoint(1.0F, 0.5F, 0.0F);
this.shape4_1.addBox(-1.0F, -0.5F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape4_1, 0.0F, 0.27314402793711257F, 0.0F);
this.shape15 = new ModelRenderer(this, 15, 141);
this.shape15.setRotationPoint(0.7F, 0.6F, 0.0F);
this.shape15.addBox(0.0F, -1.0F, -0.5F, 2, 2, 2, 0.0F);
this.setRotateAngle(shape15, 0.0F, 0.0F, 0.5009094953223726F);
this.shape2_1 = new ModelRenderer(this, 53, 68);
this.shape2_1.setRotationPoint(0.0F, 1.0F, 0.0F);
this.shape2_1.addBox(0.0F, -1.0F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape2_1, -0.27314402793711257F, 0.0F, 0.0F);
this.shape20 = new ModelRenderer(this, 30, 83);
this.shape20.setRotationPoint(-0.5F, -0.5F, 11.0F);
this.shape20.addBox(0.0F, 0.0F, 0.0F, 3, 3, 14, 0.0F);
this.shape13_1 = new ModelRenderer(this, 60, 68);
this.shape13_1.setRotationPoint(-4.450000000000001F, -4.500000000000015F, -17.399999999999963F);
this.shape13_1.addBox(0.0F, 0.0F, 0.0F, 1, 4, 1, 0.0F);
this.shape4 = new ModelRenderer(this, 50, 68);
this.shape4.setRotationPoint(0.0F, 0.5F, 0.0F);
this.shape4.addBox(0.0F, -0.5F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape4, 0.0F, -0.27314402793711257F, 0.0F);
this.shape1_1 = new ModelRenderer(this, 0, 0);
this.shape1_1.setRotationPoint(-4.700000000000001F, -0.5000000000000004F, -27.15000000000005F);
this.shape1_1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 16, 0.0F);
this.shape13 = new ModelRenderer(this, 0, 130);
this.shape13.setRotationPoint(3.0F, 0.0F, 0.0F);
this.shape13.addBox(0.0F, 0.0F, -1.0F, 2, 2, 2, 0.0F);
this.setRotateAngle(shape13, 0.0F, 0.0F, 0.8196066167365371F);
this.shape25 = new ModelRenderer(this, 60, 68);
this.shape25.setRotationPoint(0.0F, 2.0F, 1.0F);
this.shape25.addBox(0.0F, 0.0F, -1.0F, 1, 2, 1, 0.0F);
this.setRotateAngle(shape25, 0.7853981633974483F, 0.0F, 0.0F);
this.shape11_1 = new ModelRenderer(this, 53, 68);
this.shape11_1.setRotationPoint(0.0F, -0.5F, 3.5F);
this.shape11_1.addBox(0.0F, 0.0F, 0.0F, 1, 2, 2, 0.0F);
this.bipedleftarm = new ModelRenderer(this, 32, 0);
this.bipedleftarm.setRotationPoint(4.0F, 6.0F, -0.0F);
this.bipedleftarm.addBox(-1.0F, 0.0F, -1.0F, 12, 2, 2, -0.5F);
this.setRotateAngle(bipedleftarm, 0.091106186954104F, 2.1855012893472994F, 0.4553564018453205F);
this.shape21 = new ModelRenderer(this, 44, 84);
this.shape21.setRotationPoint(1.0F, 2.5F, 3.5F);
this.shape21.addBox(0.0F, 0.0F, 0.0F, 1, 1, 3, 0.0F);
this.shape19 = new ModelRenderer(this, 53, 68);
this.shape19.setRotationPoint(0.0F, 2.0F, 0.0F);
this.shape19.addBox(0.0F, 0.0F, 0.0F, 1, 0, 2, 0.0F);
this.shape11 = new ModelRenderer(this, 4, 126);
this.shape11.setRotationPoint(4.0F, 0.0F, 0.0F);
this.shape11.addBox(0.0F, 0.0F, -2.5F, 4, 3, 5, 0.0F);
this.setRotateAngle(shape11, 0.0F, 0.0F, 0.7740535232594852F);
this.shape4_2 = new ModelRenderer(this, 0, 68);
this.shape4_2.setRotationPoint(0.0F, 0.5F, 0.25F);
this.shape4_2.addBox(0.0F, -0.5F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape4_2, 0.0F, -0.27314402793711257F, 0.0F);
this.bipedbody = new ModelRenderer(this, 0, 16);
this.bipedbody.setRotationPoint(0.0F, 13.0F, 0.0F);
this.bipedbody.addBox(-5.0F, -10.0F, -5.0F, 10, 10, 10, -0.5F);
this.shape38 = new ModelRenderer(this, 54, 68);
this.shape38.setRotationPoint(-1.5F, -1.5F, 4.7F);
this.shape38.addBox(0.0F, 0.0F, 0.0F, 4, 4, 1, 0.0F);
this.shape18 = new ModelRenderer(this, 54, 68);
this.shape18.setRotationPoint(0.0F, 0.5F, 0.0F);
this.shape18.addBox(0.0F, 0.0F, 0.0F, 1, 2, 0, 0.0F);
this.shape12_1 = new ModelRenderer(this, 0, 68);
this.shape12_1.setRotationPoint(-0.5F, 0.0F, 4.0F);
this.shape12_1.addBox(0.0F, 0.0F, 0.0F, 2, 1, 3, 0.0F);
this.shape10 = new ModelRenderer(this, 2, 126);
this.shape10.setRotationPoint(-4.0F, 0.0F, 0.0F);
this.shape10.addBox(0.0F, 0.0F, -3.0F, 4, 4, 6, 0.0F);
this.setRotateAngle(shape10, 0.0F, 0.0F, -0.6373942428283291F);
this.shape10_1 = new ModelRenderer(this, 35, 68);
this.shape10_1.setRotationPoint(-5.199999999999999F, -1.000000000000004F, -17.399999999999963F);
this.shape10_1.addBox(0.0F, 0.0F, 0.0F, 2, 2, 11, 0.0F);
this.bipedlowerbody = new ModelRenderer(this, 0, 36);
this.bipedlowerbody.setRotationPoint(0.0F, 24.0F, 0.0F);
this.bipedlowerbody.addBox(-6.0F, -12.0F, -6.0F, 12, 12, 12, -0.5F);
this.shape11_2 = new ModelRenderer(this, 0, 68);
this.shape11_2.setRotationPoint(0.0F, -0.5F, 3.5F);
this.shape11_2.addBox(0.0F, 0.0F, 0.0F, 1, 2, 3, 0.0F);
this.shape22 = new ModelRenderer(this, 44, 83);
this.shape22.setRotationPoint(0.0F, 1.0F, 0.5F);
this.shape22.addBox(0.0F, 0.0F, 0.0F, 1, 3, 2, 0.0F);
this.bipedrightarm = new ModelRenderer(this, 32, 0);
this.bipedrightarm.setRotationPoint(-4.0F, 6.0F, 0.0F);
this.bipedrightarm.addBox(-1.0F, 0.0F, -1.0F, 12, 2, 2, -0.5F);
this.setRotateAngle(bipedrightarm, 0.091106186954104F, 1.9577358219620393F, 1.7756979809790308F);
this.shape1 = new ModelRenderer(this, 51, 68);
this.shape1.setRotationPoint(-4.700000000000001F, -0.5000000000000031F, 11.599999999999808F);
this.shape1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 5, 0.0F);
this.shape24 = new ModelRenderer(this, 60, 68);
this.shape24.setRotationPoint(-4.450000000000001F, -4.500000000000015F, -2.60000000000003F);
this.shape24.addBox(0.0F, 0.0F, 0.0F, 1, 4, 1, 0.0F);
this.shape9_1 = new ModelRenderer(this, 0, 68);
this.shape9_1.setRotationPoint(0.0F, 0.0F, 5.0F);
this.shape9_1.addBox(0.0F, -0.5F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape9_1, 0.0F, 0.5462880558742251F, 0.0F);
this.shape23 = new ModelRenderer(this, 50, 89);
this.shape23.setRotationPoint(0.5F, 0.5F, 14.0F);
this.shape23.addBox(0.0F, 0.0F, 0.0F, 2, 2, 5, 0.0F);
this.shape12 = new ModelRenderer(this, 6, 127);
this.shape12.setRotationPoint(4.0F, 0.0F, 0.0F);
this.shape12.addBox(0.0F, 0.0F, -2.0F, 3, 2, 4, 0.0F);
this.setRotateAngle(shape12, 0.0F, 0.0F, 0.22759093446006054F);
this.shape2_2 = new ModelRenderer(this, 0, 68);
this.shape2_2.setRotationPoint(0.0F, 0.0F, 0.25F);
this.shape2_2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape2_2, 0.27314402793711257F, 0.0F, 0.0F);
this.BipedHead = new ModelRenderer(this, 0, 0);
this.BipedHead.setRotationPoint(0.0F, 4.0F, 0.0F);
this.BipedHead.addBox(-4.0F, -8.0F, -4.0F, 8, 8, 8, -0.5F);
this.shape14_1 = new ModelRenderer(this, 58, 68);
this.shape14_1.setRotationPoint(0.0F, 2.0F, 1.0F);
this.shape14_1.addBox(0.0F, 0.0F, 0.0F, 1, 1, 2, 0.0F);
this.setRotateAngle(shape14_1, -0.7853981633974483F, 0.0F, 0.0F);
this.shape2 = new ModelRenderer(this, 53, 68);
this.shape2.setRotationPoint(0.0F, 0.0F, 0.0F);
this.shape2.addBox(0.0F, 0.0F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape2, 0.27314402793711257F, 0.0F, 0.0F);
this.shape8 = new ModelRenderer(this, 0, 68);
this.shape8.setRotationPoint(0.0F, 0.0F, 5.0F);
this.shape8.addBox(-1.0F, -0.5F, 0.0F, 1, 1, 5, 0.0F);
this.setRotateAngle(shape8, 0.0F, -0.5462880558742251F, 0.0F);
this.shape2_3.addChild(this.shape6_1);
this.shape16.addChild(this.shape17);
this.shape1_1.addChild(this.shape2_3);
this.bipedleftarm.addChild(this.extendedarm);
this.shape2_2.addChild(this.shape6);
this.shape1_1.addChild(this.shape4_3);
this.shape14_1.addChild(this.shape15_1);
this.shape13.addChild(this.shape14);
this.shape1.addChild(this.shape4_1);
this.shape14.addChild(this.shape15);
this.shape1.addChild(this.shape2_1);
this.shape10_1.addChild(this.shape20);
this.shape1.addChild(this.shape4);
this.shape12.addChild(this.shape13);
this.shape24.addChild(this.shape25);
this.shape1.addChild(this.shape11_1);
this.shape20.addChild(this.shape21);
this.shape18.addChild(this.shape19);
this.shape10.addChild(this.shape11);
this.shape1_1.addChild(this.shape4_2);
this.shape1.addChild(this.shape38);
this.shape17.addChild(this.shape18);
this.shape1_1.addChild(this.shape12_1);
this.shape9.addChild(this.shape10);
this.shape1_1.addChild(this.shape11_2);
this.shape21.addChild(this.shape22);
this.shape4_2.addChild(this.shape9_1);
this.shape20.addChild(this.shape23);
this.shape11.addChild(this.shape12);
this.shape1_1.addChild(this.shape2_2);
this.shape13_1.addChild(this.shape14_1);
this.shape1.addChild(this.shape2);
this.shape4_3.addChild(this.shape8);
}

@Override
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
this.shape9.render(f5);
this.shape16.render(f5);
this.shape13_1.render(f5);
this.shape1_1.render(f5);
this.bipedleftarm.render(f5);
this.bipedbody.render(f5);
this.shape10_1.render(f5);
this.bipedlowerbody.render(f5);
this.bipedrightarm.render(f5);
this.shape1.render(f5);
this.shape24.render(f5);
this.BipedHead.render(f5);
}

/**
* This is a helper function from Tabula to set the rotation of model parts
*/
public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) {
modelRenderer.rotateAngleX = x;
modelRenderer.rotateAngleY = y;
modelRenderer.rotateAngleZ = z;
}
}

0 comments on commit a137fa5

Please sign in to comment.