From 04201056eb94954fd21ff64a25cb9e580c545bf9 Mon Sep 17 00:00:00 2001 From: Lomeli12 Date: Mon, 4 Aug 2014 14:48:42 -0700 Subject: [PATCH 1/5] Added Elemental Creepers to AbilitySupport.json Just to avoid any more API fussiness in the future. Probably should've done this in the first place --- .../assets/morph/mod/AbilitySupport.json | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/morph/mod/AbilitySupport.json b/src/main/resources/assets/morph/mod/AbilitySupport.json index eeb1d963..22319d5f 100644 --- a/src/main/resources/assets/morph/mod/AbilitySupport.json +++ b/src/main/resources/assets/morph/mod/AbilitySupport.json @@ -1,4 +1,34 @@ { + "net.lomeli.ec.entity.EntityEnderCreeper" : [ + "waterAllergy", + "hostile" + ], + "net.lomeli.ec.entity.EntityWindCreeper" : [ + "float|-0.114,true", + "hostile" + ], + "net.lomeli.ec.entity.EntitySpiderCreeper" : [ + "poisonResistance", + "climb", + "hostile" + ], + "net.lomeli.ec.entity.EntityDarkCreeper" : [ + "sunburn", + "hostile" + ], + "net.lomeli.ec.entity.EntityWaterCreeper" : [ + "swim|true", + "hostile" + ], + "net.lomeli.ec.entity.EntityMagmaCreeper" : [ + "waterAllergy", + "fireImmunity", + "hostile" + ], + "net.lomeli.ec.entity.EntityFireCreeper" : [ + "fireImmunity", + "hostile" + ], "am2.bosses.EntityAirGuardian": [ "hostile" ], @@ -1560,4 +1590,4 @@ "fear|9,0.6D,net.minecraft.entity.passive.EntityVillager", "sunburn" ] -} \ No newline at end of file +} From 21385b2bfc4fa07cc58ee9954d7fe9eb4011e322 Mon Sep 17 00:00:00 2001 From: Lomeli12 Date: Mon, 4 Aug 2014 15:42:11 -0700 Subject: [PATCH 2/5] Aalphabetized --- .../assets/morph/mod/AbilitySupport.json | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/resources/assets/morph/mod/AbilitySupport.json b/src/main/resources/assets/morph/mod/AbilitySupport.json index 22319d5f..f3b69a39 100644 --- a/src/main/resources/assets/morph/mod/AbilitySupport.json +++ b/src/main/resources/assets/morph/mod/AbilitySupport.json @@ -1,10 +1,19 @@ { + "net.lomeli.ec.entity.EntityDarkCreeper" : [ + "sunburn", + "hostile" + ], "net.lomeli.ec.entity.EntityEnderCreeper" : [ "waterAllergy", "hostile" ], - "net.lomeli.ec.entity.EntityWindCreeper" : [ - "float|-0.114,true", + "net.lomeli.ec.entity.EntityFireCreeper" : [ + "fireImmunity", + "hostile" + ], + "net.lomeli.ec.entity.EntityMagmaCreeper" : [ + "waterAllergy", + "fireImmunity", "hostile" ], "net.lomeli.ec.entity.EntitySpiderCreeper" : [ @@ -12,21 +21,12 @@ "climb", "hostile" ], - "net.lomeli.ec.entity.EntityDarkCreeper" : [ - "sunburn", - "hostile" - ], "net.lomeli.ec.entity.EntityWaterCreeper" : [ "swim|true", "hostile" ], - "net.lomeli.ec.entity.EntityMagmaCreeper" : [ - "waterAllergy", - "fireImmunity", - "hostile" - ], - "net.lomeli.ec.entity.EntityFireCreeper" : [ - "fireImmunity", + "net.lomeli.ec.entity.EntityWindCreeper" : [ + "float|-0.114,true", "hostile" ], "am2.bosses.EntityAirGuardian": [ From e98f6bf31676e42bd990a2cb0260f7118191aee4 Mon Sep 17 00:00:00 2001 From: Lomeli12 Date: Mon, 4 Aug 2014 15:49:03 -0700 Subject: [PATCH 3/5] Derp derp derp --- .../assets/morph/mod/AbilitySupport.json | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/resources/assets/morph/mod/AbilitySupport.json b/src/main/resources/assets/morph/mod/AbilitySupport.json index f3b69a39..78d427ef 100644 --- a/src/main/resources/assets/morph/mod/AbilitySupport.json +++ b/src/main/resources/assets/morph/mod/AbilitySupport.json @@ -1,34 +1,4 @@ { - "net.lomeli.ec.entity.EntityDarkCreeper" : [ - "sunburn", - "hostile" - ], - "net.lomeli.ec.entity.EntityEnderCreeper" : [ - "waterAllergy", - "hostile" - ], - "net.lomeli.ec.entity.EntityFireCreeper" : [ - "fireImmunity", - "hostile" - ], - "net.lomeli.ec.entity.EntityMagmaCreeper" : [ - "waterAllergy", - "fireImmunity", - "hostile" - ], - "net.lomeli.ec.entity.EntitySpiderCreeper" : [ - "poisonResistance", - "climb", - "hostile" - ], - "net.lomeli.ec.entity.EntityWaterCreeper" : [ - "swim|true", - "hostile" - ], - "net.lomeli.ec.entity.EntityWindCreeper" : [ - "float|-0.114,true", - "hostile" - ], "am2.bosses.EntityAirGuardian": [ "hostile" ], @@ -1488,6 +1458,36 @@ "twilightforest.entity.passive.EntityTFTinyBird": [ "fly|true" ], + "net.lomeli.ec.entity.EntityDarkCreeper" : [ + "sunburn", + "hostile" + ], + "net.lomeli.ec.entity.EntityEnderCreeper" : [ + "waterAllergy", + "hostile" + ], + "net.lomeli.ec.entity.EntityFireCreeper" : [ + "fireImmunity", + "hostile" + ], + "net.lomeli.ec.entity.EntityMagmaCreeper" : [ + "waterAllergy", + "fireImmunity", + "hostile" + ], + "net.lomeli.ec.entity.EntitySpiderCreeper" : [ + "poisonResistance", + "climb", + "hostile" + ], + "net.lomeli.ec.entity.EntityWaterCreeper" : [ + "swim|true", + "hostile" + ], + "net.lomeli.ec.entity.EntityWindCreeper" : [ + "float|-0.114,true", + "hostile" + ], "net.minecraft.entity.passive.EntityBat": [ From babe89df7d2946a50de973b200909c22a3348be6 Mon Sep 17 00:00:00 2001 From: Lomeli12 Date: Mon, 4 Aug 2014 15:55:41 -0700 Subject: [PATCH 4/5] Yup...I'm a fail... ._. --- .../assets/morph/mod/AbilitySupport.json | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/resources/assets/morph/mod/AbilitySupport.json b/src/main/resources/assets/morph/mod/AbilitySupport.json index 78d427ef..9882b6ba 100644 --- a/src/main/resources/assets/morph/mod/AbilitySupport.json +++ b/src/main/resources/assets/morph/mod/AbilitySupport.json @@ -1262,6 +1262,36 @@ "net.aetherteam.aether.entities.mounts.EntitySwet": [ "fallNegate" ], + "net.lomeli.ec.entity.EntityDarkCreeper" : [ + "sunburn", + "hostile" + ], + "net.lomeli.ec.entity.EntityEnderCreeper" : [ + "waterAllergy", + "hostile" + ], + "net.lomeli.ec.entity.EntityFireCreeper" : [ + "fireImmunity", + "hostile" + ], + "net.lomeli.ec.entity.EntityMagmaCreeper" : [ + "waterAllergy", + "fireImmunity", + "hostile" + ], + "net.lomeli.ec.entity.EntitySpiderCreeper" : [ + "poisonResistance", + "climb", + "hostile" + ], + "net.lomeli.ec.entity.EntityWaterCreeper" : [ + "swim|true", + "hostile" + ], + "net.lomeli.ec.entity.EntityWindCreeper" : [ + "float|-0.114,true", + "hostile" + ], "noppes.animalbikes.entity.EntityDragonBike": [ "fly|true", "hostile" @@ -1458,36 +1488,6 @@ "twilightforest.entity.passive.EntityTFTinyBird": [ "fly|true" ], - "net.lomeli.ec.entity.EntityDarkCreeper" : [ - "sunburn", - "hostile" - ], - "net.lomeli.ec.entity.EntityEnderCreeper" : [ - "waterAllergy", - "hostile" - ], - "net.lomeli.ec.entity.EntityFireCreeper" : [ - "fireImmunity", - "hostile" - ], - "net.lomeli.ec.entity.EntityMagmaCreeper" : [ - "waterAllergy", - "fireImmunity", - "hostile" - ], - "net.lomeli.ec.entity.EntitySpiderCreeper" : [ - "poisonResistance", - "climb", - "hostile" - ], - "net.lomeli.ec.entity.EntityWaterCreeper" : [ - "swim|true", - "hostile" - ], - "net.lomeli.ec.entity.EntityWindCreeper" : [ - "float|-0.114,true", - "hostile" - ], "net.minecraft.entity.passive.EntityBat": [ From 613fe6203997442073acbee09be0953f967228ec Mon Sep 17 00:00:00 2001 From: Lomeli12 Date: Mon, 4 Aug 2014 16:01:09 -0700 Subject: [PATCH 5/5] Fixed swim arguments --- src/main/resources/assets/morph/mod/AbilitySupport.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/morph/mod/AbilitySupport.json b/src/main/resources/assets/morph/mod/AbilitySupport.json index 9882b6ba..2bc04375 100644 --- a/src/main/resources/assets/morph/mod/AbilitySupport.json +++ b/src/main/resources/assets/morph/mod/AbilitySupport.json @@ -1285,7 +1285,7 @@ "hostile" ], "net.lomeli.ec.entity.EntityWaterCreeper" : [ - "swim|true", + "swim|false,1.2F,0.4F,true", "hostile" ], "net.lomeli.ec.entity.EntityWindCreeper" : [