1.9.4

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
     }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -20,23 +20,23 @@ plugins {
     id "net.minecraftforge.gradle.forge" version "2.0.2"
 }
 */
-version = "1.9-1.5"
+version = "1.9.4-1.5"
 group= "furgl.babyMobs" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "BabyMobs"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 minecraft {
-    version = "1.9-12.16.1.1887"
+    version = "1.9.4-12.17.0.1976"
     runDir = "run"
 
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
     // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not allways work.
     // simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20160312"
+    mappings = "snapshot_20160518"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 

eula.txt

@@ -1,3 +1,3 @@
 #By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
-#Sat Apr 02 20:07:11 CDT 2016
+#Thu Sep 01 14:04:53 CDT 2016
 eula=true

src/main/java/furgl/babyMobs/client/ClientProxy.java

@@ -4,7 +4,7 @@
 import furgl.babyMobs.client.model.ModelBabyShulker;
 import furgl.babyMobs.client.model.ModelBabySquid;
 import furgl.babyMobs.client.particle.EntityBlazeFlamethrowerFX;
-import furgl.babyMobs.client.particle.EntityCustomFX;
+import furgl.babyMobs.client.particle.EntityCustomParticle;
 import furgl.babyMobs.client.particle.EntityDragonParticlesFX;
 import furgl.babyMobs.client.particle.EntitySkeletonEffectFX;
 import furgl.babyMobs.client.particle.EntitySquidInkFX;
@@ -64,6 +64,7 @@
 import net.minecraft.client.model.ModelChicken;
 import net.minecraft.client.model.ModelOcelot;
 import net.minecraft.client.model.ModelPig;
+import net.minecraft.client.particle.Particle;
 import net.minecraft.client.renderer.entity.RenderFireball;
 import net.minecraft.client.renderer.entity.RenderPigZombie;
 import net.minecraft.client.renderer.entity.RenderShulkerBullet;
@@ -98,17 +99,17 @@ public void registerAchievements()
 	}
 
 	@Override
-	public Class getEntityFXClass()
+	public Class getParticleClass()
 	{
-		return EntityCustomFX.class;
+		return EntityCustomParticle.class;
 	}
 
 	@Override
 	public void spawnEntitySpawner(Class entityClass, World world, double x, double y, double z, EntitySpawner spawner, int heightIterator, int entityIterator) 
 	{ 
 		try 
 		{
-			EntityCustomFX particle = (EntityCustomFX) entityClass.getConstructor(World.class, double.class, double.class, double.class, EntitySpawner.class, int.class, int.class).newInstance(world, x, y, z, spawner, heightIterator, entityIterator);
+			Particle particle = (Particle) entityClass.getConstructor(World.class, double.class, double.class, double.class, EntitySpawner.class, int.class, int.class).newInstance(world, x, y, z, spawner, heightIterator, entityIterator);
 			Minecraft.getMinecraft().effectRenderer.addEffect(particle);
 		} 
 		catch (Exception e) 
@@ -121,7 +122,7 @@ public void spawnEntitySpawner(Class entityClass, World world, double x, double
 	@Override
 	public void spawnEntitySkeletonEffectFX(World world, EntityBabySkeleton entityBabySkeleton, float red, float green, float blue) 
 	{
-		EntitySkeletonEffectFX effect = new EntitySkeletonEffectFX(world, entityBabySkeleton, red, green, blue);
+		Particle effect = new EntitySkeletonEffectFX(world, entityBabySkeleton, red, green, blue);
 		Minecraft.getMinecraft().effectRenderer.addEffect(effect);
 	}
 
@@ -189,7 +190,7 @@ private void registerEntityRenders()
 		RenderingRegistry.registerEntityRenderingHandler(EntityBabyShulker.class, new RenderBabyShulker(Minecraft.getMinecraft().getRenderManager(), new ModelBabyShulker()));
 
 		RenderingRegistry.registerEntityRenderingHandler(EntityCaveSpiderVenom.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.cave_spider_venom, Minecraft.getMinecraft().getRenderItem()));
-		RenderingRegistry.registerEntityRenderingHandler(EntitySnowmanSnowball.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), Items.snowball, Minecraft.getMinecraft().getRenderItem()));
+		RenderingRegistry.registerEntityRenderingHandler(EntitySnowmanSnowball.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), Items.SNOWBALL, Minecraft.getMinecraft().getRenderItem()));
 		RenderingRegistry.registerEntityRenderingHandler(EntityBlazeFlamethrower.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.invisible, Minecraft.getMinecraft().getRenderItem()));
 		RenderingRegistry.registerEntityRenderingHandler(EntityCreeperExplosion.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.creeper_explosion, Minecraft.getMinecraft().getRenderItem()));
 		RenderingRegistry.registerEntityRenderingHandler(EntityWitherSkeletonSmoke.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.invisible, Minecraft.getMinecraft().getRenderItem()));

src/main/java/furgl/babyMobs/client/gui/achievements/Achievements.java

@@ -24,14 +24,14 @@ public class Achievements
 
 	public static void init()
 	{
-		achievementWhyAreTheySoStrong = new Achievement("achievement.whyAreTheySoStrong", "whyAreTheySoStrong", 0, 0, Items.spawn_egg, null).initIndependentStat();
-		achievementItsGettingHotInHere = new Achievement("achievement.itsGettingHotInHere", "itsGettingHotInHere", -1, 2, Items.blaze_powder, achievementWhyAreTheySoStrong);
-		achievementLaserTag = new Achievement("achievement.laserTag", "laserTag", 2, 1, Items.ender_eye, achievementWhyAreTheySoStrong);
-		achievementItsMine = new Achievement("achievement.itsMine", "itsMine", -3, 2, new ItemStack(Items.skull, 1, 1), achievementItsGettingHotInHere);
-		achievementICantSee = new Achievement("achievement.iCantSee", "iCantSee", 2, -1, Items.dye, achievementWhyAreTheySoStrong);
-		achievementBoomBaby = new Achievement("achievement.boomBaby", "boomBaby", -1, -2, Item.getItemFromBlock(Blocks.tnt), achievementWhyAreTheySoStrong);
-		achievementAFlowerForMe = new Achievement("achievement.aFlowerForMe", "aFlowerForMe", -3, 0, Item.getItemFromBlock(Blocks.red_flower), achievementWhyAreTheySoStrong);
-		achievementBetterLuckNextTime = new Achievement("achievement.betterLuckNextTime", "betterLuckNextTime", -3, 4, Items.nether_star, achievementItsMine);
+		achievementWhyAreTheySoStrong = new Achievement("achievement.whyAreTheySoStrong", "whyAreTheySoStrong", 0, 0, Items.SPAWN_EGG, null).initIndependentStat();
+		achievementItsGettingHotInHere = new Achievement("achievement.itsGettingHotInHere", "itsGettingHotInHere", -1, 2, Items.BLAZE_POWDER, achievementWhyAreTheySoStrong);
+		achievementLaserTag = new Achievement("achievement.laserTag", "laserTag", 2, 1, Items.ENDER_EYE, achievementWhyAreTheySoStrong);
+		achievementItsMine = new Achievement("achievement.itsMine", "itsMine", -3, 2, new ItemStack(Items.SKULL, 1, 1), achievementItsGettingHotInHere);
+		achievementICantSee = new Achievement("achievement.iCantSee", "iCantSee", 2, -1, Items.DYE, achievementWhyAreTheySoStrong);
+		achievementBoomBaby = new Achievement("achievement.boomBaby", "boomBaby", -1, -2, Item.getItemFromBlock(Blocks.TNT), achievementWhyAreTheySoStrong);
+		achievementAFlowerForMe = new Achievement("achievement.aFlowerForMe", "aFlowerForMe", -3, 0, Item.getItemFromBlock(Blocks.RED_FLOWER), achievementWhyAreTheySoStrong);
+		achievementBetterLuckNextTime = new Achievement("achievement.betterLuckNextTime", "betterLuckNextTime", -3, 4, Items.NETHER_STAR, achievementItsMine);
 
 		achievements.add(achievementWhyAreTheySoStrong);
 		achievements.add(achievementItsGettingHotInHere);

src/main/java/furgl/babyMobs/client/gui/creativeTab/BabyMobsCreativeTab.java

@@ -13,7 +13,7 @@ public BabyMobsCreativeTab(String label)
 
 	@Override
 	public Item getTabIconItem() {
-		return Items.spawn_egg;
+		return Items.SPAWN_EGG;
 	}
 
 }

src/main/java/furgl/babyMobs/client/model/ModelBabyGuardian.java

@@ -59,7 +59,7 @@ public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageI
         float[] afloat4 = new float[] { -8.0F, -8.0F, -8.0F, -8.0F, 0.0F, 0.0F, 0.0F, 0.0F, 8.0F, 8.0F, 8.0F, 8.0F};
         float[] afloat5 = new float[] {8.0F, -8.0F, 0.0F, 0.0F, -8.0F, -8.0F, 8.0F, 8.0F, 8.0F, -8.0F, 0.0F, 0.0F};
 		float f6 = ageInTicks - entityIn.ticksExisted;
-		float f7 = (1.0F - ((EntityGuardian) entityIn).func_175469_o(f6)) * 0.55F;
+		float f7 = (1.0F - ((EntityGuardian) entityIn).getSpikesAnimation(f6)) * 0.55F;
 
 		//TODO render spikes longer
 		if (((EntityBabyGuardian) entityIn).longerSpikes())

src/main/java/furgl/babyMobs/client/particle/EntityBlazeFlamethrowerFX.java

@@ -6,7 +6,7 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
-public class EntityBlazeFlamethrowerFX extends EntityCustomFX
+public class EntityBlazeFlamethrowerFX extends EntityCustomParticle
 {
 	public EntityBlazeFlamethrowerFX(World world, double x, double y, double z, double motionX, double motionY, double motionZ)
 	{

src/main/java/furgl/babyMobs/client/particle/EntityCustomFX.java → src/main/java/furgl/babyMobs/client/particle/EntityCustomParticle.java

@@ -2,10 +2,10 @@
 
 import furgl.babyMobs.util.EntityMover;
 import furgl.babyMobs.util.EntitySpawner;
-import net.minecraft.client.particle.EntityFX;
+import net.minecraft.client.particle.Particle;
 import net.minecraft.world.World;
 
-public class EntityCustomFX extends EntityFX
+public class EntityCustomParticle extends Particle
 {
 	protected boolean spawnedBySpawner;
 	protected EntitySpawner spawner;
@@ -14,7 +14,7 @@ public class EntityCustomFX extends EntityFX
 	protected int maxAge;
 	public int ticksExisted;
 
-	protected EntityCustomFX(World world, double posX, double posY, double posZ, double motionX, double motionY, double motionZ) {
+	protected EntityCustomParticle(World world, double posX, double posY, double posZ, double motionX, double motionY, double motionZ) {
 		super(world, posX, posY, posZ, motionX, motionY, motionZ);
 
 		this.ticksExisted = 0;
@@ -32,31 +32,31 @@ public void onUpdate() {
 		if (this.spawnedBySpawner)
 			this.entityIterator = EntityMover.updateMovement(this, this.spawner, this.heightIterator, this.entityIterator);
 		else
-			this.moveEntity(this.xSpeed, this.ySpeed, this.zSpeed);
+			this.moveEntity(this.motionX, this.motionY, this.motionZ);
 	}
 
-	public void setXSpeed(double speed) {
-		xSpeed = speed;
+	public void setMotionX(double speed) {
+		motionX = speed;
 	}
 
-	public void setYSpeed(double speed) {
-		ySpeed = speed;
+	public void setMotionY(double speed) {
+		motionY = speed;
 	}
 
-	public void setZSpeed(double speed) {
-		zSpeed = speed;
+	public void setMotionZ(double speed) {
+		motionZ = speed;
 	}
 
-	public double getXSpeed() {
-		return xSpeed;
+	public double getMotionX() {
+		return motionX;
 	}
 
-	public double getYSpeed() {
-		return ySpeed;
+	public double getMotionY() {
+		return motionY;
 	}
 
-	public double getZSpeed() {
-		return zSpeed;
+	public double getMotionZ() {
+		return motionZ;
 	}
 
 	public double getX() {

src/main/java/furgl/babyMobs/client/particle/EntityDragonParticlesFX.java

@@ -6,21 +6,21 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
-public class EntityDragonParticlesFX extends EntityCustomFX
+public class EntityDragonParticlesFX extends EntityCustomParticle
 {
-	public EntityDragonParticlesFX(World world, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed)
+	public EntityDragonParticlesFX(World world, double x, double y, double z, double motionX, double motionY, double motionZ)
 	{
-		super(world, x, y, z, xSpeed, ySpeed, zSpeed);
+		super(world, x, y, z, motionX, motionY, motionZ);
 		float f = this.rand.nextFloat() * 0.6F + 0.4F;
 		this.particleRed = this.particleGreen = this.particleBlue = 1.0F * f;
         this.particleGreen *= 0.3F;
         this.particleRed *= 0.9F;
-		this.xSpeed *= 0.10000000149011612D;
-		this.ySpeed *= 0.10000000149011612D;
-		this.zSpeed *= 0.10000000149011612D;
-		this.xSpeed += xSpeed;
-		this.ySpeed += ySpeed;
-		this.zSpeed += zSpeed;
+		this.motionX *= 0.10000000149011612D;
+		this.motionY *= 0.10000000149011612D;
+		this.motionZ *= 0.10000000149011612D;
+		this.motionX += motionX;
+		this.motionY += motionY;
+		this.motionZ += motionZ;
 		this.particleScale *= 0.75F;
 		//this.noClip = true;
 		this.maxAge = 40;
@@ -44,6 +44,6 @@ public void onUpdate()
 
 		this.setParticleTextureIndex(7 - this.ticksExisted * 8 / this.maxAge);
 
-		this.ySpeed = 0.05D;
+		this.motionY = 0.05D;
 	}
 }

src/main/java/furgl/babyMobs/client/particle/EntitySkeletonEffectFX.java

@@ -8,7 +8,7 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
-public class EntitySkeletonEffectFX extends EntityCustomFX
+public class EntitySkeletonEffectFX extends EntityCustomParticle
 {
 	private Entity entity;
 
@@ -21,9 +21,9 @@ public EntitySkeletonEffectFX(World world, EntityBabySkeleton entity, float red,
 	public EntitySkeletonEffectFX(World world, double x, double y, double z, double motionX, double motionY, double motionZ, float red, float green, float blue)
 	{
 		super(world, x, y, z, motionX, motionY, motionZ);
-		this.xSpeed = motionX;
-		this.ySpeed = motionY;
-		this.zSpeed = motionZ;
+		this.motionX = motionX;
+		this.motionY = motionY;
+		this.motionZ = motionZ;
 		this.particleRed = red;
 		this.particleGreen = green;
 		this.particleBlue = blue;

src/main/java/furgl/babyMobs/client/particle/EntitySquidInkFX.java

@@ -6,19 +6,19 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 @SideOnly(Side.CLIENT)
-public class EntitySquidInkFX extends EntityCustomFX
+public class EntitySquidInkFX extends EntityCustomParticle
 {
 
-	public EntitySquidInkFX(World world, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed)
+	public EntitySquidInkFX(World world, double x, double y, double z, double motionX, double motionY, double zSpeed)
 	{
-		super(world, x, y, z, xSpeed, ySpeed, zSpeed);
+		super(world, x, y, z, motionX, motionY, zSpeed);
 		this.particleRed = this.particleGreen = this.particleBlue = (float)(Math.random() * 0.30000001192092896D);
-		this.xSpeed *= 0.10000000149011612D;
-        this.ySpeed *= 0.10000000149011612D;
-        this.zSpeed *= 0.10000000149011612D;
-        this.xSpeed += xSpeed;
-        this.ySpeed += ySpeed;
-        this.zSpeed += zSpeed;
+		this.motionX *= 0.10000000149011612D;
+        this.motionY *= 0.10000000149011612D;
+        this.motionZ *= 0.10000000149011612D;
+        this.motionX += motionX;
+        this.motionY += motionY;
+        this.motionZ += zSpeed;
 		this.particleScale *= 0.75F;
 		//this.noClip = false;
 		this.maxAge = (int) (8.0D / (Math.random() * 0.8D + 0.2D));
@@ -45,18 +45,18 @@ public void onUpdate()
 
 		if (this.posY == this.prevPosY)
 		{
-			this.xSpeed *= 1.1D;
-			this.zSpeed *= 1.1D;
+			this.motionX *= 1.1D;
+			this.motionZ *= 1.1D;
 		}
 
-		this.xSpeed *= 0.9599999785423279D;
-		this.ySpeed *= 0.9599999785423279D;
-		this.zSpeed *= 0.9599999785423279D;
+		this.motionX *= 0.9599999785423279D;
+		this.motionY *= 0.9599999785423279D;
+		this.motionZ *= 0.9599999785423279D;
 
 		if (this.isCollided) //changed from onGround
 		{
-			this.xSpeed *= 0.699999988079071D;
-			this.zSpeed *= 0.699999988079071D;
+			this.motionX *= 0.699999988079071D;
+			this.motionZ *= 0.699999988079071D;
 		}
 	}
 }

src/main/java/furgl/babyMobs/client/renderer/entity/layers/LayerBabyIronGolemFlower.java

@@ -42,8 +42,8 @@ public void func_177153_a(EntityBabyIronGolem p_177153_1_, float p_177153_2_, fl
             int k = i / 65536;
             OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, j / 1.0F, k / 1.0F);
             GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-            this.field_177154_a.bindTexture(TextureMap.locationBlocksTexture);
-            blockrendererdispatcher.renderBlockBrightness(Blocks.red_flower.getDefaultState(), 1.0F);
+            this.field_177154_a.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
+            blockrendererdispatcher.renderBlockBrightness(Blocks.RED_FLOWER.getDefaultState(), 1.0F);
             GlStateManager.popMatrix();
             GlStateManager.disableRescaleNormal();
         }

src/main/java/furgl/babyMobs/client/renderer/entity/mob/RenderBabyEnderman.java

@@ -85,7 +85,7 @@ public void doRender(EntityEnderman entity, double x, double y, double z, float
             int l = 200;
             int i = 1;
             float f2 = 0;//(float)entity.worldObj.getTotalWorldTime() + partialTicks;
-            float f3 = f2 * 0.5F % 1.0F+partialTicks;
+            float f3 = f2 * 0.5F % 1.0F;
             double d1 = (double)f2 * 0.05D * (1.0D - (double)(i & 1) * 2.5D);
             double d2 = (double)i * 0.2D;
             double d3 = d2 * 1.41D;

src/main/java/furgl/babyMobs/client/renderer/entity/mob/RenderBabyShulker.java

@@ -71,7 +71,7 @@ public void doRenderLayer(EntityBabyShulker entitylivingbaseIn, float limbSwing,
 				GlStateManager.translate(0.0F, -2.0F, 0.0F);
 			}*/
 
-			ModelRenderer modelrenderer = ((ModelBabyShulker)RenderBabyShulker.this.getMainModel()).field_187066_a;
+			ModelRenderer modelrenderer = ((ModelBabyShulker)RenderBabyShulker.this.getMainModel()).head;
 			modelrenderer.rotateAngleY = netHeadYaw * 0.017453292F;
 			modelrenderer.rotateAngleX = headPitch * 0.017453292F;
 			RenderBabyShulker.this.bindTexture(RenderBabyShulker.field_188342_a);
@@ -85,7 +85,7 @@ public void doRenderLayer(EntityBabyShulker entitylivingbaseIn, float limbSwing,
 			GlStateManager.scale(1.0F / f6, 1.0F / f6, 1.0F / f6);
 			GlStateManager.translate(0.0F, 24.0F * scale, 0.0F);
 
-			switch (entitylivingbaseIn.func_184696_cZ())
+			switch (entitylivingbaseIn.getAttachmentFacing())
 			{
 			case DOWN:
 			default:

src/main/java/furgl/babyMobs/common/BabyMobs.java

@@ -112,7 +112,7 @@ private void registerPackets()
 
 	private void registerCraftingRecipes()
 	{
-		GameRegistry.addRecipe(new ItemStack(ModItems.golden_bread), "NNN", "NBN", "NNN", 'N', Items.gold_nugget, 'B', Items.bread);
+		GameRegistry.addRecipe(new ItemStack(ModItems.golden_bread), "NNN", "NBN", "NNN", 'N', Items.GOLD_NUGGET, 'B', Items.BREAD);
 	}
 
 	public void registerDispenserBehaviors()
@@ -124,7 +124,7 @@ public void registerDispenserBehaviors()
 			{
 				if (fields[i].get(new Object()) instanceof ItemBabySpawnEgg)
 				{
-					BlockDispenser.dispenseBehaviorRegistry.putObject((Item) fields[i].get(ModItems.class), new BehaviorDefaultDispenseItem()
+					BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject((Item) fields[i].get(ModItems.class), new BehaviorDefaultDispenseItem()
 					{
 						/**
 						 * Dispense the specified stack, play the dispense sound and spawn particles.

src/main/java/furgl/babyMobs/common/CommonProxy.java

@@ -16,7 +16,7 @@ public void registerRenders() { }
 
 	public void registerAchievements() { }
 
-	public Class getEntityFXClass() {return null;}
+	public Class getParticleClass() {return null;}
 
 	public void spawnEntitySpawner(Class entityClass, World world, double x, double y, double z, EntitySpawner spawner, int heightIterator, int entityIterator) { }