From 050987bead5a5d7db2f16958f04544c2b18d83b4 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 30 May 2018 18:48:07 +0200 Subject: [PATCH] Add illagers to Conversion Table --- .../{mobs_mc_evoker_base.png => mobs_mc_evoker.png} | Bin ...c_vindicator_base.png => mobs_mc_vindicator.png} | Bin mods/ENTITIES/mobs_mc/villager_evoker.lua | 2 +- mods/ENTITIES/mobs_mc/villager_vindicator.lua | 2 +- tools/Conversion_Table.csv | 3 +++ 5 files changed, 5 insertions(+), 2 deletions(-) rename mods/ENTITIES/mobs_mc/textures/{mobs_mc_evoker_base.png => mobs_mc_evoker.png} (100%) rename mods/ENTITIES/mobs_mc/textures/{mobs_mc_vindicator_base.png => mobs_mc_vindicator.png} (100%) diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker.png similarity index 100% rename from mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png rename to mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker.png diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator.png similarity index 100% rename from mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png rename to mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator.png diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua index 45b50d05ee..1e7fa9ecba 100644 --- a/mods/ENTITIES/mobs_mc/villager_evoker.lua +++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua @@ -24,7 +24,7 @@ mobs:register_mob("mobs_mc:evoker", { visual = "mesh", mesh = "mobs_mc_villager.b3d", textures = { { - "mobs_mc_evoker_base.png", + "mobs_mc_evoker.png", "blank.png", --no hat -- TODO: Attack glow } }, diff --git a/mods/ENTITIES/mobs_mc/villager_vindicator.lua b/mods/ENTITIES/mobs_mc/villager_vindicator.lua index 15983f7153..aafd083bea 100644 --- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua +++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua @@ -24,7 +24,7 @@ mobs:register_mob("mobs_mc:vindicator", { mesh = "mobs_mc_vindicator.b3d", textures = { { - "mobs_mc_vindicator_base.png", + "mobs_mc_vindicator.png", "blank.png", --no hat "default_tool_steelaxe.png", -- TODO: Glow when attacking (mobs_mc_vindicator.png) diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 7de853b709..4422a1a802 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -753,6 +753,9 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/entity/villager,smith.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_villager_smith.png,,,,,,, /assets/minecraft/textures/entity/illager,vex.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_vex.png,,,,,,, /assets/minecraft/textures/entity/illager,vex_charging.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_vex_charging.png,,,,,,, +/assets/minecraft/textures/entity/illager,vindicator.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_vindicator.png,,,,,,, +/assets/minecraft/textures/entity/illager,evoker.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_evoker.png,,,,,,, +/assets/minecraft/textures/entity/illager,illusionist.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_illusionist.png,,,,,,, /assets/minecraft/textures/entity,witch.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_witch.png,,,,,,, /assets/minecraft/textures/entity/wither,wither.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_wither.png,,,,,,, /assets/minecraft/textures/entity/skeleton,wither_skeleton.png,/mods/ENTITIES/mobs_mc/textures,mobs_mc_wither_skeleton.png,,,,,,,