diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md index d207c733d..7d0ec928a 100644 --- a/mods/ENTITIES/mobs_mc/LICENSE-media.md +++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md @@ -27,7 +27,7 @@ Origin of those models: * Original author: [XSSheep](https://www.planetminecraft.com/member/xssheep/) * License (if not mentioned otherwise): CC BY-SA 4.0 * Some textures have been modified or added - * Modifications by MysticTempest: + * Modifications and additions by MysticTempest: * `mobs_mc_cave_spider.png` * `mobs_mc_enderman_eyes.png` * `mobs_mc_enderman.png` @@ -38,12 +38,26 @@ Origin of those models: * `mobs_mc_spider.png` * `mobs_mc_squid.png` * `mobs_mc_zombie.png` - * Additions by MysticTempest: + * `mobs_mc_villager_butcher.png` + * `mobs_mc_villager_farmer.png` + * `mobs_mc_villager_librarian.png` + * `mobs_mc_villager.png` + * `mobs_mc_villager_priest.png` + * `mobs_mc_villager_smith.png` * `mobs_mc_parrot_blue.png` * `mobs_mc_parrot_green.png` * `mobs_mc_parrot_grey.png` * `mobs_mc_parrot_red_blue.png` * `mobs_mc_parrot_yellow_blue.png` + * `mobs_mc_evoker_base.png` + * `mobs_mc_illusionist_bow.png` + * `mobs_mc_illusionist.png` + * `mobs_mc_vindicator_axe.png` + * `mobs_mc_vindicator_base.png` + * `mobs_mc_horse_skeleton.png` + * Additions by kingoscargames: + * `mobs_mc_vex.png` + * `mobs_mc_vex_charging.png` * “Spawn egg” textures (`mobs_mc_spawn_icon_*`) by 22i * Any other texture not mentioned here are licensed under the MIT License diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_bucket_milk.png b/mods/ENTITIES/mobs_mc/textures/mobs_bucket_milk.png deleted file mode 100644 index 18e887b34..000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_bucket_milk.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker.png new file mode 100644 index 000000000..082901fd7 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png new file mode 100644 index 000000000..ed763c2a9 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_skeleton.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_skeleton.png new file mode 100644 index 000000000..5b76d7b38 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_skeleton.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist.png new file mode 100644 index 000000000..f595dad95 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist_bow.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist_bow.png new file mode 100644 index 000000000..27e670319 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist_bow.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex.png new file mode 100644 index 000000000..980a1e3a3 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_charging.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_charging.png new file mode 100644 index 000000000..97cf85906 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_charging.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_sword.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_sword.png new file mode 100644 index 000000000..340ca52a8 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_sword.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager.png index 2858389e3..62c98bcda 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_butcher.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_butcher.png index 250ddfc7c..e8529c459 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_butcher.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_butcher.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_farmer.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_farmer.png index a3a253aa8..62c98bcda 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_farmer.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_farmer.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_librarian.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_librarian.png index 1cba43330..66b5c2929 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_librarian.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_librarian.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_priest.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_priest.png index 5b55fa94c..79682c2c8 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_priest.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_priest.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_smith.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_smith.png index 99f2125ea..53a0e3888 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_smith.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_villager_smith.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_axe.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_axe.png new file mode 100644 index 000000000..e8bf0611e Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_axe.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png new file mode 100644 index 000000000..e92d810e9 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png differ diff --git a/mods/ENTITIES/mobs_mc/villager_vindicator.lua b/mods/ENTITIES/mobs_mc/villager_vindicator.lua index eef9d9f45..785554d79 100644 --- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua +++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua @@ -23,7 +23,7 @@ mobs:register_mob("mobs_mc:vindicator", { visual = "mesh", mesh = "mobs_mc_vindicator.b3d", textures = { - {"mobs_mc_vindicator_base.png^mobs_mc_vindicator_axe.png"}, + {"mobs_mc_vindicator_axe.png"}, -- TODO: Glow when attacking (mobs_mc_vindicator.png) }, visual_size = {x=3, y=3}, diff --git a/mods/MISC/mcl_wip/init.lua b/mods/MISC/mcl_wip/init.lua index 248ac547e..534608990 100644 --- a/mods/MISC/mcl_wip/init.lua +++ b/mods/MISC/mcl_wip/init.lua @@ -16,12 +16,7 @@ local wip_items = { "mcl_observers:observer", "mcl_chests:trapped_chest", "mcl_core:cobweb", - "mobs_mc:vindicator", - "mobs_mc:evoker", - "mobs_mc:vex", "mobs_mc:llama", - "mobs_mc:illusioner", - "mobs_mc:skeleton_horse", "mobs_mc:totem", }