Actually take disabled worlds into account, rewrite gun naming